From dc93841715dfa9a9cdda6f2c4a25eec831ea7aa0 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 5 Jun 2005 15:31:52 -0700 Subject: diff 'rename' format change. Clearly even Junio felt git "rename" header lines should say "from/to" instead of "old/new", since he wrote the documentation that way. This way it also matches "copy". git-apply will accept both versions, at least for a while. --- t/t4001-diff-rename.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 't/t4001-diff-rename.sh') diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh index 933a5bfc6b..80edae6682 100755 --- a/t/t4001-diff-rename.sh +++ b/t/t4001-diff-rename.sh @@ -44,8 +44,8 @@ test_expect_success \ 'git-diff-cache -p -M $tree >current' cat >expected <<\EOF diff --git a/path0 b/path1 -rename old path0 -rename new path1 +rename from path0 +rename to path1 --- a/path0 +++ b/path1 @@ -8,7 +8,7 @@ Line 7 -- cgit v1.2.3