From 62a40c78fed772e795eca8d4e7d6f6ead4d9a125 Mon Sep 17 00:00:00 2001 From: Michael Halstead Date: Wed, 14 Nov 2012 12:41:01 -0800 Subject: 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. --- ui-diff.c | 17 ++++++++++------- ui-patch.c | 19 ++++++++++++------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/ui-diff.c b/ui-diff.c index c6bad63..3d46da2 100644 --- a/ui-diff.c +++ b/ui-diff.c @@ -229,11 +229,6 @@ static void header(unsigned char *sha1, char *path1, int mode1, html(" b/"); html_txt(path2); - if (is_null_sha1(sha1)) - path1 = "dev/null"; - if (is_null_sha1(sha2)) - path2 = "dev/null"; - if (mode1 == 0) htmlf("
new file mode %.6o", mode2); @@ -251,13 +246,21 @@ static void header(unsigned char *sha1, char *path1, int mode1, if (mode2 != mode1) htmlf("..%.6o", mode2); } - html("
--- a/"); + if (is_null_sha1(sha1)) { + path1 = "dev/null"; + html("
--- /"); + } else + html("
--- a/"); if (mode1 != 0) cgit_tree_link(path1, NULL, NULL, ctx.qry.head, sha1_to_hex(old_rev_sha1), path1); else html_txt(path1); - html("
+++ b/"); + if (is_null_sha1(sha2)) { + path2 = "dev/null"; + html("
+++ /"); + } else + html("
+++ b/"); if (mode2 != 0) cgit_tree_link(path2, NULL, NULL, ctx.qry.head, sha1_to_hex(new_rev_sha1), path2); diff --git a/ui-patch.c b/ui-patch.c index ca008f3..79bc509 100644 --- a/ui-patch.c +++ b/ui-patch.c @@ -28,11 +28,6 @@ static void header(unsigned char *sha1, char *path1, int mode1, subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); htmlf("diff --git a/%s b/%s\n", path1, path2); - if (is_null_sha1(sha1)) - path1 = "dev/null"; - if (is_null_sha1(sha2)) - path2 = "dev/null"; - if (mode1 == 0) htmlf("new file mode %.6o\n", mode2); @@ -50,8 +45,18 @@ static void header(unsigned char *sha1, char *path1, int mode1, if (mode2 != mode1) htmlf("..%.6o", mode2); } - htmlf("\n--- a/%s\n", path1); - htmlf("+++ b/%s\n", path2); + + if (is_null_sha1(sha1)) { + path1 = "dev/null"; + htmlf("\n--- /%s\n", path1); + } else + htmlf("\n--- a/%s\n", path1); + + if (is_null_sha1(sha2)) { + path2 = "dev/null"; + htmlf("+++ /%s\n", path2); + } else + htmlf("+++ b/%s\n", path2); } } -- cgit 1.4.1 d065dc602d462c5f147f8f2f89f4e'>unfollow)
Commit message (Expand)Author
2024-07-16Add photos from July 9June McEnroe
2024-07-15Add photos from July 6June McEnroe
2024-07-10Add the end of the Harman Phoenix rollJune McEnroe
2024-07-08Add photos from July 3, the hikeJune McEnroe
2024-07-07Add photos from July 1June McEnroe
2024-07-07Add photos from June 25-30June McEnroe
2024-06-30Add photos from June 22 (and the few days after that)June McEnroe
2024-06-30Accommodate lower-case .jpg filesJune McEnroe
2024-06-23Add another BACKXWASH showJune McEnroe
2024-06-16Update bioJune McEnroe
2024-06-15Add photo descriptions from June 12June McEnroe
2024-06-10Add first roll of film from June 8June McEnroe
2024-06-10Cope with not having an EXIF infoJune McEnroe
2024-06-10Resize using target pixel counts for consistencyJune McEnroe
2024-06-10Add The Girl Who Was Convinced...June McEnroe
2024-06-09Add photos from May 31June McEnroe
2024-06-09Use monospace on photo pagesJune McEnroe
2024-06-09Put lens and (future) film at the tops of photo pagesJune McEnroe
2024-05-22Remove use of sysexits.hJune McEnroe
2024-05-22Add photo descriptions from 05-03 and 05-06June McEnroe
2024-05-21Fix = precedence in whenJune McEnroe