From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 3 Apr 2011 20:53:11 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.5-rc1~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/44bc573436c98b7c6cd798af04c538f6e76f0f6e?ds=sidebyside;hp=-c

Merge branch 'maint'

* maint:
Start preparing for 1.7.4.4
pull: do not clobber untracked files on initial pull
compat: add missing #include <sys/resource.h>

Conflicts:
RelNotes
---

44bc573436c98b7c6cd798af04c538f6e76f0f6e
diff --combined git-compat-util.h
index 49b50eec86,79b5122b4f..40498b33c9
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@@ -118,6 -118,7 +118,7 @@@
  #endif
  #ifndef __MINGW32__
  #include <sys/wait.h>
+ #include <sys/resource.h>
  #include <sys/socket.h>
  #include <sys/ioctl.h>
  #include <termios.h>
@@@ -538,19 -539,6 +539,19 @@@ void git_qsort(void *base, size_t nmemb
  #define fstat_is_reliable() 1
  #endif
  
 +#ifndef va_copy
 +/*
 + * Since an obvious implementation of va_list would be to make it a
 + * pointer into the stack frame, a simple assignment will work on
 + * many systems.  But let's try to be more portable.
 + */
 +#ifdef __va_copy
 +#define va_copy(dst, src) __va_copy(dst, src)
 +#else
 +#define va_copy(dst, src) ((dst) = (src))
 +#endif
 +#endif
 +
  /*
   * Preserves errno, prints a message, but gives no warning for ENOENT.
   * Always returns the return value of unlink(2).