[RFC] git reset --recover

[RFC] git reset --recover

[Ping Yin]

Today i use git reset carelessly and lose all my changes!

To remind other people not do the same wrong thing, i share my
experience and propose a new option to avoid this happens again.
------------------------------------
foo
   .git
    bar
        file1
        file2
------------------------------------

In the direcotry structure above, i want to make bar as a repository
(which hasn't yet been tracked by foo repository). I should have done
this as follows

-------------------------------------------
cd bar
git init
git add
------------------------------------------

but i fogot to type "git init" which results that file1 and file2 are
added to index of foo repository. I tried to revert the operation
using "git reset". And the tragedy happened at that time because i
made so fatal  a mistake that i typed "git reset --hard". And i lost
all my files in bar dir!

So, can we introduce a --recover option for "git reset" to save the
foolish or careless people like me?

-- 
Ping Yin

Re: [RFC] git reset --recover

[Santi Béjar]

On Mon, Mar 3, 2008 at 3:59 PM, Ping Yin <pkufranky@gmail.com> wrote:
> Today i use git reset carelessly and lose all my changes!
>
>  To remind other people not do the same wrong thing, i share my
>  experience and propose a new option to avoid this happens again.
>  ------------------------------------
>  foo
>    .git
>     bar
>         file1
>         file2
>  ------------------------------------
>
>  In the direcotry structure above, i want to make bar as a repository
>  (which hasn't yet been tracked by foo repository). I should have done
>  this as follows
>
>  -------------------------------------------
>  cd bar
>  git init
>  git add
>  ------------------------------------------
>
>  but i fogot to type "git init" which results that file1 and file2 are
>  added to index of foo repository. I tried to revert the operation
>  using "git reset". And the tragedy happened at that time because i
>  made so fatal  a mistake that i typed "git reset --hard". And i lost
>  all my files in bar dir!

"git reset" was sufficient.

>
>  So, can we introduce a --recover option for "git reset" to save the
>  foolish or careless people like me?

Another possibility would be to not delete a file that is absent in
both the old and new HEAD, even if it was in the index.

Santi

Re: [RFC] git reset --recover

[Ping Yin]

On Mon, Mar 3, 2008 at 11:13 PM, Santi Béjar <sbejar@gmail.com> wrote:
> On Mon, Mar 3, 2008 at 3:59 PM, Ping Yin <pkufranky@gmail.com> wrote:
>  > Today i use git reset carelessly and lose all my changes!
>  >

>  >
>  >  but i fogot to type "git init" which results that file1 and file2 are
>  >  added to index of foo repository. I tried to revert the operation
>  >  using "git reset". And the tragedy happened at that time because i
>  >  made so fatal  a mistake that i typed "git reset --hard". And i lost
>  >  all my files in bar dir!
>
>  "git reset" was sufficient.
>
I know about this, but i was just too careless.
>
>  >
>  >  So, can we introduce a --recover option for "git reset" to save the
>  >  foolish or careless people like me?
>
>  Another possibility would be to not delete a file that is absent in
>  both the old and new HEAD, even if it was in the index.
>
Sounds interesting.
>  Santi
>



-- 
Ping Yin

Re: [RFC] git reset --recover

[Charles Bailey]

On Mon, Mar 03, 2008 at 10:59:14PM +0800, Ping Yin wrote:
> 
> but i fogot to type "git init" which results that file1 and file2 are
> added to index of foo repository. I tried to revert the operation
> using "git reset". And the tragedy happened at that time because i
> made so fatal  a mistake that i typed "git reset --hard". And i lost
> all my files in bar dir!

If they've been added to the index then the objects should be in your
git repository, it's just that it may be hard to find them.

Does 'git fsck' report some dangling blobs?  If so (some of) them
should be the content of your missing files.

Re: [RFC] git reset --recover

[Ping Yin]

On Tue, Mar 4, 2008 at 1:02 AM, Charles Bailey <charles@hashpling.org> wrote:
> On Mon, Mar 03, 2008 at 10:59:14PM +0800, Ping Yin wrote:
>  >
>
>  If they've been added to the index then the objects should be in your
>  git repository, it's just that it may be hard to find them.
>
>  Does 'git fsck' report some dangling blobs?  If so (some of) them
>  should be the content of your missing files.
>
Good news. So can "--recover" help me find the lost blobs?


-- 
Ping Yin

Re: [RFC] git reset --recover

[Jay Soffian]

On Tue, Mar 4, 2008 at 12:21 AM, Ping Yin <pkufranky@gmail.com> wrote:
> On Tue, Mar 4, 2008 at 1:02 AM, Charles Bailey <charles@hashpling.org> wrote:
>  >
>  >  Does 'git fsck' report some dangling blobs?  If so (some of) them
>  >  should be the content of your missing files.
>  >
>  Good news. So can "--recover" help me find the lost blobs?

git fsck --lost-found. Look under .git/lost-found/other for your blobs.
Anything that's not 41 bytes is a file.

j.

Re: [RFC] git reset --recover

[Ping Yin]

On Tue, Mar 4, 2008 at 3:42 PM, Jay Soffian <jaysoffian@gmail.com> wrote:
> On Tue, Mar 4, 2008 at 12:21 AM, Ping Yin <pkufranky@gmail.com> wrote:
>  > On Tue, Mar 4, 2008 at 1:02 AM, Charles Bailey <charles@hashpling.org> wrote:
>  >  >
>
> >  >  Does 'git fsck' report some dangling blobs?  If so (some of) them
>  >  >  should be the content of your missing files.
>  >  >
>  >  Good news. So can "--recover" help me find the lost blobs?
>
>  git fsck --lost-found. Look under .git/lost-found/other for your blobs.
>  Anything that's not 41 bytes is a file.
>
Thanks for pointing me that.
>  j.
>



-- 
Ping Yin