Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
show_reference(): rewrite to take an object_id argument
author
Michael Haggerty
<mhagger@alum.mit.edu>
Mon, 25 May 2015 18:38:44 +0000
(18:38 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 25 May 2015 19:19:30 +0000
(12:19 -0700)
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/replace.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
53dc95b
)
diff --git
a/builtin/replace.c
b/builtin/replace.c
index bcf1508c088fd2a7eb5105a1ce05423b87088c62..0d52e7fa1d394d3c39437010592e4de428f53b34 100644
(file)
--- a/
builtin/replace.c
+++ b/
builtin/replace.c
@@
-35,7
+35,7
@@
struct show_data {
enum replace_format format;
};
enum replace_format format;
};
-static int show_reference(const char *refname, const
unsigned char *sha1
,
+static int show_reference(const char *refname, const
struct object_id *oid
,
int flag, void *cb_data)
{
struct show_data *data = cb_data;
int flag, void *cb_data)
{
struct show_data *data = cb_data;
@@
-44,19
+44,19
@@
static int show_reference(const char *refname, const unsigned char *sha1,
if (data->format == REPLACE_FORMAT_SHORT)
printf("%s\n", refname);
else if (data->format == REPLACE_FORMAT_MEDIUM)
if (data->format == REPLACE_FORMAT_SHORT)
printf("%s\n", refname);
else if (data->format == REPLACE_FORMAT_MEDIUM)
- printf("%s -> %s\n", refname,
sha1_to_hex(sha1
));
+ printf("%s -> %s\n", refname,
oid_to_hex(oid
));
else { /* data->format == REPLACE_FORMAT_LONG */
else { /* data->format == REPLACE_FORMAT_LONG */
-
unsigned char object[20]
;
+
struct object_id object
;
enum object_type obj_type, repl_type;
enum object_type obj_type, repl_type;
- if (get_sha1(refname, object))
+ if (get_sha1(refname, object
.hash
))
return error("Failed to resolve '%s' as a valid ref.", refname);
return error("Failed to resolve '%s' as a valid ref.", refname);
- obj_type = sha1_object_info(object, NULL);
- repl_type = sha1_object_info(
sha1
, NULL);
+ obj_type = sha1_object_info(object
.hash
, NULL);
+ repl_type = sha1_object_info(
oid->hash
, NULL);
printf("%s (%s) -> %s (%s)\n", refname, typename(obj_type),
printf("%s (%s) -> %s (%s)\n", refname, typename(obj_type),
-
sha1_to_hex(sha1
), typename(repl_type));
+
oid_to_hex(oid
), typename(repl_type));
}
}
}
}
@@
-66,8
+66,6
@@
static int show_reference(const char *refname, const unsigned char *sha1,
static int list_replace_refs(const char *pattern, const char *format)
{
struct show_data data;
static int list_replace_refs(const char *pattern, const char *format)
{
struct show_data data;
- struct each_ref_fn_sha1_adapter wrapped_show_reference =
- {show_reference, (void *) &data};
if (pattern == NULL)
pattern = "*";
if (pattern == NULL)
pattern = "*";
@@
-84,7
+82,7
@@
static int list_replace_refs(const char *pattern, const char *format)
"valid formats are 'short', 'medium' and 'long'\n",
format);
"valid formats are 'short', 'medium' and 'long'\n",
format);
- for_each_replace_ref(
each_ref_fn_adapter, &wrapped_show_reference
);
+ for_each_replace_ref(
show_reference, (void *)&data
);
return 0;
}
return 0;
}