From: Nick Dokos <ndokos@gmail.com>
To: emacs-orgmode@gnu.org
Subject: Re: Agenda items refer to the wrong headline
Date: Wed, 09 Apr 2014 23:24:32 -0400 [thread overview]
Message-ID: <87fvllkgsv.fsf@gmail.com> (raw)
In-Reply-To: CAGk6a7n4shFRmO=TDs64NfBOFX=9fDQy+6hh+EHAo5yyAahoDA@mail.gmail.com
Fletcher Charest <fletcher.charest@gmail.com> writes:
> Nick, you say you could not reproduce the bug using version
> 8.2.5h-667-g971dc4, but you did with version 8.2.5h-888-g798bb8d. Just
> out of curiosity: does the '888' in '8.2.5h-888-g798bb8d' is a number
> that is incremented chronologically? If this is correct (I'm not
> familiar with this at all), FWIW, the bug was not caused only by the
> patch '8.2.5h-888-g798bb8d', since I observed it also with version
> 8.2.5h-94-g91175a.
>
888 is the number of commits since the commit that was tagged
'8.2.5h'. Unfortunately, that number can be misleading: in the
face of merges, there may be multiple paths that lead from some commit
back to the tagged commit (run `gitk master' if you want to see the multiple
paths), so the "number of commits since the tag" is ambiguous. It is
only unambiguous if the history is strictly linear.
If you do `git log --oneline -100' on master, you'll see that there is a
merge commit d25846b that looks like this:
,----
| $ git show d25846b
| commit d25846b2340e32dea93fc89ea432f74a7f64d950
| Merge: f261833 91175a3
| Author: Nicolas Goaziou <n.goaziou@gmail.com>
| Date: Sat Mar 29 15:02:10 2014 +0100
|
| Merge branch 'maint'
`----
The merge commit has two parents: f261833 and our old friend 91175a3.
Try git describe on this commit:
git describe d25846b
It's only one commit ahead of 91175a3 but I get
release_8.2.5h-873-gd25846b
so it's 873 commits ahead of 8.2.5h, not 95! But that's because `git
describe' takes a different, much longer, path back to the tagged
commit: it follows the first parent of the merge commit.
So I'm pretty sure that the patch that the bisection fingered is
indeed the culprit.
I believe this is correct but if not, Achim will correct me:-)
--
Nick
next prev parent reply other threads:[~2014-04-10 3:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-06 4:23 Agenda items refer to the wrong headline Fletcher Charest
2014-04-08 11:53 ` Fletcher Charest
2014-04-17 0:32 ` Bastien
2014-04-08 13:07 ` Nick Dokos
2014-04-08 20:45 ` Fletcher Charest
2014-04-09 3:54 ` Nick Dokos
2014-04-09 13:52 ` Nick Dokos
2014-04-09 14:36 ` Fletcher Charest
2014-04-10 3:24 ` Nick Dokos [this message]
2014-04-14 16:24 ` Fletcher Charest
2014-04-10 3:33 ` Samuel Wales
2014-04-16 19:05 ` Bastien
2014-04-16 22:37 ` Bastien
2014-04-17 0:33 ` Bastien
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
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fvllkgsv.fsf@gmail.com \
--to=ndokos@gmail.com \
--cc=emacs-orgmode@gnu.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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).