"David A. Greene" <gree...@obbligato.org> writes:
> From: Techlive Zheng <techlivezh...@gmail.com>
>
> 'git subtree merge' will fail if the argument of '--prefix' has a slash
> appended.
>
> Signed-off-by: Techlive Zheng <techlivezh...@gmail.com>
> Signed-off-by: David A. Greene <gree...@obbligato.org>
> ---
> 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"?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
