Merge branch 'rj/maint-grep-remove-redundant-test' into maint

diff --git a/git-compat-util.h b/git-compat-util.h
index ed11ad8119bb22db8a5428aed5525c40fbb72217..5bd9ad7d2a23773b1410ded9f4f241ebe4d4da00 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -595,4 +595,7 @@ int rmdir_or_warn(const char *path);
  */
 int remove_or_warn(unsigned int mode, const char *path);
 
+/* Get the passwd entry for the UID of the current process. */
+struct passwd *xgetpwuid_self(void);
+
 #endif