diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2010-01-19 05:26:01 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-06 20:06:50 -0800 |
| commit | 812d2a3d61b1bbb1931aff2ed6d2a17e939f5bf2 (patch) | |
| tree | 8a4b55f654c0b5f9fe4a4ebfd226e79b949df17d /t/t7111-reset-table.sh | |
| parent | ab892a19e83edd1cf9a767bc09d3239f72469d05 (diff) | |
| download | git-812d2a3d61b1bbb1931aff2ed6d2a17e939f5bf2.tar.gz git-812d2a3d61b1bbb1931aff2ed6d2a17e939f5bf2.tar.xz | |
reset: disallow using --keep when there are unmerged entries
The use case for --keep option is to remove previous commits unrelated
to the current changes in the working tree. So in this use case we are
not supposed to have unmerged entries. This is why it seems safer to
just disallow using --keep when there are unmerged entries.
And this patch changes the error message when --keep was disallowed and
there were some unmerged entries from:
error: Entry 'file1' would be overwritten by merge. Cannot merge.
fatal: Could not reset index file to revision 'HEAD^'.
to:
fatal: Cannot do a keep reset in the middle of a merge.
which is nicer.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7111-reset-table.sh')
| -rwxr-xr-x | t/t7111-reset-table.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7111-reset-table.sh b/t/t7111-reset-table.sh index 2ebda9782..ce421ad5a 100755 --- a/t/t7111-reset-table.sh +++ b/t/t7111-reset-table.sh @@ -115,7 +115,7 @@ X U B B soft XXXXX X U B B mixed X B B X U B B hard B B B X U B B merge B B B -X U B B keep X B B +X U B B keep XXXXX EOF test_done |