Skip to main content

Browse the archive

Staging
v0.5.1
Revision 7abd7117ec57b8c3c2a469db62c7811fdac5c655 authored by Jon Loeliger on 04 May 2006, 04:19:54 UTC, committed by Junio C Hamano on 04 May 2006, 05:59:30 UTC 
Add a few more words to the glossary.
 
Clean up a few entries and fix typos.

    bare repository
    cherry-picking
    hook
    topic branch

[jc: removing questionable "symbolic ref -- see 'ref'" for now.]

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 9290cd5
Raw File
unpack-file.c 
#include "cache.h"
#include "blob.h"

static char *create_temp_file(unsigned char *sha1)
{
	static char path[50];
	void *buf;
	char type[100];
	unsigned long size;
	int fd;

	buf = read_sha1_file(sha1, type, &size);
	if (!buf || strcmp(type, blob_type))
		die("unable to read blob object %s", sha1_to_hex(sha1));

	strcpy(path, ".merge_file_XXXXXX");
	fd = mkstemp(path);
	if (fd < 0)
		die("unable to create temp-file");
	if (write(fd, buf, size) != size)
		die("unable to write temp-file");
	close(fd);
	return path;
}

int main(int argc, char **argv)
{
	unsigned char sha1[20];

	if (argc != 2 || get_sha1(argv[1], sha1))
		usage("git-unpack-file <sha1>");

	setup_git_directory();
	git_config(git_default_config);

	puts(create_temp_file(sha1));
	return 0;
}
back to top