Git development
 help / color / mirror / Atom feed
From: "Alex Riesen" <raa.lkml@gmail.com>
To: "Git Mailing List" <git@vger.kernel.org>
Cc: "Junio C Hamano" <junkio@cox.net>
Subject: [PATCH] Fix t7606 on Cygwin: for some reasont it does not recognize a "." in PATH
Date: Fri, 12 Dec 2008 13:29:00 +0100	[thread overview]
Message-ID: <81b0412b0812120428mc85ae84r260b722022dc3449@mail.gmail.com> (raw)

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

The test uses the dot to add custom merge strategies
---
 t/t7606-merge-custom.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

[-- Attachment #2: 0001-Fix-t7606-on-Cygwin-it-does-not-recognize-a-.-in.patch --]
[-- Type: application/octet-stream, Size: 759 bytes --]

From 928b2b955bd2ef0e400de698c0c0bcde5e64638b Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Mon, 29 Sep 2008 17:07:00 +0200
Subject: [PATCH] Fix t7606 on Cygwin: for some reasont it does not recognize a "." in PATH

The test uses the dot to add custom merge strategies
---
 t/t7606-merge-custom.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/t/t7606-merge-custom.sh b/t/t7606-merge-custom.sh
index 52a451d..20c0907 100755
--- a/t/t7606-merge-custom.sh
+++ b/t/t7606-merge-custom.sh
@@ -11,7 +11,7 @@ cat >git-merge-theirs <<EOF
 eval git read-tree --reset -u \\\$\$#
 EOF
 chmod +x git-merge-theirs
-PATH=.:$PATH
+PATH=$(pwd):"$PATH"
 export PATH
 
 test_expect_success 'setup' '
-- 
1.6.1.rc2.48.g3c7df


             reply	other threads:[~2008-12-12 12:30 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-12 12:29 Alex Riesen [this message]
2008-12-12 14:01 ` [PATCH] Fix t7606 on Cygwin: for some reasont it does not recognize a "." in PATH Stefan Näwe

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=81b0412b0812120428mc85ae84r260b722022dc3449@mail.gmail.com \
    --to=raa.lkml@gmail.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox