Re: How to hierarchically merge from the root to the leaf of a branch tree? (Patch stack management)

2013-08-01 Thread Jakub Narebski
Jens Müller blog at tessarakt.de writes: Hi all! I mainly use Git for version control, but have also tried out Mercurial. While I don't really like Mercurial in general, the idea of maintaining clearly separated patches with Mercurial Queues (MQ) is quite appealing. Therefore, I am

Re: Difficulty adding a symbolic link, part 3

2013-08-01 Thread Dale R. Worley
From: Duy Nguyen pclo...@gmail.com With the above change, the test suite runs with zero failures, so it doesn't affect any common Git usage. It means the test suite is incomplete. As you can see, the commit introducing this change does not come with a test case to catch people changing

Re: Difficulty adding a symbolic link, part 3

2013-08-01 Thread Dale R. Worley
From: Duy Nguyen pclo...@gmail.com Can someone give me advice on what this code *should* do? It does as the function name says: given cwd, a prefix (i.e. a relative path with no .. components) and a path relative to cwd+prefix, convert 'path' to something relative to cwd. In the simplest

[PATCH v2] Provide some linguistic guidance for the documentation.

2013-08-01 Thread Marc Branchaud
This will hopefully avoid questions over which spelling and grammar should be used. Translators are of course free to create localizations for other specific English dialects. Signed-off-by: Marc Branchaud marcn...@xiplink.com --- A little less stringent now. Documentation/CodingGuidelines |

Re: [PATCH v2] Provide some linguistic guidance for the documentation.

2013-08-01 Thread Marc Branchaud
On 13-08-01 11:10 AM, Marc Branchaud wrote: This will hopefully avoid questions over which spelling and grammar should be used. Translators are of course free to create localizations for other Oops, I should have removed the word other here. M. specific English dialects.

Re: [PATCH v2 1/2] sha1_file: introduce close_one_pack() to close packs on fd pressure

2013-08-01 Thread Junio C Hamano
Brandon Casey bca...@nvidia.com writes: If the refs are loose, then upload-pack will read each ref from the pack (allocating one or more mmap windows) so it can peel tags and advertise the underlying object. If the refs are packed and peeled, then upload-pack will use the peeled sha1 in the

Re: [PATCH v6 6/6] config: git config --get-urlmatch parses section.url.key

2013-08-01 Thread Junio C Hamano
Jeff King p...@peff.net writes: That being said, git-config _should_ be lowercasing to match the normal --get code path. I think the fix (squashable on top of 6/6 + my earlier patch) is just: diff --git a/builtin/config.c b/builtin/config.c index c35c5be..9328a90 100644 ---

Re: [PATCH v2 1/2] sha1_file: introduce close_one_pack() to close packs on fd pressure

2013-08-01 Thread Brandon Casey
On Thu, Aug 1, 2013 at 10:12 AM, Junio C Hamano gits...@pobox.com wrote: Brandon Casey bca...@nvidia.com writes: If the refs are loose, then upload-pack will read each ref from the pack (allocating one or more mmap windows) so it can peel tags and advertise the underlying object. If the refs

[PATCH v3 7/6] t5540/5541: smart-http does not support --force-with-lease

2013-08-01 Thread Junio C Hamano
The push() method in remote-curl.c is not told and does not pass the necessary information to underlying send-pack, so this extension does not yet work. Leave a note in the test suite. Signed-off-by: Junio C Hamano gits...@pobox.com --- * This is primarily to give a target for other people to

Re: [PATCH v2] Provide some linguistic guidance for the documentation.

2013-08-01 Thread Junio C Hamano
Marc Branchaud marcn...@xiplink.com writes: + The documentation generally follows US English (en_US) norms for spelling + and grammar, although most spelling variations are tolerated. Just avoid + mixing styles when updating existing text. If you wish to correct the + English of some of the

Re: [PATCH v2 1/2] sha1_file: introduce close_one_pack() to close packs on fd pressure

2013-08-01 Thread Junio C Hamano
Brandon Casey draf...@gmail.com writes: I've been looking closer at uses of p-windows everywhere, and it seems that we always open_packed_git() before we try to create new windows. There doesn't seem to be any reason that we can't continue to use the existing open windows even after closing

[PATCH v3] Provide some linguistic guidance for the documentation.

2013-08-01 Thread Marc Branchaud
This will hopefully avoid questions over which spelling and grammar should be used. Translators are of course free to create localizations for specific English dialects. Signed-off-by: Marc Branchaud marcn...@xiplink.com --- On 13-08-01 02:21 PM, Junio C Hamano wrote: Marc Branchaud

Re: [PATCH v2 1/2] sha1_file: introduce close_one_pack() to close packs on fd pressure

2013-08-01 Thread Brandon Casey
On Thu, Aug 1, 2013 at 11:39 AM, Junio C Hamano gits...@pobox.com wrote: Brandon Casey draf...@gmail.com writes: I've been looking closer at uses of p-windows everywhere, and it seems that we always open_packed_git() before we try to create new windows. There doesn't seem to be any reason

Re: [PATCH v2 1/2] sha1_file: introduce close_one_pack() to close packs on fd pressure

2013-08-01 Thread Brandon Casey
On Thu, Aug 1, 2013 at 12:16 PM, Brandon Casey draf...@gmail.com wrote: On Thu, Aug 1, 2013 at 11:39 AM, Junio C Hamano gits...@pobox.com wrote: Brandon Casey draf...@gmail.com writes: I've been looking closer at uses of p-windows everywhere, and it seems that we always open_packed_git()

Re: [PATCH v2 1/2] sha1_file: introduce close_one_pack() to close packs on fd pressure

2013-08-01 Thread Junio C Hamano
Brandon Casey draf...@gmail.com writes: On Thu, Aug 1, 2013 at 11:39 AM, Junio C Hamano gits...@pobox.com wrote: That makes me feel somewhat uneasy. Yes, you can open/mmap/close and hold onto the contents of a file still mapped in-core, and it may not count as open filedescriptor, but do

URGENT RESPONSE!!

2013-08-01 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

Re: [PATCH v2 1/2] sha1_file: introduce close_one_pack() to close packs on fd pressure

2013-08-01 Thread Brandon Casey
On Thu, Aug 1, 2013 at 1:02 PM, Junio C Hamano gits...@pobox.com wrote: Brandon Casey draf...@gmail.com writes: On Thu, Aug 1, 2013 at 11:39 AM, Junio C Hamano gits...@pobox.com wrote: That makes me feel somewhat uneasy. Yes, you can open/mmap/close and hold onto the contents of a file still

Re: What's cooking in git.git (Jul 2013, #09; Mon, 29)

2013-08-01 Thread Ramsay Jones
Junio C Hamano wrote: Ramsay Jones ram...@ramsay1.demon.co.uk writes: I am personally in favor of this simpler solution. Comments? I had expected this to me marked for 'master'. Has this simply been overlooked, or do you have reservations about applying this patch? I am just being

Re: What's cooking in git.git (Jul 2013, #09; Mon, 29)

2013-08-01 Thread Junio C Hamano
Ramsay Jones ram...@ramsay1.demon.co.uk writes: Junio C Hamano wrote: Ramsay Jones ram...@ramsay1.demon.co.uk writes: I am personally in favor of this simpler solution. Comments? I had expected this to me marked for 'master'. Has this simply been overlooked, or do you have reservations

[ANNOUNCE] Git v1.8.4-rc1

2013-08-01 Thread Junio C Hamano
A release candidate for Git v1.8.4-rc1 is now available for testing at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: ab0bb0ed36dd9c0d6425f64021a9c7d7311a2b5c git-1.8.4.rc1.tar.gz

What's in What's cooking

2013-08-01 Thread Junio C Hamano
Here is a note to explain various sections and what the readers on this list are expected to read from them in the periodic What's cooking summary. This probably should be integrated in the periodic A note from the maintainer posting eventually. The first part is mostly a boilerplate message,

URGENT RESPONSE!!

2013-08-01 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

URGENT RESPONSE!!

2013-08-01 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

Re: Difficulty adding a symbolic link, part 3

2013-08-01 Thread Duy Nguyen
On Thu, Aug 1, 2013 at 10:00 PM, Dale R. Worley wor...@alum.mit.edu wrote: From: Duy Nguyen pclo...@gmail.com Can someone give me advice on what this code *should* do? It does as the function name says: given cwd, a prefix (i.e. a relative path with no .. components) and a path relative to

Re: [TIG][PATCH] Scroll diff with arrow keys in log view

2013-08-01 Thread Jonas Fonseca
On Wed, Jul 31, 2013 at 11:11 PM, Kumar Appaiah a.ku...@alumni.iitm.ac.in wrote: This commit introduces the VIEW_NO_PARENT_NAV flag and adds it to the log view. This allows the scrolling commands to fall through from the pager to the diff when the diff is viewed in the log mode. Thanks, works

Re: [TIG][PATCH] Scroll diff with arrow keys in log view

2013-08-01 Thread Kumar Appaiah
On Thu, Aug 01, 2013 at 10:01:58PM -0400, Jonas Fonseca wrote: On Wed, Jul 31, 2013 at 11:11 PM, Kumar Appaiah a.ku...@alumni.iitm.ac.in wrote: This commit introduces the VIEW_NO_PARENT_NAV flag and adds it to the log view. This allows the scrolling commands to fall through from the pager

Re: How to hierarchically merge from the root to the leaf of a branch tree? (Patch stack management)

2013-08-01 Thread Jens Müller
Am 01.08.2013 09:28, schrieb Jakub Narebski: There is also TopGit, which is feature-branch management tools (which seems like what you want, from what you written below). Indeed, thank you very much for pointing me to it. I have not read the whole documentation, but it sounds promising enough

[PATCH v3] sha1_file: introduce close_one_pack() to close packs on fd pressure

2013-08-01 Thread Brandon Casey
When the number of open packs exceeds pack_max_fds, unuse_one_window() is called repeatedly to attempt to release the least-recently-used pack windows, which, as a side-effect, will also close a pack file after closing its last open window. If a pack file has been opened, but no windows have been