@matheusbsbs / matheus-bagliano / commits / 8530c73915

sequencer: handle empty-set cases consistently

If the user gives us a set that prepare_revision_walk() takes to be empty, like: git cherry-pick base..base then we report an error. It's nonsense, and there's nothing to pick. But if they use revision options that later cull the list, like: git cherry-pick --author=nobody base~2..base then we quietly create an empty todo list and return success. Arguably either behavior is acceptable, but we should definitely be consistent about it. Reporting an error seems to match the original intent, which dates all the way back to 7e2bfd3f99 (revert: allow cherry-picking more than one commit, 2010-06-02). That in turn was trying to match the single-commit case that existed before then (and which continues to issue an error). Signed-off-by: Jeff King <peff@peff.net> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jul 9, 2018 at 15:48 UTC 8530c73915ab88b920411c6bbdf02ff4c396ca81

2 files changed +10 -3

sequencer.c

+4 -2

@@ -1176,8 +1176,6 @@ static int prepare_revs(struct replay_opts *opts)

1176 if (prepare_revision_walk(opts->revs))

1177 return error(_("revision walk setup failed"));

1178

1179 - if (!opts->revs->commits)

1180 - return error(_("empty commit set passed"));

1179 return 0;

1180 }

1181

@@ -1560,6 +1558,10 @@ static int walk_revs_populate_todo(struct todo_list *todo_list,

1558 short_commit_name(commit), subject_len, subject);

1559 unuse_commit_buffer(commit, commit_buffer);

1560 }

1561 +

1562 + if (!todo_list->nr)

1563 + return error(_("empty commit set passed"));

1564 +

1565 return 0;

1566 }

1567

t/t3510-cherry-pick-sequence.sh

+6 -1

@@ -480,11 +480,16 @@ test_expect_success 'malformed instruction sheet 2' '

480 test_expect_code 128 git cherry-pick --continue

481 '

482

483 -test_expect_success 'empty commit set' '

483 +test_expect_success 'empty commit set (no commits to walk)' '

484 pristine_detach initial &&

485 test_expect_code 128 git cherry-pick base..base

486 '

487

488 +test_expect_success 'empty commit set (culled during walk)' '

489 + pristine_detach initial &&

490 + test_expect_code 128 git cherry-pick -2 --author=no.such.author base

491 +'

492 +

493 test_expect_success 'malformed instruction sheet 3' '

494 pristine_detach initial &&

495 test_expect_code 1 git cherry-pick base..anotherpick &&