From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] autobuild-run: fix retrieving the gitid
Date: Sun, 13 Aug 2017 23:54:27 +0200 [thread overview]
Message-ID: <20170813235427.0e68fed2@windsurf> (raw)
In-Reply-To: <20170812094943.16460-1-yann.morin.1998@free.fr>
Hello,
On Sat, 12 Aug 2017 11:49:43 +0200, Yann E. MORIN wrote:
> Before 66f91eb (autobuild-run: add --repo option), we used to 'git pull'
> to update the local Buildroot clone. This had the side-effect of
> updating the local refs because we were pulling from 'origin'.
>
> So 'origin/master' and 'master' were correctly updated.
>
> But since the offending commit, we no longer pull, and we instead fetch
> from an explicit repository, which never updates 'origin/master' nor
> 'master'. Instead, they both are stuck at the time the repository was
> cloned, or at the time the autobuild script was updated.
>
> We fix that by just dropping the 'master' ref from the git log so that
> the log applies to the commit for current working copy.
>
> Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Reported-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
> Cc: Arnout Vandecappelle <arnout@mind.be>
> ---
> scripts/autobuild-run | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to buildroot-test. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
prev parent reply other threads:[~2017-08-13 21:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-12 9:49 [Buildroot] [PATCH] autobuild-run: fix retrieving the gitid Yann E. MORIN
2017-08-12 15:43 ` Arnout Vandecappelle
2017-08-13 21:54 ` Thomas Petazzoni [this message]
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=20170813235427.0e68fed2@windsurf \
--to=thomas.petazzoni@free-electrons.com \
--cc=buildroot@busybox.net \
/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