Re: [Emacs-diffs] master da4ce83: * nt/INSTALL: Update instructions for running autogen.sh

Re: [Emacs-diffs] master da4ce83: * nt/INSTALL: Update instructions for running autogen.sh

[Stefan Monnier]

> +  If the script fails because it cannot find Git, you will need to
> +  arrange for the MSYS Bash's PATH to include the Git's 'bin'
> +  sibdirectory, where there's the git.exe executable.

I'm not 100% sure I understand what this is talking about, but I get the
impression that this is saying that autogen.sh can fail if `git'
is missing.  If so, it sounds like a bug in autogen.sh.


        Stefan

Re: [Emacs-diffs] master da4ce83: * nt/INSTALL: Update instructions for running autogen.sh

[Eli Zaretskii]

> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: Eli Zaretskii <eliz@gnu.org>
> Date: Fri, 02 Oct 2015 09:03:31 -0400
> 
> > +  If the script fails because it cannot find Git, you will need to
> > +  arrange for the MSYS Bash's PATH to include the Git's 'bin'
> > +  sibdirectory, where there's the git.exe executable.
> 
> I'm not 100% sure I understand what this is talking about, but I get the
> impression that this is saying that autogen.sh can fail if `git'
> is missing.  If so, it sounds like a bug in autogen.sh.

  if test -d .git; then

     # Configure 'git diff' hunk header format.

     git config 'diff.elisp.xfuncname' \
	 '^\(def[^[:space:]]+[[:space:]]+([^()[:space:]]+)' || exit
     git config 'diff.texinfo.xfuncname' \                  ^^^^^^^
	 '^@node[[:space:]]+([^,[:space:]][^,]+)' || exit
						  ^^^^^^^

It exits with an error message, which in my book means it "fails".

Re: [Emacs-diffs] master da4ce83: * nt/INSTALL: Update instructions for running autogen.sh

[Stefan Monnier]

>   if test -d .git; then
>
>      # Configure 'git diff' hunk header format.
>
>      git config 'diff.elisp.xfuncname' \
> 	 '^\(def[^[:space:]]+[[:space:]]+([^()[:space:]]+)' || exit
>      git config 'diff.texinfo.xfuncname' \                  ^^^^^^^
> 	 '^@node[[:space:]]+([^,[:space:]][^,]+)' || exit
> 						  ^^^^^^^
>
> It exits with an error message, which in my book means it "fails".

Hmm... I see.
So the "test -d .git" ensures that this code is only run when Git was
used to get the code, so we can reasonably assume that Git is (still)
available.  I understand your text better now, thanks.

Still, I think the above code is making a poor choice.  Better emit the
warning and keep on going: these "git config" settings are sufficiently
important to justify aborting the whole operation, IMO.


        Stefan

Re: [Emacs-diffs] master da4ce83: * nt/INSTALL: Update instructions for running autogen.sh

[Eli Zaretskii]

> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: emacs-devel@gnu.org
> Date: Fri, 02 Oct 2015 11:50:54 -0400
> 
> Still, I think the above code is making a poor choice.  Better emit the
> warning and keep on going: these "git config" settings are sufficiently
> important to justify aborting the whole operation, IMO.

I agree.  I wasn't even aware of this addition until yesterday, when I
needed to bootstrap a fresh clone, and saw the error message.

Re: [Emacs-diffs] master da4ce83: * nt/INSTALL: Update instructions for running autogen.sh

[Paul Eggert]

[-- Attachment #1: Type: text/plain, Size: 133 bytes --]

On 10/02/2015 06:03 AM, Stefan Monnier wrote:
> autogen.sh can fail if `git' is missing.
I installed the attached patch to fix that.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Allow-autogen-even-when-Git-is-not-installed.patch --]
[-- Type: text/x-patch; name="0001-Allow-autogen-even-when-Git-is-not-installed.patch", Size: 804 bytes --]

From 8ccfe1163855d3a2c13e3c3915254dadd0340efb Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 2 Oct 2015 12:40:57 -0700
Subject: [PATCH] Allow autogen even when Git is not installed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* autogen.sh: Test ‘git status’ before trying to use Git.
---
 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index 926915c..563a024 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -218,7 +218,7 @@ echo timestamp > src/stamp-h.in || exit
 
 
 ## Configure Git, if using Git.
-if test -d .git; then
+if test -d .git && (git status -s) >/dev/null 2>&1; then
 
     # Configure 'git diff' hunk header format.
 
-- 
2.1.0

Re: [Emacs-diffs] master da4ce83: * nt/INSTALL: Update instructions for running autogen.sh

[Eli Zaretskii]

> From: Paul Eggert <eggert@cs.ucla.edu>
> Date: Fri, 2 Oct 2015 12:43:20 -0700
> 
> On 10/02/2015 06:03 AM, Stefan Monnier wrote:
> > autogen.sh can fail if `git' is missing.
> I installed the attached patch to fix that.

Thanks.