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 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] 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: 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 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: [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 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] 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: 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: 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

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

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

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

[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

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

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: 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 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

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

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] 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 >

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

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

<    1   2