summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-20 09:52:04 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-20 09:52:04 (GMT)
commit0080f50eb333192617739c9954a30611cc0adeaa (patch)
tree2ef11b32d4fd117d60be87157b17651b418f4f49
parenta4d0cced53facb17d777a396aa6b388e97f1d909 (diff)
parent6a74642c500118164ec331da93ef29b1163301bc (diff)
downloadgit-0080f50eb333192617739c9954a30611cc0adeaa.zip
git-0080f50eb333192617739c9954a30611cc0adeaa.tar.gz
git-0080f50eb333192617739c9954a30611cc0adeaa.tar.bz2
Merge branch 'fix'
* fix: git-commit --amend: two fixes.
-rwxr-xr-xgit-commit.sh21
-rwxr-xr-xt/t1200-tutorial.sh2
2 files changed, 16 insertions, 7 deletions
diff --git a/git-commit.sh b/git-commit.sh
index 01c73bd..26cd7ca 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -167,8 +167,13 @@ run_status () {
fi
case "$committable" in
0)
- echo "nothing to commit"
- exit 1
+ case "$amend" in
+ t)
+ echo "# No changes" ;;
+ *)
+ echo "nothing to commit" ;;
+ esac
+ exit 1 ;;
esac
exit 0
)
@@ -365,14 +370,16 @@ tt*)
die "Only one of -c/-C/-F/-m can be used." ;;
esac
-case "$#,$also$only" in
-*,tt)
+case "$#,$also,$only,$amend" in
+*,t,t,*)
die "Only one of --include/--only can be used." ;;
-0,t)
+0,t,,* | 0,,t,)
die "No paths with --include/--only does not make sense." ;;
-0,)
+0,,t,t)
+ only_include_assumed="# Clever... amending the last one with dirty index." ;;
+0,,,*)
;;
-*,)
+*,,,*)
only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
also=
;;
diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index 16b3ea9..c7db20e 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.