mirror of
https://github.com/git/git.git
synced 2024-10-30 22:07:53 +01:00
Merge maint in
This commit is contained in:
commit
951b09ce36
2 changed files with 32 additions and 1 deletions
31
Documentation/RelNotes-1.5.6.2.txt
Normal file
31
Documentation/RelNotes-1.5.6.2.txt
Normal file
|
@ -0,0 +1,31 @@
|
|||
GIT v1.5.6.2 Release Notes
|
||||
==========================
|
||||
|
||||
Futureproof
|
||||
-----------
|
||||
|
||||
* "git-shell" accepts requests without a dash between "git" and
|
||||
subcommand name (e.g. "git upload-pack") which the newer client will
|
||||
start to make sometime in the future.
|
||||
|
||||
Fixes since v1.5.6.1
|
||||
--------------------
|
||||
|
||||
* Optimization for a large import via "git-svn" introduced in v1.5.6 had a
|
||||
serious memory and temporary file leak, which made it unusable for
|
||||
moderately large import.
|
||||
|
||||
* "git-svn" mangled remote nickname used in the configuration file
|
||||
unnecessarily.
|
||||
|
||||
* "git diff --check" did not report the result via its exit status
|
||||
reliably.
|
||||
|
||||
* "git show" segfaulted when an annotated tag that points at another
|
||||
annotated tag was given to it.
|
||||
|
||||
--
|
||||
exec >/var/tmp/1
|
||||
echo O=$(git describe maint)
|
||||
O=v1.5.6.1-13-g4f3dcc2
|
||||
git shortlog --no-merges $O..maint
|
|
@ -360,7 +360,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)
|
|||
t->tag,
|
||||
diff_get_color_opt(&rev.diffopt, DIFF_RESET));
|
||||
ret = show_object(o->sha1, 1, &rev);
|
||||
objects[i].item = (struct object *)t->tagged;
|
||||
objects[i].item = parse_object(t->tagged->sha1);
|
||||
i--;
|
||||
break;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue