undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge fixes up to GIT 1.1.3

Browse Source
This commit is contained in:
Junio C Hamano 2006-01-15 22:25:35 -08:00
commit fec9ebf16c
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
commit.c
View File

@ -359,8 +359,10 @@ void clear_commit_marks(struct commit *commit, unsigned int mark)
parents = commit->parents; parents = commit->parents;
commit->object.flags &= ~mark; commit->object.flags &= ~mark;
while (parents) { while (parents) {
if (parents->item && parents->item->object.parsed) struct commit *parent = parents->item;
clear_commit_marks(parents->item, mark); if (parent && parent->object.parsed &&
(parent->object.flags & mark))
clear_commit_marks(parent, mark);
parents = parents->next; parents = parents->next;
} }
} }

13
describe.c
View File

@ -98,7 +98,7 @@ static int compare_names(const void *_a, const void *_b)
return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1; return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
} }
static void describe(char *arg) static void describe(char *arg, int last_one)
{ {
unsigned char sha1[20]; unsigned char sha1[20];
struct commit *cmit; struct commit *cmit;
@ -132,7 +132,8 @@ static void describe(char *arg)
if (n) { if (n) {
printf("%s-g%s\n", n->path, printf("%s-g%s\n", n->path,
find_unique_abbrev(cmit->object.sha1, abbrev)); find_unique_abbrev(cmit->object.sha1, abbrev));
clear_commit_marks(cmit, SEEN); if (!last_one)
clear_commit_marks(cmit, SEEN);
return; return;
} }
} }
@ -162,10 +163,12 @@ int main(int argc, char **argv)
} }
if (i == argc) if (i == argc)
describe("HEAD"); describe("HEAD", 1);
else else
while (i < argc) while (i < argc) {
describe(argv[i++]); describe(argv[i], (i == argc - 1));
i++;
}
return 0; return 0;
} }