Re: What's cooking in git.git (Sep 2011, #04; Mon, 12)

From: Jonathon Mah <me@jonathonmah.com>
Date: Sep 14, 2011, 02:34 UTC
Message-ID: <D3CA81F2-647B-4AD0-A4FC-4C22772FD791@JonathonMah.com>
In-Reply-To: <7vipox2wd6.fsf@alter.siamese.dyndns.org>

On 2011-09-12, at 14:59, Junio C Hamano wrote:

Show 14 quoted lines

>> [Stalled]
>> 
>> * jm/mergetool-pathspec (2011-06-22) 2 commits
>> - mergetool: Don't assume paths are unmerged
>> - mergetool: Add tests for filename with whitespace
>> 
>> I think this is a good idea, but it probably needs a re-roll.
>> Cf. $gmane/176254, 176255, 166256
> 
> What's the plan for this series? Do we still want to pursue it within the
> timeframe for the next round?
> 
> Is there any mergetool/difftool expert who volunteers to help moving this
> topic forward?

I'd love this to stay alive. As I've mentioned before, my relationship with shell is tenuous. My biggest problem is I don't have a mental model of how quoting works, so I end up writing tests and performing trial-and-error until it works.

On 2011-06-22, at 14:33, Junio C Hamano wrote:

> Why do you need a loop here in the else clause, instead of just a single:
> 
> 	files=$(git ls-files -u -- "$@" |...)

See above (the dumb loop isn't necessary; your suggestion is much better). Should I bother re-submitting with just this change?

Jonathon Mah me@JonathonMah.com