Junio C Hamano  committed 262657d Merge with conflicts

Merge branch 'maint'

* maint:
Update draft release notes to
tests: remove unnecessary '^' from 'expr' regular expression


  • Participants
  • Parent commits 6df2ffa, a4c2454
  • Branches master

Comments (0)

Files changed (4)

File Documentation/RelNotes-

  * "git checkout" and "git rebase" overwrote paths that are marked "assume
+ * "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.
  * "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.
  * "git status" showed excess "hints" even when advice.statusHints is set to false.
 And other minor fixes and documentation updates.
+exec >/var/tmp/1
+echo O=$(git describe HEAD)
+git shortlog --no-merges HEAD ^$O
 		/* fallthru */
-		/* nothing */
 		*must_show_header = 0;
 	if (one && two && hashcmp(one->sha1, two->sha1)) {

File t/

-if ! expr "$vi" : '^[a-z]*$' >/dev/null
+if ! expr "$vi" : '[a-z]*$' >/dev/null

File t/

 # 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' '
 	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
 	test_set_prereq SIMPLEPAGER