From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Mar 2014 20:50:59 +0000 (-0700)
Subject: Merge branch 'jk/subtree-prefix'
X-Git-Tag: v2.0.0-rc0~56
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fe2a4f1591db57473b296a004a7b1c74449aa53b?hp=0ddcc9cfbadfca928334bbd008ad2365e1543f45

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
---

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