summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2016-04-07 19:03:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-10 18:35:34 (GMT)
commit17377b62520fc12bd179514c8510d68e25dfb686 (patch)
treecc905fdc6b0ee2f059750c0b99d6878d119e5aff
parent95ae2c7490fe241e6fbdc3e26789b3cee8ec9914 (diff)
downloadgit-17377b62520fc12bd179514c8510d68e25dfb686.zip
git-17377b62520fc12bd179514c8510d68e25dfb686.tar.gz
git-17377b62520fc12bd179514c8510d68e25dfb686.tar.bz2
cmd_merge(): remove unneeded flag variable
It is never read, so we can pass NULL to resolve_ref_unsafe(). Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: David Turner <dturner@twopensource.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/merge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index 101ffef..c90ee51 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1165,7 +1165,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
struct commit *head_commit;
struct strbuf buf = STRBUF_INIT;
const char *head_arg;
- int flag, i, ret = 0, head_subsumed;
+ int i, ret = 0, head_subsumed;
int best_cnt = -1, merge_was_ok = 0, automerge_was_ok = 0;
struct commit_list *common = NULL;
const char *best_strategy = NULL, *wt_strategy = NULL;
@@ -1179,7 +1179,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
* Check if we are _not_ on a detached HEAD, i.e. if there is a
* current branch.
*/
- branch = branch_to_free = resolve_refdup("HEAD", 0, head_sha1, &flag);
+ branch = branch_to_free = resolve_refdup("HEAD", 0, head_sha1, NULL);
if (branch && starts_with(branch, "refs/heads/"))
branch += 11;
if (!branch || is_null_sha1(head_sha1))