diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-14 21:54:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-17 17:41:54 -0700 |
| commit | 22943f1a52142b0ef669c959f8b4367e579da968 (patch) | |
| tree | fb07c36540f2d1deaff3b7c371d5e40dcb5b1acf /git-am.sh | |
| parent | 4f6fbcdcf960b5afaeb2f5010be61b919c1805fd (diff) | |
| download | git-22943f1a52142b0ef669c959f8b4367e579da968.tar.gz git-22943f1a52142b0ef669c959f8b4367e579da968.tar.xz | |
Update git-apply to use C-style quoting for funny pathnames.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -35,10 +35,10 @@ fall_back_3way () { mkdir "$dotest/patch-merge-tmp-dir" # First see if the patch records the index info that we can use. - if git-apply --show-index-info "$dotest/patch" \ + if git-apply -z --index-info "$dotest/patch" \ >"$dotest/patch-merge-index-info" 2>/dev/null && GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ - git-update-index --index-info <"$dotest/patch-merge-index-info" && + git-update-index -z --index-info <"$dotest/patch-merge-index-info" && GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ git-write-tree >"$dotest/patch-merge-base+" && # index has the base tree now. |