summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-06 00:13:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-02-06 00:13:12 (GMT)
commit6d81ce0543c2fb7177c08491ba31a69aa54b7930 (patch)
tree6ef8352fb4ee054fca615d4b525bfa43c50b5686 /git-am.sh
parent15778842bd5a63a2550c3d213b157823610a4f08 (diff)
parente28efb1998bb0b73057de13b9568f6aef439a583 (diff)
downloadgit-6d81ce0543c2fb7177c08491ba31a69aa54b7930.zip
git-6d81ce0543c2fb7177c08491ba31a69aa54b7930.tar.gz
git-6d81ce0543c2fb7177c08491ba31a69aa54b7930.tar.bz2
Merge branch 'jc/fake-ancestor-with-non-blobs'
Rebasing the history of superproject with change in the submodule was broken since v1.7.12. * jc/fake-ancestor-with-non-blobs: apply: diagnose incomplete submodule object name better apply: simplify build_fake_ancestor() git-am: record full index line in the patch used while rebasing
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index b4d95f5..202130f 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -664,7 +664,7 @@ do
sed -e '1,/^$/d' >"$dotest/msg-clean"
echo "$commit" >"$dotest/original-commit"
get_author_ident_from_commit "$commit" >"$dotest/author-script"
- git diff-tree --root --binary "$commit" >"$dotest/patch"
+ git diff-tree --root --binary --full-index "$commit" >"$dotest/patch"
else
git mailinfo $keep $no_inbody_headers $scissors $utf8 "$dotest/msg" "$dotest/patch" \
<"$dotest/$msgnum" >"$dotest/info" ||