summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-12 22:20:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-12 22:20:29 (GMT)
commitbc69776aa12c68958e381e8c24e8faa172dde2d8 (patch)
treea9775aa79f0285ea565a7ff035e1ca54dbc56447
parentf7af75777fd5a217d43acb2098cf043a73c20b01 (diff)
parentc6d8f7635f619f6576dccf17c1f1264d2cc37a2a (diff)
downloadgit-bc69776aa12c68958e381e8c24e8faa172dde2d8.zip
git-bc69776aa12c68958e381e8c24e8faa172dde2d8.tar.gz
git-bc69776aa12c68958e381e8c24e8faa172dde2d8.tar.bz2
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0: State the effect of filter-branch on graft explicitly process_{tree,blob}: Remove useless xstrdup calls
-rw-r--r--Documentation/git-filter-branch.txt3
-rw-r--r--builtin-pack-objects.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index fed6de6..68f97cd 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -31,6 +31,9 @@ changes, which would normally have no effect. Nevertheless, this may be
useful in the future for compensating for some git bugs or such,
therefore such a usage is permitted.
+*NOTE*: This command honors `.git/info/grafts`. If you have any grafts
+defined, running this command will make them permanent.
+
*WARNING*! The rewritten history will have different object names for all
the objects and will not converge with the original branch. You will not
be able to easily push and distribute the rewritten branch on top of the
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 7234d76..a357cb0 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -1905,6 +1905,8 @@ static void show_object(struct object_array_entry *p)
add_preferred_base_object(p->name);
add_object_entry(p->item->sha1, p->item->type, p->name, 0);
p->item->flags |= OBJECT_ADDED;
+ free((char *)p->name);
+ p->name = NULL;
}
static void show_edge(struct commit *commit)