Revision 69310a34cb6dcca32b08cf3ea9e91ab19354a874 authored by Junio C Hamano on 22 December 2005, 20:39:39 UTC, committed by Junio C Hamano on 22 December 2005, 20:39:39 UTC
Wnen refusing to push a head, we said cryptic "remote 'branch' object X does not exist on local" or "remote ref 'branch' is not a strict subset of local ref 'branch'". That was gittish. Since the most likely reason this happens is because the pushed head was not up-to-date, clarify the error message to say that straight, and suggest pulling first. First noticed by Johannes and seconded by Andreas. Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 7246ed4
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
Computing file changes ...
