[tor-bugs] #30286 [Core Tor/Tor]: pre-push git hook will warn about fixups for no reason

["Tor Bug Tracker & Wiki" <blackhole@xxxxxxxxxxxxxx>]

#30286: pre-push git hook will warn about fixups for no reason
------------------------------+--------------------------------
     Reporter:  asn           |      Owner:  (none)
         Type:  defect        |     Status:  new
     Priority:  Medium        |  Milestone:  Tor: 0.4.1.x-final
    Component:  Core Tor/Tor  |    Version:
     Severity:  Normal        |   Keywords:  tor-ci git-scripts
Actual Points:                |  Parent ID:
       Points:  0.2           |   Reviewer:
      Sponsor:                |
------------------------------+--------------------------------
 {{{
 $ git push github bug30076_conflict
 Enter passphrase for key '/home/f/.ssh/id_rsa':
 Enter passphrase for key '/home/f/.ssh/id_rsa':
 Running pre-push hook
 Found fixup! commit in refs/heads/bug30076_conflict, not pushing
 If you really want to push this, use --no-verify.
 }}}

 My pre-push hook does not allow me to push a branch even tho it should.
 First of all, because the branch is going to github and not upstream, and
 most importantly because there is no fixup in my part of the branch. There
 might be fixups down in history but I'm not repsonsible for those and I
 cannot do anything about them/.

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/30286>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online

_______________________________________________
tor-bugs mailing list
tor-bugs@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs