* Marcel Korpel (Wed, 10 Jun 2015 19:25:30 +0200):

$ git rebase -i HEAD~2

This opens an editor with the last two commits, where you can squash a previous revision into a later one.

My bad, talked too soon: you actually squash a revision into a *previous* one.

I'm guessing, but AUR4 probably does not allow rewriting history (non-fast-forward merges), or forced pushes. On Wed, Jun 10, 2015 at 2:02 PM, SpinFlo wrote:

2015-06-10 19:26 GMT+02:00 Marcel Korpel :

...

* Marcel Korpel (Wed, 10 Jun 2015 19:25:30 +0200):

...

$ git rebase -i HEAD~2

This opens an editor with the last two commits, where you can squash a previous revision into a later one.

My bad, talked too soon: you actually squash a revision into a *previous* one.

Hi @marcel

nope, not work, or I not understand how works :S

when I edit with git rebase -i HEAD~5, and changing pick with squash (only one leave with pick) and editing the message commit, say all is ok. but when try to push the changes in [aur4] get the same fail like a message OP

any help?

greetings

Hi,

...

I'm guessing, but AUR4 probably does not allow rewriting history (non-fast-forward merges), or forced pushes.

I think so too but as his code pasting showed just a simple push. Did you try to do git push --force?

└───╼ git push --force Counting objects: 4, done. Delta compression using up to 24 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (4/4), 874 bytes | 0 bytes/s, done. Total 4 (delta 2), reused 1 (delta 1) remote: error: denying non-fast-forward refs/heads/master (you should pull first) To ssh+git://aur4.archlinux.org/libqgit2-git.git ! [remote rejected] master -> master (non-fast-forward) error: failed to push some refs to 'ssh+git://aur4.archlinux.org/libqgit2-git.git' :/

2015-06-10 21:04 GMT+02:00 Eli Schwartz :

The AUR4 does not allow rewriting history. Even if it did allow it, you'd have to use `--force` to push a non-fast-forward change, but it is a moot point because the AUR is set up to deny non-fast-forwards regardless. ;)

I believe the reason is to prevent malicious individuals from adopting an orphaned package and deleting the history. (Part of) the reason we are moving toward git repositories for package maintenance is in order to track package history without the need for *non-official* resources e.g. http://pkgbuild.com/git/aur-mirror.git/ -- if maintainers were allowed to delete history, that would be slightly counter-productive. :(

We can't delete our embarrassing mistakes anymore. :-P (Not that we could before, I guess, since it is mirrored, but now our mistakes are on official record.)

-- Eli Schwartz

ok then in the next time I'll be more careful. (I hope not fill pages and pages and pages of failures in the history) XD greetings