From: Martin von Zweigbergk Date: Mon, 14 Feb 2011 03:15:11 GMT Subject: Re: [PATCH v2 00/31] refactor rebase Message-ID: In-Reply-To: On Sun, 13 Feb 2011, Martin von Zweigbergk wrote: > On Fri, 11 Feb 2011, Martin von Zweigbergk wrote: > > > On Thu, 10 Feb 2011, Junio C Hamano wrote: > > > > > I am not sure if forbidding "-v --continue" adds any value; would it be > > > too much effort to allow "--continue -v" instead to achieve the same > > > degree of consistency between the two? > > > > I'll have a look at it when > > I get some time. > > This would apply on top of mz/rebase after dropping 95135b0 (rebase: > stricter check of standalone sub command, 2011-02-06). If you agree > with it, I will include it in a future re-roll. Sorry, anyone who intends to test it, squash in this missing test_must_fail first. -- 8< -- diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index 1581f00..02ac92f 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -95,7 +95,7 @@ test_expect_success 'rebase --continue --no-rerere-autoupdate overrides' ' git reset --hard topic@{1} && test_must_fail git rebase -m --rerere-autoupdate master && test "$(cat F2)" = "Resolved" && - git rebase --continue --no-rerere-autoupdate && + test_must_fail git rebase --continue --no-rerere-autoupdate && test "$(cat F3)" = "Resolved" && test_must_fail git rebase --continue && git add F3 &&