Merge branch 'fix'

* fix:
  git-commit --amend: two fixes.

diff --combined t/t1200-tutorial.sh
index 16b3ea9,f4d53c0..c7db20e
--- 1/t/t1200-tutorial.sh
--- 2/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
@@@ -49,7 -49,7 +49,7 @@@ test_expect_success 'git diff HEAD' 'cm
  #test_expect_success 'git-read-tree --reset HEAD' "git-read-tree --reset HEAD ; test \"hello: needs update\" = \"$(git-update-index --refresh)\""
  
  cat > whatchanged.expect << EOF
 -diff-tree VARIABLE (from root)
 +commit VARIABLE
  Author: VARIABLE
  Date:   VARIABLE
  
@@@ -72,7 -72,7 +72,7 @@@ index 0000000..557db0
  EOF
  
  git-whatchanged -p --root | \
 -      sed -e "1s/^\(.\{10\}\).\{40\}/\1VARIABLE/" \
 +      sed -e "1s/^\(.\{7\}\).\{40\}/\1VARIABLE/" \
                -e "2,3s/^\(.\{8\}\).*$/\1VARIABLE/" \
  > whatchanged.output
  test_expect_success 'git-whatchanged -p --root' 'cmp whatchanged.expect whatchanged.output'
@@@ -114,6 -114,8 +114,8 @@@ EO
  
  git commit -m 'Merged "mybranch" changes.' -i hello
  
+ test_done
+ 
  cat > show-branch.expect << EOF
  * [master] Merged "mybranch" changes.
   ! [mybranch] Some work.