From: David Aguilar Date: Thu, 26 May 2011 03:37:14 GMT Subject: [PATCH v2 3/3] git-mergetool--lib: Make vimdiff retain the current directory Message-ID: <1306381034-44190-3-git-send-email-davvid@gmail.com> In-Reply-To: <1306381034-44190-1-git-send-email-davvid@gmail.com> When using difftool with vimdiff it can be unexpected that the current directory changes to the root of the project. Tell vim to chdir to the value of $GIT_PREFIX to fix this. Care is taken to quote the variable so that vim expands it. This avoids problems when directory names contain spaces. Signed-off-by: David Aguilar Reported-by: Frédéric Heitzmann --- This version of the patch resolves GIT_PREFIX unconditionally. We did not do so before. git-mergetool--lib.sh | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 4db9212..2cef8a2 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -89,6 +89,7 @@ run_merge_tool () { merge_tool_path="$(get_merge_tool_path "$1")" || exit base_present="$2" status=0 + resolve_git_prefix case "$1" in araxis) @@ -188,6 +189,7 @@ run_merge_tool () { check_unchanged else "$merge_tool_path" -R -f -d -c "wincmd l" \ + -c 'cd $GIT_PREFIX' \ "$LOCAL" "$REMOTE" fi ;; @@ -199,6 +201,7 @@ run_merge_tool () { check_unchanged else "$merge_tool_path" -R -f -d -c "wincmd l" \ + -c 'cd $GIT_PREFIX' \ "$LOCAL" "$REMOTE" fi ;; @@ -437,3 +440,12 @@ get_merge_tool () { fi echo "$merge_tool" } + +resolve_git_prefix() { + # If GIT_PREFIX is empty then we cannot use it in tools + # that expect to be able to chdir() to its value. + if test -z "$GIT_PREFIX"; then + GIT_PREFIX=. + export GIT_PREFIX + fi +} -- 1.7.5.2.660.g9f46