diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-02-14 10:29:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-14 10:29:37 -0800 |
| commit | ba56d7057a5da9eb3485391658ba7465c855a8f3 (patch) | |
| tree | a0773d7dc3fcc6c91e1df1fc34098e203bf9e37e | |
| parent | Merge branch 'jk/error-const-return' (diff) | |
| parent | difftool--helper: fix printf usage (diff) | |
| download | tgif-ba56d7057a5da9eb3485391658ba7465c855a8f3.tar.xz | |
Merge branch 'al/mergetool-printf-fix'
* al/mergetool-printf-fix:
difftool--helper: fix printf usage
git-mergetool: print filename when it contains %
| -rwxr-xr-x | git-difftool--helper.sh | 2 | ||||
| -rwxr-xr-x | git-mergetool.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh index 3d0fe0cd93..b00ed95dba 100755 --- a/git-difftool--helper.sh +++ b/git-difftool--helper.sh @@ -40,7 +40,7 @@ launch_merge_tool () { # the user with the real $MERGED name before launching $merge_tool. if should_prompt then - printf "\nViewing: '$MERGED'\n" + printf "\nViewing: '%s'\n" "$MERGED" if use_ext_cmd then printf "Launch '%s' [Y/n]: " \ diff --git a/git-mergetool.sh b/git-mergetool.sh index c0ee9aaf81..332528ff45 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -403,7 +403,7 @@ then fi printf "Merging:\n" -printf "$files\n" +printf "%s\n" "$files" IFS=' ' |