Merge branch 'fix'

* fix:
  git-commit --amend: two fixes.
This commit is contained in:
Junio C Hamano 2006-04-20 02:52:04 -07:00
commit 0080f50eb3
2 changed files with 16 additions and 7 deletions

View file

@ -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=
;;

View file

@ -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.