summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1490e15)
raw | patch | inline | side by side (parent: 1490e15)
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 |
index 4f2b674e5de6e4b9c8c4ab9fd9684d99aa1cae50..ef1c70e1e6293f014a410b85e88701fa26f05189 100755 (executable)
--- a/test.sh
+++ b/test.sh
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"
allchanges=$(git log --name-only --pretty=format:'' | sort | fixnl)
check_equal "$allchanges" "$chkm $chkms $chks $chkms_sub"
+echo
+echo 'ok'