Re: GSoC 2014: Summary so far, discussion starter: how to improve?

2013-11-21 Thread Thomas Rast
Thomas Rast t...@thomasrast.ch writes: * Does libgit2 want to remain under the Git umbrella, or participate on its own? * Figure out the wiki situation. In previous years the project proposals and other important information were hosted at k.org [5] and github wikis [6]. Other

Re: GSoC 2014: Summary so far, discussion starter: how to improve?

2013-11-21 Thread Christian Couder
On Thu, Nov 21, 2013 at 9:36 AM, Thomas Rast t...@thomasrast.ch wrote: Thomas Rast t...@thomasrast.ch writes: * Find an org admin and backup. In previous years Shawn and Peff did this. Would you do it again? If Shawn and Peff don't answer, it probably means that you should volunteer :-)

Re: GSoC 2014: Summary so far, discussion starter: how to improve?

2013-11-21 Thread Jeff King
On Thu, Nov 21, 2013 at 09:36:37AM +0100, Thomas Rast wrote: Thomas Rast t...@thomasrast.ch writes: * Does libgit2 want to remain under the Git umbrella, or participate on its own? * Figure out the wiki situation. In previous years the project proposals and other important

[PATCH] git-svn: Support svn:global-ignores property

2013-11-21 Thread Aleksey Vasenev
--- Documentation/git-svn.txt | 12 ++-- git-svn.perl | 46 -- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 30c5ee2..0c1cd46 100644 ---

[RFC PATCH] Revamp git-cherry(1)

2013-11-21 Thread Thomas Rast
git-cherry(1)'s description section has never really managed to explain to me what the command does. It contains too much explanation of the algorithm instead of simply saying what goals it achieves, and too much terminology that we otherwise do not use (fork-point instead of merge-base). Try a

[PATCH] drop support for experimental loose objects

2013-11-21 Thread Jeff King
On Wed, Nov 20, 2013 at 06:28:06PM -0400, Joey Hess wrote: Jeff King wrote: As for your specific corruption, I can't make heads or tails of it. It is not a single-bit error. Oh, I should have mentioned that I am generating corrupt git repositories mechanically for testing. I think in

Re: [PATCH] drop support for experimental loose objects

2013-11-21 Thread Jeff King
On Thu, Nov 21, 2013 at 06:41:58AM -0500, Jeff King wrote: The test objects removed are all binary. Git seems to guess a few as non-binary, though, because they don't contain any NULs, and includes gross binary bytes in the patch below. In theory the mail's transfer encoding will take care of

Re: [RFC PATCH] Revamp git-cherry(1)

2013-11-21 Thread Jeff King
On Thu, Nov 21, 2013 at 12:30:56PM +0100, Thomas Rast wrote: git-cherry(1)'s description section has never really managed to explain to me what the command does. It contains too much explanation of the algorithm instead of simply saying what goals it achieves, and too much terminology that

Git issues with submodules

2013-11-21 Thread Sergey Sharybin
Hey everyone from Blender developers! As you might already know, we've recently switched from SVN to Git to host Blender sources. In general it works really awesome, but we've got some issues with submodules. in SVN we had separate repositories for addons and translations which were attached to

Re: [RFC PATCH] Revamp git-cherry(1)

2013-11-21 Thread Junio C Hamano
Thomas Rast t...@thomasrast.ch writes: Junio C Hamano gits...@pobox.com writes: OPTIONS --- -v:: - Verbose. + Verbose. Currently shows the commit subjects next to their + SHA1. Whenever I see Currently, it makes me wonder why does it need to say that? Is there a plan to

Re: [PATCH v3] commit -v: strip diffs and submodule shortlogs from the commit message

2013-11-21 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: But what about this: struct strbuf cut_line = STRBUF_INIT; strbuf_addf(cut_line, %c %s, comment_line_char, wt_status_cut_line); p = strstr(buf-buf, cut_line.buf); if (p (p == buf-buf || p[-1] == '\n'))

Re: [PATCH 1/2] glossary-content.txt: remove an obsolete paragrah

2013-11-21 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: With the introduction of :(literal), :(glob) and :(icase), :(top) is no longer the only recognized magic signature. You need to re-read the message you took hints that led to this patch from (or, rather, the existing document around the area you

Re: [PATCH v3] commit -v: strip diffs and submodule shortlogs from the commit message

2013-11-21 Thread Jens Lehmann
Am 21.11.2013 00:04, schrieb Junio C Hamano: Jens Lehmann jens.lehm...@web.de writes: diff --git a/wt-status.c b/wt-status.c index b4e44ba..734f94b 100644 --- a/wt-status.c +++ b/wt-status.c @@ -16,6 +16,9 @@ #include column.h #include strbuf.h +static char wt_status_cut_line[] = /*

Re: [RFC PATCH] Revamp git-cherry(1)

2013-11-21 Thread Junio C Hamano
Thomas Rast t...@thomasrast.ch writes: NAME -git-cherry - Find commits not merged upstream +git-cherry - Find commits not applied in upstream Good. +Determine whether there are commits in `head..upstream` that are +equivalent to those in the range `limit..head`. +The

Re: [PATCH] drop support for experimental loose objects

2013-11-21 Thread Jeff King
On Thu, Nov 21, 2013 at 07:43:03PM +0700, Duy Nguyen wrote: - if (experimental_loose_object(map)) { Perhaps keep this.. - /* -* The old experimental format we no longer produce; -* we can still read it. -*/ -

Re: [PATCH v6 05/10] git fetch-pack: Add --diag-url

2013-11-21 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: Subject: Re: [PATCH v6 05/10] git fetch-pack: Add --diag-url s/Add/add/ please. The main purpose is to trace the URL parser called by git_connect() in connect.c The main features of the parser can be listed as this: - parse out host and path for

[PATCH v6 07/10] connect.c: Corner case for IPv6

2013-11-21 Thread Torsten Bögershausen
Commit faea9ccbadf75128 introduced user-relative paths: ssh://host.xz/~junio/repo is the same as host.xz:~junio/repo. Commit 356bece0a27258181 Support [address] in URLs introduced a regression: When an URL like [::1]:/~repo is used, the replacement of /~ with ~ was enabled for IPv6 host names,

Re: [PATCHv3] transport: Catch non positive --depth option value

2013-11-21 Thread Junio C Hamano
Andrés G. Aragoneses kno...@gmail.com writes: From 99e387151594572dc136bf1fae45593ee710e817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20G=2E=20Aragoneses?= kno...@gmail.com Date: Wed, 13 Nov 2013 16:55:08 +0100 Subject: [PATCH] transport: Catch non positive --depth option value

[PATCH v6 02/10] t5601: Add tests for ssh

2013-11-21 Thread Torsten Bögershausen
Add more tests testing all the combinations: -IPv4 or IPv6 -path starting with / or with /~ -with and without the ssh:// scheme Some test fail, they need updates in connect.c --- t/t5601-clone.sh | 102 +-- 1 file changed, 100 insertions(+),

Re: [PATCH] drop support for experimental loose objects

2013-11-21 Thread Junio C Hamano
Jeff King p...@peff.net writes: We could try to improve the heuristic to err on the side of normal objects in the face of corruption, but there is really little point. The experimental format is long-dead, and was never enabled by default to begin with. We can instead simply remove it. The

Re: [PATCH v6 04/10] git_connect: factor out discovery of the protocol and its parts

2013-11-21 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: git_connect has grown large due to the many different protocols syntaxes that are supported. Move the part of the function that parses the URL to connect to into a separate function for readability. Signed-off-by: Johannes Sixt j...@kdbg.org --- I

Re: [PATCH v6 06/10] t5500: Test case for diag-url

2013-11-21 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: Add test cases using git fetch-pack --diag-url: - parse out host and path for URLs with a scheme (git:// file:// ssh://) - parse host names embedded by [] correctly - extract the port number, if present - seperate URLs like file (which are local)

Can a git push over ssh trigger a gc/repack? Diagnosing pack explosion

2013-11-21 Thread Martin Langhoff
Hi git list, I am trying to diagnose a strange problem in a VM running as a 'git over ssh server', with one repo which periodically grows very quickly. The complete dataset packs to a single pack+index of ~650MB. Growth is slow, these are ASCII text reports that use a template -- highly

Re: [PATCH v6 07/10] connect.c: Corner case for IPv6

2013-11-21 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: Commit faea9ccbadf75128 introduced user-relative paths: ssh://host.xz/~junio/repo is the same as host.xz:~junio/repo. Commit 356bece0a27258181 Support [address] in URLs introduced a regression: When an URL like [::1]:/~repo is used, the replacement

Re: [PATCH v6 09/10] connect.c: Refactor url parsing

2013-11-21 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: Make the function is_local() from tramsport.c public and use it s/ams/ans/, perhaps? in both transport.c and connect.c Use a protocol local for URLs for the local file system. --- connect.c| 58

Re:Answer back

2013-11-21 Thread lee hyuk
I would like to discuss a very important crude oil project with you,kindly revert back to me if this is your valid email address for further information. Regards, Lee -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: [PATCH v6 10/10] git fetch: support host:/~repo

2013-11-21 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: Since commit faea9ccb URLs host:~repo or ssh://host:/~repo reach the home directory. In 356bece0 support for [] was introduced, and as a side effect, [host]:/~repo was the same as [host]:~repo. The side effect was removed in c01049ae, connect.c:

Re:Answer back

2013-11-21 Thread lee hyuk
I would like to discuss a very important crude oil project with you,kindly revert back to me if this is your valid email address for further information. Regards, Lee -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

[PATCH v6 01/10] t5601: remove clear_ssh, refactor setup_ssh_wrapper

2013-11-21 Thread Torsten Bögershausen
Commit 8d3d28f5 added test cases for URLs which should be ssh. Remove the function clear_ssh, use test_when_finished to clean up. Introduce the function setup_ssh_wrapper, which could be factored out together with expect_ssh. Tighten one test and use foo:bar instead of ./foo:bar, Helped-by:

Re: [PATCH 1/2] glossary-content.txt: remove an obsolete paragrah

2013-11-21 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: An addendum. As we can see in a later paragaph: The magic signature consists of an ASCII symbol that is not alphanumeric. Currently only the slash `/` is recognized as a magic signature... the correct way to read that a character that

[PATCH v6 03/10] git_connect: remove artificial limit of a remote command

2013-11-21 Thread Torsten Bögershausen
Since day one, function git_connect() had a limit on the command line of the command that is invoked to make a connection. 7a33bcbe converted the code that constructs the command to strbuf. This would have been the right time to remove the limit, but it did not happen. Remove it now.

Re: [RFC PATCH] Revamp git-cherry(1)

2013-11-21 Thread Thomas Rast
Junio C Hamano gits...@pobox.com writes: OPTIONS --- -v:: -Verbose. +Verbose. Currently shows the commit subjects next to their +SHA1. Whenever I see Currently, it makes me wonder why does it need to say that? Is there a plan to change it soon, and if so where is the

What's cooking in git.git (Nov 2013, #05; Thu, 21)

2013-11-21 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. Hopefully 1.8.5-rc3 that was tagged on Wednesday will be the final release candidate for this cycle. You can find the changes described here

[PATCH v6 06/10] t5500: Test case for diag-url

2013-11-21 Thread Torsten Bögershausen
Add test cases using git fetch-pack --diag-url: - parse out host and path for URLs with a scheme (git:// file:// ssh://) - parse host names embedded by [] correctly - extract the port number, if present - seperate URLs like file (which are local) from URLs like host:repo which should use ssh

[PATCH v6 04/10] git_connect: factor out discovery of the protocol and its parts

2013-11-21 Thread Torsten Bögershausen
git_connect has grown large due to the many different protocols syntaxes that are supported. Move the part of the function that parses the URL to connect to into a separate function for readability. Signed-off-by: Johannes Sixt j...@kdbg.org --- connect.c | 80

[PATCH v6 01/10] t5601: remove clear_ssh, refactor setup_ssh_wrapper

2013-11-21 Thread Torsten Bögershausen
Commit 8d3d28f5 added test cases for URLs which should be ssh. Remove the function clear_ssh, use test_when_finished to clean up. Introduce the function setup_ssh_wrapper, which could be factored out together with expect_ssh. Tighten one test and use foo:bar instead of ./foo:bar, Helped-by:

Re: [RFC PATCH] Revamp git-cherry(1)

2013-11-21 Thread Thomas Rast
Jeff King p...@peff.net writes: On Thu, Nov 21, 2013 at 12:30:56PM +0100, Thomas Rast wrote: +Later, you can whether your changes have been applied by saying (still +on `topic`): s/can/ see/ ? +Note that this uses , and assumes that +`core.autosetupmerge` is enabled (the default). I

Re: [PATCHv3] transport: Catch non positive --depth option value

2013-11-21 Thread Duy Nguyen
On Fri, Nov 22, 2013 at 3:18 AM, Junio C Hamano gits...@pobox.com wrote: Andrés G. Aragoneses kno...@gmail.com writes: From 99e387151594572dc136bf1fae45593ee710e817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20G=2E=20Aragoneses?= kno...@gmail.com Date: Wed, 13 Nov 2013 16:55:08

Re: [PATCHv3] transport: Catch non positive --depth option value

2013-11-21 Thread Junio C Hamano
thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH] drop support for experimental loose objects

2013-11-21 Thread Christian Couder
On Thu, Nov 21, 2013 at 5:04 PM, Joey Hess j...@kitenet.net wrote: BTW, I've also seen git cat-file --batch report wrong sizes for objects, sometimes without crashing. This is particularly problimatic because if the object size is wrong, it's very hard to detect the actual end of the object

[PATCH] git-svn: Support svn:global-ignores property

2013-11-21 Thread Aleksey Vasenev
--- Documentation/git-svn.txt | 12 ++-- git-svn.perl | 46 -- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 30c5ee2..0c1cd46 100644 ---

Re: [PATCH] Support pathspec magic :(exclude) and its short form :-

2013-11-21 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: Btw I'm thinking of extending pathspec magic syntax a bit to allow path completion. Right now the user has to write git log -- :-Documentation which does not play well with path completion. I'm thinking of accepting git log -- :- Documentation Please

Re: [PATCH 1/2] glossary-content.txt: remove an obsolete paragrah

2013-11-21 Thread Duy Nguyen
On Fri, Nov 22, 2013 at 6:55 AM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: An addendum. As we can see in a later paragaph: The magic signature consists of an ASCII symbol that is not alphanumeric. Currently only the slash `/` is recognized as

Re: Can a git push over ssh trigger a gc/repack? Diagnosing pack explosion

2013-11-21 Thread Martin Langhoff
On Thu, Nov 21, 2013 at 2:52 PM, Junio C Hamano gits...@pobox.com wrote: - if it's receiving from many pushers, it races with itself; needs some lock or back-off mechanism Surely. I think these should help: 64a99eb4 (gc: reject if another gc is running, unless --force is given,

Re: [PATCH] drop support for experimental loose objects

2013-11-21 Thread Duy Nguyen
On Thu, Nov 21, 2013 at 6:48 PM, Jeff King p...@peff.net wrote: @@ -1514,14 +1469,6 @@ unsigned long unpack_object_header_buffer(const unsigned char *buf, int unpack_sha1_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz) { -

[PATCH v6 10/10] git fetch: support host:/~repo

2013-11-21 Thread Torsten Bögershausen
Since commit faea9ccb URLs host:~repo or ssh://host:/~repo reach the home directory. In 356bece0 support for [] was introduced, and as a side effect, [host]:/~repo was the same as [host]:~repo. The side effect was removed in c01049ae, connect.c: Corner case for IPv6. Re-reading the documentation

[PATCHv3] transport: Catch non positive --depth option value

2013-11-21 Thread Andrés G. Aragoneses
From 99e387151594572dc136bf1fae45593ee710e817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20G=2E=20Aragoneses?= kno...@gmail.com Date: Wed, 13 Nov 2013 16:55:08 +0100 Subject: [PATCH] transport: Catch non positive --depth option value Instead of simply ignoring the value passed to

Re: Can a git push over ssh trigger a gc/repack? Diagnosing pack explosion

2013-11-21 Thread Martin Langhoff
On Thu, Nov 21, 2013 at 10:21 AM, Martin Langhoff martin.langh...@gmail.com wrote: Do client pushes over git+ssh ever trigger a repack on the server? man git-config [snip] receive.autogc By default, git-receive-pack will run git-gc --auto after receiving data from

Re: [PATCH] drop support for experimental loose objects

2013-11-21 Thread Keshav Kini
Duy Nguyen pclo...@gmail.com writes: On Thu, Nov 21, 2013 at 6:48 PM, Jeff King p...@peff.net wrote: @@ -1514,14 +1469,6 @@ unsigned long unpack_object_header_buffer(const unsigned char *buf, int unpack_sha1_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void

Re: [PATCH] drop support for experimental loose objects

2013-11-21 Thread Jeff King
On Thu, Nov 21, 2013 at 12:04:26PM -0400, Joey Hess wrote: Jeff King wrote: This latter behavior is much worse for two reasons. One, git reports an allocation error when the real error is corruption. And two, the program dies unconditionally, so you cannot even run fsck (which would

Re: Can a git push over ssh trigger a gc/repack? Diagnosing pack explosion

2013-11-21 Thread Junio C Hamano
Martin Langhoff martin.langh...@gmail.com writes: On Thu, Nov 21, 2013 at 10:21 AM, Martin Langhoff martin.langh...@gmail.com wrote: Do client pushes over git+ssh ever trigger a repack on the server? man git-config [snip] receive.autogc By default, git-receive-pack will

[PATCH v6 08/10] git_connect(): Refactor the port handling

2013-11-21 Thread Torsten Bögershausen
Use get_host_and_port() even for ssh. Remove the variable port git_connect(), and simplify parse_connect_url() Use only one return point in git_connect(), doing the free() and return conn. t5601 had 2 corner test cases which now pass. --- connect.c | 47

[PATCH v6 05/10] git fetch-pack: Add --diag-url

2013-11-21 Thread Torsten Bögershausen
The main purpose is to trace the URL parser called by git_connect() in connect.c The main features of the parser can be listed as this: - parse out host and path for URLs with a scheme (git:// file:// ssh://) - parse host names embedded by [] correctly - extract the port number, if present -

[PATCH] git p4: Use git diff-tree instead of format-patch

2013-11-21 Thread Crestez Dan Leonard
The output of git format-patch can vary with user preferences. In particular setting diff.noprefix will break the git apply that is done as part of git p4 submit. Signed-off-by: Crestez Dan Leonard cdleon...@gmail.com --- git-p4.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

Re:Answer back

2013-11-21 Thread lee hyuk
I would like to discuss a very important crude oil project with you,kindly revert back to me if this is your valid email address for further information. Regards, Lee -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

[PATCH v6 09/10] connect.c: Refactor url parsing

2013-11-21 Thread Torsten Bögershausen
Make the function is_local() from tramsport.c public and use it in both transport.c and connect.c Use a protocol local for URLs for the local file system. --- connect.c| 58 ++-- connect.h| 1 + t/t5601-clone.sh | 10 +-

Re: [PATCH] drop support for experimental loose objects

2013-11-21 Thread Joey Hess
Jeff King wrote: This latter behavior is much worse for two reasons. One, git reports an allocation error when the real error is corruption. And two, the program dies unconditionally, so you cannot even run fsck (which would otherwise ignore the broken object and keep going). BTW, I've also

Re: [PATCH] git p4: Use git diff-tree instead of format-patch

2013-11-21 Thread Junio C Hamano
Crestez Dan Leonard cdleon...@gmail.com writes: The output of git format-patch can vary with user preferences. In particular setting diff.noprefix will break the git apply that is done as part of git p4 submit. Signed-off-by: Crestez Dan Leonard cdleon...@gmail.com --- git-p4.py | 2 +-

[PATCH v6 01/10] t5601: remove clear_ssh, refactor setup_ssh_wrapper

2013-11-21 Thread Torsten Bögershausen
Commit 8d3d28f5 added test cases for URLs which should be ssh. Remove the function clear_ssh, use test_when_finished to clean up. Introduce the function setup_ssh_wrapper, which could be factored out together with expect_ssh. Tighten one test and use foo:bar instead of ./foo:bar, Helped-by:

Re: [PATCH 1/2] glossary-content.txt: remove an obsolete paragrah

2013-11-21 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: Current version does force that. $ git log -- ':/#aa' fatal: Unimplemented pathspec magic '#' in ':/#aa' Not sure if there are tests for it though. I'll add an advice to do :/:#aa. It is good that we already do the right thing, but actually I was not