Re: git mv messed up file mapping if folders contain identical files

2016-02-26 Thread Bill Okara
/B/file' and, upon > finding identical content and basename, reports an exact rename. > > Restore the original behavior by reversing the order of filling the > hashmap with source entries. > > Reported-by: Bill Okara > Signed-off-by: SZEDER Gábor > --- > diffcore-

Re: git mv messed up file mapping if folders contain identical files

2016-02-25 Thread Bill Okara
thanks, Bill On Thu, Feb 25, 2016 at 6:56 AM, Stefan Beller wrote: > On Thu, Feb 25, 2016 at 3:49 AM, Kevin Daudt wrote: >> On Wed, Feb 24, 2016 at 04:38:11PM -0700, Bill Okara wrote: >>> Hi, >>> >>> I noticed the following 'git mv' issue with: &

Re: git mv messed up file mapping if folders contain identical files

2016-02-24 Thread Bill Okara
merged with data from prod/content.txt > cat gitmvtest/src/main/resources/demo/content.txt This is the line that contains the common content this is PROD content On Wed, Feb 24, 2016 at 4:51 PM, Bill Okara wrote: > it actually does matter in the following scenario: > > 1) master b

Re: git mv messed up file mapping if folders contain identical files

2016-02-24 Thread Bill Okara
updates from master after the merge, demo/content.txt in the new path would contain updates from dev/content.txt from master... On Wed, Feb 24, 2016 at 4:39 PM, Junio C Hamano wrote: > Bill Okara writes: > >> just want to see if this is a bug, user error (on my end), or?? > > Not

git mv messed up file mapping if folders contain identical files

2016-02-24 Thread Bill Okara
Hi, I noticed the following 'git mv' issue with: git version 2.6.4 If there are identical files in different subfolders, 'git mv' the root folder (and/or each file individually) will mess up the file path mapping. that is, if having identical 'content.txt' file under gitmvtest |--demo/conten