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

2015-05-21 Thread Jeff King
On Thu, May 21, 2015 at 06:05:31PM +0200, Johannes Schindelin wrote: > > +--seed :: > > + A convenient shorthand for `--dissociate --reference=`. > > + > > Since you want to advertise this as an easier way than `--dissociate > --reference=`, it might make sense to avoid sending the reader > t

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

2015-05-21 Thread Jeff King
On Fri, May 22, 2015 at 08:37:56AM +0200, Johannes Schindelin wrote: > > +--seed :: > > +Fetch objects from or instead of the clone > > URL when possible. This is useful when a (possibly partial) clone > > already exists locally, to avoid transferring the same objects again. > > > > I haven

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

2015-05-21 Thread Matthieu Moy
karthik nayak writes: >> I miss a high-level description of what the code is doing. Essentially, >> there's the complete repository list of refs, and you want to filter >> only some of them, right? >> >> From the name, I would guess that ref_filter is the structure describing >> how you are filt

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

2015-05-21 Thread Johannes Schindelin
Hi Philip, On 2015-05-21 21:45, Philip Oakley wrote: > From: "Johannes Schindelin" >> >> 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/Documentat

Re: [PATCH 1/2] rebase -i: demonstrate incorrect behavior of post-rewrite hook with exec

2015-05-21 Thread Matthieu Moy
Eric Sunshine writes: >> +test_expect_failure 'git rebase -i (exec)' ' >> + git reset --hard D && >> + clear_hook_input && >> + FAKE_LINES="edit 1 exec_false 2" git rebase -i B > > Broken &&-chain. Thanks, will add in v2. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To

[PATCH v2] doc: fix inconsistent spelling of "packfile"

2015-05-21 Thread Patrick Steinhardt
Fix remaining instances where "pack-file" is used instead of "packfile". Some places remain where we still use "pack-file", This is the case when we explicitly refer to a file with a ".pack" extension as opposed to a data source providing a pack data stream. Signed-off-by: Patrick Steinhardt ---

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

2015-05-21 Thread Patrick Steinhardt
On Thu, May 21, 2015 at 09:37:14AM -0700, Junio C Hamano wrote: > Patrick Steinhardt writes: > > > Fix remaining instances where "pack-file" is used instead of > > "packfile". > > > > Signed-off-by: Patrick Steinhardt > > --- > > This patch now also fixes instances where we refer to EBNF-style >

Re: [PATCH v4] send-email: Add simple email aliases format

2015-05-21 Thread Eric Sunshine
On Thu, May 21, 2015 at 11:40 PM, Allen Hubbe wrote: > This format is more simple than the other alias file formats, so it may > be preferred by some users. [...] > Signed-off-by: Allen Hubbe > --- > diff --git a/Documentation/git-send-email.txt > b/Documentation/git-send-email.txt > index 80455

Re: [PATCH v2] send-email: Add simple email aliases format

2015-05-21 Thread Eric Sunshine
On Thu, May 21, 2015 at 11:19 PM, Allen Hubbe wrote: > On May 21, 2015 9:05 PM, "Eric Sunshine" wrote: >> On Thu, May 21, 2015 at 8:16 PM, Allen Hubbe wrote: >> > +test_expect_success $PREREQ 'sendemail.aliasfiletype=simple' ' >> > + clean_fake_sendmail && rm -fr outdir && >> > + git

[PATCH v4] send-email: Add simple email aliases format

2015-05-21 Thread Allen Hubbe
This format is more simple than the other alias file formats, so it may be preferred by some users. The format is as follows. : [, ...] Aliases are specified one per line. There is no line splitting. Anything on a line after and including a `#` symbol is considered a comment, and is ign

Re: [PATCH v3] send-email: Add simple email aliases format

2015-05-21 Thread Allen Hubbe
Please ignore v3... this is the same as v2 for some reason. I will resend as v4. On Thu, May 21, 2015 at 11:35 PM, Allen Hubbe wrote: > This format is more simple than the other alias file formats, so it may > be preferred by some users. The format is as follows. > > : [, ...] > > Alias

[PATCH v3] send-email: Add simple email aliases format

2015-05-21 Thread Allen Hubbe
This format is more simple than the other alias file formats, so it may be preferred by some users. The format is as follows. : [, ...] Aliases are specified one per line. There is no line splitting. Anything on a line after and including a `#` symbol is considered a comment, and is ign

Re: [PATCH v2] send-email: Add simple email aliases format

2015-05-21 Thread Allen Hubbe
On May 21, 2015 9:05 PM, "Eric Sunshine" wrote: > > On Thu, May 21, 2015 at 8:16 PM, Allen Hubbe wrote: > > This format is more simple than the other alias file formats, so it may > > be preferred by some users. The format is as follows. > > > > : [, ...] > > > > Aliases are specified one per li

Re: git p4 clone - exclude file types

2015-05-21 Thread FusionX86
Sure, but it doesn't show anything other than the last file that p4/git was working on. It's always a different file, but looks something like this: /path/to/file/somefile1 /path/to/file/somefile2 and then just hangs... It is trying to clone ~42846 files. The p4d server version is older. It has

Re: [PATCH v2] send-email: Add simple email aliases format

2015-05-21 Thread Eric Sunshine
On Thu, May 21, 2015 at 8:16 PM, Allen Hubbe wrote: > This format is more simple than the other alias file formats, so it may > be preferred by some users. The format is as follows. > > : [, ...] > > Aliases are specified one per line. There is no line splitting. > > Example: > alice: Al

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

2015-05-21 Thread Mike Hommey
On Thu, May 21, 2015 at 03:59:48PM -0700, Junio C Hamano wrote: > Depends on why you are running rev-list. > > If you want to know if one commit is contained in another, the way > that should work the most reliably is to use merge-base, as the > traversal engine of that command was written not to

[PATCH] test_bitmap_walk: free bitmap with bitmap_free

2015-05-21 Thread Jeff King
Commit f86a374 (pack-bitmap.c: fix a memleak, 2015-03-30) noticed that we leak the "result" bitmap. But we should use "bitmap_free" rather than straight "free", as the former remembers to free the bitmap array pointed to by the struct. Signed-off-by: Jeff King --- Sorry, I should have noticed thi

git p4 rebase --branch

2015-05-21 Thread FusionX86
For my Perforce to Git migration project, I am creating an empty local git repo and then running git p4 sync with --branch to bring code from Perforce into a specific Git branch. I'm going this route because I need to take two Perforce branches that are similar and put them into different branches

Re: [PATCH v3 08/14] remote.c: report specific errors from branch_get_upstream

2015-05-21 Thread Jeff King
On Thu, May 21, 2015 at 08:46:43PM -0400, Jeff King wrote: > On Thu, May 21, 2015 at 12:25:57PM -0700, Junio C Hamano wrote: > > > > Note also that the original may dereference branch->merge[0] even if it > > > is NULL. I think that can't actually happen in practice (we only > > > allocate branch

Re: [PATCH v3 08/14] remote.c: report specific errors from branch_get_upstream

2015-05-21 Thread Jeff King
On Thu, May 21, 2015 at 12:25:57PM -0700, Junio C Hamano wrote: > > Note also that the original may dereference branch->merge[0] even if it > > is NULL. I think that can't actually happen in practice (we only > > allocate branch->merge if we have at least one item to put in it, and > > all of the

Re: recovering from "unordered stage entries in index" error

2015-05-21 Thread Duy Nguyen
On Thu, May 21, 2015 at 11:49 PM, Junio C Hamano wrote: > Duy Nguyen 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

Re: Troubleshoot clone issue to NFS.

2015-05-21 Thread Duy Nguyen
On Thu, May 21, 2015 at 10:53 PM, wrote: > 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

[PATCH v2] send-email: Add simple email aliases format

2015-05-21 Thread Allen Hubbe
This format is more simple than the other alias file formats, so it may be preferred by some users. The format is as follows. : [, ...] Aliases are specified one per line. There is no line splitting. Example: alice: Alice W Land bob: Robert Bobbyton chloe: ch...@examp

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

2015-05-21 Thread Junio C Hamano
Depends on why you are running rev-list. If you want to know if one commit is contained in another, the way that should work the most reliably is to use merge-base, as the traversal engine of that command was written not to trust the commit timestamps but go with the topology alone. (pardon top-p

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

2015-05-21 Thread Mike Hommey
On Thu, May 21, 2015 at 09:41:55AM -0700, Junio C Hamano wrote: > Mike Hommey 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). I found t

Re: [PATCH] git-send-email.perl: Add sendmail aliases support

2015-05-21 Thread Allen Hubbe
On Thu, May 21, 2015 at 5:38 PM, Junio C Hamano wrote: > Allen Hubbe writes: > >> Those are good points. Maybe I shouldn't even mention sendmail at >> all, not in the name of the format, and not in the commit message. >> What name would be a good name for this format? > > "simple"? Alright, as

Re: [PATCH v5 3/3] upload-pack: optionally allow fetching reachable sha1

2015-05-21 Thread Junio C Hamano
Fredrik Medley writes: > --- a/Documentation/technical/protocol-capabilities.txt > +++ b/Documentation/technical/protocol-capabilities.txt > @@ -260,6 +260,13 @@ If the upload-pack server advertises this capability, > fetch-pack may > send "want" lines with SHA-1s that exist at the server but a

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-21 Thread Stefan Beller
On Thu, May 21, 2015 at 1:03 PM, Philip Oakley wrote: >> +Submodules are not to be confused with remotes, which are meant >> +mainly for branches of the same project; > > > This use of 'branches' didn't work for me. "remotes are meant mainly for > branches of the same project" ? > Maybe Subm

Re: [PATCH v5 2/3] upload-pack: prepare to extend allow-tip-sha1-in-want

2015-05-21 Thread Junio C Hamano
Fredrik Medley writes: > To allow future extensions, e.g. allowing non-tip sha1, replace the > boolean allow_tip_sha1_in_want variable with the flag-style > allow_request_with_bare_object_name variable. > > Signed-off-by: Fredrik Medley > --- > fetch-pack.c | 9 ++--- > upload-pack.c | 20

Re: git p4 clone - exclude file types

2015-05-21 Thread Luke Diamand
On 21/05/15 21:49, FusionX86 wrote: I thought about that, but no. The box I'm running git-p4 on has the following specs: CentOS 6.6 64bit 1 CPU 8GB RAM 8GB Swap Can you post the output, with "-v" added? $ git-p4 clone //depot/some/dir -v Also, what is your p4d server version? $ p4 info A q

Re: [PATCH] git-send-email.perl: Add sendmail aliases support

2015-05-21 Thread Junio C Hamano
Allen Hubbe writes: > Those are good points. Maybe I shouldn't even mention sendmail at > all, not in the name of the format, and not in the commit message. > What name would be a good name for this format? "simple"? And if you are going to define such a format, then I do not think you would e

Re: [PATCH] git-send-email.perl: Add sendmail aliases support

2015-05-21 Thread Allen Hubbe
On Thu, May 21, 2015 at 5:05 PM, Eric Sunshine wrote: > On Thu, May 21, 2015 at 4:48 PM, Allen Hubbe wrote: >> My motivation for this patch was not really to support the sendmail >> aliases file directly. The commit message may therefore be >> misleading. So, I could also rewrite the commit mes

Re: [PATCH v3] pull: handle --log=

2015-05-21 Thread Junio C Hamano
Paul Tan writes: > So, here's the re-rolled patch. Sigh, too late. I thought the previous round was good enough and the patch is already on 'next'. If the incremental change is still worth doing on top, please do so. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git"

Re: [PATCH] git-send-email.perl: Add sendmail aliases support

2015-05-21 Thread Junio C Hamano
Allen Hubbe writes: > The diff doesn't show enough context to include this comment: > > my %parse_alias = ( > # multiline formats can be supported in the future > ... > > I can't be sure the author's intent, but my interpretation is such. > The parsers do not support multiline, even thoug

Re: [PATCH 1/2] rebase -i: demonstrate incorrect behavior of post-rewrite hook with exec

2015-05-21 Thread Eric Sunshine
On Thu, May 21, 2015 at 2:13 PM, Matthieu Moy wrote: > The 'exec' command is sending the current commit to stopped-sha, which is > supposed to contain the original commit (before rebase). As a result, if > an 'exec' command fails, the next 'git rebase --continue' will send the > current commit as

Re: [PATCH] git-send-email.perl: Add sendmail aliases support

2015-05-21 Thread Eric Sunshine
On Thu, May 21, 2015 at 4:48 PM, Allen Hubbe wrote: > My motivation for this patch was not really to support the sendmail > aliases file directly. The commit message may therefore be > misleading. So, I could also rewrite the commit message to say > something like, "loosely based on" the sendmai

Re: git p4 clone - exclude file types

2015-05-21 Thread FusionX86
I thought about that, but no. The box I'm running git-p4 on has the following specs: CentOS 6.6 64bit 1 CPU 8GB RAM 8GB Swap It is also on the same physical network as the Perforce server. I remember seeing someone else complain about this, but I can't find the article/blog now. On Wed, May 20,

Re: [PATCH] git-send-email.perl: Add sendmail aliases support

2015-05-21 Thread Allen Hubbe
On Thu, May 21, 2015 at 4:19 PM, Junio C Hamano wrote: > Allen Hubbe writes: > >> diff --git a/git-send-email.perl b/git-send-email.perl >> index e1e9b14..5f2ec0d 100755 >> --- a/git-send-email.perl >> +++ b/git-send-email.perl >> @@ -515,7 +515,12 @@ my %parse_alias = ( >>

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

2015-05-21 Thread Philippe De Muyter
On Thu, May 21, 2015 at 08:58:35PM +0100, Philip Oakley wrote: > From: "Philippe De Muyter" > To: "Junio C Hamano" > Cc: ; "Jeff King" ; "John Keeping" > > Sent: Thursday, May 21, 2015 8:15 AM > Subject: Re: identical hashes on two branches, but holes in git log > > >> On Tue, May 19, 2015 at 0

[PATCH v5 1/3] config.txt: clarify allowTipSHA1InWant with camelCase

2015-05-21 Thread Fredrik Medley
Most of the options in config.txt are camelCase. Improve the readability for allowtipsha1inwant by changing to allowTipSHA1InWant. Signed-off-by: Fredrik Medley --- This patch is optional. There has been work on fixing the whole Documentation/config.txt which has not been merged yet. When adding

Re: [PATCH 1/3] l10: de.po: grammar fix

2015-05-21 Thread Ralf Thielow
2015-05-20 10:55 GMT+02:00 Michael J Gruber : > Stefan Beller venit, vidit, dixit 19.05.2015 23:46: >> On Tue, May 19, 2015 at 1:51 AM, Michael J Gruber >> wrote: >>> Signed-off-by: Michael J Gruber >>> --- >>> po/de.po | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git

[PATCH v5 3/3] upload-pack: optionally allow fetching reachable sha1

2015-05-21 Thread Fredrik Medley
With uploadpack.allowReachableSHA1InWant configuration option set on the server side, "git fetch" can make a request with a "want" line that names an object that has not been advertised (likely to have been obtained out of band or from a submodule pointer). Only objects reachable from the branch ti

[PATCH v5 2/3] upload-pack: prepare to extend allow-tip-sha1-in-want

2015-05-21 Thread Fredrik Medley
To allow future extensions, e.g. allowing non-tip sha1, replace the boolean allow_tip_sha1_in_want variable with the flag-style allow_request_with_bare_object_name variable. Signed-off-by: Fredrik Medley --- fetch-pack.c | 9 ++--- upload-pack.c | 20 +--- 2 files changed,

Re: [PATCH] git-send-email.perl: Add sendmail aliases support

2015-05-21 Thread Junio C Hamano
Allen Hubbe writes: > diff --git a/git-send-email.perl b/git-send-email.perl > index e1e9b14..5f2ec0d 100755 > --- a/git-send-email.perl > +++ b/git-send-email.perl > @@ -515,7 +515,12 @@ my %parse_alias = ( > $aliases{$alias} = [ split_addrs($addr) ]; >

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-21 Thread Philip Oakley
From: "Stefan Beller" It's better to start the man page with a description of what submodules actually are instead of saying what they are not. Reorder the paragraphs such that the first short paragraph introduces the submodule concept, the second paragraph highlights the usage of the submodul

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

2015-05-21 Thread Philip Oakley
From: "Philippe De Muyter" To: "Junio C Hamano" Cc: ; "Jeff King" ; "John Keeping" Sent: Thursday, May 21, 2015 8:15 AM Subject: Re: identical hashes on two branches, but holes in git log On Tue, May 19, 2015 at 03:12:31PM -0700, Junio C Hamano wrote: Philippe De Muyter writes: > On Tue

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

2015-05-21 Thread Philip Oakley
From: "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 repo

Re: [PATCH v3 08/14] remote.c: report specific errors from branch_get_upstream

2015-05-21 Thread Junio C Hamano
Jeff King writes: > On Thu, May 21, 2015 at 11:33:58AM -0700, Junio C Hamano wrote: > >> > +static const char *error_buf(struct strbuf *err, const char *fmt, ...) >> > { >> > - if (!branch || !branch->merge || !branch->merge[0]) >> > - return NULL; >> > + if (err) { >> > + va

Re: [PATCH v3 07/14] remote.c: introduce branch_get_upstream helper

2015-05-21 Thread Junio C Hamano
Jeff King writes: > On Thu, May 21, 2015 at 02:14:29PM -0400, Jeff King wrote: > >> There is a related cleanup I resisted, which is that several call-sites >> will call stat_tracking_info, then later look directly at >> branch->merge[0]->dst without a check for NULL (fill_tracking_info is >> such

[PATCH] submodule documentation: Rewrite introductory paragraphs

2015-05-21 Thread Stefan Beller
It's better to start the man page with a description of what submodules actually are instead of saying what they are not. 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 parag

[PATCH] git-send-email.perl: Add sendmail aliases support

2015-05-21 Thread Allen Hubbe
Support sendmail (and postfix) style email aliases in git-send-email. This is the format of /etc/mail/aliases, documented by `man 5 aliases`. The man page may be provided by sendmail or postfix on your system, or by another email service that uses the same configuration file. See also: http://www.

Re: [PATCH v3 0/4] submodule config lookup API

2015-05-21 Thread René Scharfe
Am 21.05.2015 um 19:06 schrieb Heiko Voigt: diff --git a/submodule-config.h b/submodule-config.h index 9061e4e..58afc83 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -24,6 +24,6 @@ const struct submodule *submodule_from_name(const unsigned char *commit_sha1, const c

Re: [PATCH v3 08/14] remote.c: report specific errors from branch_get_upstream

2015-05-21 Thread Jeff King
On Thu, May 21, 2015 at 11:33:58AM -0700, Junio C Hamano wrote: > > +static const char *error_buf(struct strbuf *err, const char *fmt, ...) > > { > > - if (!branch || !branch->merge || !branch->merge[0]) > > - return NULL; > > + if (err) { > > + va_list ap; > > +

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

2015-05-21 Thread Eric Sunshine
On Thu, May 21, 2015 at 1:30 PM, karthik nayak wrote: > On 05/21/2015 12:37 AM, Eric Sunshine wrote: >> On Wed, May 20, 2015 at 9:18 AM, Karthik Nayak >> wrote: >>> Makefile | 1 + >>> ref-filter.c | 73 >>> >>> ref-filter.h |

Re: [PATCH v3 0/4] submodule config lookup API

2015-05-21 Thread Junio C Hamano
Heiko Voigt writes: > 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

Re: [PATCH v3 0/14] implement @{push} shorthand

2015-05-21 Thread Junio C Hamano
Jeff King writes: > On Thu, May 21, 2015 at 12:44:29AM -0400, Jeff King wrote: > >> This is a re-roll of the series at: >> >> http://thread.gmane.org/gmane.comp.version-control.git/268185 >> >> The only changes here are the addition of patches 2 and 6, which are >> both cleanups that help mak

Hello dear

2015-05-21 Thread Roseanna Martins
Hello dear I am Mrs Roseanna Martins from Sierra-Leone,a widow suffering from long time (neck cancer) illness,I sent you letter a month ago, but I'm not sure you received it, what his email fast, because I have not heard from you, this is the reason why I repeat. I have decided to hand over all m

Re: [PATCH v3 07/14] remote.c: introduce branch_get_upstream helper

2015-05-21 Thread Jeff King
On Thu, May 21, 2015 at 02:14:29PM -0400, Jeff King wrote: > There is a related cleanup I resisted, which is that several call-sites > will call stat_tracking_info, then later look directly at > branch->merge[0]->dst without a check for NULL (fill_tracking_info is > such a site). > > This works b

Re: [PATCH v3 08/14] remote.c: report specific errors from branch_get_upstream

2015-05-21 Thread Junio C Hamano
Jeff King writes: > diff --git a/remote.c b/remote.c > index dca3442..1b7051a 100644 > --- a/remote.c > +++ b/remote.c > @@ -1705,10 +1705,35 @@ int branch_merge_matches(struct branch *branch, > return refname_match(branch->merge[i]->src, refname); > } > > -const char *branch_get_upstrea

Re: [PATCH v11 0/5] group common commands by theme

2015-05-21 Thread Eric Sunshine
On Thu, May 21, 2015 at 1:39 PM, Sébastien Guimmara wrote: > Just a minor change, the modification of new-command.txt was squashed to > 2/5 instead of 1/5. Thanks. With or without addressing the two very minor nits I pointed out in patches 2/5 and 5/5, this entire patch series (v11) is: Reviewed

[PATCH 2/2] rebase -i: fix post-rewrite hook with failed exec command

2015-05-21 Thread Matthieu Moy
Usually, when 'git rebase' stops before completing the rebase, it is to give the user an opportunity to edit a commit (e.g. with the 'edit' command). In such cases, 'git rebase' leaves the sha1 of the commit being rewritten in "$state_dir"/stopped-sha, and subsequent 'git rebase --continue' will ca

Re: [PATCH v3 07/14] remote.c: introduce branch_get_upstream helper

2015-05-21 Thread Jeff King
On Thu, May 21, 2015 at 11:07:33AM -0700, Junio C Hamano wrote: > Jeff King writes: > > > All of the information needed to find the @{upstream} of a > > branch is included in the branch struct, but callers have to > > navigate a series of possible-NULL values to get there. > > Let's wrap that lo

[PATCH 0/2] fix post-rewrite hook with 'git rebase -i --exec'

2015-05-21 Thread Matthieu Moy
Matthieu Moy (2): rebase -i: demonstrate incorrect behavior of post-rewrite hook with exec rebase -i: fix post-rewrite hook with failed exec command git-rebase--interactive.sh | 10 +- t/t5407-post-rewrite-hook.sh | 17 + 2 files changed, 22 insertions(+), 5 dele

[PATCH 1/2] rebase -i: demonstrate incorrect behavior of post-rewrite hook with exec

2015-05-21 Thread Matthieu Moy
The 'exec' command is sending the current commit to stopped-sha, which is supposed to contain the original commit (before rebase). As a result, if an 'exec' command fails, the next 'git rebase --continue' will send the current commit as to the post-rewrite hook. The test currently fails with : -

Re: [PATCH v3 07/14] remote.c: introduce branch_get_upstream helper

2015-05-21 Thread Junio C Hamano
Jeff King writes: > All of the information needed to find the @{upstream} of a > branch is included in the branch struct, but callers have to > navigate a series of possible-NULL values to get there. > Let's wrap that logic up in an easy-to-read helper. > > Signed-off-by: Jeff King This step in

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

2015-05-21 Thread Eric Sunshine
On Thu, May 21, 2015 at 1:39 PM, Sébastien Guimmara wrote: > 'git help' shows common commands in alphabetical order: > > The most commonly used git commands are: >addAdd file contents to the index >bisect Find by binary search the change that introduced a bug >branch Li

Re: [PATCH v11 2/5] command-list.txt: add the common groups block

2015-05-21 Thread Eric Sunshine
On Thu, May 21, 2015 at 1:39 PM, Sébastien Guimmara wrote: > The ultimate goal is for "git help" to display common commands in > groups rather than alphabetically. As a first step, define the > groups in a new block, and then assign a group to each > common command. > > Helped-by: Eric Sunshine >

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

2015-05-21 Thread karthik nayak
I miss a high-level description of what the code is doing. Essentially, there's the complete repository list of refs, and you want to filter only some of them, right? From the name, I would guess that ref_filter is the structure describing how you are filtering, but from the code it seems to b

Re: [PATCH v3 02/14] remote.c: refactor setup of branch->merge list

2015-05-21 Thread Junio C Hamano
Jeff King writes: > When we call branch_get() to lookup or create a "struct > branch", we make sure the "merge" field is filled in so that > callers can access it. But the conditions under which we do > so are a little confusing, and can lead to two funny > situations: > ... > In addition to thos

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-21 Thread Stefan Beller
On Thu, May 21, 2015 at 10:24 AM, Junio C Hamano wrote: > Stefan Beller 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 info

[PATCH v11 1/5] command-list: prepare machinery for upcoming "common groups" section

2015-05-21 Thread Sébastien Guimmara
From: Eric Sunshine The ultimate goal is for "git help" to classify common commands by group. Toward this end, a subsequent patch will add a new "common groups" section to command-list.txt preceding the actual command list. As preparation, teach existing command-list.txt parsing machinery, which

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

2015-05-21 Thread Sébastien Guimmara
'git help' shows common commands in alphabetical order: The most commonly used git commands are: addAdd file contents to the index bisect Find by binary search the change that introduced a bug branch List, create, or delete branches checkout Checkout a branch or paths

[PATCH v11 0/5] group common commands by theme

2015-05-21 Thread Sébastien Guimmara
Just a minor change, the modification of new-command.txt was squashed to 2/5 instead of 1/5. Eric Sunshine (2): command-list: prepare machinery for upcoming "common groups" section generate-cmdlist: parse common group commands Sébastien Guimmara (3): command-list.txt: add the common groups

[PATCH v11 2/5] command-list.txt: add the common groups block

2015-05-21 Thread Sébastien Guimmara
The ultimate goal is for "git help" to display common commands in groups rather than alphabetically. As a first step, define the groups in a new block, and then assign a group to each common command. Add a block at the beginning of command-list.txt: init start a working area (see also

[PATCH v11 4/5] command-list.txt: drop the "common" tag

2015-05-21 Thread Sébastien Guimmara
command-list.sh, retired in the previous patch, was the only consumer of the "common" tag, so drop this now-unnecessary attribute. before: git-add mainporcelaincommon worktree after: git-add mainporcelainworktree Helped-by: Eric Sunshine Signed-off-by:

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

2015-05-21 Thread Sébastien Guimmara
From: Eric Sunshine 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"), N_("growing, marking

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 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 will enable each of t

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

2015-05-21 Thread Junio C Hamano
Paul Tan 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 "s/^$_x05[0-9a-f]*

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-21 Thread Junio C Hamano
Stefan Beller 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 discusing alternativ

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 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 matches and what doesn't ca

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

2015-05-21 Thread Junio C Hamano
Eric Sunshine 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 labels are a simple

[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 --- submodule.c | 142 +--- 1 file changed, 97 insertions(+), 45 deletions(-) di

[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 --- builtin/fetch.c

[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. Signed-off-

[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 .gitm

[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 mist

Re: recovering from "unordered stage entries in index" error

2015-05-21 Thread Junio C Hamano
Duy Nguyen 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 wants to record in

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 wrote: > Eric Sunshine 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

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

2015-05-21 Thread Junio C Hamano
Philippe De Muyter 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 have git do

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

2015-05-21 Thread Junio C Hamano
Mike Hommey 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 body of a messa

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

2015-05-21 Thread Junio C Hamano
Jeff King 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 declare

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 quali

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

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

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

2015-05-21 Thread Junio C Hamano
Eric Sunshine 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 not have (so

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 >

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

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 > 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 >>> @@ -11,

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 sub

Re: Troubleshoot clone issue to NFS.

2015-05-21 Thread Duy Nguyen
On Thu, May 21, 2015 at 9:31 PM, Duy Nguyen wrote: > 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 probably very wrong, but I have no time to

Re: Troubleshoot clone issue to NFS.

2015-05-21 Thread Duy Nguyen
On Thu, May 21, 2015 at 8:13 PM, wrote: > So there appears to be a change in 1.8.4.2 that made this issue appear for > me. Looking at the release notes the only thing that I can see that might be > related could be: > > * When an object is not found after checking the packfiles and then >

  1   2   >