global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-15 19:20:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  Start 1.7.5.1 maintenance track
  git-send-email: fix missing space in error message
  t/test-lib.sh: minor readability improvements
  diffcore-rename.c: avoid set-but-not-used warning
This commit is contained in:
Junio C Hamano
2011-04-29 11:52:40 -07:00
parent 6ba2fd09ea 1c08bf50cf
commit 71e0bbb2b3
4 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/RelNotes/1.7.5.1.txt Normal file
View File

@@ -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=<smtp-domain>"
and "port=<smtp-server-port>".
And other minor fixes and documentation updates.

3
diffcore-rename.c
View File

@@ -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)

2
git-send-email.perl
View File

@@ -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) {

16
t/test-lib.sh
View File

@@ -578,7 +578,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."
@@ -804,12 +804,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