From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Oct 2017 05:18:58 +0000 (+0900)
Subject: Merge branch 'mh/packed-ref-store-prep' into maint
X-Git-Tag: v2.15.0-rc2~5^2~45
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6b895039f4c81e8b50f0d5f7d22f400e52e9bfc6?hp=-c

Merge branch 'mh/packed-ref-store-prep' into maint

Fix regression to "gitk --bisect" by a recent update.

* mh/packed-ref-store-prep:
rev-parse: don't trim bisect refnames
---

6b895039f4c81e8b50f0d5f7d22f400e52e9bfc6
diff --combined builtin/rev-parse.c
index c78b7b33d6,710e4557d3..7f965fe74e
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@@ -4,7 -4,6 +4,7 @@@
   * Copyright (C) Linus Torvalds, 2005
   */
  #include "cache.h"
 +#include "config.h"
  #include "commit.h"
  #include "refs.h"
  #include "quote.h"
@@@ -757,8 -756,8 +757,8 @@@ int cmd_rev_parse(int argc, const char 
  				continue;
  			}
  			if (!strcmp(arg, "--bisect")) {
- 				for_each_ref_in("refs/bisect/bad", show_reference, NULL);
- 				for_each_ref_in("refs/bisect/good", anti_reference, NULL);
+ 				for_each_fullref_in("refs/bisect/bad", show_reference, NULL, 0);
+ 				for_each_fullref_in("refs/bisect/good", anti_reference, NULL, 0);
  				continue;
  			}
  			if (opt_with_value(arg, "--branches", &arg)) {