Skip to content

Commit 275953a

Browse files
author
Robert Kyriakis
committed
ask to delete tags on remote, when tags exist there + ask for every remote where tag exists
1 parent ad13540 commit 275953a

File tree

5 files changed

+182
-51
lines changed

5 files changed

+182
-51
lines changed

PBCreateBranchSheet.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ - (IBAction) createBranch:(id)sender
8787
return;
8888
}
8989

90-
if ([self.repository refExists:ref checkOnRemotes:YES]) {
90+
if ([self.repository refExists:ref checkOnRemotesWithoutBranches:YES]) {
9191
[self.errorMessageField setStringValue:@"Refname already exists local as tag or branch or remote as tag!"];
9292
[self.errorMessageField setHidden:NO];
9393
return;

PBCreateTagSheet.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ - (IBAction) createTag:(id)sender
6868
return;
6969
}
7070

71-
if ([self.repository refExists:ref checkOnRemotes:YES]) {
71+
if ([self.repository refExists:ref checkOnRemotesWithoutBranches:YES]) {
7272
[self.errorMessageField setStringValue:@"Refname already exists local as tag or branch or remote as tag!"];
7373
[self.errorMessageField setHidden:NO];
7474
return;

PBGitRepository.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ dispatch_queue_t PBGetWorkQueue();
8585
- (BOOL) deleteRemote:(PBGitRef *)ref;
8686
- (BOOL) isRemoteConnected:(PBGitRef *)ref;
8787
- (BOOL) deleteRemoteBranch:(PBGitRef *)ref;
88+
- (BOOL) deleteRemoteTag:(PBGitRef *)ref;
8889
- (BOOL) deleteRef:(PBGitRef *)ref;
8990

9091
- (BOOL) hasSvnRemote;
@@ -128,7 +129,9 @@ dispatch_queue_t PBGetWorkQueue();
128129
- (BOOL)isSHAOnHeadBranch:(NSString *)testSHA;
129130
- (BOOL)isRefOnHeadBranch:(PBGitRef *)testRef;
130131
- (BOOL)checkRefFormat:(NSString *)refName;
131-
- (BOOL)refExists:(PBGitRef *)ref checkOnRemotes:(BOOL)remoteCheck;
132+
- (BOOL)refExists:(PBGitRef *)ref checkOnRemotesWithoutBranches:(BOOL)remoteCheck;
133+
- (BOOL)refExistsOnRemote:(PBGitRef*)ref remoteName:(NSString*)remote;
134+
- (BOOL)refExistsOnAnyRemote:(PBGitRef*)ref;
132135
- (PBGitRef *)refForName:(NSString *)name;
133136

134137
- (NSArray *) remotes;

0 commit comments

Comments
 (0)