[PATCH v7 01/12] cherry-pick: don't barf when there's nothing to do
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
sequencer.c | 2 +-
t/t3510-cherry-pick-sequence.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 90cac7b..c94942a 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -662,7 +662,7 @@ static void prepare_revs(struct replay_opts *opts)
die(_("revision walk setup failed"));
if (!opts->revs->commits)
- die(_("empty commit set passed"));
+ error(_("empty commit set passed"));
}
static void read_and_refresh_cache(struct replay_opts *opts)
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 7b7a89d..33c5512 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -472,7 +472,7 @@ test_expect_success 'malformed instruction sheet 2' '
test_expect_success 'empty commit set' '
pristine_detach initial &&
- test_expect_code 128 git cherry-pick base..base
+ git cherry-pick base..base
'
test_expect_success 'malformed instruction sheet 3' '
--
1.9.2+fc1.2.gfbaae8c
Felipe Contreras <felipe.contreras@gmail.com>