From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Apr 2016 21:15:58 +0000 (-0700)
Subject: Merge branch 'ak/use-hashmap-iter-first-in-submodule-config' into maint
X-Git-Tag: v2.8.2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a4708391d3bf4111ae5598f8e8e9ecdc25ead10a?ds=inline;hp=-c

Merge branch 'ak/use-hashmap-iter-first-in-submodule-config' into maint

Minor code cleanup.

* ak/use-hashmap-iter-first-in-submodule-config:
submodule-config: use hashmap_iter_first()
---

a4708391d3bf4111ae5598f8e8e9ecdc25ead10a
diff --combined submodule-config.c
index 92502b594d,6ea31dd363..8476e0fa0f
--- a/submodule-config.c
+++ b/submodule-config.c
@@@ -392,8 -392,7 +392,7 @@@ static const struct submodule *config_f
  		struct hashmap_iter iter;
  		struct submodule_entry *entry;
  
- 		hashmap_iter_init(&cache->for_name, &iter);
- 		entry = hashmap_iter_next(&iter);
+ 		entry = hashmap_iter_first(&cache->for_name, &iter);
  		if (!entry)
  			return NULL;
  		return entry->config;
@@@ -427,8 -426,8 +426,8 @@@
  	parameter.commit_sha1 = commit_sha1;
  	parameter.gitmodules_sha1 = sha1;
  	parameter.overwrite = 0;
 -	git_config_from_buf(parse_config, rev.buf, config, config_size,
 -			&parameter);
 +	git_config_from_mem(parse_config, "submodule-blob", rev.buf,
 +			config, config_size, &parameter);
  	free(config);
  
  	switch (lookup_type) {