about summary refs log tree commit diff
path: root/third_party/git
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2022-05-04T14·02+0200
committerclbot <clbot@tvl.fyi>2022-05-04T16·18+0000
commit5fae8b08266a4fd7f24ed3eddc914e61a45cee9a (patch)
tree859873837e8ae1a762788a1b99f59363b407b4cd /third_party/git
parente42fd0d611b981f901c9ef37494f66dc4045d223 (diff)
chore(3p/sources): Bump channels & overlays r/4003
* //nix/buildLisp: ccl dumped images have fixed themselves… again

* //3p/git: rebase patch on 2.36.0

* //3p/overlays/haskell: remove upstreamed workarounds

* Disable everything depending on cgit temporarily, since it doesn't
  compile with git 2.36 yet.

Change-Id: I9dc11c0846641341adbdcc7162cbf149a15fe0cb
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5519
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'third_party/git')
-rw-r--r--third_party/git/0001-feat-third_party-git-date-add-dottime-format.patch50
1 files changed, 25 insertions, 25 deletions
diff --git a/third_party/git/0001-feat-third_party-git-date-add-dottime-format.patch b/third_party/git/0001-feat-third_party-git-date-add-dottime-format.patch
index 0e11b2ca63d0..a249b1ce1bf2 100644
--- a/third_party/git/0001-feat-third_party-git-date-add-dottime-format.patch
+++ b/third_party/git/0001-feat-third_party-git-date-add-dottime-format.patch
@@ -1,4 +1,4 @@
-From 46c52e6b462f9b1c9aa08a1b1bba79dd16302a9c Mon Sep 17 00:00:00 2001
+From 2fd675c5379dcfa7a2c3465e325cdea8faa2b95c Mon Sep 17 00:00:00 2001
 From: Vincent Ambo <tazjin@google.com>
 Date: Mon, 6 Jan 2020 16:00:52 +0000
 Subject: [PATCH] feat(third_party/git/date): add "dottime" format
@@ -16,16 +16,16 @@ a strftime formatting string is not sufficient.
 ---
  Documentation/rev-list-options.txt |  3 +++
  builtin/blame.c                    |  3 +++
- cache.h                            |  3 ++-
  date.c                             | 17 +++++++++++++++++
+ date.h                             |  3 ++-
  t/t0006-date.sh                    |  2 ++
  5 files changed, 27 insertions(+), 1 deletion(-)
 
 diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
-index b7bd27e171..273971bdd0 100644
+index fd4f4e26c9..1f7ab97865 100644
 --- a/Documentation/rev-list-options.txt
 +++ b/Documentation/rev-list-options.txt
-@@ -1052,6 +1052,9 @@ omitted.
+@@ -1054,6 +1054,9 @@ omitted.
  1970).  As with `--raw`, this is always in UTC and therefore `-local`
  has no effect.
  
@@ -33,13 +33,13 @@ index b7bd27e171..273971bdd0 100644
 +but suffixed with the local timezone offset if given)
 +
  `--date=format:...` feeds the format `...` to your system `strftime`,
- except for %z and %Z, which are handled internally.
+ except for %s, %z, and %Z, which are handled internally.
  Use `--date=format:%c` to show the date in your system locale's
 diff --git a/builtin/blame.c b/builtin/blame.c
-index 641523ff9a..fa0240237c 100644
+index 8d15b68afc..e0cdf418f5 100644
 --- a/builtin/blame.c
 +++ b/builtin/blame.c
-@@ -1005,6 +1005,9 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
+@@ -1009,6 +1009,9 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
  	case DATE_STRFTIME:
  		blame_date_width = strlen(show_date(0, 0, &blame_date_mode)) + 1; /* add the null */
  		break;
@@ -49,22 +49,8 @@ index 641523ff9a..fa0240237c 100644
  	}
  	blame_date_width -= 1; /* strip the null */
  
-diff --git a/cache.h b/cache.h
-index 0c245d4f10..fa79e37b49 100644
---- a/cache.h
-+++ b/cache.h
-@@ -1570,7 +1570,8 @@ enum date_mode_type {
- 	DATE_RFC2822,
- 	DATE_STRFTIME,
- 	DATE_RAW,
--	DATE_UNIX
-+	DATE_UNIX,
-+	DATE_DOTTIME
- };
- 
- struct date_mode {
 diff --git a/date.c b/date.c
-index c55ea47e96..7fe4fb982b 100644
+index 68a260c214..1485e3808f 100644
 --- a/date.c
 +++ b/date.c
 @@ -347,6 +347,21 @@ const char *show_date(timestamp_t time, int tz, const struct date_mode *mode)
@@ -98,11 +84,25 @@ index c55ea47e96..7fe4fb982b 100644
  	/*
  	 * Please update $__git_log_date_formats in
  	 * git-completion.bash when you add new formats.
+diff --git a/date.h b/date.h
+index 5d4eaba0a9..ff8fdffdbf 100644
+--- a/date.h
++++ b/date.h
+@@ -17,7 +17,8 @@ enum date_mode_type {
+ 	DATE_RFC2822,
+ 	DATE_STRFTIME,
+ 	DATE_RAW,
+-	DATE_UNIX
++	DATE_UNIX,
++	DATE_DOTTIME
+ };
+ 
+ struct date_mode {
 diff --git a/t/t0006-date.sh b/t/t0006-date.sh
-index 6b757d7169..5deb558497 100755
+index 2490162071..7ce4fe1927 100755
 --- a/t/t0006-date.sh
 +++ b/t/t0006-date.sh
-@@ -49,9 +49,11 @@ check_show short "$TIME" '2016-06-15'
+@@ -51,9 +51,11 @@ check_show short "$TIME" '2016-06-15'
  check_show default "$TIME" 'Wed Jun 15 16:13:20 2016 +0200'
  check_show raw "$TIME" '1466000000 +0200'
  check_show unix "$TIME" '1466000000'
@@ -115,5 +115,5 @@ index 6b757d7169..5deb558497 100755
  check_show 'format:%z' "$TIME" '+0200'
  check_show 'format-local:%z' "$TIME" '+0000'
 -- 
-2.32.0
+2.35.3