[PATCH] Support of "make -s" in git-gui: do not output anything of the build itself

[PATCH] Support of "make -s" in git-gui: do not output anything of the build itself

[Alex Riesen]

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

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
 git-gui/Makefile |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-Support-of-make-s-in-git-gui-do-not-output-anyth.patch --]
[-- Type: text/x-patch; name="0002-Support-of-make-s-in-git-gui-do-not-output-anyth.patch", Size: 818 bytes --]

From b347c855873d3193a6e8339f10682ba8a3931018 Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Wed, 7 Mar 2007 00:44:37 +0100
Subject: [PATCH] Support of "make -s" in git-gui: do not output anything of the build itself

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
 git-gui/Makefile |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/git-gui/Makefile b/git-gui/Makefile
index e486e8f..a219b5d 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -27,6 +27,11 @@ ifndef V
 	QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
 endif
 
+ifeq ($(findstring $(MAKEFLAGS),s),s)
+QUIET_GEN =
+QUIET_BUILT_IN =
+endif
+
 DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
 gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
 SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
-- 
1.5.0.3.430.g5573f

Re: [PATCH] Support of "make -s" in git-gui: do not output anything of the build itself

[Shawn O. Pearce]

Alex Riesen <raa.lkml@gmail.com> wrote:
> Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
> ---
> git-gui/Makefile |    5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)

Thanks.  It is applied to my git-gui tree.

BTW, Junio, I have taken your lead and defined a `maint` and a
`master` branch.  The `maint` branch of git-gui is meant to
corresponding in stability level to that of the `maint` branch
of git.git, meaning the one should always be suitable for direct
merging to the other.

If it is alright with Alex, I'd like to hold off on merging git-gui
into git.git right now.  We just got gitgui-0.6.3 merged, and I'd
like to see at least one version of git ship with a stable tag from
git-gui, rather than an arbitrary commit.  ;-)

-- 
Shawn.

[PATCH] make t8001 work on Mac OS X again

[Shawn O. Pearce]

From: Johannes Schindelin <Johannes.Schindelin@gmx.de>

It has a broken sed which adds a newline to the last line, if it does
not end with one.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
---

	From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
	> Does this work for you?

	Yes.  ;-)

 t/annotate-tests.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 87403da..cacb273 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -114,7 +114,8 @@ test_expect_success \
 test_expect_success \
     'some edit' \
     'mv file file.orig &&
-    sed -e "s/^3A/99/" -e "/^1A/d" < file.orig > file &&
+    sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" < file.orig > file &&
+    echo "incomplete" | tr -d "\\012" >>file &&
     GIT_AUTHOR_NAME="D" git commit -a -m "edit"'
 
 test_expect_success \

Re: [PATCH] make t8001 work on Mac OS X again

[Junio C Hamano]

"Shawn O. Pearce" <spearce@spearce.org> writes:

> From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
>
> It has a broken sed which adds a newline to the last line, if it does
> not end with one.
>
> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
> Acked-by: Shawn O. Pearce <spearce@spearce.org>
> ---
>
> 	From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
> 	> Does this work for you?
>
> 	Yes.  ;-)

Thanks. Strictly speaking, sed is *supposed* to end its output
of pattern space with newline, so the test is at fault, not
Macintosh sed.

Will apply.

Re: [PATCH] Support of "make -s" in git-gui: do not output anything of the build itself

[Junio C Hamano]

"Shawn O. Pearce" <spearce@spearce.org> writes:

> If it is alright with Alex, I'd like to hold off on merging git-gui
> into git.git right now.  We just got gitgui-0.6.3 merged, and I'd
> like to see at least one version of git ship with a stable tag from
> git-gui, rather than an arbitrary commit.  ;-)

Well, I do not think these Makefile clean-ups deserve to be
applied to 'maint'.  They are by definition not to have any
effect on the build products (otherwise that is called a bug),
so will not either fix nor improve the end user experience.

In 'maint', I try to have changes that fixes problems in the end
user experience that exist in the corresponding feature release,
and nothing else.  That is what 'maintenance' means.