]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/revision-range-unpeel' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Feb 2014 21:38:47 +0000 (13:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Feb 2014 21:38:47 +0000 (13:38 -0800)
"git log --left-right A...B" lost the "leftness" of commits
reachable from A when A is a tag as a side effect of a recent
bugfix.  This is a regression in 1.8.4.x series.

* jc/revision-range-unpeel:
  revision: propagate flag bits from tags to pointees
  revision: mark contents of an uninteresting tree uninteresting

1  2 
revision.c

diff --cc revision.c
index a8adb3fc8891a73fb4017d18b00020bca790c766,aec03332cabc620262fbabdf97a0164499197cc4..7afedc50fcdc1346a81ab3d95a557c85333c97b9
@@@ -139,9 -128,23 +134,21 @@@ static void mark_tree_contents_unintere
         * We don't care about the tree any more
         * after it has been marked uninteresting.
         */
 -      free(tree->buffer);
 -      tree->buffer = NULL;
 -      tree->object.parsed = 0;
 +      free_tree_buffer(tree);
  }
  
+ void mark_tree_uninteresting(struct tree *tree)
+ {
+       struct object *obj = &tree->object;
+       if (!tree)
+               return;
+       if (obj->flags & UNINTERESTING)
+               return;
+       obj->flags |= UNINTERESTING;
+       mark_tree_contents_uninteresting(tree);
+ }
  void mark_parents_uninteresting(struct commit *commit)
  {
        struct commit_list *parents = NULL, *l;