chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: Merges: Enable with command-line option instead of env var
[dgit.git]
/
tests
/
tartree-edit
diff --git
a/tests/tartree-edit
b/tests/tartree-edit
index bf5238cd3f57e8df5238892cf6d1e192c87e122c..78f0e4f65ec2c4470a04309055e6008c53f5e09d 100755
(executable)
--- a/
tests/tartree-edit
+++ b/
tests/tartree-edit
@@
-5,7
+5,7
@@
fail () { echo >&2 "$0: $*"; exit 1; }
play=.git/tartree-edit-work
git_manip_play () {
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
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\/[^\/]*\///' \
git for-each-ref --format '%(refname) %(objectname)' \
refs/remotes/"$1" \
| sed 's/^refs\/remotes\/[^\/]*\///' \
- | sort >"$play/$2"
+ |
t-
sort >"$play/$2"
}
gitfetchdiff () {
}
gitfetchdiff () {
@@
-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
@@
-125,7
+127,7
@@
tryat_gitfetchinfo () {
exec 3<&-
fi
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 '
git for-each-ref --format='%(refname)' refs/remotes >$play/l
perl -w -ne '