Re: [PATCH v2] t5551: mark half-auth no-op fetch test as v0-only

2019-03-23 Thread Jeff King
On Fri, Mar 22, 2019 at 12:01:39PM -0700, Jonathan Tan wrote: > When using protocol v0, upload-pack over HTTP permits a "half-auth" > configuration in which, at the web server layer, the info/refs path is > not protected by authentication but the git-upload-pack path is, so that > a user can perfo

Re: [PATCH] Make stashing nothing exit 1

2019-03-23 Thread Ævar Arnfjörð Bjarmason
On Sat, Mar 23 2019, Keith Smiley wrote: > In the case there are no files to stash, but the user asked to stash, we > should exit 1 since the stashing failed. > --- > git-stash.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/git-stash.sh b/git-stash.sh > index 789ce2

Re: [RFC PATCH 2/2] git-p4: support loading changelist descriptions from files

2019-03-23 Thread Luke Diamand
On Fri, 22 Mar 2019 at 19:54, Mazo, Andrey wrote: > > Our Perforce server experienced some kind of database corruption a few years > ago. > While the file data and revision history are mostly intact, > some metadata for several changesets got lost. I think it's not unheard of for P4 databases to

Re: [BUG] Cloning with git HEAD fails for some repositories

2019-03-23 Thread Jeff King
On Fri, Mar 22, 2019 at 04:50:34PM +, Eric Wong wrote: > > Weird. I had set http.maxrequests to "1" to give more readable output > > from GIT_CURL_VERBOSE, etc. It fails with that setting, but not with the > > default of 5. Which certainly seems like a bug, but one that has been > > there for

Re: [RFC PATCH 1/2] git-p4: introduce alien branch mappings

2019-03-23 Thread Luke Diamand
On Fri, 22 Mar 2019 at 19:54, Mazo, Andrey wrote: > > Labels in Perforce are not global, but can be placed on a particular > view/subdirectory. > This might pose difficulties when importing only parts of Perforce depot into > a git repository. > For example: > 1. Depot layout is as follows: >

Re: [PATCH v2 2/7] git-p4: match branches case insensitively if configured

2019-03-23 Thread Luke Diamand
On Thu, 21 Mar 2019 at 22:32, Mazo, Andrey wrote: > > git-p4 knows how to handle case insensitivity in file paths > if core.ignorecase is set. > However, when determining a branch for a file, > it still does a case-sensitive prefix match. > This may result in some file changes to be lost on import

Re: Semantic errors

2019-03-23 Thread Fabio Aiuto
Il giorno ven, 22/03/2019 alle 18.43 -0400, Randall S. Becker ha scritto: > > -Original Message- > > From: Fabio Aiuto > > Sent: March 22, 2019 17:41 > > To: Randall S. Becker ; git@vger.kernel.org > > Subject: Re: Semantic errors > > > > Il giorno ven, 22/03/2019 alle 17.39 -0400, Randal

Re: Semantic errors

2019-03-23 Thread Fabio Aiuto
Il giorno ven, 22/03/2019 alle 18.43 -0400, Randall S. Becker ha scritto: > > -Original Message- > > From: Fabio Aiuto > > Sent: March 22, 2019 17:41 > > To: Randall S. Becker ; git@vger.kernel.org > > Subject: Re: Semantic errors > > > > Il giorno ven, 22/03/2019 alle 17.39 -0400, Randal

Compliment of the day to you Dear Friend.

2019-03-23 Thread mcompola
Compliment of the day to you Dear Friend. Dear Friend. I am Mrs.M Compola. am sending this brief letter to solicit your partnership to transfer $5 million US Dollars. I shall send you more information and procedures when I receive positive response from you. Mrs M Compola

[PATCH 1/3] rebase: teach rebase --keep-base

2019-03-23 Thread Denton Liu
A common scenario is if a user is working on a topic branch and they wish to make some changes to intermediate commits or autosquashing, they would run something such as git rebase -i --onto master... master in order to preserve the merge base. This prevents unnecessary commit churning.

[PATCH 3/3] git-rebase.txt: document --keep-base option

2019-03-23 Thread Denton Liu
Document the --keep-base rebase option. While we're at it, change an instance of "merge-base" to "merge base", which is the consistent spelling. Signed-off-by: Denton Liu --- Documentation/git-rebase.txt | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Documentat

[PATCH 0/3] rebase: learn --keep-base

2019-03-23 Thread Denton Liu
This series teaches rebase the --keep-base option. 'git rebase --keep-base ' is equivalent to 'git rebase --onto ... ' or 'git rebase --onto $(git merge-base HEAD) ' . This seems to be a common case that people (including myself!) run into; I was able to find these StackOverflow posts about this

[PATCH 2/3] t3416: test rebase --keep-base

2019-03-23 Thread Denton Liu
Test rebase --keep-base to ensure it works correctly in the normal case and fails when there are multiple merge-bases, both in regular and interactive mode. Also, test to make sure conflicting options causes rebase to fail. While we're at it, add a missing set_fake_editor call to 'rebase -i --onto

[PATCH] gitk: Do not mistake unchanged lines with submodule changes

2019-03-23 Thread Gabriele Mazzotta
Unchanged lines are prefixed with a white-space, thus unchanged lines starting with either " <" or " >" are mistaken for submodule changes. Check if a line starts with either " <" or " >" only if we listing the changes of a submodule. Signed-off-by: Gabriele Mazzotta --- gitk | 4 ++-- 1 file

Re: [PATCH] asciidoctor-extensions: provide ``

2019-03-23 Thread Todd Zullinger
Hi, Martin Ågren wrote: > On Wed, 20 Mar 2019 at 19:17, Todd Zullinger wrote: >> Martin Ågren wrote: >>> {litdd} now renders as --. We should find some other way to >>> produce '--'. This should then be a simple change, as we're already >>> providing this attribute inside an `ifdef USE_ASCIIDOCTO

RE: Semantic errors

2019-03-23 Thread Randall S. Becker
On March 23, 2019 9:00, Fabio Aiuto wrote: > To: Randall S. Becker ; git@vger.kernel.org > Subject: Re: Semantic errors > > Il giorno ven, 22/03/2019 alle 18.43 -0400, Randall S. Becker ha > scritto: > > > -Original Message- > > > From: Fabio Aiuto > > > Sent: March 22, 2019 17:41 > > > T

Re: [GSoC][RFC/PATCH] userdiff: added support for diffing shell scripts

2019-03-23 Thread Christian Couder
On Fri, Mar 22, 2019 at 5:08 PM Kapil Jain wrote: > > Signed-off-by: Kapil Jain > --- > > The test written does not pass, imo there's some problem with the regex part. > please let me know about the fault. To save some work by people who could help you, it might be a good idea to show the output

Re: [PATCH v3 1/1] trace2: write to directory targets

2019-03-23 Thread Ævar Arnfjörð Bjarmason
On Thu, Mar 21 2019, Josh Steadmon wrote: > When the value of a trace2 environment variable is an absolute path > referring to an existing directory, write output to files (one per > process) underneath the given directory. Files will be named according > to the final component of the trace2 SID

Re: [GSoC][RFC] Proposal: Improve consistency of sequencer commands

2019-03-23 Thread Christian Couder
Hi Rohit, On Fri, Mar 22, 2019 at 4:12 PM Rohit Ashiwal wrote: > > Hey People > > I am Rohit Ashiwal and here my first draft of the proposal for the project > titled: `Improve consistency of sequencer commands' this summer. I need your > feedback and more than that I need help to improve the time

Git excludes fails to avoid git submodule warning

2019-03-23 Thread Klaatu
Working with Git 2.21.0 on Linux: The git-add(1) man page says: "The optional configuration variable core.excludesFile indicates a path to a file containing patterns of file names to exclude from git-add" But if I do this: $ echo "docs/themes/*/.git >> .gitexcludes $ git config core.excludeFil

Re: [GSoC][RFC] Proposal: Improve consistency of sequencer commands

2019-03-23 Thread Elijah Newren
Hi Rohit! On Fri, Mar 22, 2019 at 8:12 AM Rohit Ashiwal wrote: > > Hey People > > I am Rohit Ashiwal and here my first draft of the proposal for the project > titled: `Improve consistency of sequencer commands' this summer. I need your > feedback and more than that I need help to improve the time

Re: [GSoC][RFC] Proposal: Improve consistency of sequencer commands

2019-03-23 Thread Rohit Ashiwal
Hi Christian On 2019-03-23 22:17 UTC Christian Couder <> wrote: > On Fri, Mar 22, 2019 at 4:12 PM Rohit Ashiwal > wrote: > > > > Hey People > > > > I am Rohit Ashiwal and here my first draft of the proposal for the project > > titled: `Improve consistency of sequencer commands' this summer. I nee

Re: [GSoC][RFC] Proposal: Improve consistency of sequencer commands

2019-03-23 Thread Rohit Ashiwal
Hi Elijah! On Sat, 23 Mar 2019 18:07:17 -0700 Elijah Newren wrote: > Hi Rohit! > > On Fri, Mar 22, 2019 at 8:12 AM Rohit Ashiwal > wrote: > > PS: Point one is missing in the timeline from the ideas page[0], can someone > > explain what exactly it wants? > > I don't understand the question;

Re: [PATCH] Make stashing nothing exit 1

2019-03-23 Thread Eric Sunshine
On Sat, Mar 23, 2019 at 3:54 AM Ævar Arnfjörð Bjarmason wrote: > On Sat, Mar 23 2019, Keith Smiley wrote: > > In the case there are no files to stash, but the user asked to stash, we > > should exit 1 since the stashing failed. > > --- > > diff --git a/git-stash.sh b/git-stash.sh > > @@ -318,7 +31

Re: [PATCH 1/3] rebase: teach rebase --keep-base

2019-03-23 Thread Eric Sunshine
On Sat, Mar 23, 2019 at 11:25 AM Denton Liu wrote:> > [...] > Since rebasing onto the merge base of the branch and the upstream is > such a common case, introduce the --keep-base option as a shortcut. > [...] > Signed-off-by: Denton Liu > --- > diff --git a/builtin/rebase.c b/builtin/rebase.c > @