Skip to content

Commit 3c2de68

Browse files
author
Robert Kyriakis
committed
Bugfix refexists-Methods
1 parent fec9b6c commit 3c2de68

File tree

4 files changed

+24
-9
lines changed

4 files changed

+24
-9
lines changed

PBCreateBranchSheet.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ - (IBAction) createBranch:(id)sender
102102
}
103103
else
104104
{
105-
if (refExistsReturnMessage != @"")
105+
if (refExistsReturnMessage)
106106
{
107107
int returnButton = [[NSAlert alertWithMessageText:refExistsReturnMessage
108108
defaultButton:@"Yes"

PBCreateTagSheet.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ - (IBAction) createTag:(id)sender
8383
}
8484
else
8585
{
86-
if (refExistsReturnMessage != @"")
86+
if (refExistsReturnMessage)
8787
{
8888
int returnButton = [[NSAlert alertWithMessageText:refExistsReturnMessage
8989
defaultButton:@"Yes"

PBGitRepository.m

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,14 @@ - (BOOL)refExists:(PBGitRef *)ref checkOnRemotesWithoutBranches:(BOOL)remoteChec
675675

676676
if (result)
677677
{
678-
*result = completeResults;
678+
if ([completeResults length])
679+
{
680+
*result = completeResults;
681+
}
682+
else
683+
{
684+
result = Nil;
685+
}
679686
}
680687
return NO;
681688
}
@@ -759,6 +766,7 @@ - (BOOL)refExistsOnRemote:(PBGitRef *)ref remoteName:(NSString *)remote resultMe
759766
return YES;
760767
}
761768

769+
result = Nil;
762770
return NO;
763771
}
764772

@@ -774,7 +782,7 @@ - (BOOL)refExistsOnAnyRemote:(PBGitRef*)ref resultMessage:(NSString**)result
774782
return NO;
775783
}
776784

777-
NSMutableString *completeResult = [NSMutableString string];
785+
NSMutableString *completeResults = [NSMutableString string];
778786

779787
if ([self hasRemotes])
780788
{
@@ -786,12 +794,12 @@ - (BOOL)refExistsOnAnyRemote:(PBGitRef*)ref resultMessage:(NSString**)result
786794
{
787795
if (oneResult)
788796
{
789-
[completeResult appendString:oneResult];
797+
[completeResults appendString:oneResult];
790798
}
791799

792800
if (result)
793801
{
794-
*result = completeResult;
802+
*result = completeResults;
795803
}
796804

797805
return YES;
@@ -800,7 +808,7 @@ - (BOOL)refExistsOnAnyRemote:(PBGitRef*)ref resultMessage:(NSString**)result
800808
{
801809
if (oneResult)
802810
{
803-
[completeResult appendString:oneResult];
811+
[completeResults appendString:oneResult];
804812
}
805813
}
806814
}
@@ -816,7 +824,14 @@ - (BOOL)refExistsOnAnyRemote:(PBGitRef*)ref resultMessage:(NSString**)result
816824

817825
if (result)
818826
{
819-
*result = completeResult;
827+
if ([completeResults length])
828+
{
829+
*result = completeResults;
830+
}
831+
else
832+
{
833+
result = Nil;
834+
}
820835
}
821836
return NO;
822837
}

PBRenameSheet.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ - (IBAction)renameRef:(id)sender
103103
}
104104
else
105105
{
106-
if (refExistsReturnMessage != @"")
106+
if (refExistsReturnMessage)
107107
{
108108
int returnButton = [[NSAlert alertWithMessageText:refExistsReturnMessage
109109
defaultButton:@"Yes"

0 commit comments

Comments
 (0)