mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-25 15:38:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Resolves #362 allow deleting commits with push force

Browse source
This commit is contained in:
Peter Cottle 2016-02-29 09:27:23 -08:00
parent 3d52232464
commit 854b5d44b0
1 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/js/git/index.js
View file

@ -1074,8 +1074,31 @@ GitEngine.prototype.push = function(options) {
this.origin,
this,
branchOnRemote,
sourceLocation
sourceLocation,
/* options */ {
dontThrowOnNoFetch: true,
}
);
if (!commitsToMake.length) {
if (!options.force) {
// We are already up to date, and we cant be deleting
// either since we dont have --force
throw new GitError({
msg: intl.str('git-error-origin-fetch-uptodate')
});
} else {
var sourceCommit = this.getCommitFromRef(sourceBranch);
var originCommit = this.getCommitFromRef(branchOnRemote);
if (sourceCommit.id === originCommit.id) {
// This is essentially also being up to date
throw new GitError({
msg: intl.str('git-error-origin-fetch-uptodate')
});
}
// Otherwise fall through! We will update origin
// and essentially delete the commit
}
}
// now here is the tricky part -- the difference between local master
// and remote master might be commits C2, C3, and C4, but the remote