Merge maint in

gitster · gitster · commit 951b09ce363f · 2008-07-01T17:19:34.000-07:00
diff --git a/Documentation/RelNotes-1.5.6.2.txt b/Documentation/RelNotes-1.5.6.2.txt
@@ -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
diff --git a/builtin-log.c b/builtin-log.c
@@ -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;
 		}

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ int cmd_show(int argc, const char *argv, const char prefix)`
`360`	`360`	`t->tag,`
`361`	`361`	`diff_get_color_opt(&rev.diffopt, DIFF_RESET));`
`362`	`362`	`ret = show_object(o->sha1, 1, &rev);`
`363`		`- objects[i].item = (struct object *)t->tagged;`
	`363`	`+ objects[i].item = parse_object(t->tagged->sha1);`
`364`	`364`	`i--;`
`365`	`365`	`break;`
`366`	`366`	`}`