Changes from v2:
* The orderfile feature doesn't set the WM_PATHNAME flag when it
calls wildmatch(), so document the pattern format accordingly.
Richard Hansen (2):
diff: document behavior of relative diff.orderFile
diff: document the format of the -O (diff.orderFile)
Document that a relative pathname for diff.orderFile is interpreted as
relative to the top-level work directory.
Signed-off-by: Richard Hansen
---
Documentation/diff-config.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
Signed-off-by: Richard Hansen
---
Documentation/diff-config.txt | 5 ++---
Documentation/diff-options.txt | 34 --
2 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 875212045
On 2017-01-11 13:15, Junio C Hamano wrote:
Richard Hansen writes:
On 2017-01-10 21:46, Junio C Hamano wrote:
Richard Hansen writes:
I was looking at the code to see how the two file formats differed and
noticed that match_order() doesn't set the WM_PATHNAME flag when it
calls wild
On 2017-01-10 21:46, Junio C Hamano wrote:
Richard Hansen writes:
I was looking at the code to see how the two file formats differed and
noticed that match_order() doesn't set the WM_PATHNAME flag when it
calls wildmatch(). That's unintentional (a bug), right?
It has been that wa
Changes from v1:
* Don't reference gitignore for the file format because they're not
quite the same.
Richard Hansen (2):
diff: document behavior of relative diff.orderFile
diff: document the format of the -O (diff.orderFile) file
Documentation/diff-config
Signed-off-by: Richard Hansen
---
Documentation/diff-config.txt | 5 ++--
Documentation/diff-options.txt | 54 --
2 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index
Document that a relative pathname for diff.orderFile is interpreted as
relative to the top-level work directory.
Signed-off-by: Richard Hansen
---
Documentation/diff-config.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
On 2017-01-10 15:14, Junio C Hamano wrote:
Richard Hansen writes:
Document the format of the patterns used for the diff.orderFile
setting and diff's '-O' option by referring the reader to the
gitignore[5] page.
Signed-off-by: Richard Hansen
---
Documentation/diff-
On 2017-01-10 15:23, Junio C Hamano wrote:
Junio C Hamano writes:
Richard Hansen writes:
On 2017-01-10 01:58, Jeff King wrote:
...
What happens in a bare repository?
I'm guessing it's relative to the top-level of the repository,
I just tried it out and it's relative to
making the tests more independent so that if one
test fails it doesn't cause subsequent tests to fail.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index f62ceffdc..2d92a2646 10075
Rename the testNN branches so that NN matches the test number. This
should make it easier to troubleshoot test issues. Use $test_count to
keep this future-proof.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 82 ++--
1 file changed
Multiple test cases depend on these hunks, so move them to the 'setup'
test case. This is a step toward making the tests more independent so
that if one test fails it doesn't cause subsequent tests to fail.
Signed-off-by: Richard Hansen
---
t/t7610-me
The "--" argument avoids "ambiguous argument: unknown revision or
path not in the working tree" errors when a pathname argument refers
to a non-existent file.
The "--" passed explicitly to set was removed because rev-parse
outputs the "--" argument that it
This is a step toward making the tests more independent so that if one
test fails it doesn't cause subsequent tests to fail.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 71 +++-
1 file changed, 37 insertions(+), 34 deletions(-)
Use test_when_finished to run 'git reset --hard' after each test so
that the repository is left in a saner state for the next test.
This is a step toward making the tests more independent so that if one
test fails it doesn't cause subsequent tests to fail.
Signed-off-by: Richard
d-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index efcf5c3f1..54164a320 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -184,7 +184,7 @@ test_expect_su
Tests now always run 'git reset --hard' at the end (even if they
fail), so it's no longer necessary to run 'git reset --hard' at the
beginning of a test.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 2 --
1 file changed, 2 deletions(-)
diff --git a/t/t76
This will make it easier for a future commit to convert a relative
orderfile pathname to either absolute or relative to the top-level
directory. It also improves code readability.
Signed-off-by: Richard Hansen
---
git-mergetool.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 37 +++--
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 54164a320..c031ecd9e 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
-- $(git rev-parse --sq -- "$@")"
shift
for both 02/14 and 14/14.
Richard Hansen (14):
.mailmap: Use my personal email address as my canonical
rev-parse doc: pass "--" to rev-parse in the --prefix example
t7610: update branch names to match test number
t761
-off-by: Richard Hansen
---
.mailmap | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.mailmap b/.mailmap
index 9cc33e925..9c87a3840 100644
--- a/.mailmap
+++ b/.mailmap
@@ -192,6 +192,8 @@ Philippe Bruhat
Ralf Thielow
Ramsay Jones
René Scharfe
+Richard Hansen
+Richard Hansen
Create and use a test-specific branch when the test might create a
commit. This is not always necessary for correctness, but it improves
debuggability by ensuring a commit created by test #N shows up on the
testN branch, not the branch for test #N-1.
Signed-off-by: Richard Hansen
---
t/t7610
name-only' and adjust any relative pathnames so that 'git mergetool'
does not fail when run from a subdirectory with rerere enabled.
This fixes a regression introduced in
57937f70a09c12ef484c290865dac4066d207c9c (v2.11.0).
Based-on-patch-by: Junio C Hamano
Signed-off-by: Richar
If rerere is enabled and mergetool is run from a subdirectory,
mergetool always prints "No files need merging". Add an expected
failure test case for this situation.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 21 -
1 file changed, 20 insertions(+),
On 2017-01-10 01:58, Jeff King wrote:
On Mon, Jan 09, 2017 at 07:40:30PM -0500, Richard Hansen wrote:
Document that a relative pathname for diff.orderFile is interpreted as
relative to the top-level work directory.
Signed-off-by: Richard Hansen
---
Documentation/diff-config.txt | 2 ++
1
On 2017-01-10 01:17, Johannes Sixt wrote:
Am 10.01.2017 um 00:29 schrieb Richard Hansen:
The pathnames output by the 'git rerere remaining' command are
relative to the top-level directory but the 'git diff --name-only'
command expects its pathname arguments to be relative to
Document the format of the patterns used for the diff.orderFile
setting and diff's '-O' option by referring the reader to the
gitignore[5] page.
Signed-off-by: Richard Hansen
---
Documentation/diff-config.txt | 3 ++-
Documentation/diff-options.txt | 3 ++-
2 files changed, 4 i
Document that a relative pathname for diff.orderFile is interpreted as
relative to the top-level work directory.
Signed-off-by: Richard Hansen
---
Documentation/diff-config.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
Richard Hansen (2):
diff: document behavior of relative diff.orderFile
diff: document the pattern format for diff.orderFile
Documentation/diff-config.txt | 5 -
Documentation/diff-options.txt | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
--
2.11.0.390.gc69c2f50cf-goog
On 2017-01-09 18:29, Junio C Hamano wrote:
Junio C Hamano writes:
Junio C Hamano writes:
I wonder if it makes more sense to always move to toplevel upfront
and consistently use path from the toplevel, perhaps like the patch
s/the patch/the attached patch/ I meant.
does. The first hunk
Tests now always run 'git reset --hard' at the end (even if they
fail), so it's no longer necessary to run 'git reset --hard' at the
beginning of a test.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 2 --
1 file changed, 2 deletions(-)
diff --git a/t/t76
name-only' and adjust any relative pathnames so that 'git mergetool'
does not fail when run from a subdirectory with rerere enabled.
This fixes a regression introduced in
57937f70a09c12ef484c290865dac4066d207c9c (v2.11.0).
Based-on-patch-by: Junio C Hamano
Signed-off-by: Richar
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 37 +++--
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 54164a320..c031ecd9e 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
If rerere is enabled and mergetool is run from a subdirectory,
mergetool always prints "No files need merging". Add an expected
failure test case for this situation.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 21 -
1 file changed, 20 insertions(+),
d-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index efcf5c3f1..54164a320 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -184,7 +184,7 @@ test_expect_su
Rename the testNN branches so that NN matches the test number. This
should make it easier to troubleshoot test issues. Use $test_count to
keep this future-proof.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 82 ++--
1 file changed
This is a step toward making the tests more independent so that if one
test fails it doesn't cause subsequent tests to fail.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 71 +++-
1 file changed, 37 insertions(+), 34 deletions(-)
This will make it easier for a future commit to convert a relative
orderfile pathname to either absolute or relative to the top-level
directory. It also improves code readability.
Signed-off-by: Richard Hansen
---
git-mergetool.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff
Use test_when_finished to run 'git reset --hard' after each test so
that the repository is left in a saner state for the next test.
This is a step toward making the tests more independent so that if one
test fails it doesn't cause subsequent tests to fail.
Signed-off-by: Richard
making the tests more independent so that if one
test fails it doesn't cause subsequent tests to fail.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index f62ceffdc..2d92a2646 10075
Multiple test cases depend on these hunks, so move them to the 'setup'
test case. This is a step toward making the tests more independent so
that if one test fails it doesn't cause subsequent tests to fail.
Signed-off-by: Richard Hansen
---
t/t7610-me
Create and use a test-specific branch when the test might create a
commit. This is not always necessary for correctness, but it improves
debuggability by ensuring a commit created by test #N shows up on the
testN branch, not the branch for test #N-1.
Signed-off-by: Richard Hansen
---
t/t7610
The "--" argument avoids "ambiguous argument: unknown revision or
path not in the working tree" errors when a pathname argument refers
to a non-existent file.
Signed-off-by: Richard Hansen
---
Documentation/git-rev-parse.txt | 3 ++-
1 file changed, 2 insertions(+), 1 delet
se "--" in the --prefix example.
* Unconditionally run cd_to_toplevel at the beginning to simplify
the control flow. Thanks Junio!
* Test -O when there is also a branch named .
Richard Hansen (14):
.mailmap: Use my personal email address as my canonical
rev-parse doc: use
-off-by: Richard Hansen
---
.mailmap | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.mailmap b/.mailmap
index 9cc33e925..9c87a3840 100644
--- a/.mailmap
+++ b/.mailmap
@@ -192,6 +192,8 @@ Philippe Bruhat
Ralf Thielow
Ramsay Jones
René Scharfe
+Richard Hansen
+Richard Hansen
On 2017-01-09 14:05, Junio C Hamano wrote:
Junio C Hamano writes:
I wonder if it makes more sense to always move to toplevel upfront
and consistently use path from the toplevel, perhaps like the patch
s/the patch/the attached patch/ I meant.
does. The first hunk is what you wrote but only
Rename the testNN branches so that NN matches the test number. This
should make it easier to troubleshoot test issues. Use $test_count to
keep this future-proof.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 82 ++--
1 file changed
This is a step toward making the tests more independent so that if one
test fails it doesn't cause subsequent tests to fail.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 71 +++-
1 file changed, 37 insertions(+), 34 deletions(-)
Use test_when_finished to run 'git reset --hard' after each test so
that the repository is left in a saner state for the next test.
This is a step toward making the tests more independent so that if one
test fails it doesn't cause subsequent tests to fail.
Signed-off-by: Richard
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 37 +++--
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 54164a320..c031ecd9e 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
Tests now always run 'git reset --hard' at the end (even if they
fail), so it's no longer necessary to run 'git reset --hard' at the
beginning of a test.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 2 --
1 file changed, 2 deletions(-)
diff --git a/t/t76
Create and use a test-specific branch when the test might create a
commit. This is not always necessary for correctness, but it improves
debuggability by ensuring a commit created by test #N shows up on the
testN branch, not the branch for test #N-1.
Signed-off-by: Richard Hansen
---
t/t7610
This will make it easier for a future commit to convert a relative
orderfile pathname to either absolute or relative to the top-level
directory. It also improves code readability.
Signed-off-by: Richard Hansen
---
git-mergetool.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff
uld break some valid use cases.
This fixes a regression introduced in
57937f70a09c12ef484c290865dac4066d207c9c (v2.11.0).
Signed-off-by: Richard Hansen
---
git-mergetool.sh | 32
t/t7610-mergetool.sh | 2 +-
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/git-merge
If rerere is enabled and mergetool is run from a subdirectory,
mergetool always prints "No files need merging". Add an expected
failure test case for this situation.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 21 -
1 file changed, 20 insertions(+),
making the tests more independent so that if one
test fails it doesn't cause subsequent tests to fail.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index f62ceffdc..2d92a2646 10075
Multiple test cases depend on these hunks, so move them to the 'setup'
test case. This is a step toward making the tests more independent so
that if one test fails it doesn't cause subsequent tests to fail.
Signed-off-by: Richard Hansen
---
t/t7610-me
d-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index efcf5c3f1..54164a320 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -184,7 +184,7 @@ test_expect_su
* Patch 2/4 was split into multiple separate commits.
* Moved '-O' out of $orderfile.
* $orderfile is now adjusted after running cd_to_toplevel.
* Added lots of comments.
* Other minor tweaks to address review feedback.
Richard Hansen (13):
.mailmap: Use my personal email add
-off-by: Richard Hansen
---
.mailmap | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.mailmap b/.mailmap
index 9cc33e925..9c87a3840 100644
--- a/.mailmap
+++ b/.mailmap
@@ -192,6 +192,8 @@ Philippe Bruhat
Ralf Thielow
Ramsay Jones
René Scharfe
+Richard Hansen
+Richard Hansen
On 2017-01-06 04:42, Johannes Sixt wrote:
Am 06.01.2017 um 02:09 schrieb Richard Hansen:
If rerere is enabled and no pathnames are given, run cd_to_toplevel
before running 'git diff --name-only' so that 'git diff --name-only'
sees the pathnames emitted by 'git rer
On 2017-01-05 20:31, Stefan Beller wrote:
On Thu, Jan 5, 2017 at 5:09 PM, Richard Hansen wrote:
Reduce how much a test can interfere other tests:
A bullet point list as an unordered list often indicates that you're
doing multiple
things at once, possibly unrelated, so they could go
mprove the commit message, improve test
case independence even further, and use 'test_when_finished "git
reset --hard"' instead of a plain 'git reset --hard'.
Richard Hansen (4):
t7610: update branch names to match test number
t7610: make tests more inde
nch for test #N-1.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 146 +--
1 file changed, 84 insertions(+), 62 deletions(-)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 14090739f..2c06cf73f 100755
--- a/t/t7
; in case
'git rerere remaining' is ever changed to print pathnames relative to
the current directory rather than to $GIT_WORK_TREE.
This fixes a regression introduced in
57937f70a09c12ef484c290865dac4066d207c9c (v2.11.0).
Signed-off-by: Richard Hansen
---
git-mergetool.sh | 1
Rename the testNN branches so that NN matches the test number. This
should make it easier to troubleshoot test issues. Use $test_count to
keep this future-proof.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 82 ++--
1 file changed
If rerere is enabled and mergetool is run from a subdirectory,
mergetool always prints "No files need merging". Add an expected
failure test case for this situation.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 21 -
1 file changed, 20 insertions(+),
On 2017-01-04 15:27, Stefan Beller wrote:
On Tue, Jan 3, 2017 at 4:50 PM, Richard Hansen wrote:
If a test fails it might leave the repository in a strange state. Add
'git reset --hard' at the beginning of each test to increase the odds
of passing when an earlier test fails.
So ea
On 2017-01-05 07:20, Simon Ruderich wrote:
On Tue, Jan 03, 2017 at 07:50:40PM -0500, Richard Hansen wrote:
[snip]
@@ -145,8 +148,13 @@ test_expect_success 'mergetool in subdir' '
'
test_expect_success 'mergetool on file in parent dir' '
+ git rese
On 2017-01-04 15:27, Stefan Beller wrote:
On Tue, Jan 3, 2017 at 4:50 PM, Richard Hansen wrote:
If a test fails it might leave the repository in a strange state. Add
'git reset --hard' at the beginning of each test to increase the odds
of passing when an earlier test fails.
So
If rerere is enabled, no pathnames are given, and mergetool is run
from a subdirectory, mergetool always prints "No files need merging".
Fix the bug.
This regression was introduced in
57937f70a09c12ef484c290865dac4066d207c9c (v2.11.0).
Richard Hansen (4):
t7610: update branch name
Rename the testNN branches so that NN matches the test number. This
should make it easier to troubleshoot test issues. Use $test_count to
keep this future-proof.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 82 ++--
1 file changed
; in case
'git rerere remaining' is ever changed to print pathnames relative to
the current directory rather than to $GIT_WORK_TREE.
This fixes a regression introduced in
57937f70a09c12ef484c290865dac4066d207c9c (v2.11.0).
Signed-off-by: Richard Hansen
---
git-mergetool.sh | 1
If rerere is enabled and mergetool is run from a subdirectory,
mergetool always prints "No files need merging". Add an expected
failure test case for this situation.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 21 -
1 file changed, 20 insertions(+),
g.
Signed-off-by: Richard Hansen
---
t/t7610-mergetool.sh | 27 +++
1 file changed, 27 insertions(+)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 14090739f..8e2b4e147 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -94,6 +94,7 @@ test_expe
. This avoids the
need to test whether the variable say_color_$1 is set.
* Rename say_color_sgr0 to say_color_reset.
* Add a new variable say_color_ (set to the empty string) as a way
of documenting that $1 is expected to be the empty string for
normal text.
Richard Hansen (2
rhead of a subshell and two invocations of tput per call to
say_color().
Signed-off-by: Richard Hansen
---
t/test-lib.sh | 57 -
1 file changed, 28 insertions(+), 29 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 57212ec..cea6
This reverts commit 102fc80d32094ad6598b17ab9d607516ee8edc4a.
There are two issues with that commit:
* It is buggy. In pseudocode, it is doing:
color is set || TERM != dumb && color works && color=t
when it should be doing:
color is set || { TERM != dumb && color works &&
On 2015-06-17 15:43, Jeff King wrote:
> On Wed, Jun 17, 2015 at 03:06:26PM -0400, Richard Hansen wrote:
>> +say_color_error=$(tput bold; tput setaf 1) # bold red
>> +say_color_skip=$(tput setaf 4) # blue
>> +say_color_warn=$(tput setaf 3) # brown/yellow
>>
rhead of a subshell and two invocations of tput per call to
say_color().
Signed-off-by: Richard Hansen
---
t/test-lib.sh | 53 -
1 file changed, 28 insertions(+), 25 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 57212ec..4a59bfb 1006
This reverts commit 102fc80d32094ad6598b17ab9d607516ee8edc4a.
There are two issues with that commit:
* It is buggy. In pseudocode, it is doing:
color is set || TERM != dumb && color works && color=t
when it should be doing:
color is set || { TERM != dumb && color works &&
properly, I hope :)
Richard Hansen (2):
Revert "test-lib.sh: do tests for color support after changing HOME"
test-lib.sh: fix color support when tput needs ~/.terminfo
t/test-lib.sh | 103 +-
1 file changed, 51 inserti
patch 1/2 is the same as v1
patch 2/2 has been reworked to incorporate Hannes's feedback (thank
you!)
-Richard
Richard Hansen (2):
Documentation/githooks: mention pwd, $GIT_PREFIX
t1020-subdirectory.sh: check hook pwd, $GIT_PREFIX
Documentation/githooks.txt | 6 ++
t/
Make sure hooks are executed at the top-level directory and that
GIT_PREFIX is set (as documented).
Signed-off-by: Richard Hansen
---
t/t1020-subdirectory.sh | 23 +++
1 file changed, 23 insertions(+)
diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh
index
Document that hooks are run from the top-level directory and that
GIT_PREFIX is set to the name of the original subdirectory (relative
to the top-level directory).
Signed-off-by: Richard Hansen
---
Documentation/githooks.txt | 6 ++
1 file changed, 6 insertions(+)
diff --git a
Document that hooks are run from the top-level directory and that
GIT_PREFIX is set to the name of the original subdirectory (relative
to the top-level directory).
Signed-off-by: Richard Hansen
---
Documentation/githooks.txt | 6 ++
1 file changed, 6 insertions(+)
diff --git a
umentation for alias.* should also be shored up.
-Richard
Richard Hansen (2):
Documentation/githooks: mention pwd, $GIT_PREFIX
t1020-subdirectory.sh: check hook pwd, $GIT_PREFIX
Documentation/githooks.txt | 6 ++
t/t1020-subdirectory.sh| 34 ++
2 fil
Make sure hooks are executed at the top-level directory and that
GIT_PREFIX is set (as documented).
Signed-off-by: Richard Hansen
---
t/t1020-subdirectory.sh | 34 ++
1 file changed, 34 insertions(+)
diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh
so this patch helps one shut off that noise.
Signed-off-by: Jess Austin
Signed-off-by: Richard Hansen
Reviewed-by: Richard Hansen
---
contrib/completion/git-prompt.sh | 13 +
t/t9903-bash-prompt.sh | 106 +++
2 files changed, 119 inserti
At the beginning of __git_ps1, right after determining that the
function is running in pc mode, set PS1 to a plain (undecorated)
prompt. This makes it possible to simply return early without having
to set PS1 if the prompt should not be decorated.
Signed-off-by: Richard Hansen
---
contrib
et another.
> Would it be sensible to refactor that into a helper function, or
> open coding them this way is necessary for performance or some other
> reasons?
I thought about factoring it out, but didn't because defining a
function with just three lines seemed awkward. But I t
(see Documentation/CodingGuidelines)
Signed-off-by: Richard Hansen
---
t/test-lib.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 9acdc88..3670eed 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -184,10 +184,10 @@ export _x05
differently from the original.
>
> Makes sense.
I updated the commit message to make this change more obvious.
> This is a tangent but this patch shows 2 places out of the only
> three places we use [ ... ] construct (as opposed to a more
> traditionalist "test"). Perhaps we m
ead of a
~/.terminfo directory, NetBSD uses a ~/.terminfo.cdb database file).
Signed-off-by: Richard Hansen
---
t/test-lib.sh | 90 +++
1 file changed, 47 insertions(+), 43 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 3670eed..
t this is tricky due to the lack of
a standard name for the terminfo database (for example, instead of a
~/.terminfo directory, NetBSD uses a ~/.terminfo.cdb database file).
Signed-off-by: Richard Hansen
---
t/test-lib.sh | 90 +++
1 file ch
so this patch helps one shut off that noise.
Signed-off-by: Jess Austin
Signed-off-by: Richard Hansen
Reviewed-by: Richard Hansen
---
This is the patch from:
http://article.gmane.org/gmane.comp.version-control.git/258313
modified to include the changes I suggested in:
http
On 2014-10-15 00:06, Jess Austin wrote:
> @@ -501,6 +506,13 @@ __git_ps1 ()
> local f="$w$i$s$u"
> local gitstring="$c$b${f:+$z$f}$r$p"
>
> + if [ -n "${GIT_PS1_HIDE_IF_PWD_IGNORED}" ] &&
> +[ "$(git config --bool bash.hideIfPwdIgnored)" != "false" ] &&
> +git chec
istracting, so this patch helps one shut off that noise.
>
> Signed-off-by: Jess Austin
> ---
> On Thu, Oct 9, 2014 at 5:09 PM, Richard Hansen wrote:
>> On 2014-10-09 06:27, Jess Austin wrote:
>>> Would you want this configured in each repo (i.e. via a line in
>>&
On 2014-10-14 14:47, Johannes Sixt wrote:
> Am 14.10.2014 um 04:32 schrieb Jess Austin:
>> diff --git a/contrib/completion/git-prompt.sh
>> b/contrib/completion/git-prompt.sh
>> index c5473dc..d7559ff 100644
>> --- a/contrib/completion/git-prompt.sh
>> +++ b/contrib/completion/git-prompt.sh
>> @@
1 - 100 of 262 matches
Mail list logo
