PullReps: merge local main, instead of remote main

SunSerega · Apr 3, 2024 · 35ad6f4 · 35ad6f4
1 parent fdcce99
commit 35ad6f4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/DataScraping/Reps/PullReps.pas b/DataScraping/Reps/PullReps.pas
@@ -62,12 +62,15 @@ procedure PullRep(name, branch, nick: string);
 
   ExecCommands(path, nick, nil
     , $'echo [checkout] && git checkout {branch} 2>&1'
-    , $'echo [pull] && git pull {remote_official} main & echo [pull-own]: && git pull {remote_own} {branch}'
+    , $'echo [pull-own]: && git pull {remote_own} {branch}'
+    , $'echo [fetch-main] && git fetch {remote_official} main:main'
+    , $'echo [merge-main] && git merge main'
   );
 
   if not disable_push then
     ExecCommands(path, nick, |'console only'|
-      , $'echo [push] && git push {remote_own} {branch} || cd .'
+      , $'echo [push main] && git push {remote_own} main || cd .'
+      , $'echo [push {branch}] && git push {remote_own} {branch} || cd .'
     );
 
   Otp($'Done pulling {nick}');

diff --git a/Log/PullUpstream.log b/Log/PullUpstream.log
@@ -1,32 +1,30 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Update Reps ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Runing SubReps Update
 SubReps Update: Pulling OpenCL
-SubReps Update: cmd /c "(echo [checkout] && git checkout custom 2>&1) && (echo [pull] && git pull 0_official main & echo [pull-own]: && git pull SunSerega custom)"
+SubReps Update: cmd /c "(echo [checkout] && git checkout custom 2>&1) && (echo [pull-own]: && git pull SunSerega custom) && (echo [fetch-main] && git fetch 0_official main:main) && (echo [merge-main] && git merge main)"
 SubReps Update: OpenCL[OUT] : [checkout]
 SubReps Update: OpenCL[OUT] : Your branch is up to date with 'SunSerega/custom'.
 SubReps Update: OpenCL[OUT] : Already on 'custom'
-SubReps Update: OpenCL[OUT] : [pull]
-SubReps Update: OpenCL[ERR] : From KhronosGroup/OpenCL-Docs
-SubReps Update: OpenCL[ERR] : * branch main -> FETCH_HEAD
-SubReps Update: OpenCL[OUT] : Already up to date.
 SubReps Update: OpenCL[OUT] : [pull-own]:
 SubReps Update: OpenCL[ERR] : From SunSerega/OpenCL-Docs
 SubReps Update: OpenCL[ERR] : * branch custom -> FETCH_HEAD
 SubReps Update: OpenCL[OUT] : Already up to date.
+SubReps Update: OpenCL[OUT] : [fetch-main]
+SubReps Update: OpenCL[OUT] : [merge-main]
+SubReps Update: OpenCL[OUT] : Already up to date.
 SubReps Update: Done pulling OpenCL
 SubReps Update: Pulling OpenGL
-SubReps Update: cmd /c "(echo [checkout] && git checkout custom 2>&1) && (echo [pull] && git pull 0_official main & echo [pull-own]: && git pull SunSerega custom)"
+SubReps Update: cmd /c "(echo [checkout] && git checkout custom 2>&1) && (echo [pull-own]: && git pull SunSerega custom) && (echo [fetch-main] && git fetch 0_official main:main) && (echo [merge-main] && git merge main)"
 SubReps Update: OpenGL[OUT] : [checkout]
 SubReps Update: OpenGL[OUT] : Your branch is up to date with 'SunSerega/custom'.
 SubReps Update: OpenGL[OUT] : Already on 'custom'
-SubReps Update: OpenGL[OUT] : [pull]
-SubReps Update: OpenGL[ERR] : From KhronosGroup/OpenGL-Registry
-SubReps Update: OpenGL[ERR] : * branch main -> FETCH_HEAD
-SubReps Update: OpenGL[OUT] : Already up to date.
 SubReps Update: OpenGL[OUT] : [pull-own]:
 SubReps Update: OpenGL[ERR] : From SunSerega/OpenGL-Registry
 SubReps Update: OpenGL[ERR] : * branch custom -> FETCH_HEAD
 SubReps Update: OpenGL[OUT] : Already up to date.
+SubReps Update: OpenGL[OUT] : [fetch-main]
+SubReps Update: OpenGL[OUT] : [merge-main]
+SubReps Update: OpenGL[OUT] : Already up to date.
 SubReps Update: Done pulling OpenGL
 Finished runing SubReps Update
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Scrap XML ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~