From: Baruch Siach <baruch@tkos.co.il>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] support/scripts/pkg-stats: extract current commit id, not master
Date: Thu, 29 Aug 2019 10:29:29 +0300 [thread overview]
Message-ID: <87o908bfae.fsf@tarshish> (raw)
In-Reply-To: <20190829072233.29988-1-thomas.petazzoni@bootlin.com>
Hi Thomas,
On Thu, Aug 29 2019, Thomas Petazzoni wrote:
> pkg-stats extracts the Buildroot commit id from which the package
> information was collected. However, when doing so, it always assumes
> we're using the master branch, by running "git log master".
>
> But in fact, pkg-stats can be run from any branch/tag, so it makes a
> lot more sense to use "git log HEAD".
>
> Cc: victor.huesca at bootlin.com
> Cc: Baruch Siach <baruch@tkos.co.il>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> As was discussed with Baruch and others, the page at
> http://autobuild.buildroot.net/stats/ now shows the results
> corresponding to the next branch when such a branch exists. However,
> the commit ID currently shown at the bottom of the page is incorrect,
> as it shows the one of the master branch at the time the page was
> generated.
> ---
> support/scripts/pkg-stats | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
> index 992c2dd7c5..6cb3a6a038 100755
> --- a/support/scripts/pkg-stats
> +++ b/support/scripts/pkg-stats
> @@ -727,7 +727,7 @@ def __main__():
> else:
> package_list = None
> date = datetime.datetime.utcnow()
> - commit = subprocess.check_output(['git', 'log', 'master', '-n', '1',
> + commit = subprocess.check_output(['git', 'log', 'HEAD', '-n', '1',
> '--pretty=format:%H']).splitlines()[0]
Unrelated to this patch, commit id retrieval can be simplified to just:
git rev-parse HEAD
baruch
> print("Build package list ...")
> packages = get_pkglist(args.npackages, package_list)
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
next prev parent reply other threads:[~2019-08-29 7:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-29 7:22 [Buildroot] [PATCH] support/scripts/pkg-stats: extract current commit id, not master Thomas Petazzoni
2019-08-29 7:29 ` Baruch Siach [this message]
2019-09-12 17:10 ` Thomas Petazzoni
2019-09-12 17:09 ` Thomas Petazzoni
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=87o908bfae.fsf@tarshish \
--to=baruch@tkos.co.il \
--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