From dabdbee10bd6c7d92204ce4bfc1f3ffd60a4046a Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 29 Apr 2011 11:42:41 +0200 Subject: [PATCH 1/4] 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 f62587e523..3d65bb370d 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 c54e6be75ae90e2be45c32f4d1949fff59ad7d9d Mon Sep 17 00:00:00 2001 From: Mathias Lafeldt Date: Fri, 29 Apr 2011 14:30:30 +0200 Subject: [PATCH 2/4] t/test-lib.sh: minor readability improvements Apply parameter expansion. Also use here document to save test results instead of appending each line with ">>". Signed-off-by: Mathias Lafeldt Signed-off-by: Junio C Hamano --- t/test-lib.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index abc47f3abc..aca03d2db0 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -575,7 +575,7 @@ test_external () { test_external_without_stderr () { # The temporary file has no (and must have no) security # implications. - tmp="$TMPDIR"; if [ -z "$tmp" ]; then tmp=/tmp; fi + tmp=${TMPDIR:-/tmp} stderr="$tmp/git-external-stderr.$$.tmp" test_external "$@" 4> "$stderr" [ -f "$stderr" ] || error "Internal error: $stderr disappeared." @@ -801,12 +801,14 @@ test_done () { mkdir -p "$test_results_dir" test_results_path="$test_results_dir/${0%.sh}-$$.counts" - echo "total $test_count" >> $test_results_path - echo "success $test_success" >> $test_results_path - echo "fixed $test_fixed" >> $test_results_path - echo "broken $test_broken" >> $test_results_path - echo "failed $test_failure" >> $test_results_path - echo "" >> $test_results_path + cat >>"$test_results_path" <<-EOF + total $test_count + success $test_success + fixed $test_fixed + broken $test_broken + failed $test_failure + + EOF fi if test "$test_fixed" != 0 From a1dd7e16ad6df793fc393d6df8e9082261a0ce42 Mon Sep 17 00:00:00 2001 From: Sylvain Rabot Date: Fri, 29 Apr 2011 20:23:24 +0200 Subject: [PATCH 3/4] git-send-email: fix missing space in error message When the command cannot make a connection to the SMTP server the error message to diagnose the broken configuration is issued. However, when an optional smtp-server-port is given and needs to be reported, the message lacked a space between "hello=" and "port=". Signed-off-by: Sylvain Rabot Signed-off-by: Junio C Hamano --- git-send-email.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-send-email.perl b/git-send-email.perl index 76565de2ee..98ab33aae7 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1091,7 +1091,7 @@ X-Mailer: git-send-email $gitversion "VALUES: server=$smtp_server ", "encryption=$smtp_encryption ", "hello=$smtp_domain", - defined $smtp_server_port ? "port=$smtp_server_port" : ""; + defined $smtp_server_port ? " port=$smtp_server_port" : ""; } if (defined $smtp_authuser) { From 65f13f20bccc71cf6599e9ad6b2ed0cc2312f416 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 29 Apr 2011 11:47:10 -0700 Subject: [PATCH 4/4] Start 1.7.5.1 maintenance track Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.5.1.txt | 14 ++++++++++++++ RelNotes | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes/1.7.5.1.txt diff --git a/Documentation/RelNotes/1.7.5.1.txt b/Documentation/RelNotes/1.7.5.1.txt new file mode 100644 index 0000000000..cfd9b2aa22 --- /dev/null +++ b/Documentation/RelNotes/1.7.5.1.txt @@ -0,0 +1,14 @@ +Git v1.7.5.1 Release Notes +========================== + +Fixes since v1.7.5 +------------------ + + * The "--date=relative" output format used to say "X years, 12 months" + when it should have said "X+1 years". + + * An error message from "git send-email" to diagnose a broken SMTP + connection configuration lacked a space between "hello=" + and "port=". + +And other minor fixes and documentation updates. diff --git a/RelNotes b/RelNotes index 540b756d2f..1f849d224e 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.5.txt \ No newline at end of file +Documentation/RelNotes/1.7.5.1.txt \ No newline at end of file