Test suite: tartree-edit: gitfetchinfo: Specify commit timestamps

[dgit.git] / tests / tartree-edit

diff --git a/tests/tartree-edit b/tests/tartree-edit
index 14eec68e3e63fefbc68362c6264e8a698debee46..1aeab3d41dc7f8e2b58051667e0dc37c114141de 100755 (executable)
--- a/tests/tartree-edit
+++ b/tests/tartree-edit
@@ -2,9 +2,68 @@
 set -e
 fail () { echo >&2 "$0: $*"; exit 1; }
 
+play=.git/tartree-edit-work
+
+git_manip_play () {
+       local wd=$(pwd)
+       case "$wd" in
+       *.edit) fail "bad idea to run gitfetchinfo into a .edit tree!" ;;
+       esac
+       rm -rf $play
+       mkdir $play
+}
+
+gitfetchdiff_list () {
+       git for-each-ref --format '%(refname) %(objectname)' \
+               refs/remotes/"$1" \
+       | sed 's/^refs\/remotes\/[^\/]*\///' \
+       | sort >"$play/$2"
+}
+
+gitfetchdiff () {
+       local how="$1"
+       local a="$2"
+       local b="$3"
+       git_manip_play
+
+       rrab=refs/remotes/"$a+$b"
+
+       ulf=\
+"delete refs/remotes/$a/%l
+delete refs/remotes/$b/%l
+"
+       case "$how" in
+       diff)
+               git for-each-ref --format 'delete %(refname)' $rrab \
+                       | git update-ref --stdin
+               ;;
+       merge)
+               ulf=\
+"create $rrab/%l
+$ulf"
+               ;;
+       *)
+               fail "internal error bad how ($how)"
+               ;;
+       esac
+
+       gitfetchdiff_list "$a" a
+       gitfetchdiff_list "$b" b
+
+       diff --old-line-format='' --new-line-format='' \
+               --unchanged-line-format="$ulf" \
+               $play/a $play/b >$play/updates \
+       || test $? = 1
+
+       git update-ref --stdin <$play/updates
+       exit 0
+}
+
 case "$#.$1" in
 2.edit|2.done) mode="$1"; arg="$2" ;;
 3.gitfetchinfo)        mode="$1"; arg="$2"; remote="$3" ;;
+3.gitfetchinfo-diff)   gitfetchdiff diff "$2" "$3"     ;;
+3.gitfetchinfo-merge)  gitfetchdiff merge "$2" "$3"    ;;
 ?.-*)  fail "no options understood"                    ;;
 *)     fail "usage:
     tartree-edit edit|done DIRECTORY|TARBALL
@@ -56,13 +115,7 @@ gitfetchinfo_perhaps_commit () {
 }
 
 tryat_gitfetchinfo () {
-       local wd=$(pwd)
-       case "$wd" in
-       *.edit) fail "bad idea to run gitfetchinfo into a .edit tree!" ;;
-       esac
-       local play=.git/tartree-edit-work
-       rm -rf $play
-       mkdir $play
+       git_manip_play
        if test -d "$b.edit"; then
                cp -a "$b.edit"/. "$play"/.
        else
@@ -76,6 +129,9 @@ tryat_gitfetchinfo () {
        git fetch --no-tags -p "$remote" \
                +"HEAD:refs/remotes/$remote/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
        git add -Af .