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>
Junio C Hamano committed
Nov 13, 2007 at 12:28 UTC
245de36f035f9d549df2b1509787c25648fd611f
1 file changed
+1
-1
builtin-revert.c
+1
-1
@@ -264,7 +264,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
264
if (get_sha1("HEAD", head))
265
die ("You do not have a valid HEAD");
266
wt_status_prepare(&s);
267
- if (s.commitable || s.workdir_dirty)
267
+ if (s.commitable)
268
die ("Dirty index: cannot %s", me);
269
discard_cache();
270
}