Git development
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: Prevent git reset --hard from losing data
Date: Fri, 20 Nov 2026 17:15:28 -0500	[thread overview]
Message-ID: <20261120171528.3e6c3f5b@gandalf.local.home> (raw)
In-Reply-To: <xmqqqzgfnouv.fsf@gitster.g>

On Fri, 20 Nov 2026 14:02:16 -0800
Junio C Hamano <gitster@pobox.com> wrote:

> Steven Rostedt <rostedt@goodmis.org> writes:
> 
> > Too many times I do a "git reset --hard" in the wrong directory and end up
> > losing uncommitted changes. Is there a way to add a configuration to have
> > that command check if there's any uncommitted changes and ask if you really
> > want to do the reset?  
> 
> I do not think so.  Castrating an existing command without harming
> others is a hard thing to do once the tool gains more than a few
> hundred of users, and we probably have more users than that.

I was hoping that there was just a way to add a hook that could run before
executing the command. I wasn't suggesting that we make that the default.
Just some kind of .gitrc that says "do this before executing X".

> 
> I think you need to go to the root of the issue.  Find out what made
> you want to run "git reset --hard" and see if there are less drastic
> solution to the same issue.  And come up with a way to package that
> less drastic solution in a form that would be useful to many people.

Well, it's something I do on a daily basis and have for the last decade ;-)

The reason I use git reset --hard is because I work on several topic
branches and create development ones all the time. Sometimes I add commits
across branches. I'll create a temp branch and work on it until I like it
and then copy the sha1 of that branch, checkout the branch I want to use,
and do a "git reset --hard sha1" to convert the actual branch to the temp
one.

> 
> That way, people would start using that newer solution and less
> often be running "git reset --hard", reducing the risk.  When
> somebody really needs to do "git reset --hard" or a script that has
> happily been running "git reset --hard", it will continue to do the
> destructive thing as it was designed to, and everybody will be
> happy.

I could just make a script that would do what I want (do a git diff, and
ask if there's any changes pending before doing a git reset --hard), and
then train myself to use that instead.

I simply emailed to see if there wasn't a way to do that type of hook
before committing to that. There's a lot of things git does that I wish I
knew before and I was wondering if this wasn't one of them.

Thanks,

-- Steve


      reply	other threads:[~2026-11-20 22:15 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-20 19:54 Prevent git reset --hard from losing data Steven Rostedt
2026-11-20 21:09 ` Mirko Faina
2026-11-20 22:02 ` Junio C Hamano
2026-11-20 22:15   ` Steven Rostedt [this message]

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261120171528.3e6c3f5b@gandalf.local.home \
    --to=rostedt@goodmis.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox