From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Nov 2018 06:50:20 +0000 (+0900)
Subject: Merge branch 'nd/submodule-unused-vars'
X-Git-Tag: v2.20.0-rc0~69
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1443ca9a7243d65d6b7d47ae5089cacbf0869ac4?hp=-c

Merge branch 'nd/submodule-unused-vars'

Code clean-up.

* nd/submodule-unused-vars:
submodule.c: remove some of the_repository references
---

1443ca9a7243d65d6b7d47ae5089cacbf0869ac4
diff --combined transport.c
index 01ce11a325,f9343e6dde..5a74b609ff
--- a/transport.c
+++ b/transport.c
@@@ -1172,7 -1172,7 +1172,7 @@@ int transport_push(struct transport *tr
  					oid_array_append(&commits,
  							  &ref->new_oid);
  
- 			if (!push_unpushed_submodules(&the_index,
+ 			if (!push_unpushed_submodules(the_repository,
  						      &commits,
  						      transport->remote,
  						      rs,
@@@ -1197,7 -1197,7 +1197,7 @@@
  					oid_array_append(&commits,
  							  &ref->new_oid);
  
- 			if (find_unpushed_submodules(&the_index,
+ 			if (find_unpushed_submodules(the_repository,
  						     &commits,
  						     transport->remote->name,
  						     &needs_pushing)) {
@@@ -1413,9 -1413,9 +1413,9 @@@ static void read_alternate_refs(const c
  	fh = xfdopen(cmd.out, "r");
  	while (strbuf_getline_lf(&line, fh) != EOF) {
  		struct object_id oid;
 +		const char *p;
  
 -		if (get_oid_hex(line.buf, &oid) ||
 -		    line.buf[GIT_SHA1_HEXSZ]) {
 +		if (parse_oid_hex(line.buf, &oid, &p) || *p) {
  			warning(_("invalid line while parsing alternate refs: %s"),
  				line.buf);
  			break;