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
pack.h 
#ifndef PACK_H
#define PACK_H

/*
 * The packed object type is stored in 3 bits.
 * The type value 0 is a reserved prefix if ever there is more than 7
 * object types, or any future format extensions.
 */
enum object_type {
	OBJ_EXT = 0,
	OBJ_COMMIT = 1,
	OBJ_TREE = 2,
	OBJ_BLOB = 3,
	OBJ_TAG = 4,
	/* 5/6 for future expansion */
	OBJ_DELTA = 7,
};

/*
 * Packed object header
 */
#define PACK_SIGNATURE 0x5041434b	/* "PACK" */
#define PACK_VERSION 2
struct pack_header {
	unsigned int hdr_signature;
	unsigned int hdr_version;
	unsigned int hdr_entries;
};

extern int verify_pack(struct packed_git *, int);

#endif
back to top