]> git.ipfire.org Git - thirdparty/git.git/commit - t/t3510-cherry-pick-sequence.sh
sequencer: handle empty-set cases consistently
authorJeff King <peff@peff.net>
Mon, 9 Jul 2018 19:48:19 +0000 (15:48 -0400)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2018 15:37:47 +0000 (08:37 -0700)
commit8530c73915ab88b920411c6bbdf02ff4c396ca81
treee01118e95d07d2c17b877b3bb2dc136413011e37
parenta42a58d7b62cc1d6301440e81a83feed9d7c118c
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>
sequencer.c
t/t3510-cherry-pick-sequence.sh