threads / patch / 36011

patchcontrib/subtree - unset prefix before proceeding

Subject: [PATCH] contrib/subtree - unset prefix before proceeding

## tl;dr

2 messages between Mar 1, 2014 and Mar 3, 2014. Diffs are folded; open one to read it.

replies: 1people: 1as markdown or json

Gilles Filippini· Mar 1, 2014, 16:33 UTC · lore

This is to prevent unwanted prefix when such an environment variable exists. The case occurs for example during the Debian package build where the git-subtree test suite is called with 'prefix=/usr', which makes test 21 fail: not ok 21 - Check that prefix argument is required for split

Signed-off-by: Gilles Filippini <gilles.filippini@free.fr>
---
 contrib/subtree/git-subtree.sh | 1 +
 1 file changed, 1 insertion(+)

Show changes to contrib/subtree/git-subtree.sh +1 −0

diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index dc59a91..db925ca 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -46,6 +46,7 @@ ignore_joins=
 annotate=
 squash=
 message=
+prefix=
 
 debug()
 {

-- 
1.9.0

Gilles Filippini· Mar 3, 2014, 14:53 UTC · re: Gilles Filippini · lore

Re: [PATCH] contrib/subtree - unset prefix before proceeding

Hi,

Any chance to have this patch considered? Thanks in advance,

_g.

Gilles Filippini a écrit , Le 01/03/2014 17:33:

Show 24 quoted lines

> This is to prevent unwanted prefix when such an environment variable
> exists. The case occurs for example during the Debian package build
> where the git-subtree test suite is called with 'prefix=/usr', which
> makes test 21 fail:
> not ok 21 - Check that prefix argument is required for split
> 
> Signed-off-by: Gilles Filippini <gilles.filippini@free.fr>
> ---
>  contrib/subtree/git-subtree.sh | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
> index dc59a91..db925ca 100755
> --- a/contrib/subtree/git-subtree.sh
> +++ b/contrib/subtree/git-subtree.sh
> @@ -46,6 +46,7 @@ ignore_joins=
>  annotate=
>  squash=
>  message=
> +prefix=
>  
>  debug()
>  {
>