Merge branch 'maint'

* maint:
Fix "git-commit -C $tag"
Documentation/git-stash.txt: Adjust SYNOPSIS command syntax (2)

diff --combined t/t7501-commit.sh
index 21dcf550fc89781bc1d2aee2d39d3f563d7ebdc7,55043d102f575bd92ea61f3beccc350ba3e7cd4c..361886c3d62b8bf81db0be5999c1e98c4e972f6a
--- 1/t/t7501-commit.sh
--- 2/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@@ -17,49 -17,49 +17,49 @@@ test_expect_success 
         git-add file && \
         git-status | grep 'Initial commit'"
  
 -test_expect_failure \
 +test_expect_success \
        "fail initial amend" \
 -      "git-commit --amend"
 +      "! git-commit --amend"
  
  test_expect_success \
        "initial commit" \
        "git-commit -m initial"
  
 -test_expect_failure \
 +test_expect_success \
        "invalid options 1" \
 -      "git-commit -m foo -m bar -F file"
 +      "! git-commit -m foo -m bar -F file"
  
 -test_expect_failure \
 +test_expect_success \
        "invalid options 2" \
 -      "git-commit -C HEAD -m illegal"
 +      "! git-commit -C HEAD -m illegal"
  
 -test_expect_failure \
 +test_expect_success \
        "using paths with -a" \
        "echo King of the bongo >file &&
 -      git-commit -m foo -a file"
 +      ! git-commit -m foo -a file"
  
 -test_expect_failure \
 +test_expect_success \
        "using paths with --interactive" \
        "echo bong-o-bong >file &&
 -      echo 7 | git-commit -m foo --interactive file"
 +      ! echo 7 | git-commit -m foo --interactive file"
  
 -test_expect_failure \
 +test_expect_success \
        "using invalid commit with -C" \
 -      "git-commit -C bogus"
 +      "! git-commit -C bogus"
  
 -test_expect_failure \
 +test_expect_success \
        "testing nothing to commit" \
 -      "git-commit -m initial"
 +      "! git-commit -m initial"
  
  test_expect_success \
        "next commit" \
        "echo 'bongo bongo bongo' >file \
         git-commit -m next -a"
  
 -test_expect_failure \
 +test_expect_success \
        "commit message from non-existing file" \
        "echo 'more bongo: bongo bongo bongo bongo' >file && \
 -       git-commit -F gah -a"
 +       ! git-commit -F gah -a"
  
  # Empty except stray tabs and spaces on a few lines.
  sed -e 's/@$//' >msg <<EOF
@@@ -68,9 -68,9 +68,9 @@@
    @
  Signed-off-by: hula
  EOF
 -test_expect_failure \
 +test_expect_success \
        "empty commit message" \
 -      "git-commit -F msg -a"
 +      "! git-commit -F msg -a"
  
  test_expect_success \
        "commit message from file" \
@@@ -88,10 -88,10 +88,10 @@@ test_expect_success 
        "amend commit" \
        "VISUAL=./editor git-commit --amend"
  
 -test_expect_failure \
 +test_expect_success \
        "passing -m and -F" \
        "echo 'enough with the bongos' >file && \
 -       git-commit -F msg -m amending ."
 +       ! git-commit -F msg -m amending ."
  
  test_expect_success \
        "using message from other commit" \
@@@ -327,4 -327,22 +327,22 @@@ test_expect_success 'amend using the me
  
  '
  
+ test_expect_success 'amend using the message from a commit named with tag' '
+ 
+       git reset --hard &&
+       test_tick &&
+       git commit --allow-empty -m "old commit" &&
+       old=$(git rev-parse --verify HEAD) &&
+       git tag -a -m "tag on old" tagged-old HEAD &&
+       test_tick &&
+       git commit --allow-empty -m "new commit" &&
+       new=$(git rev-parse --verify HEAD) &&
+       test_tick &&
+       git commit --allow-empty --amend -C tagged-old &&
+       git show --pretty="format:%ad %s" "$old" >expected &&
+       git show --pretty="format:%ad %s" HEAD >actual &&
+       diff -u expected actual
+ 
+ '
+ 
  test_done