[ISSUE RESOLVED] Problems with threeway diff, checkout-cache and permissions of two blobs

From: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
Date: May 6, 2005, 11:17 UTC
Message-ID: <20050506111746.GE11506@cip.informatik.uni-erlangen.de>

Hello,

	[ *** ISSUE RESOLVED: Doesn't happen with GIT HEAD *** ]

The following issue is resolved. Just if someone hits the same problem:

I did a merge with two conflicts, which can AFAIK automatically be resolved. However if I call 'git-checkout-cache -f -a' it fails on me:

	(faui01) [~/work/mutt/git/mutt-tg] git pull ../mutt-cstatus
	head => 8aa9f8e95f17213a583d28bbc80d15bba01a375d
	remote => b54cf35a50e50a8e1bf09f79b714d0f18c8f3c92
	base => e8f4a291a81f0a8fb24555f0e36e4b75e2d3f4c8
	curs_main.c: unmerged (ff55f1869b953acb2ec816569470e4adb3421c1d)
	curs_main.c: unmerged (b5c5275ead8882ed37205b92b2bc88f7799c2ac8)
	curs_main.c: unmerged (335c5c978ac580b95168916deb297fb254592079)
	protos.h: unmerged (3cda50538b733826e37cd35734e68755173f080c)
	protos.h: unmerged (011d63023a7f1d718f90d87a4933c6f50d0fb1de)
	protos.h: unmerged (66324e580002ebd6c9d974c4873cc215b6478029)
	fatal: write-tree: not able to write tree
	Threewaydiff invloved.
	<<
This is the error I get from git-checkout-cache the first time:

	fatal: internal error: ce_mode is 644
	git-checkout-cache failed: child exit value: 1 at /home/cip/adm/sithglan/work/git/yagf/git line 942.
	(faui01) [~/work/mutt/git/mutt-tg] git-ls-tree HEAD | grep ^0 | grep blob
	000644 blob d43160b921f037dc45dba6cf80dd22520ac17c7e curs_main.c
	000644 blob 210fe03ed3004c45b9548c7f7d1e011bb216c468 protos.h
Note    ^ while every else this is '1' for files.

	(faui01) [~/work/mutt/git/mutt-tg] rm -rf *
	(faui01) [~/work/mutt/git/mutt-tg] git-read-tree HEAD
	(faui01) [~/work/mutt/git/mutt-tg] git-checkout-cache -f -a
	error: checkout-cache: unknown file mode for curs_main.c

	Thomas