aboutsummaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-11 14:23:42 -0700
committerJunio C Hamano <gitster@pobox.com>2015-05-11 14:23:42 -0700
commit66ff763ebb35e5fc379f73c2769656cd61fe6b33 (patch)
tree802fb6b714ddb3c441573632dcb0c0a3fbdee8d4 /compat
parentcedeffeee06f7ae5982aa5e08fad78a90c4331bf (diff)
parent9a9a41db83052b674b89c084e4ac8c1458f7b11e (diff)
downloadgit-66ff763ebb35e5fc379f73c2769656cd61fe6b33.tar.gz
git-66ff763ebb35e5fc379f73c2769656cd61fe6b33.tar.xz
Merge branch 'lm/squelch-bg-progress'
Many long-running operations show progress eye-candy, even when they are later backgrounded. Hide the eye-candy when the process is sent to the background instead. * lm/squelch-bg-progress: compat/mingw: stubs for getpgid() and tcgetpgrp() progress: no progress in background
Diffstat (limited to 'compat')
-rw-r--r--compat/mingw.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/compat/mingw.h b/compat/mingw.h
index 5e499cfb7..98c5e4429 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -98,8 +98,6 @@ static inline unsigned int alarm(unsigned int seconds)
{ return 0; }
static inline int fsync(int fd)
{ return _commit(fd); }
-static inline pid_t getppid(void)
-{ return 1; }
static inline void sync(void)
{}
static inline uid_t getuid(void)
@@ -121,6 +119,12 @@ static inline int sigaddset(sigset_t *set, int signum)
#define SIG_UNBLOCK 0
static inline int sigprocmask(int how, const sigset_t *set, sigset_t *oldset)
{ return 0; }
+static inline pid_t getppid(void)
+{ return 1; }
+static inline pid_t getpgid(pid_t pid)
+{ return pid == 0 ? getpid() : pid; }
+static inline pid_t tcgetpgrp(int fd)
+{ return getpid(); }
/*
* simple adaptors