OK, pushing (even without rebase) is now working for me.
On Mon, Oct 24, 2016 at 2:14 PM, Tim Armstrong <[email protected]> wrote: > Yeah, I think I probably clobbered whatever commit was there before with my > force push. > > On Mon, Oct 24, 2016 at 2:13 PM, Henry Robinson <[email protected]> wrote: > >> Ah, that might be something magit-push did in Emacs - I was trying to push >> from Emacs and it clearly didn't do the right thing. I think we can delete >> that new branch. >> >> On 24 October 2016 at 14:06, Jim Apple <[email protected]> wrote: >> >>> Doing a git fetch of the gerrit server, I see >>> >>> * [new branch] refs/for/master -> gerrit-asf/refs/for/master >>> >>> I'm not sure what's going on with that - the "master" branch is pushed >>> to by "refs/for/master" or "refs/drafts/master", so this could be a >>> typo of some sort. >>> >>> The commit 119bff3ac17f847f1a4137ea56707c72cd1119be is on >>> refs/for/master without a "Reviewed-on" line. Tim, could you take a >>> look? It's >>> >>> IMPALA-1430,IMPALA-4108: codegen all builtin aggregate functions >>> >>> On Mon, Oct 24, 2016 at 1:57 PM, Jim Apple <[email protected]> wrote: >>> > What do you think we should force-push? >>> > >>> > What did we do to cause it, and how can we avoid it in the future? >>> > >>> > On Mon, Oct 24, 2016 at 12:40 PM, Henry Robinson <[email protected]> >>> wrote: >>> >> I also saw the same thing. The way I got around it was to try pushing >>> to >>> >> /drafts/ and then publishing it, which worked. >>> >> >>> >> We might need to force-push to gerrit/master to clean this up. >>> >> >>> >> On 24 October 2016 at 12:37, Lars Volker <[email protected]> wrote: >>> >> >>> >>> I tried to push another patch set to Gerrit and got the error below. >>> This >>> >>> worked about an hour ago and now stopped working. The local parent >>> commit >>> >>> is the same one as remote, I didn't rebase either. Has anyone seen >>> this >>> >>> before? I suspect I can rebase but then the review gets much more >>> tedious >>> >>> to follow. >>> >>> >>> >>> Thanks, Lars >>> >>> >>> >>> ✔ ~/i2(i2521) ✗$ git push asf HEAD:refs/for/master >>> >>> To ssh://gerrit.cloudera.org:29418/Impala-ASF >>> >>> ! [rejected] HEAD -> refs/for/master (non-fast-forward) >>> >>> error: failed to push some refs to 'ssh:// >>> >>> [email protected]:29418/Impala-ASF' >>> >>> 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. >>> >>> ✗ ~/i2(i2521) ✗$ >>> >>> >>> >> >>> >> >>> >> >>> >> -- >>> >> Henry Robinson >>> >> Software Engineer >>> >> Cloudera >>> >> 415-994-6679 >>> >> >> >> >> -- >> Henry Robinson >> Software Engineer >> Cloudera >> 415-994-6679 >>
