[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

gnulib overrides git-log-fix upon upgrade?

From: Assaf Gordon
Subject: gnulib overrides git-log-fix upon upgrade?
Date: Fri, 18 Apr 2014 18:06:48 -0400
User-agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0


A recent change added a stub "git-log-fix" file to gnulib:

But, it might have an unintended consequences:
When updating "gnulib" submodule in a project, it overrides the project's 

It can be demonstrated with GNU Hello, but probably represents a bigger issue 
with coreutils.


    # Get fresh copy of "gnu hello",
    #  use "bootstrap" to fetch not-recent version of GnuLib
    $ git clone git://git.savannah.gnu.org/hello.git
    $ cd hello/
    $ ./bootstrap

    # This is GNU Hello's version of "git-log-fix".
    $ ls -log build-aux/git-log-fix
    -rw-r--r-- 1 201 Apr 18 17:58 build-aux/git-log-fix

    # Upgrade gnulib to latest version, which includes stub git-to-log
    $ git submodule foreach git pull origin master
    $ git diff
    diff --git a/gnulib b/gnulib
    index b532ce5..e1d49dd 160000
    --- a/gnulib
    +++ b/gnulib
    @@ -1 +1 @@
    -Subproject commit b532ce5d26245bf99bdd5cfb8530e29b808b80bd
    +Subproject commit e1d49ddae46cb80e565f61ba51027b45ddea7b9a
    $ git ci -a -m "upgraded gnulib"

    # Re-bootstrap
    $ ./bootstrap
    Replacing file build-aux/git-log-fix (non-gnulib code backed up in 
build-aux/git-log-fix~) !!
    # After Gnulib upgrade, "git-log-fix" is replace with Gnulib stub
    $ ls -log build-aux/git-log-fix
    -rw-r--r-- 1 352 Apr 18 18:03 build-aux/git-log-fix

reply via email to

[Prev in Thread] Current Thread [Next in Thread]