summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--commit.c6
-rw-r--r--describe.c13
2 files changed, 12 insertions, 7 deletions
diff --git a/commit.c b/commit.c
index 56efc69..b8bf35e 100644
--- a/commit.c
+++ b/commit.c
@@ -359,8 +359,10 @@ void clear_commit_marks(struct commit *commit, unsigned int mark)
parents = commit->parents;
commit->object.flags &= ~mark;
while (parents) {
- if (parents->item && parents->item->object.parsed)
- clear_commit_marks(parents->item, mark);
+ struct commit *parent = parents->item;
+ if (parent && parent->object.parsed &&
+ (parent->object.flags & mark))
+ clear_commit_marks(parent, mark);
parents = parents->next;
}
}
diff --git a/describe.c b/describe.c
index fabadb8..4866510 100644
--- a/describe.c
+++ b/describe.c
@@ -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;
}
-static void describe(char *arg)
+static void describe(char *arg, int last_one)
{
unsigned char sha1[20];
struct commit *cmit;
@@ -132,7 +132,8 @@ static void describe(char *arg)
if (n) {
printf("%s-g%s\n", n->path,
find_unique_abbrev(cmit->object.sha1, abbrev));
- clear_commit_marks(cmit, SEEN);
+ if (!last_one)
+ clear_commit_marks(cmit, SEEN);
return;
}
}
@@ -162,10 +163,12 @@ int main(int argc, char **argv)
}
if (i == argc)
- describe("HEAD");
+ describe("HEAD", 1);
else
- while (i < argc)
- describe(argv[i++]);
+ while (i < argc) {
+ describe(argv[i], (i == argc - 1));
+ i++;
+ }
return 0;
}