From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Oct 2016 20:25:21 +0000 (-0700)
Subject: Merge branch 'rs/cocci'
X-Git-Tag: v2.11.0-rc0~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=69e6544998892a2bd3c785cd238c786da40cf6a3;p=thirdparty%2Fgit.git

Merge branch 'rs/cocci'

Code cleanup.

* rs/cocci:
  use strbuf_add_unique_abbrev() for adding short hashes, part 3
  remove unnecessary NULL check before free(3)
---

69e6544998892a2bd3c785cd238c786da40cf6a3
diff --cc submodule.c
index 733332035b,f2ba4a2dc2..6f7d883de9
--- a/submodule.c
+++ b/submodule.c
@@@ -370,12 -370,10 +370,11 @@@ static void show_submodule_header(FILE 
  		return;
  	}
  
 +output_header:
- 	strbuf_addf(&sb, "%s%sSubmodule %s %s..", line_prefix, meta, path,
- 			find_unique_abbrev(one->hash, DEFAULT_ABBREV));
- 	if (!fast_backward && !fast_forward)
- 		strbuf_addch(&sb, '.');
+ 	strbuf_addf(&sb, "%s%sSubmodule %s ", line_prefix, meta, path);
 -	strbuf_add_unique_abbrev(&sb, one, DEFAULT_ABBREV);
++	strbuf_add_unique_abbrev(&sb, one->hash, DEFAULT_ABBREV);
+ 	strbuf_addstr(&sb, (fast_backward || fast_forward) ? ".." : "...");
 -	strbuf_add_unique_abbrev(&sb, two, DEFAULT_ABBREV);
 +	strbuf_add_unique_abbrev(&sb, two->hash, DEFAULT_ABBREV);
  	if (message)
  		strbuf_addf(&sb, " %s%s\n", message, reset);
  	else