{"thread":{"id":"37335","subject":"git-status rename conflict with a few git-adds following a git-mv (git for windows 1.9.4)","startedAt":"2014-08-12T09:48:53Z","lastAt":"2014-08-12T09:48:53Z","messageCount":1,"participants":["Panos Rontogiannis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"247604","messageId":"DUB121-W21E71C6BC416DC373C068388EA0@phx.gbl","threadId":"37335","inReplyTo":null,"subject":"git-status rename conflict with a few git-adds following a git-mv (git for windows 1.9.4)","fromName":"Panos Rontogiannis","fromEmail":"p_ronto@hotmail.com","sentAt":"2014-08-12T09:48:53Z","receivedAt":"2014-08-12T09:48:53Z","isPatch":false,"sender":{"key":"p_ronto@hotmail.com","avatar":null},"body":"Hello all,\n\nI noticed a weird rename conflict after doing the following steps:\n   1. Changing the extension of a file using 'git mv'.\n   2. Editing the file and staging the changes.\n   3. Creating a new file and staging it.\n\nHere is the Git Bash output showing the issue. The previously mentioned steps are highlighted with asterisks.\n\n$ git --version\ngit version 1.9.4.msysgit.0\n\n$ git status\nOn branch master\nYour branch is up-to-date with 'origin/master'.\n\nnothing to commit, working directory clean\n\n**** STEP 1 ****\n\n$ git mv src/documents/contact.html.md src/documents/contact.html.md.eco\n\n$ git status\nOn branch master\nYour branch is up-to-date with 'origin/master'.\n\nChanges to be committed:\n  (use \"git reset HEAD <file>...\" to unstage)\n\n        renamed:    src/documents/contact.html.md -> src/documents/contact.html.md.eco\n\n**** STEP 2 ****\n\n$ git status\nOn branch master\nYour branch is up-to-date with 'origin/master'.\n\nChanges to be committed:\n  (use \"git reset HEAD <file>...\" to unstage)\n\n        renamed:    src/documents/contact.html.md -> src/documents/contact.html.md.eco\n\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git checkout -- <file>...\" to discard changes in working directory)\n\n        modified:   src/documents/contact.html.md.eco\n\n\n$ git add src/documents/contact.html.md.eco\n\n$ git status\nOn branch master\nYour branch is up-to-date with 'origin/master'.\n\nChanges to be committed:\n  (use \"git reset HEAD <file>...\" to unstage)\n\n        deleted:    src/documents/contact.html.md\n        new file:   src/documents/contact.html.md.eco\n\n**** STEP 3 ****\n\n$ git status\nOn branch master\nYour branch is up-to-date with 'origin/master'.\n\nChanges to be committed:\n  (use \"git reset HEAD <file>...\" to unstage)\n\n        deleted:    src/documents/contact.html.md\n        new file:   src/documents/contact.html.md.eco\n\nUntracked files:\n  (use \"git add <file>...\" to include in what will be committed)\n\n        src/partials/address.html.md\n\n\n$ git add src/partials/address.html.md\n\n$ git status\nOn branch master\nYour branch is up-to-date with 'origin/master'.\n\nChanges to be committed:\n  (use \"git reset HEAD <file>...\" to unstage)\n\n        new file:   src/documents/contact.html.md.eco\n        renamed:    src/documents/contact.html.md -> src/partials/address.html.md\n\n\nNote here that the renamed object is wrong. Also note that I haven't commited the changes to the repo. \n\nThe repo is cloned from \"https://github.com/prontog/elm\".\n\nRegards,\n\nPanos\n  \t\t \t   \t\t  "}]}