{"thread":{"id":"24171","subject":"Uncommitted source and header files disappeared after a git mv operation","startedAt":"2010-06-23T10:24:23Z","lastAt":"2010-06-23T11:23:35Z","messageCount":6,"participants":["Laszlo Papp","Santi Béjar","Mahesh Vaidya","Matthieu Moy"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"144060","messageId":"AANLkTiloMDccUDObmPXPGWI_HYVDMk57EoHxZjFUiSvi@mail.gmail.com","threadId":"24171","inReplyTo":"AANLkTikeW1-Kzdyu1APSqzKGsNnny6InueWluXsKMccU@mail.gmail.com","subject":"Uncommitted source and header files disappeared after a git mv operation","fromName":"Laszlo Papp","fromEmail":"djszapi@archlinux.us","sentAt":"2010-06-23T10:24:23Z","receivedAt":"2010-06-23T10:24:23Z","isPatch":false,"sender":{"key":"djszapi@archlinux.us","avatar":null},"body":"Hello,\n\nI have got a very big trouble, so please help me if you can :(\n\nI have done a git mv operation for a whole directory, so I have put it\ninto another subfolder and all my uncommitted/unpushed source and\nheader files were lost ... How can I regain them ?\n\nSo I did \"git mv some-directory-containing-lots-of-uncommitted-changes\ntotal_different_folder/some-new-name\". If I remember well then I did\ncommit/push for that git mv operation.\n\ngit status doesn't show my changes either. Do I have any chance to\navoid so that my boss fires me ?\n\nBest Regards,\nLaszlo Papp\n"},{"id":"144061","messageId":"AANLkTilNI0lq0rUqvUIdNRpubNUNqKf3_5nX3TGauvQv@mail.gmail.com","threadId":"24171","inReplyTo":"AANLkTiloMDccUDObmPXPGWI_HYVDMk57EoHxZjFUiSvi@mail.gmail.com","subject":"Re: Uncommitted source and header files disappeared after a git mv operation","fromName":"Santi Béjar","fromEmail":"santi@agolina.net","sentAt":"2010-06-23T10:31:56Z","receivedAt":"2010-06-23T10:31:56Z","isPatch":false,"sender":{"key":"santi@agolina.net","avatar":null},"body":"On Wed, Jun 23, 2010 at 12:24 PM, Laszlo Papp wrote:\n> Hello,\n>\n> I have got a very big trouble, so please help me if you can :(\n>\n> I have done a git mv operation for a whole directory, so I have put it\n> into another subfolder and all my uncommitted/unpushed source and\n> header files were lost ... How can I regain them ?\n>\n> So I did \"git mv some-directory-containing-lots-of-uncommitted-changes\n> total_different_folder/some-new-name\". If I remember well then I did\n> commit/push for that git mv operation.\n>\n> git status doesn't show my changes either.\n\nI can't reproduce it. Can you provide a test case so we can reproduce\nit. Additionally you should tell us more information, like git\nversion, architecture.\n\nSanti\n"},{"id":"144062","messageId":"AANLkTinernf5BMowVb-iJZi0c9d6SlsGSoy2L3p4H-3E@mail.gmail.com","threadId":"24171","inReplyTo":"AANLkTilNI0lq0rUqvUIdNRpubNUNqKf3_5nX3TGauvQv@mail.gmail.com","subject":"Re: Uncommitted source and header files disappeared after a git mv operation","fromName":"Laszlo Papp","fromEmail":"djszapi@archlinux.us","sentAt":"2010-06-23T10:34:07Z","receivedAt":"2010-06-23T10:34:07Z","isPatch":false,"sender":{"key":"djszapi@archlinux.us","avatar":null},"body":"On Wed, Jun 23, 2010 at 12:31 PM, Santi Béjar wrote:\n> On Wed, Jun 23, 2010 at 12:24 PM, Laszlo Papp wrote:\n>> Hello,\n>>\n>> I have got a very big trouble, so please help me if you can :(\n>>\n>> I have done a git mv operation for a whole directory, so I have put it\n>> into another subfolder and all my uncommitted/unpushed source and\n>> header files were lost ... How can I regain them ?\n>>\n>> So I did \"git mv some-directory-containing-lots-of-uncommitted-changes\n>> total_different_folder/some-new-name\". If I remember well then I did\n>> commit/push for that git mv operation.\n>>\n>> git status doesn't show my changes either.\n>\n> I can't reproduce it. Can you provide a test case so we can reproduce\n> it. Additionally you should tell us more information, like git\n> version, architecture.\n>\n> Santi\n>\n\nhttp://www.archlinux.org/packages/extra/i686/git/\n\nSo the version is 1.7.1 and the architecture is i686.\n\nI have tried the following commands:\ngit log -1\ngit log -1 --stat\ngit reflog\n\nOnly this commit happened and I can't find the files in the new directory.\n\nBest Regards,\nLaszlo Papp\n"},{"id":"144063","messageId":"AANLkTimi_kN_i2XmKiCB4JdqGD4_kFSjIbajtvpBWnwE@mail.gmail.com","threadId":"24171","inReplyTo":"AANLkTinernf5BMowVb-iJZi0c9d6SlsGSoy2L3p4H-3E@mail.gmail.com","subject":"Re: Uncommitted source and header files disappeared after a git mv operation","fromName":"Mahesh Vaidya","fromEmail":"forvaidya@gmail.com","sentAt":"2010-06-23T10:47:31Z","receivedAt":"2010-06-23T10:47:31Z","isPatch":false,"sender":{"key":"forvaidya@gmail.com","avatar":null},"body":"That means those files were not added to index ;\nEven that private files should stay intact\n\nI have done following test case\nPWD - lowflow\ntouch foo bar car\ncd ..\ngit mv lowflow workflow\ngit commit -m \"mv test\" -a\ngit push\ncd workflow # Uncommited files visible\n\n\nOn Wed, Jun 23, 2010 at 4:04 PM, Laszlo Papp wrote:\n> On Wed, Jun 23, 2010 at 12:31 PM, Santi Béjar wrote:\n>> On Wed, Jun 23, 2010 at 12:24 PM, Laszlo Papp wrote:\n>>> Hello,\n>>>\n>>> I have got a very big trouble, so please help me if you can :(\n>>>\n>>> I have done a git mv operation for a whole directory, so I have put it\n>>> into another subfolder and all my uncommitted/unpushed source and\n>>> header files were lost ... How can I regain them ?\n>>>\n>>> So I did \"git mv some-directory-containing-lots-of-uncommitted-changes\n>>> total_different_folder/some-new-name\". If I remember well then I did\n>>> commit/push for that git mv operation.\n>>>\n>>> git status doesn't show my changes either.\n>>\n>> I can't reproduce it. Can you provide a test case so we can reproduce\n>> it. Additionally you should tell us more information, like git\n>> version, architecture.\n>>\n>> Santi\n>>\n>\n> http://www.archlinux.org/packages/extra/i686/git/\n>\n> So the version is 1.7.1 and the architecture is i686.\n>\n> I have tried the following commands:\n> git log -1\n> git log -1 --stat\n> git reflog\n>\n> Only this commit happened and I can't find the files in the new directory.\n>\n> Best Regards,\n> Laszlo Papp\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n>\n\n\n\n-- \nThank you and best regards.\nMahesh Vaidya / 9740500144\nhttp://www.twitter.com/forvaidya\n"},{"id":"144064","messageId":"AANLkTim8TblD_TUpmGR2vCjQnXMfK4WAFA3dh39dloAs@mail.gmail.com","threadId":"24171","inReplyTo":"AANLkTilNI0lq0rUqvUIdNRpubNUNqKf3_5nX3TGauvQv@mail.gmail.com","subject":"Re: Uncommitted source and header files disappeared after a git mv operation","fromName":"Laszlo Papp","fromEmail":"djszapi@archlinux.us","sentAt":"2010-06-23T10:50:24Z","receivedAt":"2010-06-23T10:50:24Z","isPatch":false,"sender":{"key":"djszapi@archlinux.us","avatar":null},"body":"I had some news.\n\nI have just checked the bash history on linux, which doesn't contain\nany intereting, but I have just realised the situation now, so the\nfollowing happened:\n\n1) So the uncommitted files were on windows\n2) I renamed the whole directory under linux.\n3) I pushed the changes under linux\n4) At last I did a git pull under windows.\n\nThe files disappeared on windows and they weren't committed :(\n\nI use this versions on windows:\nMySYSGIT: http://code.google.com/p/msysgit/downloads/detail?name=msysGit-fullinstall-1.7.1-preview20100612.exe&can=2&q=\nTortoiseGIT:\nhttp://code.google.com/p/tortoisegit/downloads/detail?name=TortoiseGit-1.5.2.0-32bit.msi&can=2&q=\n\nBest Regards,\nLaszlo Papp\n"},{"id":"144067","messageId":"vpqwrtqf0w8.fsf@bauges.imag.fr","threadId":"24171","inReplyTo":"AANLkTim8TblD_TUpmGR2vCjQnXMfK4WAFA3dh39dloAs@mail.gmail.com","subject":"Re: Uncommitted source and header files disappeared after a git mv operation","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2010-06-23T11:23:35Z","receivedAt":"2010-06-23T11:23:35Z","isPatch":false,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Laszlo Papp writes:\n\n> I had some news.\n>\n> I have just checked the bash history on linux, which doesn't contain\n> any intereting, but I have just realised the situation now, so the\n> following happened:\n>\n> 1) So the uncommitted files were on windows\n> 2) I renamed the whole directory under linux.\n> 3) I pushed the changes under linux\n> 4) At last I did a git pull under windows.\n\nAre you sure the files are not where they used to be (i.e. under the\ndirectory name used before renaming)?\n\nGit usually takes great care not to touch untracked files. I'd be very\nsurprised if it did for you.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"}]}