[PATCH v2 3/3] rebase -i: we allow extra spaces after fixup!/squash!
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jul 7, 2016, 15:52 UTC
- Message-ID
- <7a3f6dde53593160e8200a7bbec902d8fdfcf6bd.1467906747.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1467906747.git.johannes.schindelin@gmx.de>
This new test case ensures that we handle commit messages that start with fixup! or squash! followed by more than one space. While we do not generate such messages when committing with --fixup/--squash, it is perfectly legal for users to hand-craft their own fixup messages, and we heed Postel's law by being lenient.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- t/t3415-rebase-autosquash.sh | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh index 9b71a49..48346f1 100755 --- a/t/t3415-rebase-autosquash.sh +++ b/t/t3415-rebase-autosquash.sh @@ -295,4 +295,13 @@ test_expect_failure 'autosquash with multiple empty patches' ' ) ' +test_expect_success 'extra spaces after fixup!' ' + base=$(git rev-parse HEAD) && + test_commit to-fixup && + git commit --allow-empty -m "fixup! to-fixup" && + git rebase -i --autosquash --keep-empty HEAD~2 && + parent=$(git rev-parse HEAD^) && + test $base = $parent +' + test_done
-- 2.9.0.278.g1caae67