From 6a74642c500118164ec331da93ef29b1163301bc Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 20 Apr 2006 01:20:56 -0700 Subject: git-commit --amend: two fixes. When running "git commit --amend" only to fix the commit log message without any content change, we mistakenly showed the git-status output that says "nothing to commit" without commenting it out. If you have already run update-index but you want to amend the top commit, "git commit --amend --only" without any paths should have worked, because --only means "starting from the base commit, update-index these paths only to prepare the index to commit, and perform the commit". However, we refused -o without paths. Signed-off-by: Junio C Hamano --- t/t1200-tutorial.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 't/t1200-tutorial.sh') diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh index 10024133e3..f4d53c078a 100755 --- a/t/t1200-tutorial.sh +++ b/t/t1200-tutorial.sh @@ -114,6 +114,8 @@ EOF git commit -m 'Merged "mybranch" changes.' -i hello +test_done + cat > show-branch.expect << EOF * [master] Merged "mybranch" changes. ! [mybranch] Some work. -- cgit v1.2.3