RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 20:17:44 +00:00
Code Issues Activity Actions

Ports/git: Update git to version 2.39.0

Browse source
This commit is contained in:
EWouters 2022-12-13 05:05:32 +01:00 • committed by Andreas Kling
parent ad120606fd
commit 9a849c10ae
4 changed files with 50 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

72
Ports/git/patches/0001-Remove-some-unimplemented-function-calls.patch
View file

@ -5,44 +5,48 @@ Subject: [PATCH] Remove some unimplemented function calls
i.e. f(un)lockfile stubs and setitimer.
---
builtin/log.c | 2 --
git-compat-util.h | 8 --------
progress.c | 2 --
3 files changed, 12 deletions(-)
builtin/log.c | 6 ------
git-compat-util.h | 8 --------
progress.c | 14 --------------
3 files changed, 28 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index c211d66..9755174 100644
index 89447a50838562795bb80172db8102ff7a42e91b..3552e1807860b30eb18366487e5476346290bcea 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -373,7 +373,6 @@ static void log_show_early(struct rev_info *revs, struct commit_list *list)
@@ -430,9 +430,6 @@ static void log_show_early(struct rev_info *revs, struct commit_list *list)
* trigger every second even if we're blocked on a
* reader!
*/
early_output_timer.it_value.tv_sec = 0;
early_output_timer.it_value.tv_usec = 500000;
- early_output_timer.it_value.tv_sec = 0;
- early_output_timer.it_value.tv_usec = 500000;
- setitimer(ITIMER_REAL, &early_output_timer, NULL);
}
static void early_output(int signal)
@@ -407,7 +406,6 @@ static void setup_early_output(void)
@@ -464,9 +461,6 @@ static void setup_early_output(void)
*
* This is a one-time-only trigger.
*/
early_output_timer.it_value.tv_sec = 0;
early_output_timer.it_value.tv_usec = 100000;
- early_output_timer.it_value.tv_sec = 0;
- early_output_timer.it_value.tv_usec = 100000;
- setitimer(ITIMER_REAL, &early_output_timer, NULL);
}
static void finish_early_output(struct rev_info *rev)
diff --git a/git-compat-util.h b/git-compat-util.h
index 58fd813..0a0f007 100644
index a76d0526f79266e1dc512072a4236876df8f8726..596ac243f673d30748e3792d7926ea1b22d4911e 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1350,14 +1350,6 @@ int open_nofollow(const char *path, int flags);
@@ -1471,14 +1471,6 @@ int open_nofollow(const char *path, int flags);
#endif
#ifndef _POSIX_THREAD_SAFE_FUNCTIONS
-static inline void flockfile(FILE *fh)
-static inline void flockfile(FILE *fh UNUSED)
-{
- ; /* nothing */
-}
-static inline void funlockfile(FILE *fh)
-static inline void funlockfile(FILE *fh UNUSED)
-{
- ; /* nothing */
-}
@ -50,22 +54,38 @@ index 58fd813..0a0f007 100644
#endif
diff --git a/progress.c b/progress.c
index 0cdd875..19a2a67 100644
index 0cdd875d37f166bedbbeb5f0e889046674ed58be..4b7f5b0b5a48b1b895befef12217e5822d118563 100644
--- a/progress.c
+++ b/progress.c
@@ -83,7 +83,6 @@ static void set_progress_signal(void)
v.it_interval.tv_sec = 1;
v.it_interval.tv_usec = 0;
v.it_value = v.it_interval;
@@ -67,7 +67,6 @@ static void progress_interval(int signum)
static void set_progress_signal(void)
{
struct sigaction sa;
- struct itimerval v;
if (progress_testing)
return;
@@ -79,23 +78,10 @@ static void set_progress_signal(void)
sigemptyset(&sa.sa_mask);
sa.sa_flags = SA_RESTART;
sigaction(SIGALRM, &sa, NULL);
-
- v.it_interval.tv_sec = 1;
- v.it_interval.tv_usec = 0;
- v.it_value = v.it_interval;
- setitimer(ITIMER_REAL, &v, NULL);
}
static void clear_progress_signal(void)
@@ -93,7 +92,6 @@ static void clear_progress_signal(void)
if (progress_testing)
return;
{
- struct itimerval v = {{0,},};
-
- if (progress_testing)
- return;
-
- setitimer(ITIMER_REAL, &v, NULL);
signal(SIGALRM, SIG_IGN);
progress_update = 0;
- signal(SIGALRM, SIG_IGN);
- progress_update = 0;
}
static int is_foreground_fd(int fd)