Re: [RFC/PATCH 00/18] Add --index-only option to git merge

2016-04-09 Thread Elijah Newren
On Thu, Apr 7, 2016 at 11:58 PM, Elijah Newren wrote: > Luckily, I figured out that bug. So, that leaves just one case left > that I can't seem to figure out: read_tree_trivial. So much better, > right? Even it's name is sitting there, mocking me. "Ha ha, I'm > read_tree_*trivial* and

Re: [RFC/PATCH 00/18] Add --index-only option to git merge

2016-04-08 Thread Junio C Hamano
Elijah Newren writes: > On Fri, Apr 8, 2016 at 11:08 AM, Junio C Hamano wrote: >> Elijah Newren writes: >> >> The goal is stated rather vaguely--when you have a working tree and >> perform this "in index" merge, you would obviously update the index >> with the merge result and ... > > Yes, I th

Re: [RFC/PATCH 00/18] Add --index-only option to git merge

2016-04-08 Thread Elijah Newren
On Fri, Apr 8, 2016 at 6:01 AM, Michael J Gruber wrote: > I haven't looked at your series thoroughly but immediately had to think > of 'tr/remerge-diff' (on 'pu'), see > http://permalink.gmane.org/gmane.comp.version-control.git/256591 > > There, Thomas used index-only merge to reproduce an automat

Re: [RFC/PATCH 00/18] Add --index-only option to git merge

2016-04-08 Thread Elijah Newren
Hi, On Fri, Apr 8, 2016 at 11:08 AM, Junio C Hamano wrote: > Elijah Newren writes: > > The goal is stated rather vaguely--when you have a working tree and > perform this "in index" merge, you would obviously update the index > with the merge result and ... Yes, I think you hit the nail on the h

Re: [RFC/PATCH 00/18] Add --index-only option to git merge

2016-04-08 Thread Junio C Hamano
Elijah Newren writes: > This patch series adds an --index-only flag to git merge, the idea > being to allow a merge to be performed entirely in the index without > touching (or even needing) a working tree. The goal is stated rather vaguely--when you have a working tree and perform this "in inde

Re: [RFC/PATCH 00/18] Add --index-only option to git merge

2016-04-08 Thread Michael J Gruber
Elijah Newren venit, vidit, dixit 08.04.2016 08:58: > This patch series adds an --index-only flag to git merge, the idea > being to allow a merge to be performed entirely in the index without > touching (or even needing) a working tree. > > The core fix, to merge-recursive, was actually quite easy

[RFC/PATCH 00/18] Add --index-only option to git merge

2016-04-07 Thread Elijah Newren
This patch series adds an --index-only flag to git merge, the idea being to allow a merge to be performed entirely in the index without touching (or even needing) a working tree. The core fix, to merge-recursive, was actually quite easy. The recursive merge logic already had the ability to ignore