... instead of assuming ".git".
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
from stgit.config import config
from stgit.utils import append_string
+from stgit.git import get_base_dir
#
keeporig = 'yes'
-#
-# Global variables
-#
-if 'GIT_DIR' in os.environ:
- base_dir = os.environ['GIT_DIR']
-else:
- base_dir = '.git'
-
-
#
# Utility functions
#
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)