summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-28 20:50:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-28 20:50:59 (GMT)
commitfe2a4f1591db57473b296a004a7b1c74449aa53b (patch)
treecc69f87bcaa6ede92919d6dfc674fc13efbeefe4
parent0ddcc9cfbadfca928334bbd008ad2365e1543f45 (diff)
parentcba5e28426a5c9728d883171e4e5e287ab17136a (diff)
downloadgit-fe2a4f1591db57473b296a004a7b1c74449aa53b.zip
git-fe2a4f1591db57473b296a004a7b1c74449aa53b.tar.gz
git-fe2a4f1591db57473b296a004a7b1c74449aa53b.tar.bz2
Merge branch 'jk/subtree-prefix'
A stray environment variable $prefix could have leaked into and affected the behaviour of the "subtree" script. * jk/subtree-prefix: subtree: initialize "prefix" variable
-rwxr-xr-xcontrib/subtree/git-subtree.sh1
1 files changed, 1 insertions, 0 deletions
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()
{