Re: t9700-perl-git.sh is broken on some configurations

2016-03-04 Thread Dennis Kaarsemaker
hat the tests are actually being run against perl 5.10, which RHEL 6 ships as system perl. As that's still a supported OS, writing tests in a form compatible with it would be a good thing :) -- Dennis Kaarsemaker http://www.kaarsemaker.net -- To unsubscribe from this list: send the line &qu

Re: [PATCH] t9700: fix test for perl older than 5.14

2016-03-04 Thread Dennis Kaarsemaker
On vr, 2016-03-04 at 06:43 -0500, Jeff King wrote: > On Fri, Mar 04, 2016 at 11:58:24AM +0100, Dennis Kaarsemaker wrote: > > > On vr, 2016-03-04 at 03:56 -0500, Jeff King wrote: > > > ? Those are just guesses, but if we are tickling a bug in perl's parser, > >

Re: Git Smart HTTP using Nginx

2016-03-10 Thread Dennis Kaarsemaker
ib/git-core/git-http-backend; fastcgi_param PATH_INFO $uri; fastcgi_param GIT_PROJECT_ROOT $repo_root; fastcgi_param REMOTE_USER $remote_user; include fastcgi_params; } -- Dennis Kaarsemaker http://www.kaarsemaker.net -- To unsubscribe from this list: send t

Re: Problem with Integrated Vim Editor on Win 10

2016-03-30 Thread Dennis Kaarsemaker
already: https://github.com/git-for-windows/git/issues/711 -- Dennis Kaarsemaker http://www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH v3 00/16] port branch.c to use ref-filter's printing options

2016-04-01 Thread Dennis Kaarsemaker
xpect <<-\EOF && # master: Head ref # side: Not Head ref # odd/spot: Not Head ref # double-tag: Not Head ref # foo1.10: Not Head ref # foo1.3: Not Head ref # foo1.6: Not Head ref #

Re: [PATCH v3 00/16] port branch.c to use ref-filter's printing options

2016-04-01 Thread Dennis Kaarsemaker
On Fri, Apr 01, 2016 at 03:31:17PM +0200, Dennis Kaarsemaker wrote: > On wo, 2016-03-30 at 15:09 +0530, Karthik Nayak wrote: > > > > This is part of unification of the commands 'git tag -l, git branch -l > > and git for-each-ref'. This ports over branch.c to use re

Re: RFD: removing git.spec.in (Re: git 2.8.0 tarball rpmbuild error)

2016-04-04 Thread Dennis Kaarsemaker
ng as if we support RPM > packaging. I would be in favor of that. In general, I find it much better to use a distro's packaging and simply transplanting a tarball into it. That keeps the difference with what the distro provides minimal. -- Dennis Kaarsemaker www.kaarsemaker.net

Re: git 2.8.1 not working with socks5h https proxy anymore

2016-04-08 Thread Dennis Kaarsemaker
result,   CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);   else if (starts_with(curl_http_proxy, "socks4a")) But I have no socks5h proxy to test with. Can you give this patch a spin? -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH] Makefile: remove dependency on git.spec

2016-04-27 Thread Dennis Kaarsemaker
ab21433 dropped support for rpmbuild using our own specfile by removing git.spec.in, but forgot to remove the dependency of dist on git.spec. Signed-off-by: Dennis Kaarsemaker --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 23182bc

[PATCH] git-p4: import the ctypes module

2015-10-20 Thread Dennis Kaarsemaker
The ctypes module is used on windows to calculate free disk space, so it must be imported. Signed-off-by: Dennis Kaarsemaker --- git-p4.py | 1 + 1 file changed, 1 insertion(+) On di, 2015-10-20 at 09:00 -0700, Junio C Hamano wrote: > Luke Diamand writes: > > > On 20 October 2

Re: git-gui is still using old-style git-merge invocation

2015-10-29 Thread Dennis Kaarsemaker
| 1 + > 1 file changed, 1 insertion(+) > create mode 100644 a > > But I am unable to find where the invocation happens. Can somebody > help? git-gui/lib/merge.tcl, method _start The command is constructed on lines 115-120 (master as of today, 37023ba3) -- Dennis Kaarsemaker w

Re: Bug: t5813 failing on Cygwin

2015-11-07 Thread Dennis Kaarsemaker
-git a/t/t5813-proto-disable-ssh.sh b/t/t5813-proto-disable -ssh.sh index ad877d7..a954ead 100755 --- a/t/t5813-proto-disable-ssh.sh +++ b/t/t5813-proto-disable-ssh.sh @@ -14,7 +14,7 @@ test_expect_success 'setup repository to clone' ' ' test_proto "host:path" ssh "remote:repo.git" -test_proto "ssh://" ssh "ssh://remote/$PWD/remote/repo.git" -test_proto "git+ssh://" ssh "git+ssh://remote/$PWD/remote/repo.git" +test_proto "ssh://" ssh "ssh://remote$PWD/remote/repo.git" +test_proto "git+ssh://" ssh "git+ssh://remote$PWD/remote/repo.git" test_done -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: Bug: t5813 failing on Cygwin

2015-11-07 Thread Dennis Kaarsemaker
On za, 2015-11-07 at 23:05 +, Ramsay Jones wrote: > > On 07/11/15 21:21, Ramsay Jones wrote: > > > > > > On 07/11/15 21:02, Dennis Kaarsemaker wrote: > > > On za, 2015-11-07 at 19:20 +, Adam Dinwoodie wrote: > > > > On Sat, Nov 07, 2015 at 01

[PATCH] t5813: avoid creating urls that break on cygwin

2015-11-08 Thread Dennis Kaarsemaker
or helpers, but that's for another topic as it could cause regressions. Signed-off-by: Dennis Kaarsemaker --- t/t5813-proto-disable-ssh.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t5813-proto-disable-ssh.sh b/t/t5813-proto-disable-ssh.sh index ad877d7..a9

[PATCH] check-ignore: correct documentation about output

2015-11-08 Thread Dennis Kaarsemaker
By default git check-ignore shows only the filenames that will be ignored, not the pattern that causes their exclusion. Signed-off-by: Dennis Kaarsemaker --- Documentation/git-check-ignore.txt | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Documentation/git-check

Re: how to check for uncommitted/unstaged changes on remote side before pushing

2015-11-09 Thread Dennis Kaarsemaker
non-bare one - Use git archive and symlink trickery for even better deploys Questions like this come up in #git all the time, so I wrote up a few more detailed recipes here, including working hooks and config for all three ways of deploying: http://git.seveas.net/simple-deployments-with-git.h

Re: how to check for uncommitted/unstaged changes on remote side before pushing

2015-11-09 Thread Dennis Kaarsemaker
om/RichiH/vcsh/) in combination with a .bashrc.d snippet that updates dotfiles upon login when possible ( https://github.com/seveas/dotfiles/blob/master/.bashrc.d/vcsh.sh) -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe git" in th

[PATCH] t5813: avoid creating urls that break on cygwin

2015-11-09 Thread Dennis Kaarsemaker
actually fix this in git itself, making it remove extra slashes from urls before feeding them to transports or helpers, but that's for another topic as it could cause regressions. Signed-off-by: Dennis Kaarsemaker --- You're right of course. Somehow I remembered that the fake ssh was

Re: gitk fails to start after upgrading to 2.6.3 (cannot load translation)

2015-11-10 Thread Dennis Kaarsemaker
e in git 2.7. -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH] check-ignore: correct documentation about output

2015-11-16 Thread Dennis Kaarsemaker
Ping. On zo, 2015-11-08 at 21:10 +0100, Dennis Kaarsemaker wrote: > By default git check-ignore shows only the filenames that will be > ignored, not the pattern that causes their exclusion. > > Signed-off-by: Dennis Kaarsemaker > --- > Documentation/git-check-ignore.txt | 7

Re: [BUG] gitk --all and git bisect visualize crash in non-english locale

2015-11-18 Thread Dennis Kaarsemaker
2) > > It also works fine without --all. > > It bisects down to: > > commit d99b4b0de27a2bd654a40353b65883e368da6d06 > Author: Giuseppe Bilotta > Date: Wed Sep 9 15:20:53 2015 +0200 > > gitk: Accelerators for the main menu > > This allows fast,

Re: [PATCH] check-ignore: correct documentation about output

2015-11-20 Thread Dennis Kaarsemaker
[Peff, sorry for the duplicate mail. It seems I can't brain today...] On vr, 2015-11-20 at 06:31 -0500, Jeff King wrote: > On Sun, Nov 08, 2015 at 09:10:39PM +0100, Dennis Kaarsemaker wrote: > > > By default git check-ignore shows only the filenames that will be > > i

[PATCH v2] check-ignore: correct documentation about output

2015-11-20 Thread Dennis Kaarsemaker
: Dennis Kaarsemaker --- Documentation/git-check-ignore.txt | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt index 59531ab..e94367a 100644 --- a/Documentation/git-check-ignore.txt +++ b

Push --follow tags does not agree with its documentation

2015-12-04 Thread Dennis Kaarsemaker
(1/1), 166 bytes | 0 bytes/s, done. Total 1 (delta 0), reused 1 (delta 0) To /tmp/whelk.git/ - [deleted] 2.5 * [new tag] v2.5.1 -> v2.5.1 Which one is correct in this case, the behaviour or the documentation? -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from t

Re: Corruption of branch?

2015-12-14 Thread Dennis Kaarsemaker
On ma, 2015-12-14 at 14:59 -0500, Thomas Nyberg wrote: > I'm guessing you're looking for namecollisions of some kind? I was thinking the same. Can you share the (sanitised) output of git for-each-ref? -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list:

Re: Corruption of branch?

2015-12-14 Thread Dennis Kaarsemaker
s the same as 'git checkout -- frus' instead of DWIM'ing 'git checkout frus' to 'git checkout -b frus origin/frus' -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: "git stash pop" is doing an unwanted "git add" when there are conflicts.

2015-12-22 Thread Dennis Kaarsemaker
files is a bug? That depends. A stash is two commits: one for all changes that were in the index when you ran 'git stash save' and one for all changes not yet in the index. When you pop the stash, these then get restored as staged resp. unstaged changes. So if your changes are now

Segfault in git reflog

2015-12-30 Thread Dennis Kaarsemaker
aa3e54494c Dennis Kaarsemaker 1446765642 +0100 74c855f87d25a5b5c12d0485ec77c785a1c734c5 54bc41416c5d3ecb978acb0df80d57aa3e54494c Dennis Kaarsemaker 1446765951 +0100 checkout: moving from 3c3d3f629a6176b401ebec455c5dd59ed1b5f910 to master ...which I realize looks a bit broken. I think at the

Re: Segfault in git reflog

2015-12-30 Thread Dennis Kaarsemaker
On wo, 2015-12-30 at 10:24 +0100, Dennis Kaarsemaker wrote: > spirit:~/code/git (master)$ cat .git/logs/HEAD > 2635c2b8bfc9aec07b7f023d8e3b3d02df715344 > 54bc41416c5d3ecb978acb0df80d57aa3e54494c Dennis Kaarsemaker > 1446765642 +0100 > 74c855f87d25a5b5c12d0485e

Re: Segfault in git reflog

2015-12-30 Thread Dennis Kaarsemaker
On wo, 2015-12-30 at 18:28 +0700, Duy Nguyen wrote: > On Wed, Dec 30, 2015 at 6:26 PM, Duy Nguyen > wrote: > > On Wed, Dec 30, 2015 at 6:17 PM, Dennis Kaarsemaker > > wrote: > >> On wo, 2015-12-30 at 10:24 +0100, Dennis Kaarsemaker wrote: > >>> spirit:

[PATCH] reflog-walk: don't segfault on non-commit sha1's in the reflog

2015-12-30 Thread Dennis Kaarsemaker
Use lookup_commit instead of parse_object to look up commits mentioned in the reflog. This avoids a segfault in save_parents if somehow a sha1 for something other than a commit ends up in the reflog. Signed-off-by: Dennis Kaarsemaker Helped-by: Nguyễn Thái Ngọc Duy --- Duy Nguyen wrote: >

Re: [bug] Graph log and orphan branches

2015-12-30 Thread Dennis Kaarsemaker
^" ; else if (revs->cherry_mark) return "+"; return ""; -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH] reflog-walk: don't segfault on non-commit sha1's in the reflog

2015-12-30 Thread Dennis Kaarsemaker
On wo, 2015-12-30 at 13:20 -0800, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > diff --git a/reflog-walk.c b/reflog-walk.c > > index 85b8a54..b85c8e8 100644 > > --- a/reflog-walk.c > > +++ b/reflog-walk.c > > @@ -236,8 +236,8 @@ void fake_r

Re: [PATCH] reflog-walk: don't segfault on non-commit sha1's in the reflog

2015-12-30 Thread Dennis Kaarsemaker
On wo, 2015-12-30 at 13:41 -0800, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > On wo, 2015-12-30 at 13:20 -0800, Junio C Hamano wrote: > > > Dennis Kaarsemaker writes: > > > > > > > diff --git a/reflog-walk.c b/reflog-walk.c > >

[PATCH v2] reflog-walk: don't segfault on non-commit sha1's in the reflog

2015-12-30 Thread Dennis Kaarsemaker
Use lookup_commit instead of parse_object to look up commits mentioned in the reflog. This avoids a segfault in save_parents if somehow a sha1 for something other than a commit ends up in the reflog. Signed-off-by: Dennis Kaarsemaker Helped-by: Nguyễn Thái Ngọc Duy Helped-by: Junio C Hamano

[PATCH v3] reflog-walk: don't segfault on non-commit sha1's in the reflog

2015-12-30 Thread Dennis Kaarsemaker
ution would be to decouple git reflog from the log walker machinery. Signed-off-by: Dennis Kaarsemaker Helped-by: Nguyễn Thái Ngọc Duy Helped-by: Junio C Hamano --- reflog-walk.c | 16 +++- t/t1410-reflog.sh | 13 + 2 files changed, 24 insertions(+), 5 deletions(-) Ju

Re: [PATCH v3] reflog-walk: don't segfault on non-commit sha1's in the reflog

2015-12-31 Thread Dennis Kaarsemaker
On wo, 2015-12-30 at 16:02 -0800, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > diff --git a/reflog-walk.c b/reflog-walk.c > > index 85b8a54..0ebd1da 100644 > > --- a/reflog-walk.c > > +++ b/reflog-walk.c > > @@ -221,6 +221,7 @@ void fake_r

Re: [PATCH v3] reflog-walk: don't segfault on non-commit sha1's in the reflog

2015-12-31 Thread Dennis Kaarsemaker
On do, 2015-12-31 at 09:57 +0100, Dennis Kaarsemaker wrote: > > > +test_expect_success 'reflog containing non-commit sha1s displays > > > properly' ' > > > > In general, "properly" is a poor word to use in test description > (or > >

Re: Can not 'git add file'

2016-01-03 Thread Dennis Kaarsemaker
you can do instead is first git add -N ../lib/Devel/DebugHooks/Commands.pm to mark the file as tracked without adding content. Then git add -p will allow you to add the contents partially.-- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe git&

Re: [PATCH] Add a test for subtree rebase that loses commits

2016-01-05 Thread Dennis Kaarsemaker
800IN CNAME obbligato .org. obbligato.org. 1800IN A 173.255.19 9.253 So it has an MX record, it's just incorrect: MX records must not point to things that are CNAMEs. -- Dennis Kaarsemaker http://www.kaarsemaker.net -- To unsubscribe from this list: send the lin

[PATCH v4] reflog-walk: don't segfault on non-commit sha1's in the reflog

2016-01-05 Thread Dennis Kaarsemaker
ution would be to decouple git reflog from the log walker machinery. Signed-off-by: Dennis Kaarsemaker Helped-by: Nguyễn Thái Ngọc Duy Helped-by: Junio C Hamano --- Changes since v3: tweaks to the second test. reflog-walk.c | 16 +++- t/t1410-reflog.sh | 13 + 2

Re: [PATCH v4] reflog-walk: don't segfault on non-commit sha1's in the reflog

2016-01-05 Thread Dennis Kaarsemaker
On di, 2016-01-05 at 20:05 -0500, Eric Sunshine wrote: > On Tue, Jan 5, 2016 at 4:12 PM, Dennis Kaarsemaker > wrote: > > git reflog (ab)uses the log machinery to display its list of log > > entries. To do so it must fake commit parent information for the > > log > >

Re: [PATCH v4] reflog-walk: don't segfault on non-commit sha1's in the reflog

2016-01-06 Thread Dennis Kaarsemaker
On di, 2016-01-05 at 20:52 -0500, Eric Sunshine wrote: > On Tue, Jan 5, 2016 at 8:28 PM, Eric Sunshine < > sunsh...@sunshineco.com> wrote: > > On Tue, Jan 5, 2016 at 8:20 PM, Dennis Kaarsemaker > > wrote: > > > On di, 2016-01-05 at 20:05 -0500, Eric Sunshine

Re: [PATCH v2] send-email: Net::SMTP::SSL is obsolete, use only when necessary

2017-05-04 Thread Dennis Kaarsemaker
Ping. It's a little over a month since I sent this, but I haven't seen any comments. Is this commit good to go? On Fri, 2017-03-24 at 22:37 +0100, Dennis Kaarsemaker wrote: > Net::SMTP itself can do the necessary SSL and STARTTLS bits just fine > since version 1.28, and Net::

Re: Script to rebase branches

2017-05-06 Thread Dennis Kaarsemaker
On Sat, 2017-05-06 at 12:23 +0200, Lars Schneider wrote: > Hi, > > I am about to write a bash/sh script that helps me to rebase a bunch of > branches (e.g. select branches based on prefix, conflict resolution/ > rerere support, ...). > > I wonder if anyone has such a script already and is willin

Re: Bug report: Git Stash; spelling mistake of stash followed by a yes prints character 'y' infinite times.

2017-05-06 Thread Dennis Kaarsemaker
On Wed, 2017-05-03 at 14:51 +0530, Rashmi Pai wrote: > I am a corporate user of git. I noticed that when you switch between > the branches and do a git stash ( I miss spelled it as git stahs). Git > asked if i meant git stash. and i entered yes. and git printed the > character y infinite times. H

Re: [PATCH v2] send-email: Net::SMTP::SSL is obsolete, use only when necessary

2017-05-19 Thread Dennis Kaarsemaker
Second ping. This problem is not going away, so if this solution is not acceptable, I'd like to know what needs to be improved. On Thu, 2017-05-04 at 09:01 +0200, Dennis Kaarsemaker wrote: > Ping. It's a little over a month since I sent this, but I haven't seen > any comments

Re: persistent-https, url insteadof, and `git submodule`

2017-05-19 Thread Dennis Kaarsemaker
On Fri, 2017-05-19 at 14:57 -0500, Elliott Cable wrote: > Set up `persistent-https` as described in the [README][]; including the > ‘rewrite https urls’ feature in `.gitconfig`: > > [url "persistent-https"] > insteadof = https > [url "persistent-http"] > insteadof = http >

Re: persistent-https, url insteadof, and `git submodule`

2017-05-19 Thread Dennis Kaarsemaker
On Fri, 2017-05-19 at 23:43 +0200, Dennis Kaarsemaker wrote: > On Fri, 2017-05-19 at 14:57 -0500, Elliott Cable wrote: > > Set up `persistent-https` as described in the [README][]; including the > > ‘rewrite https urls’ feature in `.gitconfig`: > > > >

Re: [PATCH v2] send-email: Net::SMTP::SSL is obsolete, use only when necessary

2017-06-01 Thread Dennis Kaarsemaker
On Thu, 2017-06-01 at 07:50 +0900, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > Second ping. This problem is not going away, so if this solution is not > > acceptable, I'd like to know what needs to be improved. > > Perhaps you needed to actually test

Re: [PATCH 4/4] ident: do not ignore empty config name/email

2017-02-27 Thread Dennis Kaarsemaker
gt; so I guess that's a prerequisite. I provide daily[*] snapshots of git's master and next tree as packages for Ubuntu, Debian, Fedora and CentOS on launchpad and SuSE's openbuildservice. If there's sufficient interest in this (I know of only a few users), I can try to put more effort into this. -- Dennis Kaarsemaker http://www.kaarsemaker.net [*]When the tooling isn't broken for some reason.

[PATCH v3 0/2] diff --no-index: support symlinks and pipes

2017-03-18 Thread Dennis Kaarsemaker
les to override behaviour for pipes. - Turn the !S_ISREG(...) check into a should_mmap_file_contents helper. Dennis Kaarsemaker (2): diff --no-index: optionally follow symlinks diff --no-index: support reading from pipes Documentation/diff-options.txt | 9 +++ diff-no-i

[PATCH v3 2/2] diff --no-index: support reading from pipes

2017-03-18 Thread Dennis Kaarsemaker
diff <(command1) <(command2) provides useful output, let's make it possible for git to do the same. Signed-off-by: Dennis Kaarsemaker --- diff-no-index.c | 9 + diff.c | 18 -- t/t4053-diff-no-index.sh | 10 ++ t/

[PATCH v3 1/2] diff --no-index: optionally follow symlinks

2017-03-18 Thread Dennis Kaarsemaker
diff) option has been added to enable this behaviour. --no-dereference can be used to disable it again. Signed-off-by: Dennis Kaarsemaker --- Documentation/diff-options.txt | 9 + diff-no-index.c| 7 --- diff.c | 12 ++-- d

[PATCH] send-email: Net::SMTP::SSL is obsolete, use only when necessary

2017-03-18 Thread Dennis Kaarsemaker
Net::SMTP itself can do the necessary SSL and STARTTLS bits just fine since version 1.28, and Net::SMTP::SSL is now deprecated. Since 1.28 isn't that old yet, keep the old code in place and use it when necessary. Signed-off-by: Dennis Kaarsemaker --- Note: I've only been able t

Re: How do I make 'git diff --no-index' follow symlinks?

2017-03-18 Thread Dennis Kaarsemaker
On Sat, 2017-03-18 at 12:30 -0700, Junio C Hamano wrote: > Sounds like > > https://public-inbox.org/git/2016201958.2175-1-den...@kaarsemaker.net/ > > to me. A key message in the thread may be: > > > https://public-inbox.org/git/alpine.DEB.2.20.1611121106110.3746@virtualbox/ Sorry

Re: [PATCH] send-email: Net::SMTP::SSL is obsolete, use only when necessary

2017-03-18 Thread Dennis Kaarsemaker
On Sat, 2017-03-18 at 23:47 +0100, Ævar Arnfjörð Bjarmason wrote: > On Sat, Mar 18, 2017 at 11:23 PM, Dennis Kaarsemaker > wrote: > > > + require Net::SMTP; > > + my $use_net_smtp_ssl = $Net::SMTP::VERSION lt "1.28"; > > +

Re: [PATCH v3 1/2] diff --no-index: optionally follow symlinks

2017-03-20 Thread Dennis Kaarsemaker
On Sun, 2017-03-19 at 15:14 -0700, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > diff --git a/diff.c b/diff.c > > index be11e4ef2b..2afecfb939 100644 > > --- a/diff.c > > +++ b/diff.c > > @@ -2815,7 +2815,7 @@ int diff_populate_filespec(struct diff_

Re: [PATCH v3 0/2] diff --no-index: support symlinks and pipes

2017-03-20 Thread Dennis Kaarsemaker
On Sun, 2017-03-19 at 15:08 -0700, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > Normal diff provides arguably better output: the diff of the output of the > > commands. This series makes it possible for git diff --no-index to follow > > symlinks and read f

Re: blame --line-porcelain is providing me with funny output

2017-03-23 Thread Dennis Kaarsemaker
matching, however author mail does not match > between line-porcelain and cat-file. Is there a reason for that? The commit object has Stefan's Google address, but git.git's mailmap maps that to his gmail address. git blame actually does this mapping, where git cat-file

[PATCH v4 2/2] diff --no-index: support reading from pipes

2017-03-24 Thread Dennis Kaarsemaker
diff <(command1) <(command2) provides useful output, let's make it possible for git to do the same. Signed-off-by: Dennis Kaarsemaker --- diff-no-index.c | 9 + diff.c | 18 -- t/t4053-diff-no-index.sh | 10 ++ t/

[PATCH v4 0/2] diff --no-index: support symlinks and pipes

2017-03-24 Thread Dennis Kaarsemaker
ror. A test has been added for this behaviour. Dennis Kaarsemaker (2): diff --no-index: optionally follow symlinks diff --no-index: support reading from pipes Documentation/diff-options.txt | 9 +++ builtin/diff.c | 2 ++ diff-no-index.c

[PATCH v4 1/2] diff --no-index: optionally follow symlinks

2017-03-24 Thread Dennis Kaarsemaker
diff) option has been added to enable this behaviour. --no-dereference can be used to disable it again. Signed-off-by: Dennis Kaarsemaker --- Documentation/diff-options.txt | 9 + builtin/diff.c | 2 ++ diff-no-index.c| 7 --- d

[PATCH v2] send-email: Net::SMTP::SSL is obsolete, use only when necessary

2017-03-24 Thread Dennis Kaarsemaker
yet marked as such. Signed-off-by: Dennis Kaarsemaker --- git-send-email.perl | 54 ++--- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index eea0a517f7..0d90439d9a 100755 --- a/git-send-

Re: [PATCH v4 1/2] diff --no-index: optionally follow symlinks

2017-03-25 Thread Dennis Kaarsemaker
On Fri, 2017-03-24 at 15:56 -0700, Junio C Hamano wrote: > diff --git a/diff.c b/diff.c > > index be11e4ef2b..2afecfb939 100644 > > --- a/diff.c > > +++ b/diff.c > > @@ -2815,7 +2815,7 @@ int diff_populate_filespec(struct diff_filespec *s, > > unsigned int flags) > > s->size = xsize_t

Re: ttk error when starting git gui

2017-03-30 Thread Dennis Kaarsemaker
On Thu, 2017-03-30 at 15:54 -0400, Peter van der Does wrote: > It looks like the git gui needs TCL/TK 8.6.0 or higher. Since that > version the command 'ttk::style theme use' has been changed, which > allows the command to be run without an argument and then returning the > current theme used. > I

Re: git send-email does not work with Google anymore?!

2017-10-23 Thread Dennis Kaarsemaker
On Thu, 2017-10-05 at 12:52 +0200, Lars Schneider wrote: > Hi, > > I used to use the Google SMTP server to send my patches to the list with > the following config: >8 --- > Apparently that stopped working today. I get this error: > > (mbox) Adding cc: Lars Schneider from line > 'From: La

Re: Git diff --no-index and file descriptor inputs

2017-10-24 Thread Dennis Kaarsemaker
verage --word-diff-regex, but the > > > > --no-index option > > > does not seem to work with <(...) notation. > > > > > > I am I doing something wrong or is this a bug? > > > > There were some patches floating around half a year ago, I > &

Re: Multiple paths in GIT_EXEC_PATH

2017-10-24 Thread Dennis Kaarsemaker
On Tue, 2017-10-17 at 18:21 +0300, Nikolay Yakimov wrote: > For why I need that is another matter. Long story short, I need git to > look for '.gitignore' in a particular non-standard location, since I > have multiple git repositories in the same workdir (that workdir being > $HOME and git reposito

Re: Git libsecret No Unlock Dialog Issue

2017-11-02 Thread Dennis Kaarsemaker
On Thu, 2017-11-02 at 11:35 -0700, Stefan Beller wrote: > On Thu, Nov 2, 2017 at 9:00 AM, Yaroslav Sapozhnyk > wrote: > > When using Git on Fedora with locked password store > > credential-libsecret asks for username/password instead of displaying > > the unlock dialog. > > Git as packaged by Fed

Re: git, isolation

2017-11-03 Thread Dennis Kaarsemaker
On Fri, 2017-11-03 at 17:33 +0100, Péter wrote: > Hi, > > If I do a "git commit", issue git operations, and at the end, issue a "rm > ", is there any guarantee that my > filesystem will be "clean", No. > i.e. not polluted or otherwise modified by some git command? Are the git > operations >

[PATCH] credential-libsecret: unlock locked secrets

2017-11-03 Thread Dennis Kaarsemaker
Credentials exposed by the secret service DBUS interface may be locked. Setting the SECRET_SEARCH_UNLOCK flag will make the secret service unlock these secrets, possibly prompting the user for credentials to do so. Without this flag, the secret is simply not loaded. Signed-off-by: Dennis

git fetch (http) hanging/failing on one specific repository, http only

2014-10-20 Thread Dennis Kaarsemaker
.c:355 #5 0x004041d2 in service_rpc (service_name=) at http-backend.c:508 #6 0x00404b35 in main (argc=, argv=) at http-backend.c:631 Both git-http-backend and git-upload-pack are trying to write at the same time. I'm *guessing* I've hit some buffer limit here, gi

Bug in fetch-pack causing ever-growing http requests. (Was: git fetch (http) hanging/failing on one specific repository, http only)

2014-10-21 Thread Dennis Kaarsemaker
On ma, 2014-10-20 at 16:29 +0200, Dennis Kaarsemaker wrote: > Since a few days, one of our repos is causing problems during git fetch, > basically git fetch over http hangs during find_common. When using ssh, > this does not happen. . > And for the hanging git-uploa

[PATCH] fetch-pack: don't resend known-common refs in find_common

2014-10-21 Thread Dennis Kaarsemaker
By not clearing the request buffer in stateless-rpc mode, fetch-pack would keep sending already known-common commits, leading to ever bigger http requests, eventually getting too large for git-http-backend to handle properly without filling up the pipe buffer in inflate_request. --- I'm still not q

Re: [PATCH] fetch-pack: don't resend known-common refs in find_common

2014-10-22 Thread Dennis Kaarsemaker
On di, 2014-10-21 at 10:56 -0700, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > By not clearing the request buffer in stateless-rpc mode, fetch-pack > > would keep sending already known-common commits, leading to ever bigger > > http requests, eventually gettin

Re: [PATCH] fetch-pack: don't resend known-common refs in find_common

2014-10-26 Thread Dennis Kaarsemaker
On Wed, Oct 22, 2014 at 10:11:40AM -0700, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > On di, 2014-10-21 at 10:56 -0700, Junio C Hamano wrote: > >> Dennis Kaarsemaker writes: > >> > >> > By not clearing the request buffer in stateless-rpc

Re: [PATCH] fetch-pack: don't resend known-common refs in find_common

2014-10-26 Thread Dennis Kaarsemaker
On Wed, Oct 22, 2014 at 05:07:31PM +0700, Duy Nguyen wrote: > On Wed, Oct 22, 2014 at 2:41 PM, Dennis Kaarsemaker > wrote: > > I see two options: > > > > * Turning that interaction into a more cooperative process, with a > > select/poll loop > > * Make up

Re: Editing git changelog automatically

2014-10-26 Thread Dennis Kaarsemaker
On zo, 2014-10-26 at 22:27 -0700, Cong Wang wrote: > > My question is how to edit dozens of git commit changelogs > automatically? You can use git filter-branch in --msg-filter mode. -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsub

Re: BUG or FEATURE? Use of '/' in branch names

2014-05-03 Thread Dennis Kaarsemaker
;s an ugly message. I think we can do better. (hint hint) 2.0.0-rc2 has a better message already: $ git checkout -b hotfix/b2 error: 'refs/heads/hotfix' exists; cannot create 'refs/heads/hotfix/b2' fatal: Failed to lock ref for update: Not a directory -- Dennis Kaarsemaker w

Re: Should git-remote-hg/bzr be part of the core?

2014-05-12 Thread Dennis Kaarsemaker
his email is written in sorrow, not in anger. Felipe, you seem to have > so much potential. If you would put as much effort in conducting social > interactions as you do in coding, the whole balance would change > entirely, and any software project would be happy to have you. With al

Re: Can we stage all files using "git add" command, except some specific files ?

2014-05-26 Thread Dennis Kaarsemaker
ommand, that add all the files from the current directory, except > some specific files. No, there is no such option to do that, but you could use git add --interactive and use its interface to quickly pick the files you want to add. -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe f

Re: Bug in shallow clone?

2014-05-28 Thread Dennis Kaarsemaker
n your > version, maybe it's older than 1.8.2? If it's the latest, we screwed > something up again.. 2.0.0-rc4 does this correctly. -- Dennis Kaarsemaker http://www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [BUG REPORT] Git log pretty date

2014-05-29 Thread Dennis Kaarsemaker
38 parent 9276202f1c0dcc360433df222c90f7874558f072 author SamWM 1288370243 --700 committer SamWM 1288370243 --700 Update version number, make text formatting and indentation consistent with the rest of the code Those dates are indeed wrong, I'm not surprised git refuses to parse them. -- Denn

[PATCH] Makefile: don't hardcode HEAD in dist target

2014-05-31 Thread Dennis Kaarsemaker
Instead of calling git-archive HEAD^{tree}, use $(GIT_VERSION)^{tree}. This makes sure the archive name and contents are consistent, if HEAD has moved, but GIT-VERSION-FILE hasn't been regenerated yet. Signed-off-by: Dennis Kaarsemaker --- I have a somewhat odd setup in which I share a

Re: [PATCH] Makefile: don't hardcode HEAD in dist target

2014-06-02 Thread Dennis Kaarsemaker
On Mon, Jun 02, 2014 at 11:53:36AM -0700, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > Instead of calling git-archive HEAD^{tree}, use $(GIT_VERSION)^{tree}. > > This makes sure the archive name and contents are consistent, if HEAD > > has moved, but GIT-

Re: [BUG REPORT] Git log pretty date

2014-06-02 Thread Dennis Kaarsemaker
andle errors in each independently, assuming > it is not too invasive. I think what libgit2 does is more wrong than what git does. It displays the timestamp subtly wrong (off by 7 hours) instead of making it completely clear that the timestamp is bogus. -- Dennis Kaarsemaker http://twitter.com/se

Re: [PATCH v5 00/28] Support multiple checkouts

2014-07-07 Thread Dennis Kaarsemaker
easily reproduce errors, I would appreciate to know how, because my use of submodules is very limited. -- Dennis Kaarsemaker http://www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH v6 00/32] Support multiple checkouts

2014-07-11 Thread Dennis Kaarsemaker
Tested-by: Dennis Kaarsemaker I've been using this branch for a little while now and have no breakages to report. Max Kirillov reported some bugs in the interaction with submodules which I plan to chase when I have some time unless someone beats me to it :) On wo, 2014-07-09 at 14:32

Re: [PATCH] checkout: indicate when a detached head is checked out for a branch

2014-07-18 Thread Dennis Kaarsemaker
quot;we've warned you that we detached without being asked" message. > > Please fix it to always just error out. I really would appreciate it if it wouldn't always error out. Erroring out by default is fine, but please keep it overridable. My use case for this is checking out

Re: Is there a way to mark a branch as published?

2014-08-01 Thread Dennis Kaarsemaker
see which known remote branches contain the tip of a branch: git branch -a --contains yourbranchnamehere | grep remotes/ That doesn't say anything about remotes you don't know about of course. -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line

Re: Bug report about symlinks

2014-08-01 Thread Dennis Kaarsemaker
quot; and/or "git commit -a") dennis@spirit:/tmp/bug$ git --no-pager diff diff --git a/dir2/1.txt b/dir2/1.txt deleted file mode 100644 index d00491f..000 --- a/dir2/1.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/dir2/2.txt b/dir2/2.txt deleted file mode 100644 index b8a4cf4..000 -

Re: Error "fatal: not a git repository" after auto packing

2014-08-12 Thread Dennis Kaarsemaker
es empty directories. Fix that hook to not do anything in .git and it should be fine. -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: Wishlist: git fetch --reference

2014-08-22 Thread Dennis Kaarsemaker
l > repo > when doing a fetch to pull in updates. Alternatively, you can use Duy's multiple-work-trees patches to safely make multiple checkouts of one repository. These patches are in next. -- Dennis Kaarsemaker http://www.kaarsemaker.net -- To unsubscribe from this list: send the line

Re: GIT_DIR not auto ignored

2013-12-01 Thread Dennis Kaarsemaker
.." to include in what will be committed) .foo/ nothing added to commit but untracked files present (use "git add" to track) (Note the absence of .git there) -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe gi

Re: GIT_DIR not auto ignored

2013-12-01 Thread Dennis Kaarsemaker
On zo, 2013-12-01 at 19:08 +0100, Dennis Kaarsemaker wrote: > On za, 2013-11-30 at 23:06 -0800, Ingy dot Net wrote: > > Greetings, > > > > I found this probable bug: > > https://gist.github.com/anonymous/01979fd9e6e285df41a2 > > Summary: > > $ mv .git .f

[PATCH] path_treatment: also ignore $GIT_DIR if it's not .git

2013-12-01 Thread Dennis Kaarsemaker
We always ignore anything named .git, but we should also ignore the git directory if the user overrides it by setting $GIT_DIR Reported-By: Ingy döt Net Signed-off-by: Dennis Kaarsemaker --- dir.c | 2 +- t/t7508-status.sh | 7 +++ 2 files changed, 8 insertions(+), 1 deletion

Re: [PATCH] path_treatment: also ignore $GIT_DIR if it's not .git

2013-12-01 Thread Dennis Kaarsemaker
On ma, 2013-12-02 at 00:08 +0100, Thomas Rast wrote: > Duy Nguyen writes: > > > On Mon, Dec 2, 2013 at 2:04 AM, Dennis Kaarsemaker > > wrote: > >> We always ignore anything named .git, but we should also ignore the git > >> directory if the u

Re: [PATCH] path_treatment: also ignore $GIT_DIR if it's not .git

2013-12-02 Thread Dennis Kaarsemaker
On ma, 2013-12-02 at 07:38 +0700, Duy Nguyen wrote: > On Mon, Dec 2, 2013 at 6:38 AM, Dennis Kaarsemaker > wrote: > > On ma, 2013-12-02 at 00:08 +0100, Thomas Rast wrote: > >> Duy Nguyen writes: > >> > >> > On Mon, Dec 2, 2013 at 2:04 AM, Dennis Ka

Re: [PATCH] path_treatment: also ignore $GIT_DIR if it's not .git

2013-12-02 Thread Dennis Kaarsemaker
On ma, 2013-12-02 at 16:35 +0700, Duy Nguyen wrote: > On Mon, Dec 2, 2013 at 3:01 PM, Dennis Kaarsemaker > wrote: > > On ma, 2013-12-02 at 07:38 +0700, Duy Nguyen wrote: > >> On Mon, Dec 2, 2013 at 6:38 AM, Dennis Kaarsemaker > >> wrote: > >> > On ma, 20

<    1   2   3   >