diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-04-04 20:56:21 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-04-04 20:56:21 +0300 |
commit | 3ff8cbfe8a333f55931fa9b588f106e060a67079 (patch) | |
tree | d4096bb40c2513a46d6dfd4ecbbbe219c158a683 /reflog.c | |
parent | 4b6846d9dcd391164b72bd70e8a0c0e09776afe3 (diff) | |
parent | 840344db7578a794fd25c44587e4a08dfe4f41cc (diff) |
Merge branch 'ab/reflog-parse-options'
"git reflog" command now uses parse-options API to parse its
command line options.
* ab/reflog-parse-options:
reflog: fix 'show' subcommand's argv
reflog [show]: display sensible -h output
reflog: convert to parse_options() API
reflog exists: use parse_options() API
git reflog [expire|delete]: make -h output consistent with SYNOPSIS
reflog: move "usage" variables and use macros
reflog tests: add missing "git reflog exists" tests
reflog: refactor cmd_reflog() to "if" branches
reflog.c: indent argument lists
Diffstat (limited to 'reflog.c')
-rw-r--r-- | reflog.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -240,8 +240,8 @@ static int unreachable(struct expire_reflog_policy_cb *cb, struct commit *commit * Return true iff the specified reflog entry should be expired. */ int should_expire_reflog_ent(struct object_id *ooid, struct object_id *noid, - const char *email, timestamp_t timestamp, int tz, - const char *message, void *cb_data) + const char *email, timestamp_t timestamp, int tz, + const char *message, void *cb_data) { struct expire_reflog_policy_cb *cb = cb_data; struct commit *old_commit, *new_commit; @@ -273,10 +273,10 @@ int should_expire_reflog_ent(struct object_id *ooid, struct object_id *noid, } int should_expire_reflog_ent_verbose(struct object_id *ooid, - struct object_id *noid, - const char *email, - timestamp_t timestamp, int tz, - const char *message, void *cb_data) + struct object_id *noid, + const char *email, + timestamp_t timestamp, int tz, + const char *message, void *cb_data) { struct expire_reflog_policy_cb *cb = cb_data; int expire; @@ -323,8 +323,8 @@ static int is_head(const char *refname) } void reflog_expiry_prepare(const char *refname, - const struct object_id *oid, - void *cb_data) + const struct object_id *oid, + void *cb_data) { struct expire_reflog_policy_cb *cb = cb_data; struct commit_list *elem; @@ -379,8 +379,8 @@ void reflog_expiry_cleanup(void *cb_data) } int count_reflog_ent(struct object_id *ooid, struct object_id *noid, - const char *email, timestamp_t timestamp, int tz, - const char *message, void *cb_data) + const char *email, timestamp_t timestamp, int tz, + const char *message, void *cb_data) { struct cmd_reflog_expire_cb *cb = cb_data; if (!cb->expire_total || timestamp < cb->expire_total) |