git-commit: allow -e option anywhere on command line
Previously, the command 'git-commit -e -m foo' would ignore the '-e' option because the '-m' option overwrites the no_edit flag during sequential option parsing. Now we cause -e to reset the no_edit flag after all options are parsed. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:

committed by
Junio C Hamano

parent
8d3cbd27d4
commit
cda8ab59bb
@ -199,6 +199,7 @@ only=
|
|||||||
logfile=
|
logfile=
|
||||||
use_commit=
|
use_commit=
|
||||||
amend=
|
amend=
|
||||||
|
edit_flag=
|
||||||
no_edit=
|
no_edit=
|
||||||
log_given=
|
log_given=
|
||||||
log_message=
|
log_message=
|
||||||
@ -246,7 +247,7 @@ do
|
|||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
-e|--e|--ed|--edi|--edit)
|
-e|--e|--ed|--edi|--edit)
|
||||||
no_edit=
|
edit_flag=t
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
-i|--i|--in|--inc|--incl|--inclu|--includ|--include)
|
-i|--i|--in|--inc|--incl|--inclu|--includ|--include)
|
||||||
@ -384,6 +385,7 @@ $1"
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
case "$edit_flag" in t) no_edit= ;; esac
|
||||||
|
|
||||||
################################################################
|
################################################################
|
||||||
# Sanity check options
|
# Sanity check options
|
||||||
|
Reference in New Issue
Block a user