cherry-pick/revert: transparently refresh index
authorJonathan Nieder <jrnieder@gmail.com>
Sun, 31 Oct 2010 19:59:33 +0000 (14:59 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Nov 2010 16:49:26 +0000 (08:49 -0800)
commitf6ce1f25885f3db71935b201c5e3c858eb993f5c
tree142b6e4f329efcbc57c204779f0d77b52ffd9419
parentaf77aee9cac51c2036e6019b4aebec2049f03e6b
cherry-pick/revert: transparently refresh index

A stat-dirty index is not a detail that ought to concern the operator
of porcelain such as "git cherry-pick".

Without this change, a cherry-pick after copying a worktree with rsync
errors out with a misleading message.

$ git cherry-pick build/top
error: Your local changes to 'file.h' would be overwritten by merge.  Aborting.
Please, commit your changes or stash them before you can merge.

Noticed-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/revert.c
t/t3501-revert-cherry-pick.sh