summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder.dev@gmail.com>2019-06-24 18:13:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-06-24 20:38:46 (GMT)
commit077b9798919ac2aa63600a1547f55f89b62b3b02 (patch)
tree80c1253a551ac3abed5eef4bb8f6bc6575d9bf50 /t
parentc9749b369da14cbac6201b1730586abf1f3974f6 (diff)
downloadgit-077b9798919ac2aa63600a1547f55f89b62b3b02.zip
git-077b9798919ac2aa63600a1547f55f89b62b3b02.tar.gz
git-077b9798919ac2aa63600a1547f55f89b62b3b02.tar.bz2
t3404: make the 'rebase.missingCommitsCheck=ignore' test more focused
The test 'rebase -i respects rebase.missingCommitsCheck = warn' is mainly interested in the warning about the dropped commits, but it checks the whole output of 'git rebase', including progress lines and what not that are not at all relevant to 'rebase.missingCommitsCheck', but make it necessary to update this test whenever e.g. the way we show progress is updated (as it will happen in one of the later patches of this series). Modify the test to verify only the first four lines of 'git rebase's output that contain all the important lines, notably the line containing the "Warning:" itself and the oneline log of the dropped commit. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t3404-rebase-interactive.sh15
1 files changed, 1 insertions, 14 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 9146f9d..0b8267c 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -1299,32 +1299,19 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = ignore' '
actual
'
-cr_to_nl () {
- tr '\015' '\012'
-}
-
test_expect_success 'rebase -i respects rebase.missingCommitsCheck = warn' '
cat >expect <<-EOF &&
Warning: some commits may have been dropped accidentally.
Dropped commits (newer to older):
- $(git rev-list --pretty=oneline --abbrev-commit -1 master)
To avoid this message, use "drop" to explicitly remove a commit.
-
- Use '\''git config rebase.missingCommitsCheck'\'' to change the level of warnings.
- The possible behaviours are: ignore, warn, error.
-
- Rebasing (1/4)
- Rebasing (2/4)
- Rebasing (3/4)
- Rebasing (4/4)
- Successfully rebased and updated refs/heads/missing-commit.
EOF
test_config rebase.missingCommitsCheck warn &&
rebase_setup_and_clean missing-commit &&
set_fake_editor &&
FAKE_LINES="1 2 3 4" \
git rebase -i --root 2>actual.2 &&
- cr_to_nl <actual.2 >actual &&
+ head -n4 actual.2 >actual &&
test_i18ncmp expect actual &&
test D = $(git cat-file commit HEAD | sed -ne \$p)
'