From: Johannes Sixt <j6t@kdbg.org>
To: Julian de Bhal <julian.debhal@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git reset --hard should not irretrievably destroy new files
Date: Sat, 3 Dec 2016 08:49:35 +0100 [thread overview]
Message-ID: <f2f8c7c9-cbe0-870d-3c13-fc928dd91dd1@kdbg.org> (raw)
In-Reply-To: <CAJZCeG1Eu+5DfaxavX_WGUCa+SY+yepDWZhPXxiFcV__h0xjrw@mail.gmail.com>
Am 03.12.2016 um 06:04 schrieb Julian de Bhal:
> If you `git add new_file; git reset --hard`, new_file is gone forever.
AFAIC, this is a feature ;-) I occasionally use it to remove a file when
I already have git-gui in front of me. Then it's often less convenient
to type the path in a shell, or to pointy-click around in a file browser.
> git add new_file
Because of this ...
> git add -p # also not necessary, but distracting
> git reset --hard # decided copy from backed up diff
> # boom. new_file is gone forever
... it is not. The file is still among the dangling blobs in the
repository until you clean it up with 'git gc'. Use 'git fsck --lost-found':
--lost-found
Write dangling objects into .git/lost-found/commit/ or
.git/lost-found/other/, depending on type. If the object is a blob, the
contents are written into the file, rather than its object name.
-- Hannes
next prev parent reply other threads:[~2016-12-03 7:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-03 5:04 git reset --hard should not irretrievably destroy new files Julian de Bhal
2016-12-03 7:49 ` Johannes Sixt [this message]
2016-12-04 0:14 ` Julian de Bhal
2016-12-03 8:11 ` Christian Couder
2016-12-04 0:57 ` Julian de Bhal
2016-12-04 10:47 ` Christian Couder
2016-12-04 19:08 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f2f8c7c9-cbe0-870d-3c13-fc928dd91dd1@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=julian.debhal@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).