diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-07-28 17:46:11 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-28 11:18:02 -0700 |
| commit | e5a94313c06b83e034179ca6092ea23343e48dec (patch) | |
| tree | b64a550772210273793a7250635834edd803580d /t | |
| parent | 2941cab99ca9dec3356f0126be41bc3995bb1fef (diff) | |
| download | git-e5a94313c06b83e034179ca6092ea23343e48dec.tar.gz git-e5a94313c06b83e034179ca6092ea23343e48dec.tar.xz | |
Teach git-apply about '-R'
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4102-apply-rename.sh | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/t/t4102-apply-rename.sh b/t/t4102-apply-rename.sh index fbb508d38..22da6a00c 100755 --- a/t/t4102-apply-rename.sh +++ b/t/t4102-apply-rename.sh @@ -13,8 +13,8 @@ test_description='git-apply handling copy/rename patch. cat >test-patch <<\EOF diff --git a/foo b/bar similarity index 47% -copy from foo -copy to bar +rename from foo +rename to bar --- a/foo +++ b/bar @@ -1 +1 @@ @@ -39,4 +39,24 @@ else 'test -f bar && ls -l bar | grep "^-..x......"' fi +test_expect_success 'apply reverse' \ + 'git-apply -R --index --stat --summary --apply test-patch && + test "$(cat foo)" = "This is foo"' + +cat >test-patch <<\EOF +diff --git a/foo b/bar +similarity index 47% +copy from foo +copy to bar +--- a/foo ++++ b/bar +@@ -1 +1 @@ +-This is foo ++This is bar +EOF + +test_expect_success 'apply copy' \ + 'git-apply --index --stat --summary --apply test-patch && + test "$(cat bar)" = "This is bar" -a "$(cat foo)" = "This is foo"' + test_done |