Re: [PATCH 2/2] t/lib-git-svn.sh: improve svnserve tests with parallel make test

Hi Jonathan, Jonathan Nieder wrote: Todd Zullinger wrote: Previously, setting SVNSERVE_PORT enabled several tests which require a local svnserve daemon to be run (in t9113 & t9126). The tests share the setup of the local svnserve via `start_svnserve()`. The function uses the svnserve op

Re: [PATCH 1/2] t/lib-git-svn: whitespace cleanup

Hi Jonathan, Jonathan Nieder wrote: nit: it would have been a tiny bit easier to review if the commit message mentioned that this is only changing the indentation from an inconsistent space/tab mixture to tabs and isn't making any other changes. If only you saw how many times I typed a

Re: [PATCH 0/2] t/lib-git-svn.sh: improve svnserve tests with parallel make test

Hi Jonathan, Jonathan Nieder wrote: Todd Zullinger wrote: These tests are not run by default nor are they enabled in travis-ci. I don't know how much testing they get in user or other packager builds. I've been slowly increasing the test suite usage in fedora builds. I ran into this while

Re: [PATCH 0/2] t/lib-git-svn.sh: improve svnserve tests with parallel make test

Hi Eric, Eric Wong wrote: I'm fine with this for now. Since svnserve (and git-daemon) both support inetd behavior, I think we can eventually have a test helper which binds random ports and pretends to be an inetd, letting the test run without any special setup. It would let multiple test

[PATCH 2/2] t/lib-git-svn.sh: improve svnserve tests with parallel make test

alse' or 'auto' to enable these tests. Signed-off-by: Todd Zullinger <t...@pobox.com> --- t/lib-git-svn.sh | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh index 84366b2624..4c1f81f167 100644 --- a/t/lib-git-svn.sh +++ b/t/lib-

[PATCH 0/2] t/lib-git-svn.sh: improve svnserve tests with parallel make test

. :) The indentation of lib-git-svn.sh didn't use tabs consistently, in only a few places, so I cleaned that up first. I can drop that change if it's unwanted. Todd Zullinger (2): t/lib-git-svn: whitespace cleanup t/lib-git-svn.sh: improve svnserve tests with parallel make test t/lib-git

[PATCH 1/2] t/lib-git-svn: whitespace cleanup

Signed-off-by: Todd Zullinger <t...@pobox.com> --- t/lib-git-svn.sh | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh index 688313ed5c..84366b2624 100644 --- a/t/lib-git-svn.sh +++ b/t/lib-git-svn.sh @@ -17,8

Re: [PATCH] travis-ci: avoid new tcl/tk build requirement

Christian Couder wrote: Junio C Hamano wrote: It seems that TravisCI objects ;-) https://travis-ci.org/git/git/jobs/307745929 Interesting that the main builds passed. I don't know what the default 64-bit linuxinstall looks like in travis, so I presume it includes tcl/tk or something.

[PATCH] travis-ci: avoid new tcl/tk build requirement

A build requirement on tcl/tk was added in 01c54284f1 (Makefile: check that tcl/tk is installed, 2017-11-20). For building and running the tests, we don't need tcl/tk installed. Bypass the requirement. Signed-off-by: Todd Zullinger <t...@pobox.com> --- Junio C Hamano wrote: >

Re: [PATCH] Makefile: check that tcl/tk is installed

Jeff King wrote: Yeah, this side-steps the "other half" of the issue that Christian's patch addresses, which seems like the more controversial part (I don't have a strong opinion myself, though). I don't either. The general motivation there, as far as I understand, is that it's undesirable

Re: [PATCH] RelNotes: minor typo fixes in 2.15.1 draft

Apologies for the duplicate. I used the `-n` option, mistakenly thinking it was a synonym for `--dry-run` and didn't pay enough attention to see that it sent. (The only indication is s/OK./Dry &/ which I missed.) It was mildly surprising that the script didn't warn or complain about an

[PATCH] RelNotes: minor typo fixes in 2.15.1 draft

Signed-off-by: Todd Zullinger <t...@pobox.com> --- Documentation/RelNotes/2.15.1.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/RelNotes/2.15.1.txt b/Documentation/RelNotes/2.15.1.txt index 47f23b56fe..81dd64b4ad 100644 --- a/Documentation/Re

[PATCH] RelNotes: minor typo fixes in 2.15.1 draft

Signed-off-by: Todd Zullinger <t...@pobox.com> --- Documentation/RelNotes/2.15.1.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/RelNotes/2.15.1.txt b/Documentation/RelNotes/2.15.1.txt index 47f23b56fe..81dd64b4ad 100644 --- a/Documentation/Re

Re: [PATCH] Makefile: check that tcl/tk is installed

Christian Couder wrote: On Thu, Nov 16, 2017 at 2:35 AM, Junio C Hamano wrote: I suspect that this change will hurt those who package Git for other people. Maybe a little bit, but in my opinion it should not be a big problem for them to install Tcl/Tk and its dependencies

Re: [PATCH] branch doc: remove --set-upstream from synopsis

Junio C Hamano wrote: Todd Zullinger <t...@pobox.com> writes: Support for the --set-upstream option was removed in 52668846ea (builtin/branch: stop supporting the "--set-upstream" option, 2017-08-17), after a long deprecation period. Remove the option from the command synopsis

[PATCH] completion: add '--copy' option to 'git branch'

In 52d59cc645 (branch: add a --copy (-c) option to go with --move (-m), 2017-06-18), `git branch` learned a `--copy` option. Include it when providing command completions. Signed-off-by: Todd Zullinger <t...@pobox.com> --- contrib/completion/git-completion.bash | 2 +- 1 file chan

Re: [PATCH] branch doc: remove --set-upstream from synopsis

Martin Ågren wrote: On 16 November 2017 at 08:46, Todd Zullinger <t...@pobox.com> wrote: I noticed that --set-upstream was still in the synopsis for git branch. I don't think it was left there intentionally. I looked through the thread where support for the option was removed and

[PATCH] branch doc: remove --set-upstream from synopsis

`--delete` with `--set-upstream-to`. Signed-off-by: Todd Zullinger <t...@pobox.com> --- I noticed that --set-upstream was still in the synopsis for git branch. I don't think it was left there intentionally. I looked through the thread where support for the option was removed and d

Re: [PATCH] notes: send "Automatic notes merge failed" messages to stderr

Johan Herland wrote: On Tue, Nov 14, 2017 at 5:17 PM, Todd Zullinger <t...@pobox.com> wrote: All other error messages from notes use stderr. Do the same when alerting users of an unresolved notes merge. Fix the output redirection in t3310 and t3320 as well. Previously, the tests di

Re: [PATCH] sha1: add gnutls as a sha1 provider

Hi Shawn, Shawn Landden wrote: I think this is preferrable to bringing the assembly routines into the git code-base, as a way of getting access to these high-performance routines to a git available in Debian, Ubuntu, or Fedora (which all use BLK_SHA1=1 due to GPLv2 + OpenSSL license

[PATCH] notes: send "Automatic notes merge failed" messages to stderr

of the redirection operators. Signed-off-by: Todd Zullinger <t...@pobox.com> --- Johan Herland wrote: > ACK :-) > > Error messages should go to stderr, and redirection in the tests > should be fixed. Excellent, thanks Johan! Here's what I came up with. Hopefully I caught all t

Re: [PATCH] t/lib-gpg: fix gpgconf stderr redirect to /dev/null

Junio C Hamano wrote: The message goes to the standard output stream since it was introduced in 809f38c8 ("git notes merge: Manual conflict resolution, part 1/2", 2010-11-09) and 6abb3655 ("git notes merge: Manual conflict resolution, part 2/2", 2010-11-09). I do think it makes more sense to

Re: [PATCH] t/lib-gpg: fix gpgconf stderr redirect to /dev/null

Santiago Torres wrote: Quick followup. The version that triggers this is at least 2.1.21[1]. I recall there was some wiggle room on minor versions before it. Thanks for digging that up! I had 2.1.13 at hand in a fedora-25 chroot which I used to build git recently, but I've not been able to

Re: [PATCH] t/lib-gpg: fix gpgconf stderr redirect to /dev/null

Junio C Hamano wrote: **Blush**. I should have caught this during the review. Thanks. I've written that code myself in the past and I am sure I will do it again. :) I wonder if this line in 3320 is doing what it meant to do: test_must_fail git notes merge z 2>&1 >out &&

Re: [PATCH] t/lib-gpg: fix gpgconf stderr redirect to /dev/null

Hi Santiago, Santiago Torres wrote: Thanks for catching the redirection issue! I agree that the other fixes feel like overkill. Are you certain that switching to gpgconf --reload will have the same effect as --kill? (I know that this is the case for scdaemon only). I am not at all certain

[PATCH] rebase: fix stderr redirect in apply_autostash()

The intention is to ignore all output from the 'git stash apply' call. Adjust the order of the redirection to ensure that both stdout and stderr are redirected to /dev/null. Signed-off-by: Todd Zullinger <t...@pobox.com> --- git-rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 de

[PATCH] t/lib-gpg: fix gpgconf stderr redirect to /dev/null

. Without this, gpgconf from gnupg-2.0 releases would output 'gpgconf: invalid option "--kill"' each time it was called. Signed-off-by: Todd Zullinger <t...@pobox.com> --- I noticed that gpgconf produced error output for a number of tests on CentOS/RHEL. As an example: *** t553

Re: [PATCH/RFC] Replace Free Software Foundation address in license notices

Junio C Hamano wrote: This change probably makes sense. From here on after applying the patch, we won't have to worry about updating these every time they move---not that they have moved often, though ;-) Indeed. It's thankfully a rare move. I imagine that's why it's somewhat common to

[PATCH/RFC] Replace Free Software Foundation address in license notices

address is still present in t/diff-lib/COPYING. This is intentional, as the file is used in tests and the contents are not expected to change. Signed-off-by: Todd Zullinger <t...@pobox.com> --- As further rationale for this change, the package lint checks in Fedora (and other distributions

Re: "git rm" seems to do recursive removal even without "-r"

Robert P. J. Day wrote: was just testing variations of "git rm", and man page claims: -r Allow recursive removal when a leading directory name is given. i tested this on the "pro git" book repo, which contains a top-level "book/" directory, and quite a number of "*.asc" files in

Re: [PATCH v2] api-argv-array.txt: Remove broken link to string-list API

Jonathan Nieder wrote: Thanks for catching it. Do you use a broken link detection tool to detect this kind of issue automatically? Yeah, in the Fedora git builds we pass all the generated html files through the linkchecker tool (http://wummel.github.io/linkchecker/). We started using that

[PATCH v2] api-argv-array.txt: Remove broken link to string-list API

it to the end-user documentation. Signed-off-by: Todd Zullinger <t...@pobox.com> --- Junio C Hamano wrote: > Probably removing the link is the right thing to do. Excellent. Thank you for detailing the likely progression as well as the preferred solution. Documentation/technical/api-argv-array.txt

[PATCH] api-argv-array.txt: Update link to string-list API

In 4f665f2cf3 (string-list.h: move documentation from Documentation/api/ into header, 2017-09-26) the string-list API documentation was moved into string-list.h. Fix the link from the argv-array API documentation. Signed-off-by: Todd Zullinger <t...@pobox.com> --- Hi, I noticed this

Re: upgarding GIT

Ævar Arnfjörð Bjarmason wrote: On Mon, Aug 07 2017, James Wells jotted: I am fairly new to git, however I have a challenge of upgrading git from 2.0.4 to 2.4.12 and my initial 2.0.4 install was done via TAR BALL on my server. I have a centos server running git and Atlassian STASH and my

Re: [PATCH] send-email: check for repo before invoking hook

Hi Jonathan, Jonathan Tan wrote: Thanks for the notification. Here's a patch to fix that. --- git-send-email.perl | 32 +--- t/t9001-send-email.sh | 8 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/git-send-email.perl

Re: Git log.decorate can't be overridden in global config (v2.13.0)

Hi Caleb, Caleb Evans wrote: I recently updated to Git v2.13.0 (macOS Sierra via Homebrew), and I noticed that the default --decorate option for `git log` has changed from --decorate=no to --decorate=auto. I'd prefer to keep decoration disabled to minimize clutter in the logs, so I try

Re: [RFC] dropping support for ancient versions of curl

brian m. carlson wrote: On Wed, Apr 05, 2017 at 12:51:38PM +0200, Ævar Arnfjörð Bjarmason wrote: On Wed, Apr 5, 2017 at 11:33 AM, Tom G. Christensen wrote: Whoah. So my assumption in that nobody was

Re: [PATCH] There was a little inconsistancy in git prompt

Hi Rudy, I think the commit subject should include a bit more detail. Ideally, the subject would start with 'bash prompt: ' to make it clear what area the commit involves. Then you would want to describe what inconsistency is being fixed (and why). Rudy YAYON wrote: ---

Re: git 2.8.0 tarball rpmbuild error

Pranit Bauva wrote: On Sat, Apr 2, 2016 at 9:18 PM, マッチョコ太郎 wrote: hi I downloaded tarball (tar.gz) from git web site and tried to make rpm file. But, when I run command "$rpmbuild -tb --clean git-2.8.0.tar.gz", error message is displayed and rpm file creation stopped.

[PATCH] spec: Adjust README name

The README file moved to README.md in ad21f5 (README: use markdown syntax, 2016-02-25). Reported-by: マッチョコ太郎 <mebius10...@gmail.com> Signed-off-by: Todd Zullinger <t...@pobox.com> --- Hi, マッチョコ太郎 wrote: hi I downloaded tarball (tar.gz) from git web site and tried to make rpm file

Re: Running make rpm fails on a CentOS 6.3 machine

Erez Zilber wrote: Thanks. Just making sure - I need to do all of this on a fedora machine, not a RHEL/CentOS machine, right? Nope. An el6 box makes a fine mock host for el6 and (usually) fedora targets (though the mock package in EPEL doesn't always have config files for the very latest

Re: Running make rpm fails on a CentOS 6.3 machine

Martin Langhoff wrote: # Create an el6 srpm $ fedpkg --dist el6 srpm here I just say fedpkg --dist el6 mockbuild and it makes the srpm and the binaries in mock. Automagic. Heh, and I thought I mentioning that, but since I never use it I didn't want to have to test it before including it

Re: Running make rpm fails on a CentOS 6.3 machine

Hi Erez, Erez Zilber wrote: Thanks. I will try to use the rpm from Todd's build. BTW - if I want to create such a build on Fedora that will create el6 packages (e.g. git-1.8.5.3-2.el6.x86_64.rpm), what's the procedure? Something like this (this is from memory): # Install fedpkg $ yum

Re: Running make rpm fails on a CentOS 6.3 machine

Hello, Jonathan Nieder wrote: Erez Zilber wrote: Writing perl.mak for Git Writing perl.mak for Git rename MakeMaker.tmp = perl.mak: No such file or directory at /usr/share/perl5/ExtUtils/MakeMaker.pm line 1024. make[3]: perl.mak: No such file or directory make[3]: perl.mak: No such file or

Re: [RFC/PATCH] __git_ps1: migrate out of contrib/completion

Jonathan Nieder wrote: Different installers put the git-prompt.sh shell library at different places on the installed system, so there is no shared location users can count on: Fedora - /etc/profile.d/git-prompt.sh FWIW, we moved it to /usr/share/git-core/contrib/completion/ -- it was only

<    1   2