| commit | 0424138d5715dbf8605bacfbd22210aac85a1a8f | |
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 2 Apr 2007 04:13:27 +0000 (1 21:13 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 5 Apr 2007 22:07:16 +0000 (5 15:07 -0700) | ||
| tree | d3e540a33cad4074ceb50f04e8b5a2b3bb6c5fc8 | treesnapshot (tar.gz zip) |
| parent | b18825876ae60e67e646097945c8365779175ee2 | commitdiff |
Fix bogus error message from merge-recursive error path
This error message should not usually trigger, but the function
make_cache_entry() called by add_cacheinfo() can return early
without calling into refresh_cache_entry() that sets cache_errno.
Also the error message had a wrong function name reported, and
it did not say anything about which path failed either.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This error message should not usually trigger, but the function
make_cache_entry() called by add_cacheinfo() can return early
without calling into refresh_cache_entry() that sets cache_errno.
Also the error message had a wrong function name reported, and
it did not say anything about which path failed either.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| cache.h | diffblobblamehistory | |
| merge-recursive.c | diffblobblamehistory | |
| read-cache.c | diffblobblamehistory |