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

2016-02-26 Thread Bill Okara
Hi, On Fri, Feb 26, 2016 at 4:50 AM, SZEDER Gábor wrote: > > Please don't top-post on this list. > Sorry about that. Just learned what that means and why it is bad... > Subject: [PATCH] diffcore: fix iteration order of identical files during > rename detection > > If the two paths 'dir/A/file'

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

2016-02-26 Thread SZEDER Gábor
Hi, Please don't top-post on this list. > I guess a bigger concern of this issue is the mess up of history. That > is, even if not doing an merge/update, just doing the 'git mv' will > messed up the file history, as shown in following: > > > // Add a new resources/qa/content.txt files with a ne

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

2016-02-25 Thread Bill Okara
resent, forgot to reply to all... I guess a bigger concern of this issue is the mess up of history. That is, even if not doing an merge/update, just doing the 'git mv' will messed up the file history, as shown in following: // Add a new resources/qa/content.txt files with a new commit message: >

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

2016-02-25 Thread Stefan Beller
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: >> git version 2.6.4 >> >> >> If there are identical files in different subfolders, 'git mv' the >> root folder (and/or each f

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

2016-02-25 Thread Kevin Daudt
On Wed, Feb 24, 2016 at 04:38:11PM -0700, Bill Okara wrote: > 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

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

2016-02-24 Thread Bill Okara
following are the steps to help illustrate the issue. its actually quite common to have projects include identical placeholder files before update/refactoring... // Create in master branch > mkdir gittest > cd gittest > init > mkdir -p gitmvtest/resources > mkdir -p gitmvtest/resources/demo > mkd

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

2016-02-24 Thread Bill Okara
it actually does matter in the following scenario: 1) master branch has identical content.txt files in the folder structure 2) do the git mv in a new branch 3) master branch updated the context.txt to contain new data (more relevant to the containing folder) 4) new branch need to merge the updates

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

2016-02-24 Thread Junio C Hamano
Bill Okara writes: > just want to see if this is a bug, user error (on my end), or?? Not a bug, not a user error, just "it does not matter", I think. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at

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