* git-revert in branch next
@ 2006-10-10 1:05 Luben Tuikov
0 siblings, 0 replies; 3+ messages in thread
From: Luben Tuikov @ 2006-10-10 1:05 UTC (permalink / raw)
To: git
Has anyone successfully used "git-revert" from branch next, lately?
It seems to print USAGE no matter what arguments are given to it.
Luben
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: git-revert in branch next
@ 2006-10-10 1:11 Luben Tuikov
2006-10-10 2:21 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Luben Tuikov @ 2006-10-10 1:11 UTC (permalink / raw)
To: git
--- Luben Tuikov <ltuikov@yahoo.com> wrote:
> Has anyone successfully used "git-revert" from branch next, lately?
> It seems to print USAGE no matter what arguments are given to it.
Line 50:
test "$me,$replay" = "revert,t" && usage
is suspicious after commit abd6970a.
Luben
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git-revert in branch next
2006-10-10 1:11 Luben Tuikov
@ 2006-10-10 2:21 ` Junio C Hamano
0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2006-10-10 2:21 UTC (permalink / raw)
To: Luben Tuikov; +Cc: git
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-10-10 2:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-10 1:05 git-revert in branch next Luben Tuikov
-- strict thread matches above, loose matches on Subject: below --
2006-10-10 1:11 Luben Tuikov
2006-10-10 2:21 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox