Re: git-merge-recursive segmentation error
- From
Junio C Hamano <junkio@cox.net>
- Date
- Dec 20, 2006, 02:30 UTC
- Message-ID
- <7vpsafmh89.fsf@assigned-by-dhcp.cox.net>
- In-Reply-To
- <7vtzzrmhhd.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano <junkio@cox.net> writes:
Show 9 quoted lines
> Luben Tuikov <ltuikov@yahoo.com> writes: > >> I also ran git-bisect twice over two well known but overlapping >> good-bad regions and I get the same commit as being the culprit. >> It seems to be commit 1510fea781cb0517eeba8c378964f7bc4f9577ab. >> >> Luben > > Ooooooops.
1510fe is buggy and it is my fault.
For now, this _should_ get you keep going.
However, if this fixes it for you, that means we would still have the problem on Cygwin X-<.
-- >8 -- [PATCH] fix populate-filespec
I hand munged the original patch when committing 1510fea78.
Signed-off-by: Junio C Hamano <junkio@cox.net> --- diff.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/diff.c b/diff.c index 9974435..6e6f2a7 100644 --- a/diff.c +++ b/diff.c @@ -1223,7 +1223,7 @@ static int reuse_worktree_file(const char *name, const unsigned char *sha1, int * objects however would tend to be slower as they need * to be individually opened and inflated. */ - if (FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1, NULL)) + if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1, NULL)) return 0; len = strlen(name);
-- 1.4.4.2.g205bf