undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace: refactor checking ref validity

Browse Source 
This will be useful in a following commit when we will
want to check if the ref already exists before we let the
user edit an object.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2014-05-17 14:16:35 +02:00 committed by Junio C Hamano
parent f22166b5fe
commit b6e3884092
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
builtin/replace.c
View File

@ -124,6 +124,25 @@ static int delete_replace_ref(const char *name, const char *ref,
return 0; return 0;
} }
static void check_ref_valid(unsigned char object[20],
unsigned char prev[20],
char *ref,
int ref_size,
int force)
{
if (snprintf(ref, ref_size,
"refs/replace/%s",
sha1_to_hex(object)) > ref_size - 1)
die("replace ref name too long: %.*s...", 50, ref);
if (check_refname_format(ref, 0))
die("'%s' is not a valid ref name.", ref);
if (read_ref(ref, prev))
hashclr(prev);
else if (!force)
die("replace ref '%s' already exists", ref);
}
static int replace_object_sha1(const char *object_ref, static int replace_object_sha1(const char *object_ref,
unsigned char object[20], unsigned char object[20],
const char *replace_ref, const char *replace_ref,
@ -135,13 +154,6 @@ static int replace_object_sha1(const char *object_ref,
char ref[PATH_MAX]; char ref[PATH_MAX];
struct ref_lock *lock; struct ref_lock *lock;
if (snprintf(ref, sizeof(ref),
"refs/replace/%s",
sha1_to_hex(object)) > sizeof(ref) - 1)
die("replace ref name too long: %.*s...", 50, ref);
if (check_refname_format(ref, 0))
die("'%s' is not a valid ref name.", ref);
obj_type = sha1_object_info(object, NULL); obj_type = sha1_object_info(object, NULL);
repl_type = sha1_object_info(repl, NULL); repl_type = sha1_object_info(repl, NULL);
if (!force && obj_type != repl_type) if (!force && obj_type != repl_type)
@ -151,10 +163,7 @@ static int replace_object_sha1(const char *object_ref,
object_ref, typename(obj_type), object_ref, typename(obj_type),
replace_ref, typename(repl_type)); replace_ref, typename(repl_type));
if (read_ref(ref, prev)) check_ref_valid(object, prev, ref, sizeof(ref), force);
hashclr(prev);
else if (!force)
die("replace ref '%s' already exists", ref);
lock = lock_any_ref_for_update(ref, prev, 0, NULL); lock = lock_any_ref_for_update(ref, prev, 0, NULL);
if (!lock) if (!lock)