chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test suite: import-nonnative: Prepare for more tests
[dgit.git]
/
tests
/
tartree-edit
diff --git
a/tests/tartree-edit
b/tests/tartree-edit
index f4717faed18a60f37270efb906eaa572d97745d2..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
?.-*) 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
esac
case "$arg" in
@@
-159,9
+161,9
@@
tryat_gitfetchinfo () {
GIT_COMMITTER_DATE=$GIT_AUTHOR_DATE
export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
git checkout -b WORKTREE
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 .
git add -Af .
- gitfetchinfo_perhaps_commit
WORKTREE
+ gitfetchinfo_perhaps_commit
'UNCOMMITTED WORKING TREE'
cd ../../..
git fetch --no-tags "$remote" --refmap \
+"refs/*:refs/remotes/$remote/*" \
cd ../../..
git fetch --no-tags "$remote" --refmap \
+"refs/*:refs/remotes/$remote/*" \