Package: git
Version: 1:1.7.2.5-3
Severity: minor
In the Xen Project's CI system we have had what appears to be a
one-off failure to git push with an implausible error message - "not
fast forward", when it was.
Some time between 2014-07-01 21:42:29 Z and 2014-07-01 21:45:41 Z:
+ cd /export/home/osstest/repos/libvirt
+ git push osst...@xenbits.xensource.com:/home/xen/git/libvirt.git
ec7b92257673498d7ba6daa55f9723a421c51da6:xen-tested-master
To osst...@xenbits.xensource.com:/home/xen/git/libvirt.git
! [rejected] ec7b92257673498d7ba6daa55f9723a421c51da6 ->
xen-tested-master (non-fast-forward)
error: failed to push some refs to
'osst...@xenbits.xensource.com:/home/xen/git/libvirt.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.
Just now:
iwj@xenbits:/home/xen/git/libvirt.git$ ls -al refs/heads/
total 12
drwxrwxr-x 2 xen xen 4096 Jun 29 01:20 .
drwxrwxr-x 4 xen xen 4096 Apr 14 11:34 ..
-rw-rw-r-- 1 osstest osstest 41 Jun 29 01:20 xen-tested-master
iwj@xenbits:/home/xen/git/libvirt.git$ cat refs/heads/xen-tested-master
b963ca06d4b99e8db71c85b8800aae3c99de6bcb
iwj@xenbits:/home/xen/git/libvirt.git$ find -name \*refs\*
./refs
iwj@xenbits:/home/xen/git/libvirt.git$ date
Fri Jul 4 11:53:28 UTC 2014
iwj@xenbits:/home/xen/git/libvirt.git$
$ pwd
/u/iwj/work/libvirt
$ git-merge-base ec7b92257673498d7ba6daa55f9723a421c51da6
b963ca06d4b99e8db71c85b8800aae3c99de6bcb
b963ca06d4b99e8db71c85b8800aae3c99de6bcb
$
Attempting exactly the same push again (cutting and pasting the rune
into a shell) worked.
In our setup, at least, the probability of this (spurious and
intermittent) failure is very low.
I'm filing this bug report for three reasons
(a) maybe someone will already know what causes this and offer
a workaround or a fix
(b) maybe someone will suggest some useful debugging techiques
(c) to create a public record so that if this happens to anyone
else they won't think they are hallucinating!
Thanks,
Ian.
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
