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)

diff --cc merge-recursive.c
Simple merge

diff --cc parse-options-cb.c
Simple merge

diff --cc pretty.c
Simple merge

diff --cc submodule.c
index 733332035b3c19279885175e0689665a34dc13ef,f2ba4a2dc2a4894d76006d4ef8ba5a9bd64f153d..6f7d883de950af8ba6427537d09e021a4bed36bd
--- 1/submodule.c
--- 2/submodule.c
+++ b/submodule.c
@@@ -370,12 -370,10 +370,11 @@@ static void show_submodule_header(FILE 
                return;
        }
  
-       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, '.');
 +output_header:
 -      strbuf_add_unique_abbrev(&sb, one, DEFAULT_ABBREV);
+       strbuf_addf(&sb, "%s%sSubmodule %s ", line_prefix, meta, path);
 -      strbuf_add_unique_abbrev(&sb, two, DEFAULT_ABBREV);
++      strbuf_add_unique_abbrev(&sb, one->hash, DEFAULT_ABBREV);
+       strbuf_addstr(&sb, (fast_backward || fast_forward) ? ".." : "...");
 +      strbuf_add_unique_abbrev(&sb, two->hash, DEFAULT_ABBREV);
        if (message)
                strbuf_addf(&sb, " %s%s\n", message, reset);
        else

diff --cc wt-status.c
Simple merge