mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Michal Marek <mmarek@suse.cz>
To: Milton Miller <miltonm@bga.com>
Cc: gentoo@mgorny.alt.pl, linux-kernel@vger.kernel.org,
	linux-kbuild@vger.kernel.org
Subject: Re: [PATCH] setlocalversion: fix version for untaged nontip mercurial revs
Date: Fri, 13 Aug 2010 00:56:13 +0200	[thread overview]
Message-ID: <20100812225613.GB19690@sepie.suse.cz> (raw)
In-Reply-To: <fix-hg-id-resend1@mdm.bga.com>

On Thu, Jul 22, 2010 at 10:19:38AM -0500, Milton Miller wrote:
> The manpage for cut says it will return all lines without the delimiter
> unless -s is specified.
> 
> When I backed up my mecurial tree to generate modules, I found that the
> scm part of localversion was turning up blank.
> 
> Signed-off-by: Milton Miller <miltonm@bga.com>
> Cc: Michal Marek <mmarek@suse.cz>
> Cc: "Michał Górny" <gentoo@mgorny.alt.pl>
> 
> ---
> This version is against linux next-20100721.  The diff against 35-rc
> would be shifted left one tab stop and have different line numbers, should
> this be sent to stable.
> 
> Resend without 8-bit characters (maintainers name) in header
> Added linux-kbuild@vger.kernel.org which get-maintainer did not
> 
> diff --git a/scripts/setlocalversion b/scripts/setlocalversion
> index a7b9f76..872312f 100755
> --- a/scripts/setlocalversion
> +++ b/scripts/setlocalversion
> @@ -86,7 +86,7 @@ scm_version()
>  
>  	# Check for mercurial and a mercurial repo.
>  	if hgid=`hg id 2>/dev/null`; then
> -		tag=`printf '%s' "$hgid" | cut -d' ' -f2`
> +		tag=`printf '%s' "$hgid" | cut -s -d' ' -f2`
>  
>  		# Do we have an untagged version?
>  		if [ -z "$tag" -o "$tag" = tip ]; then

Sorry, I somehow missed this patch. I applied it now.

Michal

      reply	other threads:[~2010-08-12 22:58 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-22 15:19 Milton Miller
2010-08-12 22:56 ` Michal Marek [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=20100812225613.GB19690@sepie.suse.cz \
    --to=mmarek@suse.cz \
    --cc=gentoo@mgorny.alt.pl \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=miltonm@bga.com \
    /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

all inboxes | Powered by JetHome®