From: Kevin Ballard <kevin@sb.org>
To: git@vger.kernel.org
To: Junio C Hamano <gitster@pobox.com>
Cc: Kevin Ballard <kevin@sb.org>
Subject: [PATCH] Add test for filter-branch on a subdirectory that's been added and deleted and re-added
Date: Sat, 8 Mar 2008 06:50:07 -0500 [thread overview]
Message-ID: <1204977007-7267-3-git-send-email-kevin@sb.org> (raw)
Add a currently-failing test for the case when git-filter-branch
is run with the --subdirectory-filter referencing a folder that
has been added, deleted, and re-added. Such an action should work,
but as this test shows it ends up blowing up.
---
t/t7003-filter-branch.sh | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index 868babc..933157b 100755
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -179,4 +179,17 @@ test_expect_success 'Name needing quotes' '
'
+test_expect_success 'Subdirectory filter on folder with non-contiguous history' '
+ mkdir foo &&
+ touch foo/bar &&
+ git add foo &&
+ git commit -m "Adding foo" &&
+ git rm -r foo &&
+ git commit -m "Removing foo" &&
+ mkdir foo &&
+ touch foo/bar &&
+ git commit -m "Re-adding foo" &&
+ git filter-branch --subdirectory-filter foo
+'
+
test_done
--
1.5.4.3.487.g5a92
next reply other threads:[~2008-03-08 11:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-08 11:50 Kevin Ballard [this message]
2008-03-08 11:52 ` [PATCH] Add test for filter-branch on a subdirectory that's been added and deleted and re-added Kevin Ballard
2008-03-08 18:41 ` Junio C Hamano
2008-03-08 18:45 ` Kevin Ballard
2008-03-08 20:08 ` Re* " Junio C Hamano
2008-03-08 20:25 ` Junio C Hamano
2008-03-08 20:39 ` Kevin Ballard
-- strict thread matches above, loose matches on Subject: below --
2008-02-25 19:45 Kevin Ballard
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=1204977007-7267-3-git-send-email-kevin@sb.org \
--to=kevin@sb.org \
--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).