diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-12 22:34:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-12 22:34:53 (GMT) |
| commit | 1966af81760aea2966f8f218d442aed5f296b992 (patch) | |
| tree | 24f8bdee3c38ce4a3d02db374202088147048575 | |
| parent | db12d97542762cdb54d332ea047122f1071132b5 (diff) | |
| parent | bc69776aa12c68958e381e8c24e8faa172dde2d8 (diff) | |
| download | git-1966af81760aea2966f8f218d442aed5f296b992.zip git-1966af81760aea2966f8f218d442aed5f296b992.tar.gz git-1966af81760aea2966f8f218d442aed5f296b992.tar.bz2 | |
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1:
State the effect of filter-branch on graft explicitly
process_{tree,blob}: Remove useless xstrdup calls
| -rw-r--r-- | Documentation/git-filter-branch.txt | 3 | ||||
| -rw-r--r-- | builtin-pack-objects.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt index 7ffe03f..c119395 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 9fc3b35..6cf5b86 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -1912,6 +1912,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) |