mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-08-29 22:29:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

much better interaction on levels keys with tabs

Browse source
This commit is contained in:
Peter Cottle 2013-10-26 12:46:19 -07:00
parent 12e921a781
commit c522722513
4 changed files with 56 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/js/git/commands.js
View file

@ -685,6 +685,13 @@ var commandConfig = {
var refspecParts = firstArg.split(':');
source = refspecParts[0];
destination = validateBranchName(engine, refspecParts[1]);
if (source === "" && !engine.origin.refs[options.destination]) {
throw new GitError({
msg: intl.todo(
'cannot delete branch ' + options.destination + ' which doesnt exist'
)
});
}
} else {
if (firstArg) {
// we are using this arg as destination AND source. the dest branch

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

@ -1193,7 +1193,7 @@ GitEngine.prototype.fetchCore = function(sourceDestPairs, options) {
}, this);
chain = chain.then(_.bind(function() {
// update all the destinations
// update all the destinations
_.each(sourceDestPairs, function(pair) {
var ours = this.refs[pair.destination];
var theirCommitID = this.origin.getCommitFromRef(pair.source).get('id');