On Fri, Aug 19, 2016 at 5:02 PM, Stefan Beller wrote:
> On Fri, Aug 19, 2016 at 4:34 PM, Jacob Keller
> wrote:
>> - strbuf_git_path(buf, "%s/%s", "modules", path);
>> + /*
>> +* Lookup the submodule name from the config. If that fails
>> +
On Fri, Aug 19, 2016 at 4:46 PM, Stefan Beller wrote:
>>
>> * sb/submodule-clone-rr (2016-08-17) 8 commits
>>
>> I spotted a last-minute bug in v5, which is not a very good sign
>> (it shows that nobody is reviewing). Any more comments?
>
> nobody except you ;)
OK, it shows that nobody compete
```
% git stash -ku
error: unknown option for 'stash save': -ku
(...)
% git stash -k -u
Saved working directory and index state WIP on master: (...)
(...)
```
In other parts of git, clumping (as defined by [GNU Short Option Style
guide](https://www.gnu.org/software/tar/manual/html_node/Short-Optio
On Fri, Aug 19, 2016 at 4:34 PM, Jacob Keller wrote:
> From: Jacob Keller
>
> More suggestions from Junio and a few changes to support submodule name
> lookup. Hopefully we're getting close to the goal!
>
> interdiff between v8 and current:
> diff --git c/builtin/rev-list.c w/builtin/rev-list.c
>
>
> * sb/submodule-clone-rr (2016-08-17) 8 commits
> - clone: recursive and reference option triggers submodule alternates
> - clone: implement optional references
> - clone: clarify option_reference as required
> - clone: factor out checking for an alternate path
> - submodule--helper update-
From: Jacob Keller
Change the default behavior of git-format-patch to generate numbered
sequence of 0/1 and 1/1 when generating both a cover-letter and a single
patch. This standardizes the cover letter to have 0/N which helps
distinguish the cover letter from the patch itself. Since the behavior
From: Jacob Keller
A future patch is going to add a new submodule diff format which
displays an inline diff of the submodule changes. To make this easier,
and to ensure that both submodule diff formats use the same initial
header, factor out show_submodule_header() function which will print the
c
From: Jacob Keller
Teach git-diff and friends a new format for displaying the difference
of a submodule. The new format is an inline diff of the contents of the
submodule between the commit range of the update. This allows the user
to see the actual code change caused by a submodule update.
Add
From: Jacob Keller
Since we're going to be changing this function in a future patch, lets
go ahead and convert this to use object_id now.
Signed-off-by: Jacob Keller
---
diff.c | 2 +-
submodule.c | 16
submodule.h | 2 +-
3 files changed, 10 insertions(+), 10 deletions
From: Jacob Keller
Similar to is_null_oid(), and is_empty_blob_sha1() add an
empty_tree_oid along with helper function is_empty_tree_oid(). For
completeness, also add an "is_empty_tree_sha1()",
"is_empty_blob_sha1()", "is_empty_tree_oid()" and "is_empty_blob_oid()"
helpers.
To ensure we only get
From: Jacob Keller
A future patch will add a new format for displaying the difference of
a submodule. Make it easier by changing how we store the current
selected format. Replace the DIFF_OPT flag with an enumeration, as each
format will be mutually exclusive.
Signed-off-by: Jacob Keller
---
d
From: Jacob Keller
Currently, do_submodule_path will first try to locate the git directory
using read_gitfile on /.git. If this fails, it goes
ahead and assumes the path is actually the git directory. This is good
as it allows submodules which aren't stored in the superproject's .git
directory to
From: Junio C Hamano
"diff/log --stat" has a logic that determines the display columns
available for the diffstat part of the output and apportions it for
pathnames and diffstat graph automatically.
5e71a84a (Add output_prefix_length to diff_options, 2012-04-16)
added the output_prefix_length fi
From: Jacob Keller
Add an extension to git-diff and git-log (and any other graph-aware
displayable output) such that "--line-prefix=" will print the
additional line-prefix on every line of output.
To make this work, we have to fix a few bugs in the graph API that force
graph_show_commit_msg to b
From: Jacob Keller
More suggestions from Junio and a few changes to support submodule name
lookup. Hopefully we're getting close to the goal!
interdiff between v8 and current:
diff --git c/builtin/rev-list.c w/builtin/rev-list.c
index 21cde8dd6b31..8479f6ed28aa 100644
--- c/builtin/rev-list.c
++
On Fri, Aug 19, 2016 at 3:26 PM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>> Is there a way to do this lookup? I couldn't find it.
>
> Perhaps submodule_from_path(), that is used to implement "git
> submodule--helper name $path"?
Yep, thanks. I also added a test to show that the use of nam
A release candidate Git v2.10.0-rc1 is now available for testing
at the usual places. It is comprised of 611 non-merge commits
since v2.9.0, contributed by 68 people, 20 of which are new faces.
Relative to v2.10-0-rc0 (the preview), there is a last-minute merge
of Linus's "Let's show longer finge
Johannes Schindelin wrote:
> On Thu, 18 Aug 2016, Eric Wong wrote:
> > Johannes Schindelin wrote:
> >
> > > Old dogs claim the mail list-approach works for them. Nope. Doesn't.
> > > Else you would not have written all those custom scripts.
> >
> > git and cogito started as a bunch of custom scr
Stefan Beller wrote:
> Maybe we should invent a patch format that copes with broken whitespace?
No redundant new formats, please. MIME attachments are already
widely-supported and fine by me. But it's not my call for git.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the
Jeff King writes:
> For that matter, I'm not sure that:
>
> cat >a <<-\EOF &&
> aaa
> bbb
> ccc
> EOF
>
> cat >b <<-\EOF &&
> aaa
> 0bb
> ccc
> EOF
>
> dh_test a b <<\EOF
> aaa
> -${CW}b${CR}bb
> +${CW}0${CR}bb
> EOF
>
> isn't more readable, too. It's more lines, cer
Jacob Keller writes:
> Is there a way to do this lookup? I couldn't find it.
Perhaps submodule_from_path(), that is used to implement "git
submodule--helper name $path"?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More m
On Fri, Aug 19, 2016 at 2:52 PM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>> diff --git a/diff.h b/diff.h
>> index ea5aba668eaa..192c0eedd0ff 100644
>> --- a/diff.h
>> +++ b/diff.h
>> @@ -112,6 +112,7 @@ enum diff_words_type {
>> enum diff_submodule_format {
>> DIFF_SUBMODULE_SHORT =
Add test to explicitly check that 'git bisect reset' is working as
expected. This is already covered implicitly by the test suite.
Mentored-by: Lars Schneider
Mentored-by: Christian Couder
Signed-off-by: Pranit Bauva
---
I faced this problem while converting `bisect_clean_state` and the tests
On Fri, Aug 19, 2016 at 2:14 PM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> Jacob Keller writes:
>>
>>> Is there a reason for that? I've found that .field = value is safer
>>> because it ensures that you don't end up initializing the wrong
>>> values? Or is it a compatibility thing?
>>
On Fri, Aug 19, 2016 at 2:11 PM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>> submodule. I think we already have the complete path. Or is the name
>> *not* equivalent to the path?
>
> A submodule that is bound to top-level at "path" originally gets
> "path" as its name. If you move it elsew
Jacob Keller writes:
> diff --git a/diff.h b/diff.h
> index ea5aba668eaa..192c0eedd0ff 100644
> --- a/diff.h
> +++ b/diff.h
> @@ -112,6 +112,7 @@ enum diff_words_type {
> enum diff_submodule_format {
> DIFF_SUBMODULE_SHORT = 0,
> DIFF_SUBMODULE_LOG,
> + DIFF_SUBMODULE_INLINE_DIFF
git branch -vv will show "gone" next to a remote tracking branch if it
does not exist. for-each-ref is suitable for parsing but had no way of
showing this information.
This introduces "%(upstream:gone)" to display "gone" in the formatted
output if the ref does not exist or an empty string otherwis
Reimplement the `check_and_set_terms` shell function in C and add
`check-and-set-terms` subcommand to `git bisect--helper` to call it from
git-bisect.sh
Using `--check-and-set-terms` subcommand is a temporary measure to port
shell function in C so as to use the existing test suite. As more
functio
On Fri, Aug 19, 2016 at 09:19:44PM +, Eric Wong wrote:
> > I've rebased my changes. Unfortunately, having 3 commits made this somewhat
> > tedious. I also find it weird that my new patch set makes it difficult to
> > see
> > what changes I've made from my first set. What's the standard workfl
Brian Henderson wrote:
> On Wed, Aug 10, 2016 at 08:56:35AM +, Eric Wong wrote:
> > "local" is not a portable construct. It's common for
> > Debian/Ubuntu systems to use dash as /bin/sh instead of bash;
> > (dash is faster, and mostly sticks to POSIX)
> >
> > The "devscripts" package in Debi
Reimplement `bisect_clean_state` shell function in C and add a
`bisect-clean-state` subcommand to `git bisect--helper` to call it from
git-bisect.sh .
Using `--bisect-clean-state` subcommand is a measure to port shell
function to C so as to use the existing test suite. As more functions
are ported
Junio C Hamano writes:
> Jacob Keller writes:
>
>> Is there a reason for that? I've found that .field = value is safer
>> because it ensures that you don't end up initializing the wrong
>> values? Or is it a compatibility thing?
>
> Yes.
That was a bit too terse. The answers to all three quest
is_empty_file() can help to refactor a lot of code. This will be very
helpful in porting "git bisect" to C.
Suggested-by: Torsten Bögershausen
Mentored-by: Lars Schneider
Mentored-by: Christian Couder
Signed-off-by: Pranit Bauva
---
builtin/am.c | 20 ++--
cache.h | 3 ++
Jacob Keller writes:
> submodule. I think we already have the complete path. Or is the name
> *not* equivalent to the path?
A submodule that is bound to top-level at "path" originally gets
"path" as its name. If you move it elsewhere, you do not want it to
lose its identity (and its place in .g
Reimplement the `write_terms` shell function in C and add a `write-terms`
subcommand to `git bisect--helper` to call it from git-bisect.sh . Also
remove the subcommand `--check-term-format` as it can now be called from
inside the function write_terms() C implementation.
Also `|| exit` is added whe
Brian Henderson writes:
> +# dh_test is a test helper function which takes 1) some file data, 2) some
> +# change of the file data, creates a diff and commit of the changes and
> passes
> +# that through diff-highlight.
> +# The optional 3rd parameter is the expected output of diff-highlight min
On Fri, Aug 19, 2016 at 01:44:28PM -0700, Junio C Hamano wrote:
> Brian Henderson writes:
>
> > Junio, how does this look?
> > ...
> > +# dh_test is a test helper function which takes 1) some file data, 2) some
> > +# change of the file data, creates a diff and commit of the changes and
> > pas
On Fri, Aug 19, 2016 at 01:31:27PM -0700, Junio C Hamano wrote:
> Jacob Keller writes:
>
> > From: Jacob Keller
> >
> > Add an empty_tree_oid object which can be used in place of
> > EMPTY_TREE_SHA1_BIN_LITERAL for code which is being converted to struct
> > object_id.
>
> How widely do you en
Brian Henderson wrote:
> On Fri, Aug 19, 2016 at 11:10:55AM -0700, Junio C Hamano wrote:
> >
> > > +# vim: set noet
> >
> > We tend to avoid cluttering the source with editor specific insns
> > like this.
>
> oops.
>
> Anyone have any suggestions for project level vim settings?
vim defaults w
Reimplement `is_expected_rev` & `check_expected_revs` shell function in
C and add a `--check-expected-revs` subcommand to `git bisect--helper` to
call it from git-bisect.sh .
Using `--check-expected-revs` subcommand is a temporary measure to port
shell functions to C so as to use the existing test
Reimplement the `bisect_write` shell function in C and add a
`bisect-write` subcommand to `git bisect--helper` to call it from
git-bisect.sh
Using `--bisect-write` subcommand is a temporary measure to port shell
function in C so as to use the existing test suite. As more functions
are ported, this
Reimplement the `get_terms` and `bisect_terms` shell function in C and
add `bisect-terms` subcommand to `git bisect--helper` to call it from
git-bisect.sh .
Using `--bisect-terms` subcommand is a temporary measure to port shell
function in C so as to use the existing test suite. As more functions
Reimplement `bisect_next_check` shell function in C and add
`bisect-next-check` subcommand to `git bisect--helper` to call it from
git-bisect.sh .
Also reimplement `bisect_voc` shell function in C and call it from
`bisect_next_check` implementation in C.
Using `--bisect-next-check` is a temporary
On Fri, Aug 19, 2016 at 1:06 PM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>> diff --git a/path.c b/path.c
>> index 17551c483476..0cb30123e988 100644
>> --- a/path.c
>> +++ b/path.c
>> @@ -482,6 +482,11 @@ static void do_submodule_path(struct strbuf *buf, const
>> char *path,
>>
Jacob Keller writes:
> Is there a reason for that? I've found that .field = value is safer
> because it ensures that you don't end up initializing the wrong
> values? Or is it a compatibility thing?
Yes.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message t
`--next-all` is meant to be used as a subcommand to support multiple
"operation mode" though the current implementation does not contain any
other subcommand along side with `--next-all` but further commits will
include some more subcommands.
Helped-by: Johannes Schindelin
Mentored-by: Lars Schne
Reimplement `bisect_reset` shell function in C and add a `--bisect-reset`
subcommand to `git bisect--helper` to call it from git-bisect.sh .
Using `bisect_reset` subcommand is a temporary measure to port shell
functions to C so as to use the existing test suite. As more functions
are ported, this
Brian Henderson writes:
> Junio, how does this look?
> ...
> +# dh_test is a test helper function which takes 1) some file data, 2) some
> +# change of the file data, creates a diff and commit of the changes and
> passes
> +# that through diff-highlight.
> +# The optional 3rd parameter is the ex
Reimplement the `bisect_start` shell function partially in C and add
`bisect-start` subcommand to `git bisect--helper` to call it from
git-bisect.sh .
The last part is not converted because it calls another shell function.
`bisect_start` shell function will be completed after the `bisect_next`
she
Reimplement the `check_term_format` shell function in C and add
a `--check-term-format` subcommand to `git bisect--helper` to call it
from git-bisect.sh
Using `--check-term-format` subcommand is a temporary measure to port
shell function to C so as to use the existing test suite. As more
functions
On Fri, Aug 19, 2016 at 1:31 PM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>> From: Jacob Keller
>>
>> Add an empty_tree_oid object which can be used in place of
>> EMPTY_TREE_SHA1_BIN_LITERAL for code which is being converted to struct
>> object_id.
>
> How widely do you envision the users
On Fri, Aug 19, 2016 at 1:24 PM, Junio C Hamano wrote:
> And probably merge_bases also leaks here.
>
> It is not cheap to compute merge bases, but show_submodule_summary()
> makes two calls to get_merge_bases(), one in show_submodule_header()
> and then another inside prepare_submodule_summary() t
Jacob Keller writes:
> From: Jacob Keller
>
> Add an empty_tree_oid object which can be used in place of
> EMPTY_TREE_SHA1_BIN_LITERAL for code which is being converted to struct
> object_id.
How widely do you envision the users of this symbol would be spread
across the entire codebase? I am d
Jacob Keller writes:
> @@ -290,12 +289,6 @@ static int prepare_submodule_summary(struct rev_info
> *rev, const char *path,
> add_pending_object(rev, &left->object, path);
> add_pending_object(rev, &right->object, path);
> merge_bases = get_merge_bases(left, right);
> - if (
Junio, how does this look?
Signed-off-by: Brian Henderson
---
contrib/diff-highlight/Makefile | 5 +
contrib/diff-highlight/t/Makefile| 22
contrib/diff-highlight/t/t9400-diff-highlight.sh | 122 +++
3 files changed, 149 insertions(+)
Jacob Keller writes:
> From: Jacob Keller
>
> Since we're going to be changing this function in a future patch, lets
> go ahead and convert this to use object_id now.
>
> Signed-off-by: Jacob Keller
> ---
Sounds good. Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git"
Jacob Keller writes:
> diff --git a/path.c b/path.c
> index 17551c483476..0cb30123e988 100644
> --- a/path.c
> +++ b/path.c
> @@ -482,6 +482,11 @@ static void do_submodule_path(struct strbuf *buf, const
> char *path,
> strbuf_reset(buf);
> strbuf_addstr(buf, git_dir);
Jacob Keller writes:
> +enum diff_submodule_format {
> + DIFF_SUBMODULE_SHORT = 0,
> + DIFF_SUBMODULE_LOG,
> +};
Unlike definition of an array elements, enum {} did not allow
trailing comma until recent versions of C, and we avoid it.
No need to resend only to fix this, as I have locall
On Fri, Aug 19, 2016 at 11:10:55AM -0700, Junio C Hamano wrote:
>
> > +# vim: set noet
>
> We tend to avoid cluttering the source with editor specific insns
> like this.
oops.
Anyone have any suggestions for project level vim settings?
--
To unsubscribe from this list: send the line "unsubscrib
On Aug 19 2016, "Philip Oakley" wrote:
> On Thu, Aug 18, 2016 at 04:44:21PM +0200, Olaf Hering wrote:
>
>> This command used to create a diff which can be consumed by patch. But
>> at least with 2.9.3 it just gives a rename output:
>>
>> git format-patch \
>> --no-signature \
>>
Brian Henderson writes:
> diff --git a/contrib/diff-highlight/t/t9400-diff-highlight.sh
> b/contrib/diff-highlight/t/t9400-diff-highlight.sh
> index 3b3c831..b88174e 100755
> --- a/contrib/diff-highlight/t/t9400-diff-highlight.sh
> +++ b/contrib/diff-highlight/t/t9400-diff-highlight.sh
> @@ -185
Brian Henderson writes:
> Signed-off-by: Brian Henderson
> ---
> contrib/diff-highlight/t/t9400-diff-highlight.sh | 54
>
> 1 file changed, 54 insertions(+)
>
> diff --git a/contrib/diff-highlight/t/t9400-diff-highlight.sh
> b/contrib/diff-highlight/t/t9400-diff-highl
> +# dh_test is a test helper function which takes 1) some file data, 2) some
> +# change of the file data, creates a diff and commit of the changes and
> passes
> +# that through diff-highlight. The optional 3rd parameter is the expected
> +# output of diff-highlight minus the diff/commit header
On Thu, Aug 18, 2016 at 04:44:21PM +0200, Olaf Hering wrote:
This command used to create a diff which can be consumed by patch. But
at least with 2.9.3 it just gives a rename output:
git format-patch \
--no-signature \
--stdout \
--break-rewrites \
--keep-subjec
Signed-off-by: Brian Henderson
---
contrib/diff-highlight/diff-highlight| 19 +--
contrib/diff-highlight/t/t9400-diff-highlight.sh | 2 +-
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/contrib/diff-highlight/diff-highlight
b/contrib/diff-highlight/d
Signed-off-by: Brian Henderson
---
contrib/diff-highlight/t/t9400-diff-highlight.sh | 54
1 file changed, 54 insertions(+)
diff --git a/contrib/diff-highlight/t/t9400-diff-highlight.sh
b/contrib/diff-highlight/t/t9400-diff-highlight.sh
index 6b8a461..3b3c831 100755
---
I cleaned up the graph test, hopefully it's better.
Brian Henderson (3):
diff-highlight: add some tests.
diff-highlight: add failing test for handling --graph output.
diff-highlight: add support for --graph output.
contrib/diff-highlight/Makefile | 5 +
contrib/diff-high
Signed-off-by: Brian Henderson
---
contrib/diff-highlight/Makefile | 5 +
contrib/diff-highlight/t/Makefile| 22
contrib/diff-highlight/t/t9400-diff-highlight.sh | 150 +++
3 files changed, 177 insertions(+)
create mode 100644 contrib/
It was not my intend to start this discussion again with my initial email.
I rather wanted to point out how I make progress in doing my own
tooling.
I mean if email works well for Junio (both as a maintainer as
well as a contributor) and Jeff as a contributor, then I can adapt
my workflow to that,
tbo...@web.de writes:
> From: Torsten Bögershausen
>
> Here comes the promised cleanup of t0027:
> - The wording NNO is removed and replaced by CRI
> - No code changes
> - Needs to go on top of next or pu or tb/t0027-raciness-fix
> Torsten Bögershausen (1):
> t0027: Rename NotNormalized (NNO) i
Jeff King writes:
>> Sorry, Torsten, this is not my doing. So I cannot explain why it is not an
>> enum.
>>
>> I *guess* the rationale for 'c' being the cmdmode of --textconv is "c for
>> convert". That is why I chose "w as in worktree" as new cmdmode.
>
> I think it started as a 'char' because
Johannes Schindelin writes:
>> I think I saw some code to ensure "when giving this option you need
>> that option in effect, too"; they should be tested here, too, no?
>
> No, I would rather not test for that. These conditionals are purely for
> any user's convenience, in case they specify an opt
Johannes Schindelin writes:
>> Does it make sense to be more specific here:
>> The order of conversion is
>> - ident
>> - CRLF
>> - smudge
>
> I do not think it makes sense to complexify the documentation in that
> manner.
Right.
--
To unsubscribe from this list: send the line "unsubscribe git"
Johannes Schindelin writes:
> Actually, I find it much harder to debug these "the output must match
> these precise bytes, else we fail" type of test cases. Instead, I describe
> in a natural way what is expected:
>
> ! has_cr actual
>
> Now, when the test fails, whoever is that poor soul t
Eric Wong writes:
> I'd be more comfortable keeping the EINVAL check that got
> snipped in your reply. O_CLOEXEC can be defined to non-zero in
> new userspace headers, but an older kernel chokes on it with
> EINVAL.
Good point. Thanks.
--
To unsubscribe from this list: send the line "unsubscri
Johannes Schindelin writes:
> - configure help.format = html (for "man", the current code would always
> add $(prefix)/share/man to the MANPATH when testing, not what we want,
> and hacking this code *just* for testing is both ugly and unnecessary).
A very constructive suggestion to show a g
Hi Eric,
On Thu, 18 Aug 2016, Eric Wong wrote:
> Johannes Schindelin wrote:
>
> > Old dogs claim the mail list-approach works for them. Nope. Doesn't.
> > Else you would not have written all those custom scripts.
>
> git and cogito started as a bunch of custom scripts, too.
The difference is t
Hi,
On Thu, 18 Aug 2016, Junio C Hamano wrote:
> Eric Wong writes:
>
> > unsubscribe: meta+unsubscr...@public-inbox.org
>
> Did you mean this, really?
FWIW I do not see this line in my original mail from Eric.
Ciao,
Dscho
--
To unsubscribe from this list: send the line "unsubscribe git" in
t
On Fri, Aug 19, 2016 at 10:51:23AM -0400, Jeff King wrote:
> On Fri, Aug 19, 2016 at 07:42:35AM -0700, Brian Henderson wrote:
>
> > > > +# PERL is required, but assumed to be present, although not
> > > > necessarily modern
> > > > +# some tests require 5.8
> > > > +test_expect_success PERL 'name
On Fri, Aug 19, 2016 at 02:25:51PM +0200, Johannes Schindelin wrote:
> > On Thu, Aug 18, 2016 at 02:46:28PM +0200, Johannes Schindelin wrote:
> > > diff --git a/builtin/cat-file.c b/builtin/cat-file.c
> > > index 5ff58b3..5f91cf4 100644
> > > --- a/builtin/cat-file.c
> > > +++ b/builtin/cat-file.c
On Thu, Aug 18, 2016 at 02:42:34PM +0200, Johannes Schindelin wrote:
> BTW I take this thread as yet another proof that people are unhappy with
> mail list-based review: if you have to build *that much* tooling around it
> (and Peff & Junio certainly have a megaton of advanced and sophisticated
>
Hi Torsten,
On Fri, 19 Aug 2016, Torsten Bögershausen wrote:
> On Thu, Aug 18, 2016 at 02:46:17PM +0200, Johannes Schindelin wrote:
>
> > +--filters::
> > + Show the content as transformed by the filters configured in
>
> Minor comment:
> s/transformed/converted/ ?
Sure.
> Does it make sense
On Fri, Aug 19, 2016 at 07:42:35AM -0700, Brian Henderson wrote:
> > > +# PERL is required, but assumed to be present, although not necessarily
> > > modern
> > > +# some tests require 5.8
> > > +test_expect_success PERL 'name' 'true'
> >
> > If the platform lacks PERL prerequisite, this will si
Hi Junio,
On Thu, 18 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > There are circumstances when it is relatively easy to figure out the
> > object name for a given path, but not the revision. For example, when
>
> revision of the containing tree, I presume?
name of conta
On Fri, Aug 19, 2016 at 02:59:32PM +0200, Johannes Schindelin wrote:
> > The only thing that somewhat is worrysome is what would happen to
> > %(rest).
>
> What would happen is that it would print out the path, as it is exactly
> that "rest" field that is used in the implementation, piggybacking
On Wed, Aug 17, 2016 at 08:31:24AM -0700, Brian Henderson wrote:
> contrib/diff-highlight/diff-highlight | 16 ++--
> 1 file changed, 10 insertions(+), 6 deletions(-)
Junio already commented on the tests, and I think everything he said in
his review is sensible.
As for the code itse
On Wed, Aug 17, 2016 at 12:09:25PM -0700, Junio C Hamano wrote:
> Brian Henderson writes:
>
> > +
> > +# PERL is required, but assumed to be present, although not necessarily
> > modern
> > +# some tests require 5.8
> > +test_expect_success PERL 'name' 'true'
>
> If the platform lacks PERL p
On Sat, Aug 13, 2016 at 03:40:59PM +0700, Duy Nguyen wrote:
> Ping..
There was some discussion after v4. I think the open issues are:
- the commit message is rather terse (it should describe motivation,
and can refer to the docs for the "how")
- the syntax might be more clear as:
On Tue, Aug 16, 2016 at 03:24:14PM -0700, Josh Triplett wrote:
> > But if we had a real full-duplex connection over https, I think there
> > would be no reason for git:// to continue existing (we'd probably keep
> > ssh as it's a useful protocol for authentication, though).
>
> Agreed.
>
> Using
On Fri, Aug 19, 2016 at 03:09:19PM +0200, Johannes Schindelin wrote:
> > The object name can have spaces in it, too. E.g.:
> >
> > HEAD:path with spaces
> >
> > or even:
> >
> > :/grep for this
> >
> > (as was pointed out to me when I tried to turn on %(rest) handling by
> > default, long
Hi Junio,
On Thu, 18 Aug 2016, Junio C Hamano wrote:
> Jeff King writes:
>
> > On Thu, Aug 18, 2016 at 02:46:28PM +0200, Johannes Schindelin wrote:
> >
> >> With this patch, --batch can be combined with --textconv or --filters.
> >> For this to work, the input needs to have the form
> >>
> >>
Hi Peff,
On Thu, 18 Aug 2016, Jeff King wrote:
> On Thu, Aug 18, 2016 at 02:46:28PM +0200, Johannes Schindelin wrote:
>
> > With this patch, --batch can be combined with --textconv or --filters.
> > For this to work, the input needs to have the form
> >
> >
> >
> > so that the filters can
Hi Junio,
On Thu, 18 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > With this patch, --batch can be combined with --textconv or --filters.
> > For this to work, the input needs to have the form
> >
> >
> >
> > so that the filters can be chosen appropriately.
> > --bat
Hi Junio,
On Thu, 18 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > As suggested by its name, the --filters option applies the filters
> > that are currently configured for the specified path.
> >
> > [...]
>
> I think you can lose the last paragraph and enrich the first o
Hi Torsten,
On Thu, 18 Aug 2016, Torsten Bögershausen wrote:
> On Thu, Aug 18, 2016 at 02:46:17PM +0200, Johannes Schindelin wrote:
> > As suggested by its name, the --filters option applies the filters
>
> []
> > diff --git a/t/t8010-cat-file-filters.sh b/t/t8010-cat-file-filters.sh
>
> Does it
Hi Torsten,
On Thu, 18 Aug 2016, Torsten Bögershausen wrote:
> On Thu, Aug 18, 2016 at 02:46:28PM +0200, Johannes Schindelin wrote:
> > diff --git a/builtin/cat-file.c b/builtin/cat-file.c
> > index 5ff58b3..5f91cf4 100644
> > --- a/builtin/cat-file.c
> > +++ b/builtin/cat-file.c
> > @@ -17,6 +17
From: Torsten Bögershausen
Here comes the promised cleanup of t0027:
- The wording NNO is removed and replaced by CRI
- No code changes
- Needs to go on top of next or pu or tb/t0027-raciness-fix
Torsten Bögershausen (1):
t0027: Rename NotNormalized (NNO) into CRLF in index
t/t0027-auto-crlf.
From: Torsten Bögershausen
Originally NNO stands for content, that had been commited
"Not NOrmalized", in other words files with CRLF in the index.
Make more clear what should be tested:
- commit a file with CRLF into the index
- Change the content in the working tree
- Run "git add" and check f
[]
On Thu, Aug 18, 2016 at 02:46:17PM +0200, Johannes Schindelin wrote:
> diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
> index 071029b..7d48735 100644
> --- a/Documentation/git-cat-file.txt
> +++ b/Documentation/git-cat-file.txt
> @@ -9,15 +9,15 @@ git-cat-file - Pr
Since 4804aab (help (Windows): Display HTML in default browser using
Windows' shell API, 2008-07-13), Git for Windows used to call
`ShellExecute()` to launch the default Windows handler for `.html`
files.
The idea was to avoid going through a shell script, for performance
reasons.
However, this c
1 - 100 of 103 matches
Mail list logo