mv: combine two if(s)
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Sun, 10 Aug 2014 02:29:35 +0000 (09:29 +0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Sep 2014 22:06:59 +0000 (15:06 -0700)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/mv.c
index 4f324aea1d4c749d766738abc6f42e584f0b25a0..e2535505511678d8cda0a60930983753da79cc83 100644 (file)
@@ -274,10 +274,9 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
        if (gitmodules_modified)
                stage_updated_gitmodules();
 
-       if (active_cache_changed) {
-               if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
-                       die(_("Unable to write new index file"));
-       }
+       if (active_cache_changed &&
+           write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
+               die(_("Unable to write new index file"));
 
        return 0;
 }