* Uncommitted source and header files disappeared after a git mv operation
[not found] <AANLkTikeW1-Kzdyu1APSqzKGsNnny6InueWluXsKMccU@mail.gmail.com>
@ 2010-06-23 10:24 ` Laszlo Papp
2010-06-23 10:31 ` Santi Béjar
0 siblings, 1 reply; 6+ messages in thread
From: Laszlo Papp @ 2010-06-23 10:24 UTC (permalink / raw)
To: git
Hello,
I have got a very big trouble, so please help me if you can :(
I have done a git mv operation for a whole directory, so I have put it
into another subfolder and all my uncommitted/unpushed source and
header files were lost ... How can I regain them ?
So I did "git mv some-directory-containing-lots-of-uncommitted-changes
total_different_folder/some-new-name". If I remember well then I did
commit/push for that git mv operation.
git status doesn't show my changes either. Do I have any chance to
avoid so that my boss fires me ?
Best Regards,
Laszlo Papp
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Uncommitted source and header files disappeared after a git mv operation
2010-06-23 10:24 ` Uncommitted source and header files disappeared after a git mv operation Laszlo Papp
@ 2010-06-23 10:31 ` Santi Béjar
2010-06-23 10:34 ` Laszlo Papp
2010-06-23 10:50 ` Laszlo Papp
0 siblings, 2 replies; 6+ messages in thread
From: Santi Béjar @ 2010-06-23 10:31 UTC (permalink / raw)
To: Laszlo Papp; +Cc: git
On Wed, Jun 23, 2010 at 12:24 PM, Laszlo Papp <djszapi@archlinux.us> wrote:
> Hello,
>
> I have got a very big trouble, so please help me if you can :(
>
> I have done a git mv operation for a whole directory, so I have put it
> into another subfolder and all my uncommitted/unpushed source and
> header files were lost ... How can I regain them ?
>
> So I did "git mv some-directory-containing-lots-of-uncommitted-changes
> total_different_folder/some-new-name". If I remember well then I did
> commit/push for that git mv operation.
>
> git status doesn't show my changes either.
I can't reproduce it. Can you provide a test case so we can reproduce
it. Additionally you should tell us more information, like git
version, architecture.
Santi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Uncommitted source and header files disappeared after a git mv operation
2010-06-23 10:31 ` Santi Béjar
@ 2010-06-23 10:34 ` Laszlo Papp
2010-06-23 10:47 ` Mahesh Vaidya
2010-06-23 10:50 ` Laszlo Papp
1 sibling, 1 reply; 6+ messages in thread
From: Laszlo Papp @ 2010-06-23 10:34 UTC (permalink / raw)
To: Santi Béjar; +Cc: git
On Wed, Jun 23, 2010 at 12:31 PM, Santi Béjar <santi@agolina.net> wrote:
> On Wed, Jun 23, 2010 at 12:24 PM, Laszlo Papp <djszapi@archlinux.us> wrote:
>> Hello,
>>
>> I have got a very big trouble, so please help me if you can :(
>>
>> I have done a git mv operation for a whole directory, so I have put it
>> into another subfolder and all my uncommitted/unpushed source and
>> header files were lost ... How can I regain them ?
>>
>> So I did "git mv some-directory-containing-lots-of-uncommitted-changes
>> total_different_folder/some-new-name". If I remember well then I did
>> commit/push for that git mv operation.
>>
>> git status doesn't show my changes either.
>
> I can't reproduce it. Can you provide a test case so we can reproduce
> it. Additionally you should tell us more information, like git
> version, architecture.
>
> Santi
>
http://www.archlinux.org/packages/extra/i686/git/
So the version is 1.7.1 and the architecture is i686.
I have tried the following commands:
git log -1
git log -1 --stat
git reflog
Only this commit happened and I can't find the files in the new directory.
Best Regards,
Laszlo Papp
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Uncommitted source and header files disappeared after a git mv operation
2010-06-23 10:34 ` Laszlo Papp
@ 2010-06-23 10:47 ` Mahesh Vaidya
0 siblings, 0 replies; 6+ messages in thread
From: Mahesh Vaidya @ 2010-06-23 10:47 UTC (permalink / raw)
To: git
That means those files were not added to index ;
Even that private files should stay intact
I have done following test case
PWD - lowflow
touch foo bar car
cd ..
git mv lowflow workflow
git commit -m "mv test" -a
git push
cd workflow # Uncommited files visible
On Wed, Jun 23, 2010 at 4:04 PM, Laszlo Papp <djszapi@archlinux.us> wrote:
> On Wed, Jun 23, 2010 at 12:31 PM, Santi Béjar <santi@agolina.net> wrote:
>> On Wed, Jun 23, 2010 at 12:24 PM, Laszlo Papp <djszapi@archlinux.us> wrote:
>>> Hello,
>>>
>>> I have got a very big trouble, so please help me if you can :(
>>>
>>> I have done a git mv operation for a whole directory, so I have put it
>>> into another subfolder and all my uncommitted/unpushed source and
>>> header files were lost ... How can I regain them ?
>>>
>>> So I did "git mv some-directory-containing-lots-of-uncommitted-changes
>>> total_different_folder/some-new-name". If I remember well then I did
>>> commit/push for that git mv operation.
>>>
>>> git status doesn't show my changes either.
>>
>> I can't reproduce it. Can you provide a test case so we can reproduce
>> it. Additionally you should tell us more information, like git
>> version, architecture.
>>
>> Santi
>>
>
> http://www.archlinux.org/packages/extra/i686/git/
>
> So the version is 1.7.1 and the architecture is i686.
>
> I have tried the following commands:
> git log -1
> git log -1 --stat
> git reflog
>
> Only this commit happened and I can't find the files in the new directory.
>
> Best Regards,
> Laszlo Papp
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
Thank you and best regards.
Mahesh Vaidya / 9740500144
http://www.twitter.com/forvaidya
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Uncommitted source and header files disappeared after a git mv operation
2010-06-23 10:31 ` Santi Béjar
2010-06-23 10:34 ` Laszlo Papp
@ 2010-06-23 10:50 ` Laszlo Papp
2010-06-23 11:23 ` Matthieu Moy
1 sibling, 1 reply; 6+ messages in thread
From: Laszlo Papp @ 2010-06-23 10:50 UTC (permalink / raw)
To: Santi Béjar; +Cc: git
I had some news.
I have just checked the bash history on linux, which doesn't contain
any intereting, but I have just realised the situation now, so the
following happened:
1) So the uncommitted files were on windows
2) I renamed the whole directory under linux.
3) I pushed the changes under linux
4) At last I did a git pull under windows.
The files disappeared on windows and they weren't committed :(
I use this versions on windows:
MySYSGIT: http://code.google.com/p/msysgit/downloads/detail?name=msysGit-fullinstall-1.7.1-preview20100612.exe&can=2&q=
TortoiseGIT:
http://code.google.com/p/tortoisegit/downloads/detail?name=TortoiseGit-1.5.2.0-32bit.msi&can=2&q=
Best Regards,
Laszlo Papp
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Uncommitted source and header files disappeared after a git mv operation
2010-06-23 10:50 ` Laszlo Papp
@ 2010-06-23 11:23 ` Matthieu Moy
0 siblings, 0 replies; 6+ messages in thread
From: Matthieu Moy @ 2010-06-23 11:23 UTC (permalink / raw)
To: Laszlo Papp; +Cc: Santi Béjar, git
Laszlo Papp <djszapi@archlinux.us> writes:
> I had some news.
>
> I have just checked the bash history on linux, which doesn't contain
> any intereting, but I have just realised the situation now, so the
> following happened:
>
> 1) So the uncommitted files were on windows
> 2) I renamed the whole directory under linux.
> 3) I pushed the changes under linux
> 4) At last I did a git pull under windows.
Are you sure the files are not where they used to be (i.e. under the
directory name used before renaming)?
Git usually takes great care not to touch untracked files. I'd be very
surprised if it did for you.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-06-23 11:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <AANLkTikeW1-Kzdyu1APSqzKGsNnny6InueWluXsKMccU@mail.gmail.com>
2010-06-23 10:24 ` Uncommitted source and header files disappeared after a git mv operation Laszlo Papp
2010-06-23 10:31 ` Santi Béjar
2010-06-23 10:34 ` Laszlo Papp
2010-06-23 10:47 ` Mahesh Vaidya
2010-06-23 10:50 ` Laszlo Papp
2010-06-23 11:23 ` Matthieu Moy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).