kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2009-04-12 16:01:25 -07:00
parent ee7ec2f9de 3bd1bb327e
commit a54c4edc51
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/RelNotes-1.6.2.3.txt
View File

@ -20,9 +20,3 @@ Fixes since v1.6.2.2
to prevent them from being repacked. to prevent them from being repacked.


Many small documentation updates are included as well. 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

3
Documentation/git-filter-branch.txt
View File

@ -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, useful in the future for compensating for some git bugs or such,
therefore such a usage is permitted. 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 *WARNING*! The rewritten history will have different object names for all
the objects and will not converge with the original branch. You will not 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 be able to easily push and distribute the rewritten branch on top of the

2
builtin-pack-objects.c
View File

@ -1912,6 +1912,8 @@ static void show_object(struct object_array_entry *p)
add_preferred_base_object(p->name); add_preferred_base_object(p->name);
add_object_entry(p->item->sha1, p->item->type, p->name, 0); add_object_entry(p->item->sha1, p->item->type, p->name, 0);
p->item->flags |= OBJECT_ADDED; p->item->flags |= OBJECT_ADDED;
free((char *)p->name);
p->name = NULL;
} }


static void show_edge(struct commit *commit) static void show_edge(struct commit *commit)