Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
test.sh tweak
author
Avery Pennarun
<apenwarr@gmail.com>
Sun, 26 Apr 2009 20:33:38 +0000
(16:33 -0400)
committer
Avery Pennarun
<apenwarr@gmail.com>
Sun, 26 Apr 2009 20:33:38 +0000
(16:33 -0400)
test.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
1490e15
)
diff --git
a/test.sh
b/test.sh
index 4f2b674e5de6e4b9c8c4ab9fd9684d99aa1cae50..ef1c70e1e6293f014a410b85e88701fa26f05189 100755
(executable)
--- a/
test.sh
+++ b/
test.sh
@@
-100,7
+100,8
@@
git branch sub2 FETCH_HEAD
git subtree merge --prefix=subdir FETCH_HEAD
git branch pre-split
git subtree merge --prefix=subdir FETCH_HEAD
git branch pre-split
-split1=$(git subtree split --annotate='*' --prefix subdir --onto FETCH_HEAD --rejoin)
+split1=$(git subtree split --annotate='*' \
+ --prefix subdir --onto FETCH_HEAD --rejoin)
echo "split1={$split1}"
git branch split1 "$split1"
echo "split1={$split1}"
git branch split1 "$split1"
@@
-161,3
+162,5
@@
check_equal "$mainfiles" "$chkm $chkms_sub $chks_sub"
allchanges=$(git log --name-only --pretty=format:'' | sort | fixnl)
check_equal "$allchanges" "$chkm $chkms $chks $chkms_sub"
allchanges=$(git log --name-only --pretty=format:'' | sort | fixnl)
check_equal "$allchanges" "$chkm $chkms $chks $chkms_sub"
+echo
+echo 'ok'