From: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Date: Tue, 09 Jun 2009 17:11:05 GMT
Subject: Re: notice: pu broken tonight
Message-ID: <4A2E97A9.7040906@lsrfire.ath.cx>
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)