Skip to main content

Browse the archive

Staging
v0.5.2
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 0d214b6619bf14a6409a2a1ba079f3530d40ee41 authored by Fredrik Kuivinen on 13 September 2005, 21:40:23 UTC, committed by Junio C Hamano on 13 September 2005, 22:45:24 UTC 
[PATCH] Don't output 'Automatic merge failed, ...'
 
git-merge.sh does this for us.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent d9a23fa
Raw File
Tip revision: 0d214b6619bf14a6409a2a1ba079f3530d40ee41 authored by Fredrik Kuivinen on 13 September 2005, 21:40:23 UTC
[PATCH] Don't output 'Automatic merge failed, ...'
Tip revision: 0d214b6
get-tar-commit-id.c 
/*
 * Copyright (C) 2005 Rene Scharfe
 */
#include <stdio.h>
#include <string.h>
#include <unistd.h>

#define HEADERSIZE	1024

int main(int argc, char **argv)
{
	char buffer[HEADERSIZE];
	ssize_t n;

	n = read(0, buffer, HEADERSIZE);
	if (n < HEADERSIZE) {
		fprintf(stderr, "read error\n");
		return 3;
	}
	if (buffer[156] != 'g')
		return 1;
	if (memcmp(&buffer[512], "52 comment=", 11))
		return 1;
	n = write(1, &buffer[523], 41);
	if (n < 41) {
		fprintf(stderr, "write error\n");
		return 2;
	}
	return 0;
}
back to top