Thread (3 messages) 3 messages, 2 authors, 2021-04-28

Re: Request: `git restore $commit $file` shouldn’t override uncommited changes

From: Robin Moussu <hidden>
Date: 2021-04-28 08:35:58

I effectively did a typo, I meant `git checkout $commit $file` or `git restore -s $commit $file`. I forgot the --source in the `git restore` command.
Is your question that you expect a command like

git restore --source=some-commit some-file

to error if you have uncommitted changes (to "some-file")?
And instead you would run

git restore some-file
git restore --source=some-commit some-file
Exactly. If `--source $commit` isn’t specified, erasing uncommitted changes is what I expect. I scream-up, and want to start from a fresh state.

On the contrary,  if `--source $commit` is specified, I would like to get an error if $file has uncommitted changes. The reason I want to error when `--source $commit` is specified is because I most probably didn’t screw-up, but just forgot that I modified the file before copying its content from another revision.

Robin.

---

Should I wrap my text in 80 column? I’m not familiar with plain-text netiquette.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help