{"thread":{"id":"7123","subject":"[PATCH] Support of \"make -s\" in git-gui: do not output anything of the build itself","startedAt":"2007-03-06T23:57:27Z","lastAt":"2007-03-07T18:07:46Z","messageCount":5,"participants":["Alex Riesen","Shawn O. Pearce","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"36501","messageId":"81b0412b0703061557j1cade6f6k4577da5e447a4e2a@mail.gmail.com","threadId":"7123","inReplyTo":null,"subject":"[PATCH] Support of \"make -s\" in git-gui: do not output anything of the build itself","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2007-03-06T23:57:27Z","receivedAt":"2007-03-06T23:57:27Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"Signed-off-by: Alex Riesen <raa.lkml@gmail.com>\n---\n git-gui/Makefile |    5 +++++\n 1 files changed, 5 insertions(+), 0 deletions(-)\n\n\nFrom b347c855873d3193a6e8339f10682ba8a3931018 Mon Sep 17 00:00:00 2001\nFrom: Alex Riesen <raa.lkml@gmail.com>\nDate: Wed, 7 Mar 2007 00:44:37 +0100\nSubject: [PATCH] Support of \"make -s\" in git-gui: do not output anything of the build itself\n\nSigned-off-by: Alex Riesen <raa.lkml@gmail.com>\n---\n git-gui/Makefile |    5 +++++\n 1 files changed, 5 insertions(+), 0 deletions(-)\n\ndiff --git a/git-gui/Makefile b/git-gui/Makefile\nindex e486e8f..a219b5d 100644\n--- a/git-gui/Makefile\n+++ b/git-gui/Makefile\n@@ -27,6 +27,11 @@ ifndef V\n \tQUIET_BUILT_IN = @echo '   ' BUILTIN $@;\n endif\n \n+ifeq ($(findstring $(MAKEFLAGS),s),s)\n+QUIET_GEN =\n+QUIET_BUILT_IN =\n+endif\n+\n DESTDIR_SQ = $(subst ','\\'',$(DESTDIR))\n gitexecdir_SQ = $(subst ','\\'',$(gitexecdir))\n SHELL_PATH_SQ = $(subst ','\\'',$(SHELL_PATH))\n-- \n1.5.0.3.430.g5573f\n\n"},{"id":"36505","messageId":"20070307001410.GA26050@spearce.org","threadId":"7123","inReplyTo":"81b0412b0703061557j1cade6f6k4577da5e447a4e2a@mail.gmail.com","subject":"Re: [PATCH] Support of \"make -s\" in git-gui: do not output anything of the build itself","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-03-07T00:14:10Z","receivedAt":"2007-03-07T00:14:10Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Alex Riesen <raa.lkml@gmail.com> wrote:\n> Signed-off-by: Alex Riesen <raa.lkml@gmail.com>\n> ---\n> git-gui/Makefile |    5 +++++\n> 1 files changed, 5 insertions(+), 0 deletions(-)\n\nThanks.  It is applied to my git-gui tree.\n\nBTW, Junio, I have taken your lead and defined a `maint` and a\n`master` branch.  The `maint` branch of git-gui is meant to\ncorresponding in stability level to that of the `maint` branch\nof git.git, meaning the one should always be suitable for direct\nmerging to the other.\n\nIf it is alright with Alex, I'd like to hold off on merging git-gui\ninto git.git right now.  We just got gitgui-0.6.3 merged, and I'd\nlike to see at least one version of git ship with a stable tag from\ngit-gui, rather than an arbitrary commit.  ;-)\n\n-- \nShawn.\n"},{"id":"36507","messageId":"20070307004859.GA26262@spearce.org","threadId":"7123","inReplyTo":"20070307001410.GA26050@spearce.org","subject":"[PATCH] make t8001 work on Mac OS X again","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-03-07T00:48:59Z","receivedAt":"2007-03-07T00:48:59Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"From: Johannes Schindelin <Johannes.Schindelin@gmx.de>\n\nIt has a broken sed which adds a newline to the last line, if it does\nnot end with one.\n\nSigned-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>\nAcked-by: Shawn O. Pearce <spearce@spearce.org>\n---\n\n\tFrom: Johannes Schindelin <Johannes.Schindelin@gmx.de>\n\t> Does this work for you?\n\n\tYes.  ;-)\n\n t/annotate-tests.sh |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/t/annotate-tests.sh b/t/annotate-tests.sh\nindex 87403da..cacb273 100644\n--- a/t/annotate-tests.sh\n+++ b/t/annotate-tests.sh\n@@ -114,7 +114,8 @@ test_expect_success \\\n test_expect_success \\\n     'some edit' \\\n     'mv file file.orig &&\n-    sed -e \"s/^3A/99/\" -e \"/^1A/d\" < file.orig > file &&\n+    sed -e \"s/^3A/99/\" -e \"/^1A/d\" -e \"/^incomplete/d\" < file.orig > file &&\n+    echo \"incomplete\" | tr -d \"\\\\012\" >>file &&\n     GIT_AUTHOR_NAME=\"D\" git commit -a -m \"edit\"'\n \n test_expect_success \\\n"},{"id":"36509","messageId":"7vr6s1n9yx.fsf@assigned-by-dhcp.cox.net","threadId":"7123","inReplyTo":"20070307004859.GA26262@spearce.org","subject":"Re: [PATCH] make t8001 work on Mac OS X again","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-03-07T01:00:54Z","receivedAt":"2007-03-07T01:00:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Shawn O. Pearce\" <spearce@spearce.org> writes:\n\n> From: Johannes Schindelin <Johannes.Schindelin@gmx.de>\n>\n> It has a broken sed which adds a newline to the last line, if it does\n> not end with one.\n>\n> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>\n> Acked-by: Shawn O. Pearce <spearce@spearce.org>\n> ---\n>\n> \tFrom: Johannes Schindelin <Johannes.Schindelin@gmx.de>\n> \t> Does this work for you?\n>\n> \tYes.  ;-)\n\nThanks. Strictly speaking, sed is *supposed* to end its output\nof pattern space with newline, so the test is at fault, not\nMacintosh sed.\n\nWill apply.\n"},{"id":"36565","messageId":"7v8xe9exl9.fsf@assigned-by-dhcp.cox.net","threadId":"7123","inReplyTo":"20070307001410.GA26050@spearce.org","subject":"Re: [PATCH] Support of \"make -s\" in git-gui: do not output anything of the build itself","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-03-07T18:07:46Z","receivedAt":"2007-03-07T18:07:46Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Shawn O. Pearce\" <spearce@spearce.org> writes:\n\n> If it is alright with Alex, I'd like to hold off on merging git-gui\n> into git.git right now.  We just got gitgui-0.6.3 merged, and I'd\n> like to see at least one version of git ship with a stable tag from\n> git-gui, rather than an arbitrary commit.  ;-)\n\nWell, I do not think these Makefile clean-ups deserve to be\napplied to 'maint'.  They are by definition not to have any\neffect on the build products (otherwise that is called a bug),\nso will not either fix nor improve the end user experience.\n\nIn 'maint', I try to have changes that fixes problems in the end\nuser experience that exist in the corresponding feature release,\nand nothing else.  That is what 'maintenance' means.\n"}]}