From: broonie@opensource.wolfsonmicro.com (Mark Brown)
To: linux-arm-kernel@lists.infradead.org
Subject: Link failures due to __bug_table in current -next
Date: Mon, 19 Sep 2011 20:06:03 +0100 [thread overview]
Message-ID: <20110919190602.GG540@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <20110919185809.GA16381@n2100.arm.linux.org.uk>
On Mon, Sep 19, 2011 at 07:58:09PM +0100, Russell King - ARM Linux wrote:
> On Mon, Sep 19, 2011 at 07:42:30PM +0100, Mark Brown wrote:
> > > > I'm wondering if we need something like 7c8a25 (CRIS: Discard exit.text
> > > > and .data at runtime) but figuring it out is a bit beyond my ld skills
> > > > right now.
> Pleas elook at the error message again. >>>ambiguous<<<. That means
> git knows about the ID but more than one commit matches it:
Oh, right - sorry.
> So there's IDs 7c8a251 and 7c8a25b in existence, and git doesn't know
> which one to use. So using that, I can track down the commit you
> actually meant.
> What you're actually after is:
> 7c8a25b (CRIS: Discard exit.text and .data at runtime)
Yup.
> which is what you'd get from git if you ask it to give you the shortened
> git ID. (Git knows when the shortened git ID clashes and will add
> additional digits to make up a unique ID.)
> You can use "git log --pretty='%h (%s)'" to get a log already formatted
> with parens around the summary line.
Yeah, it's a shame it doesn't include the disambiguated short ID in the
standard git log output (which is what I always grep if I'm trying to
search commit messages). I've never seen a way to tell git to use %H
instead of %h there by default that doesn't require me to start copying
scripts or whatever between machines all the time.
next prev parent reply other threads:[~2011-09-19 19:06 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-19 12:09 Link failures due to __bug_table in current -next Mark Brown
2011-09-19 18:40 ` Russell King - ARM Linux
2011-09-19 18:42 ` Mark Brown
2011-09-19 18:58 ` Russell King - ARM Linux
2011-09-19 19:06 ` Mark Brown [this message]
2011-09-19 19:16 ` Russell King - ARM Linux
2011-09-20 7:35 ` Uwe Kleine-König
2011-09-19 19:12 ` Russell King - ARM Linux
2011-09-19 20:03 ` Russell King - ARM Linux
2011-09-20 7:06 ` Simon Glass
2011-09-20 7:59 ` Russell King - ARM Linux
2011-09-20 17:00 ` Simon Glass
2011-09-20 18:51 ` Russell King - ARM Linux
2011-09-20 19:13 ` Arnd Bergmann
2011-09-20 19:57 ` Nicolas Pitre
2011-09-21 22:58 ` Simon Glass
2011-09-21 22:45 ` Simon Glass
2011-09-20 11:02 ` Mark Brown
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=20110919190602.GG540@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=linux-arm-kernel@lists.infradead.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 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 NNTP newsgroup(s).