From: Junio C Hamano <junkio@cox.net>
To: Luben Tuikov <ltuikov@yahoo.com>
Cc: git@vger.kernel.org
Subject: Re: git-revert in branch next
Date: Mon, 09 Oct 2006 19:21:20 -0700 [thread overview]
Message-ID: <7vu02c9ahr.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20061010011134.58584.qmail@web31809.mail.mud.yahoo.com> (Luben Tuikov's message of "Mon, 9 Oct 2006 18:11:34 -0700 (PDT)")
Luben Tuikov <ltuikov@yahoo.com> writes:
> --- Luben Tuikov <ltuikov@yahoo.com> 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 <junkio@cox.net>
---
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] <commit-ish>' ;;
*-cherry-pick* )
+ replay=t
edit=
me=cherry-pick
USAGE='[--edit] [-n] [-r] [-x] <commit-ish>' ;;
@@ -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
next prev parent reply other threads:[~2006-10-10 2:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-10 1:11 git-revert in branch next Luben Tuikov
2006-10-10 2:21 ` Junio C Hamano [this message]
-- strict thread matches above, loose matches on Subject: below --
2006-10-10 1:05 Luben Tuikov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vu02c9ahr.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=ltuikov@yahoo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox