Merge fixes up to GIT 1.1.3

diff --git a/commit.c b/commit.c
index 56efc69f1f4bf1568eaa549bed16f7cc2cd669ba..b8bf35e86081a638137c49e9eabb18c466dec1e5 100644 (file)
--- 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 fabadb827fb5d7852028e5d8e437e315215f90b1..4866510eafa19fbfe74e11d20e5d2d1a0a44fd4b 100644 (file)
--- 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;
 }