Merge branch 'nd/the-index'

diff --git a/Documentation/doc-diff b/Documentation/doc-diff
index 6ce040ea05d3fce86835d291e3b18c42153c0fa7..dfd9418778a80a209e8ceb43aa94dbb4259f91db 100755 (executable)
--- a/Documentation/doc-diff
+++ b/Documentation/doc-diff
@@ -10,20 +10,25 @@
 
 OPTIONS_SPEC="\
 doc-diff [options] <from> <to> [-- <diff-options>]
+doc-diff (-c|--clean)
 --
 j=n    parallel argument to pass to make
 f      force rebuild; do not rely on cached results
+c,clean        cleanup temporary working files
 "
 SUBDIRECTORY_OK=1
 . "$(git --exec-path)/git-sh-setup"
 
 parallel=
 force=
+clean=
 while test $# -gt 0
 do
        case "$1" in
        -j)
                parallel=$2; shift ;;
+       -c|--clean)
+               clean=t ;;
        -f)
                force=t ;;
        --)
@@ -34,6 +39,17 @@ do
        shift
 done
 
+cd_to_toplevel
+tmp=Documentation/tmp-doc-diff
+
+if test -n "$clean"
+then
+       test $# -eq 0 || usage
+       git worktree remove --force "$tmp/worktree" 2>/dev/null
+       rm -rf "$tmp"
+       exit 0
+fi
+
 if test -z "$parallel"
 then
        parallel=$(getconf _NPROCESSORS_ONLN 2>/dev/null)
@@ -50,9 +66,6 @@ to=$1; shift
 from_oid=$(git rev-parse --verify "$from") || exit 1
 to_oid=$(git rev-parse --verify "$to") || exit 1
 
-cd_to_toplevel
-tmp=Documentation/tmp-doc-diff
-
 if test -n "$force"
 then
        rm -rf "$tmp"
@@ -62,7 +75,7 @@ fi
 # results that don't differ between the two trees.
 if ! test -d "$tmp/worktree"
 then
-       git worktree add --detach "$tmp/worktree" "$from" &&
+       git worktree add -f --detach "$tmp/worktree" "$from" &&
        dots=$(echo "$tmp/worktree" | sed 's#[^/]*#..#g') &&
        ln -s "$dots/config.mak" "$tmp/worktree/config.mak"
 fi