Re: Promoting Git developers

2015-03-16 Thread David Lang
On Sun, 15 Mar 2015, Junio C Hamano wrote: Christian Couder christian.cou...@gmail.com writes: I wrote something about a potential Git Rev News news letter: I read it. Sounds promising. Just one suggestion on the name and half a comment. How would Git Review (or Git Monthly Review, or

Re: [PATCH] show-branch: show all local heads when only giving one rev along --topics

2015-03-16 Thread Mike Hommey
On Mon, Mar 16, 2015 at 05:38:06PM +0900, Mike Hommey wrote: git show-branch --topics rev revs... displays ancestry graph, only considering commits that are in all given revs, except the first one. git show-branch displays ancestry graph for all local branches. Unfortunately, git

Re: Slow git pushes: sitting 1 minute in pack-objects

2015-03-16 Thread Jeff King
On Mon, Mar 09, 2015 at 09:37:25PM -0400, Stephen Morton wrote: 3. Not sure how long this part takes. It takes 1/3 - 1/2 of the time when straced, but I think it's much less, as little as 10s when not straced. It then reads a bunch of what look like objects from filehandle 0 (presumably

Re: [GSoC] Applying for conversion scripts to builtins

2015-03-16 Thread Duy Nguyen
On Tue, Mar 17, 2015 at 7:22 AM, Paul Tan pyoka...@gmail.com wrote: Hi, On Tue, Mar 17, 2015 at 12:49 AM, Yurii Shevtsov unge...@gmail.com wrote: I'm going to write for this idea. As I know good proposal should contain timeline and Todo estimations. What should I write in my proposal, since

Re: [GSoC] Applying for conversion scripts to builtins

2015-03-16 Thread Paul Tan
Hi, On Tue, Mar 17, 2015 at 12:49 AM, Yurii Shevtsov unge...@gmail.com wrote: I'm going to write for this idea. As I know good proposal should contain timeline and Todo estimations. What should I write in my proposal, since there is no clear plan for converting scripts to builtins. Thanks in

Re: [PATCH] refs.c: get_ref_cache: use a bucket hash

2015-03-16 Thread Jeff King
[+cc Michael for get_ref_cache wisdom] On Mon, Mar 16, 2015 at 07:40:40PM +0100, Andreas Krey wrote: I am guessing that the repository has tons of submodules? Not a single one. Thats's thie interesting thing that makes me think I'm not actually solving the right problem. This repo has

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-16 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Kevin Daudt m...@ikke.info writes: So this ref changes to the bad commit. For refs/bisect/good-*, I could only find an example snippet: GOOD=$(git for-each-ref --format=%(objectname) refs/bisect/good-*) But it's not really clear what * might be

Re: Bug in git-verify-pack or in its documentation?

2015-03-16 Thread Mike Hommey
On Mon, Mar 16, 2015 at 05:13:25PM +0700, Duy Nguyen wrote: On Mon, Mar 16, 2015 at 3:05 PM, Mike Hommey m...@glandium.org wrote: Hi, git-verify-pack's man page says the following about --stat-only: Do not verify the pack contents; only show the histogram of delta chain length.

Re: git-svn: Fetch svn branches only and have git recognize them as branches?

2015-03-16 Thread Brian Koehmstedt
Just to close the loop on this, I wasn't able to get git-svn to deal with this remote repository the way I wanted, so what I did is write some perl scripts to mirror the remote subversion repository locally and then use git-svn on that local fixed svn mirror. The hard part was mirroring the svn

Re: Bug in git-verify-pack or in its documentation?

2015-03-16 Thread Duy Nguyen
On Mon, Mar 16, 2015 at 3:05 PM, Mike Hommey m...@glandium.org wrote: Hi, git-verify-pack's man page says the following about --stat-only: Do not verify the pack contents; only show the histogram of delta chain length. With --verbose, list of objects is also shown. However, there is

Re: [PATCH v5 1/2] reset: enable '-' short-hand for previous branch

2015-03-16 Thread Sudhanshu Shekhar
Thank you all for your reviews and feedback. I will try and submit this patch by taking my time to think about the various solutions and coming up with the best one. I will also try and see if I can assist Junio with his JFF patch. I have learned a lot during the process of implementing this

[PATCH v2] diff-lib.c: adjust position of i-t-a entries in diff

2015-03-16 Thread Nguyễn Thái Ngọc Duy
Entries added by git add -N are reminder for the user so that they don't forget to add them before committing. These entries appear in the index even though they are not real. Their presence in the index leads to a confusing git status like this: On branch master Changes to be committed:

[RFC] git submodule purge

2015-03-16 Thread Patrick Steinhardt
Hi, This proposal is just for discussion. If there is any interest I will implement the feature and send some patches. Currently it is hard to properly remove submodules. That is when a submodule is deinitialized and removed from a repository the directory '.git/modules/SM_NAME' will still be

Re: [PATCH/GSoC/RFC] fetch: git fetch --deepen

2015-03-16 Thread Dongcan Jiang
Hi Duy, Sorry for my late response. we need to make sure that upload-pack barf if some client sends both deepen and depth. Actually, in my current design, when client just wants depth, it sends depth N; when it want deepen, it sends depth N as well as depth_deepen. For the latter case, it

[PATCH] [RFC] Add a new config. option for skipping merges in git-log

2015-03-16 Thread Koosha Khajehmoogahi
This patch adds a 'showmerges' config. option for git-log. This option determines whether the log should contain merge commits or not. In essence, if this option is set to false, git-log will be run as 'git-log --no-merges'. To force git-log to show merges even if 'log.showmerges' is set, we use

Re: [PATCH/GSoC/RFC] fetch: git fetch --deepen

2015-03-16 Thread Dongcan Jiang
Hi Junio, Sorry for my late response. As this operation is not about moving _any_ refs, whether local branches or remote-tracking branches, any ref that used to point at commit B before you executed fetch --deepen would point at the same commit after the command finishes. Thanks for

Re: [PATCH/RFC][GSoC] make git diff --no-index $directory $file DWIM better.

2015-03-16 Thread Yurii Shevtsov
Matthieu Moy matthieu@grenoble-inp.fr writes: --- a/diff-no-index.c +++ b/diff-no-index.c @@ -97,8 +97,25 @@ static int queue_diff(struct diff_options *o, if (get_mode(name1, mode1) || get_mode(name2, mode2)) return -1; - if (mode1 mode2 S_ISDIR(mode1)

Re: [PATCH/GSoC/RFC] fetch: git fetch --deepen

2015-03-16 Thread Dongcan Jiang
Hi Eric, Sorry for my late response. Thank you for your suggestions! I will try to use them in my next patch version. Best Regards, Dongcan 2015-03-14 3:42 GMT+08:00 Eric Sunshine sunsh...@sunshineco.com: On Fri, Mar 13, 2015 at 9:04 AM, Dongcan Jiang dongcan.ji...@gmail.com wrote: This

Re: [PATCH v2] diff-lib.c: adjust position of i-t-a entries in diff

2015-03-16 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: Nguyễn Thái Ngọc Duy venit, vidit, dixit 16.03.2015 14:56: The test cache-tree invalidates i-t-a paths is marked failure because I don't think removing --cached from git diff is the right fix. This test relies on diff --cached behavior but

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-16 Thread Kevin Daudt
On Wed, Mar 11, 2015 at 01:13:48PM -0700, Junio C Hamano wrote: Kevin Daudt m...@ikke.info writes: On Tue, Mar 10, 2015 at 04:12:18PM -0700, Junio C Hamano wrote: Step back and think why git bisect --first-parent is sometimes desired in the first place. It is because in the regular

[GSoC] Applying for conversion scripts to builtins

2015-03-16 Thread Yurii Shevtsov
I'm going to write for this idea. As I know good proposal should contain timeline and Todo estimations. What should I write in my proposal, since there is no clear plan for converting scripts to builtins. Thanks in advance! -- To unsubscribe from this list: send the line unsubscribe git in the

Re: [PATCH v2] diff-lib.c: adjust position of i-t-a entries in diff

2015-03-16 Thread Michael J Gruber
Nguyễn Thái Ngọc Duy venit, vidit, dixit 16.03.2015 14:56: Entries added by git add -N are reminder for the user so that they don't forget to add them before committing. These entries appear in the index even though they are not real. Their presence in the index leads to a confusing git status

[PATCH] [RFC] Add a new config. option for skipping merges in git-log

2015-03-16 Thread Koosha Khajehmoogahi
This patch adds a 'showmerges' config. option for git-log. This option determines whether the log should contain merge commits or not. In essence, if this option is set to false, git-log will be run as 'git-log --no-merges'. To force git-log to show merges even if 'log.showmerges' is set, we use

[PATCH/RFC 0/2][GSoC] revision.c: Allow - as stand-in for @{-1} everywhere a branch is allowed

2015-03-16 Thread Kenny Lee Sin Cheong
This is an attempt at a microproject for GSoC An attempt to add revision range support to Junio's JFF patch sent a few days ago. The first patch is the a copy of the one he posted. I was wondering if it was a good idea to add support for commands like rev..-. Files that starts with - requires

[PATCH 1/2] - and @{-1} on various programs

2015-03-16 Thread Kenny Lee Sin Cheong
From: Junio C Hamano gits...@pobox.com JFF stands for just for fun. This is not meant to give out a model answer and is known to be incomplete, but I was wondering if it would be a better direction to allow - as a stand-in for @{-1} everywhere we allow a branch name, losing workarounds at the

[PATCH 2/2] Add revision range support on - and @{-1}

2015-03-16 Thread Kenny Lee Sin Cheong
Currently it is not be possible to do something like git checkout master git checkout next git log -.. to see what master has on top of master. Allows use of the revision range such as rev..- or -..rev to see what HEAD has on top of rev or vice versa, respectively. Also allows use of symmetric

[PATCH] refs.c: get_ref_cache: use a bucket hash

2015-03-16 Thread Andreas Krey
get_ref_cache used a linear list, which obviously is O(n^2). Use a fixed bucket hash which just takes a factor of 10 (~ 317^2) out of the n^2 - which is enough. Signed-off-by: Andreas Krey a.k...@gmx.de --- This brings 'git clean -ndx' times down from 17 minutes to 11 seconds on one of our

Re: [RFC] git submodule purge

2015-03-16 Thread Junio C Hamano
Patrick Steinhardt p...@pks.im writes: I think there should be a command that is able to remove those dangling repositories if the following conditions are met: - the submodule should not be initialized - the submodule should not have an entry in .gitmodules in the currently checked out

[PATCH] [RFC] Add a new config. option for skipping merges in git-log

2015-03-16 Thread Koosha Khajehmoogahi
This patch adds a 'showmerges' config. option for git-log. This option determines whether the log should contain merge commits or not. In essence, if this option is set to false, git-log will be run as 'git-log --no-merges'. To force git-log to show merges even if 'log.showmerges' is set, we use

Re: [GSoC] Applying for conversion scripts to builtins

2015-03-16 Thread Matthieu Moy
Yurii Shevtsov unge...@gmail.com writes: I'm going to write for this idea. As I know good proposal should contain timeline and Todo estimations. What should I write in my proposal, since there is no clear plan for converting scripts to builtins. Thanks in advance! The fact that there is no

Re: Promoting Git developers

2015-03-16 Thread Stefan Beller
On Mon, Mar 16, 2015 at 2:20 AM, David Kastrup d...@gnu.org wrote: Git Annotate? Git Praise as opposed to blame? Git Who as a pun on the subcommand structure which doesn't always follows grammar? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

[BUG] git svn's --localtime seems to corrupt time zones

2015-03-16 Thread Christoph Anton Mitterer
Hi. I was converting some very old svn repos of mine into git using git svn, and since I didn't fully trust the conversion process I wrote a small tool which goes through all commits/revisions (there were no branches or non-linear stuff involved in these svn repos) and compares the author names,

Re: [PATCH/RFC][GSoC] make git diff --no-index $directory $file DWIM better.

2015-03-16 Thread Yurii Shevtsov
Yes, I have red what you wrote several times and tried your example. I'm really sorry if I sound like I just ignored it. I just got a little bit lost about which procedure needs patching. You're absolutely right, queue_diff() is wrong place for it. So do you agree that append the name of the file

Re: [PATCH] refs.c: get_ref_cache: use a bucket hash

2015-03-16 Thread Junio C Hamano
Andreas Krey a.k...@gmx.de writes: get_ref_cache used a linear list, which obviously is O(n^2). Use a fixed bucket hash which just takes a factor of 10 (~ 317^2) out of the n^2 - which is enough. Signed-off-by: Andreas Krey a.k...@gmx.de --- This brings 'git clean -ndx' times down

Re: [PATCH/RFC][GSoC] make git diff --no-index $directory $file DWIM better.

2015-03-16 Thread Junio C Hamano
Yurii Shevtsov unge...@gmail.com writes: ... As it stands now, even before we think about dwimming diff D/ F into diff D/F F, a simple formulation like this will error out. $ mkdir -p a/sub b $ touch a/file b/file b/sub a/sub/file $ git diff --no-index a b error:

Re: [PATCH] refs.c: get_ref_cache: use a bucket hash

2015-03-16 Thread Thomas Gummerer
Hi, On 03/16, Andreas Krey wrote: get_ref_cache used a linear list, which obviously is O(n^2). Use a fixed bucket hash which just takes a factor of 10 (~ 317^2) out of the n^2 - which is enough. Signed-off-by: Andreas Krey a.k...@gmx.de --- This brings 'git clean -ndx' times down from

Re: [PATCH] [RFC] Add a new config. option for skipping merges in git-log

2015-03-16 Thread Junio C Hamano
Koosha Khajehmoogahi koo...@posteo.de writes: This patch adds a 'showmerges' config. option for git-log. This option determines whether the log should contain merge commits or not. In essence, if this option is set to false, git-log will be run as 'git-log --no-merges'. To force git-log to

Re: Promoting Git developers

2015-03-16 Thread Junio C Hamano
David Lang da...@lang.hm writes: On Sun, 15 Mar 2015, Junio C Hamano wrote: Christian Couder christian.cou...@gmail.com writes: I wrote something about a potential Git Rev News news letter: I read it. Sounds promising. Just one suggestion on the name and half a comment. How would Git

Re: [PATCH] refs.c: get_ref_cache: use a bucket hash

2015-03-16 Thread Junio C Hamano
Jeff King p...@peff.net writes: The get_ref_cache code was designed to scale to the actual number of submodules. I do not mind seeing it become a hash if people really do have a large number of submodules, but that is not what is happening here. ... So git-clean speculatively asks what is

[PATCH v4 2/2] sha1_file: refactor sha1_file.c to support 'cat-file --literally'

2015-03-16 Thread Karthik Nayak
Modify sha1_loose_object_info() to support 'cat-file --literally' by accepting flags and also make changes to copy the type to object_info::typename. Add parse_sha1_header_extended() which acts as a wrapper around parse_sha1_header() allowing for more information to be obtained based on the given

[PATCH v4 1/2] cat-file: teach cat-file a '--literally' option

2015-03-16 Thread Karthik Nayak
Currently 'git cat-file' throws an error while trying to print the type or size of a broken/corrupt object which is created using 'git hash-object --literally'. This is because these objects are usually of unknown types. Teach git cat-file a '--literally' option where it prints the type or size

Re: Promoting Git developers

2015-03-16 Thread David Lang
On Mon, 16 Mar 2015, Junio C Hamano wrote: David Lang da...@lang.hm writes: On Sun, 15 Mar 2015, Junio C Hamano wrote: Christian Couder christian.cou...@gmail.com writes: I wrote something about a potential Git Rev News news letter: I read it. Sounds promising. Just one suggestion on

[PATCH v4 0/2] cat-file: add a '--literally' option

2015-03-16 Thread karthik nayak
Based on Junios and Erics suggestion I have made various changes over the previous iteration of the patch[1]. Changes in this version : * Add a object_info::typename to hold all the typenames. * Add a wrapper around parse_sha1_header() to get type and size of broken/corrupt objects without

Re: [PATCH] refs.c: get_ref_cache: use a bucket hash

2015-03-16 Thread Jeff King
On Mon, Mar 16, 2015 at 10:35:18PM -0700, Junio C Hamano wrote: It looks like we don't even really care about the value of HEAD. We just want to know is it a git directory?. I think in other places (like git add), we just do an existence check for $dir/.git. That would not catch a bare

Re: [PATCH] [RFC] Add a new config. option for skipping merges in git-log

2015-03-16 Thread Koosha Khajehmoogahi
On 03/16/2015 09:50 PM, Junio C Hamano wrote: The command line overrides the config, no? If you set up what the command line defaults to from the config, let the command line parser do whatever it wants to do, and do nothing else after the command line parser returns, wouldn't that be

Re: [PATCH] [RFC] Add a new config. option for skipping merges in git-log

2015-03-16 Thread Junio C Hamano
Koosha Khajehmoogahi koo...@posteo.de writes: On 03/16/2015 09:50 PM, Junio C Hamano wrote: The command line overrides the config, no? If you set up what the command line defaults to from the config, let the command line parser do whatever it wants to do, and do nothing else after the

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-16 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: From: Junio C Hamano gits...@pobox.com Hence, if you have a history that looks like this: G...1---2---3---4---6---8---B \ 5---7---B it follows that 4 must also be bad. It used to be good long time ago

Re: [PATCH RFC 1/3] add: add new --exclude option to git add

2015-03-16 Thread Alexander Kuleshov
Isn't the problem one of how are users to discover such magic. Yes it was main reason. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH RFC 1/3] add: add new --exclude option to git add

2015-03-16 Thread Torsten Bögershausen
One little question, how to better resend it? Just send v2 for the 1/3 or resend all with v2? Or maybe will be better to make one patch from these 3 pathes? Thank you. My personal suggestion would be: Please wait 24 hours to collect feedback from the different time-zones in the world, where

Re: [PATCH v5 2/2] t7102: add 'reset -' tests

2015-03-16 Thread Sudhanshu Shekhar
Hi, On Sat, Mar 14, 2015 at 2:40 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Fri, Mar 13, 2015 at 2:18 PM, Sudhanshu Shekhar sudshekha...@gmail.com wrote: Add following test cases: 1) Confirm error message when git reset is used with no previous branch 2) Confirm git reset - works

Re: [PATCH 2/2] Add revision range support on - and @{-1}

2015-03-16 Thread Junio C Hamano
Kenny Lee Sin Cheong kenny.le...@gmail.com writes: diff --git a/revision.c b/revision.c index 7778bbd..a79b443 100644 --- a/revision.c +++ b/revision.c @@ -1490,6 +1490,7 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi int symmetric =

Re: [PATCH] refs.c: get_ref_cache: use a bucket hash

2015-03-16 Thread Andreas Krey
On Mon, 16 Mar 2015 10:23:05 +, Junio C Hamano wrote: Andreas Krey a.k...@gmx.de writes: ... say a lot of ignored directories, but do you mean directories in the working tree (which I suppose do not have much to do with the submodule_ref_caches[])? Apparently, they do. I am guessing

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-16 Thread Junio C Hamano
Kevin Daudt m...@ikke.info writes: So this ref changes to the bad commit. For refs/bisect/good-*, I could only find an example snippet: GOOD=$(git for-each-ref --format=%(objectname) refs/bisect/good-*) But it's not really clear what * might be expanded to, nor what they mean. I guess

Re: [PATCH v3] log: forbid log --graph --no-walk

2015-03-16 Thread Manos Pitsidianakis
On 03/15/2015 03:39 AM, Dongcan Jiang wrote: Because revs-no_walk gets set when it comes to git show. So basically rewriting t4052-stat-output.sh to exclude git show --graph cases (or similar) is not enough. If rewriting git-show code is what is needed, is that in the scope of a microproject? --

Re: [PATCH v3] log: forbid log --graph --no-walk

2015-03-16 Thread Junio C Hamano
Manos Pitsidianakis epi...@norn.io writes: On 03/15/2015 03:39 AM, Dongcan Jiang wrote: Because revs-no_walk gets set when it comes to git show. So basically rewriting t4052-stat-output.sh to exclude git show --graph cases (or similar) is not enough. If rewriting git-show code is what is

Re: [PATCH v3] log: forbid log --graph --no-walk

2015-03-16 Thread Manos Pitsidianakis
On 03/16/2015 09:08 PM, Junio C Hamano wrote: Perhaps 13b25381 (revision: forbid combining --graph and --no-walk, 2015-03-11) that is queued on 'pu' would be a good answer to this question? Didn't notice a patch was queued on 'pu', thanks. -- To unsubscribe from this list: send the line

Re: [PATCH/RFC][GSoC] make git diff --no-index $directory $file DWIM better.

2015-03-16 Thread Junio C Hamano
Yurii Shevtsov unge...@gmail.com writes: Yes, I have red what you wrote several times and tried your example. I'm really sorry if I sound like I just ignored it. I just got a little bit lost about which procedure needs patching. You're absolutely right, queue_diff() is wrong place for it. So

Re: What is XDG_CONFIG_HOME for exactly?

2015-03-16 Thread Matthieu Moy
On Sun, Mar 15, 2015 at 6:37 PM, Robert Dailey rcdailey.li...@gmail.com wrote: My understanding is that git reads the priority of configuration as follows: 1. local_repo/.git/config 2. $HOME/.gitconfig 3. $XDG_CONFIG_HOME/git/config $HOME/.gitconfig is the traditional Unix location for

Re: [PATCH] [RFC] Add a new config. option for skipping merges in git-log

2015-03-16 Thread Koosha Khajehmoogahi
On 03/16/2015 06:53 PM, Junio C Hamano wrote: Koosha Khajehmoogahi koo...@posteo.de writes: This patch adds a 'showmerges' config. option for git-log. This option determines whether the log should contain merge commits or not. In essence, if this option is set to false, git-log will be run

Re: [RFC] git submodule purge

2015-03-16 Thread Jonathan Nieder
(+cc: Jens and Heiko, submodule experts) Hi, Patrick Steinhardt wrote: This proposal is just for discussion. If there is any interest I will implement the feature and send some patches. Currently it is hard to properly remove submodules. That is when a submodule is deinitialized and removed

[PATCH] show-branch: show all local heads when only giving one rev along --topics

2015-03-16 Thread Mike Hommey
git show-branch --topics rev revs... displays ancestry graph, only considering commits that are in all given revs, except the first one. git show-branch displays ancestry graph for all local branches. Unfortunately, git show-branch --topics rev only prints out the rev info for the given rev, and

Re: Promoting Git developers

2015-03-16 Thread Christian Couder
On Sun, Mar 15, 2015 at 11:43 PM, Randall S. Becker rsbec...@nexbridge.com wrote: On March 15, 2015 6:19 PM Christian Couder wrote: snip Just one suggestion on the name and half a comment. How would Git Review (or Git Monthly Review, or replace your favourite how-often-per-period-ly in its

Re: Promoting Git developers

2015-03-16 Thread David Kastrup
Christian Couder christian.cou...@gmail.com writes: On Sun, Mar 15, 2015 at 11:43 PM, Randall S. Becker rsbec...@nexbridge.com wrote: On March 15, 2015 6:19 PM Christian Couder wrote: snip Just one suggestion on the name and half a comment. How would Git Review (or Git Monthly Review, or