Skip to contentSkip to conversation

rebase: Ask before doing anything not undoable

DISCUSSION Ricardo Biehl Pasquali 2 participants 6 messages Dec 20, 2018 – Dec 21, 2018 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

It was the second time I've typed "git rebase --co", hit tab (for completion) and enter, and the result was --committer-date-is-author-date instead of --continue .

Please do ask user before run actions like these! I have not found a way to undo that. I had to perform a reset in the repository.

PS: Notice I was expecting a command of interactive rebase,
and I got a bunch of commits's date (and hash) changed.

Cheers!

pasquali

#1 lore raw

Am 20.12.2018 um 18:33 schrieb Ricardo Biehl Pasquali:

Quoted 10 lines

It was the second time I've typed "git rebase --co", hit tab (for completion) and enter, and the result was --committer-date-is-author-date instead of --continue .

Please do ask user before run actions like these! I have not found a way to undo that. I had to perform a reset in the repository.

PS: Notice I was expecting a command of interactive rebase,
and I got a bunch of commits's date (and hash) changed.

Do you know about the reflog? This let's you undo these kind of changes. See git help reflog.

#2 lore raw
Quoted 2 lines · Thomas Braun

Do you know about the reflog? This let's you undo these kind of changes. See git help reflog.

I didn't. This should be documented in rebase manual page.

Perhaps a message after the command might be interesting (e.g.: "to undo use git reflog").

Thank you!

pasquali

#4 lore raw
In reply to a message not in the archive

Ccing the mailing list.

Quoted 3 lines · Kevin Daudt

It would be anoying for users to have to constantly confirm when they run git rebase --continue. Rather than asking confirmation, it would be better to make it easy to go back to the previous state.

I meant confirmation for --committer-date-is-author-date option.

As Thomas said, it should be possible to undo the action using reflog, although this seems not as easy as it should be yet.

pasquali

#5 lore raw

Am 20.12.2018 um 22:11 schrieb Ricardo Biehl Pasquali:

Quoted 7 lines

Ccing the mailing list.

Quoted 3 lines · Kevin Daudt

It would be anoying for users to have to constantly confirm when they run git rebase --continue. Rather than asking confirmation, it would be better to make it easy to go back to the previous state.

Quoted 6 lines

I meant confirmation for --committer-date-is-author-date option.

As Thomas said, it should be possible to undo the action using reflog, although this seems not as easy as it should be yet.

The git rebase documentation has

ORIG_HEAD is set to point at the tip of the branch before the reset.

so doing

git reset ORIG_HEAD

does reset to the state before the rebase.

For avoiding the original problem of --co completing to --committer-date-is-author-date I'm using the alias rc for git rebase --continue.

#6 lore raw
Quoted 9 lines · Thomas Braun

The git rebase documentation has

ORIG_HEAD is set to point at the tip of the branch before the reset.

so doing

git reset ORIG_HEAD

does reset to the state before the rebase.

That's pretty easy :-)

Quoted 3 lines

For avoiding the original problem of --co completing to --committer-date-is-author-date I'm using the alias rc for git rebase --continue.

It's definetly an alternative. Anyway, ORIG_HEAD reset is sufficient for the cases when enter is hit before noticing the completion string.

Thank you!

pasquali