From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 18 Aug 2011 00:25:55 +0000 (-0700)
Subject: Merge branch 'cb/maint-exec-error-report'
X-Git-Tag: v1.7.7-rc0~31
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/253348b2dbb6519c82e6bc3543c652b9727771ed?ds=inline;hp=-c

Merge branch 'cb/maint-exec-error-report'

* cb/maint-exec-error-report:
notice error exit from pager
error_routine: use parent's stderr if exec fails
---

253348b2dbb6519c82e6bc3543c652b9727771ed
diff --combined git-compat-util.h
index ddfbf77149,041cbdb93e..5ef8ff76f6
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@@ -215,14 -215,10 +215,14 @@@ extern char *gitbasename(char *)
  #define is_dir_sep(c) ((c) == '/')
  #endif
  
 +#ifndef find_last_dir_sep
 +#define find_last_dir_sep(path) strrchr(path, '/')
 +#endif
 +
  #if __HP_cc >= 61000
  #define NORETURN __attribute__((noreturn))
  #define NORETURN_PTR
 -#elif defined(__GNUC__)
 +#elif defined(__GNUC__) && !defined(NO_NORETURN)
  #define NORETURN __attribute__((__noreturn__))
  #define NORETURN_PTR __attribute__((__noreturn__))
  #elif defined(_MSC_VER)
@@@ -240,6 -236,7 +240,7 @@@
  
  /* General helper functions */
  extern void vreportf(const char *prefix, const char *err, va_list params);
+ extern void vwritef(int fd, const char *prefix, const char *err, va_list params);
  extern NORETURN void usage(const char *err);
  extern NORETURN void usagef(const char *err, ...) __attribute__((format (printf, 1, 2)));
  extern NORETURN void die(const char *err, ...) __attribute__((format (printf, 1, 2)));
@@@ -248,6 -245,7 +249,7 @@@ extern int error(const char *err, ...) 
  extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
  
  extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params));
+ extern void set_error_routine(void (*routine)(const char *err, va_list params));
  
  extern int prefixcmp(const char *str, const char *prefix);
  extern int suffixcmp(const char *str, const char *suffix);