Re: [PATCH 3/3] clone: add `--seed` shorthand

2015-05-21 Thread Philip Oakley
From: Johannes Schindelin johannes.schinde...@gmx.de Hi Peff, On 2015-05-21 06:16, Jeff King wrote: diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index f1f2a3f..ffeb03b 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -107,6 +107,9 @@

Issue when merging a subtree whose a file has been removed

2015-05-21 Thread adatoccpptranslator
Hi all, I want to use subtrees in one of my projects and I use method desribed here https://git-scm.com/book/en/v1/Git-Tools-Subtree-Merging I`m facing issues when merging subtree in my subproject in case some files have been removed from the subtree. I`m running git 1.9.1 on Kubuntu 14.04

Re: [PATCH 02/14] pull: pass verbosity, --progress flags to fetch and merge

2015-05-21 Thread Johannes Schindelin
Hi Paul, On 2015-05-21 11:48, Paul Tan wrote: On Tue, May 19, 2015 at 1:41 AM, Johannes Schindelin johannes.schinde...@gmx.de wrote: On 2015-05-18 17:05, Paul Tan wrote: diff --git a/builtin/pull.c b/builtin/pull.c index 0b771b9..a4d9c92 100644 --- a/builtin/pull.c +++ b/builtin/pull.c

RE: Troubleshoot clone issue to NFS.

2015-05-21 Thread steve.norman
On Thu, May 21, 2015a at 9:31 PM, Duy Nguyen [mailto:pclo...@gmail.com], did scribble: In case an object is not found pack directory is re-read again, which might cause some increased load on nfs. has_sha1_file() not finding the object should not happen often.. That last statement is

Re: [PATCH 3/3] clone: add `--seed` shorthand

2015-05-21 Thread Johannes Schindelin
Hi Peff, On 2015-05-21 06:16, Jeff King wrote: diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index f1f2a3f..ffeb03b 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -107,6 +107,9 @@ objects from the source repository into a pack in the

Re: [PATCH v10 5/5] help: respect new common command grouping

2015-05-21 Thread Eric Sunshine
On Thu, May 21, 2015 at 12:16 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: + puts(_(These are common Git commands used in various situations:)); The clause in various situations is quite nebulous and thus adds no substance. FWIW I view

Re: recovering from unordered stage entries in index error

2015-05-21 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: This message can be improved to show what entries have this problem. But then I don't see any way to recover the index manually. ls-files will die too. Isn't this failure coming from git-svn that tries to write out a tree after it prepared whatever it

[PATCH v3 0/4] submodule config lookup API

2015-05-21 Thread Heiko Voigt
This is finally the next iteration of the submodule config api. The last iteration can be found here: http://article.gmane.org/gmane.comp.version-control.git/252601 This iteration fixes the lookup of submodules by name (submodule_from_name()) where one needed to pass in the gitmodule sha1 by

[PATCH v3 1/4] implement submodule config cache for lookup of submodule names

2015-05-21 Thread Heiko Voigt
This submodule configuration cache allows us to lazily read .gitmodules configurations by commit into a runtime cache which can then be used to easily lookup values from it. Currently only the values for path or name are stored but it can be extended for any value needed. It is expected that

[PATCH v3 2/4] extract functions for submodule config set and lookup

2015-05-21 Thread Heiko Voigt
This is one step towards using the new configuration API. We just extract these functions to make replacing the actual code easier. Signed-off-by: Heiko Voigt hvo...@hvoigt.net --- submodule.c | 142 +--- 1 file changed, 97 insertions(+),

[PATCH v3 4/4] do not die on error of parsing fetchrecursesubmodules option

2015-05-21 Thread Heiko Voigt
We should not die when reading the submodule config cache since the user might not be able to get out of that situation when the configuration is part of the history. We should handle this condition later when the value is about to be used. Signed-off-by: Heiko Voigt hvo...@hvoigt.net ---

[PATCH v3 3/4] use new config API for worktree configurations of submodules

2015-05-21 Thread Heiko Voigt
We remove the extracted functions and directly parse into and read out of the cache. This allows us to have one unified way of accessing submodule configuration values specific to single submodules. Regardless whether we need to access a configuration from history or from the worktree.

TV MOUNT

2015-05-21 Thread t...@a.81510.net
Dear Sirs, Happy to contact you ! We would like to introduce our company as a large scale Audio-Video Accessories enterprise, LCD TV Wall Mount, LCD trolley, Projector Stand,Microphone Stand,Ceiling Mount,Laptop Stand, Monitor Stand,Camera Stand as the main product. We could supply good

Re: Occasional wrong behavior of rev-walking (rev-list, log, etc.)

2015-05-21 Thread Junio C Hamano
Mike Hommey m...@glandium.org writes: My guess is that rev-walking is tripping on the fact that this repository has commit dates in random order. Yeah, that is well known (look for SLOP both in the code and list archive). -- To unsubscribe from this list: send the line unsubscribe git in the

Re: [PATCH v10 5/5] help: respect new common command grouping

2015-05-21 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: + + puts(_(These are common Git commands used in various situations:)); The clause in various situations is quite nebulous and thus adds no substance. FWIW I view the latter half of that sentence as explaining the group labels which we did

Re: [PATCH] doc: fix inconsistent spelling of packfile

2015-05-21 Thread Junio C Hamano
Patrick Steinhardt p...@pks.im writes: Fix remaining instances where pack-file is used instead of packfile. Signed-off-by: Patrick Steinhardt p...@pks.im --- This patch now also fixes instances where we refer to EBNF-style command line parameters, as discussed by Junio and Peff. Thanks.

Re: [PATCH/RFC 0/3] --seed as an alias for --dissociate --reference

2015-05-21 Thread Junio C Hamano
Jeff King p...@peff.net writes: Yeah, I was just looking over the list archives for the past few months, for things I had marked as to read and think about later[1]. ... [1] My think about later mailbox has ~5000 messages in it, some of which are from 2010. I think I may need to just

Re: identical hashes on two branches, but holes in git log

2015-05-21 Thread Junio C Hamano
Philippe De Muyter p...@macq.eu writes: So we trade correctness for speed :( No corretness is traded with anything else here. There are applications where topology matters and where it doesn't. When topology really matters (e.g. drawing the graph), the caller can choose to use --topo-order to

Re: [PATCH v10 5/5] help: respect new common command grouping

2015-05-21 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: Hmm, but is it necessary to explain the group labels in the first place? The help output (group labels and all) seems self-explanatory already, and one would expect (hope) that readers are intelligent enough to understand implicitly that the group

Re: [PATCH 2/4] ref-filter: add ref-filter API

2015-05-21 Thread karthik nayak
On 05/21/2015 02:17 PM, Matthieu Moy wrote: Karthik Nayak karthik@gmail.com writes: +static int match_name_as_path(const char **pattern, const char *refname) I would have appreciated a short docstring. The full doc would probably be as long as the code, but a few examples of what

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-21 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: Reorder the paragraphs such that the first short paragraph introduces the submodule concept, the second paragraph highlights the usage of the submodule command, the third paragraph giving background information, and finally the fourth paragraph

Re: [PATCH v4 8/8] t5520: check reflog action in fast-forward merge

2015-05-21 Thread Junio C Hamano
Paul Tan pyoka...@gmail.com writes: On Mon, May 18, 2015 at 11:20 PM, Johannes Schindelin ... + sed s/$_x05[0-9a-f]*/OBJID/g reflog.actual reflog.fuzzy Actually, let's use s/^[0-9a-f]*/OBJID/ instead: you only want to replace the first few characters. Did you mean

Re: [PATCH 2/4] ref-filter: add ref-filter API

2015-05-21 Thread karthik nayak
On 05/21/2015 12:37 AM, Eric Sunshine wrote: On Wed, May 20, 2015 at 9:18 AM, Karthik Nayak karthik@gmail.com wrote: add a ref-filter API to provide functions to filter refs for listing. This will act as a common library for commands like 'tag -l', 'branch -l' and 'for-each-ref'. ref-filter

[PATCH v11 3/5] generate-cmdlist: parse common group commands

2015-05-21 Thread Sébastien Guimmara
From: Eric Sunshine sunsh...@sunshineco.com Parse the group block to create the array of group descriptions: static char *common_cmd_groups[] = { N_(starting a working area), N_(working on the current change), N_(working with others), N_(examining the history and state),

<    1   2