Re: [PATCH v2 5/5] fetch: Make --jobs control submodules and remotes

On Mon, Aug 12, 2019 at 02:34:48PM -0700, Palmer Dabbelt wrote: > diff --git a/builtin/fetch.c b/builtin/fetch.c > index 67d001f3f78b..41498e9efb3b 100644 > --- a/builtin/fetch.c > +++ b/builtin/fetch.c > @@ -114,6 +114,20 @@ static int git_fetch_config(const char *k, const char > *v, void *cb) >

Re: [RFC] Improved git signing interface

Thank you very much Jeff for looking into the proposal and for pointing out the previous threads on the subject. I understand your concern on 'emerging technologies' and new tools. But to clarify, the current work and patches do not include any new tools, and is merely a cleaning of the signing co

Git fetch bug in git 2.21+ "Could not access submodule '%s'"

Spotted this when our Jenkins executors had git updated, and later managed to reproduce locally. The issue happens when fetching an updated ref from a remote, and that ref updates a submodule which is not checked out but whose folder is dirty. Steps to reproduce (on *nix) with repositories on Gi

Re: [PATCH v4 0/6] Create 'feature.*' config area and some centralized config parsing

On 8/13/2019 5:08 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> "Derrick Stolee via GitGitGadget" writes: >> >>> * Update docs and 0 constant in feature.experimental around >>>merge.directoryRenames. >> >> I somehow thought that the concensus was that *.experimental is for >> thin

Re: [PATCH v4 0/6] Create 'feature.*' config area and some centralized config parsing

On 8/14/2019 6:32 AM, Derrick Stolee wrote: > On 8/13/2019 5:08 PM, Junio C Hamano wrote: >> Junio C Hamano writes: >> >>> "Derrick Stolee via GitGitGadget" writes: >>> * Update docs and 0 constant in feature.experimental around merge.directoryRenames. >>> >>> I somehow thought that

Re: How to reset selected lines?

On 14/08/19 12:07AM, Johannes Sixt wrote: > Am 13.08.19 um 16:18 schrieb Pratyush Yadav: > > Now, I want to add a similar feature, but one that discards/resets the > > selected lines. And I'd like to avoid the hack that git-gui's > > apply_range_or_line is. So, is there a cleaner way to do this t

Re: How to reset selected lines?

On 13/08/19 11:42AM, Jeff King wrote: > On Tue, Aug 13, 2019 at 07:48:16PM +0530, Pratyush Yadav wrote: > > > To put things into context of why I am asking this, git-gui has a > > feature where you can select parts of a displayed diff, and can > > stage/unstage those parts. That feature is imple

Potential asterisk expansion bug in Windows Git Bash?

Hi there, Not sure if this is the correct channel to submit a bug report for Windows Git Bash. Please let me know if I did anything wrong. Today I noticed that on Windows Git Bash, the asterisk (*) is incorrectly expanded even when it’s in a quote or following a backslash (\). I’m wondering if th

Re: Potential asterisk expansion bug in Windows Git Bash?

On Wed, Aug 14, 2019 at 07:50:47PM +0800, Bo Zhang wrote: > Today I noticed that on Windows Git Bash, the asterisk (*) is > incorrectly expanded even when it’s in a quote or following a > backslash (\). I’m wondering if this is the correct behaviour (which > seems like to me NOT). > > Step to rep

Re: Potential asterisk expansion bug in Windows Git Bash?

Thank you very much Jeff! It turns out I ran into https://bugs.openjdk.java.net/browse/JDK-8131329 on Windows. The example was also a mistake. Anyway, false alarm, thank you again! Regards, Bo On Wed, Aug 14, 2019 at 8:10 PM Jeff King wrote: > > On Wed, Aug 14, 2019 at 07:50:47PM +0800, Bo Zhan

[PATCH] pull, fetch: add --set-upstream option

From: Corentin BOMPARD Add the --set-upstream option to git pull/fetch which lets the user set the upstream configuration (branch..merge and branch..remote) for the current branch. A typical use-case is: git clone http://example.com/my-public-fork git remote add main http://example.com/

Re: How to reset selected lines?

On Wed, Aug 14, 2019 at 05:18:44PM +0530, Pratyush Yadav wrote: > > So "git add -p", for example, also works by creating diffs, modifying > > them, and feeding the result to "apply". You can see the implementation > > in git-add--interactive.perl, where it literally calls diff and apply > > comman

Re: Git fetch bug in git 2.21+ "Could not access submodule '%s'"

On Wed, Aug 14, 2019 at 09:57:50AM +, Paolo Pettinato (ppettina) wrote: > The issue happens when fetching an updated ref from a remote, and that > ref updates a submodule which is not checked out but whose folder is dirty. > > Steps to reproduce (on *nix) with repositories on GitHub: > [...]

Re: [PATCH v2 5/5] fetch: Make --jobs control submodules and remotes

SZEDER Gábor writes: > On Mon, Aug 12, 2019 at 02:34:48PM -0700, Palmer Dabbelt wrote: >> diff --git a/builtin/fetch.c b/builtin/fetch.c >> index 67d001f3f78b..41498e9efb3b 100644 >> --- a/builtin/fetch.c >> +++ b/builtin/fetch.c >> @@ -114,6 +114,20 @@ static int git_fetch_config(const char *k,

[PATCH] get_next_submodule(): format error string as an error

On Wed, Aug 14, 2019 at 09:57:50AM +, Paolo Pettinato (ppettina) wrote: > Could not access submodule 'sm' # fails, plus no newline here :P! This part seems easy enough to fix. -- >8 -- Subject: get_next_submodule(): format error string as an error The run_processes_parallel() interface pass

Re: [RFC PATCH] http: use xmalloc with cURL

On Tue, Aug 13, 2019 at 10:00:44PM +0200, Johannes Schindelin wrote: > > Jeff King writes: > > > > > I think it might be worth just eliminating the whole idea. > > > > I kinda like the simplification ;-) An even thinner wrapper that > > calls malloc() and dies if it gets NULL, without any "try-to

Re: [PATCH] get_next_submodule(): format error string as an error

Jeff King writes: > On Wed, Aug 14, 2019 at 09:57:50AM +, Paolo Pettinato (ppettina) wrote: > >> Could not access submodule 'sm' # fails, plus no newline here :P! > > This part seems easy enough to fix. Indeed, it is ;-) > diff --git a/submodule.c b/submodule.c > index 0f199c5137..a5ba57ac3

RE: suggestion for improved docs on autocrlf

Turns out that this is not intentional behavior of IntelliJ but an unfortunate interaction with a bug in git. Had I been using a more recent version of git, it wouldn't be happening. https://youtrack.jetbrains.com/issue/IDEA-205601 Patched docs on the way eventually. Hopefully it's okay if my sy

Re: Git fetch bug in git 2.21+ "Could not access submodule '%s'"

Jeff King writes: > Because you created a file in the uninitialized submodule directory, it > fools the is_empty_dir() check. It seems like there should be a more > robust way to check whether the submodule is initialized. Maybe: > > diff --git a/submodule.c b/submodule.c > index 77ace5e784..748e

Re: Git fetch bug in git 2.21+ "Could not access submodule '%s'"

Thanks for the reply! On 14/08/2019 17:40, Junio C Hamano wrote: > Why is the user mucking with > that directory in the first place, and isn't the flagging of the > situation as an error, done with 26f80ccf ("submodule: migrate > get_next_submodule to use repository structs", 2018-11-28), a > bu

Re: [PATCH] pull, fetch: add --set-upstream option

Hi Matthieu, This is not really a review. Just some minor nitpicks I spotted while reading through. On 14/08/19 03:46PM, Matthieu Moy wrote: > From: Corentin BOMPARD > > Add the --set-upstream option to git pull/fetch > which lets the user set the upstream configuration > (branch..merge and >

Re: [PATCH] pull, fetch: add --set-upstream option

Matthieu Moy writes: > From: Corentin BOMPARD > > Add the --set-upstream option to git pull/fetch > which lets the user set the upstream configuration > (branch..merge and > branch..remote) for the current branch. > > A typical use-case is: > > git clone http://example.com/my-public-fork >

Re: Git fetch bug in git 2.21+ "Could not access submodule '%s'"

"Paolo Pettinato (ppettina)" writes: > Thanks for the reply! > > On 14/08/2019 17:40, Junio C Hamano wrote: >> Why is the user mucking with >> that directory in the first place, and isn't the flagging of the >> situation as an error, done with 26f80ccf ("submodule: migrate >> get_next_submodule

Re: [PATCH v4] documentation: add tutorial for revision walking

On Wed, Aug 07, 2019 at 12:19:12PM -0700, Junio C Hamano wrote: > Emily Shaffer writes: > > > Since v3, only a couple of minor changes from Jonathan Tan - thanks. > > > > I'm dropping the updates for the RFC set, since they're incremental from > > now. Next time you all see them they will be in a

Re: [PATCH v2 5/5] fetch: Make --jobs control submodules and remotes

On Wed, 14 Aug 2019 01:32:45 PDT (-0700), szeder@gmail.com wrote: On Mon, Aug 12, 2019 at 02:34:48PM -0700, Palmer Dabbelt wrote: diff --git a/builtin/fetch.c b/builtin/fetch.c index 67d001f3f78b..41498e9efb3b 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -114,6 +114,20 @@ static int

Re: [GSoC][PATCH v2 3/6] rebase -i: support --committer-date-is-author-date

On 13/08/2019 18:06, Junio C Hamano wrote: Phillip Wood writes: [...] + + strbuf_addf(&date, "@%s",ident.date_begin); I think we should use %s.* and ident.date_end to be sure we getting what we want. Your version is OK if the author is formatted correctly but I'm uneasy about r

Re: [GSoC][PATCH v2 5/6] rebase -i: support --ignore-date

Hi Junio & Rohit On 13/08/2019 18:21, Junio C Hamano wrote: Phillip Wood writes: +static void push_dates(struct child_process *child) +{ + time_t now = time(NULL); + struct strbuf date = STRBUF_INIT; + + strbuf_addf(&date, "@%"PRIuMAX, (uintmax_t)now); + argv_array_pus

Re: [GSoC][PATCH v2 5/6] rebase -i: support --ignore-date

On 13/08/2019 22:45, Junio C Hamano wrote: Rohit Ashiwal writes: --ignore-date:: - This flag is passed to 'git am' to change the author date - of the rebased commits (see linkgit:git-am[1]). + Instead of using the given author date, re-set it to the value + same as co

Re: [PATCH v4] documentation: add tutorial for revision walking

Emily Shaffer writes: >> > I think the tutorial itself is pretty much ready... >> >> A few comments after skimming this round; none of them may be a show >> stopper, but others may have different opinions. >> ... > Hmmm. It sounds like you're saying: > > - This object covers walking objects, wh

Re: [GSoC][PATCH v2 5/6] rebase -i: support --ignore-date

Phillip Wood writes: > That's an important distinction, particularly if GIT_COMMITTER_DATE is > set in the environment - are we aiming to have the author and > committer dates match or are we just resetting the author date to now? > Rohit - do you know which --ignore-date does in the am based reb

Re: Git fetch bug in git 2.21+ "Could not access submodule '%s'"

On Wed, Aug 14, 2019 at 09:40:40AM -0700, Junio C Hamano wrote: > > but it feels odd to me. Even if the submodule is not currently checked > > out, we'd presumably still want to do the recursive fetch as long as we > > have a repo under $GIT_DIR/modules? > > ... which means that we are not intere

A donation of 800,000.00 USD has been made in your favor

A donation of 800,000.00 USD has been made in your favor, Kindly contact the donor Mr. Johnson via email (davidjson...@aol.com ) for more details on your donation funds.

Re: minor interactive rebase regression: HEAD points to wrong commit while rewording

Hi, On Mon, 12 Aug 2019, Phillip Wood wrote: > On 12/08/2019 18:50, SZEDER Gábor wrote: > > > > When running interactive rebase to reword a commit message, I would > > expect that the commit whose message I'm rewording is checked out. > > This is not quite the case when rewording multiple subsequ

Re: minor interactive rebase regression: HEAD points to wrong commit while rewording

On Mon, Aug 12, 2019 at 09:28:52PM +0100, Phillip Wood wrote: > >Save the updated commit message, and after the editor opens up the > >third commit's log message, check again where HEAD is pointing to now: > > > > ~/tmp/reword (master +|REBASE-i 2/3)$ head -n1 .git/COMMIT_EDITMSG > > third > >

What's cooking in git.git (Aug 2019, #04; Wed, 14)

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. We have a handful of topics in 'ne

Re: minor interactive rebase regression: HEAD points to wrong commit while rewording

On Wed, Aug 14, 2019 at 10:45:22PM +0200, Johannes Schindelin wrote: > However, I am reluctant to accept the performance impact: in the long > run, I would love to have an interactive rebase that actually only > updates `HEAD` (and the worktree) when interrupting the rebase (via > `break` or `edit`

Hello Dear Friend.

Hello Dear Friend. I’m Mrs. Stellar Maoris a manger in HSBC bank of Spain Madrid, I am sending this brief letter to seek for your partnership and long term relationship, I have an important and urgent issue I want to discuss with you privately about Transaction fund worth the sum of $9.5m

Re: What's cooking in git.git (Aug 2019, #04; Wed, 14)

Hi, Junio On Wed, Aug 14, 2019 at 6:27 PM Junio C Hamano wrote: > [...] > * mt/grep-submodules-working-tree (2019-07-30) 1 commit > (merged to 'next' on 2019-08-02 at e1a46a195f) > + grep: fix worktree case in submodules There is a new version of this patch here[1], addressing the comments yo

[no subject]

Huawei Mobil'imden g This document is overwritten önderildi

Re: What's cooking in git.git (Aug 2019, #04; Wed, 14)

On Wed, Aug 14, 2019 at 4:58 PM Matheus Tavares Bernardino wrote: > > On Wed, Aug 14, 2019 at 6:27 PM Junio C Hamano wrote: > > > [...] > > * mt/grep-submodules-working-tree (2019-07-30) 1 commit > > (merged to 'next' on 2019-08-02 at e1a46a195f) > > + grep: fix worktree case in submodules > >

[PATCH] bugreport: add tool to generate debugging info

Make it easier for users who encounter a bug to send a report by collecting some state information, intended to be viewed by humans familiar with Git. Teach Git how to prompt the user for a good bug report: reproduction steps, expected behavior, and actual behavior. Also, teach Git to write down i

Is diff.indentHeuristic still experimental?

Hi all, I saw that diff.indentHeuristic was enabled by default at 33de7163879ca83be7d6e1583c125f84e1e7c329 , but the doc still says it is experimental

RE: suggestion for improved docs on autocrlf

Okay, first attempt at better phrasing. This may need more paragraph breaks, or something. Right now it's very wall-of-texty. And probably in a style way too different from the rest of the git docs. Also, the syntax is probably closer to markdown than AsciiDoc; sorry. Anyway, enough disclaimers