I work on a git server called gitano.
We've been using and recommending cgit for the web UI.
I've been working on adding git namespace support to both,
so that we can separate administrative branches from code branches.
Because git is not namespace aware for anything but git-upload-pack
and git-r
On 21 August 2016 at 03:05, Josh Triplett wrote:
> On Sat, Aug 20, 2016 at 08:07:00PM +0100, Richard wrote:
>> Since when upload-pack and receive-pack run hooks they leave GIT_NAMESPACE
>> set
>> there are hook scripts that expect that the current namespace is ignored,
&g
On 22 August 2016 at 20:16, Josh Triplett wrote:
> On Mon, Aug 22, 2016 at 07:36:31PM +0100, Richard wrote:
>> On 21 Aug 2016 15:07, "Josh Triplett" wrote:
>> > I'd like to see it work more automatically than that. Perhaps a
>> > separate environment
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
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 &&
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
>>
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 &&
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 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
Then referencing an object before
synching it do disk would make no sense.
Thanks,
//richard
--
To unsubscribe from this list: send the line "unsubscribe git" in
Hi Johannes,
[CC'ing linux-fsdevel and tytso]
Am 21.06.2015 um 14:28 schrieb Johannes Schindelin:
> Hi Richard,
>
> On 2015-06-20 21:40, Richard Weinberger wrote:
>
>> Yesterday our git server faced a power cut and a git repository broke.
>> The server is runnin
Am 21.06.2015 um 15:59 schrieb Christoph Hellwig:
> On Sun, Jun 21, 2015 at 03:07:41PM +0200, Richard Weinberger wrote:
>>>> To me it seems like git was creating a new object and got interrupted
>>>> before fsync/fdatasync'ing it.
>>>> As the object wa
Am 22.06.2015 um 02:35 schrieb Theodore Ts'o:
> On Sun, Jun 21, 2015 at 03:07:41PM +0200, Richard Weinberger wrote:
>
>>> I was then shocked to learn that ext4 apparently has a default
>>> setting that allows it to truncate files upon power failure
>>> (so
Hi, I wanted to report something interesting that I found while
tracing a severe slowdown in git-prompt.sh.
https://github.com/git/git/commit/6d158cba282f22fa1548af1188f78042fed30aed#diff-f37c4f4a898819f0ca4b5ff69e81d4d9R141
Way back in this commit, someone added a useful chunk of code that
works
Aha! Yes, this works precisely as intended: the prompt works
correctly, and quickly, with this change in place.
- R.
On Tue, Jul 19, 2016 at 4:24 AM, Johannes Schindelin
wrote:
> Hi Richard,
>
> On Mon, 18 Jul 2016, Richard Soderberg wrote:
>
>> Hi, I wanted to report som
On Thu, Jul 28, 2016 at 11:40:55PM -0700, Josh Triplett wrote:
[snip]
>
> I'd welcome any feedback, whether on the interface and workflow, the
> internals and collaboration, ideas on presenting diffs of patch series,
> or anything else.
>
This looks awesome!
I've been working on some similar st
On Fri, Jul 29, 2016 at 04:04:26AM -0700, Josh Triplett wrote:
[snip]
>
> These definitely seem like a family of related problems. I'd like to
> use git-series as a format for storing iterations on things like GitHub
> pull-requests or Gerrit patch versions (in the latter case, overcoming
> Gerri
On Fri, Jul 29, 2016 at 09:59:08AM -0700, Stefan Beller wrote:
> On Fri, Jul 29, 2016 at 5:44 AM, Richard Ipsum
> wrote:
> >>
> >> These definitely seem like a family of related problems. I'd like to
> >> use git-series as a format for storing iterations on
On Fri, Jul 29, 2016 at 06:00:55AM -0700, Josh Triplett wrote:
> On Fri, Jul 29, 2016 at 01:44:44PM +0100, Richard Ipsum wrote:
> > On Fri, Jul 29, 2016 at 04:04:26AM -0700, Josh Triplett wrote:
> > > I hope to use git notes with git-series in the future, by putting
> > >
On Mon, Aug 01, 2016 at 01:59:29AM -0700, Josh Triplett wrote:
> On Mon, Aug 01, 2016 at 07:55:54AM +, Eric Wong wrote:
[snip]
> >
> > I'm not convinced another format/standard is needed besides the
> > email workflow we already use for git and kernel development.
>
> Not all projects use a p
7;t generally
perform more than one review simultaneously. So I may well
use this idea in git-candidate if it's okay. :)
I haven't found time to use the tool to do any serious review
yet, but I'll try and post some more feedback when I do.
Hope this helps,
Richard
--
To unsubscribe from
way to store
> > reviews in Git is not necessarily improving the way our code contribution
> > process works. If you want to record the discussions revolving around the
> > code, I think public-inbox already does a pretty good job at that.
I agree, and must apologise if this r
php pl pm py rst sh tcsh txt zsh
>
> But again, I do not think that it makes sense to focus too much on a
> language, or on a file format, before we came up with a strategy how to
> *not* require everybody to change their current ways.
Fair enough. :)
Thanks,
Richard Ipsum
[1]: ht
On Tue, Aug 09, 2016 at 06:22:21AM +0200, Duy Nguyen wrote:
> On Tue, Aug 9, 2016 at 12:20 AM, Michael Haggerty
> wrote:
> > On 08/04/2016 05:58 PM, Johannes Schindelin wrote:
> >> [...]
> >> Even requiring every contributor to register with GitHub would be too much
> >> of a limitation, I would
On Thu, Aug 04, 2016 at 12:40:58PM -1000, Josh Triplett wrote:
> On Wed, Aug 03, 2016 at 08:12:02PM +0100, Richard Ipsum wrote:
> > On Thu, Jul 28, 2016 at 11:40:55PM -0700, Josh Triplett wrote:
> > > I'd welcome any feedback, whether on the interface and workflow,
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
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, 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
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
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 ea
; 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(+),
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
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
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
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
-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
* 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
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
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
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
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
n't be used with --prefix because it shows up in the output, plus
the example in the rev-parse documentation doesn't use it. I'll patch
rev-parse's man page to use "--" in the example.
Thanks,
Richard
I removed both of the comment blocks as the code always wor
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
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
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
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
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
e given via -O on the command line needs
prefixing.
Yes. By unconditionally running cd_to_top we should get the behavior we
want even if 'git diff' uses the current working directory rather than
the top-level directory.
I'll poke at 'git diff' to see what it does.
-Richard
smime.p7s
Description: S/MIME Cryptographic Signature
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-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
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
-- $(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
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
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
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
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(-)
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
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
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
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
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-
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 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
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
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)
1 - 100 of 381 matches
Mail list logo
