summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-04-23 22:07:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-04-23 22:07:54 -0700
commit5000cd45d80c6789a36e33e70c462ccf1d128dcb (patch)
tree8c1edb950075c6a5e1dd90f82ef6e9b782e48ab3
parentMerge branch 'jt/fetch-pack-error-reporting' (diff)
parentsubmodule: remove a superfluous second check for the "new" variable (diff)
downloadtgif-5000cd45d80c6789a36e33e70c462ccf1d128dcb.tar.xz
Merge branch 'sb/checkout-recurse-submodules'
Code cleanup. * sb/checkout-recurse-submodules: submodule: remove a superfluous second check for the "new" variable
-rw-r--r--submodule.c3
1 files changed, 1 insertions, 2 deletions
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;