From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Apr 2017 05:07:54 +0000 (-0700)
Subject: Merge branch 'sb/checkout-recurse-submodules'
X-Git-Tag: v2.13.0-rc1~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5000cd45d80c6789a36e33e70c462ccf1d128dcb?hp=d2617eb98440a43072c49e416e0986ef3231faa4

Merge branch 'sb/checkout-recurse-submodules'

Code cleanup.

* sb/checkout-recurse-submodules:
submodule: remove a superfluous second check for the "new" variable
---

diff --git a/submodule.c b/submodule.c
index 5615d7392e..d3299e29c0 100644
--- a/submodule.c
+++ b/submodule.c
@@ -1474,8 +1474,7 @@ int submodule_move_head(const char *path,
 			cp1.no_stdin = 1;
 			cp1.dir = path;
 
-			argv_array_pushl(&cp1.args, "update-ref", "HEAD",
-					 new ? new : EMPTY_TREE_SHA1_HEX, NULL);
+			argv_array_pushl(&cp1.args, "update-ref", "HEAD", new, NULL);
 
 			if (run_command(&cp1)) {
 				ret = -1;