From: Andy Parkins <andyparkins@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: Something wrong with next in main git repository?
Date: Fri, 7 Mar 2008 11:29:21 +0000 [thread overview]
Message-ID: <200803071129.21551.andyparkins@gmail.com> (raw)
Hello,
I've been keeping up with development only intermittently lately, and just got
a warning from git fetch (in my git directory) that the update to my 'next'
tracking branch was rejected as not being a fast forward.
I renamed my current up/next to up/oldnext and fetched the latest next, so I
had up/oldnext and up/next to compare. I'm probably concerned over nothing,
but I can't find any mention of a rewind of next in the mailing list.
As far as I can tell a whole series of merges has just vanished. For
information:
$ git rev-parse up/next up/oldnext
0bdd7328c801101d752d0dfc9976a50651738897
38fd5a1b23780381c3b6987c730f5ea3d8e1fc7f
$ git merge-base up/next up/oldnext
ef5b9d6e2286630bf8afb5bdf1c6e3356f3d50c7
Apart from all the merges that have vanished, some revisions have vanished too
(vanished in the sense, they aren't on the branch any more). i.e.
$ git log --no-merges --pretty=oneline up/next..up/oldnext
33369889 Revert "Support builtin aliases"
3a569a00 Revert "parse_commit_buffer: don't parse invalid commits"
1b1b2346 parse_commit_buffer: don't parse invalid commits
f0a31f58 Avoid redundant declaration of missing_target()
... etc ...
0edad442 adjust_shared_perm: chmod() only when needed.
69a47520 Revert "pack-objects: use of version 3 delta is now optional."
394737eb pack-objects: use of version 3 delta is now optional.
Have all these commits gone missing? I'm certain that someone other than me
would have noticed this sort of loss, so is it something I've done wrong or
misunderstood?
Andy
--
Dr Andy Parkins, M Eng (hons), MIET
andyparkins@gmail.com
next reply other threads:[~2008-03-07 11:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-07 11:29 Andy Parkins [this message]
2008-03-07 11:42 ` Something wrong with next in main git repository? Jonathan del Strother
2008-03-07 11:51 ` Johannes Schindelin
2008-03-07 15:27 ` Andy Parkins
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200803071129.21551.andyparkins@gmail.com \
--to=andyparkins@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.