Re: Re* [PATCH v2 2/2] t: add tests for pull --verify-signatures

Hans Jerry Illikainen writes: > Thanks! t7612-merge-verify-signatures.sh also lacks cleanup for > test_must_fail brokenness. Would you prefer test_when_finished to be > included in the two patches as a v3? No, I do not want a v3 as these are already in 'next'. Just like my

[no subject]

This is the second time i am sending you this mail. I, Friedrich Mayrhofer Donates the sum of $ 1,000,000.00 to You, Email Me personally for more details. Regards. Friedrich Mayrhofer

Re: [PATCH v2 1/1] check-non-portable-shell.pl: Quoted `wc -l` is not portable

On Sat, Dec 16, 2017 at 2:52 PM, wrote: > [...] > Add a check in check-non-portable-shell.pl to find '"' between > `wc -l` and '=' and hint the user about test_line_count(). > > Reviewed-by: Johannes Schindelin > Signed-off-by: Torsten Bögershausen

Re: [PATCH v2 8/8] travis-ci: only print test failures if there are

On Sat, Dec 16, 2017 at 5:48 PM, SZEDER Gábor wrote: > On Sat, Dec 16, 2017, Eric Sunshine wrote: >> I'd think you'd want to capture the result of the expansion of >> t/test-result/*.exit as a string and compare that instead. > > I'm not sure how

Re: [PATCH v2 8/8] travis-ci: only print test failures if there are

> On Sat, Dec 16, 2017 at 7:58 AM, SZEDER G=C3=A1bor w= > rote: > > +if test t/test-results/*.exit =3D "t/test-results/*.exit" > > Isn't the above going to cause 'test' to error out? > > $ mkdir -p t/test-results > $ >t/test-results/a.exit > $

Re: Q: rational for $XDG_CONFIG_HOME/git/config to be "non global" or just a bug?

On Mon, Dec 11, 2017 at 05:05:01PM -0800, Junio C Hamano wrote: > Jonathan Nieder writes: > > As for "git config --global", I think the best thing would be to split > > it into two options: something like "git config --user" and "git > > config --xdg-user". That way, it is

GREETINGS BELOVED

GREETINGS BELOVED I AM BORTE ,I WAS DIAGNOSE WITH OVARIAN CANCER,WHICH DOCTORS HAVE CONFIRMED THAT I HAVE ONLY FEW WEEKS TO LIVE, SO I HAVE DECIDED TO DONATE EVERYTHING I HAVE TO THE ORPHANAGE AND THE POOR WIDOWS THROUGH YOU AND YOUR HELP .PLEASE KINDLY REPLY ME ONLY ON MY EMAIL ADDRESS HERE

[PATCH v2 1/1] check-non-portable-shell.pl: Quoted `wc -l` is not portable

From: Torsten Bögershausen wc -l was used to count the number if lines in test scripts. $ wc -l Makefile gives a line like this: 105 Makefile while Mac OS has 4 leading spaces: 105 Makefile And this means that shell expressions like test "$(wc -l

[PATCH] l10n: de.po: improve messages when a branch starts to track another ref

Signed-off-by: Ralf Thielow --- po/de.po | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/de.po b/po/de.po index 400262625..00ffd8c41 100644 --- a/po/de.po +++ b/po/de.po @@ -1070,42 +1070,42 @@ msgstr "Branch %s kann nicht sein

'git format-patch --summary' seems to be turning off the stat

The documentation for "--summary" option in the format-patch Doc states, --summary Output a condensed summary of extended header information such as creations, renames and mode changes. It doesn't state anything about turning of the stat. Why does the stat get turned off when "--summary"

Re: Apparent bug in 'git stash push ' loses untracked files

Thomas Gummerer writes: > Maybe the best solution would be to introduce 'git reset --hard -- > ', or maybe someone who knows shell programming a little > better than me has an idea? > > diff --git a/git-stash.sh b/git-stash.sh > index 1114005ce2..01bf74015e 100755 > ---

Re: [PATCH v2 8/8] travis-ci: only print test failures if there are test results available

On Sat, Dec 16, 2017 at 7:58 AM, SZEDER Gábor wrote: > When a build job running the test suite fails, our > 'ci/print-test-failures.sh' script scans all 't/test-results/*.exit' > files to find failed tests and prints their verbose output. However, > if a build job were to

Re: [PATCH v2 1/8] travis-ci: use 'set -x' in select 'ci/*' scripts for extra tracing

Hi Gábor, On Sat, 16 Dec 2017, SZEDER Gábor wrote: > While the build logic was embedded in our '.travis.yml', Travis CI > used to produce a nice trace log including all commands executed in > those embedded scriptlets. Since 657343a60 (travis-ci: move Travis CI > code into dedicated scripts,

Merry Christmas

my name is Mrs. Alice Walton, a business woman an America Citizen and the heiress to the fortune of Walmart stores, born October 7, 1949. I have a mission for you worth $100,000,000.00(Hundred Million United State Dollars) which I intend using for CHARITY

I wait for your prompt response.

Good day, I am Mr. Sam Azada from Burkina Faso a Minister confide on me to look for foreign partner who will assist him to invest the sum of Fifty Million Dollars ($50,000,000) in your country. He has investment interest in mining, exotic properties for commercial resident, development

Urgent Message

Dear Western Union Customer, You have been awarded with the sum of $250,000 USD by our office, as one of our customers who use Western Union in their daily business transaction. This award was been selected through the internet, where your e-mail address was indicated and notified. Please

[PATCH v2 8/8] travis-ci: only print test failures if there are test results available

When a build job running the test suite fails, our 'ci/print-test-failures.sh' script scans all 't/test-results/*.exit' files to find failed tests and prints their verbose output. However, if a build job were to fail before it ever gets to run the test suite, then there will be no files to match

[PATCH v2 7/8] travis-ci: save prove state for the 32 bit Linux build

This change follows suit of 6272ed319 (travis-ci: run previously failed tests first, then slowest to fastest, 2016-01-26), which did this for the Linux and OSX build jobs. Travis CI build jobs run the tests parallel, which is sligtly faster when tests are run in slowest to fastest order,

[PATCH v2 5/8] travis-ci: don't install default addon packages for the 32 bit Linux build

The 32 bit Linux build job compiles Git and runs the test suite in a Docker container, while the additional packages (apache2, git-svn, language-pack-is) are installed on the host, therefore don't have any effect and are unnecessary. Signed-off-by: SZEDER Gábor ---

[PATCH v2 6/8] travis-ci: don't install 'language-pack-is' package

Ever since we have started to use Travis CI in 522354d70 (Add Travis CI support, 2015-11-27), our 64 bit Linux build jobs install the 'languate-pack-is' package. That commit doesn't discuss why it was deemed necessary back then, but Travis CI can build and test Git without that package just fine,

[PATCH v2 4/8] travis-ci: set GIT_TEST_HTTPD in 'ci/lib-travisci.sh'

Commit 657343a60 (travis-ci: move Travis CI code into dedicated scripts, 2017-09-10) converted '.travis.yml's default 'before_install' scriptlet to the 'ci/install-dependencies.sh' script, and while doing so moved setting GIT_TEST_HTTPD=YesPlease for the 64-bit GCC and Clang Linux build jobs to

[PATCH v2 3/8] travis-ci: move setting environment variables to 'ci/lib-travisci.sh'

Our '.travis.yml's 'env.global' section sets a bunch of environment variables for all build jobs, though none of them actually affects all build jobs. It's convenient for us, and in most cases it works just fine, because irrelevant environment variables are simply ignored. However,

[PATCH v2 2/8] travis-ci: introduce a $jobname variable for 'ci/*' scripts

A couple of 'ci/*' scripts are shared between different build jobs: 'ci/lib-travisci.sh', being a common library, is sourced from almost every script, while 'ci/install-dependencies.sh', 'ci/run-build.sh' and 'ci/run-tests.sh' are shared between the "regular" GCC and Clang Linux and OSX build

[PATCH v2 1/8] travis-ci: use 'set -x' in select 'ci/*' scripts for extra tracing

While the build logic was embedded in our '.travis.yml', Travis CI used to produce a nice trace log including all commands executed in those embedded scriptlets. Since 657343a60 (travis-ci: move Travis CI code into dedicated scripts, 2017-09-10), however, we only see the name of the dedicated

[PATCH v2 0/8] Travis CI cleanups

This is a reroll of 'sg/travis-fixes'. Changes since the previous round: - Patch 1 got updated following the discussion: - I went with enabling tracing executed commands everywhere, including the Windows build job, except where we know it causes way too much clutter, which is

[PATCH] config: document default value of http.sslVerify

Remove any doubt that certificates might not be verified by default. Signed-off-by: Simon Ruderich --- Documentation/config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index

[PATCH] p7519: improve check for prerequisite WATCHMAN

The return code of command -v with a non-existing command is 1 in bash and 127 in dash. Use that return code directly to allow the script to work with dash and without watchman (e.g. on Debian). While at it stop redirecting the output. stderr is redirected to /dev/null by test_lazy_prereq

[PATCH] revision: introduce prepare_revision_walk_extended()

prepare_revision_walk() allows callers to take ownership of the array of pending objects by setting the rev_info flag "leak_pending" and copying the object_array "pending". They use it to clear commit marks after setup is done. This interface is brittle enough that it requires extensive

PAYMENT NOTIFICATION

Attention: Beneficiary, Re:CONTACT MONEY GRAM OFFICE FOR YOUR PAYMENT OF $5,000.00 Be inform that We have been authorized by the United Nations Compensation Commission (UNCC) to release your compensation payment totaling the sum of US$1,500,000.00 through Money Gram transfer.You will be

Re: Trying to use insteadOf trick to use different SSH keys for separate github accounts - not working

Thanks it worked! I was reading all the tutorials wrong all this time... Regards, Asfand On 16 December 2017 at 09:48, Jeff King wrote: > On Sat, Dec 16, 2017 at 07:50:02AM +, Asfand Qazi wrote: > >> I found out about the 'insteadOf' setting, and thought it would work.

Re: Git Hooks

On Fri, Dec 15, 2017 at 12:48:07PM -0800, Satyakiran Duggina wrote: > To give the code pullers a chance to review, can we not have a > `trusted-hooks: default` and `trusted-SHA: ` field in .git/. > I'm assuming githooks/ are source tracked here. > > When developer tries to execute `git commit`,

Re: Trying to use insteadOf trick to use different SSH keys for separate github accounts - not working

On Sat, Dec 16, 2017 at 07:50:02AM +, Asfand Qazi wrote: > I found out about the 'insteadOf' setting, and thought it would work. > So I added this to my global git config: > > [url "g...@github.com:MyCompany/"] > insteadOf = g...@work.github.com:MyCompany/ > > and left the SSH hostname

Re: Re* [PATCH v2 2/2] t: add tests for pull --verify-signatures

On Fri, Dec 15, 2017 at 11:48:29AM -0800, Junio C Hamano wrote: > Here is what I would propose as a follow-up polishing. > > -- >8 -- > Subject: [PATCH 3/2] t5573: clean up after unexpected success of 'pull', too > > The previous step added test_when_finished to tests that run 'git > pull' with

[PATCH v5 2/3] rebase: distinguish user input by quoting it

Signed-off-by: Kaartic Sivaraam Signed-off-by: Junio C Hamano Signed-off-by: Kaartic Sivaraam --- git-rebase.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index

[PATCH v5 3/3] rebase: rebasing can also be done when HEAD is detached

Attempting to rebase when the HEAD is detached and is already up to date with upstream (so there's nothing to do), the following message is shown Current branch HEAD is up to date. which is clearly wrong as HEAD is not a branch. Handle the special case of HEAD correctly to give a more

[PATCH v5 1/3] rebase: consistently use branch_name variable

The variable "branch_name" holds the parameter in "git rebase ", but one codepath did not use it after assigning $1 to it (instead it kept using $1). Make it use the variable consistently. Also, update an error message to say there is no such branch or commit, as we are expecting either of

[PATCH v5 0/3] rebase: give precise error messages

The tip of the v4 of this patch can be found at [1]. It was a revamp sent by Junio mostly touching [PATCH v2 1/3] of the series. I've updated it a little to add in something of my taste ;-) There's only one concern that still bothers me a little. With the current code you would see the following,

[PATCH v5 0/1] clarify about @{-N} syntax in check-ref-format documentation

This was previously [PATCH v4 2/2] of this thread. It has now been detached from 1/2 as it got merged to 'master'. This patch applies on top of 'master'. As this is almost a v2 of the v4 2/2 I'm comparing the changes with v3 2/2 of the series. Apart from the changes shown by the below interdiff

[PATCH v5 1/1] Doc/check-ref-format: clarify information about @{-N} syntax

When the N-th previous thing checked out syntax (@{-N}) is used with '--branch' option of check-ref-format the result may not be the name of a branch that currently exists or ever existed. This is because @{-N} is used to refer to the N-th last checked out "thing", which might be a commit object