git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Catalin Marinas" <catalin.marinas@gmail.com>
To: "Karl Hasselström" <kha@treskal.com>
Cc: git@vger.kernel.org
Subject: Re: StGit: kha/{safe,experimental} updated
Date: Wed, 21 May 2008 15:07:44 +0100	[thread overview]
Message-ID: <b0943d9e0805210707s5af76462wc92a4cf55e5d4a9d@mail.gmail.com> (raw)
In-Reply-To: <20080520210249.GA19465@diana.vm.bytemark.co.uk>

2008/5/20 Karl Hasselström <kha@treskal.com>:
> On 2008-05-20 18:19:02 +0100, Catalin Marinas wrote:
>> I build release tarball from the directory under Git control and I
>> always get a builtin_version.py generated. In my initial patch I had
>> a check in setup.py for a .release file. I could add a check in
>> write_builtin_version to ignore the extra .git stuff if I am making
>> a release (only keep the tag name).
>
> Nah, easier to just change the order of the checks (try r2 before r1)
> as I outlined. I'll whip up a patch.
[...]
> If you're exactly on a tagged commit, git-describe will return just
> the name of that tag, so you don't need to do anything extra.

Now that you mentioned this (I didn't know), is there a need to
reverse steps r2 and r1? I always build the release from the current
tag and the version should be clean.

>> BTW, Git seems to use 6 characters for the current commit id and
>> StGIT 5. Should we change this for consistency?
>
> Both git and we call git-describe with --abbrev=4, which I think means
> "describe the commit uniquely with as few digits as possible, but no
> less than four". So we'll get upgraded automatically when it becomes
> necessary.

OK, I didn't know this either.

-- 
Catalin

  parent reply	other threads:[~2008-05-21 14:08 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-14  1:43 StGit: kha/{safe,experimental} updated Karl Hasselström
2008-05-14  1:44 ` [StGit PATCH 1/2] Import version to a separate namespace Karl Hasselström
2008-05-14  1:47 ` [StGit PATCH 2/2] Better StGit version tracking Karl Hasselström
2008-05-14  1:49 ` [StGit PATCH] Emacs mode: automatically cd up to root of worktree Karl Hasselström
2008-05-14  7:38   ` David Kågedal
2008-05-14  8:13     ` Karl Hasselström
2008-05-14  1:49 ` [StGit PATCH] New command: stg redo Karl Hasselström
2008-05-19 21:21 ` StGit: kha/{safe,experimental} updated Catalin Marinas
2008-05-20  7:04   ` Karl Hasselström
2008-05-20 17:19     ` Catalin Marinas
2008-05-20 21:02       ` Karl Hasselström
2008-05-20 21:39         ` [StGit PATCH] Try the built-in version string before git-describe Karl Hasselström
2008-05-21 14:38           ` Catalin Marinas
2008-05-21 15:00             ` Karl Hasselström
2008-05-21 14:07         ` Catalin Marinas [this message]
2008-05-21 14:58           ` StGit: kha/{safe,experimental} updated Karl Hasselström
  -- strict thread matches above, loose matches on Subject: below --
2008-05-21  5:19 Karl Hasselström

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=b0943d9e0805210707s5af76462wc92a4cf55e5d4a9d@mail.gmail.com \
    --to=catalin.marinas@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=kha@treskal.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;
as well as URLs for NNTP newsgroup(s).