diff options
| author | Ronnie Sahlberg <sahlberg@google.com> | 2014-07-15 12:59:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-15 10:47:24 -0700 |
| commit | 7695d118e5a3c9c6fcb4cb15eb766a1c57422aed (patch) | |
| tree | 53872b12d57c9f7fca48379262baff5d4f4051eb /builtin/log.c | |
| parent | aae383db8c384dc46abe199899235f67c838e601 (diff) | |
| download | git-7695d118e5a3c9c6fcb4cb15eb766a1c57422aed.tar.gz | |
refs.c: change resolve_ref_unsafe reading argument to be a flags field
resolve_ref_unsafe takes a boolean argument for reading (a nonexistent ref
resolves successfully for writing but not for reading). Change this to be
a flags field instead, and pass the new constant RESOLVE_REF_READING when
we want this behaviour.
While at it, swap two of the arguments in the function to put output
arguments at the end. As a nice side effect, this ensures that we can
catch callers that were unaware of the new API so they can be audited.
Give the wrapper functions resolve_refdup and read_ref_full the same
treatment for consistency.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index 1202eba8b6..83c0b92707 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1400,7 +1400,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) if (check_head) { unsigned char sha1[20]; const char *ref, *v; - ref = resolve_ref_unsafe("HEAD", sha1, 1, NULL); + ref = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, + sha1, NULL); if (ref && skip_prefix(ref, "refs/heads/", &v)) branch_name = xstrdup(v); else |