mirror of
https://github.com/kellymichels/zscripts-token-savers
synced 2026-10-07 07:18:18 +00:00
Kelly Michels
eedb95bbf1
With deploy.gitPull set, Invoke-DeployGitPull ran `git pull --ff-only`. Pull merges whatever .git/FETCH_HEAD marks "for merge", and a concurrent fetch in the same repo - an editor's background auto-fetch racing the deploy - can leave duplicate for-merge lines. Pull then dies with "Cannot fast-forward to multiple branches" even when both lines name the same commit. Reproduced live on 2026-08-13: the deploy failed at step 0, and by inspection time the same pull succeeded, with the duplicated FETCH_HEAD entries as the only evidence. Now the function fetches explicitly and fast-forwards against the remote-tracking ref: git fetch origin git merge --ff-only origin/$branch Identical fast-forward-or-refuse semantics, but nothing shared and mutable in the path. A failed fetch and a failed merge now also throw distinct messages, so the operator knows which half broke. CHECKSUMS.txt refreshed alongside, per the manifest rule. Tested: PS 5.1 parse clean; full Pester suite 222/222 after the manifest refresh (the 3 pre-refresh failures were the checksum suite correctly flagging the edited file). The same fix pattern was exercised against live and scratch repos for the private twin (evomedia-net/evo.scripts#58): behind -> fast-forwards, diverged -> refuses and aborts the deploy. Closes #48
43 lines
3.3 KiB
Plaintext
43 lines
3.3 KiB
Plaintext
cd12ece1106154b6d8dc4cd52bea22abe6454771eece7d060228e939a4716621 setup_backup_schedule.ps1
|
|
cfc3ed1c5f06d2964414ca71e6627291ed4b4144b69e215aed1ac898ca3ebea9 token-count.ps1
|
|
c52ebf2d8265326c2cbb55b1180c6f2674099ba8df935490e7af24f80255166a zbackup.cmd
|
|
aa9ce0f3bc6a3b8162d9d42c5a83d9e0d49676742c03b7c3c5455afc52af91f5 zbackup.ps1
|
|
1a51c45274018553377af663259c4a3d3c56802570d3f3c9498c85acc75864ff zbackup_and_sync.ps1
|
|
8e184223569b2f5fe507a2aaa891a6002279fda4d9a501b8bc612bb7a8104171 zbackup_ec2.cmd
|
|
8fe09189f5ae7f0bbd48945c82fc496b0d1c2df2d5459161f06277d01ddef51f zbackup_ec2.ps1
|
|
5ec970ac632fe24c2cdc4371fa53a2956601c5f82559cf7ba68d77738f2d7143 zchecksums.cmd
|
|
fa2916c175bf9212c470bf423b11eda363f1f46f2ea12d5fd9fa3db59ee17c60 zchecksums.ps1
|
|
935b14e87d0aba31ffe9f1b80a0cc6c13f88f20e0c3c4905ab7aa7e0fb8d4919 zdeploy.cmd
|
|
ce72a334f83622634a2a76e546313f3b7937783d9d31150208f29761789b1d53 zdeploy.ps1
|
|
c92343ce16e82210bfbdccd6ea7866ee4f0b2e0f035cf9605aa6bb35c0ba5209 zec2.cmd
|
|
86e9ff98a13465334051197cd082b50d1a7e6bbf55bb569cb5ce52be810b97e6 zec2.ps1
|
|
0a601ce4669c2866ecbfc9d25914a3f77a300739b764d51183eb2642b63aabd2 zec2_rotatekeys.cmd
|
|
af3d16e3f49b61ad1d31130a0d2c8bc2235c0319a4b67585f06a1ca684ecec65 zec2_rotatekeys.ps1
|
|
4b5c24e9fdc7963d3ac4bddb69f93850adc5a43d8b18b6e948d7e8a768e2765a zec2online.cmd
|
|
9d5cbf647c5e4f49a1fb0a42bd8746ac2e72f3db639ef2d3be31d7c6fe8582ef zec2online.ps1
|
|
8d70ff9d6dd3211461af4e1531c205414972756af44b88cd6c146852a51f82a2 ZHelpers.ps1
|
|
0a4ff2f6f220d9bde73ac19c0e19bbf5abf338f11f15bd22b90d788dabd6d9b2 zkill.cmd
|
|
8172c4d8d2c64aa1ec4b6a1a4983aece3277e248b510994b116c3024ef661874 zkill.ps1
|
|
1b25ce0848d22e1ac579287fac05da21458b59b94e09ed192282ac548516a3ce ZKiller.ps1
|
|
c8e0f0bf32a048ff286e7f923f6b91b8bdabd2c38066b3b967926e5fc2736e13 ZKillOnly.ps1
|
|
f63ab0f1ad1ff1fa7f9b9fdb7835473c69e441f796222d7dd367e1809111350a zrelease.cmd
|
|
afc1168f99feacad11f560668c2ef0a25126d16086973438884d513bfed5c1cb zrelease.ps1
|
|
91bd30d5b4a33957fdb6de85b1cf4457ef293459eb7c5aaeb6b9ea10db7de7e1 zrepair.cmd
|
|
1f73207fc2570eb2bb33a11523e36e2be76327576c40e50276c10b0eebbd0354 zrepair.ps1
|
|
cc83e71328bd3dd64d7c77786f38863f7758aeee8abe9945819fdd66848cf628 zrestart.cmd
|
|
0021eeacef03f0acbafa9c528fee28f2c7465af6379413ad3bf3be0d08e1a489 zrestart.ps1
|
|
9e217ba1623f49c31d515053b74751460b790d4528417c609691a171843b0552 zrestartd.cmd
|
|
aff72462b0c4ca517d29e9eae582cfbfba08bc3e2dcfae64698ad4252bd6d780 zsetup.cmd
|
|
9890e0665129364fd282f6b4dd1edff96b06bf6c6ace3a2dcfc1d2f954e39603 zsetup.ps1
|
|
72754ef72b4c2276410e17d9ded8aff22c49d272c735766ffe388a262f3bb6e8 zsetup_mail.ps1
|
|
8f57573619a7417aab35a1e5331887c5733007b11bf0de71183711c6ab137e89 zstart.cmd
|
|
49a9de79fbf1631b955a3e4febff0ace7be61bb2712c1556c081a2db9f725e14 zstart.ps1
|
|
c026c4546e27f963a765dd5ca2dfc83081966659ea1eb16815f28c9a13c293c0 zstart_docker.cmd
|
|
fe862e4bcf0b484113e5612958c579d5e53c9dbdf3b8312d7500d82bb6a2fcc5 zstart_docker.ps1
|
|
f908c66220691c17597fa0f3585e99211c7da80b4caf3df017710c1d839fc92e zstartd.cmd
|
|
31e8bafec708b533267b686d3568683ca466bdf6b513128ce879c7a7adbb8577 zstop.ps1
|
|
95894987bf708fc7ef05bfd4cf967a37b293cbc13a9266d381d4ca42f49b6ab5 zsync.cmd
|
|
8ac272f294364bebf169ffce278e5eb824cfe26e01e2b1a4665943010bdbf44c zsync.ps1
|
|
3dd54e4d66bd05c3d6a229e431263fb390d2c97fe098a92517f681a8182fb00e zversion.cmd
|
|
37d96ed56ff2ba72ceda5246634f53076cc588d9cc5ac7f898dde07285931d68 zversion.ps1
|