projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
builtin-grep: pass ignore case option to external grep
[git.git]
/
revision.c
diff --git
a/revision.c
b/revision.c
index
f8ee38e
..
6a6952c
100644
(file)
--- a/
revision.c
+++ b/
revision.c
@@
-53,8
+53,9
@@
static void mark_blob_uninteresting(struct blob *blob)
void mark_tree_uninteresting(struct tree *tree)
{
void mark_tree_uninteresting(struct tree *tree)
{
+ struct tree_desc desc;
+ struct name_entry entry;
struct object *obj = &tree->object;
struct object *obj = &tree->object;
- struct tree_entry_list *entry;
if (obj->flags & UNINTERESTING)
return;
if (obj->flags & UNINTERESTING)
return;
@@
-63,17
+64,22
@@
void mark_tree_uninteresting(struct tree *tree)
return;
if (parse_tree(tree) < 0)
die("bad tree %s", sha1_to_hex(obj->sha1));
return;
if (parse_tree(tree) < 0)
die("bad tree %s", sha1_to_hex(obj->sha1));
- entry = tree->entries;
-
tree->entries = NULL
;
- while (entry) {
- struct tree_entry_list *next = entry->next;
- if (
entry->directory
)
- mark_tree_uninteresting(
entry->item.tree
);
+
+
desc.buf = tree->buffer
;
+ desc.size = tree->size;
+ while (tree_entry(&desc, &entry)) {
+ if (
S_ISDIR(entry.mode)
)
+ mark_tree_uninteresting(
lookup_tree(entry.sha1)
);
else
else
- mark_blob_uninteresting(entry->item.blob);
- free(entry);
- entry = next;
+ mark_blob_uninteresting(lookup_blob(entry.sha1));
}
}
+
+ /*
+ * We don't care about the tree any more
+ * after it has been marked uninteresting.
+ */
+ free(tree->buffer);
+ tree->buffer = NULL;
}
void mark_parents_uninteresting(struct commit *commit)
}
void mark_parents_uninteresting(struct commit *commit)
@@
-733,6
+739,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;
@@
-794,7
+808,7
@@
int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
local_flags = UNINTERESTING;
arg++;
}
local_flags = UNINTERESTING;
arg++;
}
- if (get_sha1(arg, sha1)
< 0
) {
+ if (get_sha1(arg, sha1)) {
int j;
if (seen_dashdash || local_flags)
int j;
if (seen_dashdash || local_flags)
@@
-820,7
+834,7
@@
int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
if (def && !revs->pending_objects) {
unsigned char sha1[20];
struct object *object;
if (def && !revs->pending_objects) {
unsigned char sha1[20];
struct object *object;
- if (get_sha1(def, sha1)
< 0
)
+ if (get_sha1(def, sha1))
die("bad default revision '%s'", def);
object = get_reference(revs, def, sha1, 0);
add_pending_object(revs, object, def);
die("bad default revision '%s'", def);
object = get_reference(revs, def, sha1, 0);
add_pending_object(revs, object, def);