Provide --gbp and --dpm as aliases for --quilt=gbp and --quilt=dpm.

[dgit.git] / tests / tartree-edit

diff --git a/tests/tartree-edit b/tests/tartree-edit
index cdaade35b5e0a7daf2e332ea98c9d5d90c7f7084..96a5bcb093eebe1e411f5ad432a4dfc44acb9f42 100755 (executable)
--- a/tests/tartree-edit
+++ b/tests/tartree-edit
@@ -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
@@ -129,6 +131,7 @@ tryat_gitfetchinfo () {
 
        git for-each-ref --format='%(refname)' refs/remotes >$play/l
        perl -w -ne '
+           our %remerge;
            use strict;
            chomp;
            next unless m#^refs/remotes/([^/]+)/#;
@@ -141,25 +144,39 @@ tryat_gitfetchinfo () {
            $remerge{"@ab"} = 1;
            print "update refs/remotes/$_/$rhs $old\n" or die $! foreach @ab;
            print "delete $old\n" or die $!;
-       ' <$play/l >$play/unmerge
+           END {
+               open REMERGE, ">&3" or die $!;
+               print REMERGE "$_\n" or die $! foreach sort keys %remerge;
+               close REMERGE or die $!;
+           }
+       ' <$play/l >$play/unmerge 3>$play/remerge
        git update-ref --stdin <$play/unmerge
 
        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/*" \
                +"refs/*:refs/remotes/$remote/*"
+
+       exec 3<$play/remerge
+       # $play will be destroyed by what follows, but we have
+       # an fd open onto remerge, so this will work
+       while read <&3 a b; do
+             echo "Updating gitfetchinfo-merge $a $b"
+             "$0" gitfetchinfo-merge $a $b
+       done
+
        exit 0
 }