diff options
Diffstat (limited to 'ui-patch.c')
-rw-r--r-- | ui-patch.c | 19 |
1 files changed, 12 insertions, 7 deletions
@@ -28,11 +28,6 @@ static void header(unsigned char *sha1, char *path1, int mode1, | |||
28 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); | 28 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); |
29 | htmlf("diff --git a/%s b/%s\n", path1, path2); | 29 | htmlf("diff --git a/%s b/%s\n", path1, path2); |
30 | 30 | ||
31 | if (is_null_sha1(sha1)) | ||
32 | path1 = "dev/null"; | ||
33 | if (is_null_sha1(sha2)) | ||
34 | path2 = "dev/null"; | ||
35 | |||
36 | if (mode1 == 0) | 31 | if (mode1 == 0) |
37 | htmlf("new file mode %.6o\n", mode2); | 32 | htmlf("new file mode %.6o\n", mode2); |
38 | 33 | ||
@@ -50,8 +45,18 @@ static void header(unsigned char *sha1, char *path1, int mode1, | |||
50 | if (mode2 != mode1) | 45 | if (mode2 != mode1) |
51 | htmlf("..%.6o", mode2); | 46 | htmlf("..%.6o", mode2); |
52 | } | 47 | } |
53 | htmlf("\n--- a/%s\n", path1); | 48 | |
54 | htmlf("+++ b/%s\n", path2); | 49 | if (is_null_sha1(sha1)) { |
50 | path1 = "dev/null"; | ||
51 | htmlf("\n--- /%s\n", path1); | ||
52 | } else | ||
53 | htmlf("\n--- a/%s\n", path1); | ||
54 | |||
55 | if (is_null_sha1(sha2)) { | ||
56 | path2 = "dev/null"; | ||
57 | htmlf("+++ /%s\n", path2); | ||
58 | } else | ||
59 | htmlf("+++ b/%s\n", path2); | ||
55 | } | 60 | } |
56 | } | 61 | } |
57 | 62 | ||