@matheusbsbs / matheus-bagliano / commits / b1440cc806
Fork 0

Reword git-am 3-way fallback failure message.

When the blobs recorded on the index lines in the patch as pre-image blobs are not found in the repository, "git-am" punted saying that the index line does not record anything useful. This was not clear enough -- the index line does have something useful but the problem was that it was not useful in _that_ repository. Reword the message as Francis Moreau suggests. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Feb 24, 2007 at 01:05 UTC b1440cc8060e79f885691ebeae7ce033bd606a7c
1 file changed +1 -1
git-am.sh
+1 -1
@@ -66,7 +66,7 @@ fall_back_3way () {
66 git-update-index -z --index-info <"$dotest/patch-merge-index-info" &&
67 GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
68 git-write-tree >"$dotest/patch-merge-base+" ||
69 - cannot_fallback "Patch does not record usable index information."
69 + cannot_fallback "Repository lacks necessary blobs to fall back on 3-way merge."
70
71 echo Using index info to reconstruct a base tree...
72 if GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \