Re: [PATCH v2 0/8] commit-graph: segfault & other fixes for broken graphs

2019-03-15 Thread Eric Sunshine
On Thu, Mar 14, 2019 at 5:47 PM Ævar Arnfjörð Bjarmason wrote: > I fixed a test to avoid the pattern a0a630192d > (t/check-non-portable-shell: detect "FOO=bar shell_func", 2018-07-13) > tests for. The new pattern is more obvious. > > As an aside I don't get how that doesn't work as intended from t

Re: [PATCH v3 17/21] switch: no implicit dwim, use --guess to dwim

2019-03-15 Thread Eric Sunshine
On Wed, Mar 13, 2019 at 2:36 PM Eckhard Maaß wrote: > On Fri, Mar 08, 2019 at 04:57:48PM +0700, Nguyễn Thái Ngọc Duy wrote: > > Similar to automatic detach, this behavior could be confusing because > > it can sometimes create a new branch without a user asking it to, > > especially when the user i

[GSoC] Microproject: Add more builtin patterns for userdiff

2019-03-15 Thread Kapil Jain
Hi, for the microproject: creating diff function support for different languages. i wrote one for shell script, have tested it outside of git and it works fine. query regarding accommodating the pattern in: 1) userdiff.c, it uses - #define PATTERNS(name, pattern, word_regex), for defining pattern

Re: [PATCH v3 17/21] switch: no implicit dwim, use --guess to dwim

2019-03-15 Thread Duy Nguyen
On Fri, Mar 15, 2019 at 3:19 PM Eric Sunshine wrote: > > On Wed, Mar 13, 2019 at 2:36 PM Eckhard Maaß > wrote: > > On Fri, Mar 08, 2019 at 04:57:48PM +0700, Nguyễn Thái Ngọc Duy wrote: > > > Similar to automatic detach, this behavior could be confusing because > > > it can sometimes create a new

Re: [PATCH v2 2/7] gc: convert to using the_hash_algo

2019-03-15 Thread Duy Nguyen
On Thu, Mar 14, 2019 at 7:34 PM Ævar Arnfjörð Bjarmason wrote: > > There's been a lot of changing of the hardcoded "40" values to > the_hash_algo->hexsz, but we've so far missed this one where we > hardcoded 38 for the loose object file length. Wow. Good catch. > diff --git a/builtin/gc.c b/buil

Re: [PATCH v2 5/7] reflog: exit early if there's no work to do

2019-03-15 Thread Duy Nguyen
On Thu, Mar 14, 2019 at 7:35 PM Ævar Arnfjörð Bjarmason wrote: > > When gc.reflogExpire and gc.reflogExpireUnreachable are set to "never" > and --stale-fix isn't in effect (covered by the first part of the "if" > statement being modified here) we can exit early without pointlessly > looping over a

Re: [PATCH v2 6/7] gc: don't run "reflog expire" when keeping reflogs

2019-03-15 Thread Duy Nguyen
On Thu, Mar 14, 2019 at 7:35 PM Ævar Arnfjörð Bjarmason wrote: > @@ -127,6 +140,10 @@ static void gc_config(void) > pack_refs = git_config_bool("gc.packrefs", value); > } > > + if (gc_config_is_timestamp_never("gc.reflogexpire") && > + gc_config_is_t

Re: [PATCH v2 6/7] gc: don't run "reflog expire" when keeping reflogs

2019-03-15 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 15 2019, Duy Nguyen wrote: > On Thu, Mar 14, 2019 at 7:35 PM Ævar Arnfjörð Bjarmason > wrote: >> @@ -127,6 +140,10 @@ static void gc_config(void) >> pack_refs = git_config_bool("gc.packrefs", value); >> } >> >> + if (gc_config_is_timestamp_never

Re: [PATCH v2 6/7] gc: don't run "reflog expire" when keeping reflogs

2019-03-15 Thread Duy Nguyen
On Fri, Mar 15, 2019 at 5:24 PM Ævar Arnfjörð Bjarmason wrote: > > > On Fri, Mar 15 2019, Duy Nguyen wrote: > > > On Thu, Mar 14, 2019 at 7:35 PM Ævar Arnfjörð Bjarmason > > wrote: > >> @@ -127,6 +140,10 @@ static void gc_config(void) > >> pack_refs = git_config_bool("gc.p

Re: [PATCH v2 0/8] commit-graph: segfault & other fixes for broken graphs

2019-03-15 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 15 2019, Eric Sunshine wrote: > On Thu, Mar 14, 2019 at 5:47 PM Ævar Arnfjörð Bjarmason > wrote: >> I fixed a test to avoid the pattern a0a630192d >> (t/check-non-portable-shell: detect "FOO=bar shell_func", 2018-07-13) >> tests for. The new pattern is more obvious. >> >> As an asid

Re: [PATCH v2 2/7] gc: convert to using the_hash_algo

2019-03-15 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 15 2019, Duy Nguyen wrote: > On Thu, Mar 14, 2019 at 7:34 PM Ævar Arnfjörð Bjarmason > wrote: >> >> There's been a lot of changing of the hardcoded "40" values to >> the_hash_algo->hexsz, but we've so far missed this one where we >> hardcoded 38 for the loose object file length. > >

Re: [PATCH v2 7/7] reflog expire: don't assert the OID when locking refs

2019-03-15 Thread Duy Nguyen
On Thu, Mar 14, 2019 at 7:35 PM Ævar Arnfjörð Bjarmason wrote: > > During reflog expiry, the cmd_reflog_expire() function first iterates > over all reflogs in logs/*, and then one-by-one acquires the lock for > each one to expire its reflog by getting a *.lock file on the > corresponding loose ref

Ok

2019-03-15 Thread Tuan Nguyenthanh
Được gửi từ thiết bị di động Huawei

"git clone --shallow-exclude ...", fatal: the remote end hung up unexpectedly

2019-03-15 Thread Robert P. J. Day
probably doing something idiotic but i'm enumerating variations of shallow cloning, and tried the following: $ git clone --shallow-exclude=master https://github.com/django/django.git Cloning into 'django'... fatal: the remote end hung up unexpectedly $ it is entirely reproducible, and some

Re: "git clone --shallow-exclude ...", fatal: the remote end hung up unexpectedly

2019-03-15 Thread Duy Nguyen
On Fri, Mar 15, 2019 at 7:17 PM Robert P. J. Day wrote: > > > probably doing something idiotic but i'm enumerating variations of > shallow cloning, and tried the following: > > $ git clone --shallow-exclude=master https://github.com/django/django.git > Cloning into 'django'... > fatal: the remot

Re: [GSoC][PATCH v2 1/5] t0000-basic: fix an indentation error

2019-03-15 Thread Christian Couder
Hi, On Fri, Mar 15, 2019 at 2:55 AM jonathan chang wrote: > > On Mon, Mar 11, 2019 at 1:59 AM Thomas Gummerer wrote: > > > > On 03/10, Jonathan Chang wrote: > > > Also I found that there is no such function as test_char_count, > > > is it worthwile to add such function? Here are some stat: > >

Re: [GSoC] Microproject: Add more builtin patterns for userdiff

2019-03-15 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 15 2019, Kapil Jain wrote: > Hi, > > for the microproject: creating diff function support for different languages. > i wrote one for shell script, have tested it outside of git and it works fine. > > query regarding accommodating the pattern in: > 1) userdiff.c, it uses - #define PAT

ALMIGHTY GOD HAS DONE­ IT,

2019-03-15 Thread Mr.Abderazack Zebdani
Dear Friend, I hope you are fine over there in your country. I know that this message will come as a surprise to you but let me start by introducing myself; I am Mr.Abderazack Zebdani, Manager of Bank of Africa BOA Burkina Faso. I am writing you this letter to fulfill the promise I have with Almi

Re: "git clone --shallow-exclude ...", fatal: the remote end hung up unexpectedly

2019-03-15 Thread Robert P. J. Day
On Fri, 15 Mar 2019, Duy Nguyen wrote: > On Fri, Mar 15, 2019 at 7:17 PM Robert P. J. Day > wrote: > > > > > > probably doing something idiotic but i'm enumerating variations of > > shallow cloning, and tried the following: > > > > $ git clone --shallow-exclude=master https://github.com/django

Re: [PATCH v2 3/3] difftool: allow running outside Git worktrees with --no-index

2019-03-15 Thread Johannes Schindelin
Hi Peff, On Thu, 14 Mar 2019, Jeff King wrote: > On Thu, Mar 14, 2019 at 04:25:04AM -0700, Johannes Schindelin via > GitGitGadget wrote: > > > @@ -714,6 +714,7 @@ int cmd_difftool(int argc, const char **argv, const > > char *prefix) > > "tool returns a non - zero exit c

Re: [PATCH v2 2/3] parse-options: make OPT_ARGUMENT() more useful

2019-03-15 Thread Johannes Schindelin
Hi Peff, On Thu, 14 Mar 2019, Jeff King wrote: > On Thu, Mar 14, 2019 at 04:25:04AM -0700, Johannes Schindelin via > GitGitGadget wrote: > > > diff --git a/Documentation/technical/api-parse-options.txt > > b/Documentation/technical/api-parse-options.txt > > index 2b036d7838..2e2e7c10c6 100644

Re: [PATCH 1/2] t5310: correctly remove bitmaps for jgit test

2019-03-15 Thread SZEDER Gábor
On Fri, Mar 15, 2019 at 02:22:44AM -0400, Jeff King wrote: > We use "jgit gc" to generate a pack bitmap file, and then make sure our > implementation can read it. To prepare the repo before running jgit, we > try to "rm -f" any existing bitmap files. But we got the path wrong; > we're in a bare rep

Re: "git clone --shallow-exclude ...", fatal: the remote end hung up unexpectedly

2019-03-15 Thread Duy Nguyen
On Fri, Mar 15, 2019 at 8:19 PM Robert P. J. Day wrote: > this is the first time i've played with this feature, so i'm still > working my way through the man page, trying to figure out the various > valid combinations for shallow cloning. > > i notice that the SYNOPSIS for "man git-clone" does

Re: [RFC/PATCH] point pull requesters to Git Git Gadget

2019-03-15 Thread Johannes Schindelin
Hi Peff, On Thu, 14 Mar 2019, Jeff King wrote: > On Thu, Mar 14, 2019 at 12:31:21PM +0100, Johannes Schindelin wrote: > > > > Hmm. I guess it is still an issue in GGG. This thread has identical > > > timestamps on patches 1 and 2 (and my server received them out of order > > > by 2 seconds, so m

[PATCH v3] rebase: remove the rebase.useBuiltin setting

2019-03-15 Thread Ævar Arnfjörð Bjarmason
Remove the rebase.useBuiltin setting, which was added as an escape hatch to disable the builtin version of rebase first released with Git 2.20. See [1] for the initial implementation of rebase.useBuiltin, and [2] and [3] for the documentation and corresponding GIT_TEST_REBASE_USE_BUILTIN option.

Re: "git clone --shallow-exclude ...", fatal: the remote end hung up unexpectedly

2019-03-15 Thread Robert P. J. Day
On Fri, 15 Mar 2019, Duy Nguyen wrote: > On Fri, Mar 15, 2019 at 8:19 PM Robert P. J. Day > wrote: > > this is the first time i've played with this feature, so i'm > > still working my way through the man page, trying to figure out > > the various valid combinations for shallow cloning. > > >

Re: GitGitGadget on github.com/git/git?, was Re: [RFC/PATCH] point pull requesters to Git Git Gadget

2019-03-15 Thread Johannes Schindelin
Hi Peff, On Thu, 14 Mar 2019, Jeff King wrote: > On Thu, Mar 14, 2019 at 01:04:51PM +0100, Johannes Schindelin wrote: > > > > One thing that I think submitGit can do that GGG cannot (yet), is just > > > take PRs straight on git/git. If we're going to start recommending it, > > > then I think we'

[GSoC][RFC/PATCH 0/1]

2019-03-15 Thread jkapil . cs
From: Kapil Kapil (1): userdiff - support shell script t/t4018-diff-funcname.sh | 1 + t/t4034-diff-words.sh| 1 + userdiff.c | 5 + 3 files changed, 7 insertions(+) -- 2.14.2

[GSoC][RFC/PATCH 1/1] userdiff - support shell script

2019-03-15 Thread jkapil . cs
From: Kapil Made a minor change of adding regex for identifying functions in shell scripts. This regex has been tested separately from git. For testing with git, please let me know. This is just to get familiar with whole workflow, regex for word_regex parameter will be added in next patch. --

Re: straw poll: git merge conference location

2019-03-15 Thread Johannes Schindelin
Hi Ævar & Peff (and most importantly, Junio!), On Thu, 14 Mar 2019, Jeff King wrote: > > Maybe we can compromise on this whole ongoing NA v.s. Europe debate > > and meet in Iceland :) > > Iceland Air is always trying to sell me that "Reykjavik stopover"... Iceland! I could be talked into that.

Re: [PATCH v3] rebase: remove the rebase.useBuiltin setting

2019-03-15 Thread Johannes Schindelin
Hi Ævar, On Fri, 15 Mar 2019, Ævar Arnfjörð Bjarmason wrote: > Remove the rebase.useBuiltin setting, which was added as an escape > hatch to disable the builtin version of rebase first released with Git > 2.20. > > See [1] for the initial implementation of rebase.useBuiltin, and [2] > and [3] fo

Re: [PATCH v2 2/7] gc: convert to using the_hash_algo

2019-03-15 Thread Johannes Schindelin
Hi Ævar, On Fri, 15 Mar 2019, Ævar Arnfjörð Bjarmason wrote: > > On Fri, Mar 15 2019, Duy Nguyen wrote: > > > On Thu, Mar 14, 2019 at 7:34 PM Ævar Arnfjörð Bjarmason > > wrote: > >> > >> There's been a lot of changing of the hardcoded "40" values to > >> the_hash_algo->hexsz, but we've so far

Re: [PATCH v2 5/7] reflog: exit early if there's no work to do

2019-03-15 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 15 2019, Duy Nguyen wrote: > On Thu, Mar 14, 2019 at 7:35 PM Ævar Arnfjörð Bjarmason > wrote: >> >> When gc.reflogExpire and gc.reflogExpireUnreachable are set to "never" >> and --stale-fix isn't in effect (covered by the first part of the "if" >> statement being modified here) we c

Re: [PATCH v2 6/7] gc: don't run "reflog expire" when keeping reflogs

2019-03-15 Thread Johannes Schindelin
Hi Ævar, On Fri, 15 Mar 2019, Ævar Arnfjörð Bjarmason wrote: > > On Fri, Mar 15 2019, Duy Nguyen wrote: > > > On Thu, Mar 14, 2019 at 7:35 PM Ævar Arnfjörð Bjarmason > > wrote: > >> @@ -127,6 +140,10 @@ static void gc_config(void) > >> pack_refs = git_config_bool("gc.pa

Re: [PATCH v2 7/7] reflog expire: don't assert the OID when locking refs

2019-03-15 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 15 2019, Duy Nguyen wrote: > On Thu, Mar 14, 2019 at 7:35 PM Ævar Arnfjörð Bjarmason > wrote: >> >> During reflog expiry, the cmd_reflog_expire() function first iterates >> over all reflogs in logs/*, and then one-by-one acquires the lock for >> each one to expire its reflog by gett

[PATCH v3 0/8] gc: minor code cleanup + contention fixes

2019-03-15 Thread Ævar Arnfjörð Bjarmason
Changes since v2: * The "let's detect that we don't need work in reflog expire" patch is gone, as noted in a new set of tests/commit messages that was tricker than expected, and not worth it. * Minor rewording fixes to commit messages. * Further paraphrased rationale in commit messages

[PATCH v3 1/8] gc: remove redundant check for gc_auto_threshold

2019-03-15 Thread Ævar Arnfjörð Bjarmason
Checking gc_auto_threshold in too_many_loose_objects() was added in 17815501a8 ("git-gc --auto: run "repack -A -d -l" as necessary.", 2007-09-17) when need_to_gc() itself was also reliant on gc_auto_pack_limit before its early return: gc_auto_threshold <= 0 && gc_auto_pack_limit <= 0 When tha

[PATCH v3 2/8] gc: convert to using the_hash_algo

2019-03-15 Thread Ævar Arnfjörð Bjarmason
There's been a lot of changing of the hardcoded "40" values to the_hash_algo->hexsz, but we've so far missed this one where we hardcoded 38 for the loose object file length. This is because a SHA-1 like abcde[...] gets turned into objects/ab/cde[...]. There's no reason to suppose the same won't be

[PATCH v3 5/8] reflog tests: test for the "points nowhere" warning

2019-03-15 Thread Ævar Arnfjörð Bjarmason
The "git reflog expire" command when given an unknown reference has since 4264dc15e1 ("git reflog expire", 2006-12-19) when this command was implemented emit an error, but this has never been tested for. Let's test for it, also under gc.reflogExpire{Unreachable,}=never in case a future change is t

[PATCH v3 3/8] gc: refactor a "call me once" pattern

2019-03-15 Thread Ævar Arnfjörð Bjarmason
Change an idiom we're using to ensure that gc_before_repack() only does work once (see 62aad1849f ("gc --auto: do not lock refs in the background", 2014-05-25)) to be more obvious. Nothing except this function cares about the "pack_refs" and "prune_reflogs" variables, so let's not leave the reader

[PATCH v3 4/8] reflog tests: make use of "test_config" idiom

2019-03-15 Thread Ævar Arnfjörð Bjarmason
Change a couple of tests that weren't using the helper to use it. This makes the trailing "--unset" unnecessary. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t1410-reflog.sh | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh in

[PATCH v3 6/8] reflog tests: assert lack of early exit with expiry="never"

2019-03-15 Thread Ævar Arnfjörð Bjarmason
When gc.reflogExpire and gc.reflogExpireUnreachable are set to "never" and --stale-fix isn't in effect (covered by the first part of the "if" statement being modified here) we *could* exit early without pointlessly looping over all the reflogs. However, as an earlier change to add a test for the "

[PATCH v3 8/8] reflog expire: don't assert the OID when locking refs

2019-03-15 Thread Ævar Arnfjörð Bjarmason
During reflog expiry, the cmd_reflog_expire() function first iterates over all reflogs in logs/*, and then one-by-one acquires the lock for each one to expire its reflog by getting a *.lock file on the corresponding loose ref[1] (even if the actual ref is packed). This lock is needed, but what isn

[PATCH v3 7/8] gc: handle & check gc.reflogExpire config

2019-03-15 Thread Ævar Arnfjörð Bjarmason
Don't redundantly run "git reflog expire --all" when gc.reflogExpire and gc.reflogExpireUnreachable are set to "never", and die immediately if those configuration valuer are bad. As an earlier "assert lack of early exit" change to the tests for "git reflog expire" shows, an early check of gc.reflo

[WIP PATCH/RFC] Use a higher range-diff --creation-factor for format-patch

2019-03-15 Thread Ævar Arnfjörð Bjarmason
I just submittted https://public-inbox.org/git/20190315155959.12390-1-ava...@gmail.com/ and for 8/8 had to tweak the creation factor to 80% due to having added a large comment. Maybe something like the below makes more sense for format-patch? Also, the "Algorithm" section of git-range-diff describ

Re: [PATCH v3] rebase: remove the rebase.useBuiltin setting

2019-03-15 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 15 2019, Johannes Schindelin wrote: > Hi Ævar, > > On Fri, 15 Mar 2019, Ævar Arnfjörð Bjarmason wrote: > >> Remove the rebase.useBuiltin setting, which was added as an escape >> hatch to disable the builtin version of rebase first released with Git >> 2.20. >> >> See [1] for the init

.gitignore negates by mask problem

2019-03-15 Thread Maxim some
Problem: Not possible to setup exclusion with /**/ mask and names with "dot" Directory structure: conf/ conf/server.conf conf/server.conf.default conf/etc/ conf/etc/php.ini conf/etc/php.ini.default conf/etc/init.d/ conf/etc/init.d/fail2ban conf/etc/init.d/fail2ban.default controls/ controls/on_ser

Re: GitGitGadget on github.com/git/git?, was Re: [RFC/PATCH] point pull requesters to Git Git Gadget

2019-03-15 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 15 2019, Johannes Schindelin wrote: > Hi Peff, > > On Thu, 14 Mar 2019, Jeff King wrote: > >> On Thu, Mar 14, 2019 at 01:04:51PM +0100, Johannes Schindelin wrote: >> >> > > One thing that I think submitGit can do that GGG cannot (yet), is just >> > > take PRs straight on git/git. If

Re: "Problems" with git format-patch --thread email header ordering

2019-03-15 Thread Linus Torvalds
On Thu, Mar 14, 2019 at 9:47 PM Junio C Hamano wrote: > > Linus Torvalds writes: > > > While it's true that header ordering isn't specified, there's a common > > "canonical" order that the headers are listed in. To quote rfc822: > > ... > > body must occur AFTER the headers. It i

Re: [PATCH 1/2] t5310: correctly remove bitmaps for jgit test

2019-03-15 Thread Jeff King
On Fri, Mar 15, 2019 at 02:25:45PM +0100, SZEDER Gábor wrote: > > Our reader implementation will ignore one of the bitmap files, but it's > > likely non-deterministic which one we will use. We'd prefer the one with > > the more recent timestamp (just because of the way the packed_git list > > is s

Re: [PATCH 2/2] trace2: randomize/timestamp trace2 targets

2019-03-15 Thread Jeff Hostetler
On 3/13/2019 7:49 PM, Ævar Arnfjörð Bjarmason wrote: On Thu, Mar 14 2019, Josh Steadmon wrote: When the value of a trace2 environment variable contains instances of the string "%ISO8601%", expand them into the current UTC timestamp in ISO 8601 format. Any reason not to just support feedin

Re: GitGitGadget on github.com/git/git?, was Re: [RFC/PATCH] point pull requesters to Git Git Gadget

2019-03-15 Thread Jeff King
On Fri, Mar 15, 2019 at 05:28:08PM +0100, Ævar Arnfjörð Bjarmason wrote: > FWIW I'd love to see it on git/git for discoverability. From the rest of > your E-Mail it sounds like you're working on that. So just a +1. > > If that doesn't work for whatever reason maybe we can amend git.git with > thi

Re: [RFC/PATCH] point pull requesters to Git Git Gadget

2019-03-15 Thread Jeff King
On Fri, Mar 15, 2019 at 02:42:42PM +0100, Johannes Schindelin wrote: > Another thing that I always dreamed of having: GitGitGadget could > automatically warn about commit messages that are incomplete, that > disagree with our preferred format, that contain typos or offensive > language. > > Likew

Shorthand for "$(git merge-base A B)"

2019-03-15 Thread John Passaro
I find myself fairly frequently doing something like "git log $(git merge-base A B)..C". As far as I can tell, there is no shorthand for the $() part of this, but it seems like something that could be pretty naturally added, or documented better if there is some esoteric combination of the existing

Re: [WIP PATCH/RFC] Use a higher range-diff --creation-factor for format-patch

2019-03-15 Thread Eric Sunshine
On Fri, Mar 15, 2019 at 12:09 PM Ævar Arnfjörð Bjarmason wrote: > diff --git a/Documentation/git-format-patch.txt > b/Documentation/git-format-patch.txt > @@ -261,6 +261,10 @@ material (this may change in the future). > +Defaults to 90, whereas the linkgit:git-range-diff[1] default is > +60. It's

Re: [PATCH 0/2] Randomize / timestamp trace2 targets

2019-03-15 Thread Jeff Hostetler
On 3/13/2019 7:33 PM, Josh Steadmon wrote: Persistently enabling trace2 output is difficult because it requires specifying a full filename. This series teaches tr2_dst_get_trace_fd() to randomize filenames when a directory or filename prefix are given as targets in the GIT_TR2_* envvars. It al

Re: [WIP PATCH/RFC] Use a higher range-diff --creation-factor for format-patch

2019-03-15 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 15 2019, Eric Sunshine wrote: > On Fri, Mar 15, 2019 at 12:09 PM Ævar Arnfjörð Bjarmason > wrote: >> diff --git a/Documentation/git-format-patch.txt >> b/Documentation/git-format-patch.txt >> @@ -261,6 +261,10 @@ material (this may change in the future). >> +Defaults to 90, whereas

Re: [PATCH 2/2] trace2: randomize/timestamp trace2 targets

2019-03-15 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 15 2019, Jeff Hostetler wrote: > On 3/13/2019 7:49 PM, Ævar Arnfjörð Bjarmason wrote: >> >> On Thu, Mar 14 2019, Josh Steadmon wrote: >> >>> When the value of a trace2 environment variable contains instances of >>> the string "%ISO8601%", expand them into the current UTC timestamp in

Re: [PATCH 2/2] trace2: randomize/timestamp trace2 targets

2019-03-15 Thread Jeff Hostetler
On 3/15/2019 3:26 PM, Ævar Arnfjörð Bjarmason wrote: On Fri, Mar 15 2019, Jeff Hostetler wrote: [...] I'm routing the Trace2 data to a named-pipe/socket and have a daemon collecting and filtering, so I have a single pathname for output and yet get the per-file stream handling that I think

Re: [PATCH 0/2] Randomize / timestamp trace2 targets

2019-03-15 Thread Josh Steadmon
On 2019.03.14 15:34, Johannes Schindelin wrote: > Hi Josh, > > On Wed, 13 Mar 2019, Josh Steadmon wrote: > > > Persistently enabling trace2 output is difficult because it requires > > specifying a full filename. This series teaches tr2_dst_get_trace_fd() > > to randomize filenames when a director

Re: [PATCH 0/2] Randomize / timestamp trace2 targets

2019-03-15 Thread Josh Steadmon
On 2019.03.15 15:18, Jeff Hostetler wrote: > > > On 3/13/2019 7:33 PM, Josh Steadmon wrote: > > Persistently enabling trace2 output is difficult because it requires > > specifying a full filename. This series teaches tr2_dst_get_trace_fd() > > to randomize filenames when a directory or filename p

Re: [PATCH 2/2] trace2: randomize/timestamp trace2 targets

2019-03-15 Thread Josh Steadmon
On 2019.03.14 00:49, Ævar Arnfjörð Bjarmason wrote: > > On Thu, Mar 14 2019, Josh Steadmon wrote: > > > When the value of a trace2 environment variable contains instances of > > the string "%ISO8601%", expand them into the current UTC timestamp in > > ISO 8601 format. > > Any reason not to just

Re: [PATCH 2/2] trace2: randomize/timestamp trace2 targets

2019-03-15 Thread Josh Steadmon
On 2019.03.15 13:43, Josh Steadmon wrote: > On 2019.03.14 00:49, Ævar Arnfjörð Bjarmason wrote: > > > > On Thu, Mar 14 2019, Josh Steadmon wrote: > > > > > When the value of a trace2 environment variable contains instances of > > > the string "%ISO8601%", expand them into the current UTC timestam

Re: Shorthand for "$(git merge-base A B)"

2019-03-15 Thread Jonathan Nieder
Hi, John Passaro wrote: > I find myself fairly frequently doing something like "git log $(git > merge-base A B)..C". Hm. Can you tell me more about the workflow / higher-level operation where you do this? Curious, Jonathan

Re: [PATCH v2] glossary: add definition for overlay

2019-03-15 Thread Thomas Gummerer
On 03/13, Duy Nguyen wrote: > On Wed, Mar 13, 2019 at 6:30 AM Thomas Gummerer wrote: > > > > Add a definition for what overlay means in the context of git, to > > clarify the recently introduced overlay-mode in git checkout. > > > > Helped-by: Elijah Newren > > Signed-off-by: Thomas Gummerer > >

Re: [PATCH v2] stash: pass pathspec as pointer

2019-03-15 Thread Thomas Gummerer
On 03/13, Johannes Schindelin wrote: > Hi Thomas, > > On Tue, 12 Mar 2019, Thomas Gummerer wrote: > > > On 03/12, Johannes Schindelin wrote: > > > However, we would not have needed to move the initialization of > > > `rev.prune_data`, I don't think, because `init_revision()` zeros the > > > entir

Re: [GSoC][RFC/PATCH 0/1]

2019-03-15 Thread Thomas Gummerer
On 03/15, jkapil...@gmail.com wrote: > From: Kapil > The cover letter should give reviewers a short introduction what a patch series is about. It's often not worth including a cover letter if there is only a single patch, or only a couple of patches. It is okay to send a cover letter for a sin

Re: [GSoC][RFC/PATCH 1/1] userdiff - support shell script

2019-03-15 Thread Thomas Gummerer
> Subject: [GSoC][RFC/PATCH 1/1] userdiff - support shell script We usually have the subject in the format ": ", so in this case it could be "userdiff: support shell script" (without the quotes of course). On 03/15, jkapil...@gmail.com wrote: > From: Kapil Ideally the name you are using for you

Re: [PATCH v2] glossary: add definition for overlay

2019-03-15 Thread Thomas Gummerer
On 03/13, Junio C Hamano wrote: > Thomas Gummerer writes: > > > diff --git a/Documentation/glossary-content.txt > > b/Documentation/glossary-content.txt > > index 023ca95e7c..53df6ecb0a 100644 > > --- a/Documentation/glossary-content.txt > > +++ b/Documentation/glossary-content.txt > > @@ -287,6

protect .git folder/files from grep/sed commands

2019-03-15 Thread Dimitri Joukoff
When performing global changes in a project/tree using a command like: grep -r "search" | xargs -I {} sed -i '' s/search/replace/g there exists the possibility that this command will alter data in .git folder. Using GNU grep, it is possible to use --exclude '/.*"' to avoid the .git folder, but t

[PATCH v9 2/3] branch: update output to include worktree info

2019-03-15 Thread nbelakovski
From: Nickolai Belakovski The output of git branch is modified to mark branches checked out in a linked worktree with a "+" and color them in cyan (in contrast to the current branch, which will still be denoted with a "*" and colored in green) This is meant to communicate to the user that the br

[PATCH v9 1/3] ref-filter: add worktreepath atom

2019-03-15 Thread nbelakovski
From: Nickolai Belakovski Add an atom providing the path of the linked worktree where this ref is checked out, if it is checked out in any linked worktrees, and empty string otherwise. Signed-off-by: Nickolai Belakovski --- Documentation/git-for-each-ref.txt | 5 +++ ref-filter.c

[PATCH v9 3/3] branch: add worktree info on verbose output

2019-03-15 Thread nbelakovski
From: Nickolai Belakovski To display worktree path for refs checked out in a linked worktree Signed-off-by: Nickolai Belakovski --- Documentation/git-branch.txt | 6 -- builtin/branch.c | 4 t/t3203-branch-output.sh | 19 +++ 3 files changed, 27 inser

[PATCH v9 0/3]

2019-03-15 Thread nbelakovski
From: Nickolai Belakovski Cleanup on 2/3 and 3/3 To reiterate from elsewhere in the thread, I'd really like to get 1/3 and 2/3 in together. For 3/3 I'm basically indifferent. I see some value in it, but I also think it clutters up the verbose output, so I could understand if there's a lack of

Re: protect .git folder/files from grep/sed commands

2019-03-15 Thread SZEDER Gábor
On Sat, Mar 16, 2019 at 01:37:39AM +, Dimitri Joukoff wrote: > When performing global changes in a project/tree using a command like: > > grep -r "search" | xargs -I {} sed -i '' s/search/replace/g > > there exists the possibility that this command will alter data in .git > folder. Using GNU

Re: "git clone --shallow-exclude ...", fatal: the remote end hung up unexpectedly

2019-03-15 Thread Duy Nguyen
On Fri, Mar 15, 2019 at 9:31 PM Robert P. J. Day wrote: > also, i think "man git-clone" could really use a set of examples for > shallow cloning. i'd offer to write it but i'm still figuring it out. Cool. I'll give you a quick introduction to help with those examples :D Side note: there's also

Re: [PATCH v3 17/21] switch: no implicit dwim, use --guess to dwim

2019-03-15 Thread Duy Nguyen
On Thu, Mar 14, 2019 at 1:36 AM Eckhard Maaß wrote: > And while at it - what should happen, if: > > - there is a tag named example > - no local branch example > - a branch at origin/example > > ... and we switch then? Right now it just gives "cannot find branch", > should there be more information