Skip to content

Commit

Permalink
expire_reflog(): rename "ref" parameter to "refname"
Browse files Browse the repository at this point in the history
This is our usual convention.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Michael Haggerty authored and Junio C Hamano committed Dec 12, 2014
1 parent 55dfc8d commit 524127a
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions builtin/reflog.c
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ static int push_tip_to_list(const char *refname, const unsigned char *sha1, int
return 0;
}

static int expire_reflog(const char *ref, const unsigned char *sha1,
static int expire_reflog(const char *refname, const unsigned char *sha1,
struct cmd_reflog_expire_cb *cmd)
{
struct expire_reflog_cb cb;
Expand All @@ -365,20 +365,20 @@ static int expire_reflog(const char *ref, const unsigned char *sha1,
* we take the lock for the ref itself to prevent it from
* getting updated.
*/
lock = lock_any_ref_for_update(ref, sha1, 0, NULL);
lock = lock_any_ref_for_update(refname, sha1, 0, NULL);
if (!lock)
return error("cannot lock ref '%s'", ref);
log_file = git_pathdup("logs/%s", ref);
if (!reflog_exists(ref))
return error("cannot lock ref '%s'", refname);
log_file = git_pathdup("logs/%s", refname);
if (!reflog_exists(refname))
goto finish;
if (!cmd->dry_run) {
newlog_path = git_pathdup("logs/%s.lock", ref);
newlog_path = git_pathdup("logs/%s.lock", refname);
cb.newlog = fopen(newlog_path, "w");
}

cb.cmd = cmd;

if (!cmd->expire_unreachable || !strcmp(ref, "HEAD")) {
if (!cmd->expire_unreachable || !strcmp(refname, "HEAD")) {
tip_commit = NULL;
cb.unreachable_expire_kind = UE_HEAD;
} else {
Expand Down Expand Up @@ -407,7 +407,7 @@ static int expire_reflog(const char *ref, const unsigned char *sha1,
mark_reachable(&cb);
}

for_each_reflog_ent(ref, expire_reflog_ent, &cb);
for_each_reflog_ent(refname, expire_reflog_ent, &cb);

if (cb.unreachable_expire_kind != UE_ALWAYS) {
if (cb.unreachable_expire_kind == UE_HEAD) {
Expand Down

0 comments on commit 524127a

Please sign in to comment.