From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: notice: pu broken tonight
Date: Tue, 09 Jun 2009 19:11:05 +0200 [thread overview]
Message-ID: <4A2E97A9.7040906@lsrfire.ath.cx> (raw)
In-Reply-To: <7vy6s1pzwb.fsf@alter.siamese.dyndns.org>
Junio C Hamano schrieb:
> I usually make sure all four branches pass the tests before pushing them
> out, but in tonight's integration, the tip of 'pu' does not pass test for
> me, hence this notice.
The following patch makes the tests pass again for me. Feel free to squash
it into 10c29915.
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 2d36f78..25029a9 100644
--- a/Makefile
+++ b/Makefile
@@ -921,7 +921,7 @@ SANE_TOOL_PATH_SQ = $(subst ','\'',$(SANE_TOOL_PATH))
BROKEN_PATH_FIX = 's|^\# @@BROKEN_PATH_FIX@@$$|git_broken_path_fix $(SANE_TOOL_PATH_SQ)|'
PATH := $(SANE_TOOL_PATH):${PATH}
else
-BROKEN_PATH_FIX = d
+BROKEN_PATH_FIX = '/^\# @@BROKEN_PATH_FIX@@$$/d'
endif
ifeq ($(uname_S),Darwin)
next prev parent reply other threads:[~2009-06-09 17:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-09 8:36 notice: pu broken tonight Junio C Hamano
2009-06-09 17:11 ` René Scharfe [this message]
2009-06-10 7:44 ` Uwe Kleine-König
2009-06-10 7:56 ` Junio C Hamano
2009-06-10 9:42 ` [PATCH 1/2] more tests for git rev-parse --parse-opt Uwe Kleine-König
2009-06-10 9:42 ` [PATCH 2/2] parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse Uwe Kleine-König
2009-06-10 10:37 ` [PATCH 1/2] more tests for git rev-parse --parse-opt Johannes Sixt
2009-06-10 14:16 ` Uwe Kleine-König
2009-06-13 23:58 ` Uwe Kleine-König
2009-06-13 23:58 ` [PATCH 2/2] parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse Uwe Kleine-König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A2E97A9.7040906@lsrfire.ath.cx \
--to=rene.scharfe@lsrfire.ath.cx \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).