diff options
author | Michael Halstead | 2012-11-14 12:41:01 -0800 |
---|---|---|
committer | Jason A. Donenfeld | 2012-11-15 00:56:20 +0100 |
commit | 62a40c78fed772e795eca8d4e7d6f6ead4d9a125 (patch) | |
tree | 03d81c7b21c66594d7380f118fdf2711a248bf6d /ui-patch.c | |
parent | 633a66c8226286d4559e72f0dce23586d617faff (diff) | |
download | cgit-62a40c78fed772e795eca8d4e7d6f6ead4d9a125.tar.gz cgit-62a40c78fed772e795eca8d4e7d6f6ead4d9a125.tar.bz2 cgit-62a40c78fed772e795eca8d4e7d6f6ead4d9a125.zip |
Format git diff headers correctly when adding or removing files.
Copying the output of cgit and using it in patches now works when adding
files to or removing files from the repository. This is helpful for people
who use cgit in their patch workflow.
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 | ||