diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-19 23:32:05 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-19 23:32:05 +0100 |
| commit | 6ca8fc34478200c04b47c508e4874508e153b9fd (patch) | |
| tree | db4cf5cdbbde1d4c2ef3d062500276ed2dd3f0ba /src/backend/libsisyphus.py | |
| parent | 4f8dc859886bc3f9dbbc45e284b6f46f82179f45 (diff) | |
bugfix :
* fatal: refusing to merge unrelated histories
* although shallow clones are MUCH faster, they cause some issues with diverging history
* do a full clone when changing branches, and pull the full history when updating
Diffstat (limited to 'src/backend/libsisyphus.py')
| -rw-r--r-- | src/backend/libsisyphus.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py index e6a2d76..99bea8a 100644 --- a/src/backend/libsisyphus.py +++ b/src/backend/libsisyphus.py @@ -173,14 +173,14 @@ def syncLocalDatabase(): def syncPortageTree(): os.chdir(gentooEbuildDir) - subprocess.call(['git', 'pull', '--depth=1', '--update-shallow', '--quiet']) + subprocess.call(['git', 'pull', '--quiet']) os.chdir(redcoreEbuildDir) - subprocess.call(['git', 'pull', '--depth=1', '--update-shallow', '--quiet']) + subprocess.call(['git', 'pull', '--quiet']) def syncPortageCfg(): os.chdir(portageConfigDir) - subprocess.call(['git', 'pull', '--depth=1', '--update-shallow', '--quiet']) + subprocess.call(['git', 'pull', '--quiet']) def cleanCacheDir(): if os.path.isdir(portageCacheDir): @@ -547,7 +547,7 @@ def setPortageEnvStable(): os.chdir(gentooEbuildDir) subprocess.call(['git', 'init', '-q']) subprocess.call(['git', 'remote', 'add', 'origin', 'https://pagure.io/redcore/portage.git']) - subprocess.call(['git', 'pull', '--depth=1', 'origin', 'master']) + subprocess.call(['git', 'pull', 'origin', 'master']) subprocess.call(['git', 'branch', '-u', 'origin/master', 'master']) if not os.path.isdir(os.path.join(redcoreEbuildDir, '.git')): @@ -555,7 +555,7 @@ def setPortageEnvStable(): os.chdir(redcoreEbuildDir) subprocess.call(['git', 'init', '-q']) subprocess.call(['git', 'remote', 'add', 'origin', 'https://pagure.io/redcore/redcore-desktop.git']) - subprocess.call(['git', 'pull', '--depth=1', 'origin', 'master']) + subprocess.call(['git', 'pull', 'origin', 'master']) subprocess.call(['git', 'branch', '-u', 'origin/master', 'master']) if not os.path.isdir(os.path.join(portageConfigDir, '.git')): @@ -563,7 +563,7 @@ def setPortageEnvStable(): os.chdir(portageConfigDir) subprocess.call(['git', 'init', '-q']) subprocess.call(['git', 'remote', 'add', 'origin', 'https://pagure.io/redcore/redcore-build.git']) - subprocess.call(['git', 'pull', '--depth=1', 'origin', 'master']) + subprocess.call(['git', 'pull', 'origin', 'master']) subprocess.call(['git', 'branch', '-u', 'origin/master', 'master']) def setPortageEnvTesting(): @@ -572,7 +572,7 @@ def setPortageEnvTesting(): os.chdir(gentooEbuildDir) subprocess.call(['git', 'init', '-q']) subprocess.call(['git', 'remote', 'add', 'origin', 'https://pagure.io/redcore/portage.git']) - subprocess.call(['git', 'pull', '--depth=1', 'origin', 'next']) + subprocess.call(['git', 'pull', 'origin', 'next']) subprocess.call(['git', 'branch', '-u', 'origin/next', 'master']) if not os.path.isdir(os.path.join(redcoreEbuildDir, '.git')): @@ -580,7 +580,7 @@ def setPortageEnvTesting(): os.chdir(redcoreEbuildDir) subprocess.call(['git', 'init', '-q']) subprocess.call(['git', 'remote', 'add', 'origin', 'https://pagure.io/redcore/redcore-desktop.git']) - subprocess.call(['git', 'pull', '--depth=1', 'origin', 'next']) + subprocess.call(['git', 'pull', 'origin', 'next']) subprocess.call(['git', 'branch', '-u', 'origin/next', 'master']) if not os.path.isdir(os.path.join(portageConfigDir, '.git')): @@ -588,7 +588,7 @@ def setPortageEnvTesting(): os.chdir(portageConfigDir) subprocess.call(['git', 'init', '-q']) subprocess.call(['git', 'remote', 'add', 'origin', 'https://pagure.io/redcore/redcore-build.git']) - subprocess.call(['git', 'pull', '--depth=1', 'origin', 'next']) + subprocess.call(['git', 'pull', 'origin', 'next']) subprocess.call(['git', 'branch', '-u', 'origin/next', 'master']) def setHardenedProfile(): |