diff --git a/guw/main.py b/guw/main.py index 378b723..69beadb 100644 --- a/guw/main.py +++ b/guw/main.py @@ -199,7 +199,7 @@ def _sync_at(self, tmpdir, backup, local, features, prev_feature, interactive): self._backup_feature(repo, feature, backup) # Use the new branch to integrate from repo.git.reset("--hard", feature["integrating_from"]) - self._rebase(repo, feature, prev_feature, prev_active_feature, backup) + self._rebase(repo, feature, prev_feature, prev_active_feature, backup=False) prev_active_feature = feature prev_feature = feature has_pending = True diff --git a/tests/test_update.py b/tests/test_update.py index 4e87ae6..768309e 100644 --- a/tests/test_update.py +++ b/tests/test_update.py @@ -76,7 +76,7 @@ def test_update(self): ] guw = GUW(tomli.loads(config)) guw.update( - False, + True, True, True, self.tmpdir,