diff options
| author | Techlive Zheng <techlivezheng@gmail.com> | 2015-11-12 20:32:36 -0600 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2015-11-13 00:02:56 -0500 |
| commit | d16031caf106dda2da52f10ef809cf4bfc83f7be (patch) | |
| tree | 023727f05f07beaf72b341c7492f7e587c73d3e9 /contrib/subtree/git-subtree.sh | |
| parent | 43711746bd01eff9d8bac658bf1d6a39151088f2 (diff) | |
| download | git-d16031caf106dda2da52f10ef809cf4bfc83f7be.tar.gz | |
contrib/subtree: Handle '--prefix' argument with a slash appended
'git subtree merge' will fail if the argument of '--prefix' has a slash
appended.
Signed-off-by: Techlive Zheng <techlivezheng@gmail.com>
Signed-off-by: David A. Greene <greened@obbligato.org>
Signed-off-by: Jeff King <peff@peff.net>
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 ;; |