[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] configure: save git working tree information in
Re: [Qemu-devel] [PATCH] configure: save git working tree information in "pkgversion"
Tue, 31 May 2016 11:45:25 -0600
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0
On 05/31/2016 11:01 AM, Laszlo Ersek wrote:
>>> Grepping git's Documentation/RelNotes/ directory, I find:
>>> - in "1.6.6.txt": the introduction of --dirty
>>> - in "184.108.40.206.txt": an apparently important bugfix for --dirty
>>> Version 220.127.116.11 of git was tagged on Sep 23 2011.
>>> Does this information help in deciding if we can use --dirty?
>> 5 years old sounds new enough for my liking :-)
>> I guess we could use --dirty and catch the non-zero exit code and just
>> re-try without --dirty.
> But, if we can't use --dirty, I should probably use the plus-sign
> fallback (we need *something* to mark a dirty state).
> In which case however, shouldn't we just go with the current patch,
> which doesn't care about --dirty at all? Otherwise, some build hosts
> will append "-dirty", and others will append "+".
> IMO we should either require --dirty, or go with the current patch.
Gnulib's build-aux/git-version-gen script doesn't yet use --dirty, but
may be an inspiration for how to generate the same suffix:
# Test whether to append the "-dirty" suffix only if the version
# string we're using came from git. I.e., skip the test if it's "UNKNOWN"
# or if it came from .tarball-version.
if test "x$v_from_git" != x; then
# Don't declare a version "dirty" merely because a time stamp has changed.
git update-index --refresh > /dev/null 2>&1
dirty=`exec 2>/dev/null;git diff-index --name-only HEAD` || dirty=
case "$dirty" in
*) # Append the suffix only if there isn't one already.
case $v in
*) v="$v-dirty" ;;
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
Description: OpenPGP digital signature