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

replace: factor object resolution out of replace_object

Browse Source 
As we add new options that operate on objects before
replacing them, we'll want to be able to feed raw sha1s
straight into replace_object. Split replace_object into the
object-resolution part and the actual replacement.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2014-04-26 22:00:56 +02:00 committed by Junio C Hamano
parent 70c7bd6daf
commit 479bd75751
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
builtin/replace.c
View File

@ -123,19 +123,17 @@ static int delete_replace_ref(const char *name, const char *ref,
return 0;
}
static int replace_object(const char *object_ref, const char *replace_ref,
int force)
static int replace_object_sha1(const char *object_ref,
unsigned char object[20],
const char *replace_ref,
unsigned char repl[20],
int force)
{
unsigned char object[20], prev[20], repl[20];
unsigned char prev[20];
enum object_type obj_type, repl_type;
char ref[PATH_MAX];
struct ref_lock *lock;
if (get_sha1(object_ref, object))
die("Failed to resolve '%s' as a valid ref.", object_ref);
if (get_sha1(replace_ref, repl))
die("Failed to resolve '%s' as a valid ref.", replace_ref);
if (snprintf(ref, sizeof(ref),
"refs/replace/%s",
sha1_to_hex(object)) > sizeof(ref) - 1)
@ -166,6 +164,18 @@ static int replace_object(const char *object_ref, const char *replace_ref,
return 0;
}
static int replace_object(const char *object_ref, const char *replace_ref, int force)
{
unsigned char object[20], repl[20];
if (get_sha1(object_ref, object))
die("Failed to resolve '%s' as a valid ref.", object_ref);
if (get_sha1(replace_ref, repl))
die("Failed to resolve '%s' as a valid ref.", replace_ref);
return replace_object_sha1(object_ref, object, replace_ref, repl, force);
}
int cmd_replace(int argc, const char **argv, const char *prefix)
{
int force = 0;