From: Jakub Narebski Date: Fri, 22 Dec 2006 18:05:01 GMT Subject: Re: [PATCH] sha1_name(): accept ':directory/' to get at the cache_tree Message-ID: <200612221905.02915.jnareb@gmail.com> In-Reply-To: Johannes Schindelin wrote: > On Fri, 22 Dec 2006, Jakub Narebski wrote: > >> Junio C Hamano wrote: >> >>> (2) What does this do when the index is unmerged? >> >> I think it should show "git ls-files --unmerged --abbrev", perhaps... > > Nah. I'd rather fail out, saying that because there are unmerged entries, > there is no valid tree in the index. Well, 'git diff' on unmerged IIRC does 'git diff -cc', so why not 'git show :' do 'git ls-files --unmerged --abbrev'... -- Jakub Narebski Poland