From 026cd23c801687b4070a44891dbe439a8be1a73b Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Fri, 5 Nov 2021 16:39:36 +0100 Subject: 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. --- gbp/scripts/pull.py | 6 ------ 1 file changed, 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) -- cgit v1.2.3