From: Junio C Hamano Date: Tue, 10 Oct 2006 02:21:20 GMT Subject: Re: git-revert in branch next Message-ID: <7vu02c9ahr.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <20061010011134.58584.qmail@web31809.mail.mud.yahoo.com> Luben Tuikov writes: > --- Luben Tuikov wrote: >> Has anyone successfully used "git-revert" from branch next, lately? Yes, and it is actually in "master". Thanks for noticing before I declared -rc2. -- >8 -- Fix git-revert Defaulting to $replay for the sake of fixing cherry-pick was not done conditionally, which broke git-revert. Noticed by Luben. Signed-off-by: Junio C Hamano --- git-revert.sh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/git-revert.sh b/git-revert.sh index 0784f74..4fd81b6 100755 --- a/git-revert.sh +++ b/git-revert.sh @@ -7,9 +7,11 @@ # case "$0" in *-revert* ) test -t 0 && edit=-e + replay= me=revert USAGE='[--edit | --no-edit] [-n] ' ;; *-cherry-pick* ) + replay=t edit= me=cherry-pick USAGE='[--edit] [-n] [-r] [-x] ' ;; @@ -18,7 +20,7 @@ case "$0" in esac . git-sh-setup -no_commit= replay=t +no_commit= while case "$#" in 0) break ;; esac do case "$1" in -- 1.4.2.3.g2c59