[PATCH 10/18] rebase -i: Improve consistency of commit count in generated commit messages
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Jan 14, 2010, 05:54 UTC
- Message-ID
- <1e03c6ff51ca0e6da4c19da014523f01a27b1579.1263447038.git.mhagger@alum.mit.edu>
- In-Reply-To
- <cover.1263447037.git.mhagger@alum.mit.edu>
Use the numeral "2" instead of the word "two" when two commits are being interactively squashed. This makes the treatment consistent with that for higher numbers of commits.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> --- git-rebase--interactive.sh | 2 +- t/t3404-rebase-interactive.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 2c7f3ec..16e1990 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -362,7 +362,7 @@ make_squash_message () { }' <"$SQUASH_MSG" else COUNT=2 - echo "# This is a combination of two commits." + echo "# This is a combination of 2 commits." echo "# The first commit's message is:" echo git cat-file commit HEAD | sed -e '1,/^$/d' diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 0335b78..0511709 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -135,7 +135,7 @@ test_expect_success 'squash' ' test_tick && GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 && echo "******************************" && - FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=two \ + FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \ git rebase -i --onto master HEAD~2 && test B = $(cat file7) && test $(git rev-parse HEAD^) = $(git rev-parse master) @@ -301,7 +301,7 @@ test_expect_success 'squash works as expected' ' git commit -m $n done && one=$(git rev-parse HEAD~3) && - FAKE_LINES="1 squash 3 2" EXPECT_HEADER_COUNT=two \ + FAKE_LINES="1 squash 3 2" EXPECT_HEADER_COUNT=2 \ git rebase -i HEAD~3 && test $one = $(git rev-parse HEAD~2) '
-- 1.6.6