Re: [BUG] All files in folder are moved when cherry-picking commit that moves fewer files

Elijah Newren writes: > I'm not sure I'm following well enough to answer any your question(s), > so I'll instead ask a few of my own: > * Are you referring to stage #2 and stage #3 of the old path or the > new path or one of each or both of each? If they moved the sole neighbouring file X/A to

Re: [BUG] All files in folder are moved when cherry-picking commit that moves fewer files

Elijah Newren writes: > I'm not sure I'm following well enough to answer any your question(s), > so I'll instead ask a few of my own: > * Are you referring to stage #2 and stage #3 of the old path or the > new path or one of each or both of each? If they moved the sole neighbouring file X/A to

Re: [BUG] All files in folder are moved when cherry-picking commit that moves fewer files

On Tue, Mar 5, 2019 at 8:43 PM Junio C Hamano wrote: > Elijah Newren writes: > > > Note that there is also a third possibility here: > > > > C) There are different answers depending on the context and content > > that cannot be determined by git, so this is a conflict. Use a > > high

Re: [BUG] All files in folder are moved when cherry-picking commit that moves fewer files

Elijah Newren writes: > Note that there is also a third possibility here: > > C) There are different answers depending on the context and content > that cannot be determined by git, so this is a conflict. Use a > higher stage in the index to record the conflict and notify the >

Re: [BUG] All files in folder are moved when cherry-picking commit that moves fewer files

On Sat, Mar 2, 2019 at 5:33 PM Junio C Hamano wrote: > > Elijah Newren writes: > > > Whatever we choose for the default could be tweaked by some new option > > (e.g. make it less noisy or don't mark such paths as conflicted if the > > user has explicitly stated their preference for or against dir

Re: [BUG] All files in folder are moved when cherry-picking commit that moves fewer files

Elijah Newren writes: > Whatever we choose for the default could be tweaked by some new option > (e.g. make it less noisy or don't mark such paths as conflicted if the > user has explicitly stated their preference for or against directory > rename detection). I'm struggling to see directory rena

Re: [BUG] All files in folder are moved when cherry-picking commit that moves fewer files

Hi Junio, On Thu, Feb 28, 2019 at 6:52 PM Junio C Hamano wrote: > > As you know that I've always been skeptical to this rename-directory > business, this probably won't come as a surprise, but I seriously > think directory renames should be made opt-in, and as a separate > option, making the opti

Re: [BUG] All files in folder are moved when cherry-picking commit that moves fewer files

As you know that I've always been skeptical to this rename-directory business, this probably won't come as a surprise, but I seriously think directory renames should be made opt-in, and as a separate option, making the option three-way. I.e. - do we do any renames (yes/no)? - if we do do renam

RE: [BUG] All files in folder are moved when cherry-picking commit that moves fewer files

illip Wood ; Linus Nilsson ; git@vger.kernel.org Subject: Re: [BUG] All files in folder are moved when cherry-picking commit that moves fewer files On Wed, Feb 27, 2019 at 8:40 AM Jeff King wrote: > > On Wed, Feb 27, 2019 at 08:02:35AM -0800, Elijah Newren wrote: > > > > > I

Re: [BUG] All files in folder are moved when cherry-picking commit that moves fewer files

On Wed, Feb 27, 2019 at 8:40 AM Jeff King wrote: > > On Wed, Feb 27, 2019 at 08:02:35AM -0800, Elijah Newren wrote: > > > > > I have found what I suspect to be a bug, or at least not desirable > > > > behavior in my case. In one branch, I have moved all files in a > > > > directory to another dire

Re: [BUG] All files in folder are moved when cherry-picking commit that moves fewer files

On Wed, Feb 27, 2019 at 08:02:35AM -0800, Elijah Newren wrote: > > > I have found what I suspect to be a bug, or at least not desirable > > > behavior in my case. In one branch, I have moved all files in a > > > directory to another directory. The first directory is now empty > > > in this branch

Re: [BUG] All files in folder are moved when cherry-picking commit that moves fewer files

Hi, On Wed, Feb 27, 2019 at 6:30 AM Phillip Wood wrote: > > Hi Linus > > On 27/02/2019 12:47, Linus Nilsson wrote: > > Hi > > > > I have found what I suspect to be a bug, or at least not desirable behavior > > in my case. In one branch, I have moved all files in a directory to another > > direc

Re: [BUG] All files in folder are moved when cherry-picking commit that moves fewer files

Hi Linus On 27/02/2019 12:47, Linus Nilsson wrote: Hi I have found what I suspect to be a bug, or at least not desirable behavior in my case. In one branch, I have moved all files in a directory to another directory. The first directory is now empty in this branch (I haven't tested whether this

[BUG] All files in folder are moved when cherry-picking commit that moves fewer files

Hi I have found what I suspect to be a bug, or at least not desirable behavior in my case. In one branch, I have moved all files in a directory to another directory. The first directory is now empty in this branch (I haven't tested whether this is significant). I cherry-picked the commit to ano