diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-11-22 15:20:46 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-23 06:18:02 +0400 |
| commit | c427b211b3f5d3f967e5fc7abd526b02f83a7246 (patch) | |
| tree | 04d657ad603bfa1310a4b6cca20639e34e3b9e74 /t/t3510-cherry-pick-sequence.sh | |
| parent | 539047c19ec040819b6f6af2d55714195b812abb (diff) | |
revert: remove --reset compatibility option
Remove the "git cherry-pick --reset" option, which has a different
preferred spelling nowadays ("--quit"). Luckily the old --reset name
was not around long enough for anyone to get used to it.
Signed-off-by: Jonathan Nieder <jrnieder@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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index e97397f96b..2c4c1c851d 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -95,7 +95,7 @@ test_expect_success '--quit cleans up sequencer state' ' test_path_is_missing .git/sequencer ' -test_expect_success 'cherry-pick --reset (another name for --quit)' ' +test_expect_success '--quit keeps HEAD and conflicted index intact' ' pristine_detach initial && cat >expect <<-\EOF && OBJID @@ -105,7 +105,7 @@ test_expect_success 'cherry-pick --reset (another name for --quit)' ' :000000 100644 OBJID OBJID A unrelated EOF test_must_fail git cherry-pick base..picked && - git cherry-pick --reset && + git cherry-pick --quit && test_path_is_missing .git/sequencer && test_must_fail git update-index --refresh && { |