revert/cherry-pick: allow starting from dirty work tree.

gitster · gitster · commit 245de36f035f · 2007-11-13T13:25:51.000-08:00
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 &lt;gitster@pobox.com&gt;
diff --git 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();
 	}

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)`
`264`	`264`	`if (get_sha1("HEAD", head))`
`265`	`265`	`die ("You do not have a valid HEAD");`
`266`	`266`	`wt_status_prepare(&s);`
`267`		`- if (s.commitable \|\| s.workdir_dirty)`
	`267`	`+ if (s.commitable)`
`268`	`268`	`die ("Dirty index: cannot %s", me);`
`269`	`269`	`discard_cache();`
`270`	`270`	`}`