On 3/16/19, Linus Torvalds wrote:
>
>git repack -adf
>
Thanks for the tip!
--
D. Richard Hipp
d...@sqlite.org
ized packfile and perhaps offer
suggestions on how I can make it more space-efficient, it can be
cloned from https://github.com/drhsqlite/fossil-mirror.git - at least
for now - surely I will delete that repo and regenerate it once I
figure out this problem.
--
D. Richard Hipp
d...@sqlite.org
,your phone and also
your ID for more details on how we can move forward
Waiting to here from you as soon as you receive this massage.
Thanks.
Richard Thomas
Good day,
My name is Richard Jeffery I have a client, who died as a result of
heart-related condition on the 10th of December, 2015. I have contacted
you to assist in distributing the estate left behind by my client, who
shares the same last name as yours. Would discuss more when I hear from
Good day,
My name is Richard Jeffery I have a client, who died as a result of
heart-related condition on the 10th of December, 2015. I have contacted
you to assist in distributing the estate left behind by my client, who
shares the same last name as yours. Would discuss more when I hear from
s/angular brackets/angle brackets/
I've never seen these called "angular brackets". Maybe a non-native English
speaker issue.
Regards,
Richard.
PS. Please excuse my sending this twice, I don't seem to have default settings
that are compatible with the list.
s/angular brackets/angle brackets/
I've never seen these called "angular brackets".
Richard Kerry
BNCS Engineer, SI SOL Telco & Media Vertical Practice
M: +44 (0)7812 325518
2nd Floor, MidCity Place, 71 High Holborn, London, WC1V 6EA
richard.ke...@atos.net<http
--
I Mr Richard Wahl donates $ 2 Million Dollars from part of my $533M In Mega
MillionsJackpot.WATCH ME HERE: https://www.youtube.com/watch?v=tne02ExNDrw
File for claims
transfer your 1,000,000.00 EUR(One Million Euros)
to you in your own country.
Full Names:
Mobile No:
Age:
Occupation:
Country:
Send your response to: rmaxwel...@yahoo.com
Best Regards,
Richard & Angela Maxwell
From:MR.RICHARD SANDOO.
Bill and Exchange Manager
Micro Finance Bank Plc
Burkina Faso
Dear Friend,
I know that this mail will come to you as a surprise. I am MR.RICHARD
SANDOO. and I am the bill and Exchange manager in a Bank here in my
country .I Hope that you will not expose or betray this tr
ed" is the most appropriate word in
modern English.
R.
Richard Kerry
BNCS Engineer, SI SOL Telco & Media Vertical Practice
T: +44 (0)20 3618 2669
M: +44 (0)7812 325518
Lync: +44 (0) 20 3618 0778
Room G300, Stadium House, Wood Lane, London, W12 7TA
richard.ke...@atos.net
> --
"Shorted" is what happens when you put a piece of wire across the terminals of
a battery ... (bang, smoke, etc).
It's short for "short-circuited".
Yes, I think you mean "shortened" in this case.
Regards,
Richard.
Richard Kerry
BNCS Engineer, SI SOL Telco &
shall offer you 50 percent of the fund, and you will be in custody of
my intended investment in your country with my share.
Do reply for details.
Regards
Richard Williams
Email:richawill1...@gmail.com
ject representing a physical `ref_store`. Different
> reference store classes might have different "constructor" arguments.
> For example, if it represents a namespace within a larger reference tree
> contained in a shared repository, its arguments might be
> `(shared_gitdir, na
On Thu, Aug 24, 2017 at 06:17:07PM +0200, Michael Haggerty wrote:
> On Sun, Aug 13, 2017 at 9:36 PM, Richard Maw wrote:
> > [...]
> > Fortunately the pluggable ref backends work provided an easier starting
> > point.
>
> :-) I'm glad my years-long obsession is fi
On Wed, Aug 23, 2017 at 07:37:00PM +0700, Nguyễn Thái Ngọc Duy wrote:
> refs/bisect is unfortunately per-worktree, so we need to look in
> per-worktree logs/refs/bisect in addition to per-repo logs/refs. The
> current iterator only goes through per-repo logs/refs.
>
> Use merge iterator to walk tw
On Tue, Aug 15, 2017 at 10:13:22AM -0700, Junio C Hamano wrote:
> Richard Maw writes:
>
> > This is not my first attempt to improve the git namespace handling in git.
> > I tried last year, but it took me so long that all the ref handling code
> > changed
> > and
--
I'd like you to be in custody of my late client's fortune.
My client died along with his family including his next-of-kin
The funds shall be used for investment under your management
Do reply for details.
Regards
Richard Williams
Email:rich19willi...@gmail.com
s/bisect,
but those refs can't be found in iteration
because the files backend walks the refs in the common dir
rather than the refs in the git dir,
and the simple workaround in loose_fill_ref_dir doesn't work.
Richard Maw (7):
Expose expand_namespace API
Add git_con
This exposes implementation details of repo_read_config
so a configset can be populated with a repository's standard config,
without needing to create a full repository.
This allows config lookup to use the same codepath
whether the repository is ready or not,
which allows it to be used during git
Normally your own namespace is known and you only need to skip that prefix,
but when you need to classify the type of a ref
it helps to be able to consider what type of ref it would be
if it were outside of a namespace.
---
git-compat-util.h | 19 +++
1 file changed, 19 insertions(
Since refs are classified based on their prefix
but namespaces have their own prefix,
it's necessary to skip that prefix to classify their remaining prefix.
---
refs.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/refs.c b/refs.c
index ba22f4a..2e8bace 100644
--- a/refs.c
+++ b/refs.c
@@ -69
---
Makefile | 1 +
refs/namespaced-backend.c | 619 ++
refs/refs-internal.h | 1 +
3 files changed, 621 insertions(+)
create mode 100644 refs/namespaced-backend.c
diff --git a/Makefile b/Makefile
index 461c845..0c417c3 100644
---
refs.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/refs.c b/refs.c
index 9a3dcfb..e80244f 100644
--- a/refs.c
+++ b/refs.c
@@ -647,7 +647,6 @@ int refs_delete_ref(struct ref_store *refs, const char *msg,
struct strbuf err = STRBUF_INIT;
if (ref_ty
---
refs.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/refs.c b/refs.c
index 2e8bace..9a3dcfb 100644
--- a/refs.c
+++ b/refs.c
@@ -536,6 +536,7 @@ int dwim_log(const char *str, int len, unsigned char *sha1,
char **log)
static int is_per_worktree_ref(const char *refname)
{
+ (voi
Namespaces will not only be settable with GIT_NAMESPACE,
so this previously internal helper needs to be made available to other code.
---
cache.h | 1 +
environment.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/cache.h b/cache.h
index 71fe092..e01b8a2 100644
--- a/c
Hi,
I’m trying to locate a commit which takes place after another one,
matches a certain tag, and is by a specific user. I have the following
command:
git log ..HEAD --decorate --author=“" --tags=“project-name”
The tag follows the format: project-name-version
How ever this doesn’t seem to work,
Please Whoever this email meets i need your co-operation
and to introduce myself i am Mr Richard Water and i work with
an intermediary bank by name Exodus bank Group , i discovered
from my bank data assessment as the bank auditor general
that a deceased customer left in one of his accounts 580
;, we could make the message even more
> helpful by being more direct, e.g.
>
> die("'%s' is not a commit and a branch '%s' cannot be created from
> it",
> argv[0], opts.new_branch);
"'%s' can not be resolved as commit,
d by a non-native speaker.
Regards,
Richard.
Richard Kerry
BNCS Engineer, SI SOL Telco & Media Vertical Practice
T: +44 (0)20 3618 2669
M: +44 (0)7812 325518
4 Triton Square, Regent’s Place, London NW1 3HG
richard.ke...@atos.net
This e-mail and the documents attached are confidential and int
May I suggest that " The most approaching commands" doesn't make much sense as
English (I don't think a command can "approach").
Perhaps it should be " The most appropriate commands".
Regards,
Richard.
Richard Kerry
BNCS Engineer, SI SOL Telco &
better
late than never... :)
This document is nowhere near complete. My hope is that this initial effort
helps start the conversation.
Thanks,
Richard Ipsum
[1]: https://public-inbox.org/git/20160108140831.GA10200@salo/
Network Working Group R. Ipsum
I Richard Fennell, From Bendigo Bank Australia and I am writing this letter to
submit an interesting innovating business idea that I would like to share with
you, the business is real and risk free, it shall be done in accordance with
the appropriate banking regulation and finance policy.
You
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
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
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
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
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
1 - 100 of 381 matches
Mail list logo
