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

bug fix 2, now checks for ID existence

Browse source
This commit is contained in:
Peter Cottle 2012-10-12 13:47:16 -07:00
parent ba07683591
commit 225f3cf635
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/git.js
View file

@ -439,7 +439,7 @@ GitEngine.prototype.numBackFrom = function(commit, numBack) {
GitEngine.prototype.rebaseAltId = function(id) {
// this function alters an ID to add a quote to the end,
// indicating that it was rebased.
// indicating that it was rebased. it also checks existence
var regexMap = [
[/^C(\d+)[']{0,2}$/, function(bits) {
// this id can use another quote, so just add it
@ -459,7 +459,13 @@ GitEngine.prototype.rebaseAltId = function(id) {
var func = regexMap[i][1];
var results = regex.exec(id);
if (results) {
return func(results);
var newId = func(results);
// if this id exists, continue down the rabbit hole
if (this.refs[newId]) {
return this.rebaseAltId(newId);
} else {
return newId;
}
}
}
throw new Error('could not modify the id ' + id);