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

Explicitly fail when unsupported range operator is specified

Browse source
This commit is contained in:
David Nelson 2019-04-18 14:51:14 -05:00
parent f178f6c118
commit d4a2fbb2de
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
__tests__/git.spec.js
View file

@ -142,6 +142,13 @@ describe('Git', function() {
); );
}); });
it('Range operator is not supported', function() {
expectTreeAsync(
'git checkout -b side C0; git cherry-pick C1..C0',
'{"branches":{"master":{"target": "C1","id": "master"},"side":{"target":"C0","id": "side"}},"commits":{"C0":{"parents":[],"id": "C0","rootCommit": true},"C1":{"parents":["C0"],"id": "C1"}},"HEAD":{"id": "HEAD","target":"side"}}'
);
});
it('Forces branches', function() { it('Forces branches', function() {
expectTreeAsync( expectTreeAsync(
'git checkout -b side; git branch -f side C0', 'git checkout -b side; git branch -f side C0',

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

@ -1665,7 +1665,7 @@ GitEngine.prototype.resolveStringRef = function(ref) {
// Attempt to split ref string into a reference and a string of ~ and ^ modifiers. // Attempt to split ref string into a reference and a string of ~ and ^ modifiers.
var startRef = null; var startRef = null;
var relative = null; var relative = null;
var regex = /^([a-zA-Z0-9]+)(([~\^]\d*)*)/; var regex = /^([a-zA-Z0-9]+)(([~\^]\d*)*)$/;
var matches = regex.exec(ref); var matches = regex.exec(ref);
if (matches) { if (matches) {
startRef = matches[1]; startRef = matches[1];