aboutsummaryrefslogtreecommitdiff
path: root/builtin-revert.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-13 12:28:53 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-13 13:25:51 -0800
commit245de36f035f9d549df2b1509787c25648fd611f (patch)
tree3ce82b4fc6c5ac8aca39a6f648f0f3d62018110a /builtin-revert.c
parentaac5bf0b48c5f23cf482ca7958fa6815fe6502ed (diff)
downloadgit-245de36f035f9d549df2b1509787c25648fd611f.tar.gz
git-245de36f035f9d549df2b1509787c25648fd611f.tar.xz
revert/cherry-pick: allow starting from dirty work tree.
There is no reason to forbid a dirty work tree when reverting or cherry-picking a change, as long as the index is clean. The scripted version used to allow it: case "$no_commit" in t) # We do not intend to commit immediately. We just want to # merge the differences in. head=$(git-write-tree) || die "Your index file is unmerged." ;; *) head=$(git-rev-parse --verify HEAD) || die "You do not have a valid HEAD" files=$(git-diff-index --cached --name-only $head) || exit if [ "$files" ]; then die "Dirty index: cannot $me (dirty: $files)" fi ;; esac but C rewrite tightened the check, probably by mistake. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-revert.c')
-rw-r--r--builtin-revert.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-revert.c b/builtin-revert.c
index eafafbc33..94e77771d 100644
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -264,7 +264,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
if (get_sha1("HEAD", head))
die ("You do not have a valid HEAD");
wt_status_prepare(&s);
- if (s.commitable || s.workdir_dirty)
+ if (s.commitable)
die ("Dirty index: cannot %s", me);
discard_cache();
}