Skip to content

Conversation

@tiennou
Copy link

@tiennou tiennou commented Mar 2, 2014

Provide a "User Cancelled" error so we don't crash when canceling "New".

Closes #275, #220.

5sw added 4 commits July 7, 2013 19:11
…latest upstream changes.

Conflicts:
	Classes/git/PBGitCommit.h
	Classes/git/PBGitCommit.m
	Classes/git/PBGitHistoryGrapher.m
	Classes/git/PBGitRepository.m
	Classes/git/PBGitRevList.mm
	Classes/git/PBGitSHA.h
	Classes/git/PBGitSHA.m
@tiennou tiennou mentioned this pull request Mar 2, 2014
3 tasks
@rowanj
Copy link
Owner

rowanj commented May 16, 2014

I'm concerned by the Sparkle change; breaking the updates can effectively be the end-of-the-road for getting a fix.

Is there some summary of the differences, and a need to update?

5sw and others added 8 commits May 18, 2014 17:40
@tiennou
Copy link
Author

tiennou commented Jul 12, 2014

You're right, I shouldn't mess with Sparkle ;-). Here's a rebased branch that includes @5sw changes (which are lovely IMHO, note that I merged in your last changelog fixes on top of it), a few fixes, and the fix for the crash.

@rowanj rowanj merged commit 27869f9 into rowanj:master Jul 27, 2014
rowanj added a commit that referenced this pull request Jul 27, 2014
@tiennou tiennou deleted the crash-on-new-repo branch March 8, 2015 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants