[PATCH] Revert "compat/unsetenv.c: Fix a sparse warning"

2013-07-20 Thread Benoit Sigoure
This reverts commit ec535cc27e6c4f5e0b1d157e04f5511f166ecd9d. POSIX explicitly states "the [environ] variable, which must be declared by the user if it is to be used directly". Not declaring it causes compilation to fail on OS X. Instead don't declare the variable on MinGW, as it causes a spuriou

Re: [PATCH] Fix compilation on OS X.

2013-07-20 Thread tsuna
On Sat, Jul 20, 2013 at 10:53 PM, Junio C Hamano wrote: > Actually, it is _wrong_ for us to rely on system header files to > define this symbol for us. Declaring "extern char **environ" is > responsibility of the user programs (like us). Actually, that's right. The C99 standard doesn't mention

Re: [PATCH] Fix compilation on OS X.

2013-07-20 Thread Junio C Hamano
Torsten Bögershausen writes: > On 2013-07-20 09.49, Benoit Sigoure wrote: >> +#ifdef __APPLE__ >> +// On OS X libc headers don't define this symbol. >> +extern char **environ; >> +#endif >> + > A more generic approach could be: > > In the file "config.mak.uname": Define a variable in the Darwin s

Upload your papers until July 31. Indexed in ISI, ELSEVIER, SCOPUS, ACM, PubMed, Zentralblatt MATH, British Library, EBSCO, SWETS, EMBASE, CAS, DoPP, DBLP

2013-07-20 Thread Andre Ross
Dear Colleagues, After finished our conferences in Rhodes Island, Greece, a great number of participants of thes conferences expressed the desire to participate again in our upcoming conferences ( http://www.europment.org ) in Venice (Venezia), Italy of September 28-30, 2013 So, you can upload

American or British English?

2013-07-20 Thread Ondřej Bílka
On Sat, Jul 20, 2013 at 07:39:06PM +, brian m. carlson wrote: > On Sat, Jul 20, 2013 at 09:13:12PM +0200, Ondřej Bílka wrote: > > A dictionary that I generated is following, patch is below. > > > > alloted allocated > > "allotted" is a valid word, and I think it would work fine i

Re: [PATCH 2/2] Fix typos in comments

2013-07-20 Thread Ondřej Bílka
On Sun, Jul 21, 2013 at 01:21:10AM +0530, Ramkumar Ramachandra wrote: > Ondřej Bílka wrote: > > diff --git a/builtin/checkout.c b/builtin/checkout.c > > index 7fe0bff..9f29bb2 100644 > > --- a/builtin/checkout.c > > +++ b/builtin/checkout.c > > @@ -1137,7 +1137,7 @@ int cmd_checkout(int argc, const

Re: [PATCH] Cygwin has trustable filemode

2013-07-20 Thread Ramsay Jones
Mark Levedahl wrote: > On 07/19/2013 12:40 PM, Junio C Hamano wrote: >> Thanks, will replace. >> >> What do we want to do with the compat/regex build-time switch? >> >> IIRC, this was only needed for 1.7 and not 1.5, and I also would >> expect (without anything to back-up, so this is more a faith t

Re: [PATCH] test-lib.sh - define and use GREP_STRIPS_CR

2013-07-20 Thread Ramsay Jones
Mark Levedahl wrote: > Define a common macro for grep needing -U to allow tests to not need > to inquire of specific platforms needing this option. Change > t3032 and t5560 to use this rather than testing explicitly for mingw. > This fixes these two tests on Cygwin. > > Signed-off-by: Mark Levedah

Re: [PATCH 2/2] Fix typos in comments

2013-07-20 Thread brian m. carlson
On Sat, Jul 20, 2013 at 09:13:12PM +0200, Ondřej Bílka wrote: > A dictionary that I generated is following, patch is below. > > alloted allocated "allotted" is a valid word, and I think it would work fine in the code. It's probably what was intended, anyway. >behaviour b

Re: [PATCH 2/2] Fix typos in comments

2013-07-20 Thread Ramkumar Ramachandra
Ondřej Bílka wrote: > diff --git a/builtin/checkout.c b/builtin/checkout.c > index 7fe0bff..9f29bb2 100644 > --- a/builtin/checkout.c > +++ b/builtin/checkout.c > @@ -1137,7 +1137,7 @@ int cmd_checkout(int argc, const char **argv, const > char *prefix) > * 3) git checkout [] >

Re: Dead link

2013-07-20 Thread Ondřej Bílka
On Sun, Jul 21, 2013 at 01:00:11AM +0530, Ramkumar Ramachandra wrote: > Ondřej Bílka wrote: > > http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2 > > Just run a sed 's|http://marc.theaimsgroup.com|http://marc.info|', and > submit the resulting patch. Thanks, here is patch. diff --git a/D

Re: Dead link

2013-07-20 Thread Ramkumar Ramachandra
Ondřej Bílka wrote: > http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2 Just run a sed 's|http://marc.theaimsgroup.com|http://marc.info|', and submit the resulting patch. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org

Dead link

2013-07-20 Thread Ondřej Bílka
Hi, I ran simple script to check for dead links. It found three false positives and following link that now looks defunct. What we do about it? http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

Re: [PATCH 2/2] Fix typos in comments

2013-07-20 Thread Ondřej Bílka
Hi, I wrote a tool that effectively fixes typos in comments and only in comments. It can be downloaded here: https://github.com/neleai/stylepp Now I fix specific typos. First I need to generate list of likely typos. This is done by running following commands in desired directory STYLEPP/script/

[PATCH 1/2] Fix generic typos in comments

2013-07-20 Thread Ondřej Bílka
Hi, I wrote a tool that effectively fixes typos in comments and only in comments. It can be downloaded here: https://github.com/neleai/stylepp For typos you need identify them, write replacement dictionary and run STYLEPP/script/stylepp_skeleton stylepp_fix_comment Here generic dictionary is use

[PATCH] Fix compilation on OS X.

2013-07-20 Thread Benoit Sigoure
On OS X libc headers don't define `environ', and since ec535cc2 removed the redundant declaration this code no longer builds on OS X. --- Makefile | 5 + config.mak.uname | 1 + git-compat-util.h | 4 3 files changed, 10 insertions(+) diff --git a/Makefile b/Makefile index 0600

[PATCH] hg-to-git: --allow-empty-message in git commit

2013-07-20 Thread Maurício C Antunes
Do not fail to import mercurial commits with empty commit messages. Signed-off-by: Maurício C Antunes --- contrib/hg-to-git/hg-to-git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py index 232625a..60dec86 1007

Re: [PATCH] git p4 test: Check ignore files with client spec

2013-07-20 Thread Vitor Antunes
On Sat, Jul 20, 2013 at 2:48 PM, Pete Wyckoff wrote: > I'd forgotten during your conversation with Matthieu that we > did indeed have tests for detect-branches with use-client-spec. > This test sure seems like it should cover that situation though. It was good that you had some tests implemented,

Re: [PATCH] git p4 test: Check ignore files with client spec

2013-07-20 Thread Pete Wyckoff
vitor@gmail.com wrote on Fri, 19 Jul 2013 00:04 +0100: > This test confirms that a file can be ignored during git p4 sync if if is > excluded in P4 client specification. This is a good check to have, and I'm glad it happens to work. :) I'd forgotten during your conversation with Matthieu tha

Re: Git-P4 Bug With Filename Case Change

2013-07-20 Thread Pete Wyckoff
aaron.dw...@imgtec.com wrote on Wed, 17 Jul 2013 22:11 +: > We recently have moved our project from Git to Perforce and those of us > who prefer Git still are using Git p4 to stay in Git land. One of the files > in our repository was renamed while still in Git, but the rename only > c

Re: [PATCH] Fix compilation on OS X.

2013-07-20 Thread Torsten Bögershausen
On 2013-07-20 09.49, Benoit Sigoure wrote: > +#ifdef __APPLE__ > +// On OS X libc headers don't define this symbol. > +extern char **environ; > +#endif > + A more generic approach could be: In the file "config.mak.uname": Define a variable in the Darwin section like this NO_EXT_ENVIRON = Unfortun

[PATCH v2 08/16] upload-pack: let pack-objects do the object counting in shallow case

2013-07-20 Thread Nguyễn Thái Ngọc Duy
Remove the duplicate object counting code in upload-pack, dump out all register_shallow()'d SHA-1 into a temporary shallow file and feed it to pack-objects. The end result is the same, except with less code, and fewer bytes sending over pipe to pack-objects. Signed-off-by: Nguyễn Thái Ngọc Duy --

[PATCH v2 11/16] {fetch,upload}-pack: support fetching from a shallow clone via smart http

2013-07-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/technical/pack-protocol.txt | 3 +++ builtin/fetch-pack.c | 3 +-- remote-curl.c | 4 +++- t/t5536-fetch-shallow.sh | 27 +++ upload-pack.c

[PATCH v2 12/16] receive-pack: support pushing to a shallow clone via http

2013-07-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/receive-pack.c | 3 --- t/t5537-push-shallow.sh | 35 +++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index cbb2025..54bf6b2 100644 --- a/builtin/

[PATCH v2 13/16] send-pack: support pushing from a shallow clone via http

2013-07-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/send-pack.c | 3 --- send-pack.c | 19 +-- t/t5537-push-shallow.sh | 25 + 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 14a7

[PATCH v2 16/16] clone: use git protocol for cloning shallow repo locally

2013-07-20 Thread Nguyễn Thái Ngọc Duy
clone_local() does not handle $SRC/shallow. It could be made so, but it's simpler to use fetch-pack/upload-pack instead. This used by be caught by the check in upload-pack, which is triggered by transport_get_remote_refs(), even in local clone case. The check is now gone and check_everything_conne

[PATCH v2 14/16] git-clone.txt: remove shallow clone limitations

2013-07-20 Thread Nguyễn Thái Ngọc Duy
Now that git supports push/pull from/to a shallow clone, these limitations are not true anymore. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-clone.txt | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt

[PATCH v2 10/16] Add document for command arguments for supporting smart http

2013-07-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-fetch-pack.txt | 11 +++ Documentation/git-receive-pack.txt | 16 +++- Documentation/git-send-pack.txt| 9 - Documentation/git-upload-pack.txt | 13 - 4 files changed, 42 insertions(+), 7 de

[PATCH v2 09/16] pack-protocol.txt: a bit about smart http

2013-07-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/technical/pack-protocol.txt | 66 +++ 1 file changed, 66 insertions(+) diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt index c73b62f..a1672bc 100644 --- a/Docume

[PATCH v2 15/16] config: add core.noshallow to prevent turning a repo into a shallow one

2013-07-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 5 + builtin/receive-pack.c | 9 - cache.h | 1 + config.c | 5 + environment.c| 1 + fetch-pack.c | 9 - t/t5536-fetch-shallow.sh | 9 +

[PATCH v2 06/16] {send,receive}-pack: support pushing from a shallow clone

2013-07-20 Thread Nguyễn Thái Ngọc Duy
Pushing from a shallow clone using today's send-pack and receive-pack may work, if the transferred pack does not ends up at any graft points. If it does, recent receive-pack that does connectivity check will reject the push. If receive-pack is old, the upstream repo becomes corrupt. The pack proto

[PATCH v2 07/16] send-pack: support pushing to a shallow clone

2013-07-20 Thread Nguyễn Thái Ngọc Duy
When send-pack receives "shallow" lines from receive-pack, it knows the other end does not have a complete commit chains. It restrict itself to the commits that are not cut out by either end to make sure the result pack is usuable by receive-pack. The same technique here, using setup_alternate_sha

[PATCH v2 04/16] Move setup_alternate_shallow and write_shallow_commits to shallow.c

2013-07-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- commit.h | 3 +++ fetch-pack.c | 53 + shallow.c| 53 + 3 files changed, 57 insertions(+), 52 deletions(-) diff --git a/commit.h b/commit.h in

[PATCH v2 05/16] fetch-pack: support fetching from a shallow repository

2013-07-20 Thread Nguyễn Thái Ngọc Duy
upload-pack already advertises all shallow grafts if server repository is shallow. This information can be used to add more grafts to the client if the server sends commit chains down to its graft points. If the server is shallow, before we receive the pack, we setup a temporary shallow file that

[PATCH v2 02/16] {receive,upload}-pack: advertise shallow graft information

2013-07-20 Thread Nguyễn Thái Ngọc Duy
If either receive-pack or upload-pack is called on a shallow repository, shallow graft points will be sent after the ref advertisement (but before the packet flush), so that the client has the full "shape" of the server's commit graph. This breaks the protocol for all clients trying to push to a s

[PATCH v2 00/16] First class shallow clone

2013-07-20 Thread Nguyễn Thái Ngọc Duy
v2 includes: - fix Junio comments, especially the one that may lead to incomplete commit islands. - fix send-pack setting up temporary shallow file, but never passes it to index-pack/unpack-objects (also fix the tests to catch this) - support smart http - add core.noshallow for repos tha

[PATCH v2 03/16] connect.c: teach get_remote_heads to parse "shallow" lines

2013-07-20 Thread Nguyễn Thái Ngọc Duy
No callers pass a non-empty pointer as shallow_points at this stage. As a result, all clients still refuse to talk to shallow repository on the other end. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/fetch-pack.c | 2 +- builtin/send-pack.c | 2 +- cache.h | 3 ++- connect.c

[PATCH v2 01/16] send-pack: forbid pushing from a shallow repository

2013-07-20 Thread Nguyễn Thái Ngọc Duy
send-pack can send a pack with loose ends to the server. receive-pack before 6d4bb38 (fetch: verify we have everything we need before updating our ref - 2011-09-01) does not detect this and keeps the pack anyway, which corrupts the repository, at least from fsck point of view. send-pack will lear

Re: [PATCH] Fix compilation on OS X.

2013-07-20 Thread tsuna
On Sat, Jul 20, 2013 at 12:55 AM, Ramkumar Ramachandra wrote: > Benoit Sigoure wrote: >> diff --git a/compat/unsetenv.c b/compat/unsetenv.c >> index 4ea1856..addf3dc 100644 >> --- a/compat/unsetenv.c >> +++ b/compat/unsetenv.c >> @@ -1,5 +1,10 @@ >> #include "../git-compat-util.h" >> >> +#ifdef _

Re: [PATCH] Fix compilation on OS X.

2013-07-20 Thread Ramkumar Ramachandra
Benoit Sigoure wrote: > diff --git a/compat/unsetenv.c b/compat/unsetenv.c > index 4ea1856..addf3dc 100644 > --- a/compat/unsetenv.c > +++ b/compat/unsetenv.c > @@ -1,5 +1,10 @@ > #include "../git-compat-util.h" > > +#ifdef __APPLE__ > +// On OS X libc headers don't define this symbol. > +extern c

[PATCH] Fix compilation on OS X.

2013-07-20 Thread Benoit Sigoure
On OS X libc headers don't define `environ', and since ec535cc2 removed the redundant declaration this code no longer builds on OS X. --- compat/unsetenv.c | 5 + 1 file changed, 5 insertions(+) diff --git a/compat/unsetenv.c b/compat/unsetenv.c index 4ea1856..addf3dc 100644 --- a/compat/unse

RESPOND URGENTLY!!

2013-07-20 Thread GEORGE DANIELS
Greetings from George Daniels I am George Daniels, a Banker and credit system programmer (HSBC bank). I saw your email address while browsing through the bank D.T.C Screen in my office yesterday so I decided to use this very chance to know you. I believe we should use every opportunity to know ea