From: Brandon Casey <drafnel@gmail.com>
To: git@vger.kernel.org
Cc: artem.bityutskiy@linux.intel.com, Brandon Casey <drafnel@gmail.com>
Subject: [PATCH 1/2] t/t4131-apply-fake-ancestor.sh: fix broken test
Date: Sat, 3 Dec 2011 14:35:49 -0600 [thread overview]
Message-ID: <1322944550-27344-1-git-send-email-drafnel@gmail.com> (raw)
The third test "apply --build-fake-ancestor in a subdirectory" has been
broken since it was introduced. It intended to modify a tracked file named
'sub/3.t' and then produce a diff which could be git apply'ed, but the file
named 'sub/3.t' does not exist. The file that exists in the repo is called
'sub/3'. Since no tracked files were modified, an empty diff was produced,
and the test succeeded.
Correct this test by supplying the intended name of the tracked file,
'sub/3.t', to test_commit in the first test.
Signed-off-by: Brandon Casey <drafnel@gmail.com>
---
t/t4131-apply-fake-ancestor.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t4131-apply-fake-ancestor.sh b/t/t4131-apply-fake-ancestor.sh
index 94373ca..b1361ce 100755
--- a/t/t4131-apply-fake-ancestor.sh
+++ b/t/t4131-apply-fake-ancestor.sh
@@ -11,7 +11,7 @@ test_expect_success 'setup' '
test_commit 1 &&
test_commit 2 &&
mkdir sub &&
- test_commit 3 sub/3 &&
+ test_commit 3 sub/3.t &&
test_commit 4
'
--
1.7.8
next reply other threads:[~2011-12-03 20:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-03 20:35 Brandon Casey [this message]
2011-12-03 20:35 ` [PATCH 2/2] builtin/apply.c: report error on failure to recognize input Brandon Casey
2011-12-04 13:30 ` Artem Bityutskiy
2011-12-04 15:39 ` Brandon Casey
2011-12-05 19:27 ` Junio C Hamano
2011-12-05 22:38 ` Brandon Casey
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=1322944550-27344-1-git-send-email-drafnel@gmail.com \
--to=drafnel@gmail.com \
--cc=artem.bityutskiy@linux.intel.com \
--cc=git@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).