Merge branch 'make-branch-list-work-in-git-worktrees'HEADv0.1.4master

4 files changed, 46 insertions, 5 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 000c460..3c62714 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+v0.1.4 (2020-03-13):
+	Fixes:
+
+	* The database file can now be correctly located when in a worktree.
+
 v0.1.3 (2019-12-09):
 	Fixes:
 
diff --git a/README.md b/README.md
index a472433..81bb231 100644
--- a/README.md
+++ b/README.md
@@ -48,5 +48,5 @@ On other platforms, grab the code and put the `git-branch-list` script in your
 
 
 ## License
-Copyright © 2018–2019 Teddy Wing. Licensed under the GNU GPLv3+ (see the
+Copyright © 2018–2020 Teddy Wing. Licensed under the GNU GPLv3+ (see the
 included COPYING file).
diff --git a/git-branch-list b/git-branch-list
index b70b106..24eb5b7 100755
--- a/git-branch-list
+++ b/git-branch-list
@@ -3,7 +3,7 @@
 # git-branch-list
 # Maintains a list of Git branches that can be checked out quickly.
 
-# Copyright (c) 2018–2019  Teddy Wing
+# Copyright (c) 2018–2020  Teddy Wing
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,9 +18,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-GIT_ROOT=$(git rev-parse --show-toplevel)
-DATABASE="${GIT_ROOT}/.git/info/git-branch-list"
-VERSION=0.1.3
+GIT_ROOT="$(git rev-parse --git-common-dir)"
+DATABASE="${GIT_ROOT}/info/git-branch-list"
+VERSION=0.1.4
 
 function initialise_database () {
 	if [ -d .git ]; then
diff --git a/t/108-works-with-git-worktrees.t b/t/108-works-with-git-worktrees.t
new file mode 100644
index 0000000..b2901c0
--- /dev/null
+++ b/t/108-works-with-git-worktrees.t
@@ -0,0 +1,36 @@
+#!/usr/bin/env perl -w
+
+use strict;
+
+use Test::More;
+use File::Path qw(remove_tree);
+
+use Bin qw($BIN);
+
+chdir 't-git-repo' or die $!;
+
+system('git branch a-branch');
+ok !$?;
+
+system("$BIN save a-branch");
+ok !$?;
+
+system('git worktree add ../t-git-repo-worktree');
+ok !$?;
+
+chdir '../t-git-repo-worktree' or die $!;
+
+my $branch_list = qx($BIN);
+is $branch_list, '     1	a-branch
+';
+
+
+# Teardown
+system("$BIN clear");
+chdir '../t-git-repo' or die $!;
+remove_tree('../t-git-repo-worktree') or die $!;
+system('git checkout master');
+system('git branch -d a-branch');
+
+
+done_testing;