diff options
| author |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-05 15:31:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-05 15:31:52 -0700 |
| commit | dc93841715dfa9a9cdda6f2c4a25eec831ea7aa0 (patch) | |
| tree | 5e1c39a01feb2364f97f2c0c72e4a5870af9a69d | |
| parent | git-apply: consider it an error to apply no changes (diff) | |
| download | tgif-dc93841715dfa9a9cdda6f2c4a25eec831ea7aa0.tar.xz | |
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.
| -rw-r--r-- | apply.c | 2 | ||||
| -rw-r--r-- | diff.c | 4 | ||||
| -rwxr-xr-x | t/t4001-diff-rename.sh | 4 | ||||
| -rw-r--r-- | t/t4003-diff-rename-1.sh | 4 | ||||
| -rw-r--r-- | t/t4004-diff-rename-symlink.sh | 4 | ||||
| -rw-r--r-- | t/t4005-diff-rename-2.sh | 4 | ||||
| -rw-r--r-- | t/t4009-diff-rename-4.sh | 4 |
7 files changed, 14 insertions, 12 deletions
@@ -437,6 +437,8 @@ static int parse_git_header(char *line, int len, unsigned int size, struct patch { "copy to ", gitdiff_copydst }, { "rename old ", gitdiff_renamesrc }, { "rename new ", gitdiff_renamedst }, + { "rename from ", gitdiff_renamesrc }, + { "rename to ", gitdiff_renamedst }, { "similarity index ", gitdiff_similarity }, { "dissimilarity index ", gitdiff_dissimilarity }, { "", gitdiff_unrecognized }, @@ -786,8 +786,8 @@ static void diff_flush_patch(struct diff_filepair *p) case 'R': sprintf(msg_, "similarity index %d%%\n" - "rename old %s\n" - "rename new %s", + "rename from %s\n" + "rename to %s", (int)(0.5 + p->score * 100.0/MAX_SCORE), p->one->path, p->two->path); msg = msg_; 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 diff --git a/t/t4003-diff-rename-1.sh b/t/t4003-diff-rename-1.sh index 7a5f73a310..63a3103b4b 100644 --- a/t/t4003-diff-rename-1.sh +++ b/t/t4003-diff-rename-1.sh @@ -40,8 +40,8 @@ copy to COPYING.1 - HOWEVER, in order to allow a migration to GPLv3 if that seems like + However, in order to allow a migration to GPLv3 if that seems like diff --git a/COPYING b/COPYING.2 -rename old COPYING -rename new COPYING.2 +rename from COPYING +rename to COPYING.2 --- a/COPYING +++ b/COPYING.2 @@ -2 +2 @@ diff --git a/t/t4004-diff-rename-symlink.sh b/t/t4004-diff-rename-symlink.sh index eb6dedd1ca..010dd87eef 100644 --- a/t/t4004-diff-rename-symlink.sh +++ b/t/t4004-diff-rename-symlink.sh @@ -48,8 +48,8 @@ copy from frotz copy to nitfol diff --git a/frotz b/rezrov similarity index 100% -rename old frotz -rename new rezrov +rename from frotz +rename to rezrov diff --git a/yomin b/yomin deleted file mode 100644 --- a/yomin diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh index fa2b1556b2..1921299fbc 100644 --- a/t/t4005-diff-rename-2.sh +++ b/t/t4005-diff-rename-2.sh @@ -53,8 +53,8 @@ copy to COPYING.1 - HOWEVER, in order to allow a migration to GPLv3 if that seems like + However, in order to allow a migration to GPLv3 if that seems like diff --git a/COPYING b/COPYING.2 -rename old COPYING -rename new COPYING.2 +rename from COPYING +rename to COPYING.2 --- a/COPYING +++ b/COPYING.2 @@ -2 +2 @@ diff --git a/t/t4009-diff-rename-4.sh b/t/t4009-diff-rename-4.sh index 7d8ca6dc35..318915f447 100644 --- a/t/t4009-diff-rename-4.sh +++ b/t/t4009-diff-rename-4.sh @@ -57,8 +57,8 @@ copy to COPYING.1 - HOWEVER, in order to allow a migration to GPLv3 if that seems like + However, in order to allow a migration to GPLv3 if that seems like diff --git a/COPYING b/COPYING.2 -rename old COPYING -rename new COPYING.2 +rename from COPYING +rename to COPYING.2 --- a/COPYING +++ b/COPYING.2 @@ -2 +2 @@ |