Re: [PATCH] submodule: Improve documentation of update subcommand

2015-03-02 Thread Michal Sojka
On Mon, Feb 23 2015, Junio C Hamano wrote: Michal Sojka sojk...@fel.cvut.cz writes: The documentation of 'git submodule update' has several problems: Thanks, this round looks much better. diff --git a/Documentation/config.txt b/Documentation/config.txt index ae6791d..fb2ae37 100644 ---

Re: [PATCH v6] submodule: Improve documentation of update subcommand

2015-03-02 Thread Junio C Hamano
Thanks, will queue. I think this round should be ready for 'next'. -- 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 v2 4/7] struct ref_lock: delete the force_write member

2015-03-02 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: Instead, compute the value when it is needed. @@ -2318,8 +2317,6 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname, lock-ref_name = xstrdup(refname); lock-orig_ref_name = xstrdup(orig_refname); ref_file =

[PATCH v5] submodule: Improve documentation of update subcommand

2015-03-02 Thread Michal Sojka
The documentation of 'git submodule update' has several problems: 1) It mentions that value 'none' of submodule.$name.update can be overridden by --checkout, but other combinations of configuration values and command line options are not mentioned. 2) The documentation of

What's cooking in git.git (Mar 2015, #01; Mon, 2)

2015-03-02 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. Fifth batch of topics have been merged to 'master', including both fixes and enhancements. First maintenance release for v2.3 was cut with many

Re: weaning distributions off tarballs: extended verification of git tags

2015-03-02 Thread Duy Nguyen
On Tue, Mar 3, 2015 at 1:12 AM, Joey Hess i...@joeyh.name wrote: I support this proposal, as someone who no longer releases tarballs of my software, when I can possibly avoid it. I have worried about signed tags / commits only being a SHA1 break away from useless. As to the implementation,

Re: [PATCH v2 5/7] reflog: improve and update documentation

2015-03-02 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: +Reference logs, or reflogs, record when the tips of branches and +other references were updated in the local repository. Reflogs are +useful in various Git commands, to specify the old value of a +reference. For example, `HEAD@{2}` means where

Re: [PATCH v2 0/7] Fix some problems with reflog expiration

2015-03-02 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: This is v2 of the patch series. Thanks to Eric Sunshine, Stefan Beller, Peff, and Junio for their comments about v1 [1]. Thanks for a pleasant read. Will replace what has been queued. -- To unsubscribe from this list: send the line unsubscribe

[GSoC idea] Resumable clone

2015-03-02 Thread Koosha Khajehmoogahi
Among GSoC 2011 ideas of git [1], it was proposed that a GSoC project could be implementing resumable clone for git. AFAIK, this feature is still missing in git but could be a great idea to be implemented. Does that sound OK to the community? [1]:

[PATCH v6] submodule: Improve documentation of update subcommand

2015-03-02 Thread Michal Sojka
The documentation of 'git submodule update' has several problems: 1) It mentions that value 'none' of submodule.$name.update can be overridden by --checkout, but other combinations of configuration values and command line options are not mentioned. 2) The documentation of

Re: weaning distributions off tarballs: extended verification of git tags

2015-03-02 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Tue, Mar 3, 2015 at 1:12 AM, Joey Hess i...@joeyh.name wrote: I support this proposal, as someone who no longer releases tarballs of my software, when I can possibly avoid it. I have worried about signed tags / commits only being a SHA1 break away from

Re: [GSoC idea] Resumable clone

2015-03-02 Thread Duy Nguyen
On Tue, Mar 3, 2015 at 6:47 AM, Junio C Hamano gits...@pobox.com wrote: Koosha Khajehmoogahi koosha.kha...@gmail.com writes: Among GSoC 2011 ideas of git [1], it was proposed that a GSoC project could be implementing resumable clone for git. AFAIK, this feature is still missing in git but

git notes from incoming patch

2015-03-02 Thread Keller, Jacob E
Hi, I am wondering whether it is possible to read from a format-patch input and add notes when we generate the applied patch. The use case is to be able to send patches that had notes appended via $git format-patch --notes ... And have notes objects created on the remote repository to store

Re: [GSoC idea] Resumable clone

2015-03-02 Thread Junio C Hamano
Koosha Khajehmoogahi koosha.kha...@gmail.com writes: Among GSoC 2011 ideas of git [1], it was proposed that a GSoC project could be implementing resumable clone for git. AFAIK, this feature is still missing in git but could be a great idea to be implemented. Does that sound OK to the

Re: weaning distributions off tarballs: extended verification of git tags

2015-03-02 Thread Duy Nguyen
On Tue, Mar 3, 2015 at 6:44 AM, Junio C Hamano gits...@pobox.com wrote: Duy Nguyen pclo...@gmail.com writes: On Tue, Mar 3, 2015 at 1:12 AM, Joey Hess i...@joeyh.name wrote: I support this proposal, as someone who no longer releases tarballs of my software, when I can possibly avoid it. I

Re: [RFC/PATCH 0/3] protocol v2

2015-03-02 Thread Duy Nguyen
On Mon, Mar 02, 2015 at 04:21:36PM +0700, Duy Nguyen wrote: On Sun, Mar 01, 2015 at 07:47:40PM -0800, Junio C Hamano wrote: It seems, however, that our current thinking is that it is OK to do the allow new v1 clients to notice the availabilty of v2 servers, so that they can talk v2 the next

Re: [PATCH] git: make was_alias and done_help non-static

2015-03-02 Thread Jeff King
On Mon, Mar 02, 2015 at 06:02:37PM +0600, Alexander Kuleshov wrote: 'was_alias' variable does not need to store it's value on each iteration in the loop, anyway this variable changes it's value with run_argv. 'done_help' variable does not need to be static variable too if we'll move it out

Re: [PATCH] Use unsigned char to squash compiler warnings

2015-03-02 Thread Junio C Hamano
Ben Walton bdwal...@gmail.com writes: Sun Studio on Solaris issues warnings about improper initialization values being used when defining tolower_trans_tbl in ctype.c. tolower_trans_tbl is defined as char[], which studio's compiler defaults to signed char[] due to the Solaris ABI. To resolve

Re: [PATCH v4 1/2] gitk: write only changed configuration variables

2015-03-02 Thread Max Kirillov
On Mon, Mar 02, 2015 at 10:47:30AM +1100, Paul Mackerras wrote: On Mon, Nov 10, 2014 at 12:20:01AM +0200, Max Kirillov wrote: +lappend views_modified_names $current_viewname($v) This view_modified_names variable doesn't seem to be used anywhere. If you don't mind me taking out

Re: weaning distributions off tarballs: extended verification of git tags

2015-03-02 Thread Sam Vilain
On 03/02/2015 12:08 PM, Junio C Hamano wrote: I have a hazy recollection of what it would take to replace SHA-1 in git with something else; it should be possible (though tricky) to do it lazily, where a tree entry has bits (eg, some of the currently unused file mode bits) to denotes which hash

[PATCH 3/3] Documentation/git-hash-object.txt: add verbose option for hash-object

2015-03-02 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- Documentation/git-hash-object.txt | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt index 02c1f12..efec7c6 100644 ---

[PATCH v3] diff --shortstat --dirstat: remove duplicate output

2015-03-02 Thread Mårten Kongstad
When --shortstat is used in conjunction with --dirstat=changes, git diff will output the dirstat information twice: first as calculated by the 'lines' algorithm, then as calculated by the 'changes' algorithm: $ git diff --dirstat=changes,10 --shortstat v2.2.0..v2.2.1 23 files changed,

[PATCH] git: make was_alias and done_help non-static

2015-03-02 Thread Alexander Kuleshov
'was_alias' variable does not need to store it's value on each iteration in the loop, anyway this variable changes it's value with run_argv. 'done_help' variable does not need to be static variable too if we'll move it out the loop. So these variables do not need to be static. Signed-off-by:

Move commits not in origin to a branch

2015-03-02 Thread shawn wilson
How do I move commits I haven't pushed into a new branch? % git log origin..master --pretty=format:'%h' f7d3a19 1f186c9 66d99f6 Which I'd like to be in a new branch. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

[PATCH 1/3] hash-object: add -v/--verbose option

2015-03-02 Thread Alexander Kuleshov
This patch provides ability to pass -v/--verbose option to the git hash-object command. hash-object will print not only hash, but also file path of a file from what hash was calculated. It can be useful in scripting, especially with --stdin-paths option. For example: $ git hash-object -v test

[PATCH 2/3] t1007-hash-object: add tests for verbose hash-object

2015-03-02 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- t/t1007-hash-object.sh | 11 +++ 1 file changed, 11 insertions(+) diff --git a/t/t1007-hash-object.sh b/t/t1007-hash-object.sh index f83df8e..fa957bf 100755 --- a/t/t1007-hash-object.sh +++ b/t/t1007-hash-object.sh @@ -201,4

Re: Move commits not in origin to a branch

2015-03-02 Thread Michael J Gruber
shawn wilson venit, vidit, dixit 02.03.2015 14:25: How do I move commits I haven't pushed into a new branch? % git log origin..master --pretty=format:'%h' f7d3a19 1f186c9 66d99f6 Which I'd like to be in a new branch. Do you want them to be on the new branch as they are, i.e. as

Re: [PATCH] git-remote.txt: describe behavior without --tags and --no-tags

2015-03-02 Thread Michael J Gruber
Francis Moreau venit, vidit, dixit 02.03.2015 14:36: Hi, On 03/02/2015 02:08 PM, Michael J Gruber wrote: Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Documentation/git-remote.txt | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git

[PATCH v2 2/7] write_ref_sha1(): Move write elision test to callers

2015-03-02 Thread Michael Haggerty
write_ref_sha1() previously skipped the write if the reference already had the desired value, unless lock-force_write was set. Instead, perform that test at the callers. Two of the callers (in rename_ref()) unconditionally set force_write just before calling write_ref_sha1(), so they don't need

[PATCH v2 3/7] lock_ref_sha1_basic(): do not set force_write for missing references

2015-03-02 Thread Michael Haggerty
If a reference is missing, its SHA-1 will be null_sha1, which can't possibly match a new value that ref_transaction_commit() is trying to update it to. So there is no need to set force_write in this scenario. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- refs.c | 15 ++- 1

[PATCH v2 4/7] struct ref_lock: delete the force_write member

2015-03-02 Thread Michael Haggerty
From: Stefan Beller sbel...@google.com Instead, compute the value when it is needed. Signed-off-by: Stefan Beller sbel...@google.com Edited-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- refs.c | 12 +++- 1 file changed, 7

[PATCH v2 6/7] reflog_expire(): ignore --updateref for symbolic references

2015-03-02 Thread Michael Haggerty
If we are expiring reflog entries for a symbolic reference, then how should --updateref be handled if the newest reflog entry is expired? Option 1: Update the referred-to reference. (This is what the current code does.) This doesn't make sense, because the referred-to reference has its own

[PATCH v2 1/7] write_ref_sha1(): remove check for lock == NULL

2015-03-02 Thread Michael Haggerty
None of the callers pass NULL to this function, and there doesn't seem to be any usefulness to allowing them to do so. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Reviewed-by: Stefan Beller sbel...@google.com --- refs.c | 4 1 file changed, 4 deletions(-) diff --git a/refs.c

[PATCH] git-remote.txt: describe behavior without --tags and --no-tags

2015-03-02 Thread Michael J Gruber
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Documentation/git-remote.txt | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index a77607b..f3f6f0d 100644 --- a/Documentation/git-remote.txt +++

Re: [PATCH] git-remote.txt: describe behavior without --tags and --no-tags

2015-03-02 Thread Francis Moreau
Hi, On 03/02/2015 02:08 PM, Michael J Gruber wrote: Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Documentation/git-remote.txt | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index

Re: feature request: excluding files/paths from git grep

2015-03-02 Thread Trevor Saunders
On Sun, Mar 01, 2015 at 03:22:11PM -0800, Junio C Hamano wrote: Trevor Saunders tbsau...@tbsaunde.org writes: ... For these per-invocation differences, attributes to declare permenent/inherent nature of the contents is much less suited than per-invocation inclusion/exclusion mechanism

Re: [RFC/PATCH 0/3] protocol v2

2015-03-02 Thread Duy Nguyen
On Sun, Mar 01, 2015 at 07:47:40PM -0800, Junio C Hamano wrote: It seems, however, that our current thinking is that it is OK to do the allow new v1 clients to notice the availabilty of v2 servers, so that they can talk v2 the next time thing, so my preference is to throw this client first and

[PATCH v2 7/7] reflog_expire(): never update a reference to null_sha1

2015-03-02 Thread Michael Haggerty
Currently, if --updateref is specified and the very last reflog entry is expired or deleted, the reference's value is set to 0{40}. This is an invalid state of the repository, and breaks, for example, git fsck and git for-each-ref. The only place we use --updateref in our own code is when

git-remote add: --no-tags/--tags which one is the default option

2015-03-02 Thread Francis Moreau
Hi, git remote add has --no-tags/--tags option, but I can't find in the man page which one is the default. Could anybody tell me the default option ? Thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

[PATCH v2 5/7] reflog: improve and update documentation

2015-03-02 Thread Michael Haggerty
Revamp the git reflog usage documentation in the manpage and the command help to match the current reality and improve its clarity: * Add documentation for some options that had been left out. * Group the subcommands and options more logically and move more common subcommands/options higher.

[PATCH v2 0/7] Fix some problems with reflog expiration

2015-03-02 Thread Michael Haggerty
This is v2 of the patch series. Thanks to Eric Sunshine, Stefan Beller, Peff, and Junio for their comments about v1 [1]. The two main changes since v1: * Don't change the locking policy for changing symbolic references. Even though the existing policy is partly broken, the change proposed in

Re: [RFC/PATCH 0/3] protocol v2

2015-03-02 Thread Duy Nguyen
On Sun, Mar 01, 2015 at 11:06:21PM -, Philip Oakley wrote: OK, maybe not exactly about protocol, but a possible option would be the ability to send the data as a bundle or multi-bundles; Or perhasps as an archive, zip, or tar. Data can then be exchanged across an airgap or pigeon mail.

Re: [PATCH 0/2] Tweaking the gitk window title.

2015-03-02 Thread Marc Branchaud
On 15-01-06 12:51 PM, Marc Branchaud wrote: The first patch simply changes the title from gitk: dir to dir - gitk, which is the title layout used by most of the applications on my Kubuntu box. The second patch is the one that I'm more keen to see accepted. It relies on the first only in

Re: Move commits not in origin to a branch

2015-03-02 Thread shawn wilson
On Mon, Mar 2, 2015 at 9:54 AM, Michael J Gruber g...@drmicha.warpmail.net wrote: shawn wilson venit, vidit, dixit 02.03.2015 14:25: How do I move commits I haven't pushed into a new branch? % git log origin..master --pretty=format:'%h' f7d3a19 1f186c9 66d99f6 Which I'd like to be in a

Re: [PATCH 1/3] hash-object: add -v/--verbose option

2015-03-02 Thread Michael J Gruber
Alexander Kuleshov venit, vidit, dixit 02.03.2015 14:55: This patch provides ability to pass -v/--verbose option to the git hash-object command. hash-object will print not only hash, but also file path of a file from what hash was calculated. It can be useful in scripting, especially with

Re: weaning distributions off tarballs: extended verification of git tags

2015-03-02 Thread Colin Walters
On Sat, Feb 28, 2015, at 03:34 PM, Morten Welinder wrote: Is there a point to including a different checksum inside a git tag? If someone can break the SHA-1 checksum in the repository then the recorded SHA-256 checksum can be changed. In other words, wouldn't you be just as well off

Re: weaning distributions off tarballs: extended verification of git tags

2015-03-02 Thread Joey Hess
I support this proposal, as someone who no longer releases tarballs of my software, when I can possibly avoid it. I have worried about signed tags / commits only being a SHA1 break away from useless. As to the implementation, checksumming the collection of raw objects is certainly superior to

Re: [PATCH v6 0/4] commit: Add commit.verbose configuration

2015-03-02 Thread Caleb Thompson
Hey Torstein. I'd planned to come back with a heavily simplified version of this that didn't include any of the related changes, just the feature and the new test, since a lot of that seemed controversial. That said, I haven't done so and you're welcome to take a whack at this feedback if you'd

Re: Git Scaling: What factors most affect Git performance for a large repo?

2015-03-02 Thread Ævar Arnfjörð Bjarmason
On Tue, Feb 24, 2015 at 1:44 PM, Michael Haggerty mhag...@alum.mit.edu wrote: On 02/20/2015 03:25 PM, Ævar Arnfjörð Bjarmason wrote: On Fri, Feb 20, 2015 at 1:09 PM, Ævar Arnfjörð Bjarmason ava...@gmail.com wrote: On Fri, Feb 20, 2015 at 1:04 AM, Duy Nguyen pclo...@gmail.com wrote: On Fri,

Re: [PATCHv2] Add hint interactive cleaning

2015-03-02 Thread Junio C Hamano
Jean-Noel Avila jn.av...@free.fr writes: For translators, specify that a y/N reply is needed. Signed-off-by: Jean-Noel Avila jn.av...@free.fr --- builtin/clean.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/clean.c b/builtin/clean.c index

Re: weaning distributions off tarballs: extended verification of git tags

2015-03-02 Thread Sam Vilain
On 03/02/2015 10:12 AM, Joey Hess wrote: I support this proposal, as someone who no longer releases tarballs of my software, when I can possibly avoid it. I have worried about signed tags / commits only being a SHA1 break away from useless. As to the implementation, checksumming the collection

Re: Git Scaling: What factors most affect Git performance for a large repo?

2015-03-02 Thread Ævar Arnfjörð Bjarmason
On Fri, Feb 20, 2015 at 10:04 PM, Junio C Hamano gits...@pobox.com wrote: Ævar Arnfjörð Bjarmason ava...@gmail.com writes: I actually ran this a few times while testing it, so this is a before and after on a hot cache of linux.git with 406 tags v.s. ~140k. I ran the gc + repack + bitmaps for

Re: [PATCH] t5516-fetch-push: Correct misspelled pushInsteadOf

2015-03-02 Thread Junio C Hamano
Anders Kaseorg ande...@mit.edu writes: Signed-off-by: Anders Kaseorg ande...@mit.edu --- t/t5516-fetch-push.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 85c7fec..594d7a6 100755 --- a/t/t5516-fetch-push.sh +++

[PATCH] Use unsigned char to squash compiler warnings

2015-03-02 Thread Ben Walton
Sun Studio on Solaris issues warnings about improper initialization values being used when defining tolower_trans_tbl in ctype.c. tolower_trans_tbl is defined as char[], which studio's compiler defaults to signed char[] due to the Solaris ABI. To resolve this, instead of supplying -xchar or

Re: weaning distributions off tarballs: extended verification of git tags

2015-03-02 Thread Junio C Hamano
Sam Vilain s...@vilain.net writes: As to the implementation, checksumming the collection of raw objects is certainly superior to tar. Colin had suggested sorting the objects by checksum, but I don't think that is necessary. Just stream the commit object, then its tree object, followed by the

Re: Git is accepted for Google Summer of Code 2015.

2015-03-02 Thread Jeff King
On Mon, Mar 02, 2015 at 09:05:50PM +0100, Matthieu Moy wrote: Everything is in the title :-). As a reminder, we have a list of ideas here: http://git.github.io/SoC-2015-Ideas.html As another reminder, we're short of potential mentors, so if you're willing to mentor a project this

Git is accepted for Google Summer of Code 2015.

2015-03-02 Thread Matthieu Moy
Everything is in the title :-). As a reminder, we have a list of ideas here: http://git.github.io/SoC-2015-Ideas.html As another reminder, we're short of potential mentors, so if you're willing to mentor a project this summer and you did not already say so, then please speak up. -- Matthieu

Re: Git is accepted for Google Summer of Code 2015.

2015-03-02 Thread karthik nayak
On 03/03/2015 01:35 AM, Matthieu Moy wrote: Everything is in the title :-). As a reminder, we have a list of ideas here: http://git.github.io/SoC-2015-Ideas.html As another reminder, we're short of potential mentors, so if you're willing to mentor a project this summer and you did not

Re: Git Scaling: What factors most affect Git performance for a large repo?

2015-03-02 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason ava...@gmail.com writes: On Fri, Feb 20, 2015 at 10:04 PM, Junio C Hamano gits...@pobox.com wrote: Ævar Arnfjörð Bjarmason ava...@gmail.com writes: I actually ran this a few times while testing it, so this is a before and after on a hot cache of linux.git with 406