Re: [RFC PATCH 3/3] diff: add --color-moved-ws=allow-mixed-indentation-change

2018-10-10 Thread Phillip Wood
On 09/10/2018 22:10, Stefan Beller wrote: As I said above I've more or less come to the view that the correctness of pythonic indentation is orthogonal to move detection as it affects all additions, not just those that correspond to moved lines. Makes sense. Right so are you happy for we to

[PATCH] doc: fix a typo and clarify a sentence

2018-10-10 Thread Mihir Mehta
I noticed that git-merge-base was unlikely to actually be a git command, and tried it in my shell. Seeing that it doesn't work, I cleaned up two places in the docs where it appears. Signed-off-by: Mihir Mehta --- Documentation/git-diff.txt | 7 ---

[no subject]

2018-10-10 Thread Mihir Mehta
Thanks, Junio. Instead of removing that part of the patch, I opted to expand it to make it a little clearer (in my opinion) than it was before. Let me know if this works. Mihir.

[PATCH] range-diff: allow to diff files regardless submodule

2018-10-10 Thread Lucas De Marchi
Do like it's done in grep so mode doesn't end up as 016, which means range-diff doesn't work if one has "submodule.diff = log" in the configuration. Without this while using range-diff I only get a Submodule a 000...000 (new submodule) instead of the diff between the revisions.

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Jeff King
On Wed, Oct 10, 2018 at 09:59:16AM +0200, Ævar Arnfjörð Bjarmason wrote: > > On Wed, Oct 10 2018, Junio C Hamano wrote: > > > * jk/drop-ancient-curl (2017-08-09) 5 commits > > - http: #error on too-old curl > > - curl: remove ifdef'd code never used with curl >=7.19.4 > > - http: drop

Re: [PATCH 0/2] branch: introduce --current display option

2018-10-10 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 09 2018, Daniels Umanovskis wrote: > I often find myself needing the current branch name, for which > currently there's git rev-parse --abrev-ref HEAD. I would expect `git > branch` to have an option to output the branch name instead. > > This is my first patch to Git, so

ATTN:

2018-10-10 Thread Ken Obodo
ATTN: I am MR.Ken Obodo, writing you in respect of my deceased client,I have been trying to locate any member of his family to assist in repatriating his fund he deposited in finance house valued at US$10.500.000 .Contact me with your full names, occupation, country of residence and direct

Re: [PATCH v5 17/23] userdiff.c: remove implicit dependency on the_index

2018-10-10 Thread Jeff King
On Fri, Sep 21, 2018 at 05:57:33PM +0200, Nguyễn Thái Ngọc Duy wrote: > diff --git a/diff.c b/diff.c > index 140d0e86df..5256b9eabc 100644 > --- a/diff.c > +++ b/diff.c > @@ -2093,23 +2093,25 @@ static void diff_words_flush(struct emit_callback > *ecbdata) > } > } > > -static void

Re: bug when combined with etckeeper

2018-10-10 Thread Joey Hess
/etc/.git/hooks/pre-commit is installed by etckeeper and runs etckeeper pre-commit, which deals with /etc/.etckeeper, including running "git add .etckeeper". Why that file would match a gitignore seems much less important than why git would run that hook in an entirely different git repository.

Re: bug when combined with etckeeper

2018-10-10 Thread Jeff King
On Wed, Oct 10, 2018 at 09:33:00AM +, Naja Melan wrote: > I ran into a strange bug. In the following script the commit at the end will > fail with: > > > The following paths are ignored by one of your .gitignore files: > > .etckeeper > > Use -f if you really want to add them. > > Note

Re: [PATCH 0/2] branch: introduce --current display option

2018-10-10 Thread Rafael Ascensão
On Wed, Oct 10, 2018 at 05:59:05AM +0900, Junio C Hamano wrote: > > But I do not think that is what is going on. There is "--list" that > lists branches whose name match given patterns, and at the end-user > level (I haven't seen the implementation) this is another mode of > that operation that

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Thomas Gummerer
On 10/10, Junio C Hamano wrote: > * ps/stash-in-c (2018-08-31) 20 commits > - stash: replace all `write-tree` child processes with API calls > - stash: optimize `get_untracked_files()` and `check_changes()` > - stash: convert `stash--helper.c` into `stash.c` > - stash: convert save to builtin

Re: [PATCH 3/3] mingw: bump the minimum Windows version to Vista

2018-10-10 Thread Ævar Arnfjörð Bjarmason
On Wed, Oct 03 2018, Johannes Schindelin via GitGitGadget wrote: > Quite some time ago, a last plea to the XP users out there who want to > see Windows XP support in Git for Windows, asking them to get engaged > and help, vanished into the depths of the universe. > > We tried for a long time to

Re: [PATCH v3] coccicheck: process every source file at once

2018-10-10 Thread Jeff King
On Wed, Oct 10, 2018 at 01:44:41PM +0200, SZEDER Gábor wrote: > > So that's really weird and counter-intuitive, since we should be doing > > strictly less work. I know that spatch tries to parallelize itself, > > though from my tests, 1.0.4 does not. I wonder if the version in Travis > > differs

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Phillip Wood
On 10/10/2018 06:43, Junio C Hamano wrote: 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

Re: [PATCH] git-completion.bash: Add completion for stash list

2018-10-10 Thread steve
On 2018-10-07 2:08 am, Junio C Hamano wrote: Steve writes: Since stash list accepts git-log options, add the following useful options that make sense in the context of the `git stash list` command: --name-status --oneline --patch-with-stat Signed-off-by: Steven Fernandez --- This is

Re: [PATCH 2/3] send-email: only consider lines containing @ or <> for automatic Cc'ing

2018-10-10 Thread Rasmus Villemoes
On 2018-10-10 14:57, Ævar Arnfjörð Bjarmason wrote: > > On Wed, Oct 10 2018, Rasmus Villemoes wrote: > >> +if ($c !~ /.+@.+|<.+>/) { >> +printf("(body) Ignoring %s from line '%s'\n", >> +$what, $_) unless $quiet;

Re: builtin stash/rebase, was Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Junio C Hamano
Johannes Schindelin writes: > Speaking about the two `rebase` ones: they are simple fixup! commits, > could I trouble you to fetch and cherry-pick them into `pu`, or would you > prefer if I sent another iteration of `rebase-in-c-4-opts`? If it were only about me, then the former if I can do my

Re: js/mingw-wants-vista-or-above, was Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Junio, > > On Wed, 10 Oct 2018, Junio C Hamano wrote: > >> * js/mingw-wants-vista-or-above (2018-10-04) 3 commits >> - mingw: bump the minimum Windows version to Vista >> - mingw: set _WIN32_WINNT explicitly for Git for Windows >> - compat/poll: prepare for

Good day

2018-10-10 Thread Sui Yang
Good day, I am Mdm. SUI Yang, Chief Financial Officer of the Bank of China I am looking for a manager / investment partner who will work with me for a joint venture. Contact me in my private email for more details. email (suiyan...@gmail.com) Waiting to hear from you. Thank you, Mdm SUI Yang`

js/mingw-wants-vista-or-above, was Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Johannes Schindelin
Hi Junio, On Wed, 10 Oct 2018, Junio C Hamano wrote: > * js/mingw-wants-vista-or-above (2018-10-04) 3 commits > - mingw: bump the minimum Windows version to Vista > - mingw: set _WIN32_WINNT explicitly for Git for Windows > - compat/poll: prepare for targeting Windows Vista > > The minimum

Re: Translation to Portuguese

2018-10-10 Thread Thiago Saife
Ok, no problem. Regards, On Wed, Oct 10, 2018 at 9:43 AM Ævar Arnfjörð Bjarmason wrote: > > On Wed, Oct 10, 2018 at 2:41 PM Thiago Saife > wrote: > > > > Hi Avar. > > > > What it means? I should not continue the translation? Because > > Brazilian Portuguese states as Translations started for,

builtin stash/rebase, was Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Johannes Schindelin
Hi Junio, On Wed, 10 Oct 2018, Junio C Hamano wrote: > We haven't seen much complaints and breakages reported against the > two big "rewrite in C" topics around "rebase"; perhaps it is a good > time to merge them to 'next' soonish to cook them for a few weeks > before moving them to 'master'? I

Re: [PATCH 2/3] send-email: only consider lines containing @ or <> for automatic Cc'ing

2018-10-10 Thread Ævar Arnfjörð Bjarmason
On Wed, Oct 10 2018, Rasmus Villemoes wrote: > + if ($c !~ /.+@.+|<.+>/) { > + printf("(body) Ignoring %s from line '%s'\n", > + $what, $_) unless $quiet; > + next; > +

Re: [PATCH 3/3] send-email: also pick up cc addresses from -by trailers

2018-10-10 Thread Ævar Arnfjörð Bjarmason
On Wed, Oct 10 2018, Rasmus Villemoes wrote: > - next if $suppress_cc{'sob'} and $what =~ > /Signed-off-by/i; > + next if $suppress_cc{'sob'} and $what =~ > /^Signed-off-by$/i; > + next if

Re: Translation to Portuguese

2018-10-10 Thread Ævar Arnfjörð Bjarmason
On Wed, Oct 10, 2018 at 2:41 PM Thiago Saife wrote: > > Hi Avar. > > What it means? I should not continue the translation? Because > Brazilian Portuguese states as Translations started for, but it's not > finished yet. I misunderstood and thought you meant the translation of the git program

Re: Translation to Portuguese

2018-10-10 Thread Thiago Saife
Hi Avar. What it means? I should not continue the translation? Because Brazilian Portuguese states as Translations started for, but it's not finished yet. On Wed, Oct 10, 2018 at 6:04 AM Ævar Arnfjörð Bjarmason wrote: > > > On Wed, Oct 10 2018, Ævar Arnfjörð Bjarmason wrote: > > > On Mon, Oct

Re: git svn clone/fetch hits issues with gc --auto

2018-10-10 Thread Ævar Arnfjörð Bjarmason
On Wed, Oct 10 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> - We use this warning as a proxy for "let's not run for a day", >>otherwise we'll just grind on gc --auto trying to consolidate >>possibly many hundreds of K of loose objects only to find none of >>

Re: [PATCH][Outreachy] remove all the inclusions of git-compat-util.h in header files

2018-10-10 Thread Junio C Hamano
Christian Couder writes: > So I think one solution to this problem is already proposed on our web site. OK, that's a good start. The next step is to make those who are involved in these education programs to be more aware of it ;-)

Re: git svn clone/fetch hits issues with gc --auto

2018-10-10 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > - We use this warning as a proxy for "let's not run for a day", >otherwise we'll just grind on gc --auto trying to consolidate >possibly many hundreds of K of loose objects only to find none of >them can be pruned because the run into the expiry

Good day

2018-10-10 Thread Sui Yang
Good day, I am Mdm. SUI Yang, Chief Financial Officer of the Bank of China I am looking for a manager / investment partner who will work with me for a joint venture. Contact me in my private email for more details. email (suiyan...@gmail.com) Waiting to hear from you. Thank you, Mdm SUI Yang`

Re: git svn clone/fetch hits issues with gc --auto

2018-10-10 Thread Ævar Arnfjörð Bjarmason
On Wed, Oct 10 2018, Martin Langhoff wrote: > On Wed, Oct 10, 2018 at 7:27 AM Ævar Arnfjörð Bjarmason > wrote: >> As Jeff's >> https://public-inbox.org/git/20180716175103.gb18...@sigill.intra.peff.net/ >> and my https://public-inbox.org/git/878t69dgvx@evledraar.gmail.com/ >> note it's a

Re: [PATCH v3] coccicheck: process every source file at once

2018-10-10 Thread SZEDER Gábor
On Mon, Oct 08, 2018 at 11:15:42PM -0400, Jeff King wrote: > On Fri, Oct 05, 2018 at 09:54:13PM +0200, SZEDER Gábor wrote: > > > Runtimes tend to fluctuate quite a bit more on Travis CI compared to > > my machine, but not this much, and it seems to be consistent so far. > > > > After

Re: git svn clone/fetch hits issues with gc --auto

2018-10-10 Thread Ævar Arnfjörð Bjarmason
On Wed, Oct 10 2018, Ævar Arnfjörð Bjarmason wrote: > On Wed, Oct 10 2018, Martin Langhoff wrote: > >> Looking around, Jonathan Tan's "[PATCH] gc: do not warn about too many >> loose objects" makes sense to me. >> >> - remove unactionable warning >> - as the warning is gone, no gc.log is

Re: git svn clone/fetch hits issues with gc --auto

2018-10-10 Thread Martin Langhoff
On Wed, Oct 10, 2018 at 7:27 AM Ævar Arnfjörð Bjarmason wrote: > As Jeff's > https://public-inbox.org/git/20180716175103.gb18...@sigill.intra.peff.net/ > and my https://public-inbox.org/git/878t69dgvx@evledraar.gmail.com/ > note it's a bit more complex than that. Ok, my bad for not reading

Re: git svn clone/fetch hits issues with gc --auto

2018-10-10 Thread Ævar Arnfjörð Bjarmason
On Wed, Oct 10 2018, Martin Langhoff wrote: > Looking around, Jonathan Tan's "[PATCH] gc: do not warn about too many > loose objects" makes sense to me. > > - remove unactionable warning > - as the warning is gone, no gc.log is produced > - subsequent gc runs don't exit due to gc.log > > My

[PATCH 1/3] Documentation/git-send-email.txt: style fixes

2018-10-10 Thread Rasmus Villemoes
For consistency, add full stops in a few places and outdent a line by one space. Signed-off-by: Rasmus Villemoes --- Documentation/git-send-email.txt | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt

[PATCH 0/3] send-email: Also pick up cc addresses from -by trailers

2018-10-10 Thread Rasmus Villemoes
This has been attempted multiple times before, but I hope that this can make it in this time around. That *-by addresses are not automatically Cc'ed certainly still surprises people from time to time. I hope that this addresses all the concerns Junio had in https://lkml.org/lkml/2016/8/31/768 .

[PATCH 3/3] send-email: also pick up cc addresses from -by trailers

2018-10-10 Thread Rasmus Villemoes
When rerolling a patch series, including various Reviewed-by etc. that may have come in, it is quite convenient to have git-send-email automatically cc those people. So pick up any *-by lines, with a new suppression category 'misc-by', but special-case Signed-off-by, since that already has its

[PATCH 2/3] send-email: only consider lines containing @ or <> for automatic Cc'ing

2018-10-10 Thread Rasmus Villemoes
While the address sanitizations routines do accept local addresses, that is almost never what is meant in a Cc or Signed-off-by trailer. Looking through all the signed-off-by lines in the linux kernel tree without a @, there are mostly two patterns: Either just a full name, or a full name

Re: git svn clone/fetch hits issues with gc --auto

2018-10-10 Thread Martin Langhoff
Looking around, Jonathan Tan's "[PATCH] gc: do not warn about too many loose objects" makes sense to me. - remove unactionable warning - as the warning is gone, no gc.log is produced - subsequent gc runs don't exit due to gc.log My very humble +1 on that. As for downsides... if we have truly

[PATCH 2/2] push: add an advice on unqualified push

2018-10-10 Thread Ævar Arnfjörð Bjarmason
Improve the error message added in f8aae12034 ("push: allow unqualified dest refspecs to DWIM", 2008-04-23), which before this change looks like this: $ git push avar v2.19.0^{commit}:newbranch -n error: unable to push to unqualified destination: newbranch The destination refspec

[PATCH 1/2] i18n: remote.c: mark error(...) messages for translation

2018-10-10 Thread Ævar Arnfjörð Bjarmason
Mark up the error(...) messages in remote.c for translation. The likes of "unable to push to unqualified destination" are relatively big parts of the UI, i.e. error messages shown when "git push" fails. I don't think any of these are plumbing, an the entire test suite passes when running the

[PATCH 0/2] add an advice on unqualified push

2018-10-10 Thread Ævar Arnfjörð Bjarmason
Years ago I accidentally deleted the "master" branch at work (due to git push origin $emptyvar:master), and while I could tell from the reflogs what SHA-1 I needed on the other side ran into the fairly cryptic error message, certainly to me when the adrenaline is flowing and you've just ruined

Re: [PATCH 3/3] sequencer: use read_author_script()

2018-10-10 Thread Phillip Wood
On 14/09/2018 01:31, Eric Sunshine wrote: > On Wed, Sep 12, 2018 at 6:11 AM Phillip Wood > wrote: >> Use the new function to read the author script, updating >> read_env_script() and read_author_ident(). This means we now have a >> single code path that reads the author script and uses

Re: [PATCH 2/3] add read_author_script() to libgit

2018-10-10 Thread Eric Sunshine
On Wed, Oct 10, 2018 at 6:14 AM Phillip Wood wrote: > On 14/09/2018 00:49, Eric Sunshine wrote: > > What if, instead of exit()ing directly, you drop the conditional and > > instead return the value of read_author_script(): > > > > return read_author_script(...); > > > > and let the caller

Re: [PATCH 2/3] add read_author_script() to libgit

2018-10-10 Thread Phillip Wood
Hi Eric Thanks for looking at this series, sorry it has taken so long for me to reply. On 14/09/2018 00:49, Eric Sunshine wrote: > On Wed, Sep 12, 2018 at 6:11 AM Phillip Wood > wrote: >> Add read_author_script() to sequencer.c based on the implementation in >> builtin/am.c and update

bug when combined with etckeeper

2018-10-10 Thread Naja Melan
I am running: Linux 4.18.12-arch1-1-ARCH #1 SMP PREEMPT Thu Oct 4 01:01:27 UTC 2018 x86_64 GNU/Linux git version 2.19.1 etckeeper Version: 1.18.8 I ran into a strange bug. In the following script the commit at the end will fail with: > The following paths are ignored by one of your

Re: [PATCH v2 1/2] rebase -i: clarify what happens on a failed `exec`

2018-10-10 Thread Eric Sunshine
On Wed, Oct 10, 2018 at 4:54 AM Johannes Schindelin via GitGitGadget wrote: > We had not documented previously what happens when an `exec` command in > an interactive rebase fails. Now we do. > > Signed-off-by: Johannes Schindelin > --- > diff --git a/Documentation/git-rebase.txt

Re: [PATCH 0/2] branch: introduce --current display option

2018-10-10 Thread Eric Sunshine
On Wed, Oct 10, 2018 at 5:29 AM Eric Sunshine wrote: > On Tue, Oct 9, 2018 at 4:59 PM Junio C Hamano wrote: > > My inclination is to recommend to: > > > > (1) name the "show the current one" not "--current" but with some > > verb > > > > (2) display nothing when there is no current branch

Re: [PATCH 0/2] branch: introduce --current display option

2018-10-10 Thread Eric Sunshine
On Tue, Oct 9, 2018 at 4:59 PM Junio C Hamano wrote: > My inclination is to recommend to: > > (1) name the "show the current one" not "--current" but with some > verb > > (2) display nothing when there is no current branch (i.e. detached > HEAD) and without any error. Sensible

Re: [PATCH][Outreachy] remove all the inclusions of git-compat-util.h in header files

2018-10-10 Thread Christian Couder
On Wed, Oct 10, 2018 at 10:46 AM Junio C Hamano wrote: > > Johannes Schindelin writes: > > > Personally, I find the "whoever is picking it up should do the thinking" > > much too harsh for a first-time contributor who specifically came through > > the Outreachy program, i.e. expected to have a

Re: Translation to Portuguese

2018-10-10 Thread Ævar Arnfjörð Bjarmason
On Wed, Oct 10 2018, Ævar Arnfjörð Bjarmason wrote: > On Mon, Oct 08 2018, Thiago Saife wrote: > >> Hello Git Team. >> >> I would like to help to continue the books' translation to Brazilian >> Portuguese and I don't know how to proceed. Thanks in advance for your >> help. > > That would be

[PATCH v2 2/2] rebase -i: introduce the 'break' command

2018-10-10 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The 'edit' command can be used to cherry-pick a commit and then immediately drop out of the interactive rebase, with exit code 0, to let the user amend the commit, or test it, or look around. Sometimes this functionality would come in handy *without* cherry-picking a

[PATCH v2 1/2] rebase -i: clarify what happens on a failed `exec`

2018-10-10 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin We had not documented previously what happens when an `exec` command in an interactive rebase fails. Now we do. Signed-off-by: Johannes Schindelin --- Documentation/git-rebase.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git

[PATCH v2 0/2] rebase -i: introduce the 'break' command

2018-10-10 Thread Johannes Schindelin via GitGitGadget
Stefan asked a while back [https://public-inbox.org/git/20180118183618.39853-3-sbel...@google.com/] for a todo command in interactive rebases that would essentially perform the "stop" part of the edit command, but without the "pick" part: interrupt the interactive rebase, with exit code 0,

Re: [PATCH][Outreachy] remove all the inclusions of git-compat-util.h in header files

2018-10-10 Thread Junio C Hamano
Johannes Schindelin writes: > Personally, I find the "whoever is picking it up should do the thinking" > much too harsh for a first-time contributor who specifically came through > the Outreachy program, i.e. expected to have a gentle introduction into > the project, and into the ways we work.

Re: Translation to Portuguese

2018-10-10 Thread Ævar Arnfjörð Bjarmason
On Mon, Oct 08 2018, Thiago Saife wrote: > Hello Git Team. > > I would like to help to continue the books' translation to Brazilian > Portuguese and I don't know how to proceed. Thanks in advance for your > help. That would be great. Have you seen

Re: [PATCH][Outreachy] remove all the inclusions of git-compat-util.h in header files

2018-10-10 Thread Johannes Schindelin
Hi Junio & Ananya, Ananya, I think you did a really good job at contributing your first patch, demonstrated by the useful comments you already received. On Tue, 9 Oct 2018, Junio C Hamano wrote: > Derrick Stolee writes: > > > On 10/8/2018 1:05 PM, Ananya Krishna Maram wrote: > >> Hi All, > >

Re: git svn clone/fetch hits issues with gc --auto

2018-10-10 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 09 2018, Martin Langhoff wrote: > Hi folks, > > Long time no see! Importing a 3GB (~25K revs, tons of files) SVN repo > I hit the gc error: > > warning: There are too many unreachable loose objects; run 'git prune' > to remove them. > gc --auto: command returned error: 255 > > I

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Ævar Arnfjörð Bjarmason
On Wed, Oct 10 2018, Junio C Hamano wrote: > * jk/drop-ancient-curl (2017-08-09) 5 commits > - http: #error on too-old curl > - curl: remove ifdef'd code never used with curl >=7.19.4 > - http: drop support for curl < 7.19.4 > - http: drop support for curl < 7.16.0 > - http: drop support

INVESTMENT INQUIRY IN YOUR COUNTRY

2018-10-10 Thread Manda Khazaleh
Dear Sir, I write to you based on a request by an investor. My name is Manda Khazaleh, an investment Director (Europe/East and North African). We represent the interests of some elite class mainly from East and North Africa. Due to the sensitivity of their position they hold in their

<    1   2