Marown/git-filter-repo
1
0
Fork 0
mirror of https://github.com/newren/git-filter-repo.git synced 2024-07-06 18:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

filter-repo: move git_dir determination into function for future re-use

Browse Source 
Signed-off-by: Elijah Newren <newren@gmail.com>
This commit is contained in:
Elijah Newren 2018-08-28 20:58:38 -07:00
parent 4fed91af18
commit 40f90c9cb8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git-filter-repo
View File

@ -1119,6 +1119,10 @@ def is_repository_bare():
output = subprocess.check_output('git rev-parse --is-bare-repository'.split())
return (output.strip() == 'true')
def determine_git_dir():
output = subprocess.check_output('git rev-parse --git-dir'.split())
return output.strip()
def sanity_check(refs, is_bare):
def abort(reason):
raise SystemExit(
@ -1140,7 +1144,7 @@ def sanity_check(refs, is_bare):
# Avoid letting people running with weird setups and overwriting GIT_DIR
# elsewhere
git_dir = subprocess.check_output('git rev-parse --git-dir'.split()).strip()
git_dir = determine_git_dir()
if is_bare and git_dir != '.':
abort("GIT_DIR must be .")
elif not is_bare and git_dir != '.git':
@ -1208,8 +1212,12 @@ def tweak_commit(args, commit):
def run_fast_filter():
args = get_args()
# Determine basic repository information
orig_refs = get_refs()
is_bare = is_repository_bare()
# Do sanity checks
if not args.force:
sanity_check(orig_refs, is_bare)