All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Shawn O. Pearce" <spearce@spearce.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org, Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCH] make t8001 work on Mac OS X again
Date: Tue, 6 Mar 2007 19:48:59 -0500	[thread overview]
Message-ID: <20070307004859.GA26262@spearce.org> (raw)
In-Reply-To: <20070307001410.GA26050@spearce.org>

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 \

  reply	other threads:[~2007-03-07  0:49 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-03-06 23:57 [PATCH] Support of "make -s" in git-gui: do not output anything of the build itself Alex Riesen
2007-03-07  0:14 ` Shawn O. Pearce
2007-03-07  0:48   ` Shawn O. Pearce [this message]
2007-03-07  1:00     ` [PATCH] make t8001 work on Mac OS X again Junio C Hamano
2007-03-07 18:07   ` [PATCH] Support of "make -s" in git-gui: do not output anything of the build itself Junio C Hamano

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070307004859.GA26262@spearce.org \
    --to=spearce@spearce.org \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /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. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.