Re: [PATCH] make slash-rules more readable

2019-05-17 Thread Johannes Sixt
Am 17.05.19 um 23:43 schrieb Dr. Adam Nielsen: >> Another thing that I noticed is that its not mentioned anywhere that >> the pattern use a slash as a directory separator (instead of a >> backslash), its only clear from the examples. Maybe its worth to >> mention it in the "PATTERN FORMAT" section.

Re: [PATCH] doc: hint about GIT_DEBUGGER

2019-05-17 Thread Elijah Newren
Hi Emily, On Fri, May 17, 2019 at 3:40 PM Emily Shaffer wrote: > > We check for a handy environment variable GIT_DEBUGGER when running via > bin-wrappers/, but this feature is undocumented. Add a hint to how to > use it into the CodingGuidelines (which is where other useful > environment settings

Re: Revision walking, commit dates, slop

2019-05-17 Thread Mike Hommey
On Sat, May 18, 2019 at 12:58:28PM +0900, Mike Hommey wrote: > On Sat, May 18, 2019 at 03:50:05AM +0200, SZEDER Gábor wrote: > > On Sat, May 18, 2019 at 09:54:12AM +0900, Mike Hommey wrote: > > > There are established corner cases, where in a repo where commit dates > > > are not monotonically incr

Re: Revision walking, commit dates, slop

2019-05-17 Thread Mike Hommey
On Sat, May 18, 2019 at 03:50:05AM +0200, SZEDER Gábor wrote: > On Sat, May 18, 2019 at 09:54:12AM +0900, Mike Hommey wrote: > > There are established corner cases, where in a repo where commit dates > > are not monotonically increasing, revision walking can go horribly > > wrong. This was discusse

[PATCH v5] userdiff: add Octave

2019-05-17 Thread Boxuan Li
Octave pattern is almost the same as matlab, except that '%%%' and '##' can also be used to begin code sections, in addition to '%%' that is understood by both. Octave pattern is merged into Matlab pattern. Test cases for the hunk header patterns of matlab and octave under t/t4018 are added. Signe

Re: Revision walking, commit dates, slop

2019-05-17 Thread SZEDER Gábor
On Sat, May 18, 2019 at 09:54:12AM +0900, Mike Hommey wrote: > There are established corner cases, where in a repo where commit dates > are not monotonically increasing, revision walking can go horribly > wrong. This was discussed in the past in e.g. > https://public-inbox.org/git/20150521061553.ga

Revision walking, commit dates, slop

2019-05-17 Thread Mike Hommey
Hi, There are established corner cases, where in a repo where commit dates are not monotonically increasing, revision walking can go horribly wrong. This was discussed in the past in e.g. https://public-inbox.org/git/20150521061553.ga29...@glandium.org/ The only (simple) workable way, given the c

Congratulations! Your e-mail address was selected to receive our donation

2019-05-17 Thread Patrick and Frances Connolly

Re: Git ransom campaign incident report - May 2019

2019-05-17 Thread Martin Langhoff
On Fri, May 17, 2019 at 6:20 PM Jeff King wrote: > I hate the magical-ness of 3b, because credential-store really _isn't_ > the best choice. It's just better than the current behavior. At the same > time, by doing it automatically, the existing flow they were using just > works, and is moderately

Re: Git ransom campaign incident report - May 2019

2019-05-17 Thread Jeff King
On Fri, May 17, 2019 at 09:39:55PM +0200, Johannes Schindelin wrote: > > Of course I suspect there are many cases where people _do_ need to store > > the password in plaintext, because an automated system needs to fetch > > with it. They can use the plaintext git-credential-store, but it's > > sli

Re: [RFC WIP PATCH v8 13/13] WIP: can_fast_forward() support for --preserve-merges and --rebase-merges

2019-05-17 Thread Johannes Schindelin
Hi Ævar, On Wed, 8 May 2019, Ævar Arnfjörð Bjarmason wrote: > This seems to work, needs more tests etc... I can see how it works, but it is a bit limited, and at the same time overzealous. The reason why we do not enter the fast-forwarding block in the interactive case would appear to me to be

[PATCH v2] Makefile: remove the NO_R_TO_GCC_LINKER flag

2019-05-17 Thread Ævar Arnfjörð Bjarmason
Change our default CC_LD_DYNPATH invocation to something GCC likes these days. Since the GCC 4.6 release unknown flags haven't been passed through to ld(1). Thus our previous default of CC_LD_DYNPATH=-R would cause an error on modern GCC unless NO_R_TO_GCC_LINKER was set. This CC_LD_DYNPATH flag i

Re: [PATCH] make slash-rules more readable

2019-05-17 Thread Dr. Adam Nielsen
Another thing that I noticed is that its not mentioned anywhere that the pattern use a slash as a directory separator (instead of a backslash), its only clear from the examples. Maybe its worth to mention it in the "PATTERN FORMAT" section. Also its maybe worth to introduce the term "leading

Re: [RFC WIP PATCH v8 11/13] rebase: eliminate side-effects from can_fast_forward()

2019-05-17 Thread Johannes Schindelin
Hi Ævar, On Wed, 8 May 2019, Ævar Arnfjörð Bjarmason wrote: > The can_fast_forward() function is potentially much more expensive > than is_interactive() since it e.g. might need to call > is_linear_history(). > > So reversing the two looks like an obvious improvement, but doing so > reveals a pre

Re: How to update Git's metadata without affecting working dir?

2019-05-17 Thread Philip Oakley
This is a duplicate of a question on the Git Users list. On 17/05/2019 18:04, Rocky Ji wrote: I am working individually at the moment. I have the habit of committing related changes on a regular basis, but I push to GitLab only at the end of class session. ---Events to reproduce the situati

[PATCH] doc: hint about GIT_DEBUGGER

2019-05-17 Thread Emily Shaffer
We check for a handy environment variable GIT_DEBUGGER when running via bin-wrappers/, but this feature is undocumented. Add a hint to how to use it into the CodingGuidelines (which is where other useful environment settings like DEVELOPER are documented). It looks like you can use GIT_DEBUGGER to

Re: [PATCH v2 1/7] run-command: add preliminary support for multiple hooks

2019-05-17 Thread Johannes Schindelin
Hi Hannes, On Thu, 16 May 2019, Johannes Sixt wrote: > Am 16.05.19 um 00:44 schrieb brian m. carlson: > > On Tue, May 14, 2019 at 05:12:39PM +0200, Johannes Schindelin wrote: > >> On Tue, 14 May 2019, brian m. carlson wrote: > >>> +/* > >>> + * Return 1 if a hook exists at path (which may be modi

[PATCH 5/5] send-email: remove support for deprecated sendemail.smtpssl

2019-05-17 Thread Ævar Arnfjörð Bjarmason
Remove the sendemail.smtpssl configuration variable and its associated --smtp-ssl command-line option. This has been documented as deprecated since f6bebd121a ("git-send-email: add support for TLS via Net::SMTP::SSL", 2008-06-25) and 65180c6618 ("List send-email config options in config.txt.", 2009

[PATCH 3/5] send-email: document --no-[to|cc|bcc]

2019-05-17 Thread Ævar Arnfjörð Bjarmason
These options added in f434c083a0 ("send-email: add --no-cc, --no-to, and --no-bcc", 2010-03-07) were never documented. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/git-send-email.txt | 4 1 file changed, 4 insertions(+) diff --git a/Documentation/git-send-email.txt b/Documenta

[PATCH 4/5] send-email: fix regression in sendemail.identity parsing

2019-05-17 Thread Ævar Arnfjörð Bjarmason
Fix a regression in my recent 3494dfd3ee ("send-email: do defaults -> config -> getopt in that order", 2019-05-09). I missed that the $identity variable needs to be extracted from the command-line before we do the config reading, as it determines which config variable we should read first. See [1]

[PATCH 2/5] send-email: fix broken transferEncoding tests

2019-05-17 Thread Ævar Arnfjörð Bjarmason
I fixed a bug that had broken the reading of sendmail.transferEncoding in 3494dfd3ee ("send-email: do defaults -> config -> getopt in that order", 2019-05-09), but the test I added in that commit did nothing to assert the bug had been fixed. That issue originates in 8d81408435 ("git-send-email: ad

[PATCH 1/5] send-email: remove cargo-culted multi-patch pattern in tests

2019-05-17 Thread Ævar Arnfjörð Bjarmason
Change test code added in f434c083a0 ("send-email: add --no-cc, --no-to, and --no-bcc", 2010-03-07) which blindly copied a pattern from an earlier test added in 32ae83194b ("add a test for git-send-email for non-threaded mails", 2009-06-12) where the "$patches" variable was supplied more than once.

[PATCH 0/5] ab/send-email-transferencoding-fix-for-the-fix

2019-05-17 Thread Ævar Arnfjörð Bjarmason
This ab/send-email-transferencoding-fix-for-the-fix series goes on top of the ab/send-email-transferencoding-fix merged into "next". It fixes the sendemail.identity issue Stephen Boyd reported, and then some. Maybe it would be more understandable to rewind the existing topic out of next and produc

Re: [PATCH v3] userdiff.c & doc/gitattributes.txt: add Octave

2019-05-17 Thread Johannes Sixt
Am 17.05.19 um 14:19 schrieb LI, BO XUAN: > On Fri, May 17, 2019 at 7:34 AM Junio C Hamano wrote: >> >> Johannes Sixt writes: >> >>> I'd prefer to keep this list at the minimum necessary as long as it is >>> hard-coded in C. >> >> Yeah, I know that feeling. > > So do we reach a consensus? Should

Re: Git ransom campaign incident report - May 2019

2019-05-17 Thread Johannes Schindelin
Hi, On Thu, 16 May 2019, Jeff King wrote: > On Wed, May 15, 2019 at 08:59:47PM +0200, Ævar Arnfjörð Bjarmason wrote: > > > > > On Wed, May 15 2019, Martin Langhoff wrote: > > > > > Spotted this on the internet... > > > > > > https://github.blog/2019-05-14-git-ransom-campaign-incident-report/ > >

[PATCH] diff: fix mistake in translatable strings

2019-05-17 Thread Jean-Noël Avila
Signed-off-by: Jean-Noël Avila --- diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/diff.c b/diff.c index 4d3cf83a27..6e87f95645 100644 --- a/diff.c +++ b/diff.c @@ -5453,13 +5453,13 @@ static void prep_parse_options(struct diff_options *options)

[PATCH v6 2/2] documentation: add anchors to MyFirstContribution

2019-05-17 Thread Emily Shaffer
During the course of review for MyFirstContribution.txt, the suggestion came up to include anchors to make it easier for veteran contributors to link specific sections of this documents to newbies. To make life easier for reviewers, add these anchors in their own commit. See review context here: ht

[PATCH v6 1/2] documentation: add tutorial for first contribution

2019-05-17 Thread Emily Shaffer
This tutorial covers how to add a new command to Git and, in the process, everything from cloning git/git to getting reviewed on the mailing list. It's meant for new contributors to go through interactively, learning the techniques generally used by the git/git development community. Reviewed-by:

[PATCH v6 0/2] documentation: add tutorial for first contribution

2019-05-17 Thread Emily Shaffer
Only minor changes since v5. Removed 'official' from the blurb about the Github mirror, and removed some spurious braces around oneline code branches. Emily Shaffer (2): documentation: add tutorial for first contribution documentation: add anchors to MyFirstContribution Documentation/Makefil

Re: [PATCH 1/2] pkt-line: fix declaration of `set_packet_header()`

2019-05-17 Thread Johannes Schindelin
Hi Junio, On Thu, 16 May 2019, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> lacked the "const" for that reason, but apparently some compilers > >> complain about the parameter type mismatch. > > > > We could be more explicit, as we know exactly that it is MS Visual C 2017 > > that

[PATCH 0/3] Close commit-graph before calling 'gc'

2019-05-17 Thread Derrick Stolee via GitGitGadget
In Windows, the way we rename a lock file to replace the underlying file does not work when a process holds a read handle. For this reason, we call close_all_packs() everywhere before starting a git gc --auto subprocess. We also call close_commit_graph() before renaming the commit-graph lock file.

[PATCH 2/3] packfile: close commit-graph in close_all_packs

2019-05-17 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The close_all_packs() method is used to close all read handles to pack-files and the multi-pack-index before running 'git gc --auto'. This is particularly important on the Windows platform, where read handles block any writes to those files. Replacing one of these files with

[PATCH 1/3] commit-graph: use raw_object_store when closing

2019-05-17 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The close_commit_graph() method took a repository struct, but then only uses the raw_object_store within. Change the function prototype to make the method more flexible. Signed-off-by: Derrick Stolee --- commit-graph.c | 8 commit-graph.h | 2 +- upload-pack.c |

[PATCH 3/3] packfile: close_all_packs to close_object_store

2019-05-17 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The close_all_packs() method is now responsible for more than just pack-files. It also closes the commit-graph and the multi-pack-index. Rename the function to be more descriptive of its larger role. The name also fits because the input parameter is a raw_object_store. Signe

Re: [PATCH 2/2] index-pack: prefetch missing REF_DELTA bases

2019-05-17 Thread Johannes Schindelin
Hi Jonathan, On Wed, 15 May 2019, Jonathan Tan wrote: > > > To resolve this, prefetch all missing REF_DELTA bases before attempting > > > to resolve them. This both ensures that all bases are attempted to be > > > fetched, and ensures that we make only one request per index-pack > > > invocation,

Re: [PATCH 1/1] stash: document stash.useBuiltin

2019-05-17 Thread Johannes Schindelin
Hi Junio, On Wed, 15 May 2019, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> See a few nits below, none of which are necessarily worth a re-roll. > > > > Thanks! > > > > Junio, do you agree, do you want to fix it up on your side? > > I think you'd see all of them in what I've pushed

Re: js/difftool-no-index, was Re: What's cooking in git.git (May 2019, #02; Tue, 14)

2019-05-17 Thread Johannes Schindelin
Hi Junio, On Wed, 15 May 2019, Junio C Hamano wrote: > Johannes Schindelin writes: > > I was imagining what would happen if we treat _everything_ in the two > directories being compared by "difftool --dir-diff --no-index" as if it > is tracked. Isn't this exactly what `git difftool --no-index`

How to update Git's metadata without affecting working dir?

2019-05-17 Thread Rocky Ji
I am working individually at the moment. I have the habit of committing related changes on a regular basis, but I push to GitLab only at the end of class session. ---Events to reproduce the situation Thursday, in school: - `git clone https://gitlab.../my-repo` - create a few .rst docu

Re: Resetting files during a merge causes loss of resetted change, invisible in commit logs.

2019-05-17 Thread Elijah Newren
Hi Thijs, On Fri, May 17, 2019 at 3:47 AM Thijs ter Horst wrote: > > Dear all, > > Disclaimer: I have never done a bug report / worked with mailing lists > before, so if I'm doing things wrong I'd gladly hear. > > As the title describes, git can change files without logging the > change. I'm not

Re: [PATCH v2 0/6] teach branch-specific options for format-patch

2019-05-17 Thread Denton Liu
Hi Junio, I just realised that my use-cases wouldn't be fully covered with the onBranch configuration option. On Fri, May 17, 2019 at 03:25:15AM -0400, Denton Liu wrote: > Hi Junio, > > On Fri, May 17, 2019 at 01:12:04PM +0900, Junio C Hamano wrote: > > Denton Liu writes: > > > > > diff --git

Re: [RFC PATCH 3/3] list-objects-filter: implement composite filters

2019-05-17 Thread Matthew DeVore
> On May 16, 2019, at 8:25 PM, Junio C Hamano wrote: >> >> $ git rev-list --filter=tree:2 --filter:blob:limit=32k > > Shouldn't the second one say "--filter=blob:limit=32k" (i.e. the > first colon should be an equal sign)? That's right. Fixed locally. > >> Such usage is currently an e

Re: Merging (joining/stiching/rewriting) history of "unrelated" git repositories

2019-05-17 Thread Piotr Krukowiecki
On Thu, May 16, 2019 at 8:38 AM Piotr Krukowiecki wrote: > > On Wed, May 15, 2019 at 10:34 PM Elijah Newren wrote: > > > > On Wed, May 15, 2019 at 8:30 AM Ævar Arnfjörð Bjarmason > > wrote: > > > > > > On Wed, May 15 2019, Piotr Krukowiecki wrote: > > > > > > > Hello, > > > > > > > > I'm migrati

Re: [PATCH v3] userdiff.c & doc/gitattributes.txt: add Octave

2019-05-17 Thread LI, BO XUAN
On Fri, May 17, 2019 at 7:34 AM Junio C Hamano wrote: > > Johannes Sixt writes: > > > I'd prefer to keep this list at the minimum necessary as long as it is > > hard-coded in C. > > Yeah, I know that feeling. > So do we reach a consensus? Should I merge the Octave rules into Matlab rules? Best

[Patch] Fixing diff.ignoreSubmodules

2019-05-17 Thread Allan Jensen
Hi git team I had trouble getting diff.ignoreSubmodules to work at all in any of my git projects, and googling around I found many other people who also couldn't get it to work. I found the source of the issue and attached a patch fixing it, though the old non-working behavior seems to have bee

Re: [PATCH v2] userdiff: add built-in pattern for rust

2019-05-17 Thread Marc-André Lureau
Hi On Fri, May 17, 2019 at 8:26 AM Johannes Sixt wrote: > > Am 17.05.19 um 01:58 schrieb marcandre.lur...@redhat.com: > > From: Marc-André Lureau > > > > This adds xfuncname and word_regex patterns for Rust, a quite > > popular programming language. It also includes test cases for the > > xfuncn

Re: getting pull/push/fetch url

2019-05-17 Thread clime
On Fri, 17 May 2019 at 13:02, clime wrote: > > On Fri, 17 May 2019 at 10:10, Eric Sunshine wrote: > > > > On Fri, May 17, 2019 at 3:30 AM clime wrote: > > > for my app, i need to be able get remote urls (fetch/pull/push) so > > > that i can derive some information from those, e.g. pull url netlo

Re: getting pull/push/fetch url

2019-05-17 Thread clime
On Fri, 17 May 2019 at 10:10, Eric Sunshine wrote: > > On Fri, May 17, 2019 at 3:30 AM clime wrote: > > for my app, i need to be able get remote urls (fetch/pull/push) so > > that i can derive some information from those, e.g. pull url netloc > > from which i derive where other custom endpoints (

Resetting files during a merge causes loss of resetted change, invisible in commit logs.

2019-05-17 Thread Thijs ter Horst
Dear all, Disclaimer: I have never done a bug report / worked with mailing lists before, so if I'm doing things wrong I'd gladly hear. As the title describes, git can change files without logging the change. I'm not sure how to describe it shortly, so I've made a minimal reproduction at 'https://

Re: [PATCH 2/2] index-pack: prefetch missing REF_DELTA bases

2019-05-17 Thread Jeff King
On Fri, May 17, 2019 at 02:20:42PM +0700, Duy Nguyen wrote: > On Fri, May 17, 2019 at 12:35 PM Jeff King wrote: > > As it turns out, index-pack does not handle these complicated cases at > > all! In the final fix_unresolved_deltas(), we are only looking for thin > > deltas, and anything that was

Re: getting pull/push/fetch url

2019-05-17 Thread Eric Sunshine
On Fri, May 17, 2019 at 3:30 AM clime wrote: > for my app, i need to be able get remote urls (fetch/pull/push) so > that i can derive some information from those, e.g. pull url netloc > from which i derive where other custom endpoints (binary file storage) > related to the remote git repo is locat

Re: [PATCH] worktree add: be tolerant of corrupt worktrees

2019-05-17 Thread Eric Sunshine
On Mon, May 13, 2019 at 6:50 AM Nguyễn Thái Ngọc Duy wrote: > find_worktree() can die() unexpectedly because it uses real_path() > instead of the gentler version. When it's used in 'git worktree add' [1] > and there's a bad worktree, this die() could prevent people from adding > new worktrees. Th

getting pull/push/fetch url

2019-05-17 Thread clime
Hello, for my app, i need to be able get remote urls (fetch/pull/push) so that i can derive some information from those, e.g. pull url netloc from which i derive where other custom endpoints (binary file storage) related to the remote git repo is located. This is just one example. I am also using

Re: [PATCH v2 0/6] teach branch-specific options for format-patch

2019-05-17 Thread Denton Liu
Hi Junio, On Fri, May 17, 2019 at 01:12:04PM +0900, Junio C Hamano wrote: > Denton Liu writes: > > > diff --git a/Documentation/config/format.txt > > b/Documentation/config/format.txt > > index dc77941c48..d387451573 100644 > > --- a/Documentation/config/format.txt > > +++ b/Documentation/confi

Re: [PATCH 2/2] index-pack: prefetch missing REF_DELTA bases

2019-05-17 Thread Duy Nguyen
On Fri, May 17, 2019 at 12:35 PM Jeff King wrote: > As it turns out, index-pack does not handle these complicated cases at > all! In the final fix_unresolved_deltas(), we are only looking for thin > deltas, and anything that was not yet resolved is assumed to be a thin > object. In many of these c