projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch "read_tree_recursive()" over to tree-walk functionality
[git.git]
/
revision.c
diff --git
a/revision.c
b/revision.c
index
2294b16
..
8d70a6f
100644
(file)
--- a/
revision.c
+++ b/
revision.c
@@
-68,9
+68,9
@@
void mark_tree_uninteresting(struct tree *tree)
while (entry) {
struct tree_entry_list *next = entry->next;
if (entry->directory)
while (entry) {
struct tree_entry_list *next = entry->next;
if (entry->directory)
- mark_tree_uninteresting(
entry->item.tree
);
+ mark_tree_uninteresting(
lookup_tree(entry->sha1)
);
else
else
- mark_blob_uninteresting(
entry->item.blob
);
+ mark_blob_uninteresting(
lookup_blob(entry->sha1)
);
free(entry);
entry = next;
}
free(entry);
entry = next;
}
@@
-733,6
+733,14
@@
int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
revs->abbrev = DEFAULT_ABBREV;
continue;
}
revs->abbrev = DEFAULT_ABBREV;
continue;
}
+ if (!strncmp(arg, "--abbrev=", 9)) {
+ revs->abbrev = strtoul(arg + 9, NULL, 10);
+ if (revs->abbrev < MINIMUM_ABBREV)
+ revs->abbrev = MINIMUM_ABBREV;
+ else if (revs->abbrev > 40)
+ revs->abbrev = 40;
+ continue;
+ }
if (!strcmp(arg, "--abbrev-commit")) {
revs->abbrev_commit = 1;
continue;
if (!strcmp(arg, "--abbrev-commit")) {
revs->abbrev_commit = 1;
continue;