diff options
| author | Ramkumar Ramachandra <artagnon@gmail.com> | 2011-12-14 22:24:30 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-15 13:15:46 -0800 |
| commit | 0db76962d156c196a23a98014c1585246f561a5d (patch) | |
| tree | 0967e49d1b767e2446c0f360aa300c0c95954bb3 /t/t3510-cherry-pick-sequence.sh | |
| parent | 6bc1a235b1260a8395045261f8004ba9f12677c7 (diff) | |
| download | git-0db76962d156c196a23a98014c1585246f561a5d.tar.gz | |
revert: tolerate extra spaces, tabs in insn sheet
Tolerate extra spaces and tabs as part of the the field separator in
'.git/sequencer/todo', for people with fat fingers.
Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3510-cherry-pick-sequence.sh')
| -rwxr-xr-x | t/t3510-cherry-pick-sequence.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index 1820a424e9..1069857553 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -492,6 +492,17 @@ test_expect_success 'malformed instruction sheet 3' ' test_must_fail git cherry-pick --continue ' +test_expect_success 'instruction sheet, fat-fingers version' ' + pristine_detach initial && + test_must_fail git cherry-pick base..anotherpick && + echo "c" >foo && + git add foo && + git commit && + sed "s/pick \([0-9a-f]*\)/pick \1 /" .git/sequencer/todo >new_sheet && + cp new_sheet .git/sequencer/todo && + git cherry-pick --continue +' + test_expect_success 'commit descriptions in insn sheet are optional' ' pristine_detach initial && test_must_fail git cherry-pick base..anotherpick && |