diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-08-10 09:29:35 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-09-03 15:06:59 -0700 |
| commit | dcadc8b80609f6857ab35163a8a6e08cdaf35b8f (patch) | |
| tree | 6d8237aba79abd89acf87d8cedfa60b61071325b | |
| parent | mv: unindent one level for directory move code (diff) | |
| download | tgif-dcadc8b80609f6857ab35163a8a6e08cdaf35b8f.tar.xz | |
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>
| -rw-r--r-- | builtin/mv.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/builtin/mv.c b/builtin/mv.c index 4f324aea1d..e253550551 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -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; } |