Example #1
0
        private bool IsWorktreeDirty(WorkingTreeIterator work)
        {
            if (inCore)
            {
                return(false);
            }
            int modeF = tw.GetRawMode(T_FILE);
            int modeO = tw.GetRawMode(T_OURS);
            // Worktree entry has to match ours to be considered clean
            bool isDirty;

            if (NonTree(modeF))
            {
                isDirty = work.IsModeDifferent(modeO) || !tw.IdEqual(T_FILE, T_OURS);
            }
            else
            {
                isDirty = false;
            }
            if (isDirty)
            {
                failingPaths.Put(tw.PathString, ResolveMerger.MergeFailureReason.DIRTY_WORKTREE);
            }
            return(isDirty);
        }
Example #2
0
 private bool IsWorktreeDirty(WorkingTreeIterator work)
 {
     if (inCore || work == null)
     {
         return false;
     }
     int modeF = tw.GetRawMode(T_FILE);
     int modeO = tw.GetRawMode(T_OURS);
     // Worktree entry has to match ours to be considered clean
     bool isDirty = work.IsModeDifferent(modeO);
     if (!isDirty && NonTree(modeF))
     {
         isDirty = !tw.IdEqual(T_FILE, T_OURS);
     }
     if (isDirty)
     {
         failingPaths.Put(tw.PathString, ResolveMerger.MergeFailureReason.DIRTY_WORKTREE);
     }
     return isDirty;
 }