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.
This commit is contained in:
Linus Torvalds
2005-06-05 15:31:52 -07:00
parent f7b797073c
commit dc93841715
7 changed files with 14 additions and 12 deletions

4
diff.c
View File

@ -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_;