[PATCH] contrib/subtree - unset prefix before proceeding

Subsystems: the rest

STALE3736d

2 messages, 1 author, 2016-06-15 · open the first message on its own page

[PATCH] contrib/subtree - unset prefix before proceeding

From: Gilles Filippini <hidden>
Date: 2016-06-15 23:00:08 

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 <redacted>
---
 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()
 {
-- 
1.9.0

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

From: Gilles Filippini <hidden>
Date: 2016-06-15 23:00:09 

Hi,

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

_g.

Gilles Filippini a écrit , Le 01/03/2014 17:33:
quoted hunk
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 <redacted>
---
 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()
 {
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help