mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix off-by-one error in git-merge

Browse Source 
'git-merge -s' without a strategy name does not fail and does
not give usage as it should.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2005-09-12 22:20:42 -07:00
parent 22c67ca88e
commit f88ed172e7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge.sh
View File

@ -43,7 +43,7 @@ do
case "$#,$1" in case "$#,$1" in
*,*=*) *,*=*)
strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;; strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
0,*) 1,*)
usage ;; usage ;;
*) *)
strategy="$2" strategy="$2"