kennethreitz-archive/gitx
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/gitx.git synced 2026-06-05 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

CommitController: Don't show files that are in conflict twice

Browse Source
This commit is contained in:
Pieter de Bie
2008-09-26 00:37:28 +02:00
parent d3f97bdfcb
commit b243e86a58
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PBGitCommitController.m
+12 -1
View File
@@ -119,7 +119,18 @@
PBChangedFile *file = [[PBChangedFile alloc] initWithPath:[components objectAtIndex:1] andRepository:repository];
file.status = MODIFIED;
file.cached = NO;
[unstagedFilesController addObject: file];
// FIXME: If you are in a merge and have conflicts, a file is displayed twice, with different
// index values. For now, we don't handle this gracefully.
BOOL fileExists = NO;
for (PBChangedFile *object in [unstagedFilesController arrangedObjects]) {
if ([[object path] isEqualToString:[file path]]) {
fileExists = YES;
break;
}
}
if (!fileExists)
[unstagedFilesController addObject: file];
}
[self doneProcessingIndex];
}