diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:04:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:04:01 -0800 |
| commit | b79faa99e6c4eac658130c5b6291dc0145164293 (patch) | |
| tree | 4cc1bee7dd2909ccf5f69500533173faf072ccb0 | |
| parent | 75288cc7e120cfcce4b11699d034bcadccdf9344 (diff) | |
| parent | 2a9ccfff5553b8ab28eb5a172738cc9f3afadcd5 (diff) | |
| download | git-b79faa99e6c4eac658130c5b6291dc0145164293.tar.gz git-b79faa99e6c4eac658130c5b6291dc0145164293.tar.xz | |
Merge branch 'al/mergetool-printf-fix' into maint
* 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 3d0fe0cd9..b00ed95db 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 c50e18a89..012afa554 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -440,7 +440,7 @@ then fi printf "Merging:\n" -printf "$files\n" +printf "%s\n" "$files" IFS=' ' |