Re: [PATCH 3/5] commit: replace the raw buffer with strbuf in read_graft_line

2017-08-16 Thread Jeff King
On Wed, Aug 16, 2017 at 10:59:02PM +, brian m. carlson wrote: > On Wed, Aug 16, 2017 at 02:24:27PM +0200, Patryk Obara wrote: > > On Tue, Aug 15, 2017 at 7:02 PM, Stefan Beller wrote: > > >> const int entry_size = GIT_SHA1_HEXSZ + 1; > > > > > > outside the scope

Re: [PATCH] sub-process: print the cmd when a capability is unsupported

2017-08-16 Thread Christian Couder
On Wed, Aug 16, 2017 at 5:58 PM, Junio C Hamano wrote: > Christian Couder writes: > I am still wondering if protocol errors should be fatal, >>> >>> Yes, please. >> >> Unfortunately I think it would prevent new filters or new >> sub-processes

[PATCH v4 2/3] builtin/branch: stop supporting the use of --set-upstream option

2017-08-16 Thread Kaartic Sivaraam
The '--set-upstream' option of branch was deprecated in, b347d06bf branch: deprecate --set-upstream and show help if we detect possible mistaken use (Thu, 30 Aug 2012 19:23:13 +0200) In order to prevent "--set-upstream" on a command line from being taken as an abbreviated form of

[PATCH v4 3/3] branch: quote branch/ref names to improve readability

2017-08-16 Thread Kaartic Sivaraam
Signed-off-by: Kaartic Sivaraam --- No changes in this one. Sending this just because of the change in the total number of commits. branch.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/branch.c b/branch.c index

[PATCH v4 1/3] test: cleanup cruft of a test

2017-08-16 Thread Kaartic Sivaraam
Avoiding the clean up step of tests may help in some cases but in other cases they cause the other unrelated tests to fail for unobvious reasons. It's better to cleanup a few things to keep other tests from failing as a result of it. So, cleanup a cruft left behind by an old test in order for the

[PATCH v2/RFC] hook: use correct logical variable

2017-08-16 Thread Kaartic Sivaraam
In general, a 'Sign-off' added should be that of the *committer* and not that of the *commit's author*. As the 3rd part of the 'prepare-commit-msg' hook appended the sign-off of the *commit's author* it worked weirdly in some cases. For example 'git commit --amend -s' when coupled with that part

Re: [PATCH] hook: use correct logical variable

2017-08-16 Thread Kaartic Sivaraam
On Tue, 2017-08-15 at 10:28 -0700, Junio C Hamano wrote: > I did shoot for conciseness, but what is a lot more important is to > record what is at the core of the issue. "I found it by doing A" > can hint to careful readers why doing A leads to an undesirable > behaviour, but when there are other

Re: [PATCH v3 1/2 / RFC] builtin/branch: stop supporting the use of --set-upstream option

2017-08-16 Thread Kaartic Sivaraam
On Wed, 2017-08-16 at 12:09 -0700, Junio C Hamano wrote: > You said that "checkout" does not do a necessary check that is done > in "branch", so presumably "branch" already has a code to do so that > is not called by the current "checkout", right? Then you would add > a new caller in "checkout"

Re: git clean -fdx deletes tracked files

2017-08-16 Thread Andrew Ardill
Hi Kim, I have cc'd the git for windows mailing list, but doing a quick search on the bug tracker shows this issue which looks related: https://github.com/git-for-windows/git/issues/607 Hope that helps, seems like it may be an issue with how junctions on windows are handled by git. Regards,

loan

2017-08-16 Thread FINANCE CAPITAL IN
UNSECURED BUSINESS/PERSONAL LOAN BY LOAN CAPITAL FINANCE - NO COLLATERAL - MINIMUM DOCUMENTATION - BUSINESS LOAN UP TO FIVE(5) MILLION US DOLLARS CONTACT US TODAY VIA EMAIL: financecapital...@mail.com

Re: [PATCH] submodule.sh: remove unused variable

2017-08-16 Thread Jonathan Nieder
Stefan Beller wrote: > This could have been part of 48308681b0 (git submodule update: have a > dedicated helper for cloning, 2016-02-29). > > Signed-off-by: Stefan Beller > --- > git-submodule.sh | 1 - > 1 file changed, 1 deletion(-) Reviewed-by: Jonathan Nieder

Re: [PATCH 3/5] commit: replace the raw buffer with strbuf in read_graft_line

2017-08-16 Thread brian m. carlson
On Wed, Aug 16, 2017 at 02:24:27PM +0200, Patryk Obara wrote: > On Tue, Aug 15, 2017 at 7:02 PM, Stefan Beller wrote: > >> const int entry_size = GIT_SHA1_HEXSZ + 1; > > > > outside the scope of this patch: > > Is GIT_SHA1_HEXSZ or GIT_MAX_HEXSZ the right call here? >

Re: [RFC PATCH 01/10] pack: move pack name-related functions

2017-08-16 Thread Jonathan Tan
On Fri, 11 Aug 2017 14:34:27 -0700 Junio C Hamano wrote: > Ben Peart writes: > > > On 8/9/2017 1:16 PM, Jonathan Tan wrote: > > > >> Ah, I forgot to mention this in the cover letter. I thought that one > >> header was sufficient to cover all pack-related

[PATCH] submodule.sh: remove unused variable

2017-08-16 Thread Stefan Beller
This could have been part of 48308681b0 (git submodule update: have a dedicated helper for cloning, 2016-02-29). Signed-off-by: Stefan Beller --- git-submodule.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/git-submodule.sh b/git-submodule.sh index

Re: [PATCH] fix revisions doc about quoting for ':/' notation

2017-08-16 Thread Junio C Hamano
Andreas Heiduk writes: > Am 16.08.2017 um 05:21 schrieb ryenus: >> To make sure the `` in `:/` is seen as one search string, >> one should quote/escape `` properly. >> >> Especially, the example given in the manual `:/fix nasty bug` does not >> work because of missing

Re: [PATCH v2] sub-process: print the cmd when a capability is unsupported

2017-08-16 Thread Junio C Hamano
Junio C Hamano writes: > Ben Peart writes: > >>> - warning("external filter requested unsupported filter >>> capability '%s'", >>> - p); >>> + warning("subprocess '%s' requested unsupported

Re: [PATCH v2 0/2] Allow building with the external sha1dc library

2017-08-16 Thread Junio C Hamano
Takashi Iwai writes: > this is the second attempt to allow linking with the external sha1dc > shlib. Now I split to two patches: one for cleaning up of sha1dc > plumbing codes, and another for adding the option to link with the > external sha1dc lib. > > Other changes from v1: >

Re: [Patch size_t V3 13/19] Convert index-pack to size_t

2017-08-16 Thread Ramsay Jones
On 16/08/17 21:16, Martin Koegler wrote: > From: Martin Koegler > > Signed-off-by: Martin Koegler > --- > builtin/index-pack.c | 26 +- > 1 file changed, 13 insertions(+), 13 deletions(-) > > diff --git

Re: [RFC PATCH] Updated "imported object" design

2017-08-16 Thread Jonathan Tan
On Wed, 16 Aug 2017 13:32:23 -0700 Junio C Hamano wrote: > Jonathan Tan writes: > > > Also, let me know if there's a better way to send out these patches for > > review. Some of the code here has been reviewed before, for example. > > > > [1] > >

Re: [Patch size_t V3 00/19] use size_t

2017-08-16 Thread Junio C Hamano
Martin Koegler writes: > From: Martin Koegler > > This patchset is for next [24db08a6e8fed761d3bace7f2d5997806e20b9f7]. > Its a complete collection of all patches. Some errors were fixed and > it sticks with off_t for length in (pack) files.

Re: [PATCH] fix revisions doc about quoting for ':/' notation

2017-08-16 Thread Andreas Heiduk
Am 16.08.2017 um 05:21 schrieb ryenus: > To make sure the `` in `:/` is seen as one search string, > one should quote/escape `` properly. > > Especially, the example given in the manual `:/fix nasty bug` does not > work because of missing quotes. The examples are now corrected, and a > note about

Re: reftable [v7]: new ref storage format

2017-08-16 Thread Junio C Hamano
Shawn Pearce writes: > 7th iteration of the reftable storage format. > > You can read a rendered version of this here: > https://googlers.googlesource.com/sop/jgit/+/reftable/Documentation/technical/reftable.md > > Changes from v6: > - Blocks are variable sized, and

Re: [RFC PATCH] Updated "imported object" design

2017-08-16 Thread Junio C Hamano
Jonathan Tan writes: > Also, let me know if there's a better way to send out these patches for > review. Some of the code here has been reviewed before, for example. > > [1] > https://public-inbox.org/git/cover.1502241234.git.jonathanta...@google.com/ > > [2] >

git add -p breaks after split on change at the top of the file

2017-08-16 Thread Simon Ruderich
Hello, The following session reproduces the issue with Git 2.14.1: $ git init test $ cd test $ echo x >file $ git add file $ git commit -m commit $ printf 'a\nb\nx\nc\n' >file $ git add -p diff --git a/file b/file index 587be6b..74a69a0 100644 --- a/file

Re: [PATCH 1/9] Convert pack-objects to size_t

2017-08-16 Thread Martin Koegler
On Mon, Aug 14, 2017 at 10:08:05AM -0700, Junio C Hamano wrote: >It may help reducing the maintenance if we introduced obj_size_t >that is defined to be size_t for now, so that we can later swap >it to ofs_t or some larger type when we know we do need to >support objects whose size

[Patch size_t V3 06/19] Use size_t for sha1

2017-08-16 Thread Martin Koegler
From: Martin Koegler Signed-off-by: Martin Koegler --- block-sha1/sha1.c | 2 +- block-sha1/sha1.h | 2 +- ppc/sha1.c| 2 +- ppc/sha1.h| 2 +- sha1dc_git.c | 2 +- sha1dc_git.h | 2 +- 6 files changed, 6

[Patch size_t V3 05/19] Convert sha1_file.c to size_t

2017-08-16 Thread Martin Koegler
From: Martin Koegler Signed-off-by: Martin Koegler --- cache.h | 16 +++ sha1_file.c | 68 ++--- streaming.c | 2 +- 3 files changed, 43 insertions(+), 43 deletions(-)

[Patch size_t V3 09/19] Convert cache functions to size_t

2017-08-16 Thread Martin Koegler
From: Martin Koegler Signed-off-by: Martin Koegler --- cache-tree.c | 6 +++--- cache-tree.h | 2 +- cache.h | 6 +++--- convert.c | 18 +- environment.c | 4 ++-- read-cache.c | 18 +- 6 files

[Patch size_t V3 13/19] Convert index-pack to size_t

2017-08-16 Thread Martin Koegler
From: Martin Koegler Signed-off-by: Martin Koegler --- builtin/index-pack.c | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 7f3ccd0..bf2d728

[Patch size_t V3 02/19] Convert size datatype to size_t

2017-08-16 Thread Martin Koegler
From: Martin Koegler It changes the signature of the core object access function including any other functions to assure a clean compile if sizeof(size_t) != sizeof(unsigned long). Signed-off-by: Martin Koegler --- apply.c |

[Patch size_t V3 00/19] use size_t

2017-08-16 Thread Martin Koegler
From: Martin Koegler This patchset is for next [24db08a6e8fed761d3bace7f2d5997806e20b9f7]. Its a complete collection of all patches. Some errors were fixed and it sticks with off_t for length in (pack) files. Object sizes are handled as size_t. Martin Koegler (19):

[Patch size_t V3 14/19] Convert unpack-objects to size_t

2017-08-16 Thread Martin Koegler
From: Martin Koegler Signed-off-by: Martin Koegler --- builtin/unpack-objects.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index

[Patch size_t V3 07/19] Convert parse_X_buffer to size_t

2017-08-16 Thread Martin Koegler
From: Martin Koegler Signed-off-by: Martin Koegler --- blob.c | 2 +- blob.h | 2 +- builtin/fsck.c | 2 +- commit.c | 2 +- commit.h | 2 +- object.c | 2 +- object.h | 2 +- pack-check.c | 2 +-

[Patch size_t V3 15/19] Convert archive functions to size_t

2017-08-16 Thread Martin Koegler
From: Martin Koegler Signed-off-by: Martin Koegler --- archive-tar.c | 16 archive-zip.c | 22 +++--- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/archive-tar.c b/archive-tar.c index

[Patch size_t V3 16/19] Convert various things to size_t

2017-08-16 Thread Martin Koegler
From: Martin Koegler Signed-off-by: Martin Koegler --- bisect.c| 2 +- blame.c | 2 +- builtin/fmt-merge-msg.c | 2 +- builtin/mktag.c | 2 +- dir.c | 4 ++-- dir.h |

[Patch size_t V3 18/19] Convert tree-walk to size_t

2017-08-16 Thread Martin Koegler
From: Martin Koegler Signed-off-by: Martin Koegler --- tree-walk.c | 17 + tree-walk.h | 4 ++-- tree.h | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/tree-walk.c b/tree-walk.c index

[Patch size_t V3 11/19] Use size_t for config parsing

2017-08-16 Thread Martin Koegler
From: Martin Koegler Signed-off-by: Martin Koegler --- builtin/pack-objects.c | 6 +++--- config.c | 27 ++- config.h | 2 ++ 3 files changed, 27 insertions(+), 8 deletions(-) diff --git

[Patch size_t V3 12/19] Convert pack-objects to size_t

2017-08-16 Thread Martin Koegler
From: Martin Koegler Signed-off-by: Martin Koegler --- Documentation/technical/api-parse-options.txt | 2 +- builtin/pack-objects.c| 46 +-- parse-options.c | 6

[Patch size_t V3 10/19] Add overflow check to get_delta_hdr_size

2017-08-16 Thread Martin Koegler
From: Martin Koegler Signed-off-by: Martin Koegler --- delta.h | 5 + 1 file changed, 5 insertions(+) diff --git a/delta.h b/delta.h index 2df0f55..dab7352 100644 --- a/delta.h +++ b/delta.h @@ -96,6 +96,11 @@ static inline size_t

[Patch size_t V3 17/19] Convert ref-filter to size_t

2017-08-16 Thread Martin Koegler
From: Martin Koegler Signed-off-by: Martin Koegler --- ref-filter.c | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ref-filter.c b/ref-filter.c index 5c903a5..30f249c 100644 ---

[Patch size_t V3 08/19] Convert fsck.c & commit.c to size_t

2017-08-16 Thread Martin Koegler
From: Martin Koegler Signed-off-by: Martin Koegler --- builtin/replace.c | 2 +- commit.c | 14 +++--- commit.h | 8 fsck.c| 14 +++--- fsck.h| 2 +- 5 files changed, 20

[Patch size_t V3 19/19] Convert xdiff-interface to size_t

2017-08-16 Thread Martin Koegler
From: Martin Koegler Signed-off-by: Martin Koegler --- combine-diff.c | 2 +- diff.c | 28 ++-- diffcore-pickaxe.c | 4 ++-- xdiff-interface.c | 8 xdiff-interface.h | 6 +++--- 5 files

[Patch size_t V3 04/19] delta: Fix offset overflows

2017-08-16 Thread Martin Koegler
From: Martin Koegler Prevent generating delta offsets beyond 4G. Signed-off-by: Martin Koegler --- diff-delta.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/diff-delta.c b/diff-delta.c index dffbab1..4489b79 100644 ---

[Patch size_t V3 01/19] delta: fix enconding size larger than an "uint" can hold

2017-08-16 Thread Martin Koegler
From: Martin Koegler The current delta code produces incorrect pack objects for files > 4GB. Signed-off-by: Martin Koegler --- diff-delta.c | 23 --- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git

[Patch size_t V3 03/19] Convert zlib.c to size_t

2017-08-16 Thread Martin Koegler
From: Martin Koegler Signed-off-by: Martin Koegler --- builtin/pack-objects.c | 8 cache.h| 12 ++-- pack-check.c | 4 ++-- sha1_file.c| 6 +++--- wrapper.c | 8

Re: [PATCH v2 1/4] sha1_file: fix hardcoded size in null_sha1

2017-08-16 Thread Junio C Hamano
Patryk Obara writes: > This prevents compilation error if GIT_MAX_RAWSZ is different than 20. The above made me scratch my head wondering why because it does not say what the root cause of the issue is. It would have avoided a few strand of lost hair if it were more

Re: [PATCH 5/5] commit: rewrite read_graft_line

2017-08-16 Thread Junio C Hamano
Patryk Obara writes: > Junio C Hamano wrote: >> I am not sure if this is a good approach. Just like in 2/5 you can >> use the MAX thing instead of 20, instead of having each graft entry >> allocate a separate oid_array.oid[]. > > Once MAX values were

Re: [PATCH 2/5] sha1_file: fix hardcoded size in null_sha1

2017-08-16 Thread Junio C Hamano
Patryk Obara writes: > Junio C Hamano wrote: > >> I said this is OK for "null" because we assume we will use ^\0{len}$ >> for any hash function we choose as the "impossible" value, and for >> that particular use pattern, we do not need such a union.

Re: What's cooking in git.git (Aug 2017, #03; Mon, 14)

2017-08-16 Thread Junio C Hamano
Kaartic Sivaraam writes: > It's been around 4 or 5 issues of 'What's cooking in git.git' and I haven't > heard about the patches found at, > > http://public-inbox.org/git/<20170730111705.12444-1-kaarticsivaraam91...@gmail.com> > > and > >

Re: [PATCH v3 1/2 / RFC] builtin/branch: stop supporting the use of --set-upstream option

2017-08-16 Thread Junio C Hamano
Kaartic Sivaraam writes: > On Wednesday 16 August 2017 12:28 AM, Junio C Hamano wrote: >> Some refactoring to make it easier to reuse it from the new caller >> would be necessary. > Sorry but I think I don't get that correctly. What's the "new caller" > being

Re: Submodule regression in 2.14?

2017-08-16 Thread Stefan Beller
On Wed, Aug 16, 2017 at 11:51 AM, Stefan Beller wrote: > Any chance the "did not happen with 2.13" was not > freshly cloned but tested on an existing repo? If so a hot > candidate for suspicion is a93dcb0a56 (Merge branch > 'bw/submodule-is-active', 2017-03-30), IMHO, just >

Re: Submodule regression in 2.14?

2017-08-16 Thread Stefan Beller
On Wed, Aug 16, 2017 at 11:35 AM, Lars Schneider wrote: > Hi, > > I think we discovered a regression in Git 2.14.1 today. > It looks like as if "git submodule update --init --recursive" removes > the "skip submodules" config. > > Consider the following steps: > > git

Re: [PATCH] fix revisions doc about quoting for ':/' notation

2017-08-16 Thread Junio C Hamano
ryenus writes: > To make sure the `` in `:/` is seen as one search string, > one should quote/escape `` properly. > > Especially, the example given in the manual `:/fix nasty bug` does not > work because of missing quotes. The examples are now corrected, and a > note about

Submodule regression in 2.14?

2017-08-16 Thread Lars Schneider
Hi, I think we discovered a regression in Git 2.14.1 today. It looks like as if "git submodule update --init --recursive" removes the "skip submodules" config. Consider the following steps: git clone https://server/repo.git cd repo git config --local submodule.some/other/repo.update

[PATCH/FIXUP 6/2] apply: clarify read_old_data() is about no-index case

2017-08-16 Thread Junio C Hamano
With the previous fixes to CRLF handling in place, read_old_data() knows what it wants convert_to_git() to do with respect to CRLF. In fact, this codepath is about applying a patch to a file in the filesystem, which may not exist in the index, or may exist but may not match what is recorded in

[PATCH/FIXUP 5/2] apply: localize the CRLF business to read_old_data()

2017-08-16 Thread Junio C Hamano
Previous changes passed a new APPLY_FLAGS_CR_AT_EOL option down from load_preimage() to read_old_data(), because the last function in that callchain needs to decide how its call to convert_to_git() function is made on the data read from the working tree. The load_preimage() function and its

[PATCH/FIXUP 4/2] apply: only pay attention to CRLF in the preimage

2017-08-16 Thread Junio C Hamano
The newly added "patch.has_crlf" member wants to indicate if the incoming patch expects any CRLF line in the patch target, and parse_fragment() implements that logic for "git apply". Rename the member to "patch.crlf_in_old" to clarify what it means, and fix the logic in parse_fragment() so that

Re: [PATCH/RFC 2/2] File commited with CRLF should roundtrip diff and apply

2017-08-16 Thread Junio C Hamano
I'll be sending a few patches that apply on top of applying these two patches to show what I meant in my previous review comments. The net change to apply.c, when you combine your 2/2 with these, would become like the attached, which I think makes more sense. Instead of queuing a squashed result,

[PATCH/FIXUP 3/2] apply: remove unused member apply_state.flags

2017-08-16 Thread Junio C Hamano
The previous step added the "flags" member to apply_state, but it is never used. Remove it and move the bit assignment macro to apply.c as that is just a private implementation detail. Signed-off-by: Junio C Hamano --- apply.c | 2 ++ apply.h | 4 2 files changed, 2

Re: What's cooking in git.git (Aug 2017, #03; Mon, 14)

2017-08-16 Thread Kaartic Sivaraam
It's been around 4 or 5 issues of 'What's cooking in git.git' and I haven't heard about the patches found at, http://public-inbox.org/git/<20170730111705.12444-1-kaarticsivaraam91...@gmail.com> and https://public-inbox.org/git/<20170730115908.13841-1-kaarticsivaraam91...@gmail.com> What has

Re: [PATCH v3 1/2 / RFC] builtin/branch: stop supporting the use of --set-upstream option

2017-08-16 Thread Kaartic Sivaraam
On Wednesday 16 August 2017 12:28 AM, Junio C Hamano wrote: Some refactoring to make it easier to reuse it from the new caller would be necessary. Sorry but I think I don't get that correctly. What's the "new caller" being referred to here? What should be refactored? --- Kaartic

[PATCH v2 2/4] commit: replace the raw buffer with strbuf in read_graft_line

2017-08-16 Thread Patryk Obara
This simplifies function declaration and allows for use of strbuf_rtrim instead of modifying buffer directly. Signed-off-by: Patryk Obara --- builtin/blame.c | 2 +- commit.c| 11 ++- commit.h| 2 +- 3 files changed, 8 insertions(+), 7

[PATCH v2 4/4] commit: rewrite read_graft_line

2017-08-16 Thread Patryk Obara
The previous implementation of read_graft_line used calculations based on GIT_SHA1_RAWSZ and GIT_SHA1_HEXSZ to determine the number of commit ids in a single graft line. New implementation does not depend on these constants, so it adapts to any object_id buffer size. To make this possible,

[PATCH v2 3/4] commit: implement free_commit_graft

2017-08-16 Thread Patryk Obara
In preparation for new graft struct version introduced in next commit. Signed-off-by: Patryk Obara --- commit.c | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/commit.c b/commit.c index 499fb14..4d23e72 100644 --- a/commit.c +++ b/commit.c

[PATCH v2 1/4] sha1_file: fix hardcoded size in null_sha1

2017-08-16 Thread Patryk Obara
This prevents compilation error if GIT_MAX_RAWSZ is different than 20. Signed-off-by: Patryk Obara --- sha1_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sha1_file.c b/sha1_file.c index b60ae15..f5b5bec 100644 --- a/sha1_file.c +++

[PATCH v2 0/4] Modernize read_graft_line implementation

2017-08-16 Thread Patryk Obara
Compared to v1: - the first patch is dropped to make it easier to merge - free_graft is now static function in commit.c I don't know, what are exact rules about adding Reviewed-by footer, so I didn't add any. Patryk Obara (4): sha1_file: fix hardcoded size in null_sha1 commit: replace the

Re: git reset

2017-08-16 Thread Junio C Hamano
Efim Goncharuk writes: > Starting from git v.2.13.0 onwards (v 2.12.2 works fine) > > git reset --hard with --work-tree and --git-dir options does not move HEAD to > hash/tag specified. HEAD remains on same position. > > Example: > >> git --work-tree=lib/core

Re: [PATCH v2] sub-process: print the cmd when a capability is unsupported

2017-08-16 Thread Junio C Hamano
Ben Peart writes: >> -warning("external filter requested unsupported filter >> capability '%s'", >> -p); >> +warning("subprocess '%s' requested unsupported >> capability '%s'", >> +

Re: [PATCH] push: do not add submodule odb as an alternate when recursing on demand

2017-08-16 Thread Heiko Voigt
Hi, was about to write that we are maybe overly cautious here. Because the current way a submodule ends up in the list to be pushed is through: find_unpushed_submodules() that itself collects all changed submodules when submodule_needs_pushing() is true. In there we have this: if

Re: [PATCH] sub-process: print the cmd when a capability is unsupported

2017-08-16 Thread Junio C Hamano
Christian Couder writes: >>> I am still wondering if protocol errors should be fatal, >> >> Yes, please. > > Unfortunately I think it would prevent new filters or new > sub-processes to work with older versions of Git. > > For example if filters are upgraded company

Re: reftable [v7]: new ref storage format

2017-08-16 Thread Shawn Pearce
On Tue, Aug 15, 2017 at 11:15 PM, Stefan Beller wrote: > On Tue, Aug 15, 2017 at 7:48 PM, Shawn Pearce wrote: >> 7th iteration of the reftable storage format. >> >> You can read a rendered version of this here: >>

Re: [PATCH v2] sub-process: print the cmd when a capability is unsupported

2017-08-16 Thread Lars Schneider
> On 16 Aug 2017, at 14:40, Christian Couder wrote: > > In handshake_capabilities() we use warning() when a capability > is not supported, so the exit code of the function is 0 and no > further error is shown. This is a problem because the warning > message doesn't

Re: [PATCH v2] sub-process: print the cmd when a capability is unsupported

2017-08-16 Thread Ben Peart
On 8/16/2017 8:40 AM, Christian Couder wrote: In handshake_capabilities() we use warning() when a capability is not supported, so the exit code of the function is 0 and no further error is shown. This is a problem because the warning message doesn't tell us which subprocess cmd failed. On the

[no subject]

2017-08-16 Thread donellvavas
Contact me urgently

Re: [PATCH 5/5] commit: rewrite read_graft_line

2017-08-16 Thread Patryk Obara
Junio C Hamano wrote: > I am not sure if this is a good approach. Just like in 2/5 you can > use the MAX thing instead of 20, instead of having each graft entry > allocate a separate oid_array.oid[]. Once MAX values were increased memory corruption was caused exactly by this

Re: Bug with ignorecase on Git and Cygwin

2017-08-16 Thread Torsten Bögershausen
On Wed, Aug 16, 2017 at 11:50:47AM +, CHEVALLIER Yves wrote: > Hi, > > On Cygwin, the config value `ignorecase` is set to `true` during `git init` > and it is not possible to change the default value using templates. > > The issue was discovered while I was tracking a bunch of source

[PATCH v2] sub-process: print the cmd when a capability is unsupported

2017-08-16 Thread Christian Couder
In handshake_capabilities() we use warning() when a capability is not supported, so the exit code of the function is 0 and no further error is shown. This is a problem because the warning message doesn't tell us which subprocess cmd failed. On the contrary if we cannot write a packet from this

Re: [PATCH] sub-process: print the cmd when a capability is unsupported

2017-08-16 Thread Christian Couder
On Wed, Aug 16, 2017 at 2:22 AM, Jonathan Nieder wrote: > Jonathan Tan wrote: >> Christian Couder wrote: > >>> In handshake_capabilities() we use warning() when a capability >>> is not supported, so the exit code of the function is 0 and no >>>

Re: [RFC 0/3] imap-send curl tunnelling support

2017-08-16 Thread Johannes Schindelin
Hi, On Tue, 15 Aug 2017, Stefan Beller wrote: > On Tue, Aug 15, 2017 at 10:49 AM, Nicolas Morey-Chaisemartin > wrote: > > Ping. > > > > I'd like to get feedback from Windows developer on patch #2 > > Patch#3 will probably need some updates as I expected Jeff old

Re: [PATCH 4/5] commit: implement free_commit_graft

2017-08-16 Thread Patryk Obara
Junio C Hamano wrote: > I do not see a need to make this new function extern. Shouldn't it > be made "static" and revert the change to commit.h? Ah, of course :) I was anticipating to find free(graft); in more places throughout code but forgot to get back to it once there was

Re: [PATCH 3/5] commit: replace the raw buffer with strbuf in read_graft_line

2017-08-16 Thread Patryk Obara
On Tue, Aug 15, 2017 at 7:02 PM, Stefan Beller wrote: >> const int entry_size = GIT_SHA1_HEXSZ + 1; > > outside the scope of this patch: > Is GIT_SHA1_HEXSZ or GIT_MAX_HEXSZ the right call here? I think neither one. In my opinion, this code should not be so closely

git reset

2017-08-16 Thread Efim Goncharuk
Hello, Starting from git v.2.13.0 onwards (v 2.12.2 works fine) git reset --hard with --work-tree and --git-dir options does not move HEAD to hash/tag specified. HEAD remains on same position. Example: > git --work-tree=lib/core --git-dir=lib/core/.git/ reset --hard 0.1.0 Note: on another

Re: [PATCH v2 1/2] clang-format: outline the git project's coding style

2017-08-16 Thread Johannes Schindelin
Hi Peff, On Mon, 14 Aug 2017, Jeff King wrote: > On Mon, Aug 14, 2017 at 03:54:30PM -0700, Brandon Williams wrote: > > > > And removing that gives me a clean output. I have no idea why my clang > > > doesn't like these (but presumably yours does). It's clang-format-5.0 in > > > Debian unstable

Re: [PATCH 2/5] sha1_file: fix hardcoded size in null_sha1

2017-08-16 Thread Patryk Obara
Junio C Hamano wrote: > I said this is OK for "null" because we assume we will use ^\0{len}$ > for any hash function we choose as the "impossible" value, and for > that particular use pattern, we do not need such a union. Just > letting the caller peek at an appropriate

Bug with ignorecase on Git and Cygwin

2017-08-16 Thread CHEVALLIER Yves
Hi, On Cygwin, the config value `ignorecase` is set to `true` during `git init` and it is not possible to change the default value using templates. The issue was discovered while I was tracking a bunch of source files of a SDK. To track the changes I simply rm all the working directory,

[ANNOUNCE] Git Rev News edition 30

2017-08-16 Thread Christian Couder
Hi everyone, The 30th edition of Git Rev News is now published: https://git.github.io/rev_news/2017/08/16/edition-30/ Thanks a lot to all the contributors and helpers! Enjoy, Christian, Thomas, Jakub and Markus.

MR.SALLM SA.LIF

2017-08-16 Thread sallsm salif
Hi friend I am a banker, I want to transfer an abandoned sum of USD15.5 Million to your Bank account. 40/percent will be your share. No risk involved but keep it as secret. Contact me for more details. Thanks. MR.SALLM SALIF

Assalamu`Alaikum.

2017-08-16 Thread Mohammad Ouattara
Greetings from Dr. mohammad ouattara. Assalamu`Alaikum. My Name is Dr. mohammad ouattara, I am a banker by profession. I'm from Ouagadougou, Burkina Faso, West Africa. My reason for contacting you is to transfer an abandoned $14.6M to your account. The owner of this fund died since 2004 with

Re: [RFC 0/3] imap-send curl tunnelling support

2017-08-16 Thread Jeff King
On Tue, Aug 15, 2017 at 07:46:11PM +0200, Nicolas Morey-Chaisemartin wrote: > Patch#3 will probably need some updates as I expected Jeff old curl drop > patches to make it in. > As it seems to be going another way a few more ifdefs will be required I'm not sure where we're going with the

Re: [RFC 0/3] imap-send curl tunnelling support

2017-08-16 Thread Jeff King
On Wed, Aug 09, 2017 at 04:43:26PM +0200, Nicolas Morey-Chaisemartin wrote: > I have a few doubt on patch #2: > - is socketpair working on all git supported system (windows ?) I'm pretty sure the answer is no, after searching a bit for mingw and socketpair. The big question is whether we could

Re: [PATCH v4 5/8] interpret-trailers: add --parse convenience option

2017-08-16 Thread Jeff King
On Tue, Aug 15, 2017 at 01:26:53PM +0200, Martin Ågren wrote: > > This command reads some patches or commit messages from either the > > - arguments or the standard input if no is specified. Then > > -this command applies the arguments passed using the `--trailer` > > -option, if any, to the

Re: [BUG] git am sometimes unable to apply git format-patch output file

2017-08-16 Thread Soul Trace
12.08.2017 20:01, Torsten Bögershausen пишет: On Sat, Aug 12, 2017 at 06:20:23PM +0200, Torsten Bögershausen wrote: On Sat, Aug 12, 2017 at 07:02:59PM +0300, Soul Trace wrote: Hello. Using git i have found that git am command may sometimes fail to apply patch file which was created by the git

Re: git clean -fdx deletes tracked files

2017-08-16 Thread Kim Birkelund
Apologies. I should obviously have mentioned which OSes the machines I tested on ran. One Windows 10 (fully updated) and one Windows Server 2016 (also updated). I've also seen it in a real repository on our build server which is Windows Server 2012 R2. After my first mail I updated git to latest

Re: reftable [v7]: new ref storage format

2017-08-16 Thread Stefan Beller
On Tue, Aug 15, 2017 at 7:48 PM, Shawn Pearce wrote: > 7th iteration of the reftable storage format. > > You can read a rendered version of this here: > https://googlers.googlesource.com/sop/jgit/+/reftable/Documentation/technical/reftable.md > > Changes from v6: > - Blocks