On Wed, Oct 23, 2019 at 09:32:26AM -0400, Eric Sunshine wrote:
> On Wed, Oct 23, 2019 at 8:04 AM Denton Liu wrote:
> > Before, the output of `git diff HEAD` would always be piped to
> > sanitize_conflicted_diff(). However, since the Git command was upstream
> > of the
ce to put it.
Signed-off-by: Denton Liu
---
t/t4108-apply-threeway.sh | 27 ++-
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/t/t4108-apply-threeway.sh b/t/t4108-apply-threeway.sh
index fa5d4efb89..b109ecbd9f 100755
--- a/t/t4108-apply-threeway.sh
+++ b/t/
Since `git config` leaves the configurations set even after the test
case completes, use `test_config` instead so that the configurations are
reset once the test case finishes.
Signed-off-by: Denton Liu
---
t/t4108-apply-threeway.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff
the command `git diff HEAD` was being piped to
sanitize_conflicted_diff(), move the command into the function and rename
it to print_sanitized_diff().
Signed-off-by: Denton Liu
---
t/t4108-apply-threeway.sh | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/t/t4108
This fixes a bug where even if `merge.conflictStyle = diff3`, running
`git apply --3way` would not output the base.
Patches 1-3 are general cleanup for t4108, 4 demonstrates the bug and 5
actually fixes it.
Denton Liu (5):
t4108: replace create_file with test_write_lines
t4108: remove git
o sanitize `|||` conflict markers.
Signed-off-by: Denton Liu
---
t/t4108-apply-threeway.sh | 58 ---
1 file changed, 36 insertions(+), 22 deletions(-)
diff --git a/t/t4108-apply-threeway.sh b/t/t4108-apply-threeway.sh
index 3615256492..84347fc178 100755
--- a/t/t
Before, when doing a 3-way merge, the merge.conflictStyle option was not
respected and the "merge" style was always used, even if "diff3" was
specified.
Call git_xmerge_config() at the end of git_apply_config() so that the
merge.conflictStyle config is read.
Signe
On Wed, Oct 23, 2019 at 10:15:15AM +, Jerome Pouiller wrote:
> On Wednesday 23 October 2019 10:55:03 CEST Denton Liu wrote:
> > I am currently have a WIP patchset that will print the location of the
> > failed patch file (.git/rebase-apply/patch) in the case of a failure as
Hi Jerome,
On Wed, Oct 23, 2019 at 08:49:41AM +, Jerome Pouiller wrote:
> On Wednesday 23 October 2019 04:24:58 CEST Junio C Hamano wrote:
> > Jerome Pouiller writes:
> > > I try to use "git am" to apply a patch sent using "git send-email". This
> > > patch does not apply properly. I try to u
l clean up situations where we have multiple duplicate
statements within a test case. This is done to keep this patch purely
mechanical.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 105
1 file changed, 70 insertions(+), 35 deletions(-)
diff --gi
of the file stays the same throughout the whole test case.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 8
1 file changed, 8 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index c9e4eec004..ef3dbc201a 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -147,7 +147,6
quot;$(git rev-parse.* \([^)]*\))"/test_cmp_rev ! \1 \2/
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 50 -
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 18225d8430..1af6ea06ee 100755
le duplicate
statements within a test case. This is done to keep this patch purely
mechanical.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 64 -
1 file changed, 48 insertions(+), 16 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
i
st -n` or `test -z`, replace them respectively with
invocations of test_file_not_empty() and test_must_be_empty() so that we
get better debugging information in the case of a failure.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 12
1 file changed, 8 insertions(+), 4 deletions(-)
Currently, if a Git command fails in an unexpected way, such as a
segfault, it will be masked and ignored. Replace the ! with
test_must_fail so that only expected failures pass.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a
The style for tests in Git is to have the redirect operator attached to
the filename with no spaces. Fix test cases where this is not the case.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520
Instead of rolling our own functionality to test the number of lines a
command outputs, use test_line_count() which provides better debugging
information in the case of a failure.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a
Before, if the invocation of git failed, it would be masked by the pipe
since only the return code of the last element of a pipe is used.
Rewrite the test to put the Git command on its own line so its return
code is not masked.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 3 ++-
1 file
case of `! test -f`, not only should that path not be a
file, it shouldn't exist at all so replace it with
test_path_is_missing().
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
The usual convention is for test case names to be written between
single-quotes. Change all double-quoted test case names to single-quotes
except for two test case names that use variables within.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 4 ++--
1 file changed, 2 insertions(+), 2
We were using a redirection operator to feed input into sed. However,
since sed is capable of opening its own files, make sed open its own
files instead of redirecting input into it.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
Rebase against the latest master since this topic hasn't been picked
up yet
Changes since v1:
* Incorporate Eric's feedback
Denton Liu (14):
t: teach test_cmp_rev to accept ! for not-equals
t5520: improve test style
t5520: use sq for test case names
t5520: let sed open its own input
e `git rev-parse` segfaults and dies unexpectedly, the
failure will be ignored.
Rewrite test_cmp_rev() to optionally accept "!" as the first argument to
do a not-equals comparison. Rewrite `! test_cmp_rev` to `test_cmp_rev !`
in all tests to take advantage of this new functionality.
Signed-of
Improve the test style by removing leading and trailing empty lines
within test cases. Also, reformat multi-line subshells to conform to the
existing style.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 88 +
1 file changed, 45 insertions(+), 43
According to t/README, test_must_fail() should only be used to test for
failure in Git commands. Replace the invocations of
`test_must_fail grep` with `! grep`.
Signed-off-by: Denton Liu
---
*sigh* Here's another cleanup patch for 'dl/submodule-set-branch'. It's
inspire
Hi Johannes,
On Mon, Oct 21, 2019 at 08:44:40PM +0200, Johannes Schindelin wrote:
> Hi Junio,
>
> On Fri, 18 Oct 2019, Junio C Hamano wrote:
>
> > Denton Liu writes:
> >
> > > There are many += lists in the Makefile and, over time, they have gotten
> >
Since --preserve-merges has been deprecated in favour of
--rebase-merges, mark this option as hidden so it no longer shows up in
the usage and completions.
Signed-off-by: Denton Liu
---
This patch continues the deprecation effort and can be based on top of
`js/rebase-deprecate-preserve-merges
Sorry for the double-send. public-inbox and MARC both showed that
only 3 messages got through the in the first send so I sent it again.
Seems to have gotten through find the second time around.
On Fri, Oct 18, 2019 at 03:04:03PM -0700, Denton Liu wrote:
> Like earlier patchsets, I want
anup to an unrelated test that I found while addressing
some of Eric's comments.
2/15 is a general improvement to test_rev_cmp() that will be used later
in the series.
Changes since v1:
* Incorporate Eric's feedback
Denton Liu (15):
t7408: replace `test_must_fail test_path_is_file`
t
Improve the test style by removing leading and trailing empty lines
within test cases. Also, reformat multi-line subshells to conform to the
existing style.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 88 +
1 file changed, 45 insertions(+), 43
quot;$(git rev-parse.* \([^)]*\))"/test_cmp_rev ! \1 \2/
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 50 -
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 18225d8430..1af6ea06ee 100755
le duplicate
statements within a test case. This is done to keep this patch purely
mechanical.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 64 -
1 file changed, 48 insertions(+), 16 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
i
Currently, if a Git command fails in an unexpected way, such as a
segfault, it will be masked and ignored. Replace the ! with
test_must_fail so that only expected failures pass.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a
The style for tests in Git is to have the redirect operator attached to
the filename with no spaces. Fix test cases where this is not the case.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520
Before, if the invocation of git failed, it would be masked by the pipe
since only the return code of the last element of a pipe is used.
Rewrite the test to put the Git command on its own line so its return
code is not masked.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 3 ++-
1 file
l clean up situations where we have multiple duplicate
statements within a test case. This is done to keep this patch purely
mechanical.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 105
1 file changed, 70 insertions(+), 35 deletions(-)
diff --gi
We were using a redirection operator to feed input into sed. However,
since sed is capable of opening its own files, make sed open its own
files instead of redirecting input into it.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
Instead of rolling our own functionality to test the number of lines a
command outputs, use test_line_count() which provides better debugging
information in the case of a failure.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a
case of `! test -f`, not only should that path not be a
file, it shouldn't exist at all so replace it with
test_path_is_missing().
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
The usual convention is for test case names to be written between
single-quotes. Change all double-quoted test case names to single-quotes
except for two test case names that use variables within.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 4 ++--
1 file changed, 2 insertions(+), 2
e `git rev-parse` segfaults and dies unexpectedly, the
failure will be ignored.
Rewrite test_cmp_rev() to optionally accept "!" as the first argument to
do a not-equals comparison. Rewrite `! test_cmp_rev` to `test_cmp_rev !`
in all tests to take advantage of this new functionality.
Signed-of
According to t/README, test_must_fail() should only be used to test for
failure in git commands. Replace the only invocation of
`test_must_fail test_path_is_file` with `test_path_is_missing` since in
this test case, the path should not exist at all.
Signed-off-by: Denton Liu
---
t/t7408
of the file stays the same throughout the whole test case.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 8
1 file changed, 8 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index c9e4eec004..ef3dbc201a 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -147,7 +147,6
st -n` or `test -z`, replace them respectively with
invocations of test_file_not_empty() and test_must_be_empty() so that we
get better debugging information in the case of a failure.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 12
1 file changed, 8 insertions(+), 4 deletions(-)
7, 2019 at 07:41:44PM -0400, Eric Sunshine wrote:
> On Thu, Oct 17, 2019 at 7:17 PM Denton Liu wrote:
> > In case an invocation of `git rev-list` fails within the subshell, the
> > failure will be masked. Remove the subshell and use test_cmp_rev() so
> > that failures can be di
case of `! test -f`, replace it with test_path_is_missing().
Signed-off-by: Denton Liu
---
I just realised that test_path_is_missing() is a much better replacement
than `test_must_fail test_path_is_file`. Please use this patch instead
of 04/12.
t/t5520-pull.sh | 10 +-
1 file changed, 5
Like earlier patchsets, I want to implement a feature that involves
modifications to the test suite. Since that feature will probably take a
while to polish up, however, let's clean up the test suite in a separate
patchset first so it's not blocked by the feature work.
Denton Liu (12
Improve the test style by removing leading and trailing empty lines
within test cases. Also, reformat multi-line subshells to conform to the
existing style.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 88 +
1 file changed, 45 insertions(+), 43
The style for tests in Git is to have the redirect operator attached to
the filename with no spaces. Fix test cases where this is not the case.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520
We were using a redirection operator to feed input into sed. However,
since sed is capable of opening its own files, make sed open its own
files instead of redirecting input into it.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
: Denton Liu
---
t/t5520-pull.sh | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 55560ce3cd..5ab5ec508a 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -39,8 +39,8 @@ test_expect_success 'pulling into
expressions:
s/\(\s*\)test \([^=]*\)= "$(cat \([^)]*\))"/\1echo \2>expect
\&\&\n\1test_cmp expect \3/
s/\(\s*\)test "$(cat \([^)]*\))" = \([^&]*\)\( &&\)\?$/\1echo \3
>expect \&\&\n\1test_cmp expect \2\4/
Before, if the invocation of git failed, it would be masked by the pipe
since only the return code of the last element of a pipe is used.
Rewrite the test to put the Git command on its own line so its return
code is not masked.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 3 ++-
1 file
The usual convention is for test case names to be written between
single-quotes. Change all double-quoted test case names to single-quotes
except for two test case names that use variables within.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 4 ++--
1 file changed, 2 insertions(+), 2
Currently, if a Git command fails in an unexpected way, such as a
segfault, it will be masked and ignored. Replace the ! with
test_must_fail so that only expected failures pass.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a
) != "$(git rev-parse.* \([^)]*\))"/test_must_fail
test_cmp_rev \1 \2/
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 50 -
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index c7797
\2 >expect
\&\&\n\1\3 >actual \&\&\n\1test_cmp expect actual/
s/\(\s*\)test "$(\(git [^)]*\))" = \([^ ]*\)/\1echo \3 >expect
\&\&\n\1\2 >actual \&\&\n\1test_cmp expect actual/
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 64 +
Instead of using `test -n` or `test -z`, replace them respectively with
invocations of test_file_not_empty() and test_must_be_empty().
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
Instead of rolling our own functionality to test the number of lines a
command outputs, use test_line_count() which provides better debugging
information in the case of a failure.
Signed-off-by: Denton Liu
---
t/t5520-pull.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a
Since autostash.c was recently introduced, we should avoid
USE_THE_INDEX_COMPATIBILITY_MACROS since we are trying to move away from
this in the rest of the codebase. Rewrite the autostash code to not need
it and remove its definition.
Signed-off-by: Denton Liu
---
autostash.c | 8 +++-
1
There are many += lists in the Makefile and, over time, they have gotten
slightly out of order, alphabetically. Alphabetically sort all += lists
to bring them back in order.
Signed-off-by: Denton Liu
---
Makefile | 75
1 file changed, 38
Continue the process of lib-ifying the autostash code. In a future
commit, this will be used to implement `--autostash` in other builtins.
This patch is best viewed with `--color-moved` and
`--color-moved-ws=allow-indentation-change`.
Signed-off-by: Denton Liu
---
autostash.c | 46
right.
Since this is an RFC, we're missing tests and documentation but I've
tested it and it seems to work reasonably well.
[1]: https://github.com/gitgitgadget/git/issues/394
Denton Liu (7):
Makefile: alphabetically sort += lists
autostash: extract read_one() from rebase
aut
Continue the process of lib-ifying the autostash code. In a future
commit, this will be used to implement `--autostash` in other builtins.
This patch is best viewed with `--color-moved` and
`--color-moved-ws=allow-indentation-change`.
Signed-off-by: Denton Liu
---
autostash.c | 46
then pops after.
Reported-by: Alban Gruin
Signed-off-by: Denton Liu
---
builtin/merge.c | 13 +
builtin/pull.c | 9 +
t/t5520-pull.sh | 8
3 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 062e911441
Begin the process of lib-ifying the autostash code. In a future commit,
This patch is best viewed with `--color-moved` and
`--color-moved-ws=allow-indentation-change`.
this will be used to implement `--autostash` in other builtins.
Signed-off-by: Denton Liu
---
autostash.c | 137
Begin the process of lib-ifying the autostash code. In a future commit,
this will be used to implement `--autostash` in other builtins.
This patch is best viewed with `--color-moved` and
`--color-moved-ws=allow-indentation-change`.
Signed-off-by: Denton Liu
---
autostash.c | 12
ormat-patch to accept the `--cover-from-description` option and
corresponding `format.coverFromDescription` config, allowing users to
populate different parts of the cover letter (including the subject
now).
Signed-off-by: Denton Liu
Signed-off-by: Junio C Hamano
---
Documentation/config/forma
ferCoverSubject was borrowed from
this config but it also did not state what the default value was)
* In 1/4, rename all instances of "expected" to "expect"
[1]: https://public-inbox.org/git/cover.1558492582.git.liu.den...@gmail.com/
Denton Liu (3):
format-patch: replac
Before, `thread` and `config_cover_letter` were defined as ints even
though they behaved as enums. Define actual enums and change these
variables to use these new definitions.
Signed-off-by: Denton Liu
Signed-off-by: Junio C Hamano
---
builtin/log.c | 30 +-
1 file
SHALLOW`
is a no-op. Replace this errorneous and condition with a ternary
statement so that it is clear what the configured value is when a
boolean is given.
Signed-off-by: Denton Liu
---
builtin/log.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/log.c b/bui
Hi Junio,
Thanks for the feedback.
On Tue, Oct 15, 2019 at 11:16:35AM +0900, Junio C Hamano wrote:
> Denton Liu writes:
>
> > Since this
> > seems to be a Python-ism that's mistakenly leaked into our code, convert
>
> The conclusion is OK, but as the invento
ormat-patch to accept the `--cover-from-description` option and
corresponding `format.coverFromDescription` config, allowing users to
populate different parts of the cover letter (including the subject
now).
Signed-off-by: Denton Liu
---
Documentation/config/format.txt| 6 +
Documentation/git-f
lt value for
format.coverLetter (since format.inferCoverSubject was borrowed from
this config but it also did not state what the default value was)
* In 1/4, rename all instances of "expected" to "expect"
Denton Liu (3):
format-patch: change erroneous and condition
format-
Before, `thread` and `config_cover_letter` were defined as ints even
though they behaved as enums. Define actual enums and change these
variables to use these new definitions.
Signed-off-by: Denton Liu
---
Hi Junio, I double-checked and made sure that there is no arithmetic
done on the new enums
SHALLOW`
is a no-op.
In Python, `x and y` is equivalent to `y if x else x`[1]. Since this
seems to be a Python-ism that's mistakenly leaked into our code, convert
this to the equivalent C expression.
[1]: https://docs.python.org/3/reference/expressions.html#boolean-operations
Sign
Signed-off-by: Denton Liu
---
Documentation/git-format-patch.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-format-patch.txt
b/Documentation/git-format-patch.txt
index 86114e4c22..4c652c97f5 100644
--- a/Documentation/git-format-patch.txt
+++ b
since v1:
* Incorporate Eric's suggestions for cleanup in all patches
* Add patch 3/4 to make it clear what is the default value for
format.coverLetter (since format.inferCoverSubject was borrowed from
this config but it also did not state what the default value was)
* In 1/4, rena
Before, `thread` and `config_cover_letter` were defined as ints even
though they behaved as enums. Define actual enums and change these
variables to use these new definitions.
Signed-off-by: Denton Liu
---
builtin/log.c | 30 +-
1 file changed, 17 insertions(+), 13
SHALLOW`
is a no-op. Remove this erroneous and condition.
Signed-off-by: Denton Liu
---
builtin/log.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/log.c b/builtin/log.c
index 44b10b3415..7d658cecef 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -835,7 +835
ormat-patch to accept the `--cover-from-description` option and
corresponding `format.coverFromDescription` config, allowing users to
populate different parts of the cover letter (including the subject
now).
Signed-off-by: Denton Liu
---
Documentation/config/format.txt| 6 +
Documentation/git-f
On Fri, Oct 11, 2019 at 10:42:20AM +0900, Junio C Hamano wrote:
> Denton Liu writes:
>
> > static int calculate_width(const struct strbuf *row)
> > {
> > int in_termcode = 0;
> > int width = 0;
> > int i;
> >
Hi Dscho,
On Thu, Oct 10, 2019 at 11:07:35PM +0200, Johannes Schindelin wrote:
> Hi James,
>
> On Thu, 10 Oct 2019, James Coglan via GitGitGadget wrote:
>
> > From: James Coglan
> >
> > All the output functions in `graph.c` currently keep track of how many
> > printable chars they've written to
no output.
Signed-off-by: Denton Liu
---
I missed a step in 'dl/compat-cleanup'. This patch can be applied on the
tip of that branch.
compat/win32/pthread.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compat/win32/pthread.h b/compat/win32/pthread.h
index f1cfe73de
On Thu, Oct 10, 2019 at 11:16:24AM -0700, Denton Liu wrote:
> You can see the results of this by doing:
>
> $ git fetch https://github.com/Denton-L/git.git testing/graph-output
> $ git diff FETCH_HEAD^2 t/t4214-log-graph-octopus.sh
>
> and the resulting diff is ver
n).
>
> test_expect_success 'log --graph with normal octopus merge, no color' '
So, I decided to merge 'dl/octopus-graph-bug' with your branch and I
couldn't be happier! I had to make a couple of minor tweaks to the
existing test cases but most of them only involved flipping
`test_expect_failure` to `test_expect_success`.
You can see the results of this by doing:
$ git fetch https://github.com/Denton-L/git.git testing/graph-output
$ git diff FETCH_HEAD^2 t/t4214-log-graph-octopus.sh
and the resulting diff is very pleasing imo.
Junio, when you pick this topic up, that branch should contain the
correct conflict resolution if that can help you out in any way.
Anyway, thanks for the work, James!
I'll give this patch my:
Tested-by: Denton Liu
> --
> gitgitgadget
On Thu, Oct 10, 2019 at 01:49:03PM +0200, Johannes Schindelin wrote:
> Hi,
>
> On Wed, 9 Oct 2019, Jeff King wrote:
>
> > On Wed, Oct 09, 2019 at 11:19:47AM +0900, Junio C Hamano wrote:
> >
> > > > I wonder how we are supposed to use this trailer in the Git project,
> > > > in particular in combi
ff-by: Denton Liu
---
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index c99361e719..ae45bfc429 100644
--- a/Makefile
+++ b/Makefile
@@ -1890,6 +1890,7 @@ ifndef V
QUIET_SP = @echo ' ' SP $<;
QUIET_HDR
Currently, the tests for GIT_SKIP_TESTS do not cover the situation where
we skip an entire test suite. The tests also do not cover the situation
where we have GIT_SKIP_TESTS defined but the test suite does not match.
Add two test cases so we cover this blindspot.
Signed-off-by: Denton Liu
.
Helped-by: SZEDER Gábor
Signed-off-by: Denton Liu
---
Thanks for point out my mistake, Szeder. This patch can be applied to
the tip of 'dl/format-patch-doc-test-cleanup' and then we should base
Bert's changes on top of this branch.
t/t4014-format-patch.sh | 5 +++--
1
Welcome to the Git community, Toon!
Wow, I never realised that people actually read my braindump of issues
on GGG. Thanks for taking this on.
First some housekeeping, when formatting your patches, it's a good idea
to use `git format-patch --thread` so that your patches are grouped
together by thr
synopsis is not only annoying but
actively harmful, replace it with `[]` so users know to
explicitly look through the documentation for further information.
While we're at it, update the optional path notation so that it is more
modern.
Signed-off-by: Denton Liu
---
I initially wrote a pat
oid breaking Junio's workflow since he's probably one of the
most frequent user of `git am` in the world. ;)
Signed-off-by: Denton Liu
---
apply.c| 2 +-
t/t4012-diff-binary.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/apply.c b/apply.c
index
color" and
"log --graph with tricky octopus merge with colors" so that the "no
color" version appears first.
This patch is best viewed with `--color-moved`.
Signed-off-by: Denton Liu
---
t/t4214-log-graph-octopus.sh | 42 ++--
1 file
In the previous commit, we extended test_merge() so that it could
perform octopus merges. Now that the restriction is lifted, use
test_merge() to perform the octopus merge instead of manually
duplicating test_merge() functionality.
Signed-off-by: Denton Liu
---
t/t4214-log-graph-octopus.sh | 3
.
I tried my hand at fixing the bug but in the hour I spent going at it, I
couldn't fix the logic up. The buggy logic is in graph.c:
graph_draw_octopus_merge() in case anyone is interested.
Changes since v1:
* Add a few more test cases to demonstrate more failure (and passing)
conditions
In a future test case, we will be extending the commit graph. As a
result, explicitly list the tags that will generate the graph so that
when future additions are made, the current graph illustrations won't be
affected.
Signed-off-by: Denton Liu
---
t/t4214-log-graph-octopus.sh | 8 --
reaks existing operation.
Signed-off-by: Denton Liu
---
t/t4214-log-graph-octopus.sh | 282 ++-
1 file changed, 281 insertions(+), 1 deletion(-)
diff --git a/t/t4214-log-graph-octopus.sh b/t/t4214-log-graph-octopus.sh
index 097151da39..3ae8e51e50 100755
--- a/t/t421
Currently test_merge() only allows developers to merge in one branch.
However, this restriction is artificial and there is no reason why it
needs to be this way.
Extend test_merge() to allow the specification of multiple branches so
that octopus merges can be performed.
Signed-off-by: Denton Liu
Hi Bert,
> Subject: format-patch: document and exercise that -o does only create the
> trailing directory
s/does only create/only creates/ ?
Anyway, as a prepatory patch, I don't think that it's necessary. Maybe
it's just me but I assume that most tools create at most one directory
deep. Even m
1 - 100 of 683 matches
Mail list logo
