From: Junio C Hamano Date: Tue, 05 Feb 2013 05:16:33 GMT Subject: Re: [PATCH 12/13] contrib/subtree: Handle '--prefix' argument with a slash appended Message-ID: <7vsj5bwdam.fsf@alter.siamese.dyndns.org> In-Reply-To: <1360037173-23291-13-git-send-email-greened@obbligato.org> "David A. Greene" writes: > From: Techlive Zheng > > 'git subtree merge' will fail if the argument of '--prefix' has a slash > appended. > > Signed-off-by: Techlive Zheng > Signed-off-by: David A. Greene > --- > contrib/subtree/git-subtree.sh | 2 +- > contrib/subtree/t/t7900-subtree.sh | 19 +++++++++++++++++++ > 2 files changed, 20 insertions(+), 1 deletion(-) > > diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh > index c72af95..0493e47 100755 > --- a/contrib/subtree/git-subtree.sh > +++ b/contrib/subtree/git-subtree.sh > @@ -82,7 +82,7 @@ while [ $# -gt 0 ]; do > --annotate) annotate="$1"; shift ;; > --no-annotate) annotate= ;; > -b) branch="$1"; shift ;; > - -P) prefix="$1"; shift ;; > + -P) prefix="${1%/}"; shift ;; While it may not be a bad change per-se, I have to wonder if it is worth special casing "--prefix=foo/", that should have been spelled as "--prefix=foo", while still failing misspelling like "--prefix=foo//" and possibly other forms, perhaps "--prefix=foo//bar/baz"?