Hi Todd,
On Mon, 18 Jun 2018, Todd Zullinger wrote:
> When testing a reworded root commit, ensure that the squash-onto commit
> which is created and amended is still the root commit.
>
> Suggested-by: Phillip Wood
> Helped-by: Johannes Schindelin
> Signed-off-by: Todd Zullinger
Trusting that
Hi Stefan,
On Mon, 18 Jun 2018, Stefan Beller wrote:
> On Mon, Jun 18, 2018 at 6:19 AM Alban Gruin wrote:
> >
> > +int setup_reflog_action(struct replay_opts *opts, const char *commit,
> > + int verbose)
> > +{
> > + const char *action;
> > +
> > + if (commit &&
Hi, Junio
Could you help review this patch?
Thanks,
Xiaolong
On 06/04, Xiaolong Ye wrote:
>When users specify the commit range with 'Z..C' pattern for format-patch, all
>the parents of Z (including Z) would be marked as UNINTERESTING which would
>prevent revision walk in prepare_bases from getti
Hi Junio,
The following changes since commit fd8cb379022fc6f5c6d71d12d10c9388b9f5841c:
l10n: zh_CN: for git v2.18.0 l10n round 1 to 3 (2018-06-18 00:31:45 +0800)
are available in the Git repository at:
git://github.com/git-l10n/git-po tags/l10n-2.18.0-rnd3.1
for you to fetch changes up to
Hi,
Ian Jackson wrote[1]:
> git-rebase leaves entries like this in the reflog:
>
> c15f4d5391 HEAD@{33}: rebase: checkout
> c15f4d5391ff07a718431aca68a73e672fe8870e
>
> It would be nice if there were an option to control this message.
> Particularly, when another tool invokes git-rebase, the o
Signed-off-by: Stefan Beller
---
builtin/submodule--helper.c | 24
git-submodule.sh| 5 +
2 files changed, 29 insertions(+)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index bd250ca2164..dffc55ed8ee 100644
--- a/builtin/submodu
v2:
* fixed quoting issues for white space'd names/paths
v1:
The first patch teaches checkout/reset (with --recurse-submodules) to unset
the core.worktree config when the new state of the superprojects working tree
doesn't contain the submodules working tree.
The last patch is teaching "git submo
When a submodule is deinit'd, the working tree is gone, so the setting of
core.worktree is bogus. Unset it.
Signed-off-by: Stefan Beller
---
builtin/submodule--helper.c | 2 ++
t/lib-submodule-update.sh | 2 +-
t/t7400-submodule-basic.sh | 5 +
3 files changed, 8 insertions(+), 1 deletion
When a submodules work tree is removed, we should unset its core.worktree
setting as the worktree is no longer present. This is not just in line
with the conceptual view of submodules, but it fixes an inconvenience
for looking at submodules that are not checked out:
git clone --recurse-submodu
Take advantage of 'git-grep(1)''s new option, '--column' in order to
teach Peff's 'git-jump' script how to jump to the correct column for any
given match.
'git-grep(1)''s output is in the correct format for Vim's jump list, so
no additional cleanup is necessary.
Signed-off-by: Taylor Blau
---
c
To prepare for 'git grep' learning '--column', teach grep.c's
show_line() how to show the column of the first match on non-context
lines.
Signed-off-by: Taylor Blau
---
grep.c | 30 +-
1 file changed, 25 insertions(+), 5 deletions(-)
diff --git a/grep.c b/grep.c
inde
To support git-grep(1)'s new option, '--column', document and teach
grep.c how to interpret relevant configuration options, similar to those
associated with '--line-number'.
Signed-off-by: Taylor Blau
---
Documentation/config.txt | 5 +
Documentation/git-grep.txt | 3 +++
grep.c
When calling match_line(), callers presently cannot determine the
relative offset of the match because match_line() discards the
'regmatch_t' that contains this information.
Instead, teach match_line() to take in two 'ssize_t's. Fill the first
with the offset of the match produced by the given exp
lineNumber has casing that is inconsistent with surrounding options,
like color.grep.matchContext, and color.grep.matchSelected. Re-case this
documentation in order to be consistent with the text around it, and to
ensure that new entries are consistent, too.
Signed-off-by: Taylor Blau
---
Docume
To support showing the matched column when calling 'git-grep(1)', teach
'grep_opt' the normal set of options to configure the default behavior
and colorization of this feature.
Signed-off-by: Taylor Blau
---
grep.c | 3 +++
grep.h | 2 ++
2 files changed, 5 insertions(+)
diff --git a/grep.c b/g
Teach 'git-grep(1)' a new option, '--column', to show the column
number of the first match on a non-context line. This makes it possible
to teach 'contrib/git-jump/git-jump' how to seek to the first matching
position of a grep match in your editor, and allows similar additional
scripting capabiliti
Hi,
Attached is a ``fresh start'' of my series to teach 'git grep --column'.
Since the last time I sent this, much has changed, notably the semantics
for deciding which column is the first when given (1) extended
expressions and (2) --invert.
Both (1) and (2) are described in-depth in patch 2/7,
When running t7400 in a shell you observe more output than expected:
...
ok 8 - setup - hide init subdirectory
ok 9 - setup - repository to add submodules to
ok 10 - submodule add
[master (root-commit) d79ce16] one
Author: A U Thor
1 file changed, 1 insertion(+)
> Jonathan Tan writes:
>
> >> Wouldn't that allow us not having to advertise the whole tags
> >> namespace only to implement the tag following?
> >
> > Yes, it would, but as far as I can tell, it would add an extra burden on
> > the server to walk all refs requested in the ls-refs call (in order
Hi Jacob,
> * sb/diff-color-move-more (2018-05-21) 8 commits
> (merged to 'next' on 2018-05-24 at 45f3fb7975)
> + diff: color-moved white space handling options imply color-moved
> + diff.c: add --color-moved-ignore-space-delta option
> + diff.c: decouple white space treatment from move detec
When testing a reworded root commit, ensure that the squash-onto commit
which is created and amended is still the root commit.
Suggested-by: Phillip Wood
Helped-by: Johannes Schindelin
Signed-off-by: Todd Zullinger
---
Hi Johannes,
Johannes Schindelin wrote:
>On Mon, 18 Jun 2018, Todd Zullinge
On Mon, Jun 18, 2018 at 6:19 AM Alban Gruin wrote:
>
> This rewrites setup_reflog_action() from shell to C.
>
> A new command is added to rebase--helper.c, “setup-reflog”, as such as a
> new flag, “verbose”, to silence the output of the checkout operation
> called by setup_reflog_action().
>
> The
Hi Todd,
On Mon, 18 Jun 2018, Todd Zullinger wrote:
> Phillip Wood wrote:
> > On 15/06/18 05:31, Johannes Schindelin via GitGitGadget wrote:
> >>
> >> From: Todd Zullinger
> >>
> >> +test_expect_failure 'rebase -i --root reword root commit' '
> >> + test_when_finished "test_might_fail git re
Hi Junio,
Junio C Hamano wrote:
> * tz/cred-netrc-cleanup (2018-06-18) 3 commits
> - git-credential-netrc: fix exit status when tests fail
> - git-credential-netrc: use in-tree Git.pm for tests
> - git-credential-netrc: minor whitespace cleanup in test script
>
> Build and test procedure for
Hi Phillip,
On Mon, 18 Jun 2018, Phillip Wood wrote:
> On 17/06/18 20:28, Johannes Schindelin wrote:
> >
> > On Sun, 17 Jun 2018, Phillip Wood wrote:
> >
> >> On 17/06/18 06:37, Elijah Newren wrote:
> >>> Ever since commit 18633e1a22 ("rebase -i: use the rebase--helper
> >>> builtin", 2017-02-0
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
As -rc2 has slipped by a few days,
Jonathan Tan writes:
>> Wouldn't that allow us not having to advertise the whole tags
>> namespace only to implement the tag following?
>
> Yes, it would, but as far as I can tell, it would add an extra burden on
> the server to walk all refs requested in the ls-refs call (in order to
> determine
On Mon, Jun 18, 2018 at 08:53:27AM -0700, Junio C Hamano wrote:
> > Yeah, that will work for some cases. A few places it might not:
> >
> > - some people may want to provide this only in response to a 401
> >
> > - some tokens may need to be refreshed, which would require interacting
> >with
> Jonathan Tan writes:
>
> > When performing tag following, in addition to using the server's
> > "include-tag" capability to send tag objects (and emulating it if the
> > server does not support that capability), "git fetch" relies upon the
> > presence of refs/tags/* entries in the initial ref
Jonathan Tan writes:
> When performing tag following, in addition to using the server's
> "include-tag" capability to send tag objects (and emulating it if the
> server does not support that capability), "git fetch" relies upon the
> presence of refs/tags/* entries in the initial ref advertisemen
On 6/18/2018 3:55 PM, Stefan Beller wrote:
But as this is plumbing and users should not need to worry about it
this is optional, I would think.
The design document is also in 'Documentation/technical' instead of just
'Documentation/'. Do we have a pattern of linking to the technical
documents?
> > But as this is plumbing and users should not need to worry about it
> > this is optional, I would think.
>
> The design document is also in 'Documentation/technical' instead of just
> 'Documentation/'. Do we have a pattern of linking to the technical
> documents?
Apparently we do (and I was no
On 06/18, Jonathan Tan wrote:
>
> This would cause different behavior. For example, if I run "git fetch
> refs/heads/master refs/tags/foo", I would expect tag following to work
> even if the tag's name does not start with refs/tags/foo.
I understand that some people *may* want tag following, but
> okay. Thinking long term, we may want to introduce a capability that
> can filter the tag space, e.g. "want-refs-since refs/tags/*"
> as a client directive as then the client only asks for new (newly
> created/appearing) tags instead of all tags.
I don't think refs normally have a created/modif
> >> + (C + 1) * 12 bytes providing the chunk offsets:
> >> + First 4 bytes describe chunk id. Value 0 is a terminating
> >> label.
> >> + Other 8 bytes provide offset in current file for chunk to
> >> start.
> >> + (Chunks are provided in file-order, so you ca
On 6/11/2018 5:02 PM, Stefan Beller wrote:
Hi Derrick,
On Thu, Jun 7, 2018 at 7:03 AM Derrick Stolee wrote:
This new 'git midx' builtin will be the plumbing access for writing,
reading, and checking multi-pack-index (MIDX) files. The initial
implementation is a no-op.
Let's talk about the name
On Mon, Jun 18, 2018 at 12:15 PM Jonathan Tan wrote:
>
> On Mon, Jun 18, 2018 at 11:30 AM, Stefan Beller wrote:
> >> +test_expect_success 'fetch supports various ways of have lines' '
> >> + rm -rf server client trace &&
> >
> > Can we move these deletions to test_when_finished of the previ
Todd Zullinger writes:
>> Offhand it is not clear from the proposed log message where the
>> original breakage happened, but if this is to fix a regression
>> between v2.17.0 and v2.18.0, then let's have it. As -rc2 slipped
>> for a few days, it is reasonable to delay the final by a couple of
>>
On 6/7/2018 1:20 PM, Duy Nguyen wrote:
On Thu, Jun 7, 2018 at 4:03 PM, Derrick Stolee wrote:
diff --git a/Documentation/git-midx.txt b/Documentation/git-midx.txt
new file mode 100644
index 00..2bd886f1a2
--- /dev/null
+++ b/Documentation/git-midx.txt
@@ -0,0 +1,29 @@
+git-midx(1)
+=
On Tue, Jun 5, 2018 at 2:41 PM Jonathan Tan wrote:
>
> When performing tag following, in addition to using the server's
> "include-tag" capability to send tag objects (and emulating it if the
> server does not support that capability), "git fetch" relies upon the
> presence of refs/tags/* entries
On Mon, Jun 18, 2018 at 11:30 AM, Stefan Beller wrote:
>> +test_expect_success 'fetch supports various ways of have lines' '
>> + rm -rf server client trace &&
>
> Can we move these deletions to test_when_finished of the previous(?) test
> as well as have them here in a test_when_finished li
On 6/11/2018 3:19 PM, Stefan Beller wrote:
Hi Derrick,
On Thu, Jun 7, 2018 at 7:03 AM Derrick Stolee wrote:
The multi-pack-index (MIDX) feature generalizes the existing pack-
index (IDX) feature by indexing objects across multiple pack-files.
Describe the basic file format, using a 12-byte hea
On 06/16, Nguyễn Thái Ngọc Duy wrote:
> From now on, by default index compat macros are off because they could
> hide the_index dependency. Only those in builtin can use it (and even
> so should be avoided if possible).
This is awesome! Now there aren't any compat macros left in the lib code
and t
Hello!
On 18.06.2018 20:34, Alban Gruin wrote:
Hi,
I published a new blog post here:
https://blog.pa1ch.fr/posts/2018/06/18/en/gsoc2018-week-7.html
It’s shorter than the last one, but feel free to tell me what you think
about it! :)
Cheers,
Alban
Good job! My blog is also up:
https:/
On 6/11/2018 3:04 PM, Stefan Beller wrote:
On Thu, Jun 7, 2018 at 7:03 AM Derrick Stolee wrote:
Signed-off-by: Derrick Stolee
---
Documentation/technical/midx.txt | 109 +++
1 file changed, 109 insertions(+)
create mode 100644 Documentation/technical/midx.txt
On 06/17, Duy Nguyen wrote:
> On Sun, Jun 17, 2018 at 9:02 AM Elijah Newren wrote:
> >
> > On Fri, Jun 15, 2018 at 10:41 PM, Nguyễn Thái Ngọc Duy
> > wrote:
> > > This is the beginning of the end of the_index. The problem with
> > > the_index is it lets library code anywhere access it freely. Thi
On Tue, Jun 5, 2018 at 2:40 PM Jonathan Tan wrote:
>
> Extend the protocol v2 tests to also test fetches with multiple refspecs
> specified. This also covers the previously uncovered cases of fetching
> with prefix matching and fetching by SHA-1.
>
> Signed-off-by: Jonathan Tan
> ---
> t/t5702-p
On 06/18, Duy Nguyen wrote:
> On Mon, Jun 18, 2018 at 1:23 PM Heiko Voigt wrote:
> >
> > Hi,
> >
> > I just discovered that when you have a slash at the end of a nested
> > repository, the files contained in the repository get added instead of
> > the gitlink.
> >
> > I found this when I was addin
On 06/15, Junio C Hamano wrote:
> Brandon Williams writes:
>
> > Changes in v2:
> > * issuing a want-ref line to a ref which doesn't exist is just ignored.
> > * fixed some typos
>
> Do I lock some (logical) prerequisite changes? On 2.18-rc2 they
> apply cleanly but the series fails its own te
On Sat, Jun 16, 2018 at 1:33 PM SZEDER Gábor wrote:
>
> Three tests in 't7406-submodule-update' contain broken &&-chains, but
> since they are all in subshells, chain-lint couldn't notice them.
>
> Signed-off-by: SZEDER Gábor
This looks good to me;
Thanks for spotting and fixing it,
Stefan
On Sun, Jun 17, 2018 at 8:41 PM Shriramana Sharma wrote:
> Do I need to execute any `git submodule` commands separately even if I
> do `git pull --recurse-submodules`?
Ideally you don't need "git submodule" commands any more, the rest of git
is slowly converging to have builtin submodule functio
Hi,
I published a new blog post here:
https://blog.pa1ch.fr/posts/2018/06/18/en/gsoc2018-week-7.html
It’s shorter than the last one, but feel free to tell me what you think
about it! :)
Cheers,
Alban
Hi Christian,
Le 18/06/2018 à 18:26, Christian Couder a écrit :
> Hi Alban,
>
> On Mon, Jun 18, 2018 at 3:18 PM, Alban Gruin wrote:
>> This adds a new function, run_command_silent_if_successful(),
>
> He re the function is called run_command_silent_if_successful()...
>
>> to
>> redirect the st
Hi Phillip,
Le 18/06/2018 à 17:34, Phillip Wood a écrit :
> On 18/06/18 14:18, Alban Gruin wrote:
>> This rewrites setup_reflog_action() from shell to C.
>>
>> A new command is added to rebase--helper.c, “setup-reflog”, as such as a
>> new flag, “verbose”, to silence the output of the checkout ope
Hi Phillip,
Le 18/06/2018 à 18:09, Phillip Wood a écrit :
>> + if (get_oid(orig_head, &oid))
>> + die(_("%s: not a valid OID"), orig_head);
>
> If this code is going to live long-term in sequencer.c then it would be
> better not to die, but return an error instead as it's part of libgit
Hi Phillip,
Phillip Wood wrote:
> On 15/06/18 05:31, Johannes Schindelin via GitGitGadget wrote:
>>
>> From: Todd Zullinger
>>
>> +test_expect_failure 'rebase -i --root reword root commit' '
>> +test_when_finished "test_might_fail git rebase --abort" &&
>> +git checkout -b reword-root-
Hi Phillip,
Le 18/06/2018 à 17:26, Phillip Wood a écrit :
> Hi Alban
>
> On 18/06/18 14:18, Alban Gruin wrote:
>> This adds a new function, run_command_silent_if_successful(), to
>> redirect the stdout and stderr of a command to a strbuf, and then to run
>> that command. This strbuf is printed on
Hi,
Junio C Hamano wrote:
> Todd Zullinger writes:
>
>> Hi Johannes,
>>
>> Johannes Schindelin via GitGitGadget wrote:
>>> From: GitGitGadget
>>>
>>> Todd Zullinger reported this bug in
>>> https://public-inbox.org/git/20180615043111.gs3...@zaya.teonanacatl.net/:
>>> when calling git rebase --
Hi Alban,
On Mon, Jun 18, 2018 at 3:18 PM, Alban Gruin wrote:
> This adds a new function, run_command_silent_if_successful(),
He re the function is called run_command_silent_if_successful()...
> to
> redirect the stdout and stderr of a command to a strbuf, and then to run
> that command. This s
Todd Zullinger writes:
> Hi Johannes,
>
> Johannes Schindelin via GitGitGadget wrote:
>> From: GitGitGadget
>>
>> Todd Zullinger reported this bug in
>> https://public-inbox.org/git/20180615043111.gs3...@zaya.teonanacatl.net/:
>> when calling git rebase --root and trying to reword the
>> root c
Eric Sunshine writes:
> On Sun, Jun 17, 2018 at 1:32 PM Kaartic Sivaraam
> wrote:
>> On Friday 15 June 2018 01:13 PM, Eric Sunshine wrote:
>> > On Fri, Jun 15, 2018 at 2:58 AM Simon Ruderich wrote:
>> >> Should we put the part about MacOS's make into the commit
>> >> message? Seems like relevan
Hi Alban
On 18/06/18 14:18, Alban Gruin wrote:
This rewrites checkout_onto() from shell to C.
A new command (“checkout-onto”) is added to rebase--helper.c. The shell
version is then stripped.
Signed-off-by: Alban Gruin
---
builtin/rebase--helper.c | 7 ++-
git-rebase--interactive.sh
On Mon, Jun 18, 2018 at 01:19:19PM +0200, Heiko Voigt wrote:
Now with cc to the mailing list.
> Hi,
>
> I just discovered that when you have a slash at the end of a nested
> repository, the files contained in the repository get added instead of
> the gitlink.
>
> I found this when I was adding
Jeff King writes:
> On Sun, Jun 17, 2018 at 01:37:24PM +0200, Johannes Schindelin wrote:
>
>> > If it's just a custom Authorization header, we should be able to support
>> > it with existing curl versions without _too_ much effort.
>>
>> Indeed. Because it is already implemented:
>>
>> git
Phillip Wood writes:
>> Oh, you're right, the fast-forwarding path would pose a problem. I think
>> there is an easy way to resolve this, though: in the case that we do want
>> to amend the to-be-reworded commit, we simply have to see whether HEAD
>> points to the very same commit mentioned in th
On 18/06/18 14:18, Alban Gruin wrote:
This rewrites setup_reflog_action() from shell to C.
A new command is added to rebase--helper.c, “setup-reflog”, as such as a
new flag, “verbose”, to silence the output of the checkout operation
called by setup_reflog_action().
I'm having difficulty unders
Hi Alban
On 18/06/18 14:18, Alban Gruin wrote:
This adds a new function, run_command_silent_if_successful(), to
redirect the stdout and stderr of a command to a strbuf, and then to run
that command. This strbuf is printed only if the command fails. It is
functionnaly similar to output() from git
On Mon, Jun 18, 2018 at 1:23 PM Heiko Voigt wrote:
>
> Hi,
>
> I just discovered that when you have a slash at the end of a nested
> repository, the files contained in the repository get added instead of
> the gitlink.
>
> I found this when I was adding a submodule and wanted to commit a small
> c
This is a feature request; sorry for the confusion. My guess is that it's a
corner case that was not considered due to the default prefixing.
> On Jun 18, 2018, at 10:59 AM, Duy Nguyen wrote:
>
> On Mon, Jun 18, 2018 at 4:36 PM George King wrote:
>>
>> As of 2.17.1, `git diff --no-index --no
On Mon, Jun 18, 2018 at 4:36 PM George King wrote:
>
> As of 2.17.1, `git diff --no-index --no-prefix relative/path /absolute/path`
> produces the following:
I checked as far back as v1.4.0 and git behaved the same way too. What
version did it work for you? Or is this not a regression, rather a
As of 2.17.1, `git diff --no-index --no-prefix relative/path /absolute/path`
produces the following:
diff --git relative/path absolute/path
index XXX..YYY ZZ
--- relative/path
+++ absolute/path
The leading slash on `absolute/path` is lost. This is unfortunate; my use case
is a diff
> That is true; submodule.recurse is not affecting git clone.
> This was a design decision once it was introduced, as the git clone might be
> too large. Maybe we need to revisit that decision and just clone the
> submodules if submodule.recurse is set.
>
> The problem that this bug report highli
This rewrites checkout_onto() from shell to C.
A new command (“checkout-onto”) is added to rebase--helper.c. The shell
version is then stripped.
Signed-off-by: Alban Gruin
---
builtin/rebase--helper.c | 7 ++-
git-rebase--interactive.sh | 25 -
sequencer.c
This rewrites setup_reflog_action() from shell to C.
A new command is added to rebase--helper.c, “setup-reflog”, as such as a
new flag, “verbose”, to silence the output of the checkout operation
called by setup_reflog_action().
The shell version is then stripped in favour of a call to the helper.
This patch series rewrites the reflog operations from shell to C. This
is part of the effort to rewrite interactive rebase in C.
The first commit is dedicated to creating a function to silence a
command, as the sequencer will do in several places with these patches.
This branch is based on ag/re
This adds a new function, run_command_silent_if_successful(), to
redirect the stdout and stderr of a command to a strbuf, and then to run
that command. This strbuf is printed only if the command fails. It is
functionnaly similar to output() from git-rebase.sh.
run_git_commit() is then refactored t
On 16 June 2018 at 10:58, merlo...@yahoo.fr wrote:
> Yes Luke, my colleagues and I, we care ! Our repository is p4 (choice of the
> high management, sigh...). Some of us are working natively on p4, but others
> like me are working on git through git-p4. We often want to share pieces of
> codes to
Hi,
I just discovered that when you have a slash at the end of a nested
repository, the files contained in the repository get added instead of
the gitlink.
I found this when I was adding a submodule and wanted to commit a small
change before that. You get the slash by using tab autocompletion.
H
It was not "newer versions of bash" but newer versions of
bash-completion that made commit 085e2ee0e6 (completion: load
completion file for external subcommand, 2018-04-29) both necessary
and possible.
Update the corresponding RelNotes entry accordingly.
Signed-off-by: SZEDER Gábor
---
Document
Hi Todd/Johannes
On 15/06/18 05:31, Johannes Schindelin via GitGitGadget wrote:
>
> From: Todd Zullinger
>
> When splitting a repository, running `git rebase -i --root` to reword
> the initial commit, Git dies with
>
> BUG: sequencer.c:795: root commit without message.
>
> Signed-off-by
Hi Johannes
On 17/06/18 20:28, Johannes Schindelin wrote:
> Hi Phillip,
>
> On Sun, 17 Jun 2018, Phillip Wood wrote:
>
>> On 17/06/18 06:37, Elijah Newren wrote:
>>> Ever since commit 18633e1a22 ("rebase -i: use the rebase--helper builtin",
>>> 2017-02-09), when a commit marked as 'reword' in an
Hi,
A draft of a new Git Rev News edition is available here:
https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-40.md
Everyone is welcome to contribute in any section either by editing the
above page on GitHub and sending a pull request, or by commenting on
this GitHub is
82 matches
Mail list logo
