diff options
| author |  Richard Hansen <hansenr@google.com> | 2017-01-10 15:42:01 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-01-10 13:22:20 -0800 |
| commit | c1b0d3a010eaed0d7683fe0593132f2211467b20 (patch) | |
| tree | eeef5c61236d6c07cc3a40b650a57653d6b8cfb4 | |
| parent | t7610: add test case for rerere+mergetool+subdir bug (diff) | |
| download | tgif-c1b0d3a010eaed0d7683fe0593132f2211467b20.tar.xz | |
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>
| -rwxr-xr-x | git-mergetool.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 |