From 5be8aed2b75b428139a4aaefe4b0b89439c07e66 Mon Sep 17 00:00:00 2001 From: Pieter de Bie Date: Thu, 1 Oct 2009 21:17:32 +0200 Subject: [PATCH] GitIndex: increase refreshStatus before launching task We used to increase this variable after handing it over to the [handle readToEndOfFileInBackgroundAndNotify], but sometimes a task would quit before getting to that point, causing a premature index refresh event to be called. --- PBGitIndex.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PBGitIndex.m b/PBGitIndex.m index 4174d49..4f74afb 100644 --- a/PBGitIndex.m +++ b/PBGitIndex.m @@ -417,28 +417,28 @@ NSString *PBGitIndexOperationFailed = @"PBGitIndexOperationFailed"; NSNotificationCenter *nc = [NSNotificationCenter defaultCenter]; // Other files (not tracked, not ignored) + refreshStatus++; NSFileHandle *handle = [PBEasyPipe handleForCommand:[PBGitBinary path] withArgs:[NSArray arrayWithObjects:@"ls-files", @"--others", @"--exclude-standard", @"-z", nil] inDir:[workingDirectory path]]; [nc addObserver:self selector:@selector(readOtherFiles:) name:NSFileHandleReadToEndOfFileCompletionNotification object:handle]; [handle readToEndOfFileInBackgroundAndNotify]; - refreshStatus++; // Unstaged files + refreshStatus++; handle = [PBEasyPipe handleForCommand:[PBGitBinary path] withArgs:[NSArray arrayWithObjects:@"diff-files", @"-z", nil] inDir:[workingDirectory path]]; [nc addObserver:self selector:@selector(readUnstagedFiles:) name:NSFileHandleReadToEndOfFileCompletionNotification object:handle]; [handle readToEndOfFileInBackgroundAndNotify]; - refreshStatus++; // Staged files + refreshStatus++; handle = [PBEasyPipe handleForCommand:[PBGitBinary path] withArgs:[NSArray arrayWithObjects:@"diff-index", @"--cached", @"-z", [self parentTree], nil] inDir:[workingDirectory path]]; [nc addObserver:self selector:@selector(readStagedFiles:) name:NSFileHandleReadToEndOfFileCompletionNotification object:handle]; [handle readToEndOfFileInBackgroundAndNotify]; - refreshStatus++; } - (void)readOtherFiles:(NSNotification *)notification