Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
revision: convert prepare_show_merge to struct object_id
author
brian m. carlson
<sandals@crustytoothpaste.net>
Sat, 6 May 2017 22:10:05 +0000
(22:10 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 8 May 2017 06:12:57 +0000
(15:12 +0900)
This is a caller of lookup_commit_or_die, which we will convert later
on.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
revision.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
18b74e5
)
diff --git
a/revision.c
b/revision.c
index 2b56c3baf07980a9ee50eac0394bc64c83c5508c..94536703417a73048dd8106f929a2626eee77ced 100644
(file)
--- a/
revision.c
+++ b/
revision.c
@@
-1389,16
+1389,16
@@
static void prepare_show_merge(struct rev_info *revs)
{
struct commit_list *bases;
struct commit *head, *other;
{
struct commit_list *bases;
struct commit *head, *other;
-
unsigned char sha1[20]
;
+
struct object_id oid
;
const char **prune = NULL;
int i, prune_num = 1; /* counting terminating NULL */
const char **prune = NULL;
int i, prune_num = 1; /* counting terminating NULL */
- if (get_
sha1("HEAD", sha1
))
+ if (get_
oid("HEAD", &oid
))
die("--merge without HEAD?");
die("--merge without HEAD?");
- head = lookup_commit_or_die(
sha1
, "HEAD");
- if (get_
sha1("MERGE_HEAD", sha1
))
+ head = lookup_commit_or_die(
oid.hash
, "HEAD");
+ if (get_
oid("MERGE_HEAD", &oid
))
die("--merge without MERGE_HEAD?");
die("--merge without MERGE_HEAD?");
- other = lookup_commit_or_die(
sha1
, "MERGE_HEAD");
+ other = lookup_commit_or_die(
oid.hash
, "MERGE_HEAD");
add_pending_object(revs, &head->object, "HEAD");
add_pending_object(revs, &other->object, "MERGE_HEAD");
bases = get_merge_bases(head, other);
add_pending_object(revs, &head->object, "HEAD");
add_pending_object(revs, &other->object, "MERGE_HEAD");
bases = get_merge_bases(head, other);