On Tue, Jun 12, 2018 at 11:10 PM, Todd Zullinger wrote:
> Signed-off-by: Todd Zullinger
> ---
> diff --git a/contrib/credential/netrc/t-git-credential-netrc.sh
> b/contrib/credential/netrc/t-git-credential-netrc.sh
> index 58191a62f8..c5661087fe 100755
> ---
The syntax "git merge HEAD " has been removed. The
order of the syntax should also be updated.
---
Documentation/git-merge.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index d5dfd8430..6a5c00e2c 100644
---
From: Luis Marsano
The netrc test.pl script calls git-credential-netrc which imports the
Git module. Pass GITPERLLIB to git-credential-netrc via PERL5LIB to
ensure the in-tree Git module is used for testing.
Signed-off-by: Luis Marsano
---
contrib/credential/netrc/t-git-credential-netrc.sh |
From: Luis Marsano
Signed-off-by: Luis Marsano
---
contrib/credential/netrc/test.pl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/contrib/credential/netrc/test.pl b/contrib/credential/netrc/test.pl
index 2b5280ad6a..c0fb3718b2 100755
---
This replaces my 2/2 "use in-tree Git.pm for tests" with
Luis's improved version. It also adds Luis's fix to ensure
the proper exit status on test failures and a minor
whitespace cleanup.
Is it alright to forge your signoff Luis?
Luis Marsano (2):
git-credential-netrc: use in-tree Git.pm for
Running "make" in contrib/credential/netrc should run the "all" target
rather than the "test" target. Add an empty "all::" target like most of
our other Makefiles.
Signed-off-by: Todd Zullinger
---
contrib/credential/netrc/Makefile | 3 +++
1 file changed, 3 insertions(+)
diff --git
Signed-off-by: Todd Zullinger
---
contrib/credential/netrc/t-git-credential-netrc.sh | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/contrib/credential/netrc/t-git-credential-netrc.sh
b/contrib/credential/netrc/t-git-credential-netrc.sh
index 58191a62f8..c5661087fe
Hi,
Ævar Arnfjörð Bjarmason wrote:
>
> On Sun, Jun 10 2018, Todd Zullinger wrote:
>
>>> I added 'use autodie;' without realizing it had external dependencies.
>>> According to the documentation
>>> http://perldoc.perl.org/autodie.html
>>> it's a pragma since perl 5.10.1
>>> Removing 'use
On Mon, Jun 11, 2018 at 06:46:34PM -0700, Anthony Sottile wrote:
[]
> Anything else for me to do here? (sorry! not super familiar with the process)
Your patch has been picked up by Junio, and is currently merged into the
"pu" branch (proposed updates):
commit
Hi,
Sorry about the delay here (bit of a mix-up and didn't reply to the list).
(see inline )
On Sun, May 27, 2018 at 9:41 PM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> Duy Nguyen writes:
>>
>>> On Sun, May 27, 2018 at 1:57 AM, Junio C Hamano wrote:
(trimming)
>
> Specifically, I
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 submodule deinit" to unset the core.worktree
setting as well. It
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
---
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
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
Mention that this feature works with some commands (merge and cherry-pick,
implying that it also works with commands that build on these like rebase
-m and rebase -i). Explicitly mentioning two commands hopefully implies
that it may not always work with other commands (am, and rebase without
On 12/06/2018, Junio C Hamano wrote:
> Sam Kuper writes:
>> [...] It makes sense that `git am [--skip|--abort]` and `git rebase
>> [--skip|--abort]` would run `git rerere clear`.
>>
>> However, if they run it, then shouldn't `git merge --abort` run it, too?
>>
>> If not, then what is the reason
On 12 June 2018 at 22:53, Eric Sunshine wrote:
> On Tue, Jun 12, 2018 at 5:49 PM, Luke Diamand wrote:
>> Thanks. While on the subject of git-p4, I thought I should mention
>> that I've been looking at getting git-p4 to work with Python3.
>>
>> I've got some low risk easy (mostly automated)
On Tue, Jun 12, 2018 at 5:49 PM, Luke Diamand wrote:
> Thanks. While on the subject of git-p4, I thought I should mention
> that I've been looking at getting git-p4 to work with Python3.
>
> I've got some low risk easy (mostly automated) changes which get it to
> the point where it compiles.
On 12 June 2018 at 22:35, Junio C Hamano wrote:
> Luke Diamand writes:
>
>> On 12 June 2018 at 18:10, Junio C Hamano wrote:
>>> Luke Diamand writes:
>>>
This is an updated version of the set of changes I posted recently,
following comments on the list:
disable automatic
On Tue, Jun 12, 2018 at 5:25 PM, Stefan Beller wrote:
> When running t7400 in a shell you observe more output than expected:
> ...
> ok 10 - submodule add
> [master (root-commit) d79ce16] one
> Author: A U Thor
> 1 file changed, 1 insertion(+)
> create mode 100644
Luke Diamand writes:
> On 12 June 2018 at 18:10, Junio C Hamano wrote:
>> Luke Diamand writes:
>>
>>> This is an updated version of the set of changes I posted recently,
>>> following comments on the list:
>>>
>>> disable automatic sync after git-p4 submit:
>>>
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(+)
On 12 June 2018 at 18:10, Junio C Hamano wrote:
> Luke Diamand writes:
>
>> This is an updated version of the set of changes I posted recently,
>> following comments on the list:
>>
>> disable automatic sync after git-p4 submit:
>> https://marc.info/?l=git=152818734814838=2
>>
>> better
> A tl;dr summary for -rc2 that hopefully should happen in 24 hours:
> the following four topics
>
> jk/submodule-fsck-loose-fixup
> sb/submodule-merge-in-merge-recursive
> jk/index-pack-maint
> sg/completion-zsh-workaround
>
> are planned to be merged in -rc2.
It would be nice to have
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.
A tl;dr summary for -rc2 that
g...@jeffhostetler.com writes:
> +static void indent_pretty(struct json_writer *jw)
> +{
> + int k;
> +
> + if (!jw->pretty)
> + return;
> +
> + for (k = 0; k < jw->open_stack.len; k++)
> + strbuf_addstr(>json, " ");
> +}
> +static void array_common(struct
Steve Litt writes:
> But then I view all filenames from that directory that have ever been
> in the project, as follows:
>
> git cat-file --buffer --batch-all-objects \
> --batch-check='%(objecttype) %(objectname)' \
> | grep ^c | cut -d " " -f 2 \
> | xargs -n 1 git ls-tree -r | sort | uniq
On Tue, Jun 12, 2018 at 4:26 PM, Christian Couder
wrote:
> On Tue, Jun 12, 2018 at 9:44 PM, Steve Litt wrote:
>
>> My project (call it myproject) had a directory (call it docs/propdir)
>> that was unnecessary for the project, and I've decided I don't want to
>> offer the files in that directory
On Tue, Jun 12, 2018 at 4:22 PM, wrote:
> Add "struct json_writer" and a series of jw_ routines to compose JSON
> data into a string buffer. The resulting string may then be printed by
> commands wanting to support a JSON-like output format.
>
> The json_writer is limited to correctly
Hi,
On Tue, Jun 12, 2018 at 9:44 PM, Steve Litt wrote:
> My project (call it myproject) had a directory (call it docs/propdir)
> that was unnecessary for the project, and I've decided I don't want to
> offer the files in that directory as free software. So I need to delete
> docs/propdir from
On Tue, Jun 12, 2018 at 03:44:13PM -0400, Steve Litt wrote:
> git filter-branch --tree-filter 'rm -rf docs/propdir' HEAD
...
> What command do I do to remove all mention of doc/propdir and its
> files from my git history?
Are you sure that you pruned all branches? I would have expected a
command
From: Jeff Hostetler
Add "struct json_writer" and a series of jw_ routines to compose JSON
data into a string buffer. The resulting string may then be printed by
commands wanting to support a JSON-like output format.
The json_writer is limited to correctly formatting structured data for
From: Jeff Hostetler
Here is V9 of my json-writer patches. Please replace the existing V5..V8
versions with this one.
This version has been rebased onto v2.18.0-rc1 rather than 2.17 because
of changes to the test-tool setup.
I've incorporated all of the suggestions on the V8 version,
Sam Kuper writes:
> `man git-rerere` says:
>
>> clear
>>
>> Reset the metadata used by rerere if a merge resolution is to be
>> aborted. Calling git am [--skip|--abort] or git rebase
>> [--skip|--abort] will automatically invoke this command.
>
> It makes sense that `git am [--skip|--abort]` and
Hi all,
I have git 2.17.1 running on Void Linux 64 bit running the Linux
4.16.9_1 kernel, not available to the public in any way (yet). I have a
repository in my project's working directory, and push to a bare
repository on the hard disk.
My project (call it myproject) had a directory (call it
`man git-rerere` says:
> clear
>
> Reset the metadata used by rerere if a merge resolution is to be
> aborted. Calling git am [--skip|--abort] or git rebase
> [--skip|--abort] will automatically invoke this command.
It makes sense that `git am [--skip|--abort]` and `git rebase
[--skip|--abort]`
On Tuesday, June 12, 2018 09:12:19 PM Peter Backes wrote:
> So? If a thousand lawyers claim 1+1=3, it becomes a
> mathematical truth?
No, but probably a legal "truth". :)
--
The Qualcomm Innovation Center, Inc. is a member of Code
Aurora Forum, hosted by The Linux Foundation
Ævar Arnfjörð Bjarmason writes:
> Change the core.abbrev config variable and the corresponding --abbrev
> command-line option to support relative values such as +1 or -1.
>
> Before Linus's e6c587c733 ("abbrev: auto size the default
> abbreviation", 2016-09-30) git would default to abbreviating
On Tue, Jun 12, 2018 at 05:48:49AM -0400, Jeff King wrote:
> On Mon, Jun 11, 2018 at 09:43:02AM +, Kirill Smelkov wrote:
>
> > > Looking deeper, we do not need these trees and blobs at all. The problem
> > > is really just a tag that peels to an object that is not otherwise a ref
> > > tip,
On Tue, Jun 12, 2018 at 11:56:13AM -0700, David Lang wrote:
> [quoting github]
>
> It's important to remember that the Right to Erasure only applies to
> personal data, not all data. It only applies to data a controller (GitHub,
> for example) is processing _solely_ on the basis of consent.
This
Martin Ågren writes:
>> +This is especially useful in combination with the
>> +`core.validateAbbrev` setting, or to get more future-proof hashes to
>> +reference in the future in a repository whose number of objects is
>> +expected to grow.
>
> Maybe s/validateAbbrev/validateAbbrev = false/?
Adding one more datapoint here, I reached out to Github to find out their
stance.
Here is what I got back
Quote:
Thanks for reaching out to us about this.
It's important to remember that the Right to Erasure only applies to personal
data, not all data. It only applies to data a controller
Ævar Arnfjörð Bjarmason writes:
> diff --git a/t/t0014-abbrev.sh b/t/t0014-abbrev.sh
> new file mode 100755
> index 00..1c60f5ff93
> --- /dev/null
> +++ b/t/t0014-abbrev.sh
> @@ -0,0 +1,118 @@
> +#!/bin/sh
> +
> +test_description='test core.abbrev and related features'
> +
> +.
On Tue, Jun 12, 2018 at 2:16 PM, Jonathan Nieder wrote:
> Masaya Suzuki wrote:
>> builtin/send-pack didn't call git_default_config, and because of this
>> git push --signed didn't respect the username and email in gitconfig in
>> the HTTP transport.
>>
>> Signed-off-by: Masaya Suzuki
>> ---
>
On Tue, Jun 12, 2018 at 11:08 AM Jonathan Nieder wrote:
>
> Hi,
>
> Stefan Beller wrote:
>
> > Any caller except of git_gpg_config() except the one in send_pack_config()
> > handles the return value of git_gpg_config(). Also handle the return value
> > there.
> >
> > Signed-off-by: Stefan Beller
Hi,
Masaya Suzuki wrote:
> builtin/send-pack didn't call git_default_config, and because of this
> git push --signed didn't respect the username and email in gitconfig in
> the HTTP transport.
>
> Signed-off-by: Masaya Suzuki
> ---
> builtin/send-pack.c | 2 +-
> 1 file changed, 1
Ævar Arnfjörð Bjarmason writes:
> In a later change I'm adding stress testing of the commit abbreviation
> as it relates to git-blame and others, and initially thought that the
> inability to extract full SHA-1s from the non-"--porcelain" output was
> a bug.
... meaning that it is not actually
Hi,
Stefan Beller wrote:
> Any caller except of git_gpg_config() except the one in send_pack_config()
> handles the return value of git_gpg_config(). Also handle the return value
> there.
>
> Signed-off-by: Stefan Beller
> ---
> builtin/send-pack.c | 3 ++-
> 1 file changed, 2 insertions(+), 1
On Tue, Jun 12, 2018 at 1:53 PM, Stefan Beller wrote:
> Any caller except of git_gpg_config() except the one in send_pack_config()
Drop the first "except"?
Also: s/Any caller/All callers/
> handles the return value of git_gpg_config(). Also handle the return value
> there.
>
> Signed-off-by:
Any caller except of git_gpg_config() except the one in send_pack_config()
handles the return value of git_gpg_config(). Also handle the return value
there.
Signed-off-by: Stefan Beller
---
> Makes sense. I wonder if this was deliberate
There was no need for other configuration to be loaded
Jonathan Tan writes:
> In partial_clone_get_default_filter_spec(), the
> core_partial_clone_filter_default variable may be NULL; ensure that it
> is not NULL before using it.
>
> Signed-off-by: Jonathan Tan
> ---
> This was noticed by someone else at $DAY_JOB when trying to use a
> partial
Masaya Suzuki writes:
> builtin/send-pack didn't call git_default_config, and because of this
> git push --signed didn't respect the username and email in gitconfig in
> the HTTP transport.
>
> Signed-off-by: Masaya Suzuki
> ---
> builtin/send-pack.c | 2 +-
> 1 file changed, 1 insertion(+), 1
On Sat, Jun 9, 2018 at 4:04 AM Duy Nguyen wrote:
>
> On Tue, Jun 05, 2018 at 05:31:41PM +0200, Duy Nguyen wrote:
> > I do not know how to reproduce this (and didn't bother to look deeply
> > into it after I found it was not a trivial fix) but one of my "git
> > fetch" showed
> >
> > warning:
builtin/send-pack didn't call git_default_config, and because of this
git push --signed didn't respect the username and email in gitconfig in
the HTTP transport.
Signed-off-by: Masaya Suzuki
---
builtin/send-pack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
Luke Diamand writes:
> This is an updated version of the set of changes I posted recently,
> following comments on the list:
>
> disable automatic sync after git-p4 submit:
> https://marc.info/?l=git=152818734814838=2
>
> better handling of being logged out by Perforce:
>
Derrick Stolee writes:
> diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
> index 2b9214bc83..9a3481c30f 100755
> --- a/t/t5318-commit-graph.sh
> +++ b/t/t5318-commit-graph.sh
> @@ -269,6 +269,9 @@ GRAPH_BYTE_OID_LOOKUP_ORDER=$(($GRAPH_OID_LOOKUP_OFFSET +
> $HASH_LEN * 8))
>
Jeff King writes:
> To be honest, I could easily see an argument that I _should_ be setting
> GIT_SSH_VARIANT to explain what my wrapper is expecting, even though it
> happened to work before.
The way I read that message is that the patch proposed in
Hi,
On 10/06/18 00:49, brian m. carlson wrote:
> I imported the optimized 64-bit implementation of KangarooTwelve. The
> AVX2 implementation was not considered for licensing reasons (it's
> partially generated from external code, which falls foul of the GPL's
> "preferred form for modifications"
Hi Alban
On 12/06/18 13:33, Alban Gruin wrote:
Hi Phillip,
Le 11/06/2018 à 17:32, Phillip Wood a écrit :
+ if (launch_editor(todo_file, NULL, NULL))
I'm not sure that this will respect GIT_SEQUENCE_EDITOR, it would be
nice to have a launch_sequence_editor() function that shared as much
Hi Elijah,
Le 12/06/2018 à 17:46, Elijah Newren a écrit :
> Hi Alban,
>
> On Mon, Jun 11, 2018 at 6:57 AM, 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
Jeff King writes:
> In my experience the maintenance burden is not in the "connect to a
> socket" part, but the fact that you have to sprinkle the entry points
> throughout the code (e.g., "set 'cloning' flag to 1" or "I'm entering
> the pack generation phase of the fetch"). So I'd love to see
Hi Alban,
On Mon, Jun 11, 2018 at 6:57 AM, 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
On Thu, Jun 7, 2018 at 7:01 PM Derrick Stolee wrote:
> diff --git a/midx.c b/midx.c
> index 616af66b13..3e55422a21 100644
> --- a/midx.c
> +++ b/midx.c
> @@ -1,9 +1,62 @@
> #include "git-compat-util.h"
> #include "cache.h"
> #include "dir.h"
> +#include "csum-file.h"
> +#include "lockfile.h"
>
Hi Phillip,
Le 11/06/2018 à 17:32, Phillip Wood a écrit :
>> + if (launch_editor(todo_file, NULL, NULL))
>
> I'm not sure that this will respect GIT_SEQUENCE_EDITOR, it would be
> nice to have a launch_sequence_editor() function that shared as much
> code as possible with launch_editor()
>
On Mon, Jun 11, 2018 at 06:06:11PM +0200, ch wrote:
> After the rebase the 'stuff' branch only has a single commit even though I'd
> expect there to be two according to the instructions that were passed to
> git-rebase. It works as expected if there's either no merge-conflict at the
> reword or
On 11/06/18 17:08, Elijah Newren wrote:
> Hi Phillip,
>
> On Mon, Jun 11, 2018 at 8:16 AM, Phillip Wood
> wrote:
>> On 11/06/18 15:42, Elijah Newren wrote:
>
>>> However, we have a bigger problem with empty commits, in that there
>>> are really three modes rather than two:
>>>*
On Sat, Jun 09, 2018 at 03:44:30PM +0200, Martin Ågren wrote:
> On 9 June 2018 at 11:21, Jeff King wrote:
> > On Sat, Jun 09, 2018 at 10:50:36AM +0200, Martin Ågren wrote:
> >
> >> On 9 June 2018 at 10:32, Jeff King wrote:
> >> > Except it _does_ do one non-trivial thing, which is call the
> >>
On 11 June 2018 at 20:20, Jonathan Nieder wrote:
> SZEDER Gábor wrote:
>
>> Being in RC phase, I'm all for aiming for a minimal solution.
>> However, I don't think that the better fix would be erm.. any "less
>> minimal":
>
> Thanks again. May we have your sign-off?
>
>
On Mon, Jun 11, 2018 at 09:43:02AM +, Kirill Smelkov wrote:
> > Looking deeper, we do not need these trees and blobs at all. The problem
> > is really just a tag that peels to an object that is not otherwise a ref
> > tip, regardless of its type.
>
> Thanks for feedback and for coming up
On Mon, Jun 11, 2018 at 8:20 PM, Jonathan Nieder wrote:
> From: SZEDER Gábor
> Subject: completion: correct zsh detection when run from git-completion.zsh
>
> v2.18.0-rc0~90^2 (completion: reduce overhead of clearing cached
> --options, 2018-04-18) worked around a bug in bash's "set" builtin on
On 11/06/18 16:49, Elijah Newren wrote:
> Another thing I missed...
>
> On Sun, Jun 10, 2018 at 12:40 PM, Phillip Wood
> wrote:
>> On 07/06/18 06:06, Elijah Newren wrote:
>
>>> Some exceptions I left out:
>>>
>>>* --merge and --interactive are technically incompatible since they are
>>>
On Tue, Jun 12, 2018 at 10:18:31AM +0200, Crni Gorac wrote:
> I'm working on a large closed-source project. For one of clients, I
> had to create a library that consists of some directories from
> original project, and even within these directories, not all files are
> used for the library. On
On Tue, Jun 12, 2018 at 09:13:54AM +0300, Orgad Shaneh wrote:
> Some of my colleagues use an ancient version of Source Insight, which also
> locks files for write.
If that application is locking files for writing (that is to say, it did
not specify the `FILE_SHARE_WRITE` bit in the sharing modes
On Mon, Jun 11, 2018 at 8:20 PM, Jonathan Nieder wrote:
> From: SZEDER Gábor
> Subject: completion: correct zsh detection when run from git-completion.zsh
>
> v2.18.0-rc0~90^2 (completion: reduce overhead of clearing cached
> --options, 2018-04-18) worked around a bug in bash's "set" builtin on
I'm working on a large closed-source project. For one of clients, I
had to create a library that consists of some directories from
original project, and even within these directories, not all files are
used for the library. On top of that, I've added some files specific
for this library, in
Sie wurden ausgewählt, um eine Spende / Prämiensumme zu erhalten, kontaktieren
Sie wbrde...@gmail.com für weitere Informationen.
E-Mail: wbrde...@gmail.com
On Mon, Jun 11, 2018 at 9:05 PM, brian m. carlson
wrote:
> On Mon, Jun 11, 2018 at 03:47:43AM -0400, Eric Sunshine wrote:
>> The word "translate" is very generic and is (at least in my mind)
>> strongly associated with i18n/l10n, so the name test_translate() may
>> be confusing for readers.
Am 11.06.2018 um 23:58 schrieb Stefan Beller:
On Mon, Jun 4, 2018 at 10:48 PM Bert Wesarg wrote:
the last time this topic came up, Stefan (in Cc) offered to volunteer.
Stefan, is this offer still open? I would support this.
After I made this offer, I started looking at the code base more and
78 matches
Mail list logo
