chiark / gitweb /
git-debrebase: merge: Save wreckage if desired
[dgit.git] / tests / tartree-edit
index f4717fa..78f0e4f 100755 (executable)
@@ -5,7 +5,7 @@ fail () { echo >&2 "$0: $*"; exit 1; }
 play=.git/tartree-edit-work
 
 git_manip_play () {
-       local wd=$(pwd)
+       local wd; wd=$(pwd)
        case "$wd" in
        *.edit) fail "bad idea to run gitfetchinfo into a .edit tree!" ;;
        esac
@@ -17,7 +17,7 @@ gitfetchdiff_list () {
        git for-each-ref --format '%(refname) %(objectname)' \
                refs/remotes/"$1" \
        | sed 's/^refs\/remotes\/[^\/]*\///' \
-       | sort >"$play/$2"
+       | t-sort >"$play/$2"
 }
 
 gitfetchdiff () {
@@ -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
@@ -125,7 +127,7 @@ tryat_gitfetchinfo () {
                exec 3<&-
        fi
 
-       local innerwd="$(echo $play/*)"
+       local innerwd; innerwd="$(echo $play/*)"
 
        git for-each-ref --format='%(refname)' refs/remotes >$play/l
        perl -w -ne '
@@ -159,9 +161,9 @@ tryat_gitfetchinfo () {
        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/*" \