If I am reading the git book or manual (https://git-scm.com/), and zoom
in, and/or have browser sized to a fraction of the screen, I cannot see
all the text, and have to horizontally scroll back and forth to read at
that zoom.
This may also be for smaller laptop screens, so those with larger
Jonathan Tan writes:
>> each other [*1*], so listing them in the offset order (with made-up
>> pathname information to _force_ that objects that live close
>> together in the original pack are grouped together by getting
>> similar names) might give us a better than horrible deltification.
>> I
Brandon Williams writes:
> Introduce a function "strbuf_submodule_gitdir()" which callers can use
> to build a path to a submodule's gitdir. This allows for a single
> location where we can munge the submodule name (by url encoding it)
> before using it as part of a path.
I am not sure about
I have a Businesss Proposal for you, get ack to me for more details.
> Just a note (and a request-for-sanity-check) and not meant to be a
> request to update the code, but with a still-in-pu 4b757a40 ("Use
> remote_odb_get_direct() and has_remote_odb()", 2018-08-02) in
> flight, repository_format_partial_clone is now gone.
>
> I've tentatively resolved the above
Hi,
Brandon Williams wrote:
> Commit 0383bbb901 (submodule-config: verify submodule names as paths,
> 2018-04-30) introduced some checks to ensure that submodule names don't
> include directory traversal components (e.g. "../").
>
> This addresses the vulnerability identified in 0383bbb901 but
> for_each_object_in_pack() is a fine way to make sure that you list
> everythning in a pack, but I suspect it is a horrible way to feed a
> list of objects to pack-objects, as it goes by the .idx order, which
> is by definition a way to enumerate objects in a randomly useless
> order.
That's
Commit 0383bbb901 (submodule-config: verify submodule names as paths,
2018-04-30) introduced some checks to ensure that submodule names don't
include directory traversal components (e.g. "../").
This addresses the vulnerability identified in 0383bbb901 but the root
cause is that we use submodule
Jonathan Tan writes:
> @@ -293,6 +346,9 @@ int cmd_repack(int argc, const char **argv, const char
> *prefix)
> if (pack_everything & ALL_INTO_ONE) {
> get_non_kept_pack_filenames(_packs, _pack_list);
>
> + if (repository_format_partial_clone)
> +
Junio C Hamano writes:
> if test -z "$module_path"
> then
> for candidate in \
> /etc/httpd \
> /usr/lib/apache2 \
> /usr/lib/httpd \
I obviously missed semicolon here...
> do
>
On Tue, Aug 7, 2018 at 5:09 AM Eric Sunshine wrote:
> On Mon, Aug 6, 2018 at 9:15 AM Johannes Schindelin
> wrote:
> > I think Andrei's assessment is wrong. The code could not test for that
> > earlier, as it did allow ranges to become "abutting" in the process, by
> > failing to merge them. So
On Tue, Aug 7, 2018 at 9:54 AM Andrei Rybak wrote:
> line-log.[ch] use left-closed, right-open interval logic. Change comment
> and debug output to square brackets+parentheses notation to help
> developers avoid off-by-one errors.
> ---
This seems sensible. There might be some reviewers who
Sebastian Kisela writes:
> On Fedora-derived systems, the apache httpd package installs modules
> under /usr/lib{,64}/httpd/modules, depending on whether the system is
> 32- or 64-bit. A symlink from /etc/httpd/modules is created which
> points to the proper module path. Use it to support
Eric Sunshine writes:
> On Mon, Aug 6, 2018 at 9:20 PM Hilco Wijbenga
> wrote:
>> But your suggestion did make me think about what behaviour I would
>> like to see, exactly. I like that Git removes commits that no longer
>> serve any purpose (because I've included their changes in earlier
>>
Han-Wen Nienhuys writes:
> Fix nits; remove debug printf.
>
> Han-Wen Nienhuys (1):
> sideband: highlight keywords in remote sideband output
>
> Documentation/config.txt| 12 +++
> help.c | 1 +
> help.h | 1 +
>
Jonathan Tan writes:
> +static int write_oid(const struct object_id *oid, struct packed_git *pack,
> + uint32_t pos, void *data)
> +{
> + int fd = *(int *)data;
> +
> + xwrite(fd, oid_to_hex(oid), GIT_SHA1_HEXSZ);
> + xwrite(fd, "\n", 1);
> + return 0;
> +}
> +
>
These patches teach Git to also repack promisor packfiles upon GC, which
reduces one of the pain points of current partial clone usage (many
promisor packfiles in the objects/pack/ directory, generated upon each
fetch).
In the t/ tests, I strived to verify that repack doesn't accidentally
delete
Currently, repack does not touch promisor packfiles at all, potentially
causing the performance of repositories that have many such packfiles to
drop. Therefore, repack all promisor objects if invoked with -a or -A.
This is done by an additional invocation of pack-objects on all promisor
objects
A subsequent patch will teach repack to run pack-objects with some same
and some different arguments if repacking of promisor objects is
required. Refactor the setup of the pack-objects cmd so that setting up
the arguments common to both is done in a function.
Signed-off-by: Jonathan Tan
---
Nguyễn Thái Ngọc Duy writes:
> One nice thing about this is we don't need platform specific code for
> detecting the duplicate entries. I think ce_match_stat() works even
> on Windows. And it's now equally expensive on all platforms :D
ce_match_stat() may not be a very good measure to see
On Sat, Aug 04 2018, Johannes Schindelin via GitGitGadget wrote:
> From: Johannes Schindelin
>
> Git for Windows' original 4aa8b8c8283 (Teach 'git pull' to handle
> --rebase=interactive, 2011-10-21) had support for the very convenient
> abbreviation
>
> git pull --rebase=i
>
> which was
(cc:+Karen Arutyunov[1]; perhaps also do so when you re-roll)
In addition to the good review comments by Martin and Duy...
On Tue, Aug 7, 2018 at 9:21 AM Elia Pinto wrote:
> Add the '--quiet' option to git worktree add,
> as for the other git commands.
It might make sense to say instead that
On Tue, Aug 7, 2018 at 5:12 PM Lars Schneider wrote:
>
> > On Aug 1, 2018, at 12:56 AM, SZEDER Gábor wrote:
> >
> > The trash directory of a failed test might contain invaluable
> > information about the cause of the failure, but we have no access to
> > the trash directories of Travis CI build
Paths that only differ in case work fine in a case-sensitive
filesystems, but if those repos are cloned in a case-insensitive one,
you'll get problems. The first thing to notice is "git status" will
never be clean with no indication what exactly is "dirty".
This patch helps the situation a bit by
Elijah Newren writes:
>> I think 0/5 should fix the real bug you are deliberately keeping in
>> this patch, from the point of view of organization.
>
> You mean 5/5? And yeah, it was just a temporary thing for
> organizational purposes.
I meant "a thing that comes before all the other steps".
On Tue, Aug 7, 2018 at 10:29 AM Junio C Hamano wrote:
> Elijah Newren writes:
>
> > We can get rid of some quoted tabs and make a few tests slightly easier
> > to read and edit by just asking for the names of the files modified,
> > since that's all these tests were interested in anyway.
>
>
Elijah Newren writes:
> A test making use of test_must_fail was failing like this:
> fatal: ambiguous argument '|': unknown revision or path not in the working
> tree.
> when the intent was to verify that a specific string was not found
> in the output of the git diff command, i.e. that grep
Elijah Newren writes:
> test -e, test -s, etc. do not provide nice error messages when we hit
> test failures, so use the test_* helper functions from
> test-lib-functions.sh.
Good explanation.
> Note: The use of 'test_path_is_file submodule/.git' may look odd, but
> it is a file which is
Hi Christian
On 07/08/18 17:28, Christian Couder wrote:
> On Tue, Aug 7, 2018 at 6:15 PM, Phillip Wood
> wrote:
>> On 07/08/18 16:25, Christian Couder wrote:
>>>
>>> I agree about checking the return value from fputs(), but it seems to
>>> me that we don't usually check the value of fclose().
>>
Elijah Newren writes:
> We can get rid of some quoted tabs and make a few tests slightly easier
> to read and edit by just asking for the names of the files modified,
> since that's all these tests were interested in anyway.
Technically the quoted tab was making sure that we do not mistake
Phillip Wood writes:
> Yes I think the earlier approach with the more robust detection you
> suggested is probably a good compromise. Junio does that sound good to
> you?
Surely, and thanks.
When a git command is on the left side of a pipe, the pipe will swallow
its exit status, preventing us from detecting failures in said commands.
Restructure the tests to put the output in a temporary file to avoid
this problem.
Signed-off-by: Elijah Newren
---
t/t7406-submodule-update.sh | 26
A test making use of test_must_fail was failing like this:
fatal: ambiguous argument '|': unknown revision or path not in the working
tree.
when the intent was to verify that a specific string was not found
in the output of the git diff command, i.e. that grep returned
non-zero. Fix the test
This series started as a simple single-line fix, but folks keep
noticing other problems with t7406 while reading my patches. So, changes
noted below and I have a challenge at the end.
Changes since v2:
- Two new patches inserted into this series (3/5 and 4/5):
- Prefer test_* helper
Signed-off-by: Elijah Newren
---
t/t7406-submodule-update.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index ab67e373c5..5b42bbe9fa 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@
We can get rid of some quoted tabs and make a few tests slightly easier
to read and edit by just asking for the names of the files modified,
since that's all these tests were interested in anyway.
Signed-off-by: Elijah Newren
---
t/t7406-submodule-update.sh | 8
1 file changed, 4
test -e, test -s, etc. do not provide nice error messages when we hit
test failures, so use the test_* helper functions from
test-lib-functions.sh.
Note: The use of 'test_path_is_file submodule/.git' may look odd, but
it is a file which is populated with a
gitdir: ../.git/modules/submodule
On Tue, Aug 7, 2018 at 6:15 PM, Phillip Wood wrote:
> On 07/08/18 16:25, Christian Couder wrote:
>>
>> I agree about checking the return value from fputs(), but it seems to
>> me that we don't usually check the value of fclose().
>
> A quick grep shows you're right, there are only a handful of
Hi Christian
On 07/08/18 16:25, Christian Couder wrote:
Hi Phillip,
On Tue, Aug 7, 2018 at 3:57 PM, Phillip Wood wrote:
On 31/07/18 18:59, Alban Gruin wrote:
+
+ ret = fputs(buf.buf, todo);
It is not worth changing the patch just for this but strbuf_write()
might be clearer (you use
Jonathan Nieder writes:
> Both don't seem quite right, since they have an extra space before the
> period. The git-diff(1) seems especially not quite right --- does it
> intend to say something like "See the DIFF ALGORITHMS section for more
> discussion"?
Good suggestion and doing so would
2018-08-07 16:37 GMT+02:00 Martin Ågren :
> Hi Elia
>
> On 7 August 2018 at 15:21, Elia Pinto wrote:
>> Add the '--quiet' option to git worktree add,
>> as for the other git commands.
>>
>> Signed-off-by: Elia Pinto
>> ---
>> Documentation/git-worktree.txt | 4 +++-
>> builtin/worktree.c
On Tue, 7 Aug 2018 at 16:36, Junio C Hamano wrote:
> Jakub Narebski writes:
>> Junio C Hamano writes:
>>
>>> * ds/commit-graph-with-grafts (2018-07-19) 8 commits
>>> (merged to 'next' on 2018-08-02 at 0ee624e329)
>>> ...
>>> Will merge to 'master'.
>>
>> Derrick wrote that he will be sending
On Tue, Aug 7, 2018 at 3:27 PM Elia Pinto wrote:
>
> Add the '--quiet' option to git worktree add,
> as for the other git commands.
>
> Signed-off-by: Elia Pinto
> ---
> Documentation/git-worktree.txt | 4 +++-
> builtin/worktree.c | 11 +--
> 2 files changed, 12
Hi Phillip,
On Tue, Aug 7, 2018 at 3:57 PM, Phillip Wood wrote:
>
> On 31/07/18 18:59, Alban Gruin wrote:
>>
>> +
>> + ret = fputs(buf.buf, todo);
>
> It is not worth changing the patch just for this but strbuf_write()
> might be clearer (you use it in a later patch)
>
>> + if (ret < 0)
Ævar Arnfjörð Bjarmason writes:
> On Mon, Aug 06 2018, Junio C Hamano wrote:
>
>> * ab/newhash-is-sha256 (2018-08-06) 2 commits
>> - doc hash-function-transition: pick SHA-256 as NewHash
>> - doc hash-function-transition: note the lack of a changelog
>>
>> Documentation update.
>>
>> Will
Ævar Arnfjörð Bjarmason writes:
> On Mon, Aug 06 2018, Junio C Hamano wrote:
>
>> * ab/newhash-is-sha256 (2018-08-06) 2 commits
>> - doc hash-function-transition: pick SHA-256 as NewHash
>> - doc hash-function-transition: note the lack of a changelog
>>
>> Documentation update.
>>
>> Will
Hi Elia
On 7 August 2018 at 15:21, Elia Pinto wrote:
> Add the '--quiet' option to git worktree add,
> as for the other git commands.
>
> Signed-off-by: Elia Pinto
> ---
> Documentation/git-worktree.txt | 4 +++-
> builtin/worktree.c | 11 +--
> 2 files changed, 12
Jakub Narebski writes:
> Junio C Hamano writes:
>
>> * ds/commit-graph-with-grafts (2018-07-19) 8 commits
>> (merged to 'next' on 2018-08-02 at 0ee624e329)
>> ...
>> Will merge to 'master'.
>
> Derrick wrote that he will be sending v2 of this patch series in a few
> weeks, among others to
On 31/07/18 18:59, Alban Gruin wrote:
> This rewrites the edit-todo functionality from shell to C.
>
> To achieve that, a new command mode, `edit-todo`, is added, and the
> `write-edit-todo` flag is removed, as the shell script does not need to
> write the edit todo help message to the todo list
Hi Alban
On 31/07/18 18:59, Alban Gruin wrote:
> This rewrites append_todo_help() from shell to C. It also incorporates
> some parts of initiate_action() and complete_action() that also write
> help texts to the todo file.
>
> This also introduces the source file rebase-interactive.c. This file
Hi Eric
On 07/08/18 11:23, Eric Sunshine wrote:
> On Tue, Aug 7, 2018 at 5:35 AM Phillip Wood wrote:
>> - Reverted the implementation to v2 with more robust detection of the
>>missing "'" on the last line of the author script based on a
>>suggestion by Eric. This means that
line-log.[ch] use left-closed, right-open interval logic. Change comment
and debug output to square brackets+parentheses notation to help
developers avoid off-by-one errors.
---
Original idea for this change in recent thread about line-log changes:
On Tue, Aug 7, 2018 at 2:07 AM, SZEDER Gábor wrote:
>> A test making use of test_must_fail was failing like this:
>> fatal: ambiguous argument '|': unknown revision or path not in the working
>> tree.
>> when the intent was to verify that a specific string was not found
>> in the output of the
On Tue, Aug 7, 2018 at 12:50 AM, Martin Ågren wrote:
> On 6 August 2018 at 17:25, Elijah Newren wrote:
>> Changes since v1:
>> - Simplify multiple tests using diff --name-only instead of diff --raw;
>> these tests are only interested in which file was modified anyway.
>> (Suggested by
Add the '--quiet' option to git worktree add,
as for the other git commands.
Signed-off-by: Elia Pinto
---
Documentation/git-worktree.txt | 4 +++-
builtin/worktree.c | 11 +--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-worktree.txt
The colorization is controlled with the config setting "color.remote".
Supported keywords are "error", "warning", "hint" and "success". They
are highlighted if they appear at the start of the line, which is
common in error messages, eg.
ERROR: commit is missing Change-Id
The Git push process
Fix nits; remove debug printf.
Han-Wen Nienhuys (1):
sideband: highlight keywords in remote sideband output
Documentation/config.txt| 12 +++
help.c | 1 +
help.h | 1 +
sideband.c | 125
Hi Junio,
On Mon, 6 Aug 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > Git for Windows' original 4aa8b8c8283 (Teach 'git pull' to handle
> > --rebase=interactive, 2011-10-21) had support for the very convenient
> >
On 2018-08-06 22:14, Junio C Hamano wrote:
> Andrei Rybak writes:
>>
>> Only changes since v2 are more clear tag names.
>
> ... and updated log message, which I think makes it worthwhile to
> replace the previous one plus the squash/fixup with this version.
My bad, totally forgot that I had
On Tue, Aug 7, 2018 at 1:42 AM, Andrei Rybak wrote:
> On 2018-08-06 10:58, Paul Tan wrote:
>>> + git commit -F msg-without-scissors-line &&
>>> + git tag scissors-used &&
>>
>> Nit: I'm not quite sure about naming the tag "scissors-used" though,
>> since this commit was not created
Junio C Hamano writes:
> * ds/commit-graph-with-grafts (2018-07-19) 8 commits
> (merged to 'next' on 2018-08-02 at 0ee624e329)
> + commit-graph: close_commit_graph before shallow walk
> + commit-graph: not compatible with uninitialized repo
> + commit-graph: not compatible with grafts
> +
On Tue, Aug 7, 2018 at 5:35 AM Phillip Wood wrote:
> - Reverted the implementation to v2 with more robust detection of the
>missing "'" on the last line of the author script based on a
>suggestion by Eric. This means that this series needs to progress
>closely with
From: Phillip Wood
I've updated these based on Eric's suggestions, hopefully they're good
to go now. Thanks Eric for you help.
Phillip Wood (2):
sequencer: handle errors from read_author_ident()
sequencer: fix quoting in write_author_script
sequencer.c | 47
From: Phillip Wood
Check for a NULL return value from read_author_ident() that indicates
an error. Previously the NULL author was passed to commit_tree() which
would then fallback to using the default author when creating the new
commit. This changed the date and potentially the author of the
From: Phillip Wood
Single quotes should be escaped as \' not \\'. The bad quoting breaks
the interactive version of 'rebase --root' (which is used when there
is no '--onto' even if the user does not specify --interactive) for
authors that contain "'" as sq_dequote() called by read_author_ident()
On Mon, 06 Aug 2018 10:38:20 -0700
Junio C Hamano wrote:
> Antonio Ospite writes:
>
> >> I also do not see a reason why we want to stop referring to
> >> .gitmodules explicitly by name. We do not hide the fact that
> >> in-tree .gitignore and .gitattributes files are used to hold the
> >>
On Mon, Aug 6, 2018 at 9:15 AM Johannes Schindelin
wrote:
> On Sun, 5 Aug 2018, Eric Sunshine wrote:
> > Although this appears to be a faithful translation of the assert() to
> > BUG(), as mentioned by Andrei in his review of 3/4, the existing
> > assert() seems to have an off-by-1 error, which
> A test making use of test_must_fail was failing like this:
> fatal: ambiguous argument '|': unknown revision or path not in the working
> tree.
> when the intent was to verify that a specific string was not found
> in the output of the git diff command, i.e. that grep returned
> non-zero.
chainlint.sed recognizes multi-line quoted strings within subshells:
echo "abc
def" >out &&
so it can avoid incorrectly classifying lines internal to the string as
breaking the &&-chain. To identify the first line of a multi-line
string, it checks if the line contains a single quote.
This series improves chainlint's robustness when faced with the sort of
unusual shell coding in contrib/subtree/t7900 which triggered a
false-positive, as reported by Jonathan[1]. Jonathan has already
rewritten[2] that code to be cleaner and more easily understood (and,
consequently, to avoid
This extract from contrib/subtree/t7900 triggered a false positive due
to three chainlint limitations:
* recognizing only a "blessed" set of here-doc tag names in a subshell
("EOF", "EOT", "INPUT_END"), of which "TXT" is not a member
* inability to recognize multi-line $(...) when the first
For multi-line $(...) expressions nested within subshells, chainlint.sed
only recognizes:
x=$(
echo foo &&
...
but it is not unlikely that test authors may also cuddle the command
with the opening "$(", so support that style, as well:
x=$(echo foo &&
...
The
After swallowing a here-doc, chainlint.sed assumes that no other
processing needs to be done on the line aside from checking for &&-chain
breakage; likewise, after folding a multi-line quoted string. However,
it's conceivable (even if unlikely in practice) that both a here-doc and
a multi-line
chainlint.sed swallows top-level here-docs to avoid being fooled by
content which might look like start-of-subshell. It likewise swallows
here-docs in subshells to avoid marking content lines as breaking the
&&-chain, and to avoid being fooled by content which might look like
end-of-subshell,
On 6 August 2018 at 17:25, Elijah Newren wrote:
> Changes since v1:
> - Simplify multiple tests using diff --name-only instead of diff --raw;
> these tests are only interested in which file was modified anyway.
> (Suggested by Junio)
> - Avoid putting git commands upstream of a pipe,
The generated apache2 config fails with apache >= 2.4. The error log
states:
AH00136: Server MUST relinquish startup privileges before accepting
connections. Please ensure mod_unixd or other system security
module is loaded.
AH00016: Configuration Failed
Fix this by loading the
On Fedora-derived systems, the apache httpd package installs modules
under /usr/lib{,64}/httpd/modules, depending on whether the system is
32- or 64-bit. A symlink from /etc/httpd/modules is created which
points to the proper module path. Use it to support apache on Fedora,
CentOS, and Red Hat
On Mon, Aug 6, 2018 at 11:47 PM Eric Sunshine wrote:
> On Mon, Aug 6, 2018 at 6:36 PM Junio C Hamano wrote:
> > * pw/rebase-i-author-script-fix (2018-08-02) 2 commits
> > - sequencer: fix quoting in write_author_script
> > - sequencer: handle errors in read_author_ident()
> > (this branch
On Mon, Aug 06 2018, Junio C Hamano wrote:
> * ab/newhash-is-sha256 (2018-08-06) 2 commits
> - doc hash-function-transition: pick SHA-256 as NewHash
> - doc hash-function-transition: note the lack of a changelog
>
> Documentation update.
>
> Will Merge to 'next'.
The tip of
79 matches
Mail list logo
