aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJochen Sprickerhof <git@jochen.sprickerhof.de>2021-11-05 16:39:36 +0100
committerJochen Sprickerhof <git@jochen.sprickerhof.de>2024-01-14 17:33:55 +0100
commit026cd23c801687b4070a44891dbe439a8be1a73b (patch)
tree1e3ae589c9c793d5ba6f8a287fd78bcbf25fc95f
parentef0211c5639259f504e49b947cf1c6896b78de16 (diff)
pull: Allow pull in unclean repos
This works just fine when git can fast forward, i.e. with untracked content or changes in tracked files that are not touched by the commits. In case fast forward is not possible gbp will complain anyhow.
-rwxr-xr-xgbp/scripts/pull.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/gbp/scripts/pull.py b/gbp/scripts/pull.py
index d8ece701..59903976 100755
--- a/gbp/scripts/pull.py
+++ b/gbp/scripts/pull.py
@@ -177,12 +177,6 @@ def main(argv):
else:
raise
- (ret, out) = repo.is_clean()
- if not ret:
- gbp.log.err("You have uncommitted changes in your source tree:")
- gbp.log.err(out)
- raise GbpError
-
repo.fetch(rem_repo, depth=options.depth)
repo.fetch(rem_repo, depth=options.depth, tags=True)