From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Oct 2017 06:42:49 +0000 (+0900)
Subject: Merge branch 'sb/submodule-diff-header-fix'
X-Git-Tag: v2.15.0-rc0~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9257d3d7db17be306875f41b842716d275a3f76a?ds=inline;hp=-c

Merge branch 'sb/submodule-diff-header-fix'

Error message tweak.

* sb/submodule-diff-header-fix:
submodule: correct error message for missing commits
---

9257d3d7db17be306875f41b842716d275a3f76a
diff --combined submodule.c
index 3e3ea11761,394497bb16..63e7094e16
--- a/submodule.c
+++ b/submodule.c
@@@ -503,7 -503,7 +503,7 @@@ static void show_submodule_header(struc
  
  	if (add_submodule_odb(path)) {
  		if (!message)
- 			message = "(not initialized)";
+ 			message = "(commits not present)";
  		goto output_header;
  	}
  
@@@ -1685,7 -1685,7 +1685,7 @@@ static int find_first_merges(struct obj
  			add_object_array(merges.objects[i].item, NULL, result);
  	}
  
 -	free(merges.objects);
 +	object_array_clear(&merges);
  	return result->nr;
  }
  
@@@ -1790,7 -1790,7 +1790,7 @@@ int merge_submodule(struct object_id *r
  			print_commit((struct commit *) merges.objects[i].item);
  	}
  
 -	free(merges.objects);
 +	object_array_clear(&merges);
  	return 0;
  }
  
@@@ -1997,10 -1997,6 +1997,10 @@@ const char *get_superproject_working_tr
  	return ret;
  }
  
 +/*
 + * Put the gitdir for a submodule (given relative to the main
 + * repository worktree) into `buf`, or return -1 on error.
 + */
  int submodule_to_gitdir(struct strbuf *buf, const char *submodule)
  {
  	const struct submodule *sub;