diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-12 16:01:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-12 16:01:25 -0700 |
| commit | a54c4edc511608fdba513cc94812c31fd4b497f6 (patch) | |
| tree | 53dea1be73208c23be4cdf2aec37894de8415889 | |
| parent | ee7ec2f9ded03700f2b95cc1d4b3d60ed374132a (diff) | |
| parent | 3bd1bb327eb4d3e386800897734f9f42b48280ff (diff) | |
| download | git-a54c4edc511608fdba513cc94812c31fd4b497f6.tar.gz | |
Merge branch 'maint'
* maint:
GIT 1.6.2.3
State the effect of filter-branch on graft explicitly
process_{tree,blob}: Remove useless xstrdup calls
Conflicts:
GIT-VERSION-GEN
| -rw-r--r-- | Documentation/RelNotes-1.6.2.3.txt | 6 | ||||
| -rw-r--r-- | Documentation/git-filter-branch.txt | 3 | ||||
| -rw-r--r-- | builtin-pack-objects.c | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/Documentation/RelNotes-1.6.2.3.txt b/Documentation/RelNotes-1.6.2.3.txt index 6560593fd5..4d3c1ac91c 100644 --- a/Documentation/RelNotes-1.6.2.3.txt +++ b/Documentation/RelNotes-1.6.2.3.txt @@ -20,9 +20,3 @@ Fixes since v1.6.2.2 to prevent them from being repacked. Many small documentation updates are included as well. - ---- -exec >/var/tmp/1 -echo O=$(git describe maint) -O=v1.6.2.2-41-gbff82d0 -git shortlog --no-merges $O..maint diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt index 237f85e767..ab527b5b31 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 99181fd7ee..e58d300e3f 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) |