undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mv: combine two if(s)

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2014-08-10 09:29:35 +07:00 committed by Junio C Hamano
parent b46b15dea0
commit dcadc8b806
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/mv.c
View File

@ -274,10 +274,9 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
if (gitmodules_modified) if (gitmodules_modified)
stage_updated_gitmodules(); stage_updated_gitmodules();
if (active_cache_changed) { if (active_cache_changed &&
if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
die(_("Unable to write new index file")); die(_("Unable to write new index file"));
}
return 0; return 0;
} }