Browse Source

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>
maint
Junio C Hamano 18 years ago
parent
commit
96779be48a
  1. 4
      git-revert.sh

4
git-revert.sh

@ -7,9 +7,11 @@
case "$0" in case "$0" in
*-revert* ) *-revert* )
test -t 0 && edit=-e test -t 0 && edit=-e
replay=
me=revert me=revert
USAGE='[--edit | --no-edit] [-n] <commit-ish>' ;; USAGE='[--edit | --no-edit] [-n] <commit-ish>' ;;
*-cherry-pick* ) *-cherry-pick* )
replay=t
edit= edit=
me=cherry-pick me=cherry-pick
USAGE='[--edit] [-n] [-r] [-x] <commit-ish>' ;; USAGE='[--edit] [-n] [-r] [-x] <commit-ish>' ;;
@ -18,7 +20,7 @@ case "$0" in
esac esac
. git-sh-setup . git-sh-setup


no_commit= replay=t no_commit=
while case "$#" in 0) break ;; esac while case "$#" in 0) break ;; esac
do do
case "$1" in case "$1" in

Loading…
Cancel
Save