From: Richard Hansen <hansenr@google.com>
Date: Tue, 10 Jan 2017 20:42:01 +0000 (-0500)
Subject: mergetool: take the "-O" out of $orderfile
X-Git-Tag: v2.12.0-rc0~60^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c1b0d3a010eaed0d7683fe0593132f2211467b20?ds=inline;hp=--cc

mergetool: take the "-O" out of $orderfile

This will make it easier for a future commit to convert a relative
orderfile pathname to either absolute or relative to the top-level
directory.  It also improves code readability.

Signed-off-by: Richard Hansen <hansenr@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

c1b0d3a010eaed0d7683fe0593132f2211467b20
diff --git a/git-mergetool.sh b/git-mergetool.sh
index e52b4e4f24..b506896dc1 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -421,7 +421,7 @@ main () {
 			prompt=true
 			;;
 		-O*)
-			orderfile="$1"
+			orderfile="${1#-O}"
 			;;
 		--)
 			shift
@@ -465,7 +465,7 @@ main () {
 
 	files=$(git -c core.quotePath=false \
 		diff --name-only --diff-filter=U \
-		${orderfile:+"$orderfile"} -- "$@")
+		${orderfile:+"-O$orderfile"} -- "$@")
 
 	cd_to_toplevel