chiark / gitweb /
Provide --gbp and --dpm as aliases for --quilt=gbp and --quilt=dpm.
[dgit.git] / tests / tartree-edit
index 9fe06e6..96a5bcb 100755 (executable)
@@ -67,7 +67,9 @@ case "$#.$1" in
 ?.-*)  fail "no options understood"                    ;;
 *)     fail "usage:
     tartree-edit edit|done DIRECTORY|TARBALL
-    tartree-edit gitfetchinfo DIRECTORY|TARBALL REMOTE"        ;;
+    tartree-edit gitfetchinfo DIRECTORY|TARBALL REMOTE
+    tartree-edit gitfetchinfo-merge REMOTE-A REMOTE-B" ;;
+    # we don't document gitfetchinfo-diff because it's rather poor
 esac
 
 case "$arg" in
@@ -153,15 +155,15 @@ tryat_gitfetchinfo () {
        git remote remove "$remote" 2>/dev/null ||:
        git remote add "$remote" $innerwd
        git fetch --no-tags -p "$remote" \
-               +"HEAD:refs/remotes/$remote/HEAD"
+               +"HEAD:refs/remotes/$remote/TT-HEAD"
        cd $innerwd
        GIT_AUTHOR_DATE=$(git log -n1 --pretty=format:'%ai')
        GIT_COMMITTER_DATE=$GIT_AUTHOR_DATE
        export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
        git checkout -b WORKTREE
-       gitfetchinfo_perhaps_commit INDEX
+       gitfetchinfo_perhaps_commit 'UNCOMMITTED INDEX'
        git add -Af .
-       gitfetchinfo_perhaps_commit WORKTREE
+       gitfetchinfo_perhaps_commit 'UNCOMMITTED WORKING TREE'
        cd ../../..
        git fetch --no-tags "$remote" --refmap \
                +"refs/*:refs/remotes/$remote/*" \