diff options
author | Junio C Hamano <junkio@cox.net> | 2007-02-24 01:05:27 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-02-24 01:06:19 -0800 |
commit | b1440cc8060e79f885691ebeae7ce033bd606a7c (patch) | |
tree | 3814718e45ebb948d423e24c41ca71fd565be12a | |
parent | c06d2daa12f72f175e3569bbb2a5f25e5f134f5e (diff) | |
download | git-b1440cc8060e79f885691ebeae7ce033bd606a7c.tar.gz git-b1440cc8060e79f885691ebeae7ce033bd606a7c.tar.xz |
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>
-rwxr-xr-x | git-am.sh | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -66,7 +66,7 @@ fall_back_3way () { 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+" || - cannot_fallback "Patch does not record usable index information." + cannot_fallback "Repository lacks necessary blobs to fall back on 3-way merge." echo Using index info to reconstruct a base tree... if GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ |