From 76c0badbfd74c545849b659ade0c6d049c147283 Mon Sep 17 00:00:00 2001 From: Georg Fischer Date: Fri, 27 Feb 2009 15:52:23 +0100 Subject: [PATCH] changed added/conflicted checking order --- igit-enumfiles.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/igit-enumfiles.c b/igit-enumfiles.c index 5cb7fd8e41..daf55054fc 100644 --- a/igit-enumfiles.c +++ b/igit-enumfiles.c @@ -121,10 +121,10 @@ static BOOL enum_ce_entry(struct cache_entry *ce, struct stat *st) int nStatus = WGFS_Unknown; if (!st || (ce->ce_flags & CE_IG_DELETED)) nStatus = WGFS_Deleted; - else if (ce->ce_flags & CE_IG_ADDED) - nStatus = WGFS_Added; else if (nStage) nStatus = WGFS_Conflicted; + else if (ce->ce_flags & CE_IG_ADDED) + nStatus = WGFS_Added; else if ( ce_modified(ce, st, 0) ) nStatus = WGFS_Modified; else if (ce->ce_flags & CE_IG_STAGED) @@ -171,10 +171,10 @@ static BOOL process_ce_entry_status(struct cache_entry *ce, struct stat *st) UINT nStatus = WGFS_Unknown; if (!st || (ce->ce_flags & CE_IG_DELETED)) nStatus = WGFS_Deleted; - else if (ce->ce_flags & CE_IG_ADDED) - nStatus = WGFS_Added; else if (nStage) nStatus = WGFS_Conflicted; + else if (ce->ce_flags & CE_IG_ADDED) + nStatus = WGFS_Added; else if ( ce_modified(ce, st, 0) ) nStatus = WGFS_Modified; else if (ce->ce_flags & CE_IG_STAGED) -- 2.11.4.GIT