Skip to content

Commit e5e3693

Browse files
JPeer264JPeer264
committed
Fix: show the current branch when multiple branches are set (ref: #4)
1 parent ba79b24 commit e5e3693

34 files changed

+834
-6
lines changed

‎index.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,12 @@ const branchName = (options = defaultOptions) => {
2626
const branchOptions = sanitize(options.branchOptions);
2727

2828
try {
29-
const cmd = `git branch ${branchOptions}`;
29+
const cmd = `git branch --show-current ${branchOptions}`;
3030

3131
return execSync(cmd.trim(), {
3232
cwd: options.cwd ?? cwd,
3333
})
3434
.toString()
35-
.substring(2)
3635
.trim();
3736
} catch {
3837
return false;

‎index.spec.js‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { execSync } from "node:child_process";
1818
const cwd = process.cwd();
1919
const fixtures = path.join(cwd, "test", "fixtures");
2020

21-
const folders = ["feat_test", "master"];
21+
const folders = ["feat_test", "master", "more_branches"];
2222

2323
vi.mock("node:child_process", { spy: true });
2424

@@ -48,18 +48,18 @@ describe("branchName", () => {
4848
it("check the default", () => {
4949
branchName();
5050

51-
expect(execSync).toHaveBeenCalledWith("git branch", { cwd });
51+
expect(execSync).toHaveBeenCalledWith("git branch --show-current", { cwd });
5252
});
5353

5454
it("check if values are properly ignored", () => {
5555
branchName({ cwd: path.join(fixtures, "master"), branchOptions: [] });
5656
branchName({ branchOptions: [null, 0, "--no-color"] });
5757

5858
expect(execSync).toHaveBeenCalledTimes(2);
59-
expect(execSync).toHaveBeenNthCalledWith(1, "git branch", {
59+
expect(execSync).toHaveBeenNthCalledWith(1, "git branch --show-current", {
6060
cwd: path.join(fixtures, "master"),
6161
});
62-
expect(execSync).toHaveBeenNthCalledWith(2, "git branch --no-color", {
62+
expect(execSync).toHaveBeenNthCalledWith(2, "git branch --show-current --no-color", {
6363
cwd,
6464
});
6565
});
@@ -73,6 +73,15 @@ describe("branchName", () => {
7373
).toBe("master");
7474
});
7575

76+
it("check if more branches still return just one branch", () => {
77+
expect(
78+
branchName({
79+
cwd: path.join(fixtures, "more_branches"),
80+
branchOptions: "--no-color",
81+
}),
82+
).toBe("feat/new");
83+
});
84+
7685
it("check if the given directory is the branch feat/test", () => {
7786
expect(
7887
branchName({

‎test/fixtures/more_branches/git/COMMIT_EDITMSG‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Initial commit

‎test/fixtures/more_branches/git/HEAD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ref: refs/heads/feat/new

‎test/fixtures/more_branches/git/config‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[core]
2+
repositoryformatversion = 0
3+
filemode = true
4+
bare = false
5+
logallrefupdates = true
6+
ignorecase = true
7+
precomposeunicode = true

‎test/fixtures/more_branches/git/description‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Unnamed repository; edit this file 'description' to name the repository.

‎test/fixtures/more_branches/git/hooks/applypatch-msg.sample‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/sh
2+
#
3+
# An example hook script to check the commit log message taken by
4+
# applypatch from an e-mail message.
5+
#
6+
# The hook should exit with non-zero status after issuing an
7+
# appropriate message if it wants to stop the commit. The hook is
8+
# allowed to edit the commit message file.
9+
#
10+
# To enable this hook, rename this file to "applypatch-msg".
11+
12+
. git-sh-setup
13+
commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
14+
test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
15+
:

‎test/fixtures/more_branches/git/hooks/commit-msg.sample‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/bin/sh
2+
#
3+
# An example hook script to check the commit log message.
4+
# Called by "git commit" with one argument, the name of the file
5+
# that has the commit message. The hook should exit with non-zero
6+
# status after issuing an appropriate message if it wants to stop the
7+
# commit. The hook is allowed to edit the commit message file.
8+
#
9+
# To enable this hook, rename this file to "commit-msg".
10+
11+
# Uncomment the below to add a Signed-off-by line to the message.
12+
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
13+
# hook is more suited to it.
14+
#
15+
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
16+
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
17+
18+
# This example catches duplicate Signed-off-by lines.
19+
20+
test "" = "$(grep '^Signed-off-by: ' "$1" |
21+
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
22+
echo >&2 Duplicate Signed-off-by lines.
23+
exit 1
24+
}

‎test/fixtures/more_branches/git/hooks/fsmonitor-watchman.sample‎

Lines changed: 174 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,174 @@
1+
#!/usr/bin/perl
2+
3+
use strict;
4+
use warnings;
5+
use IPC::Open2;
6+
7+
# An example hook script to integrate Watchman
8+
# (https://facebook.github.io/watchman/) with git to speed up detecting
9+
# new and modified files.
10+
#
11+
# The hook is passed a version (currently 2) and last update token
12+
# formatted as a string and outputs to stdout a new update token and
13+
# all files that have been modified since the update token. Paths must
14+
# be relative to the root of the working tree and separated by a single NUL.
15+
#
16+
# To enable this hook, rename this file to "query-watchman" and set
17+
# 'git config core.fsmonitor .git/hooks/query-watchman'
18+
#
19+
my ($version, $last_update_token) = @ARGV;
20+
21+
# Uncomment for debugging
22+
# print STDERR "$0 $version $last_update_token\n";
23+
24+
# Check the hook interface version
25+
if ($version ne 2) {
26+
die "Unsupported query-fsmonitor hook version '$version'.\n" .
27+
"Falling back to scanning...\n";
28+
}
29+
30+
my $git_work_tree = get_working_dir();
31+
32+
my $retry = 1;
33+
34+
my $json_pkg;
35+
eval {
36+
require JSON::XS;
37+
$json_pkg = "JSON::XS";
38+
1;
39+
} or do {
40+
require JSON::PP;
41+
$json_pkg = "JSON::PP";
42+
};
43+
44+
launch_watchman();
45+
46+
sub launch_watchman {
47+
my $o = watchman_query();
48+
if (is_work_tree_watched($o)) {
49+
output_result($o->{clock}, @{$o->{files}});
50+
}
51+
}
52+
53+
sub output_result {
54+
my ($clockid, @files) = @_;
55+
56+
# Uncomment for debugging watchman output
57+
# open (my $fh, ">", ".git/watchman-output.out");
58+
# binmode $fh, ":utf8";
59+
# print $fh "$clockid\n@files\n";
60+
# close $fh;
61+
62+
binmode STDOUT, ":utf8";
63+
print $clockid;
64+
print "\0";
65+
local $, = "\0";
66+
print @files;
67+
}
68+
69+
sub watchman_clock {
70+
my $response = qx/watchman clock "$git_work_tree"/;
71+
die "Failed to get clock id on '$git_work_tree'.\n" .
72+
"Falling back to scanning...\n" if $? != 0;
73+
74+
return $json_pkg->new->utf8->decode($response);
75+
}
76+
77+
sub watchman_query {
78+
my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
79+
or die "open2() failed: $!\n" .
80+
"Falling back to scanning...\n";
81+
82+
# In the query expression below we're asking for names of files that
83+
# changed since $last_update_token but not from the .git folder.
84+
#
85+
# To accomplish this, we're using the "since" generator to use the
86+
# recency index to select candidate nodes and "fields" to limit the
87+
# output to file names only. Then we're using the "expression" term to
88+
# further constrain the results.
89+
my $last_update_line = "";
90+
if (substr($last_update_token, 0, 1) eq "c") {
91+
$last_update_token = "\"$last_update_token\"";
92+
$last_update_line = qq[\n"since": $last_update_token,];
93+
}
94+
my $query = <<" END";
95+
["query", "$git_work_tree", {$last_update_line
96+
"fields": ["name"],
97+
"expression": ["not", ["dirname", ".git"]]
98+
}]
99+
END
100+
101+
# Uncomment for debugging the watchman query
102+
# open (my $fh, ">", ".git/watchman-query.json");
103+
# print $fh $query;
104+
# close $fh;
105+
106+
print CHLD_IN $query;
107+
close CHLD_IN;
108+
my $response = do {local $/; <CHLD_OUT>};
109+
110+
# Uncomment for debugging the watch response
111+
# open ($fh, ">", ".git/watchman-response.json");
112+
# print $fh $response;
113+
# close $fh;
114+
115+
die "Watchman: command returned no output.\n" .
116+
"Falling back to scanning...\n" if $response eq "";
117+
die "Watchman: command returned invalid output: $response\n" .
118+
"Falling back to scanning...\n" unless $response =~ /^\{/;
119+
120+
return $json_pkg->new->utf8->decode($response);
121+
}
122+
123+
sub is_work_tree_watched {
124+
my ($output) = @_;
125+
my $error = $output->{error};
126+
if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
127+
$retry--;
128+
my $response = qx/watchman watch "$git_work_tree"/;
129+
die "Failed to make watchman watch '$git_work_tree'.\n" .
130+
"Falling back to scanning...\n" if $? != 0;
131+
$output = $json_pkg->new->utf8->decode($response);
132+
$error = $output->{error};
133+
die "Watchman: $error.\n" .
134+
"Falling back to scanning...\n" if $error;
135+
136+
# Uncomment for debugging watchman output
137+
# open (my $fh, ">", ".git/watchman-output.out");
138+
# close $fh;
139+
140+
# Watchman will always return all files on the first query so
141+
# return the fast "everything is dirty" flag to git and do the
142+
# Watchman query just to get it over with now so we won't pay
143+
# the cost in git to look up each individual file.
144+
my $o = watchman_clock();
145+
$error = $output->{error};
146+
147+
die "Watchman: $error.\n" .
148+
"Falling back to scanning...\n" if $error;
149+
150+
output_result($o->{clock}, ("/"));
151+
$last_update_token = $o->{clock};
152+
153+
eval { launch_watchman() };
154+
return 0;
155+
}
156+
157+
die "Watchman: $error.\n" .
158+
"Falling back to scanning...\n" if $error;
159+
160+
return 1;
161+
}
162+
163+
sub get_working_dir {
164+
my $working_dir;
165+
if ($^O =~ 'msys' || $^O =~ 'cygwin') {
166+
$working_dir = Win32::GetCwd();
167+
$working_dir =~ tr/\\/\//;
168+
} else {
169+
require Cwd;
170+
$working_dir = Cwd::cwd();
171+
}
172+
173+
return $working_dir;
174+
}

‎test/fixtures/more_branches/git/hooks/post-update.sample‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/sh
2+
#
3+
# An example hook script to prepare a packed repository for use over
4+
# dumb transports.
5+
#
6+
# To enable this hook, rename this file to "post-update".
7+
8+
exec git update-server-info

0 commit comments

Comments
 (0)