summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-31 19:33:27 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-31 20:30:55 -0800
commite28efb1998bb0b73057de13b9568f6aef439a583 (patch)
treec9770fd614cb3d75eb74e590fc5f1aa813d41f84 /git-am.sh
parente2afb0be9073fbe9f565ad9e952155c0bf7dd7c6 (diff)
downloadgit-e28efb1998bb0b73057de13b9568f6aef439a583.tar.gz
apply: diagnose incomplete submodule object name better
"git am -3" uses this function to build a tree that records how the preimage the patch was created from would have looked like. An abbreviated object name on the index line is ordinarily sufficient for us to figure out the object name the preimage tree would have contained, but a change to a submodule by definition shows an object name of a submodule commit which our repository should not have, and get_sha1_blob() is not an appropriate way to read it (or get_sha1() for that matter). Use get_sha1_hex() and complain if we do not find a full object name there. We could read from the payload part of the patch to learn the full object name of the commit, but the primary user "git rebase" has been fixed to give us a full object name, so this should suffice for now. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
0 files changed, 0 insertions, 0 deletions