Re: git-describe --contains

2017-08-12 Thread Davide Cavallari
Thanks Andreas and Nicholas, I'll check it out.

Re: [PATCH] strbuf: clear errno before calling getdelim(3)

2017-08-12 Thread Jeff King
On Sun, Aug 13, 2017 at 07:51:34AM +0200, René Scharfe wrote: > Am 13.08.2017 um 06:32 schrieb Jeff King: > > On Sat, Aug 12, 2017 at 01:57:06PM +0200, René Scharfe wrote: > > > >> But we probably want to check for other errors. They look unlikely > >> enough that we may get away with something

Re: [PATCH] strbuf: clear errno before calling getdelim(3)

2017-08-12 Thread René Scharfe
Am 13.08.2017 um 06:32 schrieb Jeff King: > On Sat, Aug 12, 2017 at 01:57:06PM +0200, René Scharfe wrote: > >> But we probably want to check for other errors. They look unlikely >> enough that we may get away with something like this: >> >> - if (errno == ENOMEM) >> -

Bug?: git archive exclude pathspec and gitattributes export-ignore

2017-08-12 Thread David Adam
Hi all, I think I have a bug in git (tested 2.11.0 on Debian 8, 2.14.1 on OS X and 2.14.1.145.gb3622a4 on OS X). Given a repository with an export-ignore directive for a subdirectory in .gitattributes, `git archive` with a pathspec that excludes a different subdirectory produces no output file

Re: NO_MSGFMT

2017-08-12 Thread Jeff King
On Sat, Aug 12, 2017 at 03:44:17PM +0200, Dominik Mahrer (Teddy) wrote: > Hi all > > I'm compiling git from source code on a mashine without msgfmt. This leads > to compile errors. To be able to compile git I created a patch that at least > works for me: Try: make NO_MSGFMT=Nope NO_GETTEXT=No

Re: [RFC] clang-format: outline the git project's coding style

2017-08-12 Thread Jeff King
On Fri, Aug 11, 2017 at 09:39:11PM -0700, Junio C Hamano wrote: > > Yeah, I just dug in the archive. The script I ran way back when was > > actually clang-format-diff. > > I am confident with the competence of people around here that we can > come up with a reasonable checker for obvious style vi

Re: [PATCH v2 1/2] format-patch: have progress option while generating patches

2017-08-12 Thread Jeff King
On Sat, Aug 12, 2017 at 09:06:18AM +0100, Philip Oakley wrote: > > > > + progress = start_progress_delay(_("Generating patches"), total, 0, 1); > > > > > > I don't really have an opinion on a 1 second delay versus 2. I thought > > > we used 2 pretty consistently, though grepping around I do see a

Re: [PATCH] strbuf: clear errno before calling getdelim(3)

2017-08-12 Thread Jeff King
On Sat, Aug 12, 2017 at 01:57:06PM +0200, René Scharfe wrote: > But we probably want to check for other errors. They look unlikely > enough that we may get away with something like this: > > - if (errno == ENOMEM) > - die("Out of memory, getdelim failed"); >

[no subject]

2017-08-12 Thread Stephanie Gomes
How I work this? Sent from my iPhone

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

2017-08-12 Thread 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 am command. > > > > > > Steps

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

2017-08-12 Thread Torsten Bögershausen
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 am command. > > > Steps to reproduce: Excellent, thanks so much for the detailed bug report. This kind of inf

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

2017-08-12 Thread Soul Trace
Hello. Using git i have found that git am command may sometimes fail to apply patch file which was created by the git am command. Steps to reproduce: # 1. Clone test repository: git clone https://github.com/S-trace/git_am_bug_test.git # 2. Format patch file for last commit: git format-pat

Re: Error: Permition denied. git should not try to access root account if I work under common user

2017-08-12 Thread brian m. carlson
On Sat, Aug 12, 2017 at 04:22:08PM +0300, KES wrote: > Hi. > > When I use `git pull -v --rebase` command under user I got this error: > > POST git-upload-pack (947 bytes) > POST git-upload-pack (452 bytes) > remote: warning: unable to access '/root/.config/git/attributes': Permission > denied >

[PATCH v3] am: fix signoff when other trailers are present

2017-08-12 Thread Phillip Wood
From: Phillip Wood If there was no 'Signed-off-by:' trailer but another trailer such as 'Reported-by:' then 'git am --signoff' would add a blank line between the existing trailers and the added 'Signed-off-by:' line. e.g. Rebase accepts '--rerere-autoupdate' as an option but only honors

IMMEDIATE REPLY NEEDED.

2017-08-12 Thread Alaine Kamba
Dear, My name is Mr Alaine Kamba, I am the Bill and Exchange (assistant) Manager of Bank of Africa Ouagadougou, Burkina Faso. In my department I discovered an abandoned sum of eighteen million three hundred thousand United State of American dollars (18.3MILLION USA DOLLARS) in an account that belo

Re: [PATCH v2] tree-walk: convert fill_tree_descriptor() to object_id

2017-08-12 Thread brian m. carlson
On Sat, Aug 12, 2017 at 10:32:59AM +0200, René Scharfe wrote: > All callers of fill_tree_descriptor() have been converted to object_id > already, so convert that function as well. As a nice side-effect we get > rid of NULL checks in tree-diff.c, as fill_tree_descriptor() already > does them for us

[PATCH/RFC] convert: Add SAFE_CRLF_KEEP_CRLF

2017-08-12 Thread tboegi
From: Torsten Bögershausen When convert_to_git() is called, the caller may want to keep CRLF to be kept as CRLF (and not converted into LF). This will be used in the next commit, when apply works with files that have CRLF and patches are applied onto these files. Add the new value "SAFE_CRLF_KE

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

2017-08-12 Thread tboegi
From: Torsten Bögershausen When a file had been commited with CRLF and core.autocrlf is true, the following does not roundtrip, `git apply` fails: printf "Added line\r\n" >>file && git diff >patch && git checkout -- . && git apply patch Before applying the patch, the file from working tree is c

Re: [PATCH 3/9] Convert unpack-objects to size_t

2017-08-12 Thread Martin Ågren
On 12 August 2017 at 10:47, Martin Koegler wrote: > 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

Re: [PATCH 2/9] Convert index-pack to size_t

2017-08-12 Thread Ramsay Jones
On 12/08/17 09:47, 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 a/builtin/index-pack.c b/builtin/index-pack.c > index 7f3ccd0..bf

NO_MSGFMT

2017-08-12 Thread Dominik Mahrer (Teddy)
Hi all I'm compiling git from source code on a mashine without msgfmt. This leads to compile errors. To be able to compile git I created a patch that at least works for me: diff -Naur ../git-2.14.1.orig/Makefile ./Makefile --- ../git-2.14.1.orig/Makefile 2017-08-09 21:54:31.0 +0200 ++

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

2017-08-12 Thread Ramsay Jones
On 12/08/17 09:47, Martin Koegler wrote: > From: Martin Koegler > > Signed-off-by: Martin Koegler > --- > builtin/pack-objects.c | 48 > 1 file changed, 24 insertions(+), 24 deletions(-) > > diff --git a/builtin/pack-objects.c b/builtin/pack-o

Error: Permition denied. git should not try to access root account if I work under common user

2017-08-12 Thread KES
Hi. When I use `git pull -v --rebase` command under user I got this error: POST git-upload-pack (947 bytes) POST git-upload-pack (452 bytes) remote: warning: unable to access '/root/.config/git/attributes': Permission denied remote: Counting objects: 4, done. remote: Compressing objects: 100% (

Re: [PATCH 5/9] Convert various things to size_t

2017-08-12 Thread Martin Ågren
On 12 August 2017 at 10:47, Martin Koegler wrote: > From: Martin Koegler > > --- > bisect.c| 2 +- > blame.c | 2 +- > builtin/fmt-merge-msg.c | 2 +- > builtin/mktag.c | 2 +- > dir.c | 4 ++-- > dir.h | 2 +- > 6 files

Re: [PATCH v4 4/4] add: modify already added files when --chmod is given

2017-08-12 Thread Thomas Gummerer
On 08/07, René Scharfe wrote: > Am 14.09.2016 um 23:07 schrieb Thomas Gummerer: > > When the chmod option was added to git add, it was hooked up to the diff > > machinery, meaning that it only works when the version in the index > > differs from the version on disk. > > > > As the option was suppo

Re: [PATCH] strbuf: clear errno before calling getdelim(3)

2017-08-12 Thread René Scharfe
Am 12.08.2017 um 13:57 schrieb René Scharfe: > Update: Just noticed that on the BSDs getdelim(3) doesn't set errno > to ENOMEM on allocation failure, but does set the error indicator. > That might be an oversight on their part, but that means we > certainly *need* to check ferror(). And an unchang

Re: [PATCH] strbuf: clear errno before calling getdelim(3)

2017-08-12 Thread René Scharfe
Am 12.08.2017 um 12:02 schrieb Simon Ruderich: > On Fri, Aug 11, 2017 at 10:52:51AM +0200, René Scharfe wrote: >> Am 11.08.2017 um 09:50 schrieb Simon Ruderich: >>> On Thu, Aug 10, 2017 at 10:56:40PM +0200, René Scharfe wrote: getdelim(3) returns -1 at the end of the file and if it encounters

Re: [PATCH] strbuf: clear errno before calling getdelim(3)

2017-08-12 Thread Simon Ruderich
On Fri, Aug 11, 2017 at 10:52:51AM +0200, René Scharfe wrote: > Am 11.08.2017 um 09:50 schrieb Simon Ruderich: >> On Thu, Aug 10, 2017 at 10:56:40PM +0200, René Scharfe wrote: >>> getdelim(3) returns -1 at the end of the file and if it encounters an >>> error, but sets errno only in the latter case

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

2017-08-12 Thread Torsten Bögershausen
Thanks for working on this - unfortunatly the patch does not apply on git.git/master. Which baseline did you use ?

Re: Would it make sense to add `--depth=0` feature?

2017-08-12 Thread Philip Oakley
From: "ankostis" Would it be feasible/sensical to support clone/fetch with --depth=0? The point is to download the tags/commit objects but not the actual trees and blobs, creating a "ledger" acting as a promise for the remote'e repo content? Is there some estimation of the effort required to do

Re: [PATCH 1/2] http: Fix handling of missing CURLPROTO_*

2017-08-12 Thread Tom G. Christensen
On 12/08/17 02:30, Junio C Hamano wrote: This may make the code to _compile_, but is it sensible to let the code build and be used by the end users without the "these protocols are safe" filter, I wonder? Git will display a warning at runtime if this is not available but perhaps this warning

Re: [PATCH v2 1/2] format-patch: have progress option while generating patches

2017-08-12 Thread Philip Oakley
From: "Junio C Hamano" Jeff King writes: On Thu, Aug 10, 2017 at 02:32:55PM -0400, Kevin Willford wrote: @@ -1493,6 +1496,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) OPT_FILENAME(0, "signature-file", &signature_file, N_("add a signature from a file")), OPT

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

2017-08-12 Thread Martin Koegler
From: Martin Koegler Signed-off-by: Martin Koegler --- builtin/pack-objects.c | 48 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index aa70f80..f8db283 100644 --- a/builtin/pack-o

[PATCH 2/9] Convert index-pack to size_t

2017-08-12 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 100644 --- a/builtin/index-pack.c +++ b/builtin/index-p

[PATCH 6/9] Use size_t for config parsing

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

[PATCH 9/9] Convert xdiff-interface to size_t

2017-08-12 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 | 6 +++--- xdiff-interface.h | 6 +++--- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a

[PATCH 5/9] Convert various things to size_t

2017-08-12 Thread Martin Koegler
From: Martin Koegler --- bisect.c| 2 +- blame.c | 2 +- builtin/fmt-merge-msg.c | 2 +- builtin/mktag.c | 2 +- dir.c | 4 ++-- dir.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bisect.c b/bis

[PATCH 7/9] Convert ref-filter to size_t

2017-08-12 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 --- a/ref-filter.c +++ b/ref-filter.c @@ -724,7 +724,7 @@ static

[PATCH] Add overflow check to get_delta_hdr_size

2017-08-12 Thread Martin Koegler
From: Martin Koegler Signed-off-by: Martin Koegler --- Applies on top of my size_t series I'm not sure, if die or error is better. delta.h | 5 + 1 file changed, 5 insertions(+) diff --git a/delta.h b/delta.h index 2df0f55..18a4983 100644 --- a/delta.h +++ b/delta.h @@ -96,6 +96,11 @@ st

[PATCH 4/9] Convert archive functions to size_t

2017-08-12 Thread Martin Koegler
From: 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 719673d..ee56b2b 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -12,7 +12,7 @@ #define

[PATCH 8/9] Convert tree-walk to size_t

2017-08-12 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 7c9f9e3..a7d8b2a 100644 --- a/tree-walk.c +++ b/tree-walk.c @@

[PATCH 3/9] Convert unpack-objects to size_t

2017-08-12 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 001dd4b..0d8b6b3 100644 --- a/builtin/unpack-objects.c +++ b/built

[PATCH v2] tree-walk: convert fill_tree_descriptor() to object_id

2017-08-12 Thread René Scharfe
All callers of fill_tree_descriptor() have been converted to object_id already, so convert that function as well. As a nice side-effect we get rid of NULL checks in tree-diff.c, as fill_tree_descriptor() already does them for us. Helped-by: Johannes Sixt Signed-off-by: Rene Scharfe --- Changes

description about necessary libs on INSTALL

2017-08-12 Thread Kazuki Tsunemi
Hello! I have an idea about document. I installed git with INSTALL. I executed 'make install' but got some errors while building. I found necessary libs written in INSTALL after all build errors have solved. How about write about libs before install command ? I think it is better :) --- Kazuki Ts

Re: [PATCH] tree-walk: convert fill_tree_descriptor() to object_id

2017-08-12 Thread Johannes Sixt
Am 12.08.2017 um 09:14 schrieb René Scharfe: - Initialize a `tree_desc` and decode its first entry given the sha1 of - a tree. Returns the `buffer` member if the sha1 is a valid tree - identifier and NULL otherwise. + Initialize a `tree_desc` and decode its first entry giv

[PATCH] tree-walk: convert fill_tree_descriptor() to object_id

2017-08-12 Thread René Scharfe
All callers of fill_tree_descriptor() have been converted to object_id already, so convert that function as well. As a nice side-effect we get rid of NULL checks in tree-diff.c, as fill_tree_descriptor() already does them for us. Signed-off-by: Rene Scharfe --- Documentation/technical/api-tree-