git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, peff@peff.net, pclouds@gmail.com,
	Ramsay Jones <ramsay@ramsayjones.plus.com>,
	Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH 19/21] checkout_paths(): remove unneeded flag variable
Date: Wed, 23 Mar 2016 11:04:36 +0100	[thread overview]
Message-ID: <1b77b4a4bba21cb4f38092b6b36663b38de58a23.1458723959.git.mhagger@alum.mit.edu> (raw)
In-Reply-To: <cover.1458723959.git.mhagger@alum.mit.edu>

It is never read, so we can pass NULL to resolve_ref_unsafe().

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 builtin/checkout.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/builtin/checkout.c b/builtin/checkout.c
index cfa66e2..ef42237 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -242,7 +242,6 @@ static int checkout_paths(const struct checkout_opts *opts,
 	struct checkout state;
 	static char *ps_matched;
 	unsigned char rev[20];
-	int flag;
 	struct commit *head;
 	int errs = 0;
 	struct lock_file *lock_file;
@@ -375,7 +374,7 @@ static int checkout_paths(const struct checkout_opts *opts,
 	if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
 		die(_("unable to write new index file"));
 
-	read_ref_full("HEAD", 0, rev, &flag);
+	read_ref_full("HEAD", 0, rev, NULL);
 	head = lookup_commit_reference_gently(rev, 1);
 
 	errs |= post_checkout_hook(head, head, 0);
-- 
2.8.0.rc3

  parent reply	other threads:[~2016-03-23 10:05 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-23 10:04 [PATCH 00/21] replacement for dt/refs-backend-lmdb v7 patch 04/33 Michael Haggerty
2016-03-23 10:04 ` [PATCH 01/21] t1430: test the output and error of some commands more carefully Michael Haggerty
2016-03-23 10:04 ` [PATCH 02/21] t1430: clean up broken refs/tags/shadow Michael Haggerty
2016-03-23 10:04 ` [PATCH 03/21] t1430: don't rely on symbolic-ref for creating broken symrefs Michael Haggerty
2016-03-23 10:04 ` [PATCH 04/21] t1430: test for-each-ref in the presence of badly-named refs Michael Haggerty
2016-03-23 10:04 ` [PATCH 05/21] t1430: improve test coverage of deletion " Michael Haggerty
2016-03-23 10:04 ` [PATCH 06/21] resolve_missing_loose_ref(): simplify semantics Michael Haggerty
2016-03-23 10:04 ` [PATCH 07/21] resolve_ref_unsafe(): use for loop to count up to MAXDEPTH Michael Haggerty
2016-03-23 10:04 ` [PATCH 08/21] resolve_ref_unsafe(): ensure flags is always set Michael Haggerty
2016-03-23 10:04 ` [PATCH 09/21] resolve_ref_1(): eliminate local variable Michael Haggerty
2016-03-23 10:04 ` [PATCH 10/21] resolve_ref_1(): reorder code Michael Haggerty
2016-03-23 10:04 ` [PATCH 11/21] resolve_ref_1(): eliminate local variable "bad_name" Michael Haggerty
2016-03-23 10:04 ` [PATCH 12/21] files-backend: break out ref reading Michael Haggerty
2016-03-23 10:04 ` [PATCH 13/21] read_raw_ref(): manage own scratch space Michael Haggerty
2016-03-23 10:04 ` [PATCH 14/21] Inline resolve_ref_1() into resolve_ref_unsafe() Michael Haggerty
2016-03-23 10:04 ` [PATCH 15/21] read_raw_ref(): change flags parameter to unsigned int Michael Haggerty
2016-03-23 10:04 ` [PATCH 16/21] fsck_head_link(): remove unneeded flag variable Michael Haggerty
2016-03-23 10:04 ` [PATCH 17/21] cmd_merge(): " Michael Haggerty
2016-03-23 10:04 ` [PATCH 18/21] get_default_remote(): " Michael Haggerty
2016-03-23 10:04 ` Michael Haggerty [this message]
2016-03-23 10:04 ` [PATCH 20/21] check_aliased_update(): check that dst_name is non-NULL Michael Haggerty
2016-03-23 10:04 ` [PATCH 21/21] show_head_ref(): check the result of resolve_ref_namespace() Michael Haggerty
2016-03-24  6:47 ` [PATCH 00/21] replacement for dt/refs-backend-lmdb v7 patch 04/33 David Turner
2016-03-27  5:22   ` Michael Haggerty
2016-03-29 20:12     ` David Turner
2016-03-30  6:37       ` Michael Haggerty
2016-03-30 20:05         ` David Turner
2016-03-31 16:14           ` Michael Haggerty
2016-03-31 22:22             ` David Turner
2016-04-01  1:37           ` Stefan Beller
2016-04-01 17:55             ` David Turner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1b77b4a4bba21cb4f38092b6b36663b38de58a23.1458723959.git.mhagger@alum.mit.edu \
    --to=mhagger@alum.mit.edu \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    --cc=ramsay@ramsayjones.plus.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).