mv: combine two if(s)

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Nguyễn Thái Ngọc Duy committed Aug 10, 2014 at 09:29 UTC dcadc8b80609f6857ab35163a8a6e08cdaf35b8f
1 file changed +3 -4
builtin/mv.c
+3 -4
@@ -274,10 +274,9 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
274 if (gitmodules_modified)
275 stage_updated_gitmodules();
276
277 - if (active_cache_changed) {
278 - if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
279 - die(_("Unable to write new index file"));
280 - }
277 + if (active_cache_changed &&
278 + write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
279 + die(_("Unable to write new index file"));
280
281 return 0;
282 }