diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2010-01-14 05:54:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-14 08:27:56 (GMT) |
| commit | 959c0d06eafd7723517c953e80ee1a60881c373b (patch) | |
| tree | fb80251b5d91b951d9647f56b3f78f2c26ce6675 /t/lib-rebase.sh | |
| parent | a4049ae7ac97cb8887e9cd499c4dd0fed0eb968d (diff) | |
| download | git-959c0d06eafd7723517c953e80ee1a60881c373b.zip git-959c0d06eafd7723517c953e80ee1a60881c373b.tar.gz git-959c0d06eafd7723517c953e80ee1a60881c373b.tar.bz2 | |
t3404: Test the commit count in commit messages generated by "rebase -i"
The first line of commit messages generated for "rebase -i"
squash/fixup commits includes a count of the number of commits that
are being combined. Add machinery to check that this count is
correct, and add such a check to some test cases.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-rebase.sh')
| -rw-r--r-- | t/lib-rebase.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index 0db8250..2d922ae 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -2,9 +2,10 @@ # After setting the fake editor with this function, you can # -# - override the commit message with $FAKE_COMMIT_MESSAGE, +# - override the commit message with $FAKE_COMMIT_MESSAGE # - amend the commit message with $FAKE_COMMIT_AMEND # - check that non-commit messages have a certain line count with $EXPECT_COUNT +# - check the commit count in the commit message header with $EXPECT_HEADER_COUNT # - rewrite a rebase -i script as directed by $FAKE_LINES. # $FAKE_LINES consists of a sequence of words separated by spaces. # The following word combinations are possible: @@ -25,6 +26,9 @@ set_fake_editor () { cat >> fake-editor.sh <<\EOF case "$1" in */COMMIT_EDITMSG) + test -z "$EXPECT_HEADER_COUNT" || + test "$EXPECT_HEADER_COUNT" = $(sed -n '1s/^# This is a combination of \(.*\) commits\./\1/p' < "$1") || + exit test -z "$FAKE_COMMIT_MESSAGE" || echo "$FAKE_COMMIT_MESSAGE" > "$1" test -z "$FAKE_COMMIT_AMEND" || echo "$FAKE_COMMIT_AMEND" >> "$1" exit |