Merge branch 'maint'

gitster · gitster · commit 262657dce61b · 2010-06-22T09:35:36.000-07:00
* maint:
  Update draft release notes to 1.7.1.1
  tests: remove unnecessary '^' from 'expr' regular expression

Conflicts:
	diff.c
diff --git a/Documentation/RelNotes-1.7.1.1.txt b/Documentation/RelNotes-1.7.1.1.txt
@@ -28,6 +28,9 @@ Fixes since v1.7.1
  * "git checkout" and "git rebase" overwrote paths that are marked "assume
    unchanged".
 
+ * "git commit --amend" on a commit with an invalid author-name line that
+   lacks the display name didn't work.
+
  * "git describe" did not tie-break tags that point at the same commit
    correctly; newer ones are preferred by paying attention to the
    tagger date now.
@@ -49,14 +52,25 @@ Fixes since v1.7.1
 
  * "git log --abbrev=$num --format='%h' ignored --abbrev=$num.
 
+ * "git ls-files ../out/side/cwd" refused to work.
+
+ * "git merge --log" used to replace the custom message given by "-m" with
+   the shortlog, instead of appending to it.
+
  * "git pull" accepted "--dry-run", gave it to underlying "git fetch" but
    ignored the option itself, resulting in a bogus attempt to merge
    unrelated commit.
 
+ * "git reset --hard" started from a wrong directory and a working tree in
+   a nonstandard location is in use got confused.
+
  * "git send-email" lacked a way to specify the domainname used in the
    EHLO/HELO exchange, causing rejected connection from picky servers.
    It learned --smtp-domain option to solve this issue.
 
+ * "git show -C -C" and other corner cases lost diff metainfo output
+   in 1.7.0.
+
  * "git stash" incorrectly lost paths in the working tree that were
    previously removed from the index.
 
@@ -65,3 +79,10 @@ Fixes since v1.7.1
  * "git status" showed excess "hints" even when advice.statusHints is set to false.
 
 And other minor fixes and documentation updates.
+
+
+--
+exec >/var/tmp/1
+O=v1.7.1-195-gb2ebbd8
+echo O=$(git describe HEAD)
+git shortlog --no-merges HEAD ^$O
diff --git a/diff.c b/diff.c
@@ -2620,7 +2620,6 @@ static void fill_metainfo(struct strbuf *msg,
 		}
 		/* fallthru */
 	default:
-		/* nothing */
 		*must_show_header = 0;
 	}
 	if (one && two && hashcmp(one->sha1, two->sha1)) {
diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh
@@ -13,7 +13,7 @@ test_expect_success 'determine default editor' '
 
 '
 
-if ! expr "$vi" : '^[a-z]*$' >/dev/null
+if ! expr "$vi" : '[a-z]*$' >/dev/null
 then
 	vi=
 fi
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
@@ -109,7 +109,7 @@ test_expect_success TTY 'no pager with --no-pager' '
 # for the first color; the text "commit" comes later.
 colorful() {
 	read firstline <$1
-	! expr "$firstline" : "^[a-zA-Z]" >/dev/null
+	! expr "$firstline" : "[a-zA-Z]" >/dev/null
 }
 
 test_expect_success 'tests can detect color' '
@@ -167,7 +167,7 @@ test_expect_success 'determine default pager' '
 	test -n "$less"
 '
 
-if expr "$less" : '^[a-z][a-z]*$' >/dev/null && test_have_prereq TTY
+if expr "$less" : '[a-z][a-z]*$' >/dev/null && test_have_prereq TTY
 then
 	test_set_prereq SIMPLEPAGER
 fi

Original file line number	Diff line number	Diff line change
`@@ -2620,7 +2620,6 @@ static void fill_metainfo(struct strbuf *msg,`
`2620`	`2620`	`}`
`2621`	`2621`	`/* fallthru */`
`2622`	`2622`	`default:`
`2623`		`- /* nothing */`
`2624`	`2623`	`*must_show_header = 0;`
`2625`	`2624`	`}`
`2626`	`2625`	`if (one && two && hashcmp(one->sha1, two->sha1)) {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ test_expect_success 'determine default editor' '`
`13`	`13`
`14`	`14`	`'`
`15`	`15`
`16`		`-if ! expr "$vi" : '^[a-z]*$' >/dev/null`
	`16`	`+if ! expr "$vi" : '[a-z]*$' >/dev/null`
`17`	`17`	`then`
`18`	`18`	`vi=`
`19`	`19`	`fi`