diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-07 15:14:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-07 15:14:22 -0800 |
| commit | 427c6d0caf0caee5ad2c4925910a6b8ebcf95408 (patch) | |
| tree | ea73fd905a86866dfb95976b13f2e1cda00bbd67 /git-am.sh | |
| parent | 45bb6cbb49699a64196ed866c4809cd8267bd481 (diff) | |
| parent | e28efb1998bb0b73057de13b9568f6aef439a583 (diff) | |
| download | git-427c6d0caf0caee5ad2c4925910a6b8ebcf95408.tar.gz git-427c6d0caf0caee5ad2c4925910a6b8ebcf95408.tar.xz | |
Merge branch 'jc/fake-ancestor-with-non-blobs' into maint
Rebasing the history of superproject with change in the submodule
has been 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-x | git-am.sh | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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" || |