Skip to content

Handle worktrees under Windows #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle worktrees under Windows #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ var shell = require('shelljs');
var HAS_NATIVE_EXECSYNC = childProcess.hasOwnProperty('spawnSync');
var PATH_SEP = path.sep;
var RE_BRANCH = /^ref: refs\/heads\/(.*)\n/;
var RE_WORKTREES = new RegExp('\.git\\' + PATH_SEP + 'worktrees\\' + PATH_SEP + '.+$');

function _command(cmd, args) {
var result;
Expand Down Expand Up @@ -93,9 +94,7 @@ function long(dir) {
}

var gitDir = _getGitDirectory(dir);
var gitRootDir = gitDir.indexOf('.git/worktrees/') > 0 ?
gitDir.replace(/\.git\/worktrees\/.+$/, '.git') :
gitDir;
var gitRootDir = gitDir.replace(RE_WORKTREES, '.git');
var refsFilePath = path.resolve(gitRootDir, 'refs', 'heads', b);
var ref;

Expand All @@ -106,7 +105,7 @@ function long(dir) {
// the ref is stored in the packfile (.git/packed-refs). Fall back to
// looking up the hash here.
var refToFind = ['refs', 'heads', b].join('/');
var packfileContents = fs.readFileSync(path.resolve(gitDir, 'packed-refs'), 'utf8');
var packfileContents = fs.readFileSync(path.resolve(gitRootDir, 'packed-refs'), 'utf8');
var packfileRegex = new RegExp('(.*) ' + escapeStringRegexp(refToFind));
ref = packfileRegex.exec(packfileContents)[1];
}
Expand Down