Re: Allow git alias to override existing Git commands

On 11/11/15 14:58, Jeremy Morton wrote: > On 11/11/2015 04:48, Sitaram Chamarty wrote: >> A lot of things in Unix do follow that "give you rope to hang yourself" >> philosophy. I used to (and to *some* extent still do) think like that, >> but some years of supporting normal users trying to do

Re: [PATCH 0/2] git-candidate: git based patch tracking and review

On 11/10/2015 01:56 PM, Richard Ipsum wrote: > I've continued my work[1] to add patch tracking and candidate review > capability > to git. > > git-candidate now has a more git-like user interface, so remote candidates > can now be specified in a similar way to remote refs (e.g. origin/candidate)

Re: Allow git alias to override existing Git commands

On 11/11/2015 04:48, Sitaram Chamarty wrote: A lot of things in Unix do follow that "give you rope to hang yourself" philosophy. I used to (and to *some* extent still do) think like that, but some years of supporting normal users trying to do stuff has taught me it's not always that simple. I

git submodule sync / git submodule rm

Hi, i'm currently on a migration from svn to git and also have the task to convert the svnexternal to git submodules. During the migration step I am doing an automatic verification which needs a reliable way to switch the working tree to another branch include the submodules. When the

Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs

Michael Rappazzo venit, vidit, dixit 11.11.2015 03:11: > This patch series is built on (based on) 'next' because it relies on > worktree.c > > `ff-refs` will update local branches which can be fast-forwarded to their > upstream tracking branch. Any branch which has diverged from the upstream >

Re: [PATCH 2/2] contrib/git-candidate: Add README

On Tue, Nov 10, 2015 at 03:19:11PM -0500, David Turner wrote: > I didn't actually read the code. Instead, I started with the README and > decided to provide both text and UX comments all mixed up. These are > mostly my personal preferences; take them or leave them as you choose. > > I'm really

Re: Allow git alias to override existing Git commands

On 11/11/15 15:42, Jeremy Morton wrote: > On 11/11/2015 09:51, Sitaram Chamarty wrote: >> I can only repeat what I said before: it's not all black and white. >> >> Reducing the opportunity to make mistakes is useful for everyone, even >> expetrs. Especially stuff that you may have setup aeons ago

Re: Allow git alias to override existing Git commands

On 11/11/2015 09:51, Sitaram Chamarty wrote: I can only repeat what I said before: it's not all black and white. Reducing the opportunity to make mistakes is useful for everyone, even expetrs. Especially stuff that you may have setup aeons ago and hits you only aeons later when something

Re: [PATCH] http: fix some printf format warnings on 32-bit builds

On 11/11/15 01:22, Eric Sunshine wrote: > On Tue, Nov 10, 2015 at 7:23 PM, Ramsay Jones > wrote: >> Commit f8117f55 ("http: use off_t to store partial file size", >> 02-11-2015) changed the type of some variables from long to off_t. >> The 32-bit build, which

Re: [PATCH] http: fix some printf format warnings on 32-bit builds

On 11/11/15 02:00, Stefan Beller wrote: > On Tue, Nov 10, 2015 at 5:22 PM, Eric Sunshine > wrote: >> On Tue, Nov 10, 2015 at 7:23 PM, Ramsay Jones >> wrote: >>> Commit f8117f55 ("http: use off_t to store partial file size", >>> 02-11-2015)

Re: Allow git alias to override existing Git commands

On Wed, Nov 11, 2015 at 1:28 AM, Jeremy Morton wrote: > On 11/11/2015 04:48, Sitaram Chamarty wrote: >> >> A lot of things in Unix do follow that "give you rope to hang yourself" >> philosophy. I used to (and to *some* extent still do) think like that, >> but some years of

Re: [PATCH] http: fix some printf format warnings on 32-bit builds

On Wed, Nov 11, 2015 at 12:02 AM, Lars Schneider wrote: > > Unfortunately no. All their machines are 64-bit [1] and they have "no > immediate plans to add this feature" [2]. > However, we could the following build configuration on a 64-bit machine: > > export

Re: [PATCH] allow hooks to ignore their standard input stream

On Wed, Nov 11, 2015 at 03:39:20PM +0100, Clemens Buchacher wrote: > + if (write_in_full(proc.in, buf.buf, buf.len) < 0) { > + /* We do not mind if a hook does not read all refs. */ > + if (errno != EPIPE) > + ret =

Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs

On Wed, Nov 11, 2015 at 5:41 AM, Michael J Gruber wrote: > Michael Rappazzo venit, vidit, dixit 11.11.2015 03:11: >> This patch series is built on (based on) 'next' because it relies on >> worktree.c >> >> `ff-refs` will update local branches which can be fast-forwarded

[RFC] Clone repositories recursive with depth 1

Hi, I have a clean build machine and I want to clone my source code to this machine while transferring only the minimal necessary amount of data. Therefore I use this command: git clone --recursive --depth 1 --single-branch Apparently this does not clone the submodules with "--depth 1"

Apple Xcode Asserts Control Over Git - License Violation?

I recently installed Xcode 7.1.1 on my Mac. While this was underway, I continued to work on an unrelated project, until I found I could not use git from the command-line. Instead, I got this message: Agreeing to the Xcode/iOS license requires admin privileges, please re-run as root via sudo.

[PATCH] Documentation: make formatting more consistent

Documentation/git.txt: enclose all Environment Variables in single quotes. Signed-off-by: Andrey Rybak --- Documentation/git.txt is not consistent in the way it stylizes mentions of Environment Variables. Most of them are enclosed in single quotes, some are enclosed in

Re: Apple Xcode Asserts Control Over Git - License Violation?

ARaybould writes: > I recently installed Xcode 7.1.1 on my Mac. While this was underway, I > continued to work on an unrelated project, until I found I could not > use git from the command-line. Instead, I got this message: > > Agreeing to the Xcode/iOS license requires

Fwd: Question: .idx without .pack causes performance issues?

Hi all, (re-sending because my first e-mail was rejected due to html formatting) While debugging a git fetch performance problem on Windows I came across this thread. The problem in our case was also caused by orphaned .idx files. On Tue, Jul 21, 2015 at 9:15 PM, Junio C Hamano

git clone --recursive should run git submodule update with flag --remote

Consider two repositories, A and B. Repo A is embedded into B by using submodule: git submodule add -b master sub-a So, submodule sub-a is set to track master branch of the repo A. Running git submodule update --remote inside repo B will automatically update and checkout submodule sub-a to

[PATCH] allow hooks to ignore their standard input stream

Since ec7dbd145 (receive-pack: allow hooks to ignore its standard input stream) the pre-receive and post-receive hooks ignore SIGPIPE. Do the same for the remaining hooks pre-push and post-rewrite, which read from standard input. The same arguments for ignoring SIGPIPE apply. Signed-off-by:

[PATCH v6] Add git-grep threads param

"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 specific number is not configured GREP_NUM_THREADS_DEFAULT (8) threads

Re: [PATCH] http: fix some printf format warnings on 32-bit builds

>Ah. OK, so %ld for long and %lld for long long, I suppose. Only if you have a system that's support it. Linux does, Windows not. Hmm, not that it matters, but I wonder what the PRId64 macro is. ;-) It's "I64d" for Windows, and "lld" for all Gnu based systems and others, When you do

Re: [PATCHv3 08/11] fetching submodules: respect `submodule.jobs` config option

On Wed, Nov 11, 2015 at 11:55 AM, Jens Lehmann wrote: >> >> TL;DR: checkout is serial, network-related stuff only will be using >> submodule.jobs > > > My point being: isn't "jobs" a bit too generic for a config option that > is only relevant for network-related stuff? Maybe

Re: [PATCH v4 2/3] Limit the size of the data block passed to SHA1_Update()

> Adjusting to the proposed change to 1/3, this step would become the > attached patch. Note that I thought the above would not scale well > so I did it a bit differently. Thank you, I understand now the changes that you made. Let me know if this can be improved any further. Atousa -- To

[PATCH] http: fix some printf format warnings

Commit f8117f55 ("http: use off_t to store partial file size", 02-11-2015) changed the type of some variables from long to off_t. Unfortunately, the off_t type is not portable and can be represented by several different actual types (even multiple types on the same platform). This makes it

Re: [PATCH] http: fix some printf format warnings

On Thu, Nov 12, 2015 at 12:07:42AM +, Ramsay Jones wrote: > Commit f8117f55 ("http: use off_t to store partial file size", > 02-11-2015) changed the type of some variables from long to off_t. > Unfortunately, the off_t type is not portable and can be represented > by several different actual

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

On Wed, Nov 11, 2015 at 11:11 AM, Jeff King wrote: > On Wed, Nov 11, 2015 at 10:59:26AM -0800, Stefan Beller wrote: > >> On Fri, Nov 6, 2015 at 3:41 PM, Junio C Hamano wrote: >> > I'll be offline for a few weeks, and Jeff King graciously agreed to >> > help

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

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. Signed-off-by: Karthik Nayak --- ref-filter.c

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

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. Signed-off-by: Karthik Nayak ---

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

Carried over http://thread.gmane.org/gmane.comp.version-control.git/279226/focus=279352. Where we were talking about pre-parsing most of the atoms so that we do not have to parse them in ref-filter:populate_value(), where we could now instead only fill in necessary values. This series aims to

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

Signed-off-by: Karthik Nayak --- ref-filter.c | 4 1 file changed, 4 insertions(+) diff --git a/ref-filter.c b/ref-filter.c index 1542f5f..4af28ef 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -37,6 +37,10 @@ static int match_atom_name(const char *name, const char

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

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 --- ref-filter.c | 66

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

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 (e.g. %(align:position=middle,width=30)). Add documentation

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

The current implementation of 'strbuf_split_buf()' includes the terminator at the end of each strbuf post splitting. Include an option wherein we can drop the terminator if required. In this context introduce a wrapper function 'strbuf_split_str_without_term()' which splits a given string into

[PATCH/RFC 03/10] ref-fitler: bump match_atom() name to the top

Bump match_atom() to the top for usage in further patches. Signed-off-by: Karthik Nayak --- ref-filter.c | 32 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ref-filter.c b/ref-filter.c index 748a2fe..1542f5f 100644 ---

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

Introduce color_atom_parser() which will parse a "color" atom and store its color in the "use_atom" structure for further usage in 'populate_value()'. Signed-off-by: Karthik Nayak --- ref-filter.c | 20 1 file changed, 16 insertions(+), 4 deletions(-)

Re: [PATCH 2/2] contrib/git-candidate: Add README

On Wed, 2015-11-11 at 09:48 +, Richard Ipsum wrote: > > > > > + (master)$ git candidate submit origin archiverepo > > > + Review added successfully > > > > Is the contributor automatically (optionally) emailed on this? If not, > > consider this a feature request for this. > > There's no

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

On Wed, Nov 11, 2015 at 10:59:26AM -0800, Stefan Beller wrote: > On Fri, Nov 6, 2015 at 3:41 PM, Junio C Hamano wrote: > > I'll be offline for a few weeks, and Jeff King graciously agreed to > > help shepherd the project forward in the meantime as an interim > > maintainer.

Re: [RFC] Clone repositories recursive with depth 1

On Wed, Nov 11, 2015 at 11:19 AM, Stefan Beller wrote: > On Wed, Nov 11, 2015 at 6:09 AM, Lars Schneider > wrote: >> Hi, >> >> I have a clean build machine and I want to clone my source code to this >> machine while transferring only the minimal

Re: [PATCH] run-command: detect finished children by closed pipe rather than waitpid

including the list and all others this time. >> if (code < 0) { >> pp->shutdown = 1; >> - kill_children(pp, SIGTERM); >> + kill_children(pp, -code); > > > I'll see what this means

Re: [PATCH] run-command: detect finished children by closed pipe rather than waitpid

On Wed, Nov 11, 2015 at 12:48 PM, Johannes Sixt wrote: >> >> So maybe that was not the right thought and we do have to special case >> SIGTERM here? > > > I wonder why task_finish() callback gets to choose a signal. The point here > is, IIUC, when one child dies, the others must be

Re: [PATCH] http: fix some printf format warnings on 32-bit builds

On Wed, Nov 11, 2015 at 03:31:01PM -0500, Eric Sunshine wrote: > The fact that 'long' and 'long long' happen to be the same size (in > this case) is immaterial. What is important is that the code is just > wrong to be using the "%l" specifier for 'long' when the actual > datatype is 'long long'

Re: Allow git alias to override existing Git commands

Am 10.11.2015 um 23:49 schrieb Stefan Beller: On Tue, Nov 10, 2015 at 1:57 PM, Jens Lehmann wrote: Am 10.11.2015 um 19:12 schrieb Stefan Beller: On Tue, Nov 10, 2015 at 8:31 AM, Jeremy Morton For example, I wanted to setup "git clone" to

Re: git clone --recursive should run git submodule update with flag --remote

On Wed, Nov 11, 2015 at 4:46 AM, Stanislav wrote: > Consider two repositories, A and B. > > Repo A is embedded into B by using submodule: > > git submodule add -b master sub-a > > So, submodule sub-a is set to track master branch of the repo A. > > Running git submodule

Re: [PATCHv3 08/11] fetching submodules: respect `submodule.jobs` config option

Am 10.11.2015 um 23:29 schrieb Stefan Beller: On Tue, Nov 10, 2015 at 2:21 PM, Jens Lehmann wrote: +submodule.jobs:: + This is used to determine how many submodules can be operated on in + parallel. Specifying a positive integer allows up to that number +

Re: git submodule sync / git submodule rm

Am 11.11.2015 um 11:18 schrieb Boettger, Heiko: i'm currently on a migration from svn to git and also have the task to convert the svnexternal to git submodules. During the migration step I am doing an automatic verification which needs a reliable way to switch the working tree to another

Re: [PATCH] run-command: detect finished children by closed pipe rather than waitpid

Am 11.11.2015 um 21:37 schrieb Stefan Beller: including the list and all others this time. if (code < 0) { pp->shutdown = 1; - kill_children(pp, SIGTERM); + kill_children(pp,

[PULL] git-svn: improve rebase/mkdirs performance

Hi Jeff/Junio, nothing urgent, please pull at your convenience. Thanks. The following changes since commit f34be46e47773d03e9d09641209121591a6b37c8: Eleventh batch for 2.7 (2015-11-05 15:26:08 -0800) are available in the git repository at: git://git.bogomips.org/git-svn.git master for you

Re: [PATCH] http: fix some printf format warnings on 32-bit builds

On 11/11/15 20:31, Eric Sunshine wrote: > On Wed, Nov 11, 2015 at 12:47 PM, Ramsay Jones > wrote: >> On 11/11/15 01:22, Eric Sunshine wrote: >>> On Tue, Nov 10, 2015 at 7:23 PM, Ramsay Jones >>> wrote: >>> My machine is 64-bit, though,

Re: [PATCH] http: fix some printf format warnings on 32-bit builds

On Wed, Nov 11, 2015 at 12:47 PM, Ramsay Jones wrote: > On 11/11/15 01:22, Eric Sunshine wrote: >> On Tue, Nov 10, 2015 at 7:23 PM, Ramsay Jones >> wrote: >> My machine is 64-bit, though, so perhaps it's misleading to >> characterize this

[PATCH v2] run-command: detect finished children by closed pipe rather than waitpid

Detect if a child stopped working by checking if their stderr pipe was closed instead of checking their state with waitpid. As waitpid is not fully working in Windows, this is an approach which allows for better cross platform operation. (It's less code, too) Previously we did not close the read

Re: [PATCH] run-command: detect finished children by closed pipe rather than waitpid

Am 11.11.2015 um 21:53 schrieb Stefan Beller: On Wed, Nov 11, 2015 at 12:48 PM, Johannes Sixt wrote: I wonder why task_finish() callback gets to choose a signal. The point here is, IIUC, when one child dies, the others must be halted, too. SIGTERM seems to be the only sensible

[ANNOUNCE] Git Rev News edition 9

Hi everyone, I'm happy announce that the 9th edition of Git Rev News is now published: http://git.github.io/rev_news/2015/11/11/edition-9/ Thanks a lot to all the contributors, especially Matthieu! Enjoy, Christian, Thomas and Nicola. -- To unsubscribe from this list: send the line

Re: [PATCH] http: fix some printf format warnings on 32-bit builds

On 11 Nov 2015, at 03:00, Stefan Beller wrote: > On Tue, Nov 10, 2015 at 5:22 PM, Eric Sunshine > wrote: >> On Tue, Nov 10, 2015 at 7:23 PM, Ramsay Jones >> wrote: >>> Commit f8117f55 ("http: use off_t to store partial