From 4f3dcc2753ef6c244622334cef94a72682fcd850 Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Tue, 1 Jul 2008 11:47:04 +0200 Subject: Fix 'git show' on signed tag of signed tag of commit The cmd_show loop resolves tags by showing them, then pointing the object to the 'tagged' member. However, this object is not fully initialized; it only contains the SHA1. (This resulted in a segfault if there were two levels of tags.) We apply parse_object to get a full object. Noticed by Kalle Olavi Niemitalo on IRC. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- builtin-log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin-log.c b/builtin-log.c index 9817d6fbeb..9979e37f38 100644 --- 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; } -- cgit v1.2.3 From 7ad0f27b925463c5ca6908573ed24ede11a9981f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 1 Jul 2008 17:09:21 -0700 Subject: Start draft release notes for 1.5.6.2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.6.2.txt | 31 +++++++++++++++++++++++++++++++ RelNotes | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes-1.5.6.2.txt diff --git a/Documentation/RelNotes-1.5.6.2.txt b/Documentation/RelNotes-1.5.6.2.txt new file mode 100644 index 0000000000..02d5910d5c --- /dev/null +++ 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/RelNotes b/RelNotes index ebc4b20148..0072160018 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.5.6.1.txt \ No newline at end of file +Documentation/RelNotes-1.5.6.2.txt \ No newline at end of file -- cgit v1.2.3