git/commit.c, branch v1.2.4

Give no terminating LF to error() function.

2006-02-23T03:10:26Z

Signed-off-by: Junio C Hamano

commit.c: "Merge" fix in pretty_print_commit.

2006-02-03T01:52:19Z

Earlier, f2d4227530499db3e273ae84f30adfd4b70791c6 commit broke Merge: lines for unabbreviated case. Do not emit extra dots if we do not abbreviate. Signed-off-by: Junio C Hamano

pretty_print_commit: honor grafts.

2006-01-28T08:09:39Z

When displaying Merge: lines, we used to take the real commit parents from the commit objects. Use the parsed parents from the commit object instead, so that we honor fake parent information from info/grafts. Signed-off-by: Junio C Hamano

pretty_print_commit(): pass commit object instead of commit->buffer.

2006-01-28T08:09:39Z

Signed-off-by: Junio C Hamano

diff-tree: abbreviate merge parent object names with --abbrev --pretty.

2006-01-28T08:09:38Z

When --abbrev is in effect, abbreviate the merge parent names in prettyprinted output. Signed-off-by: Junio C Hamano

describe: omit clearing marks on the last one.

2006-01-16T06:15:37Z

When describing more than one, we need to clear the commit marks before handling the next one, but most of the time we are running it for only one commit, and in such a case this clearing phase is totally unnecessary. Signed-off-by: Junio C Hamano

GIT 1.1.0

2006-01-08T22:22:19Z

describe: allow more than one revs to be named.

2006-01-08T05:43:01Z

The main loop was prepared to take more than one revs, but the actual naming logic wad not (it used pop_most_recent_commit while forgetting that the commit marks stay after it's done). Signed-off-by: Junio C Hamano

[PATCH] Compilation: zero-length array declaration.

2006-01-07T18:51:06Z

ISO C99 (and GCC 3.x or later) lets you write a flexible array at the end of a structure, like this: struct frotz { int xyzzy; char nitfol[]; /* more */ }; GCC 2.95 and 2.96 let you to do this with "char nitfol[0]"; unfortunately this is not allowed by ISO C90. This declares such construct like this: struct frotz { int xyzzy; char nitfol[FLEX_ARRAY]; /* more */ }; and git-compat-util.h defines FLEX_ARRAY to 0 for gcc 2.95 and empty for others. If you are using a C90 C compiler, you should be able to override this with CFLAGS=-DFLEX_ARRAY=1 from the command line of "make". Signed-off-by: Junio C Hamano

short circuit out of a few places where we would allocate zero bytes

2005-12-26T16:59:21Z

dietlibc versions of malloc, calloc and realloc all return NULL if they're told to allocate 0 bytes, causes the x* wrappers to die(). There are several more places where these calls could end up asking for 0 bytes, too... Maybe simply not die()-ing in the x* wrappers if 0/NULL is returned when the requested size is zero is a safer and easier way to go. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano