Re: [RFD] annnotating a pair of commit objects?

2013-04-06 Thread Michael Haggerty
On 04/05/2013 09:36 PM, Antoine Pelisse wrote: > On Thu, Jan 3, 2013 at 10:59 AM, Michael Haggerty > wrote: >> How could M be stored? Assuming that these type of premerge merges are >> sparse, then Jeff's analysis seems good. Concretely, one could simply >> store pointers to M from both X and Y

Aw: Re: [PATCH 0/3] Some small fixes to glossary-content.txt

2013-04-06 Thread Thomas Ackermann
> > > While proof-reading the user-manual I noticed some issues with > glossary-content.txt: > > I found now mention of my patches in the latest "What's cooking". Did I miss an action item on my side or got this lost in the noise? --- Thomas -- To unsubscribe from this list: send the line "un

Re: [PATCH v2 1/2] perl: redirect stderr to /dev/null instead of closing

2013-04-06 Thread Thomas Rast
Petr Baudis writes: > On Fri, Apr 05, 2013 at 11:57:19AM -0700, Junio C Hamano wrote: > The thing is, I was confused about dup2() all along as my old UNIX > masters taught me that I must close() the original descriptor first > and since that's what's commonly done anyway, I never thought to > d

Re: Collective wisdom about repos on NFS accessed by concurrent clients (== corruption!?)

2013-04-06 Thread Thomas Rast
Kenneth Ölwing writes: > On 2013-04-05 15:42, Thomas Rast wrote: >> Can you run the same tests under strace or similar, and gather the >> relevant outputs? Otherwise it's probably very hard to say what is >> going wrong. In particular we've had some reports on lustre that >> boiled down to "impos

[PATCH v2 0/2] send-email: couple of improvements

2013-04-06 Thread Felipe Contreras
Hi, First patch was already sent, I just added the --no-annotate option. Second one is new, it adds a configuration for --cover-letter, so it can automatically determine when to generated: 1 patch, no cover, otherwise there is. Felipe Contreras (2): send-email: make annotate configurable form

[PATCH v2 1/2] send-email: make annotate configurable

2013-04-06 Thread Felipe Contreras
Some people always do --annotate, lets not force them to always type that. Signed-off-by: Felipe Contreras --- Documentation/config.txt | 1 + Documentation/git-send-email.txt | 5 +++-- git-send-email.perl | 12 +--- 3 files changed, 13 insertions(+), 5 deletions(

[PATCH v2 2/2] format-patch: add format.cover-letter configuration

2013-04-06 Thread Felipe Contreras
Also, add a new option: 'auto', so if there's more than one patch, the cover letter is generated, otherwise it's not. This has the slight disadvantage that a piece of code will always be run even if the user doesn't want a cover letter, and thus waste a few cycles. But the convenience is well wort

Re: [PATCH v2 1/2] perl: redirect stderr to /dev/null instead of closing

2013-04-06 Thread Petr Baudis
On Sat, Apr 06, 2013 at 10:07:40AM +0200, Thomas Rast wrote: > The manpage for dup2 does, however, say > >If newfd was open, any errors that would have been reported at >close(2) time are lost. A careful programmer will not use dup2() or >dup3() without closing newfd first. > >

Re: [PATCH v2 2/2] format-patch: add format.cover-letter configuration

2013-04-06 Thread Ramkumar Ramachandra
Felipe Contreras wrote: > Also, add a new option: 'auto', so if there's more than one patch, the > cover letter is generated, otherwise it's not. Awesome! I wanted to fix this myself, but got sidetracked with the whole submodules thing. > +format.cover-letter:: > + Allows to configure the

RE: Collective wisdom about repos on NFS accessed by concurrent clients (== corruption!?)

2013-04-06 Thread Jason Pyeron
> -Original Message- > From: Thomas Rast > Sent: Saturday, April 06, 2013 4:12 > > Kenneth Ölwing writes: > > > On 2013-04-05 15:42, Thomas Rast wrote: > >> Can you run the same tests under strace or similar, and gather the > >> relevant outputs? Otherwise it's probably very hard to say

typo in Documentation/git-rebase.txt

2013-04-06 Thread Дилян Палаузов
Hello, please change in Documentation/git-rebase.txt, as of v1.8.2-470-g21ccebe, for --ignore-whitespace and --whitespace, line 326 from These flag are passed to the 'git apply' program to (add an 's') These flags are passed to the 'git apply' program and in the same file, und

Re: [PATCH 00/13] remote-hg: general updates

2013-04-06 Thread Philip Oakley
From: "Felipe Contreras" Sent: Saturday, April 06, 2013 1:45 AM On Fri, Apr 5, 2013 at 4:30 PM, Max Horn wrote: On 04.04.2013, at 08:42, Felipe Contreras wrote: Please consider [...] Ultimately this is not about people, this is about the code. In the case of helper functions this is n

Re: [PATCH 00/13] remote-hg: general updates

2013-04-06 Thread Felipe Contreras
On Sat, Apr 6, 2013 at 8:09 AM, Philip Oakley wrote: > From: "Felipe Contreras" > Sent: Saturday, April 06, 2013 1:45 AM >> Ultimately this is not about people, this is about the code. > > > In the case of helper functions this is not the case. > > The question would be better framed: > "Does th

[PATCH] remote-helpers: remove --graph in hg_log()

2013-04-06 Thread Antoine Pelisse
The hg_log() test helper uses the "--graph" parameter that is implemented by the GraphLog extension. If the extension is not activated by the user, the parameter is not available. Do not use the option that is unnecessary. Also changes the way we grep the output in hg_log(). The pipe operator can

Re: [PATCH v2 2/2] format-patch: add format.cover-letter configuration

2013-04-06 Thread Felipe Contreras
On Sat, Apr 6, 2013 at 6:43 AM, Ramkumar Ramachandra wrote: > Felipe Contreras wrote: >> Also, add a new option: 'auto', so if there's more than one patch, the >> cover letter is generated, otherwise it's not. > > Awesome! I wanted to fix this myself, but got sidetracked with the > whole submodul

Re: [PATCH] remote-helpers: remove --graph in hg_log()

2013-04-06 Thread Felipe Contreras
On Sat, Apr 6, 2013 at 10:00 AM, Antoine Pelisse wrote: > The hg_log() test helper uses the "--graph" parameter that is > implemented by the GraphLog extension. If the extension is not activated > by the user, the parameter is not available. Do not use the option that > is unnecessary. > I'm not

Re: [PATCH] remote-helpers: remove --graph in hg_log()

2013-04-06 Thread Antoine Pelisse
On Sat, Apr 6, 2013 at 6:06 PM, Felipe Contreras wrote: > On Sat, Apr 6, 2013 at 10:00 AM, Antoine Pelisse wrote: >> I'm not so confident that --graph is useless to the test. If it's really >> necessary, it would be nice either to activate it in setup() or to use >> it just for the command throug

Re: [PATCH] remote-helpers: remove --graph in hg_log()

2013-04-06 Thread Felipe Contreras
On Sat, Apr 6, 2013 at 10:12 AM, Antoine Pelisse wrote: > On Sat, Apr 6, 2013 at 6:06 PM, Felipe Contreras > wrote: >> On Sat, Apr 6, 2013 at 10:00 AM, Antoine Pelisse wrote: >>> I'm not so confident that --graph is useless to the test. If it's really >>> necessary, it would be nice either to ac

[PATCH] remote-hg: activate graplog extension for hg_log()

2013-04-06 Thread Antoine Pelisse
The hg_log() test helper uses the "--graph" parameter that is implemented by the GraphLog extension. If the extension is not activated by the user, the parameter is not available. Activate the extension in setup(). Also changes the way we grep the output in hg_log(). The pipe operator can hide the

Re: [PATCH v2 0/4] remote-helpers: trivial test fixes

2013-04-06 Thread Torsten Bögershausen
On 04.04.13 17:36, Felipe Contreras wrote: > Hi, > > A reroll, now we do some checks, just avoid test-lint-duplicates, and fix the > outsanding shell portability issue. The rest is the same. > > Felipe Contreras (4): > remote-bzr: avoid echo -n > remote-helpers: fix the run of all tests > r

[PATCH] fast-export: Allow pruned-references in mark file

2013-04-06 Thread Antoine Pelisse
fast-export can fail because of some pruned-reference when importing a mark file. The problem happens in the following scenario: $ git fast-export --export-marks=MARKS master (rewrite master) $ git prune $ git fast-export --import-marks=MARKS master This might fail if some refere

Re: [PATCH v2 0/4] remote-helpers: trivial test fixes

2013-04-06 Thread Torsten Bögershausen
On 06.04.13 19:03, Torsten Bögershausen wrote: > On 04.04.13 17:36, Felipe Contreras wrote: >> Hi, >> >> A reroll, now we do some checks, just avoid test-lint-duplicates, and fix the >> outsanding shell portability issue. The rest is the same. >> >> Felipe Contreras (4): >> remote-bzr: avoid echo

Re: [PATCH v2 0/4] remote-helpers: trivial test fixes

2013-04-06 Thread Felipe Contreras
On Sat, Apr 6, 2013 at 11:03 AM, Torsten Bögershausen wrote: > On 04.04.13 17:36, Felipe Contreras wrote: >> Hi, >> >> A reroll, now we do some checks, just avoid test-lint-duplicates, and fix the >> outsanding shell portability issue. The rest is the same. >> >> Felipe Contreras (4): >> remote-

Re: [PATCH] fast-export: Allow pruned-references in mark file

2013-04-06 Thread Felipe Contreras
On Sat, Apr 6, 2013 at 11:04 AM, Antoine Pelisse wrote: > fast-export can fail because of some pruned-reference when importing a > mark file. > > The problem happens in the following scenario: > > $ git fast-export --export-marks=MARKS master > (rewrite master) > $ git prune > $ gi

Re: [PATCH v2 2/2] format-patch: add format.cover-letter configuration

2013-04-06 Thread Matthieu Moy
Felipe Contreras writes: >> Perhaps you can clarify this: Controls whether to generate a >> cover-letter when format-patch is invoked. Can be true, false, or >> auto. "auto" generates a cover-letter only when generating more than >> one patch. > > That's good, but I believe if we say it's a boo

Re: [PATCH v2 2/2] format-patch: add format.cover-letter configuration

2013-04-06 Thread Matthieu Moy
Felipe Contreras writes: > +format.cover-letter:: We normally use camelCase, so format.coverLetter, not cover-letter. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More ma

Re: [PATCH v2 0/4] remote-helpers: trivial test fixes

2013-04-06 Thread Torsten Bögershausen
On 06.04.13 19:29, Felipe Contreras wrote: > On Sat, Apr 6, 2013 at 11:03 AM, Torsten Bögershausen wrote: >> On 04.04.13 17:36, Felipe Contreras wrote: >>> Hi, >>> >>> A reroll, now we do some checks, just avoid test-lint-duplicates, and fix >>> the >>> outsanding shell portability issue. The res

Re: [PATCH v2 0/2] send-email: couple of improvements

2013-04-06 Thread Matthieu Moy
Felipe Contreras writes: > First patch was already sent, I just added the --no-annotate option. Second > one > is new, it adds a configuration for --cover-letter, so it can automatically > determine when to generated: 1 patch, no cover, otherwise there is. Very good. I unconditionnally run --an

Advice and repo setup

2013-04-06 Thread Michael Campbell
My company is moving from CVS to git in a few weeks (and we have a training class scheduled with the github folks). That said our CI/build guys have already got gitorious set up (we get to it through ssh with ssh keys and one "git" user on the server) and we are in the process of migrating all new

Re: [PATCH v2 0/4] remote-helpers: trivial test fixes

2013-04-06 Thread Felipe Contreras
On Sat, Apr 6, 2013 at 11:45 AM, Torsten Bögershausen wrote: > On 06.04.13 19:29, Felipe Contreras wrote: >> On Sat, Apr 6, 2013 at 11:03 AM, Torsten Bögershausen wrote: >>> --- a/contrib/remote-helpers/test-hg.sh >>> +++ b/contrib/remote-helpers/test-hg.sh >>> @@ -115,7 +115,7 @@ test_expect_su

Re: Advice and repo setup

2013-04-06 Thread Seth Robertson
In message , Michael Campbell writes: As a business decision we have decided to pull in some "staff augmentation". We don't want the remote developers to have direct access. Our plan is to have some sort of external repo on which they can push things, and locally we can pull t

[PATCH] gitremote-helpers(1): clarify refspec behaviour

2013-04-06 Thread John Keeping
The documentation says that "If no 'refspec' capability is advertised, there is an implied `refspec *:*`" but this is only the case for the "import" command. Since there is a comment in transport-helper.c indicating that this default is for historical reasons, change the documentation to clarify t

Re: [PATCH] gitremote-helpers(1): clarify refspec behaviour

2013-04-06 Thread Sverre Rabbelier
In Sat, Apr 6, 2013 at 11:13 AM, John Keeping wrote: > The documentation says that "If no 'refspec' capability is advertised, > there is an implied `refspec *:*`" but this is only the case for the > "import" command. > > Since there is a comment in transport-helper.c indicating that this > default

Re: [PATCH v2 0/4] remote-helpers: trivial test fixes

2013-04-06 Thread Torsten Bögershausen
On 06.04.13 19:58, Felipe Contreras wrote: > On Sat, Apr 6, 2013 at 11:45 AM, Torsten Bögershausen wrote: >> On 06.04.13 19:29, Felipe Contreras wrote: >>> On Sat, Apr 6, 2013 at 11:03 AM, Torsten Bögershausen wrote: > --- a/contrib/remote-helpers/test-hg.sh +++ b/contrib/remote-helper

Re: check-attr doesn't respect recursive definitions

2013-04-06 Thread Jan Larres
Duy Nguyen wrote: > On Sat, Mar 30, 2013 at 8:45 PM, Jan Larres wrote: >> I would expect the last command to also report 'set'. I've also tried >> other patterns like 'foo/' and 'foo*', but it didn't make any >> difference. > > Try "foo/**". You need 1.8.2 though. That indeed works exactly the w

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-06 Thread Ramkumar Ramachandra
Hi again, So we've thought about it for some time, and I really need you to start reviewing the code now. I'll just summarize what we've discussed so far: 1. The malleability argument doesn't hold, because we're proposing a link object with optional fields. 2. The local-fork argument doesn't hol

Re: [PATCH] remote-hg: activate graplog extension for hg_log()

2013-04-06 Thread Eric Sunshine
On Sat, Apr 6, 2013 at 12:50 PM, Antoine Pelisse wrote: > remote-hg: activate graplog extension for hg_log() s/graplog/graphlog/ > The hg_log() test helper uses the "--graph" parameter that is > implemented by the GraphLog extension. If the extension is not activated > by the user, the parameter

Git/Mac refuses to install on OS X 10.8 (Mountain Lion)

2013-04-06 Thread David Foster
The default security settings on OS X 10.8 (Mountain Lion) disallow the installation of unsigned packages, with no override. Git/Mac 1.8.2 is not signed and therefore will not install without changing the OS default security settings. See screenshot: http://postimg.org/image/wcb34kzy5/ -- David

git instaweb - share all project files

2013-04-06 Thread Trenton D. Adams
Hello, On that first page that shows up, it shows the .git folder. It would be kind of nice if it shared out both the git repo and the actual current project files. I frequently have stuff I'd like to see in a web browser, and even requires one (i.e. Navigating to file:///home/blah/blah doesn't

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-06 Thread Junio C Hamano
Ramkumar Ramachandra writes: > So we've thought about it for some time, and I really need you to > start reviewing the code now. > > I'll just summarize what we've discussed so far: > ... I do not think we have heard anything concrete and usable about what you are trying to achieve yet. You may

Re: [PATCH 00/13] remote-hg: general updates

2013-04-06 Thread Junio C Hamano
Felipe Contreras writes: > On Fri, Apr 5, 2013 at 7:28 PM, Junio C Hamano wrote: > >> A tool that is in contrib/ follows the contrib/README rule. >> >> I do not maintain it. Maintenance is up to the person who asked to >> include it there. I do ask the people who propose to add something >> in

Re: [PATCH v2 1/2] send-email: make annotate configurable

2013-04-06 Thread Junio C Hamano
Felipe Contreras writes: > @@ -305,6 +306,7 @@ my $rc = GetOptions("h" => \$help, > "smtp-domain:s" => \$smtp_domain, > "identity=s" => \$identity, > "annotate" => \$annotate, > + "no-annotate" => \$no_annotate, Wouldn't it be

Re: [PATCH v2 2/2] format-patch: add format.cover-letter configuration

2013-04-06 Thread Junio C Hamano
Felipe Contreras writes: > Also, add a new option: 'auto', so if there's more than one patch, the > cover letter is generated, otherwise it's not. Very sensible goal. > This has the slight disadvantage that a piece of code will always be run > even if the user doesn't want a cover letter, and t

Re: [PATCH v2 2/2] format-patch: add format.cover-letter configuration

2013-04-06 Thread Felipe Contreras
On Sat, Apr 6, 2013 at 9:32 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> Also, add a new option: 'auto', so if there's more than one patch, the >> cover letter is generated, otherwise it's not. > > Very sensible goal. > >> This has the slight disadvantage that a piece of code will al

Re: Advice and repo setup

2013-04-06 Thread Thomas Koch
Michael Campbell: > So one plan is to have multiple repos, and then a mirror of those for > the remote devs. The other plan is to say "sod it" and have one local > and one remote and just suffer through possible non-requirements of > varying authorization profiles. You could also use Gerrit[1]. I

Re: [PATCH v2 1/2] send-email: make annotate configurable

2013-04-06 Thread Felipe Contreras
On Sat, Apr 6, 2013 at 9:32 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> @@ -305,6 +306,7 @@ my $rc = GetOptions("h" => \$help, >> "smtp-domain:s" => \$smtp_domain, >> "identity=s" => \$identity, >> "annotate" => \$annotate, >> +