Re: Fetching commit instead of ref

2017-12-19 Thread Carlsson, Magnus
Thanks Junio for your answer! >From my simple tests it seems that github doesn't have this on by default so >that seems a little dull. Do you know if there is a way to actually find a ref that contains the SHA from a remote? Finally, you say that its a security feature, but from the log it

Re: [PATCH v4] Makefile: replace perl/Makefile.PL with simple make rules

2017-12-19 Thread Todd Zullinger
Hi Ævar, Ævar Arnfjörð Bjarmason wrote: > Here's a hopefully final version. The only difference with v3 is: > > -local @_ = ($caller, @_); > +unshift @_, $caller; > > As it turns out localizing @_ isn't something that worked properly > until >

Re: [PATCH v6 0/2] http-backend: respect CONTENT_LENGTH as specified by rfc3875

2017-12-19 Thread Max Kirillov
On Tue, Dec 19, 2017 at 02:13:33PM -0800, Junio C Hamano wrote: > So... is there going to be an update (or has there been one and I > missed it)? Yes there it! I wanted to add tests for the cases Jeff mentioned. It is almost done, I just need to check I did not miss some note.

Re: [PATCH] http: support CURLPROXY_HTTPS

2017-12-19 Thread Wei Shuyu
On 2017-12-20 10:22, Wei Shuyu wrote: CURLPROXY_HTTPS is intended for run-time detection. I don't think it's a good idea to use it with #ifdef. s/CURLPROXY_HTTPS/CURL_VERSION_HTTPS_PROXY/

Re: [PATCH 5/5] submodule: submodule_move_head omits old argument in forced case

2017-12-19 Thread Jonathan Nieder
Stefan Beller wrote: > On Tue, Dec 19, 2017 at 2:44 PM, Jonathan Nieder wrote: >> checkout -f >> I think I would expect this not to touch a submodule that >> hasn't changed, since that would be consistent with its >> behavior on files that haven't

[PATCH v4] Makefile: replace perl/Makefile.PL with simple make rules

2017-12-19 Thread Ævar Arnfjörð Bjarmason
Replace the perl/Makefile.PL and the fallback perl/Makefile used under NO_PERL_MAKEMAKER=NoThanks with a much simpler implementation heavily inspired by how the i18n infrastructure's build process works[1]. The reason for having the Makefile.PL in the first place is that it was initially[2]

Re: [PATCH 5/5] submodule: submodule_move_head omits old argument in forced case

2017-12-19 Thread Jonathan Nieder
Hi, Stefan Beller wrote: > On Tue, Dec 19, 2017 at 2:44 PM, Jonathan Nieder wrote: >> checkout -f >> I think I would expect this not to touch a submodule that >> hasn't changed, since that would be consistent with its >> behavior on files that

Congratulation Again

2017-12-19 Thread Friedrich Mayrhofer
This is the second time i am sending you this mail. I, Friedrich Mayrhofer Donate $ 1,000,000.00 to You, Email Me personally for more details. Regards. Friedrich Mayrhofer

Re: [PATCH 5/5] submodule: submodule_move_head omits old argument in forced case

2017-12-19 Thread Stefan Beller
On Tue, Dec 19, 2017 at 2:44 PM, Jonathan Nieder wrote: > Hi, > > I had trouble understanding what this fixes, so I'll try nitpicking a > bit as a sideways way to address that. > > Stefan Beller wrote: > >> With the previous patch applied (fix of the same() function), > > This

Re: [PATCH 5/5] submodule: submodule_move_head omits old argument in forced case

2017-12-19 Thread Jonathan Nieder
Hi, I had trouble understanding what this fixes, so I'll try nitpicking a bit as a sideways way to address that. Stefan Beller wrote: > With the previous patch applied (fix of the same() function), This tripped me up a bit. Usually commits assume that all previous patches have already been

Re: [PATCH 3/5] t/lib-submodule-update.sh: add new test for submodule internal change

2017-12-19 Thread Stefan Beller
On Tue, Dec 19, 2017 at 2:31 PM, Jonathan Nieder wrote: > Hi, > > Stefan Beller wrote: > >> The test is marked as a failure as the fix comes in a later patch. >> >> Signed-off-by: Stefan Beller >> --- >> t/lib-submodule-update.sh | 11 +++ >> 1

Re: [PATCH] Re: Bug with "git submodule update" + subrepo with differing path/name?

2017-12-19 Thread Stefan Beller
On Tue, Dec 19, 2017 at 2:19 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> I tried reproducing the issue (based on the `next` branch, not 2.15, >> but I do not recall any changes in the submodule area lately), and >> could not come up with a

Re: [PATCH 3/5] t/lib-submodule-update.sh: add new test for submodule internal change

2017-12-19 Thread Jonathan Nieder
Hi, Stefan Beller wrote: > The test is marked as a failure as the fix comes in a later patch. > > Signed-off-by: Stefan Beller > --- > t/lib-submodule-update.sh | 11 +++ > 1 file changed, 11 insertions(+) I think I'd find this easier to undrestand if it were

[PATCH 5/5] submodule: submodule_move_head omits old argument in forced case

2017-12-19 Thread Stefan Beller
With the previous patch applied (fix of the same() function), the function `submodule_move_head` may be invoked with the same argument for the `old` and `new` state of a submodule, for example when you run `reset --hard --recurse-submodules` in the superproject that has no change in the gitlink

[PATCH 2/5] t/lib-submodule-update.sh: Fix test ignoring ignored files in submodules

2017-12-19 Thread Stefan Beller
It turns out that this buggy test passed due to the buggy implementation, which will soon be corrected. Let's fix the test first. Signed-off-by: Stefan Beller --- t/lib-submodule-update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/lib-submodule-update.sh

[PATCH 4/5] unpack-trees: Fix same() for submodules

2017-12-19 Thread Stefan Beller
The function same(a, b) is used to check if two entries a and b are the same. As the index contains the staged files the same() function can be used to check if files between a given revision and the index are the same. In case of submodules, the gitlink entry is showing up as not modified

[PATCH 1/5] t/lib-submodule-update.sh: clarify test

2017-12-19 Thread Stefan Beller
Keep the local branch name as the upstream branch name to avoid confusion. Signed-off-by: Stefan Beller --- t/lib-submodule-update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh index

[PATCH 0/5] Fix --recurse-submodules for submodule worktree changes

2017-12-19 Thread Stefan Beller
The fix is in the last patch, the first patches are just massaging the code base to make the fix easy. The second patch fixes a bug in the test, which was ineffective at testing. The third patch shows the problem this series addresses, the fourth patch is a little refactoring, which I want to

[PATCH 3/5] t/lib-submodule-update.sh: add new test for submodule internal change

2017-12-19 Thread Stefan Beller
The test is marked as a failure as the fix comes in a later patch. Signed-off-by: Stefan Beller --- t/lib-submodule-update.sh | 11 +++ 1 file changed, 11 insertions(+) diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh index fb0173ea87..15cf3e0b8b

Re: [PATCH] Re: Bug with "git submodule update" + subrepo with differing path/name?

2017-12-19 Thread Junio C Hamano
Stefan Beller writes: > I tried reproducing the issue (based on the `next` branch, not 2.15, > but I do not recall any changes in the submodule area lately), and > could not come up with a reproduction recipe,... I do not offhand recall anything; the closest I can think of

Re: [PATCH v6 0/2] http-backend: respect CONTENT_LENGTH as specified by rfc3875

2017-12-19 Thread Junio C Hamano
Max Kirillov writes: > v6: > > Do not implement generic git_env_ssize_t(), instead export > git_parse_ssize_t() from config.c > and hardcode the rest. > > Florian Manschwetus (1): > http-backend: respect CONTENT_LENGTH as specified by rfc3875 > > Max Kirillov (1): >

What's cooking in git.git (Dec 2017, #04; Tue, 19)

2017-12-19 Thread Junio C Hamano
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 onto them. You can find the changes

Re: [PATCH] http: support CURLPROXY_HTTPS

2017-12-19 Thread Jonathan Nieder
Junio C Hamano wrote: > Jonathan Nieder writes: >> Wei Shuyu wrote: >>> diff --git a/http.c b/http.c >>> index 215bebef1..32d33261c 100644 >>> --- a/http.c >>> +++ b/http.c >>> @@ -865,6 +865,11 @@ static CURL *get_curl_handle(void) >>> else if

Re: [PATCH] http: support CURLPROXY_HTTPS

2017-12-19 Thread Junio C Hamano
Jonathan Nieder writes: > Hi, > > Wei Shuyu wrote: > >> HTTP proxy over SSL is supported by curl since 7.52.0. >> This is very useful for networks with protocol whitelist. >> >> Signed-off-by: Wei Shuyu >> --- >> http.c | 5 + >> 1 file changed, 5

[PATCH v2 3/2] t5573, t7612: clean up after unexpected success of 'pull' and 'merge'

2017-12-19 Thread Junio C Hamano
The previous steps added test_when_finished to tests that run 'git pull' or 'git merge' with expectation of success, so that the test after them can start from a known state even when their 'git pull' invocation unexpectedly fails. However, tests that run 'git pull' or 'git merge' expecting it

Re: [PATCH] http: support CURLPROXY_HTTPS

2017-12-19 Thread Jonathan Nieder
Hi, Wei Shuyu wrote: > HTTP proxy over SSL is supported by curl since 7.52.0. > This is very useful for networks with protocol whitelist. > > Signed-off-by: Wei Shuyu > --- > http.c | 5 + > 1 file changed, 5 insertions(+) Thanks for writing this. Can you give an example

Re: [PATCH 4/6] fsmonitor: Add a trailing newline to test-dump-fsmonitor

2017-12-19 Thread Junio C Hamano
Alex Vandiver writes: > Subject: Re: [PATCH 4/6] fsmonitor: Add a trailing newline to > test-dump-fsmonitor "Subject: fsmonitor: complete the last line of test-dump-fsmonitor output" perhaps. > This makes it more readable when used for debugging from the > commandline. >

Re: [PATCH 5/6] fsmonitor: Remove debugging lines from t/t7519-status-fsmonitor.sh

2017-12-19 Thread Junio C Hamano
Alex Vandiver writes: > These were mistakenly left in when the test was introduced, in > 1487372d3 ("fsmonitor: store fsmonitor bitmap before splitting index", > 2017-11-09) > > Signed-off-by: Alex Vandiver > --- > t/t7519-status-fsmonitor.sh | 2 -- > 1

Re: [PATCH 2/6] fsmonitor: Add dir.h include, for untracked_cache_invalidate_path

2017-12-19 Thread Junio C Hamano
Alex Vandiver writes: > Subject: Re: [PATCH 2/6] fsmonitor: Add dir.h include, for > untracked_cache_invalidate_path Perhaps "Subject: fsmonitor.h: include dir.h" But I am not sure if this is a right direction to go in. If a .C user of fsmonitor needs (does not need)

Re: [PATCHv5 7/7] builtin/describe.c: describe a blob

2017-12-19 Thread Stefan Beller
On Tue, Dec 19, 2017 at 11:22 AM, Junio C Hamano wrote: > I had to squash in the following to make 'pu' pass under > gettext-poison build. Is this ready for 'next' otherwise? I saw that in pu, thanks for squashing. I should have spoken up earlier confirming it. > With the

Re: [PATCHv5 7/7] builtin/describe.c: describe a blob

2017-12-19 Thread Junio C Hamano
I had to squash in the following to make 'pu' pass under gettext-poison build. Is this ready for 'next' otherwise? With the "log --find-object" thing, it may be that this no longer is needed, but then again we haven't done anything with the other Jonathan's idea to unify the --find-object thing

Re: [PATCH v2 2/5] Makefile: under "make dist", include the sha1collisiondetection submodule

2017-12-19 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > I started by trying to come up with something generic which would handle > future submodules, i.e.: > > git submodule foreach 'git ls-files' I am not all that interested in that. The hardcoded list I felt disturbing was not "what are the

Re: [PATCH] revision: introduce prepare_revision_walk_extended()

2017-12-19 Thread Junio C Hamano
Jeff King writes: > On Mon, Dec 18, 2017 at 08:18:19PM +0100, René Scharfe wrote: > >> > The root of the matter is that the revision-walking code doesn't clean >> > up after itself. In every case, the caller is just saving these to clean >> > up commit marks, isn't it? >> >>

Re: [PATCH] fmt-merge-msg: avoid leaking strbuf in shortlog()

2017-12-19 Thread René Scharfe
Am 19.12.2017 um 12:38 schrieb Jeff King: > On Mon, Dec 18, 2017 at 08:18:17PM +0100, René Scharfe wrote: > >>> I'd actually argue the other way: the simplest interface is one where >>> the string list owns all of its pointers. That keeps the >>> ownership/lifetime issues clear, and it's one less

[PATCH] Re: Bug with "git submodule update" + subrepo with differing path/name?

2017-12-19 Thread Stefan Beller
I tried reproducing the issue (based on the `next` branch, not 2.15, but I do not recall any changes in the submodule area lately), and could not come up with a reproduction recipe, but here is what I got so far, maybe you can take it from here (i.e. either make the test case more like your

GREETINGS BELOVED

2017-12-19 Thread mis.sbort...@ono.com
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

Re: difftool uses hardcoded perl shebang

2017-12-19 Thread Junio C Hamano
Jeff King writes: > On Tue, Dec 19, 2017 at 09:08:44AM -0800, Junio C Hamano wrote: > >> Jeff King writes: >> >> > In the meantime, pointing to the actual build-time perl is a workaround >> > (but obviously not if it's being done by a third-party packager who has

[PATCH] http: support CURLPROXY_HTTPS

2017-12-19 Thread Wei Shuyu
HTTP proxy over SSL is supported by curl since 7.52.0. This is very useful for networks with protocol whitelist. Signed-off-by: Wei Shuyu --- http.c | 5 + 1 file changed, 5 insertions(+) diff --git a/http.c b/http.c index 215bebef1..32d33261c 100644 --- a/http.c +++

Re: difftool uses hardcoded perl shebang

2017-12-19 Thread Jeff King
On Tue, Dec 19, 2017 at 09:08:44AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > In the meantime, pointing to the actual build-time perl is a workaround > > (but obviously not if it's being done by a third-party packager who has > > no idea where your perl is). > > Is

Re: difftool uses hardcoded perl shebang

2017-12-19 Thread Junio C Hamano
Jeff King writes: > In the meantime, pointing to the actual build-time perl is a workaround > (but obviously not if it's being done by a third-party packager who has > no idea where your perl is). Is such a binary packaging scheme actually in use that deliberately leaves it up to

Re: difftool uses hardcoded perl shebang

2017-12-19 Thread Jeff King
On Tue, Dec 19, 2017 at 08:33:22AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > This is a build-time knob. When you build git, try: > > > > make PERL_PATH='/usr/bin/env perl' > > > > (If you don't build your own git, then you might raise the issue with > > whomever

Re: difftool uses hardcoded perl shebang

2017-12-19 Thread Junio C Hamano
Jeff King writes: > This is a build-time knob. When you build git, try: > > make PERL_PATH='/usr/bin/env perl' > > (If you don't build your own git, then you might raise the issue with > whomever packages your binary). I somehow thought ANYTHING_PATH was meant to point at the

Re: difftool uses hardcoded perl shebang

2017-12-19 Thread Jeff King
On Tue, Dec 19, 2017 at 01:28:09PM +, Jakub Zaverka wrote: > When running git difftool: > > >git difftool > Perl lib version (5.10.0) doesn't match executable version (v5.16.3) > Compilation failed in require at /git-difftool line 2. > > First line in my git-difftool is: > #!/usr/bin/perl >

RE: difftool uses hardcoded perl shebang

2017-12-19 Thread Jakub Zaverka
Please disregard that line, it just a mailing client attachment. It is completely irrelevant to the matter. -Original Message- From: Junio C Hamano [mailto:gits...@pobox.com] Sent: 19 December 2017 17:13 To: Jakub Zaverka Cc: git@vger.kernel.org

Re: difftool uses hardcoded perl shebang

2017-12-19 Thread Junio C Hamano
Jakub Zaverka writes: > The below email is classified: Internal Internal to what?

Re: Fetching commit instead of ref

2017-12-19 Thread Junio C Hamano
"Carlsson, Magnus" writes: > I understand that you don't want to allow people fetching single > commits all the time, but is there a reason that you don't allow > SHA instead of references when you fetch an entire tree? I do not think we don't want to allow "single

Re: [PATCH v3] Makefile: replace perl/Makefile.PL with simple make rules

2017-12-19 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: >> Is there anything I'm supposed to do differently now to make our test >> suite run? If yes then a clear and short hint in the patch description >> would me more than approriate. > > This is a bug in my patch, I can reproduce it on CO7. Will

[no subject]

2017-12-19 Thread Amir A. K
-- Thanks for your last email response to me. The information required should include the following-: Your full names Your address Telephone number Your private email Occupation Age This is to enable my further discussion with you in confidence. Best regards and wishes to you. Mohammad Amir

Re: [FYI PATCH] t/helper/test-lazy-name-hash: fix compilation

2017-12-19 Thread Jeff Hostetler
On 12/18/2017 4:49 PM, Stefan Beller wrote: I was compiling origin/master today with stricter compiler flags today and was greeted by t/helper/test-lazy-init-name-hash.c: In function ‘cmd_main’: t/helper/test-lazy-init-name-hash.c:172:5: error: ‘nr_threads_used’ may be used uninitialized in

Allowing remote git repos to set config & hook configuration

2017-12-19 Thread Ævar Arnfjörð Bjarmason
On Sat, Dec 16 2017, Jeff King jotted: > 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. >>

difftool uses hardcoded perl shebang

2017-12-19 Thread Jakub Zaverka
The below email is classified: Internal When running git difftool: >git difftool Perl lib version (5.10.0) doesn't match executable version (v5.16.3) Compilation failed in require at /git-difftool line 2. First line in my git-difftool is: #!/usr/bin/perl I am using a specific perl that I

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

2017-12-19 Thread SZEDER Gábor
On Mon, Dec 18, 2017 at 11:04 PM, SZEDER Gábor wrote: > $ sudo apt-get install language-pack-is > [...] > $ ./t0204-gettext-reencode-sanity.sh > # lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale > # lib-gettext: No is_IS ISO-8859-1 locale available > ok

Re: [PATCH] revision: introduce prepare_revision_walk_extended()

2017-12-19 Thread Jeff King
On Mon, Dec 18, 2017 at 08:18:19PM +0100, René Scharfe wrote: > > The root of the matter is that the revision-walking code doesn't clean > > up after itself. In every case, the caller is just saving these to clean > > up commit marks, isn't it? > > bundle also checks if the pending objects

Re: [PATCH] fmt-merge-msg: avoid leaking strbuf in shortlog()

2017-12-19 Thread Jeff King
On Mon, Dec 18, 2017 at 08:18:17PM +0100, René Scharfe wrote: > > I'd actually argue the other way: the simplest interface is one where > > the string list owns all of its pointers. That keeps the > > ownership/lifetime issues clear, and it's one less step for the caller > > to have to remember

FEDERAL MINISTRY OF FINANCE

2017-12-19 Thread Cynthia Eden
Dear Friend Be informed that we have received an approved payment file from FEDERAL MINISTRY OF FINANCE in conjunction with International Monetary Fund (IMF) compensation for scam victims and your email address is among the listed victim's. I write to inform you that we will be sending you

Re: Fetching commit instead of ref

2017-12-19 Thread Carlsson, Magnus
First: Thanks everyone for your answers. I understand that there is a fetch pack, problem is that I can't force every git server provider to turn it on... Tested with github and they don't seem to have it on by default. I understand that you don't want to allow people fetching single commits