From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH 18/24] status: enable untracked cache Date: Sun, 8 Mar 2015 17:12:41 +0700 Message-ID: <1425809567-25518-19-git-send-email-pclouds@gmail.com> References: <1425809567-25518-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , Junio C Hamano To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Mar 08 11:14:58 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YUYEZ-00049a-IZ for gcvg-git-2@plane.gmane.org; Sun, 08 Mar 2015 11:14:55 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752079AbbCHKOv convert rfc822-to-quoted-printable (ORCPT ); Sun, 8 Mar 2015 06:14:51 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:35640 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751560AbbCHKOu (ORCPT ); Sun, 8 Mar 2015 06:14:50 -0400 Received: by pabli10 with SMTP id li10so64777989pab.2 for ; Sun, 08 Mar 2015 03:14:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=HfbPHDBDCOrU0oHLr0EfbrmEe4HMziYQE5/dFST4EUE=; b=ri83WI1LxStZ9kXtxFRfdwnyo1L/5Ywcya7umeMHAKzIi3uUpDRYA2AWtRbkrdYT79 k/UrlPEXf6It2XYph7PfbLc8rsbqhJPGHwjzMfGhTkiy3iRABEAw0b0xkw4BCt9+UWdS ZqdHqK4Ty7tlZ+2KPyuaoBQwaYuh1Omnlb9cn5Dd8gGKhBUOHuz4qz1vDePXuFKspRSx h24+lv+KDMOYUiS2diPSPFOWHemdIRQCtXaR+mwkorDGuGImZjZSxwBMijZ8GbnrCgHu dRxpKmJiLECW13NzbfRT45+G6BCLGqBkt3GwxFOjSuTc8kfjhbqsoJe7Ll2tXuPiGlYR oDrw== X-Received: by 10.66.234.2 with SMTP id ua2mr19629958pac.137.1425809690390; Sun, 08 Mar 2015 03:14:50 -0700 (PDT) Received: from lanh ([115.73.247.162]) by mx.google.com with ESMTPSA id z2sm14327610pde.94.2015.03.08.03.14.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Mar 2015 03:14:49 -0700 (PDT) Received: by lanh (sSMTP sendmail emulation); Sun, 08 Mar 2015 17:14:45 +0700 X-Mailer: git-send-email 2.3.0.rc1.137.g477eb31 In-Reply-To: <1425809567-25518-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: update_index_if_able() is moved down so that the updated untracked cache could be written out. Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy Signed-off-by: Junio C Hamano --- builtin/commit.c | 5 +++-- wt-status.c | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 5ed6036..bdcfa61 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1372,13 +1372,14 @@ int cmd_status(int argc, const char **argv, con= st char *prefix) refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, &s.pathspec= , NULL, NULL); =20 fd =3D hold_locked_index(&index_lock, 0); - if (0 <=3D fd) - update_index_if_able(&the_index, &index_lock); =20 s.is_initial =3D get_sha1(s.reference, sha1) ? 1 : 0; s.ignore_submodule_arg =3D ignore_submodule_arg; wt_status_collect(&s); =20 + if (0 <=3D fd) + update_index_if_able(&the_index, &index_lock); + if (s.relative_paths) s.prefix =3D prefix; =20 diff --git a/wt-status.c b/wt-status.c index 27da529..8880c3b 100644 --- a/wt-status.c +++ b/wt-status.c @@ -585,6 +585,8 @@ static void wt_status_collect_untracked(struct wt_s= tatus *s) DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES; if (s->show_ignored_files) dir.flags |=3D DIR_SHOW_IGNORED_TOO; + else + dir.untracked =3D the_index.untracked; setup_standard_excludes(&dir); =20 fill_directory(&dir, &s->pathspec); --=20 2.3.0.rc1.137.g477eb31