threads / discuss / 66901

Prevent git reset --hard from losing data

Subject: Prevent git reset --hard from losing data

## tl;dr

A user who lost uncommitted work asked for a confirmation setting. Junio Hamano said existing commands are hard to change and urged a safer replacement. Read the story.

replies: 3people: 3as markdown or json

Steven Rostedt· Nov 20, 2026, 19:54 UTC · lore
Hi,

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'm writing this after I just lost some uncommitted changes from doing this :-( ]
Thanks,
-- Steve
Mirko Faina· Nov 20, 2026, 21:09 UTC · re: Steven Rostedt · lore

Re: Prevent git reset --hard from losing data

On Fri, Nov 20, 2026 at 02:54:44PM -0500, Steven Rostedt wrote:
> 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?

You could just reset without the --hard option and restore what you don't want to keep. Otherwise there's the --keep option that aborts the reset if there's local changes, but you'd have to remember to type it out every time.

Maybe a configuration variable that makes the --keep behaviour the default could be added with a --force flag to override it.

Junio C Hamano· Nov 20, 2026, 22:02 UTC · re: Steven Rostedt · lore

Re: Prevent git reset --hard from losing data

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 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.

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.

Steven Rostedt· Nov 20, 2026, 22:15 UTC · re: Junio C Hamano · lore

Re: Prevent git reset --hard from losing data

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

Show 10 quoted lines
> 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".

Show 5 quoted lines
> 
> 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.

Show 7 quoted lines
> 
> 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

← back to recent threads