diff options
author | Ramkumar Ramachandra <artagnon@gmail.com> | 2011-08-04 16:09:14 +0530 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-08 09:24:51 -0700 |
commit | 21afd0806205d4a41c7c6076bd049842779ec080 (patch) | |
tree | dfb9ddee9eebf2abaa0e9c1cdb6fa4f4932f5302 /diffcore-break.c | |
parent | revert: Remove sequencer state when no commits are pending (diff) | |
download | tgif-21afd0806205d4a41c7c6076bd049842779ec080.tar.xz |
revert: Don't implicitly stomp pending sequencer operation
Protect the user from forgetting about a pending sequencer operation
by immediately erroring out when an existing cherry-pick or revert
operation is in progress like:
$ git cherry-pick foo
... conflict ...
$ git cherry-pick moo
error: .git/sequencer already exists
hint: A cherry-pick or revert is in progress
hint: Use --reset to forget about it
fatal: cherry-pick failed
A naive version of this would break the following established ways of
working:
$ git cherry-pick foo
... conflict ...
$ git reset --hard # I actually meant "moo" when I said "foo"
$ git cherry-pick moo
$ git cherry-pick foo
... conflict ...
$ git commit # commit the resolution
$ git cherry-pick moo # New operation
However, the previous patches "reset: Make reset remove the sequencer
state" and "revert: Remove sequencer state when no commits are
pending" make sure that this does not happen.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore-break.c')
0 files changed, 0 insertions, 0 deletions