diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-07 17:02:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-07 17:02:07 -0700 |
| commit | 9673198ee867cea4ed70d2cf54c1a2eb8f27bb46 (patch) | |
| tree | f06a5be02102b0a78f56e18beffa8fa5c3e70b6e /convert-objects.c | |
| parent | Eliminate Scalar::Util usage from private-Error.pm (diff) | |
| parent | annotate: Fix bug when parsing merges with differing real and logical parents. (diff) | |
| download | git-9673198ee867cea4ed70d2cf54c1a2eb8f27bb46.tar.gz git-9673198ee867cea4ed70d2cf54c1a2eb8f27bb46.zip | |
Merge branch 'master' into pb/gitpm
This is to resolve the conflicts with Ryan's annotate updates early.
Diffstat (limited to 'convert-objects.c')
| -rw-r--r-- | convert-objects.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/convert-objects.c b/convert-objects.c index 0fabd8981c..ebea8e472b 100644 --- a/convert-objects.c +++ b/convert-objects.c @@ -240,14 +240,14 @@ static void convert_date(void *buffer, unsigned long size, unsigned char *result { char *new = xmalloc(size + 100); unsigned long newlen = 0; - - // "tree <sha1>\n" + + /* "tree <sha1>\n" */ memcpy(new + newlen, buffer, 46); newlen += 46; buffer = (char *) buffer + 46; size -= 46; - // "parent <sha1>\n" + /* "parent <sha1>\n" */ while (!memcmp(buffer, "parent ", 7)) { memcpy(new + newlen, buffer, 48); newlen += 48; @@ -255,12 +255,12 @@ static void convert_date(void *buffer, unsigned long size, unsigned char *result size -= 48; } - // "author xyz <xyz> date" + /* "author xyz <xyz> date" */ newlen += convert_date_line(new + newlen, &buffer, &size); - // "committer xyz <xyz> date" + /* "committer xyz <xyz> date" */ newlen += convert_date_line(new + newlen, &buffer, &size); - // Rest + /* Rest */ memcpy(new + newlen, buffer, size); newlen += size; |