diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-05 18:10:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-05 18:10:20 -0700 |
| commit | c49b5a3c891e34f6fea9f73847322e9447db91df (patch) | |
| tree | 9ecc71e83c169bf60936afc01029dce3c50bb1e6 /builtin-rev-list.c | |
| parent | Fix earlier mismerges. (diff) | |
| parent | git alias: try alias last. (diff) | |
| download | tgif-c49b5a3c891e34f6fea9f73847322e9447db91df.tar.xz | |
Merge branch 'js/alias' into next
* js/alias:
git alias: try alias last.
If you have a config containing something like this:
builtin-push: don't pass --thin to HTTP transport
pack-objects: improve path grouping heuristics.
rev-list: fix process_tree() conversion.
Fix typo in tutorial-2.txt
Fix Documentation/everyday.txt: Junio's workflow
Add example xinetd(8) configuration to Documentation/everyday.txt
read-tree: fix eye-candy.
gitview: Add some useful keybindings.
Diffstat (limited to 'builtin-rev-list.c')
| -rw-r--r-- | builtin-rev-list.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-rev-list.c b/builtin-rev-list.c index 17c04b962d..e885624255 100644 --- a/builtin-rev-list.c +++ b/builtin-rev-list.c @@ -135,9 +135,9 @@ static struct object_list **process_tree(struct tree *tree, while (tree_entry(&desc, &entry)) { if (S_ISDIR(entry.mode)) - p = process_tree(lookup_tree(entry.sha1), p, &me, name); + p = process_tree(lookup_tree(entry.sha1), p, &me, entry.path); else - p = process_blob(lookup_blob(entry.sha1), p, &me, name); + p = process_blob(lookup_blob(entry.sha1), p, &me, entry.path); } free(tree->buffer); tree->buffer = NULL; |