From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v2 7/8] mv: combine two if(s)
Date: Sun, 10 Aug 2014 09:29:35 +0700 [thread overview]
Message-ID: <1407637776-19794-8-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1407637776-19794-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
builtin/mv.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/builtin/mv.c b/builtin/mv.c
index 988945c..cbe220f 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -275,10 +275,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;
}
--
2.1.0.rc0.78.gc0d8480
next prev parent reply other threads:[~2014-08-10 2:30 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-10 2:29 [PATCH v2 0/8] builtin/mv.c cleanup Nguyễn Thái Ngọc Duy
2014-08-10 2:29 ` [PATCH v2 1/8] mv: mark strings for translations Nguyễn Thái Ngọc Duy
2014-08-10 2:29 ` [PATCH v2 2/8] mv: flatten error handling code block Nguyễn Thái Ngọc Duy
2014-08-10 2:29 ` [PATCH v2 3/8] mv: split submodule move preparation code out Nguyễn Thái Ngọc Duy
2014-08-10 2:29 ` [PATCH v2 4/8] mv: remove an "if" that's always true Nguyễn Thái Ngọc Duy
2014-08-10 2:29 ` [PATCH v2 5/8] mv: move index search code out Nguyễn Thái Ngọc Duy
2014-08-10 2:29 ` [PATCH v2 6/8] mv: unindent one level for directory move code Nguyễn Thái Ngọc Duy
2014-08-11 18:47 ` Junio C Hamano
2014-08-12 14:57 ` Duy Nguyen
2014-08-12 17:56 ` Junio C Hamano
2014-08-10 2:29 ` Nguyễn Thái Ngọc Duy [this message]
2014-08-10 2:29 ` [PATCH v2 8/8] mv: no SP between function name and the first opening parenthese Nguyễn Thái Ngọc Duy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1407637776-19794-8-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).