summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2015-08-22 01:08:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-09-07 03:01:13 (GMT)
commit895ff3b2c73c737b699a921fe71cea4dadefab7b (patch)
tree5e4900163660191be5544e4c4df14f6dd8d73bf9 /builtin
parenta62bc310bf033f38a23fb80f5ab2c9f6f05cd161 (diff)
downloadgit-895ff3b2c73c737b699a921fe71cea4dadefab7b.zip
git-895ff3b2c73c737b699a921fe71cea4dadefab7b.tar.gz
git-895ff3b2c73c737b699a921fe71cea4dadefab7b.tar.bz2
add and use a convenience macro ce_intent_to_add()
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/rm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rm.c b/builtin/rm.c
index 3304bff..74a7a43 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -212,7 +212,7 @@ static int check_local_mod(unsigned char *head, int index_only)
* "intent to add" entry.
*/
if (local_changes && staged_changes) {
- if (!index_only || !(ce->ce_flags & CE_INTENT_TO_ADD))
+ if (!index_only || !ce_intent_to_add(ce))
string_list_append(&files_staged, name);
}
else if (!index_only) {