aboutsummaryrefslogtreecommitdiff
path: root/builtin-revert.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-14 03:37:18 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-14 03:37:18 -0800
commitfb5fd011482b5aa0b340a4a5bd9192c0efc1edb7 (patch)
tree1701d97cd2ae3aa4ce52127cf8343b8b1efc9383 /builtin-revert.c
parent481424e1f100de690849a9f0348fc78f45ab815e (diff)
parentb57321f57b324320bdcf9f453ec4788da166f8f4 (diff)
downloadgit-fb5fd011482b5aa0b340a4a5bd9192c0efc1edb7.tar.gz
git-fb5fd011482b5aa0b340a4a5bd9192c0efc1edb7.tar.xz
Merge branch 'maint'
* maint: git-clean: honor core.excludesfile Documentation: Fix man page breakage with DocBook XSL v1.72 git-remote.txt: fix typo core-tutorial.txt: Fix argument mistake in an example. replace reference to git-rm with git-reset in git-commit doc Grammar fixes for gitattributes documentation Don't allow fast-import tree delta chains to exceed maximum depth revert/cherry-pick: allow starting from dirty work tree. t/t3404: fix test for a bogus todo file. Conflicts: fast-import.c
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 afc28845f..365b330f9 100644
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -258,7 +258,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();
}