undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reset: rename update_refs to reset_refs

Browse Source 
The function resets refs rather than doing arbitrary updates.
Rename it to allow a future general-purpose update_refs function
to be added.

Signed-off-by: Brad King <brad.king@kitware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brad King 2013-08-30 14:11:59 -04:00 committed by Junio C Hamano
parent e230c568c4
commit 2be778a8ac
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/reset.c
View File

@ -219,7 +219,7 @@ static const char **parse_args(const char **argv, const char *prefix, const char
return argv[0] ? get_pathspec(prefix, argv) : NULL; return argv[0] ? get_pathspec(prefix, argv) : NULL;
} }
static int update_refs(const char *rev, const unsigned char *sha1) static int reset_refs(const char *rev, const unsigned char *sha1)
{ {
int update_ref_status; int update_ref_status;
struct strbuf msg = STRBUF_INIT; struct strbuf msg = STRBUF_INIT;
@ -350,7 +350,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
if (!pathspec && !unborn) { if (!pathspec && !unborn) {
/* Any resets without paths update HEAD to the head being /* Any resets without paths update HEAD to the head being
* switched to, saving the previous head in ORIG_HEAD before. */ * switched to, saving the previous head in ORIG_HEAD before. */
update_ref_status = update_refs(rev, sha1); update_ref_status = reset_refs(rev, sha1);
if (reset_type == HARD && !update_ref_status && !quiet) if (reset_type == HARD && !update_ref_status && !quiet)
print_new_head_line(lookup_commit_reference(sha1)); print_new_head_line(lookup_commit_reference(sha1));