Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
builtin/branch: convert to struct object_id
author
brian m. carlson
<sandals@crustytoothpaste.net>
Tue, 21 Feb 2017 23:47:26 +0000
(23:47 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 22 Feb 2017 18:12:15 +0000
(10:12 -0800)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/branch.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
1db1108
)
diff --git
a/builtin/branch.c
b/builtin/branch.c
index 9d30f55b0b83cfc09294e2cb7cabdc9aa72e2508..faf472ff8f091306ef3ee528662b45bb693393c4 100644
(file)
--- a/
builtin/branch.c
+++ b/
builtin/branch.c
@@
-32,7
+32,7
@@
static const char * const builtin_branch_usage[] = {
};
static const char *head;
};
static const char *head;
-static
unsigned char head_sha1[20]
;
+static
struct object_id head_oid
;
static int branch_use_color = -1;
static char branch_colors[][COLOR_MAXLEN] = {
static int branch_use_color = -1;
static char branch_colors[][COLOR_MAXLEN] = {
@@
-117,13
+117,13
@@
static int branch_merged(int kind, const char *name,
if (kind == FILTER_REFS_BRANCHES) {
struct branch *branch = branch_get(name);
const char *upstream = branch_get_upstream(branch, NULL);
if (kind == FILTER_REFS_BRANCHES) {
struct branch *branch = branch_get(name);
const char *upstream = branch_get_upstream(branch, NULL);
-
unsigned char sha1[20]
;
+
struct object_id oid
;
if (upstream &&
(reference_name = reference_name_to_free =
resolve_refdup(upstream, RESOLVE_REF_READING,
if (upstream &&
(reference_name = reference_name_to_free =
resolve_refdup(upstream, RESOLVE_REF_READING,
-
sha1
, NULL)) != NULL)
- reference_rev = lookup_commit_reference(
sha1
);
+
oid.hash
, NULL)) != NULL)
+ reference_rev = lookup_commit_reference(
oid.hash
);
}
if (!reference_rev)
reference_rev = head_rev;
}
if (!reference_rev)
reference_rev = head_rev;
@@
-153,10
+153,10
@@
static int branch_merged(int kind, const char *name,
}
static int check_branch_commit(const char *branchname, const char *refname,
}
static int check_branch_commit(const char *branchname, const char *refname,
- const
unsigned char *sha1
, struct commit *head_rev,
+ const
struct object_id *oid
, struct commit *head_rev,
int kinds, int force)
{
int kinds, int force)
{
- struct commit *rev = lookup_commit_reference(
sha1
);
+ struct commit *rev = lookup_commit_reference(
oid->hash
);
if (!rev) {
error(_("Couldn't look up commit object for '%s'"), refname);
return -1;
if (!rev) {
error(_("Couldn't look up commit object for '%s'"), refname);
return -1;
@@
-183,7
+183,7
@@
static int delete_branches(int argc, const char **argv, int force, int kinds,
int quiet)
{
struct commit *head_rev = NULL;
int quiet)
{
struct commit *head_rev = NULL;
-
unsigned char sha1[20]
;
+
struct object_id oid
;
char *name = NULL;
const char *fmt;
int i;
char *name = NULL;
const char *fmt;
int i;
@@
-207,7
+207,7
@@
static int delete_branches(int argc, const char **argv, int force, int kinds,
}
if (!force) {
}
if (!force) {
- head_rev = lookup_commit_reference(head_
sha1
);
+ head_rev = lookup_commit_reference(head_
oid.hash
);
if (!head_rev)
die(_("Couldn't look up commit object for HEAD"));
}
if (!head_rev)
die(_("Couldn't look up commit object for HEAD"));
}
@@
-235,7
+235,7
@@
static int delete_branches(int argc, const char **argv, int force, int kinds,
RESOLVE_REF_READING
| RESOLVE_REF_NO_RECURSE
| RESOLVE_REF_ALLOW_BAD_NAME,
RESOLVE_REF_READING
| RESOLVE_REF_NO_RECURSE
| RESOLVE_REF_ALLOW_BAD_NAME,
-
sha1
, &flags);
+
oid.hash
, &flags);
if (!target) {
error(remote_branch
? _("remote-tracking branch '%s' not found.")
if (!target) {
error(remote_branch
? _("remote-tracking branch '%s' not found.")
@@
-245,13
+245,13
@@
static int delete_branches(int argc, const char **argv, int force, int kinds,
}
if (!(flags & (REF_ISSYMREF|REF_ISBROKEN)) &&
}
if (!(flags & (REF_ISSYMREF|REF_ISBROKEN)) &&
- check_branch_commit(bname.buf, name,
sha1
, head_rev, kinds,
+ check_branch_commit(bname.buf, name,
&oid
, head_rev, kinds,
force)) {
ret = 1;
goto next;
}
force)) {
ret = 1;
goto next;
}
- if (delete_ref(name, is_null_
sha1(sha1) ? NULL : sha1
,
+ if (delete_ref(name, is_null_
oid(&oid) ? NULL : oid.hash
,
REF_NODEREF)) {
error(remote_branch
? _("Error deleting remote-tracking branch '%s'")
REF_NODEREF)) {
error(remote_branch
? _("Error deleting remote-tracking branch '%s'")
@@
-267,7
+267,7
@@
static int delete_branches(int argc, const char **argv, int force, int kinds,
bname.buf,
(flags & REF_ISBROKEN) ? "broken"
: (flags & REF_ISSYMREF) ? target
bname.buf,
(flags & REF_ISBROKEN) ? "broken"
: (flags & REF_ISSYMREF) ? target
- : find_unique_abbrev(
sha1
, DEFAULT_ABBREV));
+ : find_unique_abbrev(
oid.hash
, DEFAULT_ABBREV));
}
delete_branch_config(bname.buf);
}
delete_branch_config(bname.buf);
@@
-693,7
+693,7
@@
int cmd_branch(int argc, const char **argv, const char *prefix)
track = git_branch_track;
track = git_branch_track;
- head = resolve_refdup("HEAD", 0, head_
sha1
, NULL);
+ head = resolve_refdup("HEAD", 0, head_
oid.hash
, NULL);
if (!head)
die(_("Failed to resolve HEAD as a valid ref."));
if (!strcmp(head, "HEAD"))
if (!head)
die(_("Failed to resolve HEAD as a valid ref."));
if (!strcmp(head, "HEAD"))