diff options
| author | Jeff King <peff@peff.net> | 2015-12-01 18:54:31 -0500 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2015-12-01 18:54:31 -0500 |
| commit | 30fe9b2f9aece7f8f24bc069b9d7470b8291535e (patch) | |
| tree | fa94365b9293f3fd8b4f37f42c086b7a0daae470 /contrib/subtree/git-subtree.sh | |
| parent | 23bc35f3dc8b4241a9a6aa97db2a94d3c4c92468 (diff) | |
| parent | d16031caf106dda2da52f10ef809cf4bfc83f7be (diff) | |
| download | git-30fe9b2f9aece7f8f24bc069b9d7470b8291535e.tar.gz | |
Merge branch 'dg/subtree-test-cleanup'
Test cleanups for the subtree project.
* dg/subtree-test-cleanup:
contrib/subtree: Handle '--prefix' argument with a slash appended
contrib/subtree: Make each test self-contained
contrib/subtree: Add split tests
contrib/subtree: Add merge tests
contrib/subtree: Add tests for subtree add
contrib/subtree: Add test for missing subtree
contrib/subtree: Clean and refactor test code
Diffstat (limited to 'contrib/subtree/git-subtree.sh')
| -rwxr-xr-x | contrib/subtree/git-subtree.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index 308b777b0a..edf36f8c36 100755 --- a/contrib/subtree/git-subtree.sh +++ b/contrib/subtree/git-subtree.sh @@ -90,7 +90,7 @@ while [ $# -gt 0 ]; do --annotate) annotate="$1"; shift ;; --no-annotate) annotate= ;; -b) branch="$1"; shift ;; - -P) prefix="$1"; shift ;; + -P) prefix="${1%/}"; shift ;; -m) message="$1"; shift ;; --no-prefix) prefix= ;; --onto) onto="$1"; shift ;; |