On 1/5/26 14:15, Rob Landley wrote:
On 12/16/25 08:05, enh wrote:
ping?
For some reason I thought I'd already applied this one.
Looking at it again, the #defines at the top put me off, but it's
certainly been long enough to tip over into "apply now, fix up later"...
To ssh://github.com/landley/toybox
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'ssh://github.com/landley/toybox'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
What the...
https://github.com/landley/toybox/commit/2e359788808b
That's supposed to be removed from the tree and orphaned via force push,
it only exists to close issues without the web interface:
$ cat gitwhack.sh
#!/bin/bash
[ "$1" -gt 1 ] || { echo "Needs numeric argument"; exit 1;}
touch dummy &&
git add dummy &&
git commit -F <(echo "Closes #$1"; cat ../whacker.txt) dummy &&
git push ssh://[email protected]/landley/toybox &&
git reset HEAD^1 &&
rm dummy &&
sleep 5 &&
git push --force ssh://[email protected]/landley/toybox
I've done this a bunch of times and it worked fine:
https://github.com/landley/toybox/issues/561
Did microsoft github start rejecting force pushes?
Right, the version on microsoft github is broken now. I need to finish
setting up my codeberg account...
Rob
_______________________________________________
Toybox mailing list
[email protected]
http://lists.landley.net/listinfo.cgi/toybox-landley.net
