Re: [PATCH v4 14/14] mergetool: fix running in subdir when rerere enabled

2017-01-10 Thread Johannes Sixt
Am 10.01.2017 um 20:25 schrieb Junio C Hamano: Johannes Sixt writes: BTW, the --sq and eval business is not required here. At this point, $IFS = $'\n', so set -- $(git rev-parse --sq --prefix "$prefix" -- "$@") will do. (Except that it would not detect errors.) I thought you

Re: [PATCH v4 14/14] mergetool: fix running in subdir when rerere enabled

2017-01-10 Thread Junio C Hamano
Johannes Sixt writes: >> +prefix=$(git rev-parse --show-prefix) || exit 1 >> +cd_to_toplevel >> + >> +if test -n "$orderfile" >> +then >> +orderfile=$(git rev-parse --prefix "$prefix" -- "$orderfile") >> || exit 1 >> +orderfile=$(printf %s\\n "$orderfile"

Re: [PATCH v4 14/14] mergetool: fix running in subdir when rerere enabled

2017-01-10 Thread Richard Hansen
On 2017-01-10 01:17, Johannes Sixt wrote: Am 10.01.2017 um 00:29 schrieb Richard Hansen: The pathnames output by the 'git rerere remaining' command are relative to the top-level directory but the 'git diff --name-only' command expects its pathname arguments to be relative to the current working

Re: [PATCH v4 14/14] mergetool: fix running in subdir when rerere enabled

2017-01-09 Thread Johannes Sixt
Am 10.01.2017 um 00:29 schrieb Richard Hansen: The pathnames output by the 'git rerere remaining' command are relative to the top-level directory but the 'git diff --name-only' command expects its pathname arguments to be relative to the current working directory. Run cd_to_toplevel before runni

[PATCH v4 14/14] mergetool: fix running in subdir when rerere enabled

2017-01-09 Thread Richard Hansen
The pathnames output by the 'git rerere remaining' command are relative to the top-level directory but the 'git diff --name-only' command expects its pathname arguments to be relative to the current working directory. Run cd_to_toplevel before running 'git diff --name-only' and adjust any relative