Re: [PATCH v4 11/45] cherry-pick: don't barf when there's nothing to do
- From
Fredrik Gustafsson <iveqy@iveqy.com>
- Date
- Jun 9, 2013, 19:21 UTC
- Message-ID
- <20130609192143.GC12122@paksenarrion.iveqy.com>
- In-Reply-To
- <1370796057-25312-12-git-send-email-felipe.contreras@gmail.com>
On Sun, Jun 09, 2013 at 11:40:23AM -0500, Felipe Contreras wrote:
Show 31 quoted lines
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---
> builtin/sequencer.c | 4 ++--
> t/t3510-cherry-pick-sequence.sh | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/sequencer.c b/builtin/sequencer.c
> index 23b01b7..4d7dc8b 100644
> --- a/builtin/sequencer.c
> +++ b/builtin/sequencer.c
> @@ -565,8 +565,8 @@ static void prepare_revs(struct replay_opts *opts)
> if (prepare_revision_walk(opts->revs))
> die(_("revision walk setup failed"));
>
> - if (!opts->revs->commits)
> - die(_("empty commit set passed"));
> + if (!opts->revs->commits && !opts->quiet)
> + 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..baseShouldn't this result in the error "empty commit set passed"? If so, shouldn't that be checked to actually print that error?
-- Med vänliga hälsningar Fredrik Gustafsson tel: 0733-608274 e-post: iveqy@iveqy.com