Segfault on publish

[alerque]

I've been using aurpublish for some time to manage this repository of AUR packages that I (co-)maintain. I've gotten into a few messes (usually because I work on packages from more than one machine and then have to cobble the history together without breaking git subtree) but am usually able to get out of them. All packages do publish...except one.

For some reason my chomsky-font base package has gone wonky. My usual bump routine ended with a segfault. Because I was on hardware with a serious south bridge issue I kind of just ignored it and figured it had memory problems. I pushed the commit to my repo without getting the subtree pushed to the AUR.

Now I'm trying from another machine with stable hardware and realize there is still a problem:

$ pwd
/home/caleb/projects/aur/chomsky-font
$ aurpublish $(basename $PWD)
git push using:  aur:chomsky-font.git master
/usr/lib/git-core/git-subtree: line 757: 98078 Done                    eval "$grl"
     98079 Segmentation fault      (core dumped) | while read rev parents; do
    process_split_commit "$rev" "$parents" 0;
done

I've tried a few things such as checking out the repository before the last commit on that package, running aurpublish -p chomsky-font, and redoing the bump. Nothing flies, for some reason any attempt I make to publish that package to the AUR now results in a segfault no matter what machine I try from.

[eli-schwartz]

I don't get this problem, but I do get a different one:

$ aurpublish chomsky-font 
git push using:  aur@aur.archlinux.org:chomsky-font.git master
To aur.archlinux.org:chomsky-font.git
 ! [rejected]          9f6cf88afbe3391ac38cbf0b96f28b8169d3caba -> master (non-fast-forward)
error: failed to push some refs to 'aur.archlinux.org:chomsky-font.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Looks like the chomsky-font 2.1-1 update got successfully pushed to the AUR, then later amended locally.

[alerque]

That's possible, but how do I fix it? Usually when that happens I can aurpublish -p to completely reset the subtree, then cherry pick any later commits back into place and publish again. For some reason that isn't working for this repository. What's the most correct way to dig out of this hole?