Re: [PATCH v2 1/2] sendemail: teach git-send-email to list aliases

2015-11-16 Thread Eric Sunshine
On Mon, Nov 16, 2015 at 6:50 PM, Eric Sunshine wrote: > Also, shouldn't --list-aliases (or --dump-aliases) be mutually > exclusive with many of the other options? New tests would check such > exclusivity as well. In fact, while I agree with Szeder that it makes sense to re-us

Re: [PATCH v2] blame: avoid checking if a file exists on the working tree if a revision is provided

2015-11-16 Thread Eric Sunshine
On Mon, Nov 16, 2015 at 8:29 PM, Edmundo Carmona Antoranz wrote: > blame: avoid checking if a file exists on the working tree > if a revision is provided This subject is a bit long; try to keep it to about 72 characters or less. More importantly, though, it doesn't give us a high level overview

Re: [PATCH v2 1/2] sendemail: teach git-send-email to list aliases

2015-11-16 Thread Eric Sunshine
On Tue, Nov 17, 2015 at 12:10:35AM +, Keller, Jacob E wrote: > On Mon, 2015-11-16 at 18:50 -0500, Eric Sunshine wrote: > > It should be possible to extract the alias within the shell itself > > without a separate process. For instance: > > > > read alias rest &g

Re: [PATCH v3 1/2] sendemail: teach git-send-email to dump alias names

2015-11-17 Thread Eric Sunshine
On Mon, Nov 16, 2015 at 7:29 PM, Jacob Keller wrote: > Add an option "dump-aliases" which changes the default behavior of It would be easier to understand that this is a new command-line option (as opposed to a configuration or other option) if you spelled it --dump-aliases (with the leading dash

Re: [PATCH v3 2/2] completion: add support for completing email aliases

2015-11-17 Thread Eric Sunshine
On Mon, Nov 16, 2015 at 7:29 PM, Jacob Keller wrote: > Using the new --dump-alias-names option from git-send-email, add completion s/dump-alias-names/dump-aliases/ > for --to, --cc, and --bcc with the available configured aliases. "--from" is missing from this list. > Signed-off-by: Jacob Kell

Re: [PATCH v5 3/6] git-p4: retry kill/cleanup operations in tests with timeout

2015-11-17 Thread Eric Sunshine
On Tue, Nov 17, 2015 at 3:28 AM, Lars Schneider wrote: > On 16 Nov 2015, at 22:14, Eric Sunshine wrote: >> On Sun, Nov 15, 2015 at 8:08 AM, wrote: >>> From: Lars Schneider >>> >>> In rare cases kill/cleanup operations in tests fail. Retry these >>&g

Re: [PATCH v5 3/6] git-p4: retry kill/cleanup operations in tests with timeout

2015-11-17 Thread Eric Sunshine
On Tue, Nov 17, 2015 at 4:34 AM, Luke Diamand wrote: >>> While implementing it I thought more about it. P4D is only >>> supported on platforms that support the date function. That means >>> these tests will only run on platforms that support the date >>> function. Consequently I wondered if this w

Re: [PATCH v2] blame: avoid checking if a file exists on the working tree if a revision is provided

2015-11-17 Thread Eric Sunshine
On Tue, Nov 17, 2015 at 5:48 PM, Jeff King wrote: > On Tue, Nov 17, 2015 at 12:11:25AM -0500, Eric Sunshine wrote: >> > blame content even if the path provided does match an existing >> > blob on said revision. >> >> git-blame documentation does not advertise &

Re: [PATCH 1/2] t1450: add tests for NUL in headers of commits and tags

2015-11-19 Thread Eric Sunshine
On Thu, Nov 19, 2015 at 11:20 AM, René Scharfe wrote: > Signed-off-by: Rene Scharfe > --- > diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh > @@ -176,6 +176,18 @@ test_expect_success 'integer overflow in timestamps is > reported' ' > +test_expect_success 'commit with NUL in header' ' > + gi

Re: [PATCH 0/7] Modernize t9300-fast-import

2015-11-19 Thread Eric Sunshine
On Thu, Nov 19, 2015 at 2:09 PM, Johannes Sixt wrote: > Some time ago, I had to dig into t9300-fast-import and found it quite > unhelpful that it does not follow our modern best-practices. This series > brings it up-to-date. I thought I submit it now while it is quiet in > the area. > > The larger

Re: [PATCH v2] blame: avoid checking if a file exists on the working tree if a revision is provided

2015-11-19 Thread Eric Sunshine
On Tue, Nov 17, 2015 at 6:22 PM, Jeff King wrote: > On Tue, Nov 17, 2015 at 06:01:25PM -0500, Eric Sunshine wrote: >> On Tue, Nov 17, 2015 at 5:48 PM, Jeff King wrote: >> > Hmm. Out of curiosity I tried: >> > >> > git blame v2.4.0 -- t/t6031-merge-recursive

Re: [PATCH v3] ls-files: Add eol diagnostics

2015-11-23 Thread Eric Sunshine
On Sat, Nov 21, 2015 at 2:36 AM, Torsten Bögershausen wrote: > When working in a cross-platform environment, a user wants to > check if text files are stored normalized in the repository and if > .gitattributes are set appropriately. > > Make it possible to let Git show the line endings in the ind

Re: [PATCH v3] ls-files: Add eol diagnostics

2015-11-23 Thread Eric Sunshine
On Mon, Nov 23, 2015 at 2:45 PM, Sebastian Schuberth wrote: > On Mon, Nov 23, 2015 at 6:05 PM, Torsten Bögershausen wrote: >> git ls-files -o --eol >> i/ w/binaryattr/ zlib.o > > I see, somewhat convincing I have to agree. > > On another note, how about making the pr

Re: [PATCH/RFC 01/10] ref-filter: introduce a parsing function for each atom in valid_atom

2015-11-23 Thread Eric Sunshine
On Wed, Nov 11, 2015 at 2:44 PM, Karthik Nayak wrote: > Introduce a parsing function for each atom in valid_atom. Using this > we can define special parsing functions for each of the atoms. Since > we have a third field in valid_atom structure, we now fill out missing > cmp_type values. I don't g

Re: [PATCH 2/2] send-email: expand paths in sendemail.{to,cc}cmd config

2015-11-23 Thread Eric Sunshine
On Tue, Nov 17, 2015 at 5:01 PM, John Keeping wrote: > These configuration variables specify the paths to commands so we should > support tilde-expansion for files inside a user's home directory. Hmm, I don't see anything in the documentation which says that these are paths to commands, and the c

Re: git rm --recursive

2015-11-23 Thread Eric Sunshine
On Wed, Nov 18, 2015 at 10:06 AM, Hans Ginzel wrote: > I have added the --recursive alias for the -r option to the rm command. When sending a patch, separate the patch itself from the above commentary with a scissor line (--- 8< ---) so that git-am can extract the patch automatically. Alternately

Re: [PATCH v2] Documentation/git-update-index: add missing opts to synopsys

2015-11-24 Thread Eric Sunshine
On Wed, Nov 25, 2015 at 1:53 AM, Christian Couder wrote: > Documentation/git-update-index: add missing opts to synopsys s/synopsys/synopsis/ > Untracked cache and split index related options should appear > in the 'SYNOPSIS' section. > > These options are already documented in the 'OPTIONS' sect

Re: [PATCH/RFC 01/10] ref-filter: introduce a parsing function for each atom in valid_atom

2015-11-25 Thread Eric Sunshine
On Wed, Nov 25, 2015 at 7:10 AM, Karthik Nayak wrote: > On Tue, Nov 24, 2015 at 5:14 AM, Eric Sunshine > wrote: >> On Wed, Nov 11, 2015 at 2:44 PM, Karthik Nayak wrote: >>> Introduce a parsing function for each atom in valid_atom. Using this >>> we can define spec

Re: [PATCH v5] ls-files: Add eol diagnostics

2015-11-29 Thread Eric Sunshine
On Sat, Nov 28, 2015 at 10:07 AM, Torsten Bögershausen wrote: > diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh > @@ -213,7 +238,20 @@ checkout_files () { > git -c core.eol=$eol checkout $src$f.txt > fi > done > - > + test_expect_succe

Re: [PATCH] clean: new option --exclude-from

2015-11-29 Thread Eric Sunshine
On Thu, Nov 26, 2015 at 9:44 AM, James wrote: > From: James Rouzier > > Specify a file to read for exclude patterns. > --- > diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt > @@ -8,7 +8,7 @@ git-clean - Remove untracked files from the working tree > SYNOPSIS > >

Re: Bug: git crashes on rebase reporting bogus memory corruption

2015-11-29 Thread Eric Sunshine
On Fri, Nov 27, 2015 at 9:08 AM, Daniele Varrazzo wrote: > I was trying to rewrite history in a small repos and replace > indentation tabs with spaces. Steps to reproduce: > > git clone https://github.com/dvarrazzo/suponoff.git > git checkout -b gitbug > git config core.whitespace > trailing-space

Re: [PATCH v6] Add git-grep threads param

2015-11-30 Thread Eric Sunshine
On Mon, Nov 16, 2015 at 8:11 AM, Victor Leschuk wrote: > "git grep" can now be configured (or told from the command line) > how many threads to use when searching in the working tree files. > > Changes to default behavior: number of threads now doesn't depend > on online_cpus(), e.g. if specifi

Re: [PATCH] clean: new option --exclude-from

2015-12-01 Thread Eric Sunshine
On Tue, Dec 1, 2015 at 4:36 PM, James Rouzier wrote: > Eric thank you for the feedback. [re-adding git@vger.kernel.org to recipient list since this response was likely intended to be public] > On Sun, Nov 29, 2015 at 9:24 PM, Eric Sunshine > wrote: >> On Thu, Nov 26, 2015 at

Re: [PATCH/RFC 02/10] ref-filter: introduce struct used_atom

2015-12-01 Thread Eric Sunshine
On Wed, Nov 11, 2015 at 2:44 PM, Karthik Nayak wrote: > Introduce the 'used_array' structure which would replace the existing I guess you meant s/used_array/used_atom/ or something? Also, s/which would/to/ > implementation of 'used_array' (which a list of atoms). This helps us s/which a/which

Re: [PATCH/RFC 04/10] ref-filter: skip deref specifier in match_atom_name()

2015-12-01 Thread Eric Sunshine
On Wed, Nov 11, 2015 at 2:44 PM, Karthik Nayak wrote: > Signed-off-by: Karthik Nayak A bit of explanation about why this change is desirable would be welcome. I'm guessing it's because a future patch is going to make calls to match_atom_name() with the '*' deref indicator still attached to the n

Re: [PATCH/RFC 05/10] ref-filter: introduce color_atom_parser()

2015-12-01 Thread Eric Sunshine
On Wed, Nov 11, 2015 at 2:44 PM, Karthik Nayak wrote: > Introduce color_atom_parser() which will parse a "color" atom and > store its color in the "use_atom" structure for further usage in s/use_atom/used_atom/ > 'populate_value()'. > > Signed-off-by: Karthik Nayak > --- > diff --git a/ref-filt

Re: [PATCH] Make error message after failing commit_lock_file() less confusing

2015-12-01 Thread Eric Sunshine
On Mon, Nov 30, 2015 at 6:40 AM, SZEDER Gábor wrote: > The error message after a failing commit_lock_file() call sometimes > looks like this, causing confusion: > > $ git remote add remote g...@server.com/repo.git > error: could not commit config file .git/config > # Huh?! > # I didn't wan

Re: [PATCH/RFC 06/10] strbuf: introduce strbuf_split_str_without_term()

2015-12-02 Thread Eric Sunshine
On Wed, Nov 11, 2015 at 2:44 PM, Karthik Nayak wrote: > The current implementation of 'strbuf_split_buf()' includes the > terminator at the end of each strbuf post splitting. Include an option s/Include an/Add an/ > wherein we can drop the terminator if required. In this context s/required/desi

Re: [PATCH/RFC 07/10] ref-filter: introduce align_atom_parser()

2015-12-02 Thread Eric Sunshine
On Wed, Nov 11, 2015 at 2:44 PM, Karthik Nayak wrote: > Introduce align_atom_parser() which will parse 'align' atoms and store > the required width and position into the 'used_atom' structure. While > we're here, add support for the usage of 'width=' and 'position=' when > using the 'align' atom (

Re: [PATCH 2/5] config.c: move worktree-specific variables to .git/worktrees/...

2015-12-05 Thread Eric Sunshine
On Wed, Dec 2, 2015 at 2:13 PM, Nguyễn Thái Ngọc Duy wrote: > .git/info/config.worktree is a pattern list that splits .git/config in > to sets: the worktree set matches the patterns, the commmon set does > not. > > In normal worktrees, both sets are stored in .git/config. The > config.worktree has

Re: [PATCH 5/5] git-worktree.txt: mention about the config file split

2015-12-06 Thread Eric Sunshine
On Wed, Dec 2, 2015 at 2:13 PM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt > @@ -147,6 +147,19 @@ to `/path/main/.git/worktrees/test-next` then a file > named > `test-next` entry from bei

Re: What's cooking in git.git (Dec 2015, #02; Fri, 4)

2015-12-06 Thread Eric Sunshine
On Sun, Dec 6, 2015 at 11:12 AM, Edmundo Carmona Antoranz wrote: > And, another thing, I had sent the fifth version of my patch about > progress for blame where I took care of all the comments hat Junio > stated before and I got no comments since. I hoped that patch would be > listed sometime but

Re: [PATCH 0/2] gitk spacing/sizing tuning for HiDPI

2015-12-06 Thread Eric Sunshine
On Sun, Dec 6, 2015 at 7:25 AM, Giuseppe Bilotta wrote: > On my HiDPI monitor, most elements in gitk are correctly rendered, with two > exceptions: > > * when using ttk, some elements do not use the same fonts as gitk would use > without, and since ttk picks _unscaled_ sizes this is very noticea

Re: git subtree bug produces divergent descendants

2015-12-06 Thread Eric Sunshine
On Mon, Dec 07, 2015 at 11:09:48AM +1300, David Ware wrote: > My group has run into a bug with "git-subtree split". Under some > circumstances a split created from a descendant of another earlier > split is not a descendant of that earlier split (thus blocking > pushes). [...] I'm not a git-subtre

Re: [PATCH v6] ls-files: Add eol diagnostics

2015-12-06 Thread Eric Sunshine
On Sun, Dec 6, 2015 at 3:38 PM, Torsten Bögershausen wrote: > When working in a cross-platform environment, a user wants to > check if text files are stored normalized in the repository and if > .gitattributes are set appropriately. > [...] > Signed-off-by: Torsten Bögershausen > --- > diff --git

Re: [PATCH v7] ls-files: Add eol diagnostics

2015-12-07 Thread Eric Sunshine
On Monday, December 7, 2015, Torsten Bögershausen wrote: > When working in a cross-platform environment, a user wants to > check if text files are stored normalized in the repository and if > .gitattributes are set appropriately.[...] A few style comments this time around... > Hel

Re: [PATCH v2 1/2] modernize t7300

2015-12-07 Thread Eric Sunshine
On Sun, Dec 6, 2015 at 9:58 AM, James wrote: > From: James Rouzier This would be a good place to explain how you are modernizing the test script. Right now, you're just updating to take advantage of test_path_is_foo(), but some other modernizations you could do include: * using '>' rather than

Re: [PATCH v2 1/2] modernize t7300

2015-12-07 Thread Eric Sunshine
On Mon, Dec 7, 2015 at 4:40 PM, Junio C Hamano wrote: > James writes: >> @@ -46,15 +46,15 @@ test_expect_success 'git clean' ' >> mkdir -p build docs && >> touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && >> git clean && >> - test -f Makefile && >> - test -f

Re: [PATCH v2 2/2] clean: new option --exclude-from

2015-12-07 Thread Eric Sunshine
In addition to Peff's and Junio's review comments... On Sun, Dec 6, 2015 at 9:58 AM, James wrote: > From: James Rouzier > > Specify a file to read for exclude patterns. Missing Signed-off-by:. > --- > diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh > @@ -628,6 +628,66 @@ test_expect_success '

Re: [PATCH] contrib/subtree: fix "subtree split" skipped-merge bug.

2015-12-07 Thread Eric Sunshine
On Mon, Dec 7, 2015 at 3:50 PM, Dave Ware wrote: > [PATCH] contrib/subtree: fix "subtree split" skipped-merge bug. As an aid for reviewers, please indicate the version of this patch submission. For instance, this is the second attempt, so the subject would be decorated as [PATCH v2], and the next

Re: [PATCH v5] blame: add support for --[no-]progress option

2015-12-08 Thread Eric Sunshine
On Tue, Nov 24, 2015 at 11:36 PM, Edmundo Carmona Antoranz wrote: > * created struct progress_info in builtin/blame.c > this struct holds the information used to display progress so > that only one additional parameter is passed to > found_guilty_entry(). Commit messages typically are compo

Re: [PATCH v4] contrib/subtree: fix "subtree split" skipped-merge bug

2015-12-08 Thread Eric Sunshine
On Tue, Dec 8, 2015 at 7:19 PM, Dave Ware wrote: > 'git subtree split' can incorrectly skip a merge even when both parents > act on the subtree, provided the merge results in a tree identical to > one of the parents. Fix by copying the merge if at least one parent is > non-identical, and the non-i

Re: [PATCH v5] blame: add support for --[no-]progress option

2015-12-09 Thread Eric Sunshine
On Wed, Dec 9, 2015 at 11:20 PM, Edmundo Carmona Antoranz wrote: > On Tue, Dec 8, 2015 at 2:22 AM, Eric Sunshine wrote: >> On Tue, Nov 24, 2015 at 11:36 PM, Edmundo Carmona Antoranz >> wrote: >>> +--[no-]progress:: >>> + Progress status is repo

Re: [PATCH v6] blame: add support for --[no-]progress option

2015-12-12 Thread Eric Sunshine
On Sat, Dec 12, 2015 at 6:57 PM, Edmundo Carmona Antoranz wrote: > --progress can't be used with --incremental or > porcelain formats. > > git-annotate inherits the option as well > > Helped-by: Eric Sunshine > Signed-off-by: Edmundo Carmona Antoranz > --- Ri

Re: [PATCH v6] blame: add support for --[no-]progress option

2015-12-12 Thread Eric Sunshine
On Sat, Dec 12, 2015 at 7:30 PM, Edmundo Carmona Antoranz wrote: > On Sat, Dec 12, 2015 at 6:17 PM, Eric Sunshine > wrote: >> The 'show_progress = 0' seems unnecessary. What if you did something >> like this instead? >> >>

Re: [PATCH v6] blame: add support for --[no-]progress option

2015-12-12 Thread Eric Sunshine
On Sat, Dec 12, 2015 at 7:36 PM, Edmundo Carmona Antoranz wrote: > On Sat, Dec 12, 2015 at 6:30 PM, Edmundo Carmona Antoranz > wrote: > H if the code in assign_blame changed to this, it would be > possible to allow the -1 to go through: > > if (show_progress > 0) > pi.progress = start

Re: [PATCH/RFC 08/10] ref-filter: introduce remote_ref_atom_parser()

2015-12-12 Thread Eric Sunshine
On Wed, Nov 11, 2015 at 2:44 PM, Karthik Nayak wrote: > Introduce remote_ref_atom_parser() which will parse the '%(upstream)' > and '%(push)' atoms and store information into the 'used_atom' > structure based on the modifiers used along with the corresponding > atom. > > Signed-off-by: Karthik Nay

Re: [PATCH/RFC 09/10] ref-filter: introduce contents_atom_parser()

2015-12-12 Thread Eric Sunshine
On Wed, Nov 11, 2015 at 2:44 PM, Karthik Nayak wrote: > Introduce contents_atom_parser() which will parse the '%(contents)' > atom and store information into the 'used_atom' structure based on the > modifiers used along with the atom. > > Signed-off-by: Karthik Nayak > --- > diff --git a/ref-filt

Re: [PATCH/RFC 09/10] ref-filter: introduce contents_atom_parser()

2015-12-12 Thread Eric Sunshine
On Sat, Dec 12, 2015 at 10:10 PM, Eric Sunshine wrote: > On Wed, Nov 11, 2015 at 2:44 PM, Karthik Nayak wrote: >> +void contents_atom_parser(struct used_atom *atom) >> +{ >> + const char * buf; >> + >> + if (match_atom_name(atom->str, "

Re: [PATCH/RFC 10/10] ref-filter: introduce objectname_atom_parser()

2015-12-12 Thread Eric Sunshine
On Wed, Nov 25, 2015 at 8:44 AM, Karthik Nayak wrote: > Introduce objectname_atom_parser() which will parse the > '%(objectname)' atom and store information into the 'used_atom' > structure based on the modifiers used along with the atom. > > Signed-off-by: Karthik Nayak > --- > diff --git a/ref-

Re: [PATCH/RFC 00/10] ref-filter: use parsing functions

2015-12-12 Thread Eric Sunshine
On Fri, Dec 11, 2015 at 5:49 PM, Junio C Hamano wrote: > Karthik Nayak writes: >> ref-filter: introduce a parsing function for each atom in valid_atom >> ref-filter: introduce struct used_atom >> ref-fitler: bump match_atom() name to the top >> ref-filter: skip deref specifier in match_at

Re: [PATCH/RFC 05/10] ref-filter: introduce color_atom_parser()

2015-12-12 Thread Eric Sunshine
On Thu, Dec 3, 2015 at 8:35 AM, Karthik Nayak wrote: > On Wed, Dec 2, 2015 at 4:57 AM, Eric Sunshine wrote: >> On Wed, Nov 11, 2015 at 2:44 PM, Karthik Nayak wrote: >>> @@ -833,11 +846,10 @@ static void populate_value(struct ref_array_item *ref) >>>

Re: [PATCH/RFC 08/10] ref-filter: introduce remote_ref_atom_parser()

2015-12-12 Thread Eric Sunshine
On Sun, Dec 13, 2015 at 1:02 AM, Karthik Nayak wrote: > On Sun, Dec 13, 2015 at 6:23 AM, Eric Sunshine > wrote: >> On Wed, Nov 11, 2015 at 2:44 PM, Karthik Nayak wrote: >>> + if (!num_ours && !num_theirs) >>> + *s = &quo

Re: [PATCH/RFC 08/10] ref-filter: introduce remote_ref_atom_parser()

2015-12-13 Thread Eric Sunshine
On Sun, Dec 13, 2015 at 3:32 AM, Karthik Nayak wrote: >> On Sun, Dec 13, 2015 at 6:23 AM, Eric Sunshine >> wrote: >>> On Wed, Nov 11, 2015 at 2:44 PM, Karthik Nayak >>> wrote: >>>> Introduce remote_ref_atom_parser() which will parse the '

Re: [PATCH v7] Add git-grep threads param

2015-12-13 Thread Eric Sunshine
On Sun, Dec 13, 2015 at 10:17 AM, Victor Leschuk wrote: > "git grep" can now be configured (or told from the command line) > how many threads to use when searching in the working tree files. > > Changes to default behavior: number of threads now doesn't depend > on online_cpus(), e.g. if speci

Re: [PATCH/RFC 00/10] ref-filter: use parsing functions

2015-12-13 Thread Eric Sunshine
On Sun, Dec 13, 2015 at 4:31 AM, Karthik Nayak wrote: > On Sun, Dec 13, 2015 at 11:10 AM, Eric Sunshine > wrote: >> If the intention is to rid that inner loop of much of the expensive >> processing, then wouldn't we want to introduce an enum of valid atoms >> which

Re: [PATCH v1 1/4] git-gui: remove duplicate entries from .gitconfig's gui.recentrepo

2015-12-14 Thread Eric Sunshine
On Monday, December 14, 2015, Philip Oakley wrote: > The git gui's recent repo list may become contaminated with duplicate > entries. The git gui would barf when attempting to remove one entry. > Remove them all - there is no option within 'git config' to selectively > remove one of the entries. >

Re: [PATCH v1 4/4] git gui: allow for a long recentrepo list

2015-12-14 Thread Eric Sunshine
On Mon, Dec 14, 2015 at 10:09 AM, Philip Oakley wrote: > The gui.recentrepo list may be longer than the maxrecent setting. > Allow extra space to show any extra entries. > > In an ideal world, the git gui would limit the number of entries > to the maxrecent setting, however the recentrepo config l

Re: [PATCH 2/8] xread: poll on non blocking fds

2015-12-14 Thread Eric Sunshine
On Mon, Dec 14, 2015 at 2:37 PM, Stefan Beller wrote: > From the man page: > EAGAIN The file descriptor fd refers to a file other than a socket >and has been marked nonblocking (O_NONBLOCK), and the read >would block. > > EAGAIN or EWOULDBLOCK >The file descriptor fd refers

Re: [PATCH 3/8] xread_nonblock: add functionality to read from fds without blocking

2015-12-14 Thread Eric Sunshine
On Mon, Dec 14, 2015 at 2:37 PM, Stefan Beller wrote: > Provide a wrapper to read(), similar to xread(), that restarts on > EINTR but not EAGAIN (or EWOULDBLOCK). This enables the caller to > handle polling itself, possibly polling multiple sockets or performing > some other action. > > Signed-off

Re: [PATCH 3/8] xread_nonblock: add functionality to read from fds without blocking

2015-12-14 Thread Eric Sunshine
On Mon, Dec 14, 2015 at 6:03 PM, Eric Sunshine wrote: > On Mon, Dec 14, 2015 at 2:37 PM, Stefan Beller wrote: >> Provide a wrapper to read(), similar to xread(), that restarts on >> EINTR but not EAGAIN (or EWOULDBLOCK). This enables the caller to >> handle polling its

Re: [PATCH 4/8] strbuf: add strbuf_read_once to read without blocking

2015-12-14 Thread Eric Sunshine
On Mon, Dec 14, 2015 at 2:37 PM, Stefan Beller wrote: > The new call will read from a file descriptor into a strbuf once. The > underlying call xread_nonblock is meant to execute without blocking if > the file descriptor is set to O_NONBLOCK. It is a bug to call > strbuf_read_once on a file descri

Re: [PATCH 1/2] Introduce grep threads param

2015-12-15 Thread Eric Sunshine
On Tue, Dec 15, 2015 at 3:06 PM, Junio C Hamano wrote: > Victor Leschuk writes: >> Subject: Re: [PATCH 1/2] Introduce grep threads param > > I'll retitle this to something like > > grep: add --threads= option and grep.threads configuration > > while queuing (which I did for v7 earlier). > > I

Re: [PATCH v7] blame: add support for --[no-]progress option

2015-12-15 Thread Eric Sunshine
On Sat, Dec 12, 2015 at 7:51 PM, Edmundo Carmona Antoranz wrote: > --progress can't be used with --incremental or > porcelain formats. > > git-annotate inherits the option as well > > Helped-by: Eric Sunshine > Signed-off-by: Edmundo Carmona Antoranz > --- This

Re: [PATCH] mingw: emulate write(2) that fails with a EPIPE

2015-12-16 Thread Eric Sunshine
On Wednesday, December 16, 2015, Johannes Schindelin wrote: > On Windows, when writing to a pipe fails, errno is always > EINVAL. However, Git expects it to be EPIPE. > > According to the documentation, there are two cases in which write() > triggers EINVAL: the buffer is NULL, or the length is od

Re: [PATCH v2 01/11] strbuf: introduce strbuf_split_str_without_term()

2015-12-16 Thread Eric Sunshine
On Wed, Dec 16, 2015 at 10:29 AM, Karthik Nayak wrote: > strbuf: introduce strbuf_split_str_without_term() s/without/omit/ > The current implementation of 'strbuf_split_buf()' includes the > terminator at the end of each strbuf post splitting. Add an option > wherein we can drop the terminator i

Re: [PATCH v2 03/11] ref-filter: introduce struct used_atom

2015-12-16 Thread Eric Sunshine
On Wed, Dec 16, 2015 at 10:29 AM, Karthik Nayak wrote: > Introduce the 'used_array' structure which would replace the existing > implementation of 'used_array' (which a list of atoms). This helps us > parse atom's before hand and store required details into the > 'used_array' for future usage. Al

Re: [PATCH v2 05/11] ref-filter: skip deref specifier in match_atom_name()

2015-12-16 Thread Eric Sunshine
On Wed, Dec 16, 2015 at 10:29 AM, Karthik Nayak wrote: > In upcoming patches we make calls to match_atom_name() with the '*' > deref specifier still attached to the atom name. This causes > undesirable errors, hence, if present skip over the '*' deref > specifier in the atom name. I'd drop the se

Re: [PATCH v2 06/11] ref-filter: introduce color_atom_parser()

2015-12-16 Thread Eric Sunshine
On Wed, Dec 16, 2015 at 10:29 AM, Karthik Nayak wrote: > Introduce color_atom_parser() which will parse a "color" atom and > store its color in the "use_atom" structure for further usage in Same comment as last time: s/use_atom/used_atom/ > 'populate_value()'. s/'//g More below... > Helped-by

Re: [PATCH v2 07/11] ref-filter: introduce align_atom_parser()

2015-12-16 Thread Eric Sunshine
On Wed, Dec 16, 2015 at 10:29 AM, Karthik Nayak wrote: > Introduce align_atom_parser() which will parse an "align" atom and > store the required alignment position and width in the "use_atom" > structure for further usage in 'populate_value()'. > > Helped-by: Ramsay Jones > Signed-off-by: Karthik

Re: [PATCH v1 1/4] git-gui: remove duplicate entries from .gitconfig's gui.recentrepo

2015-12-16 Thread Eric Sunshine
On Wed, Dec 16, 2015 at 6:41 PM, Philip Oakley wrote: > From: "Eric Sunshine" >> On Monday, December 14, 2015, Philip Oakley wrote: >>> The git gui's recent repo list may become contaminated with duplicate >>> entries. The git gui would barf when attem

Re: [PATCHv2] submodule: Port resolve_relative_url from shell to C

2015-12-17 Thread Eric Sunshine
A rather superficial review... On Wed, Dec 16, 2015 at 7:26 PM, Stefan Beller wrote: > This reimplements the helper function `resolve_relative_url` in shell s/This reimplements/Reimplement/ > in C. This functionality is needed in C for introducing the groups > feature later on. When using group

Re: [PATCH v2 08/11] ref-filter: introduce prefixes for the align atom

2015-12-17 Thread Eric Sunshine
On Wed, Dec 16, 2015 at 10:29 AM, Karthik Nayak wrote: > ref-filter: introduce prefixes for the align atom The prefixes are actually for the arguments to the 'align' atom, not for the atom itself. However, it might be better to describe this at a bit higher level. Perhaps: ref-filter: align:

Re: [PATCH v2 09/11] ref-filter: introduce remote_ref_atom_parser()

2015-12-17 Thread Eric Sunshine
On Wed, Dec 16, 2015 at 10:30 AM, Karthik Nayak wrote: > Introduce remote_ref_atom_parser() which will parse the '%(upstream)' > and '%(push)' atoms and store information into the 'used_atom' > structure based on the modifiers used along with the corresponding > atom. > > Helped-by: Ramsay Jones

Re: [PATCH v2 10/11] ref-filter: introduce contents_atom_parser()

2015-12-17 Thread Eric Sunshine
On Wed, Dec 16, 2015 at 10:30 AM, Karthik Nayak wrote: > Introduce contents_atom_parser() which will parse the '%(contents)' > atom and store information into the 'used_atom' structure based on the > modifiers used along with the atom. > > Helped-by: Ramsay Jones > Signed-off-by: Karthik Nayak >

Re: [PATCH v2 07/11] ref-filter: introduce align_atom_parser()

2015-12-17 Thread Eric Sunshine
On Wed, Dec 16, 2015 at 10:29 AM, Karthik Nayak wrote: > Introduce align_atom_parser() which will parse an "align" atom and > store the required alignment position and width in the "use_atom" > structure for further usage in 'populate_value()'. > > Helped-by: Ramsay Jones > Signed-off-by: Karthik

Re: [PATCH v2 11/11] ref-filter: introduce objectname_atom_parser()

2015-12-17 Thread Eric Sunshine
On Wed, Dec 16, 2015 at 10:30 AM, Karthik Nayak wrote: > Introduce objectname_atom_parser() which will parse the > '%(objectname)' atom and store information into the 'used_atom' > structure based on the modifiers used along with the atom. > > Helped-by: Ramsay Jones > Signed-off-by: Karthik Naya

Re: [PATCH 1/2] pack-revindex: drop hash table

2015-12-20 Thread Eric Sunshine
On Mon, Dec 21, 2015 at 1:19 AM, Jeff King wrote: > The main entry point to the pack-revindex code is > find_pack_revindex(). This calls revindex_for_pack(), which > lazily computes and caches the revindex for the pack. > > We store the cache in a very simple hash table. It's created > by init_pac

Re: [PATCH] hooks/update: Add a hooks.denyunsignedtags option

2015-12-21 Thread Eric Sunshine
On Monday, December 21, 2015, Julian Andres Klode wrote: > Introduce an option to deny unsigned tags from entering > a repository. This is useful in teams where members forget > to sign their release tags. > > It does not actually check whether the signature is actually > complete or valid, it jus

Re: Someplace to contribute: documentation

2015-12-21 Thread Eric Sunshine
On Mon, Dec 21, 2015 at 2:55 PM, Stephen & Linda Smith wrote: > On Sunday, December 20, 2015 06:27:56 PM Stephen & Linda Smith wrote: >> I've been looking over the git source tree to see if there is some place >> where I can >> contribute. It appears that there are some suggestions at the botto

Re: [PATCH 1/2] Define the term shallow clone.

2015-12-21 Thread Eric Sunshine
On Mon, Dec 21, 2015 at 9:09 PM, Stephen P. Smith wrote: > There are several places in the documentation that > the term shallow clone is used. Defining the term > enables its use elsewhere with a known definition. > > Signed-off-by: Stephen P. Smith > --- > diff --git a/Documentation/glossary-co

Re: [PATCH 2/2] Add a section to the users manual documenting shallow clones.

2015-12-21 Thread Eric Sunshine
On Mon, Dec 21, 2015 at 9:09 PM, Stephen P. Smith wrote: > Add a section to the users manual documenting shallow clones. For the subject, prefix by section/module you're touching; drop capitalization; drop full-stop (period). > The todo section previously noted that documentation of shallow clon

Re: [PATCH V3 2/2] user-manual: add section documenting shallow clones

2015-12-22 Thread Eric Sunshine
On Tue, Dec 22, 2015 at 10:53 PM, Stephen P. Smith wrote: > Rather than merely pointing readers at the 1.5 release notes to > learn about shallow clones, document them formally. Thanks, this version looks better. A few comment below... > Signed-off-by: Stephen P. Smith > --- Right here, below

Re: Combining APPLE_COMMON_CRYPTO=1 and NO_OPENSSL=1 produces unexpected result

2015-12-23 Thread Eric Sunshine
On Wed, Nov 25, 2015 at 10:10 AM, Jack Nagel wrote: > When compiling git on OS X (where APPLE_COMMON_CRYPTO=1 is the > default) and specifying NO_OPENSSL=1, the resulting git uses the > BLK_SHA1 implementation rather than the functions available in > CommonCrypto. > > $ make NO_OPENSSL=1 > [...] >

Re: [PATCH v2 0/3] nd/clear-gitenv-upon-use-of-alias

2015-12-23 Thread Eric Sunshine
On Wed, Dec 23, 2015 at 4:37 AM, Jeff King wrote: > Subject: [PATCH] avoid SIGPIPE warnings for aliases > > When git executes an alias that specifies an external > command, it will complain if the alias dies due to a signal. > This is usually a good thing, as signal deaths are > unexpected. Howeve

Re: [PATCH 14/16] refs: allow ref backend to be set for clone

2015-12-23 Thread Eric Sunshine
On Wed, Dec 23, 2015 at 8:51 AM, Michael Haggerty wrote: > On 12/03/2015 01:35 AM, David Turner wrote: >> + if (refs_backend_type && *refs_backend_type) { >> + argv_array_push(&cp.args, "--refs-backend-type"); >> + argv_array_push(&cp.args, refs_backend_type); >> +

Re: [PATCH v3 07/11] dir: add new_untracked_cache()

2015-12-23 Thread Eric Sunshine
On Wed, Dec 23, 2015 at 4:03 PM, Christian Couder wrote: > Factor out code into new_untracked_cache(), which will be used > multiple times in a later commit. Odd indentation: s/^\s+// > Signed-off-by: Christian Couder > --- > diff --git a/dir.c b/dir.c > @@ -1938,16 +1938,20 @@ void add

Re: [PATCH v2 11/11] ref-filter: introduce objectname_atom_parser()

2015-12-25 Thread Eric Sunshine
On Fri, Dec 25, 2015 at 8:44 AM, Karthik Nayak wrote: > On Fri, Dec 18, 2015 at 11:54 AM, Eric Sunshine > wrote: >> On Wed, Dec 16, 2015 at 10:30 AM, Karthik Nayak >> wrote: >>> +static void objectname_atom_parser(struct used_atom *atom) >>

Re: [PATCH] worktree: stop supporting moving worktrees manually

2015-12-27 Thread Eric Sunshine
On Sun, Dec 27, 2015 at 10:43:16AM +0700, Nguyễn Thái Ngọc Duy wrote: > The current update_linked_gitdir() has a bug that can create "gitdir" > file in non-multi-worktree setup. Instead of fixing this, we step back a > bit. The original design was probably not well thought out. For now, if > the us

Re: [PATCH 2/2] bswap: add NO_UNALIGNED_LOADS define

2015-12-28 Thread Eric Sunshine
On Tue, Dec 29, 2015 at 1:36 AM, Jeff King wrote: > The byte-swapping code automatically decides, based on the > platform, whether it is sensible to cast an do a potentially s/an/and/ or something? > unaligned ntohl(), or to pick individual bytes out of an > array. > > It can be handy to overrid

Re: [PATCH] worktree: stop supporting moving worktrees manually

2015-12-30 Thread Eric Sunshine
On Tue, Dec 29, 2015 at 8:55 AM, Duy Nguyen wrote: > On Mon, Dec 28, 2015 at 1:22 PM, Eric Sunshine > wrote: >> On Sun, Dec 27, 2015 at 10:43:16AM +0700, Nguyễn Thái Ngọc Duy wrote: >>> If you move a linked working tree to another file system, or >>> -within a fil

Re: ./t3310-notes-merge-manual-resolve.sh broken on pu under Mac OS ?

2015-12-30 Thread Eric Sunshine
On Wed, Dec 30, 2015 at 8:20 AM, Torsten Bögershausen wrote: > I got 2 failures on pu under Mac OS, (Linux is OK) > I did some very basic debugging, it seems as if grep doesn't find > a needed string. > Does anybody have an idea here ? I'm unable to reproduce these failures on Mac. > ---

Re: [PATCH 02/14] log: refactor add_header to drop some magic numbers

2015-12-30 Thread Eric Sunshine
On Tue, Dec 29, 2015 at 2:20 AM, Jeff King wrote: > We want to chomp newlines off the end of the "value" string. > But because it's const, we must track its length rather than > writing a NUL. This leads to us having to tweak that length > later, to account for moving the pointer forward. > > Sinc

Re: [PATCH 03/14] strutil: add skip_prefix_icase

2015-12-30 Thread Eric Sunshine
On Tue, Dec 29, 2015 at 2:22 AM, Jeff King wrote: > Some sites that otherwise would use skip_prefix cannot do > so, because it has no way to do case-insensitive > comparisons. Such sites usually get around this by using > strncasecmp, at the cost of having to use magic numbers. > We can help them

Re: [PATCH 04/14] shortlog: use skip_prefix_icase to parse "Author" lines

2015-12-30 Thread Eric Sunshine
On Tue, Dec 29, 2015 at 2:27 AM, Jeff King wrote: > Because we must match both "Author" and "author" here, we > could not use skip_prefix, and had to hand-code a partial > case-insensitive match. Now that we have skip_prefix_case, s/skip_prefix_case/skip_prefix_icase/ > we can use it. This is te

Re: [PATCH 06/14] shortlog: replace hand-parsing of author with pretty-printer

2016-01-04 Thread Eric Sunshine
On Tue, Dec 29, 2015 at 2:29 AM, Jeff King wrote: > When gathering the author and oneline subject for each > commit, we hand-parse the commit headers to find the > "author" line, and then continue past to the blank line at > the end of the header. > > We can replace this tricky hand-parsing by sim

Re: [PATCH 20/20] fetch: add --deepen= to extend shallow boundary by commits

2016-01-04 Thread Eric Sunshine
ce or --not. > [...] > > Helped-by: Duy Nguyen > Helped-By: Eric Sunshine s/By/by/ > Helped-By: Junio C Hamano Ditto. > Signed-off-by: Dongcan Jiang > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-opti

Re: [PATCH 11/14] shortlog: allow grouping by committer ident

2016-01-04 Thread Eric Sunshine
On Tue, Dec 29, 2015 at 2:35 AM, Jeff King wrote: > Shortlog always groups commits by the author field. It can > be interesting to group by other fields, as well. The > obvious other identity in each commit is the committer > field. This might be interesting if your project follows a > workflow wh

Re: [PATCH 14/14] shortlog: match commit trailers with --ident

2016-01-04 Thread Eric Sunshine
On Tue, Dec 29, 2015 at 2:50 AM, Jeff King wrote: > This doesn't leave us many syntactic "outs" for adding new ident types > in the future (nor can you match a trailer called "Author"). I guess we > could call this "--ident=trailer:reviewed-by" to be more precise, but > it's more annoying to type.

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

2016-01-05 Thread Eric Sunshine
On Mon, Jan 4, 2016 at 11:40 PM, David Greene wrote: > This test merges an external tree in as a subtree, makes some commits > on top of it and splits it back out. In the process the added commits > are lost. This is marked to expect failure so that we don't forget to > fix it. > > Signed-off-by

<    8   9   10   11   12   13   14   15   16   17   >