Re: What's cooking in git.git (Oct 2013, #02; Mon, 14)

2013-10-16 Thread Jens Lehmann
Am 15.10.2013 22:05, schrieb Jonathan Nieder: Jens Lehmann wrote: Am 15.10.2013 21:16, schrieb Jonathan Nieder: So I suspect this will fix more scripts than it breaks, though it may still break some. :/ Hmm, I'm really not sure if we should do this or not. What convinced me was Anders's

Re: What's cooking in git.git (Oct 2013, #02; Mon, 14)

2013-10-15 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: What's cooking in git.git (Oct 2013, #02; Mon, 14) Tying up loose ends before the hand-off. I'll try: - slurping your integration branches, - teasing the topics apart out of your 'pu', - populating my rerere database to match your confict

Re: What's cooking in git.git (Oct 2013, #02; Mon, 14)

2013-10-15 Thread Jonathan Nieder
Junio C Hamano wrote: I'll try: - slurping your integration branches, - teasing the topics apart out of your 'pu', - populating my rerere database to match your confict resolution, - reconstructing the Meta/Reintegrate insn for 'pu', and - rebuilding 'pu' to make sure the end result

Re: What's cooking in git.git (Oct 2013, #02; Mon, 14)

2013-10-15 Thread Jens Lehmann
Am 15.10.2013 02:12, schrieb Jonathan Nieder: * jl/submodule-mv (2013-10-13) 1 commit - mv: Fix spurious warning when moving a file in presence of submodules Moving a regular file in a repository with a .gitmodules file was producing a warning 'Could not find section in .gitmodules where

Re: What's cooking in git.git (Oct 2013, #02; Mon, 14)

2013-10-15 Thread Jens Lehmann
Am 15.10.2013 21:16, schrieb Jonathan Nieder: So I suspect this will fix more scripts than it breaks, though it may still break some. :/ Hmm, I'm really not sure if we should do this or not. It might make sense to warn when passed multiple arguments and some include shell metacharacters,

Re: What's cooking in git.git (Oct 2013, #02; Mon, 14)

2013-10-15 Thread Jonathan Nieder
Jens Lehmann wrote: Am 15.10.2013 21:16, schrieb Jonathan Nieder: So I suspect this will fix more scripts than it breaks, though it may still break some. :/ Hmm, I'm really not sure if we should do this or not. What convinced me was Anders's observation that the current behavior can have

What's cooking in git.git (Oct 2013, #02; Mon, 14)

2013-10-14 Thread Jonathan Nieder
What's cooking in git.git (Oct 2013, #02; Mon, 14) -- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. Tying up loose ends before the hand-off

Re: What's cooking in git.git (Oct 2013, #02; Mon, 14)

2013-10-14 Thread Ramkumar Ramachandra
Jonathan Nieder wrote: What's cooking in git.git (Oct 2013, #02; Mon, 14) Could you have a look at the minor f-e-r enhancement I posted? [1] Thanks. [1]: http://thread.gmane.org/gmane.comp.version-control.git/235483 -- To unsubscribe from this list: send the line unsubscribe git in the body