At the same time, stop talking about "--only" option being the
default when given paths. It has been that way for quite some
time.
This change breaks t1400 which assumed the long tradition of not
modifying index when not told to touch it with an explicit -a
nor paths, so this commit includes adjustment for it as well.
Signed-off-by: Junio C Hamano <junkio@xxxxxxx>
---
git-commit.sh | 13 ++++++-------
t/t1400-update-ref.sh | 4 ++--
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/git-commit.sh b/git-commit.sh
index 6c95817..655340c 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -292,13 +292,12 @@ case "$#,$also,$only,$amend" in
0,,t,)
die "No paths with --only does not make sense." ;;
0,,t,t)
- only_include_assumed="# Clever... amending the last one with dirty index." ;;
+ only_include_assumed="Clever... amending the last one with dirty index." ;;
0,,,*)
- : all=t
- only_include_assumed="# We will start assuming -a without -i; you have been warned."
+ all=t
+ only_include_assumed="No -o nor -i is given; committing --all"
;;
*,,,*)
- only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
also=
;;
esac
@@ -542,9 +541,9 @@ then
echo "# Please enter the commit message for your changes."
echo "# (Comment lines starting with '#' will not be included)"
test -z "$only_include_assumed" || {
- echo "#"
- echo "$only_include_assumed"
- echo "#"
+ echo "################################################"
+ echo "# $only_include_assumed"
+ echo "################################################"
}
run_status
} >>"$GIT_DIR"/COMMIT_EDITMSG
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 6a917f2..1580224 100755
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -200,13 +200,13 @@ test_expect_success \
h_OTHER=$(git-rev-parse --verify HEAD) &&
echo FIXED >F &&
GIT_AUTHOR_DATE="2005-05-26 23:44" \
- GIT_COMMITTER_DATE="2005-05-26 23:44" git-commit --amend &&
+ GIT_COMMITTER_DATE="2005-05-26 23:44" git-commit --amend -i &&
h_FIXED=$(git-rev-parse --verify HEAD) &&
echo TEST+FIXED >F &&
echo Merged initial commit and a later commit. >M &&
echo $h_TEST >.git/MERGE_HEAD &&
GIT_AUTHOR_DATE="2005-05-26 23:45" \
- GIT_COMMITTER_DATE="2005-05-26 23:45" git-commit -F M &&
+ GIT_COMMITTER_DATE="2005-05-26 23:45" git-commit -F M -i &&
h_MERGED=$(git-rev-parse --verify HEAD)
rm -f M'
--
1.4.4.1.gcee8-dirty
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html