From: Nickolai Belakovski
Add an atom providing the path of the linked worktree where this ref is
checked out, if it is checked out in any linked worktrees, and empty
string otherwise.
Signed-off-by: Nickolai Belakovski
---
Documentation/git-for-each-ref.txt | 5 +++
ref-filter.c
From: Nickolai Belakovski
Added test_i18ncmp per instructions from Szeder
Is there some other part of the infrastructure that's testing for this? Because
it did not fail in any of my Travis CI builds.
Travis CI results: https://travis-ci.org/nbelakovski/git/builds/525801210
Nic
From: Nickolai Belakovski
The output of git branch is modified to mark branches checked out in a
linked worktree with a "+" and color them in cyan (in contrast to the
current branch, which will still be denoted with a "*" and colored in green)
This is meant to communicate to the user that the br
From: Nickolai Belakovski
To display worktree path for refs checked out in a linked worktree
Signed-off-by: Nickolai Belakovski
---
Documentation/git-branch.txt | 6 --
builtin/branch.c | 4
t/t3203-branch-output.sh | 19 +++
3 files changed, 27 inser
From: Nickolai Belakovski
In order to more clearly display which branches are active, the output
of git branch is modified to mark branches checkout out in a linked
worktree with a "+" and color them in cyan (in contrast to the current
branch, which will still be denoted with a "*" and colored in
From: Nickolai Belakovski
---
builtin/branch.c | 4
1 file changed, 4 insertions(+)
diff --git a/builtin/branch.c b/builtin/branch.c
index 2a24153b78..56589a3684 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -366,6 +366,10 @@ static char *build_format(struct ref_filter *filter, i
From: Nickolai Belakovski
Add an atom proving the path of the linked worktree where this ref is
checked out, if it is checked out in any linked worktrees, and empty
string otherwise.
---
Documentation/git-for-each-ref.txt | 4 +++
ref-filter.c | 70
this series, we can skip it and I can move discussion to a separate
thread
(or just forget it, as the case may be)
Travis CI results: https://travis-ci.org/nbelakovski/git/builds/468569102
Nickolai Belakovski (3):
ref-filter: add worktreepath atom
branch: Mark and color a branch differently
From: Nickolai Belakovski
Add an atom providing the path of the linked worktree where this ref is
checked out, if it is checked out in any linked worktrees, and empty
string otherwise.
---
Documentation/git-for-each-ref.txt | 5 +++
ref-filter.c | 72 ++
From: Nickolai Belakovski
In order to more clearly display which branches are active, the output
of git branch is modified to mark branches checkout out in a linked
worktree with a "+" and color them in cyan (in contrast to the current
branch, which will still be denoted with a "*" and colored in
From: Nickolai Belakovski
---
builtin/branch.c | 4
1 file changed, 4 insertions(+)
diff --git a/builtin/branch.c b/builtin/branch.c
index 2a24153b78..56589a3684 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -366,6 +366,10 @@ static char *build_format(struct ref_filter *filter, i
the hashmap API seems OK, yea, this is definitely awful. It
feels like it should just be able to take a key and return either an entry or
NULL, and do away with entry_or_key and equals_function_data.
Travis-CI results: https://travis-ci.org/nbelakovski/git/builds/471787317
Nickolai Belakovski (3):
sticking to the style in the rest of the code but I think it's a little better
that
all of the relevant structs and the cmpfnc are all in the same place.
Travis-CI results: https://travis-ci.org/nbelakovski/git/builds/475825245
Nickolai Belakovski (3):
ref-filter: add worktreepath
From: Nickolai Belakovski
Add an atom providing the path of the linked worktree where this ref is
checked out, if it is checked out in any linked worktrees, and empty
string otherwise.
---
Documentation/git-for-each-ref.txt | 5 +++
ref-filter.c | 71 ++
From: Nickolai Belakovski
In order to more clearly display which branches are active, the output
of git branch is modified to mark branches checkout out in a linked
worktree with a "+" and color them in cyan (in contrast to the current
branch, which will still be denoted with a "*" and colored in
From: Nickolai Belakovski
---
Documentation/git-branch.txt | 5 -
builtin/branch.c | 4
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index b3eca6ffdc..6d1fc59e32 100644
--- a/Documentation/git-branc
From: Nickolai Belakovski
Add an atom providing the path of the linked worktree where this ref is
checked out, if it is checked out in any linked worktrees, and empty
string otherwise.
---
Documentation/git-for-each-ref.txt | 5 +++
ref-filter.c | 74 ++
From: Nickolai Belakovski
The output of git branch is modified to mark branches checkout out in a
linked worktree with a "+" and color them in cyan (in contrast to the
current branch, which will still be denoted with a "*" and colored in green)
This is meant to communicate to the user that the b
or ref-filter to be
reentrant
Travis-CI results: https://travis-ci.org/nbelakovski/git/builds/483134182
Nickolai Belakovski (3):
ref-filter: add worktreepath atom
branch: Mark and color a branch differently if it is checked out in a
linked worktree
branch: Add an extra verbose outp
From: Nickolai Belakovski
---
Documentation/git-branch.txt | 7 +--
builtin/branch.c | 4
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index b3eca6ffdc..a1aef00af0 100644
--- a/Documentation/git-br
i.org/nbelakovski/git/builds/487642061
Nickolai Belakovski (3):
ref-filter: add worktreepath atom
branch: Mark and color a branch differently if it is checked out in a
linked worktree
branch: Add an extra verbose output displaying worktree path for refs
checked out in a linked wor
From: Nickolai Belakovski
Add an atom providing the path of the linked worktree where this ref is
checked out, if it is checked out in any linked worktrees, and empty
string otherwise.
Signed-off-by: Nickolai Belakovski
---
Documentation/git-for-each-ref.txt | 5 +++
ref-filter.c
From: Nickolai Belakovski
Signed-off-by: Nickolai Belakovski
---
Documentation/git-branch.txt | 6 --
builtin/branch.c | 4
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index b3eca6ffdc..778be7080
From: Nickolai Belakovski
The output of git branch is modified to mark branches checkout out in a
linked worktree with a "+" and color them in cyan (in contrast to the
current branch, which will still be denoted with a "*" and colored in green)
This is meant to communicate to the user that the b
From: Nickolai Belakovski
I remember now why I didn't add a test for this one earlier.
Testing git branch -vv is a little tricky for a couple reasons.
For one thing, the output contains commit hashes, so the 'expect' file cannot
be simply static.
For another, the output doesn't have clear del
. The
lock_reason_valid field was removed since a NULL/non-NULL value of
lock_reason accomplishes the same effect.
Some unused variables within worktree source code were removed.
Signed-off-by: Nickolai Belakovski
---
Notes:
Travis CI results: https://travis-ci.org/nbelakovski/git/builds/445500127
bu
From: Nickolai Belakovski
lock_reason_valid is renamed to is_locked and lock_reason is removed as
a field of the worktree struct. Lock reason can be obtained instead by a
standalone function.
This is done in order to make the worktree struct more intuitive when it
is used elsewhere in the codeba
From: Nickolai Belakovski
Clarify that these fields are to be considered implementation details
and direct the reader to use the is_worktree_locked function to retrieve
said information.
Signed-off-by: Nickolai Belakovski
---
worktree.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
From: Nickolai Belakovski
A function prefixed with 'is_' would be expected to return a boolean,
however this function returns a string.
Signed-off-by: Nickolai Belakovski
---
builtin/worktree.c | 10 +-
worktree.c | 2 +-
worktree.h | 4 ++--
3 files changed, 8 insert
From: Nickolai Belakovski
In order to more clearly display which branches are active, the output
of git branch is modified to mark branches checkout out in a linked
worktree with a "+" and color them in a faint light green (in contrast
to the current branch, which will still be denoted with a "*"
From: Nickolai Belakovski
Add an atom expressing whether the particular ref is checked out in a
linked worktree.
Signed-off-by: Nickolai Belakovski
---
ref-filter.c | 31 +++
t/t6302-for-each-ref-filter.sh | 15 +++
2 files changed, 46
f the changes introduced here.
I've split this work into two commits since the items are logically
separate.
CI results: https://travis-ci.org/nbelakovski/git/builds/453723727
Nickolai Belakovski (2):
ref-filter: add worktree atom
branch: Mark and colorize a branch differently if it is chec
From: Nickolai Belakovski
Add an atom providing the path of the linked worktree where this ref is
checked out, if it is checked out in any linked worktrees, and empty
string otherwise.
Signed-off-by: Nickolai Belakovski
---
Documentation/git-for-each-ref.txt | 5 +++
ref-filter.c
From: Nickolai Belakovski
The output of git branch is modified to mark branches checkout out in a
linked worktree with a "+" and color them in cyan (in contrast to the
current branch, which will still be denoted with a "*" and colored in green)
This is meant to communicate to the user that the b
earlier in this thread that if
we went with
"worktree:path", then "worktree" is somewhat ambiguous, and that discussion led
to deciding to
have "worktree" return the path,. After that I chose to name it "worktreepath"
because I like to
make things explicit an
From: Nickolai Belakovski
To display worktree path for refs checked out in a linked worktree
Signed-off-by: Nickolai Belakovski
---
Documentation/git-branch.txt | 6 --
builtin/branch.c | 4
t/t3203-branch-output.sh | 21 -
3 files changed, 28 ins
From: Nickolai Belakovski
The output of git branch is modified to mark branches checked out in a
linked worktree with a "+" and color them in cyan (in contrast to the
current branch, which will still be denoted with a "*" and colored in green)
This is meant to communicate to the user that the br
From: Nickolai Belakovski
Add an atom providing the path of the linked worktree where this ref is
checked out, if it is checked out in any linked worktrees, and empty
string otherwise.
Signed-off-by: Nickolai Belakovski
---
Documentation/git-for-each-ref.txt | 5 +++
ref-filter.c
From: Nickolai Belakovski
To display worktree path for refs checked out in a linked worktree
Signed-off-by: Nickolai Belakovski
---
Documentation/git-branch.txt | 6 --
builtin/branch.c | 4
t/t3203-branch-output.sh | 19 +++
3 files changed, 27 inser
standpoint
of decoupling tests and limiting scope of tests.
Travis-CI results: https://travis-ci.org/nbelakovski/git/builds/506853143
Nickolai Belakovski (3):
ref-filter: add worktreepath atom
branch: update output to include worktree info
branch: add worktree info on verbose output
Do
40 matches
Mail list logo