From 1193935637b5b5329b7d6f036177992ee9d5f08f Mon Sep 17 00:00:00 2001 From: Georg Fischer Date: Thu, 26 Feb 2009 15:52:37 +0100 Subject: [PATCH] restored staged/modified checking order, was originally correct (a file that is modified after it was staged should be shown as modified) --- igit-enumfiles.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/igit-enumfiles.c b/igit-enumfiles.c index c23206184a..5cb7fd8e41 100644 --- a/igit-enumfiles.c +++ b/igit-enumfiles.c @@ -125,10 +125,10 @@ static BOOL enum_ce_entry(struct cache_entry *ce, struct stat *st) nStatus = WGFS_Added; else if (nStage) nStatus = WGFS_Conflicted; - else if (ce->ce_flags & CE_IG_STAGED) - nStatus = WGFS_Staged; else if ( ce_modified(ce, st, 0) ) nStatus = WGFS_Modified; + else if (ce->ce_flags & CE_IG_STAGED) + nStatus = WGFS_Staged; else if (!l_bHasHistory) nStatus = WGFS_Added; else @@ -175,10 +175,10 @@ static BOOL process_ce_entry_status(struct cache_entry *ce, struct stat *st) nStatus = WGFS_Added; else if (nStage) nStatus = WGFS_Conflicted; - else if (ce->ce_flags & CE_IG_STAGED) - nStatus = WGFS_Staged; else if ( ce_modified(ce, st, 0) ) nStatus = WGFS_Modified; + else if (ce->ce_flags & CE_IG_STAGED) + nStatus = WGFS_Staged; else if (!l_bHasHistory) nStatus = WGFS_Added; else -- 2.11.4.GIT