diff options
author | Junio C Hamano <junkio@cox.net> | 2005-08-10 07:10:18 (GMT) |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-08-10 07:10:18 (GMT) |
commit | f69714c38c6f3296a4bfba0d057e0f1605373f49 (patch) | |
tree | 2d850f14f62d33ed514e2b197b63fe459ff20d37 /diff.c | |
parent | edee414c3e5a546aae3dd1529f397df949713305 (diff) | |
parent | c35a7b8d806317dc1762e36561cbd31c2530dd9c (diff) | |
download | git-f69714c38c6f3296a4bfba0d057e0f1605373f49.zip git-f69714c38c6f3296a4bfba0d057e0f1605373f49.tar.gz git-f69714c38c6f3296a4bfba0d057e0f1605373f49.tar.bz2 |
Merge with master.
This merges commit
c35a7b8d806317dc1762e36561cbd31c2530dd9c
from master into our head commit
edee414c3e5a546aae3dd1529f397df949713305
Sincerely,
jit-merge command.
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -134,8 +134,8 @@ static void builtin_diff(const char *name_a, int complete_rewrite) { int i, next_at, cmd_size; - const char *diff_cmd = "diff -L%s%s -L%s%s"; - const char *diff_arg = "%s %s||:"; /* "||:" is to return 0 */ + const char *const diff_cmd = "diff -L%s%s -L%s%s"; + const char *const diff_arg = "%s %s||:"; /* "||:" is to return 0 */ const char *input_name_sq[2]; const char *path0[2]; const char *path1[2]; @@ -782,7 +782,8 @@ static void diff_flush_raw(struct diff_filepair *p, char status[10]; if (line_termination) { - const char *err = "path %s cannot be expressed without -z"; + const char *const err = + "path %s cannot be expressed without -z"; if (strchr(p->one->path, line_termination) || strchr(p->one->path, inter_name_termination)) die(err, p->one->path); |