Re: [PATCH] userdiff: add build-in pattern for shell

2017-03-30 Thread Ivan Tham
On Wed, Mar 29, 2017 at 11:25:15PM -0700, Junio C Hamano wrote: Pickfire writes: > +- `sh` suitable for source code in POSIX-compatible shells. The new test you added seems to show that this is not limited to POSIX shells but also understands bashisms like ${x//x/x}. Perhaps drop "POSIX-comp

Re: [PATCH v5 4/6] dir_iterator: add tests for dir_iterator API

2017-03-30 Thread Michael Haggerty
On 03/30/2017 05:32 AM, Daniel Ferreira wrote: > Create t/helper/test-dir-iterator.c, which prints relevant information > about a directory tree iterated over with dir_iterator. > > Create t/t0065-dir-iterator.sh, which tests that dir_iterator does > iterate through a whole directory tree and that

Re: [PATCH v5 4/6] dir_iterator: add tests for dir_iterator API

2017-03-30 Thread Michael Haggerty
On 03/30/2017 05:32 AM, Daniel Ferreira wrote: > Create t/helper/test-dir-iterator.c, which prints relevant information > about a directory tree iterated over with dir_iterator. > > Create t/t0065-dir-iterator.sh, which tests that dir_iterator does > iterate through a whole directory tree and that

Re: [PATCH v5 4/6] dir_iterator: add tests for dir_iterator API

2017-03-30 Thread Michael Haggerty
On 03/30/2017 05:32 AM, Daniel Ferreira wrote: > Create t/helper/test-dir-iterator.c, which prints relevant information > about a directory tree iterated over with dir_iterator. > > Create t/t0065-dir-iterator.sh, which tests that dir_iterator does > iterate through a whole directory tree and that

Re: [PATCH v5 2/6] dir_iterator: refactor state machine model

2017-03-30 Thread Michael Haggerty
On 03/30/2017 05:32 AM, Daniel Ferreira wrote: > Remove the "initialized" member of dir_iterator_level. Replace its > functionality with a DIR_STATE_PUSH state in the > dir_iterator_level.dir_state enum. > > This serves to remove a redundant property in the dir_iterator_level > struct and ease com

Re: [PATCH] read-cache: avoid git_path() race in freshen_shared_index()

2017-03-30 Thread Christian Couder
On Wed, Mar 29, 2017 at 7:56 PM, Jeff King wrote: > On Wed, Mar 29, 2017 at 10:06:52AM -0700, Junio C Hamano wrote: > >> > This shows that we should be careful not to use git_path() in >> > freshen_shared_index(). It is using a shared buffer that can >> > too easily lead to races. >> >> The impres

Hi

2017-03-30 Thread Bong Phang
A favorable transaction Of £ 12.5 million,

Re: [PATCH] read-cache: avoid git_path() race in freshen_shared_index()

2017-03-30 Thread Duy Nguyen
On Thu, Mar 30, 2017 at 12:56 AM, Jeff King wrote: > But in the end it doesn't really matter. I think code like: > > const char *filename = git_path(...); > > or > > nontrivial_function(git_path(...)); > > is an anti-pattern. It _might_ be safe, but it's really hard to tell > without following

Re: [PATCH 3/3] completion: offer ctags symbol names for 'git log -S', '-G' and '-L:'

2017-03-30 Thread SZEDER Gábor
On Fri, Mar 24, 2017 at 1:52 AM, Jeff King wrote: > On Thu, Mar 23, 2017 at 04:38:39PM +0100, SZEDER Gábor wrote: > > > Just like in the case of search patterns for 'git grep', see 29eec71f2 > > (completion: match ctags symbol names in grep patterns, 2011-10-21)), > > a common thing to look for

[PATCH] difftool: avoid strcpy

2017-03-30 Thread Jeff King
In order to checkout files, difftool reads "diff --raw" output and feeds the names to checkout_entry(). That function requires us to have a "struct cache_entry". And because that struct uses a FLEX_ARRAY for the name field, we have to actually copy in our new name. The current code allocates a sin

Re: [PATCH v5 3/6] dir_iterator: iterate over dir after its contents

2017-03-30 Thread Michael Haggerty
On 03/30/2017 05:32 AM, Daniel Ferreira wrote: > Create an option for the dir_iterator API to iterate over subdirectories > only after having iterated through their contents. This feature was > predicted, although not implemented by 0fe5043 ("dir_iterator: new API > for iterating over a directory t

Re: [PATCH v5 6/6] remove_subtree(): test removing nested directories

2017-03-30 Thread Michael Haggerty
On 03/30/2017 05:32 AM, Daniel Ferreira wrote: > Test removing a nested directory when an attempt is made to restore the > index to a state where it does not exist. A similar test could be found > previously in t/t2000-checkout-cache-clash.sh, but it did not check for > nested directories, which co

Re: [PATCH v4 2/5] dir_iterator: iterate over dir after its contents

2017-03-30 Thread Duy Nguyen
On Thu, Mar 30, 2017 at 1:39 PM, Michael Haggerty wrote: > * DIR_ITERATOR_RECURSE -- recurse into subdirectories > > would make the set of possible options complete. If this option is not > set, then the iteration would be over the entries in a single directory > without traversing its subdirector

Re: [PATCH v5 0/6] [GSoC] remove_subtree(): reimplement using iterators

2017-03-30 Thread Michael Haggerty
On 03/30/2017 05:32 AM, Daniel Ferreira wrote: > This is the fifth version of a patch series that implements the GSoC > microproject of converting a recursive call to readdir() to use dir_iterator. > > v1: > https://public-inbox.org/git/CAGZ79kZwT-9mHTiOJ5CEjk2wDFkn6+NcogjX0=vjhsah16a...@mail.gma

[PATCH 1/2] path.c: and an option to call real_path() in expand_user_path()

2017-03-30 Thread Nguyễn Thái Ngọc Duy
In the next patch we need the ability to expand '~' to real_path($HOME). But we can't do that from outside because '~' is part of a pattern, not a true path. Add an option to expand_user_path() to do so. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/commit.c | 2 +- builtin/config.c | 2

[PATCH 2/2] config: resolve symlinks in conditional include's patterns

2017-03-30 Thread Nguyễn Thái Ngọc Duy
$GIT_DIR returned by get_git_dir() is normalized, with all symlinks resolved (see setup_work_tree function). In order to match paths (or patterns) against $GIT_DIR char-by-char, they have to be normalized too. There is a note in config.txt about this, that the user need to resolve symlinks by thems

Re: [PATCH v5 0/6] [GSoC] remove_subtree(): reimplement using iterators

2017-03-30 Thread Duy Nguyen
On Thu, Mar 30, 2017 at 6:27 PM, Michael Haggerty wrote: > I'm very encouraged by your quick and constructive > responses and especially that you are sticking with it even though the > project is getting much, much more involved than a typical GSoC > microproject. I'm impressed too. The new serie

Re: [PATCH] difftool: avoid strcpy

2017-03-30 Thread Johannes Schindelin
Hi Peff, On Thu, 30 Mar 2017, Jeff King wrote: > In order to checkout files, difftool reads "diff --raw" > output and feeds the names to checkout_entry(). That > function requires us to have a "struct cache_entry". And > because that struct uses a FLEX_ARRAY for the name field, we > have to actua

Re: [PATCH v2 0/3] name-rev sanity

2017-03-30 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 29.03.2017 19:43: > Junio C Hamano writes: > >> The first two applies cleanly to the same base as jc/name-rev that >> the first two of these patches are meant to replace, but the third >> one doesn't apply on top. Are you depending on something newer? > > Ah,

Re: [PATCH v2 1/2] pkt-line: add packet_writel() and packet_read_line_gently()

2017-03-30 Thread Torsten Bögershausen
[snip] Would packet_write_lines make more sense ? Just goes to prove that there are two hard things in computer science: cache invalidation, naming things, and off-by-one errors. :) The feedback on V1 was: "I am hesitant to take a function that does not take any "list" type argument and ye

Re: [RFC PATCH 0/5] Localise error headers

2017-03-30 Thread Michael J Gruber
Jeff King venit, vidit, dixit 21.01.2017 15:20: > On Wed, Jan 11, 2017 at 10:08:46AM -0800, Junio C Hamano wrote: > >> Jeff King writes: >> >>> Yes, I would think die_errno() is a no-brainer for translation, since >>> the strerror() will be translated. >>> apply.c:die(_("

RE: [PATCH v3 0/8] refactor the filter process code into a reusable module

2017-03-30 Thread Ben Peart
> From: Junio C Hamano [mailto:gits...@pobox.com] > > Ben Peart writes: > > > Ben Peart (8): > > pkt-line: add packet_writel() and packet_read_line_gently() > > convert: Update convert to use new packet_writel() function > > convert: Split start_multi_file_filter into two separate function

RE: [PATCH v3 7/8] sub-process: move sub-process functions into separate files

2017-03-30 Thread Ben Peart
> From: Junio C Hamano [mailto:gits...@pobox.com] > > > diff --git a/sub-process.c b/sub-process.c new file mode 100644 index > > 00..2c4d27c193 > > --- /dev/null > > +++ b/sub-process.c > > @@ -0,0 +1,116 @@ > > +/* > > + * Generic implementation of background process infrastructure. > >

[PATCH v4 2/8] convert: move packet_write_list() into pkt-line as packet_writel()

2017-03-30 Thread Ben Peart
Add packet_writel() which writes multiple lines in a single call and then calls packet_flush_gently(). Update convert.c to use the new packet_writel() function from pkt-line. Signed-off-by: Ben Peart --- convert.c | 23 ++- pkt-line.c | 19 +++ pkt-line.h |

[PATCH v4 0/8] refactor the filter process code into a reusable module

2017-03-30 Thread Ben Peart
Refactor the filter..process code into a separate sub-process module that can be used to reduce the cost of starting up a sub-process for multiple commands. It does this by keeping the external process running and processing all commands by communicating over standard input and standard output usi

[PATCH v4 6/8] convert: rename reusable sub-process functions

2017-03-30 Thread Ben Peart
Do a mechanical rename of the functions that will become the reusable sub-process module. Signed-off-by: Ben Peart --- convert.c | 47 --- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/convert.c b/convert.c index 747c0c363b..f68a7be62

[PATCH v4 4/8] convert: Separate generic structures and variables from the filter specific ones

2017-03-30 Thread Ben Peart
To enable future reuse of the filter..process infrastructure, split the cmd2process structure into two separate parts. subprocess_entry will now contain the generic data required to manage the creation and tracking of the child process in a hashmap. Also move all knowledge of the hashmap into the

[PATCH v4 2/8] convert: move packet_write_list() into pkt-line as packet_writel()

2017-03-30 Thread Ben Peart
Add packet_writel() which writes multiple lines in a single call and then calls packet_flush_gently(). Update convert.c to use the new packet_writel() function from pkt-line. Signed-off-by: Ben Peart --- convert.c | 23 ++- pkt-line.c | 19 +++ pkt-line.h |

[PATCH v4 1/8] pkt-line: add packet_read_line_gently()

2017-03-30 Thread Ben Peart
Add packet_read_line_gently() to enable reading a line without dying on EOF. Signed-off-by: Ben Peart --- pkt-line.c | 12 pkt-line.h | 10 ++ 2 files changed, 22 insertions(+) diff --git a/pkt-line.c b/pkt-line.c index d4b6bfe076..58842544b4 100644 --- a/pkt-line.c +++ b/p

[PATCH v4 5/8] convert: Update generic functions to only use generic data structures

2017-03-30 Thread Ben Peart
Update all functions that are going to be moved into a reusable module so that they only work with the reusable data structures. Move code that is specific to the filter out into the filter specific functions. Signed-off-by: Ben Peart --- convert.c | 46 -

[PATCH v4 3/8] convert: Split start_multi_file_filter into two separate functions

2017-03-30 Thread Ben Peart
To enable future reuse of the filter..process infrastructure, split start_multi_file_filter into two separate parts. start_multi_file_filter will now only contain the generic logic to manage the creation and tracking of the child process in a hashmap. start_multi_file_filter_fn is a protocol spec

[PATCH v4 7/8] sub-process: move sub-process functions into separate files

2017-03-30 Thread Ben Peart
Move the sub-proces functions into sub-process.h/c. Add documentation for the new module in Documentation/technical/api-sub-process.txt Signed-off-by: Ben Peart --- Documentation/technical/api-sub-process.txt | 54 + Makefile| 1 + convert.c

[PATCH v4 8/8] convert: Update subprocess_read_status to not die on EOF

2017-03-30 Thread Ben Peart
Enable sub-processes to gracefully handle when the process dies by updating subprocess_read_status to return an error on EOF instead of dying. Update apply_multi_file_filter to take advantage of the revised subprocess_read_status. Signed-off-by: Ben Peart --- convert.c | 10 -- sub-

Re: [PATCH] read-cache: avoid git_path() race in freshen_shared_index()

2017-03-30 Thread Junio C Hamano
Christian Couder writes: > On Wed, Mar 29, 2017 at 7:56 PM, Jeff King wrote: > ... >> Yeah, it looks like that is what happened. I see that Christian bisected >> the rebase to find the commit in the series that introduces the problem. >> I'm mildly curious which commit upstream created the probl

RE: [PATCH v2 1/2] pkt-line: add packet_writel() and packet_read_line_gently()

2017-03-30 Thread Ben Peart
> From: Torsten Bögershausen [mailto:tbo...@web.de] > > > Does this work ? > I would have expected > packet_writel(fd, "line one", "line two", "line n"), NULL; > No, that's actually not valid C syntax. > > > > which requires the use of variable number of arguments. With your > proposal that c

Re: [PATCH 2/7] Makefile: optionally compile with both SHA1DC and SHA1_OPENSSL

2017-03-30 Thread Junio C Hamano
Johannes Schindelin writes: > +#ifdef SHA1_DC_AND_OPENSSL > +void (*SHA1_Init_func)(SHA_CTX_union *ctx) = (void *)SHA1DCInit; > +void (*SHA1_Update_func)(SHA_CTX_union *ctx, const void *pointer, size_t > size) = > + (void *)git_SHA1DCUpdate; > +int (*SHA1_Final_func)(unsigned char sha1[20],

Re: [PATCH 2/7] Makefile: optionally compile with both SHA1DC and SHA1_OPENSSL

2017-03-30 Thread Junio C Hamano
Junio C Hamano writes: > ... > The use of union is a good ingredient for a solution. I would have > chosen to do this slightly differently if I were doing it. > > typedef struct { > int safe; > union { > SHA1_CTX_SAFE safe; >

Re: [PATCH v2 1/2] pkt-line: add packet_writel() and packet_read_line_gently()

2017-03-30 Thread Torsten Bögershausen
On 30.03.17 18:01, Ben Peart wrote: >> From: Torsten Bögershausen [mailto:tbo...@web.de] >> >> >> Does this work ? >> I would have expected >> packet_writel(fd, "line one", "line two", "line n"), NULL; Typo. Should have been: packet_writel(fd, "line one", "line two", "line n", NULL); >> > > No, t

ttk error when starting git gui

2017-03-30 Thread David Shrader
Hello, I get the following error when trying to start git gui: Error in startup script: wrong # args: should be "ttk::style theme use theme" while executing "ttk::style theme use" (procedure "ttext" line 4) invoked from within "ttext $ui_workdir -background white -foreground black

Re: [PATCH 0/18] snprintf cleanups

2017-03-30 Thread Junio C Hamano
Jeff King writes: > On Wed, Mar 29, 2017 at 09:05:33AM -0700, Junio C Hamano wrote: > >> > I think there are two things going on in your example. >> > >> > One is that obviously patch_id_addf() removes the spaces from the >> > result. But we could do that now by keeping the big strbuf_addf(), and

Re: [PATCH v4 2/5] dir_iterator: iterate over dir after its contents

2017-03-30 Thread Junio C Hamano
Michael Haggerty writes: > I don't think any of this needs to be implemented now, but maybe keep it > in mind if/when `dir_iterator` gets more users. OK. One thing that was missing in your list was the opposite of "do not show directories", i.e. "show only directories". That should also be eas

Re: [PATCH v2 0/3] name-rev sanity

2017-03-30 Thread Junio C Hamano
Michael J Gruber writes: > Junio C Hamano venit, vidit, dixit 29.03.2017 19:43: > ... >> Ah, of course, you are depending on your other topic ;-) >> I'll wiggle these in. >> >> Thanks. > > Yes, sorry, isn't that in next already? I should have meantioned it anyways. No worries. jc/name-rev was

Re: [PATCH v8 04/11] update-index: add untracked cache notifications

2017-03-30 Thread Junio C Hamano
Jeff King writes: > On Wed, Jan 27, 2016 at 07:58:00AM +0100, Christian Couder wrote: > >> diff --git a/builtin/update-index.c b/builtin/update-index.c >> index 6dd..369c207 100644 >> --- a/builtin/update-index.c >> +++ b/builtin/update-index.c >> @@ -130,7 +130,7 @@ static int test_if_untrac

Re: [PATCH v8 04/11] update-index: add untracked cache notifications

2017-03-30 Thread Stefan Beller
On Thu, Mar 30, 2017 at 10:33 AM, Junio C Hamano wrote: >> >> Coverity points out that this is a leak (xgetcwd returns an allocated >> buffer). > > I saw that quite recently and was wondering why it reported it this > late. It has been in 'master' for more than a month. Because the repo/script f

Re: [PATCH] strbuf: support long paths w/o read rights in strbuf_getcwd() on FreeBSD

2017-03-30 Thread René Scharfe
Am 29.03.2017 um 06:54 schrieb Christian Couder: On Tue, Mar 28, 2017 at 11:49 PM, Jeff King wrote: On Tue, Mar 28, 2017 at 11:15:12PM +0200, Christian Couder wrote: On Sun, Mar 26, 2017 at 3:43 PM, René Scharfe wrote: FreeBSD implements getcwd(3) as a syscall, but falls back to a version b

Re: [RFC PATCH] change default for status.submoduleSummary to true

2017-03-30 Thread Stefan Beller
On Wed, Mar 29, 2017 at 11:04 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> A user complained about the workflow with submodules: >>> Re submodules pain, I've seen a lot of people get confused about >>> how and when to commit submodule changes. The main thing missing >>> in the related U

Re: [PATCH v2] log: if --decorate is not given, default to --decorate=auto

2017-03-30 Thread Junio C Hamano
With the "--decorate=auto" option becoming the default for "git log", "git tbdiff" will be broken. The configuration variable has been already there, so in that sense this is not a new breakage (tbdiff wouldn't have worked well for those with configured default). A fix is trivial (attached). I s

[PATCH v2] userdiff: add build-in pattern for shell

2017-03-30 Thread Ivan Tham
Shell are widely used but comes with lots of different patterns. The build-in pattern aim for POSIX-like shells with some additions: - Notably ${g//re/s} and ${g#cut} - Bashisms such as "function" Signed-off-by: Ivan Tham --- Documentation/gitattributes.txt | 2 ++ t/t4034-diff-words.sh

Re: [PATCH 7/7] submodule.c: correctly handle nested submodules in is_submodule_modified

2017-03-30 Thread Junio C Hamano
Jonathan Nieder writes: > Junio C Hamano wrote: > >> Shouldn't this done as part of 4/7 where is_submodule_modified() >> starts reading from the porcelain v2 output? 4/7 does adjust for >> the change from double question mark (porcelain v1) to a single one >> for untracked, but at the same time

Re: [PATCH 0/18] snprintf cleanups

2017-03-30 Thread Jeff King
On Thu, Mar 30, 2017 at 10:24:36AM -0700, Junio C Hamano wrote: > > I'm OK either with the series I posted, or wrapping up the alternative > > in a commit message. > > I do find the updated one easier to follow (if anything it is more > compact); I do not think it is worth a reroll, but it is eas

Re: [PATCH v5 4/6] dir_iterator: add tests for dir_iterator API

2017-03-30 Thread Daniel Ferreira (theiostream)
On Thu, Mar 30, 2017 at 4:46 AM, Michael Haggerty wrote: > Is there a special reason to write the date to the file as opposed to, say > > touch dir/b > > ? (Some people use `: >dir/b` for this purpose, though I've never found > out why.) If you write the date to the file, the reader will be >

Re: [PATCH v5 4/6] dir_iterator: add tests for dir_iterator API

2017-03-30 Thread Daniel Ferreira (theiostream)
On Thu, Mar 30, 2017 at 5:05 AM, Michael Haggerty wrote: > Oh I forgot to mention, in the Git project we don't allow declarations > to be mixed with code. Apparently there's some ancient compiler > somewhere that doesn't allow it. Declarations always have to be > together, at the top of a block. (

Re: [PATCH 2/2] submodule.c: correctly handle nested submodules in is_submodule_modified

2017-03-30 Thread Junio C Hamano
Jonathan Nieder writes: > Stefan Beller wrote: > >> This bug fix also affects the default output (non-short, non-porcelain) >> of git-status, which is not tested here. > > Do you have an example? (In just the commit message would be fine, in > tests would be even better.) > >> Signed-off-by: Ste

Re: [PATCH 2/2] config: resolve symlinks in conditional include's patterns

2017-03-30 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > $GIT_DIR returned by get_git_dir() is normalized, with all symlinks > resolved (see setup_work_tree function). In order to match paths (or > patterns) against $GIT_DIR char-by-char, they have to be normalized > too. There is a note in config.txt about this, that th

Re: [PATCH 3/3] WIP - Allow custom printf function for column printing

2017-03-30 Thread Stefan Beller
On Wed, Mar 29, 2017 at 8:22 PM, Jeff King wrote: > On Wed, Mar 29, 2017 at 06:42:38PM -0700, Stefan Beller wrote: > >> Ever wondered why column.ui applies the untracked files in git-status, >> but not for the help text comment in git-commit? Nobody wrote the code! >> >> This is marked as WIP, as

I need your urgent help...

2017-03-30 Thread Sgt. Britta Lopez
Hello, I have a personal Project in which i need your assistance I would like to be sure of your willingness and commitment to execute this transaction with me. I seek your partnership in receiving this fund worth (Twenty five million United States Dollars). If interested, reply immediately for det

Re: [RFC] should these two topics graduate to 'master' soon?

2017-03-30 Thread Junio C Hamano
Jeff King writes: > On Tue, Mar 28, 2017 at 11:51:49AM -0700, Jonathan Nieder wrote: > >> > * jc/merge-drop-old-syntax (2015-04-29) 1 commit >> > >> > This topic stops "git merge HEAD " syntax that >> > has been deprecated since October 2007 (and we have issued a >> > warning message since

[BUG?] iconv used as textconv, and spurious ^M on added lines on Windows

2017-03-30 Thread Jakub Narębski
Hello, Recently I had to work on a project which uses legacy 8-bit encoding (namely cp1250 encoding) instead of utf-8 for text files (LaTeX documents). My terminal, that is Git Bash from Git for Windows is set up for utf-8. I wanted for "git diff" and friends to return something sane on said utf

Re: [PATCH v3 0/2] read-cache: call verify_hdr() in a background thread

2017-03-30 Thread Junio C Hamano
Jeff King writes: > So just mentioning the test case and the improvement in the commit > message is sufficient, IMHO. So here is how I butchered [v3 1/2] to tentatively queue it on 'pu'. Notable suggested changes I have in this one are: * I stole the numbers from the cover letter of v2 and ad

Re: [ANNOUNCE] Git for Windows 2.12.2

2017-03-30 Thread Mike Rappazzo
Forwarding to the lists, as my original message was rejected for html. On Thu, Mar 30, 2017 at 3:44 PM, Andrew Witte wrote: > Just updated back to git 2.12.2 and git-lfs 2.0.2 and everything worked > fine. Wish I could have gotten more info when it happened as its happened on > a different comput

[PATCH] Docs: Add some missing options to git-diff.txt

2017-03-30 Thread Andreas Heiduk
git-diff understands "--ours", "--theirs" and "--base" for files with conflicts. But so far they were not documented for the central diff command but only for diff-files. Signed-off-by: Andreas Heiduk --- Documentation/git-diff.txt | 8 1 file changed, 8 insertions(+) diff --git a/Docu

Re: [PATCH v3 0/2] read-cache: call verify_hdr() in a background thread

2017-03-30 Thread Jeff King
On Thu, Mar 30, 2017 at 12:49:15PM -0700, Junio C Hamano wrote: > Notable suggested changes I have in this one are: > > * I stole the numbers from the cover letter of v2 and added them at >the end of the log message. Yeah, good. > * As the checksum is not a useless relic, but is an integr

Re: [BUG?] iconv used as textconv, and spurious ^M on added lines on Windows

2017-03-30 Thread Jeff King
On Thu, Mar 30, 2017 at 09:35:27PM +0200, Jakub Narębski wrote: > And everything would be all right... if not the fact that Git appends > spurious ^M to added lines in the `git diff` output. Files use CRLF > end-of-line convention (the native MS Windows one). > > $ git diff test.tex > diff -

Re: git-compat-util.h:735:13: error: conflicting types for 'inet_ntop'

2017-03-30 Thread Jeffrey Walton
On Wed, Mar 29, 2017 at 1:11 PM, Junio C Hamano wrote: > Jeffrey Walton writes: > >> Some more 2.12.2 testing on Solaris 11.3 x86_64: >> >> $ make V=1 >> gcc -o credential-store.o -c -MF ./.depend/credential-store.o.d -MQ >> credential-store.o -MMD -MP -I/usr/local/include -m64 -m64 -I. >> -D__EX

Re: [PATCH v3 0/2] read-cache: call verify_hdr() in a background thread

2017-03-30 Thread Thomas Gummerer
On 03/28, Jeff King wrote: > On Tue, Mar 28, 2017 at 03:50:34PM -0400, Jeff Hostetler wrote: > > > It was a convenient way to isolate, average, and compare > > read_index() times, but I suppose we could do something > > like that. > > > > I did confirm that a ls-files does show a slight 0.008 > >

Re: [PATCH v4 0/8] refactor the filter process code into a reusable module

2017-03-30 Thread Junio C Hamano
Now 1 & 2 are as equally pleasant to read as others ;-). Let's wait for a few days and then merge to 'next'. I didn't see anything questionable. Thanks.

Re: ttk error when starting git gui

2017-03-30 Thread Peter van der Does
On 3/30/17 1:01 PM, David Shrader wrote: > Hello, > > I get the following error when trying to start git gui: > > Error in startup script: wrong # args: should be "ttk::style theme use > theme" > while executing > "ttk::style theme use" > (procedure "ttext" line 4) > invoked from with

Re: [PATCH] Docs: Add some missing options to git-diff.txt

2017-03-30 Thread Junio C Hamano
Andreas Heiduk writes: > git-diff understands "--ours", "--theirs" and "--base" for files with > conflicts. But so far they were not documented for the central diff > command but only for diff-files. This is probably a shared issue with the original text for "diff-files", but I think we must str

Re: git-compat-util.h:735:13: error: conflicting types for 'inet_ntop'

2017-03-30 Thread Jeffrey Walton
On Thu, Mar 30, 2017 at 4:06 PM, Jeffrey Walton wrote: > On Wed, Mar 29, 2017 at 1:11 PM, Junio C Hamano wrote: >> Jeffrey Walton writes: >> >>> Some more 2.12.2 testing on Solaris 11.3 x86_64: >>> >>> $ make V=1 >>> gcc -o credential-store.o -c -MF ./.depend/credential-store.o.d -MQ >>> credent

[PATCH] http.postbuffer: make a size_t

2017-03-30 Thread David Turner
Unfortunately, in order to push some large repos, the http postbuffer must sometimes exceed two gigabytes. On a 64-bit system, this is OK: we just malloc a larger buffer. Signed-off-by: David Turner --- cache.h | 1 + config.c | 17 + http.c | 2 +- 3 files changed, 19 inse

Re: git-compat-util.h:735:13: error: conflicting types for 'inet_ntop'

2017-03-30 Thread Junio C Hamano
Jeffrey Walton writes: > On Wed, Mar 29, 2017 at 1:11 PM, Junio C Hamano wrote: >> Jeffrey Walton writes: >> >>> Some more 2.12.2 testing on Solaris 11.3 x86_64: >>> >>> $ make V=1 >>> gcc -o credential-store.o -c -MF ./.depend/credential-store.o.d -MQ >>> credential-store.o -MMD -MP -I/usr/loc

Re: [PATCH v3 0/2] read-cache: call verify_hdr() in a background thread

2017-03-30 Thread Jeff King
On Thu, Mar 30, 2017 at 09:06:48PM +0100, Thomas Gummerer wrote: > > Yeah, I think that would be fine. You _could_ write a t/perf test and > > then use your 400MB monstrosity as GIT_PERF_LARGE_REPO. But given that > > most people don't have such a thing, there's not much value over you > > just sh

Re: [PATCH] http.postbuffer: make a size_t

2017-03-30 Thread Shawn Pearce
On Thu, Mar 30, 2017 at 1:29 PM, David Turner wrote: > Unfortunately, in order to push some large repos, the http postbuffer > must sometimes exceed two gigabytes. On a 64-bit system, this is OK: > we just malloc a larger buffer. I'm slightly curious what server you are pushing to that needs the

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: [PATCH v3 0/2] read-cache: call verify_hdr() in a background thread

2017-03-30 Thread Junio C Hamano
Jeff King writes: > Still, I'm not sure the extra layer of cache is all that valuable. It > should be a single hash lookup in the config cache (in an operation that > otherwise reads the entire index). OK, let's drop that part, then.

Re: git-compat-util.h:735:13: error: conflicting types for 'inet_ntop'

2017-03-30 Thread Jeffrey Walton
On Thu, Mar 30, 2017 at 4:30 PM, Junio C Hamano wrote: > Jeffrey Walton writes: > >> On Wed, Mar 29, 2017 at 1:11 PM, Junio C Hamano wrote: >>> Jeffrey Walton writes: >>> Some more 2.12.2 testing on Solaris 11.3 x86_64: $ make V=1 gcc -o credential-store.o -c -MF ./.depend/c

RE: [PATCH] http.postbuffer: make a size_t

2017-03-30 Thread David Turner
GitLab. I can't speak to our particular configuration of it -- but if you have a specific question about what the config is, I can ask our gitlab admins. > -Original Message- > From: Shawn Pearce [mailto:spea...@spearce.org] > Sent: Thursday, March 30, 2017 4:42 PM > To: David Turner >

Git and PCRE2 vs PCRE?

2017-03-30 Thread Jeffrey Walton
Some more 2.12.2 testing on Solaris 11.3 x86_64: ... CC ident.o CC kwset.o CC line-log.o CC levenshtein.o CC line-range.o CC list-objects.o In file included from revision.h:5:0, from line-log.c:10: grep.h:5:18: fatal error: pcre.h: No such file or direc

[PATCH v2] read-cache: avoid using git_path() in freshen_shared_index()

2017-03-30 Thread Christian Couder
When performing an interactive rebase in split-index mode, the commit message that one should rework when squashing commits can contain some garbage instead of the usual concatenation of both of the commit messages. Bisecting shows that c3a0082502 (read-cache: use freshen_shared_index() in read_in

Re: Git and PCRE2 vs PCRE?

2017-03-30 Thread Jeff King
On Thu, Mar 30, 2017 at 04:59:27PM -0400, Jeffrey Walton wrote: > Configure has an option for libpcre, but its not clear to me how to > fine tune it for libpcre2: > > $ ./configure --help | /usr/gnu/bin/grep -A 2 -i pcre > --with-libpcre support Perl-compatible regexes (default is NO)

Re: Git and PCRE2 vs PCRE?

2017-03-30 Thread Junio C Hamano
Jeffrey Walton writes: > Is it possible to use PCRE2 with Git? If so, how do I tell Git to use PCRE2? Given that pcre2's symbols are all prefixed with pcre2_ (I only checked http://www.pcre.org/current/doc/html/pcre2api.html) and we do not see any hits from "git grep pcre2", I do not think you c

[RFC/PATCH] Make “git tag --contains ” less chatty if is invalid (gsoc)

2017-03-30 Thread Varun Garg
Hi Git devs, I am a student interested for Gsoc. With my patch I am able to produce following output.     $ git tag --contains qq     error: malformed object name qq     $ git tag --contains HEAD qq     fatal: --contains option is only allowed with -l.     $ git tag --contains 5c5c16af33f3cba2

Re: [PATCH v2] log: if --decorate is not given, default to --decorate=auto

2017-03-30 Thread Jeff King
On Thu, Mar 30, 2017 at 11:03:51AM -0700, Junio C Hamano wrote: > With the "--decorate=auto" option becoming the default for "git > log", "git tbdiff" will be broken. > > The configuration variable has been already there, so in that sense > this is not a new breakage (tbdiff wouldn't have worked

Re: ttk error when starting git gui

2017-03-30 Thread David Shrader
On 03/30/2017 01:54 PM, Peter van der Does wrote: On 3/30/17 1:01 PM, David Shrader wrote: Hello, I get the following error when trying to start git gui: Error in startup script: wrong # args: should be "ttk::style theme use theme" while executing "ttk::style theme use" (procedure

Re: [PATCH v2] log: if --decorate is not given, default to --decorate=auto

2017-03-30 Thread Junio C Hamano
Jeff King writes: > On Thu, Mar 30, 2017 at 11:03:51AM -0700, Junio C Hamano wrote: > >> With the "--decorate=auto" option becoming the default for "git >> log", "git tbdiff" will be broken. >> ... > I'm confused. I thought "auto" would kick in only when we are outputting > to a terminal. Or is t

Re: Git and PCRE2 vs PCRE?

2017-03-30 Thread Jeffrey Walton
On Thu, Mar 30, 2017 at 5:23 PM, Junio C Hamano wrote: > Jeffrey Walton writes: > >> Is it possible to use PCRE2 with Git? If so, how do I tell Git to use PCRE2? > > Given that pcre2's symbols are all prefixed with pcre2_ (I only > checked http://www.pcre.org/current/doc/html/pcre2api.html) and w

Re: [PATCH] http.postbuffer: make a size_t

2017-03-30 Thread Junio C Hamano
David Turner writes: > Unfortunately, in order to push some large repos, the http postbuffer > must sometimes exceed two gigabytes. On a 64-bit system, this is OK: > we just malloc a larger buffer. > > Signed-off-by: David Turner > --- > cache.h | 1 + > config.c | 17 + > ht

[PATCH v2] http.postbuffer: allow full range of ssize_t values

2017-03-30 Thread David Turner
Unfortunately, in order to push some large repos, the http postbuffer must sometimes exceed two gigabytes. On a 64-bit system, this is OK: we just malloc a larger buffer. Signed-off-by: David Turner --- cache.h | 1 + config.c | 17 + http.c | 4 ++-- http.h | 2 +- 4 fi

/bin/bash: /usr/ucb/install: No such file or directory

2017-03-30 Thread Jeffrey Walton
I think this is the last of the issues for Git 2.12.2 on Solaris 11.3. It looks like 'install' is located in a few places, but not in '/usr/ucb'. I believe /usr/ucb is Solaris 9 or Solaris 10. I think the equivalent place to look on Solaris 11 is /usr/gnu (but I only have limited experience on Sol

Issue with 2.11.0 and GIT_EXEC_PATH with multiple entries

2017-03-30 Thread Nate Mueller
I ran into this after upgrading to 2.11.0 through Xcode. I assumed it was a packaging issue but it looks like it's been in the mainline since 1073094f30 (on October 29). In 2.11.0, git-sh-setup switched it's call of git-sh-i18n from: . git-sh-i18n to: . "$(git --exec-path)/git-sh-i18n" This f

RE:

2017-03-30 Thread Mikhail Fridman
I have a Charitable Donation proposal for you. Reply to this email for more information Check the link below for confirmation: http://www.ibtimes.co.uk/russias-second-wealthiest-man-mikhail-fridman-plans-leaving-14-2bn-fortune-charity-1561604 Best Regards Mikhail Fridman.

Re: /bin/bash: /usr/ucb/install: No such file or directory

2017-03-30 Thread Junio C Hamano
Jeffrey Walton writes: > I think this is the last of the issues for Git 2.12.2 on Solaris 11.3. > > It looks like 'install' is located in a few places, but not in > '/usr/ucb'. I believe /usr/ucb is Solaris 9 or Solaris 10. I think the > equivalent place to look on Solaris 11 is /usr/gnu (but I o

Re: Issue with 2.11.0 and GIT_EXEC_PATH with multiple entries

2017-03-30 Thread Junio C Hamano
Nate Mueller writes: > This fails for me because my GIT_EXEC_PATH is set to > "/Library/Developer/CommandLineTools/usr/libexec/git-core:/Users/nate/.git-exec". That environment variable is designed to hold a single path, not like $PATH that lists multiple places in a colon separated list.

Re: Issue with 2.11.0 and GIT_EXEC_PATH with multiple entries

2017-03-30 Thread Nate Mueller
Really? My config has been set this way for years and it's never caused problems before. I have subcommands in both of those directories and all work. On Thu, Mar 30, 2017 at 3:57 PM, Junio C Hamano wrote: > Nate Mueller writes: > >> This fails for me because my GIT_EXEC_PATH is set to >> "/Li

RE:

2017-03-30 Thread Mikhail Fridman
I have a Charitable Donation proposal for you. Reply to this email for more information Check the link below for confirmation: http://www.ibtimes.co.uk/russias-second-wealthiest-man-mikhail-fridman-plans-leaving-14-2bn-fortune-charity-1561604 Best Regards Mikhail Fridman.

Re: Issue with 2.11.0 and GIT_EXEC_PATH with multiple entries

2017-03-30 Thread Jeff King
On Thu, Mar 30, 2017 at 04:00:41PM -0700, Nate Mueller wrote: > Really? My config has been set this way for years and it's never > caused problems before. I have subcommands in both of those > directories and all work. Really. It did happen to work most of the time before (because most uses inv

Re: Issue with 2.11.0 and GIT_EXEC_PATH with multiple entries

2017-03-30 Thread Nate Mueller
Got it. Thanks! On Thu, Mar 30, 2017 at 4:32 PM, Jeff King wrote: > On Thu, Mar 30, 2017 at 04:00:41PM -0700, Nate Mueller wrote: > >> Really? My config has been set this way for years and it's never >> caused problems before. I have subcommands in both of those >> directories and all work. >

[PATCH v3 09/20] test-sha1-array: convert most code to struct object_id

2017-03-30 Thread brian m. carlson
This helper is very small, so convert the entire thing. Signed-off-by: brian m. carlson --- t/helper/test-sha1-array.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/t/helper/test-sha1-array.c b/t/helper/test-sha1-array.c index f7a53c4ad6..b4bb97fccc 100644 --- a/

[PATCH v3 04/20] builtin/diff: convert to struct object_id

2017-03-30 Thread brian m. carlson
Signed-off-by: brian m. carlson --- builtin/diff.c | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/builtin/diff.c b/builtin/diff.c index 3d64b85337..398eee00d5 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -21,7 +21,7 @@ #define DIFF

[PATCH v3 13/20] builtin/pull: convert to struct object_id

2017-03-30 Thread brian m. carlson
Convert virtually all uses of unsigned char [20] to struct object_id. Leave all the arguments that come from struct sha1_array, as these will be converted in a later patch. Signed-off-by: brian m. carlson --- builtin/pull.c | 72 +- 1 file

  1   2   >