From 6051561a6cc8d715ce6243c26712448f6e32fe4e Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 29 Apr 2011 11:42:41 +0200 Subject: [PATCH 1/2] diffcore-rename.c: avoid set-but-not-used warning Since 9d8a5a5 (diffcore-rename: refactor "too many candidates" logic, 2011-01-06), diffcore_rename() initializes num_src but does not use it anymore. "-Wunused-but-set-variable" in gcc-4.6 complains about this. Signed-off-by: Jim Meyering Signed-off-by: Junio C Hamano --- diffcore-rename.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/diffcore-rename.c b/diffcore-rename.c index d0259be41..f639601c7 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -498,7 +498,7 @@ void diffcore_rename(struct diff_options *options) struct diff_queue_struct outq; struct diff_score *mx; int i, j, rename_count, skip_unmodified = 0; - int num_create, num_src, dst_cnt; + int num_create, dst_cnt; struct progress *progress = NULL; if (!minimum_score) @@ -554,7 +554,6 @@ void diffcore_rename(struct diff_options *options) * files still remain as options for rename/copies!) */ num_create = (rename_dst_nr - rename_count); - num_src = rename_src_nr; /* All done? */ if (!num_create) From e5af0de202e885b793482d416b8ce9d50dd2b8bc Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 1 Jun 2011 14:08:26 -0700 Subject: [PATCH 2/2] Git 1.7.5.4 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.5.4.txt | 3 +++ Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Documentation/RelNotes/1.7.5.4.txt b/Documentation/RelNotes/1.7.5.4.txt index f3412ced3..cf3f455ce 100644 --- a/Documentation/RelNotes/1.7.5.4.txt +++ b/Documentation/RelNotes/1.7.5.4.txt @@ -8,6 +8,9 @@ Fixes since v1.7.5.3 that it was told to add everthing ('a') when up-arrow was pressed by mistake. + * Setting a git command that uses custom configuration via "-c var=val" + as an alias caused a crash due to a realloc(3) failure. + * "git diff -C -C" used to disable the rename detection entirely when there are too many copy candidate paths in the tree; now it falls back to "-C" when doing so would keep the copy candidate paths diff --git a/Documentation/git.txt b/Documentation/git.txt index 504e1b118..8c0bfdf5a 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.5.3/git.html[documentation for release 1.7.5.3] +* link:v1.7.5.4/git.html[documentation for release 1.7.5.4] * release notes for + link:RelNotes/1.7.5.4.txt[1.7.5.4], link:RelNotes/1.7.5.3.txt[1.7.5.3], link:RelNotes/1.7.5.2.txt[1.7.5.2], link:RelNotes/1.7.5.1.txt[1.7.5.1], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 85e25a6dd..621944129 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.5.3 +DEF_VER=v1.7.5.4 LF=' '