delta/git.git, branch dm/port2zos

compat/bswap.h: detect endianness from XL C compiler macros

2014-10-27T18:51:12+00:00

There is no /usr/include/endian.h equivalent on z/OS, but the
compiler will define macros to indicate endianness on host and
target hardware.  This adds a test for these macros as a last
resort for determining byte order.

Signed-off-by: David Michael 
Signed-off-by: Junio C Hamano

Makefile: reorder linker flags in the git executable rule

2014-10-27T18:49:18+00:00

The XL C compiler can fail due to mixing library path and object
file arguments, for example when linking git while building with
"gmake LDFLAGS=-L$prefix/lib".

Move the ALL_LDFLAGS variable expansion in the git executable rule
to be consistent with all the other linking rules, namely to have
LDFLAGS such as -L$where before the object files *.o being linked
together.

Signed-off-by: David Michael 
Signed-off-by: Junio C Hamano

git-compat-util.h: support variadic macros with the XL C compiler

2014-10-27T18:48:37+00:00

When the XL C compiler is run with an appropriate language level or
suboption, it defines a feature test macro to indicate support for
variadic macros by defining __C99_MACRO_WITH_VA_ARGS C preprocessor
macro.

This was tested on z/OS, but it should also work on AIX according
to IBM documentation.

Signed-off-by: David Michael 
Signed-off-by: Junio C Hamano

Merge branch 'maint-2.0' into maint

2014-10-07T20:40:51+00:00

* maint-2.0:
  git-tag.txt: Add a missing hyphen to `-s`

Merge branch 'maint-1.9' into maint-2.0

2014-10-07T20:40:39+00:00

* maint-1.9:
  git-tag.txt: Add a missing hyphen to `-s`

Merge branch 'maint-1.8.5' into maint-1.9

2014-10-07T20:40:19+00:00

* maint-1.8.5:
  git-tag.txt: Add a missing hyphen to `-s`

Merge branch 'jk/mbox-from-line' into maint

2014-10-07T20:39:27+00:00

Some MUAs mangled a line in a message that begins with "From " to
">From " when writing to a mailbox file and feeding such an input to
"git am" used to lose such a line.

* jk/mbox-from-line:
  mailinfo: work around -Wstring-plus-int warning
  mailinfo: make ">From" in-body header check more robust

git-tag.txt: Add a missing hyphen to `-s`

2014-10-07T18:08:06+00:00

Signed-off-by: Wieland Hoffmann 
Signed-off-by: Junio C Hamano

Git 2.1.2

2014-09-30T05:15:00+00:00

Signed-off-by: Junio C Hamano

Merge branch 'jk/fsck-exit-code-fix' into maint

2014-09-30T05:10:55+00:00

"git fsck" failed to report that it found corrupt objects via its
exit status in some cases.

* jk/fsck-exit-code-fix:
  fsck: return non-zero status on missing ref tips
  fsck: exit with non-zero status upon error from fsck_obj()