From a622d90bbeccf29319dc2c3142a93ae1010648fe Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Thu, 9 Mar 2006 21:53:54 +0000 Subject: [PATCH] gitmergeonefile.py should use git.get_base_dir() ... instead of assuming ".git". Signed-off-by: Catalin Marinas --- gitmergeonefile.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/gitmergeonefile.py b/gitmergeonefile.py index 2f327a3..99882c8 100755 --- a/gitmergeonefile.py +++ b/gitmergeonefile.py @@ -35,6 +35,7 @@ if bin == 'bin' and prefix != sys.prefix: from stgit.config import config from stgit.utils import append_string +from stgit.git import get_base_dir # @@ -53,15 +54,6 @@ else: # -# Global variables -# -if 'GIT_DIR' in os.environ: - base_dir = os.environ['GIT_DIR'] -else: - base_dir = '.git' - - -# # Utility functions # def __str2none(x): @@ -113,7 +105,7 @@ def __remove_files(): def __conflict(): """Write the conflict file for the 'path' variable and exit """ - append_string(os.path.join(base_dir, 'conflicts'), path) + append_string(os.path.join(get_base_dir(), 'conflicts'), path) sys.exit(1) -- 2.11.0