git-sync: Use proper thing
This commit is contained in:
parent
a7e2b49bea
commit
9389d1d284
|
@ -19,10 +19,10 @@ in
|
|||
cd "${r.path}"
|
||||
if [ -d .jj ]
|
||||
then
|
||||
jj git fetch
|
||||
jj rebase -d main@origin
|
||||
jj branch set main -r @-
|
||||
jj git push
|
||||
${lib.getExe pkgs.jujutsu} git fetch
|
||||
${lib.getExe pkgs.jujutsu} rebase -d main@origin
|
||||
${lib.getExe pkgs.jujutsu} branch set main -r @-
|
||||
${lib.getExe pkgs.jujutsu} git push
|
||||
else
|
||||
${pkgs.git}/bin/git --no-optional-locks diff --quiet || echo "Repository is dirty!"
|
||||
${pkgs.git}/bin/git pull || true
|
||||
|
|
Loading…
Reference in a new issue