Fix IT

SwissDataScienceCenter · Oct 22, 2021 · b9ed7c8 · b9ed7c8
1 parent bde0bd2
commit b9ed7c8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/renku/core/commands/save.py b/renku/core/commands/save.py
@@ -198,6 +198,7 @@ def repo_sync(repo, message=None, remote=None, paths=None):
             raise errors.GitError(f"Couldn't push changes. Reason:\n{msg}")
 
     except git.exc.GitCommandError as e:
+        breakpoint()
         raise errors.GitError("Cannot push changes") from e
 
     return saved_paths, pushed_branch
diff --git a/renku/service/controllers/utils/project_clone.py b/renku/service/controllers/utils/project_clone.py
@@ -40,7 +40,11 @@ def user_project_clone(cache, user_data, project_data):
                 path=project.abs_path,
                 depth=project_data["depth"],
                 raise_git_except=True,
-                config={"user.name": project_data["fullname"], "user.email": project_data["email"]},
+                config={
+                    "user.name": project_data["fullname"],
+                    "user.email": project_data["email"],
+                    "pull.rebase": False,
+                },
                 checkout_rev=project_data["ref"],
             )
         ).output