David Aguilar venit, vidit, dixit 22.05.2011 11:57:
> 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 <davvid@xxxxxxxxx>
> Reported-by: FrÃdÃric Heitzmann <frederic.heitzmann@xxxxxxxxx>
> ---
> git-mergetool--lib.sh | 13 +++++++++++++
> 1 files changed, 13 insertions(+), 0 deletions(-)
>
> diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
> index 4db9212..ece6a08 100644
> --- a/git-mergetool--lib.sh
> +++ b/git-mergetool--lib.sh
> @@ -187,7 +187,9 @@ run_merge_tool () {
> fi
> check_unchanged
> else
> + resolve_git_prefix
> "$merge_tool_path" -R -f -d -c "wincmd l" \
> + -c 'cd $GIT_PREFIX' \
> "$LOCAL" "$REMOTE"
> fi
> ;;
> @@ -198,7 +200,9 @@ run_merge_tool () {
> "$LOCAL" "$MERGED" "$REMOTE"
> check_unchanged
> else
> + resolve_git_prefix
> "$merge_tool_path" -R -f -d -c "wincmd l" \
> + -c 'cd $GIT_PREFIX' \
> "$LOCAL" "$REMOTE"
> fi
> ;;
> @@ -437,3 +441,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
> +}
Hmmm. Maybe we should export "." when there is no prefix? Maybe it's not
too late to change that aspect of GIT_PREFIX. We went through some
iteration back then for !alias.
Michael
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html