Re: [PATCH 2/3] hooks/post-receive-email: force log messages in UTF-8

2013-08-05 Thread Alexey Shumkin
On Sun, Aug 04, 2013 at 11:14:40AM -0700, Jonathan Nieder wrote: Alexey Shumkin wrote: On Fri, Aug 02, 2013 at 04:23:38PM -0700, Jonathan Nieder wrote: 1. Log messages use the configured log output encoding, which is meant to be whatever encoding works best with local terminals

Re: redundant message in builtin/rm.c

2013-08-05 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: Thanks both. Perhaps we should do something like this? -- 8 -- Subject: builtin/rm.c: consolidate error reporting for removing submodules Sounds good, yes. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the

Re: Rewriting git-repack.sh in C

2013-08-05 Thread Matthieu Moy
Stefan Beller stefanbel...@googlemail.com writes: Hello, I'd like to rewrite the repack shell script in C. So I tried the naive approach reading the man page and the script itself and write C program by matching each block/line of the script with a function in C You should add one step

Re: git replace: should it check for object type, and can it replace merges?

2013-08-05 Thread Christian Couder
Hi, On Sat, Aug 3, 2013 at 5:13 PM, Philip Oakley philipoak...@iee.org wrote: A recent comment http://stackoverflow.com/a/18027030/717355 on a question I asked two years ago about 'grafts' and 'replace' indicates that users think that 'git replace' can't replace a merge commit. The

Fwd: Bug: SEGV in git when applying the patches

2013-08-05 Thread Rafal W.
Hi, When applying patch via git, it is doing sometimes SEGV. Please find more details in the attached crash logs. --- kenorb git_2013-07-08-150841_kenorbs-MacBook-Air.crash Description: Binary data git_2013-07-08-173513_kenorbs-MacBook-Air.crash Description: Binary data

Re: Fwd: Bug: SEGV in git when applying the patches

2013-08-05 Thread John Keeping
On Mon, Aug 05, 2013 at 12:01:44PM +0100, Rafal W. wrote: Hi, When applying patch via git, it is doing sometimes SEGV. Please find more details in the attached crash logs. This looks like the issue fixed by commit 212eb96 (apply: carefully strdup a possibly-NULL name, 2013-06-21), which is in

Re: Fwd: Bug: SEGV in git when applying the patches

2013-08-05 Thread Rafal W.
Thank you, I'll test with the newer version. --- kenorb On 5 August 2013 12:09, John Keeping j...@keeping.me.uk wrote: On Mon, Aug 05, 2013 at 12:01:44PM +0100, Rafal W. wrote: Hi, When applying patch via git, it is doing sometimes SEGV. Please find more details in the attached crash logs.

Re: [PATCH 4/4] gitweb: make search help link less ugly

2013-08-05 Thread Tony Finch
Jakub Narębski jna...@gmail.com wrote: - -values = ['commit', 'grep', 'author', 'committer', 'pickaxe']) . + -values = ['commit', 'grep', 'author', 'committer', 'pickaxe']) . Nb. what changed here (in line above)? Whoops, tab

Re: [PATCH 3/4] gitweb: omit the repository owner when it is unset

2013-08-05 Thread Tony Finch
Jakub Narębski jna...@gmail.com wrote: On Tue, Jul 2, 2013 at 6:24 PM, Tony Finch d...@dotat.at wrote: On the repository summary page, leave the whole owner line out if the repo does not have an owner, rather than displaying a labelled empty field.. Note that if $omit_owner is true,

Re: [PATCH] commit: reject non-characters

2013-08-05 Thread Peter Krefting
Peter Krefting: - /* U+FFFE and U+ are guaranteed non-characters. */ - if ((codepoint 0x1e) == 0xfffe) + /* U+xxFFFE and U+xx are guaranteed non-characters. */ + if ((codepoint 0xe) == 0xfffe) +

[PATCH v3] gc: reject if another gc is running, unless --force is given

2013-08-05 Thread Nguyễn Thái Ngọc Duy
This may happen when `git gc --auto` is run automatically, then the user, to avoid wait time, switches to a new terminal, keeps working and `git gc --auto` is started again because the first gc instance has not clean up the repository. This patch tries to avoid multiple gc running, especially in

About close() in commit_lock_file()

2013-08-05 Thread Duy Nguyen
close() is added in commit_lock_file(), before rename(), by 4723ee9 (Close files opened by lock_file() before unlinking. - 2007-11-13), which is needed by Windows. But doesn't that create a gap between close() and rename() on other platforms where another process can replace .lock file with

Re: What's cooking in git.git (Aug 2013, #01; Thu, 1)

2013-08-05 Thread Junio C Hamano
Thomas Rast tr...@inf.ethz.ch writes: Junio C Hamano gits...@pobox.com writes: * tr/log-full-diff-keep-true-parents (2013-08-01) 1 commit - log: use true parents for diff even when rewriting Output from git log --full-diff -- pathspec looked strange, because comparison was done with the

Re: [PATCH] log doc: the argument to --encoding is not optional

2013-08-05 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: $ git log --encoding fatal: Option '--encoding' requires a value $ git rev-list --encoding fatal: Option '--encoding' requires a value The argument to --encoding has always been mandatory. Unfortunately manpages like git-rev-list(1),

[PATCH] t8001, t8002: fix blame -L :literal test on NetBSD

2013-08-05 Thread René Scharfe
Sub-test 42 of t8001 and t8002 (blame -L :literal) fails on NetBSD with the following verbose output: git annotate -L:main hello.c Author F (expected 4, attributed 3) bad Author G (expected 1, attributed 1) good This is not caused by different behaviour of git blame or

Re: [BUG?] gc and impatience

2013-08-05 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: I worry less about this. It's not the right model to have two machines modify the same shared repository (gc --auto is only triggered when we think there are new objects) even though I think we support it. I am a bit hesitant to dismiss with It's not the

Re: [PATCH 2/2] howto: Eliminate all tabs

2013-08-05 Thread Junio C Hamano
Piotr Krukowiecki piotr.krukowie...@gmail.com writes: Isn't the howto documentation intended (mainly/also) for the users of git, not the developers? And they have *.html version for that exact version, no? We used not to bother running asciidoc to Documentation/howto, so the *.txt versions

Re: [PATCH] t8001, t8002: fix blame -L :literal test on NetBSD

2013-08-05 Thread Eric Sunshine
On Mon, Aug 5, 2013 at 11:21 AM, René Scharfe l@web.de wrote: Sub-test 42 of t8001 and t8002 (blame -L :literal) fails on NetBSD with the following verbose output: git annotate -L:main hello.c Author F (expected 4, attributed 3) bad Author G (expected 1,

git-http-backend vs gitweb pathinfo mode

2013-08-05 Thread Tony Finch
Background: You cam make the same URL work for gitwe and git clone as described in git-http-backend(1). It says: To serve gitweb at the same url, use a ScriptAliasMatch to only those URLs that git http-backend can handle, and forward the rest to gitweb: ScriptAliasMatch \

Re: [PATCH] Documentation/rev-list-options: add missing word in --*-parents

2013-08-05 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] log doc: the argument to --encoding is not optional

2013-08-05 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: git-http-backend vs gitweb pathinfo mode

2013-08-05 Thread Tony Finch
Tony Finch d...@dotat.at wrote: For example, go to https://git.csx.cam.ac.uk/i/ucs/git/git.git/tree and click on the gitweb subdirectory which takes you to https://git.csx.cam.ac.uk/i/ucs/git/git.git/tree/HEAD:/gitweb then click on [git/git.git] to go back, which takes you to

Re: [BUG?] gc and impatience

2013-08-05 Thread Ramkumar Ramachandra
Junio C Hamano wrote: I am a bit hesitant to dismiss with It's not the right model, as the original of accessing the repository from two terminals while one clearly is being accessed busily by gc falls into the same category. As to why I think it makes sense: garbage collecting unreferenced

[PATCH 0/3] Fixes for OS X

2013-08-05 Thread Brian Gernhardt
A few changes recently broke my build on Mac 10.8, possibly because I have a more strict set of warnings/errors enabled. The first two handle minor problems with the use of APPLE_COMMON_CRYPTO, which was expanded for use in imap-send but had a couple of problems. The last is likely due to curl

[PATCH 1/3] Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1

2013-08-05 Thread Brian Gernhardt
It used to be that APPLE_COMMON_CRYPTO did nothing when BLK_SHA1 was set. But APPLE_COMMON_CRYPTO is now used for more than just SHA1 (see 3ef2bca) so make sure that the appropriate libraries are always set. Signed-off-by: Brian Gernhardt br...@gernhardtsoftware.com --- Makefile | 4 +++- 1

[PATCH 3/3] t5551: Remove header from curl cookie file

2013-08-05 Thread Brian Gernhardt
The URL included in the header appears to vary from curl version to curl version. Since we only care about the final few lines, only test them. However, make sure the blank line after the header is still included to make sure there are no extra cookie lines. Signed-off-by: Brian Gernhardt

[PATCH 2/3] OS X: Fix redeclaration of die warning

2013-08-05 Thread Brian Gernhardt
compat/apple-common-crypto.h uses die() in one of its macros, but was included in git-compat-util.h before the definition of die. Fix by simply moving the relevant block after the die/error/warning declarations. Signed-off-by: Brian Gernhardt br...@gernhardtsoftware.com --- Not sure if this is

Re: [PATCH/RFC] log doc: explain --encoding=none and default output encoding

2013-08-05 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- I'm not thrilled with the wording. This can probably be explained more simply. Ideas? Some random thoughts on text, both before and after this patch. - The first stentence in this paragraph

Re: git replace: should it check for object type, and can it replace merges?

2013-08-05 Thread Philip Oakley
From: Christian Couder christian.cou...@gmail.com Hi, On Sat, Aug 3, 2013 at 5:13 PM, Philip Oakley philipoak...@iee.org wrote: A recent comment http://stackoverflow.com/a/18027030/717355 on a question I asked two years ago about 'grafts' and 'replace' indicates that users think that 'git

Re: [PATCH 2/3] OS X: Fix redeclaration of die warning

2013-08-05 Thread Jeremy Huddleston Sequoia
Thanks Brian, Reviewed-by: Jeremy Huddleston Sequoia jerem...@apple.com On Aug 5, 2013, at 8:59, Brian Gernhardt br...@gernhardtsoftware.com wrote: compat/apple-common-crypto.h uses die() in one of its macros, but was included in git-compat-util.h before the definition of die. Fix by

Re: [PATCH 1/3] Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1

2013-08-05 Thread Jeremy Huddleston Sequoia
Thanks Brian, Reviewed-by: Jeremy Huddleston Sequoia jerem...@apple.com On Aug 5, 2013, at 8:59, Brian Gernhardt br...@gernhardtsoftware.com wrote: It used to be that APPLE_COMMON_CRYPTO did nothing when BLK_SHA1 was set. But APPLE_COMMON_CRYPTO is now used for more than just SHA1 (see

Re: [PATCH] git_mkstemps: improve test suite test

2013-08-05 Thread Junio C Hamano
wor...@alum.mit.edu (Dale R. Worley) writes: Commit 52749 fixes a bug regarding testing the return of an open() call for success/failure. Improve the testsuite test for that fix by removing the helper program 'test-close-fd-0' and replacing it with the shell redirection '-'. (The

Re: [PATCH] cherry-pick: allow - as abbreviation of '@{-1}'

2013-08-05 Thread Junio C Hamano
Thomas Rast tr...@inf.ethz.ch writes: Hiroshige Umino hiroshig...@gmail.com writes: As git cherry-pick - or git merge - is convenient to switch back to or merge the previous branch, git cherry-pick - is abbreviation of git cherry-pick @{-1} to pick up a commit from the previous branch

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

2013-08-05 Thread Junio C Hamano
Mark Levedahl mleved...@gmail.com writes: I have been using this patch since Ramsey first sent it, have noticed no trouble over that time but all of my work is with filemode=true (has been since I started using git as Cygwin is a secondary platform for me and interoperability with repos on

Re: [PATCH] fix typo in documentation of git-svn

2013-08-05 Thread Junio C Hamano
Thanks, will apply after fixing whitespace damage to the patch. -- 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] .mailmap: Multiple addresses of Michael S. Tsirkin

2013-08-05 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] commit: reject non-characters

2013-08-05 Thread Junio C Hamano
Peter Krefting pe...@softwolves.pp.se writes: Peter Krefting: -/* U+FFFE and U+ are guaranteed non-characters. */ -if ((codepoint 0x1e) == 0xfffe) +/* U+xxFFFE and U+xx are guaranteed non-characters. */ +if ((codepoint 0xe)

Re: About close() in commit_lock_file()

2013-08-05 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: close() is added in commit_lock_file(), before rename(), by 4723ee9 (Close files opened by lock_file() before unlinking. - 2007-11-13), which is needed by Windows. But doesn't that create a gap between close() and rename() on other platforms where another

Re: [PATCH] git_mkstemps: improve test suite test

2013-08-05 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: wor...@alum.mit.edu (Dale R. Worley) writes: Commit 52749 fixes a bug regarding testing the return of an open() call for success/failure. Improve the testsuite test for that fix by removing the helper program 'test-close-fd-0' and replacing it with

Re: [BUG?] gc and impatience

2013-08-05 Thread Ramkumar Ramachandra
Martin Fick wrote: https://gerrit-review.googlesource.com/#/c/35215/ Very cool. Of what I understood: So, the problem is that my .git/objects/pack is polluted with little packs everytime I fetch (or push, if you're the server), and this is problematic from the perspective of a overtly (naively)

Re: [PATCH] t8001, t8002: fix blame -L :literal test on NetBSD

2013-08-05 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 1/3] Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1

2013-08-05 Thread Junio C Hamano
Brian Gernhardt br...@gernhardtsoftware.com writes: It used to be that APPLE_COMMON_CRYPTO did nothing when BLK_SHA1 was set. But APPLE_COMMON_CRYPTO is now used for more than just SHA1 (see 3ef2bca) so make sure that the appropriate libraries are always set. Signed-off-by: Brian Gernhardt

Re: [PATCH 2/3] OS X: Fix redeclaration of die warning

2013-08-05 Thread Junio C Hamano
Brian Gernhardt br...@gernhardtsoftware.com writes: compat/apple-common-crypto.h uses die() in one of its macros, but was included in git-compat-util.h before the definition of die. Fix by simply moving the relevant block after the die/error/warning declarations. Puzzled. What needs

[ANN] SubGit 2.0 Released

2013-08-05 Thread Semyon Vadishev
Hello all, Our team is proud to announce SubGit 2.0.0 release! New version is available for download at SubGit web site at http://subgit.com/ SubGit lets one to set up a bi-directional Git-SVN mirror, and thus it allows users to choose freely between Subversion and Git version control systems.

Re: [PATCH v3] gc: reject if another gc is running, unless --force is given

2013-08-05 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: diff --git a/builtin/gc.c b/builtin/gc.c index 6be6c8d..1f33908 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -167,11 +167,66 @@ static int need_to_gc(void) return 1; } +static int gc_running(int force) Sounds like a bool asking

Re: [PATCH v3] gc: reject if another gc is running, unless --force is given

2013-08-05 Thread Ramkumar Ramachandra
Junio C Hamano wrote: [...] The other comments mostly make sense. After reading what the whole function does, I think the purpose of this function is to take gc-lock (with optionally force). Perhaps a name along the lines of lock_gc, gc_lock, lock_repo_for_gc, would be more appropriate.

Re: [BUG?] gc and impatience

2013-08-05 Thread Martin Fick
On Monday, August 05, 2013 11:34:24 am Ramkumar Ramachandra wrote: Martin Fick wrote: https://gerrit-review.googlesource.com/#/c/35215/ Very cool. Of what I understood: So, the problem is that my .git/objects/pack is polluted with little packs everytime I fetch (or push, if you're the

Re: [PATCHv3 6/9] hash-object: Replace stdin parsing OPT_BOOLEAN by OPT_COUNTUP

2013-08-05 Thread Junio C Hamano
Stefan Beller stefanbel...@googlemail.com writes: This task emerged from b04ba2bb (parse-options: deprecate OPT_BOOLEAN, 2011-09-27). hash-object is a plumbing layer command, so better not change the input/output behavior for now. Unfortunately we have these lines relying on the count up

Re: [PATCHv3 7/9] config parsing options: allow one flag multiple times

2013-08-05 Thread Junio C Hamano
Stefan Beller stefanbel...@googlemail.com writes: This task emerged from b04ba2bb (parse-options: deprecate OPT_BOOLEAN, 2011-09-27). This commit introduces a change for the users, after this patch you can pass one of the config level flags multiple times: Before: $ git config

Re: [PATCH] log: use true parents for diff when walking reflogs

2013-08-05 Thread Junio C Hamano
Thomas Rast tr...@inf.ethz.ch writes: The reflog walking logic (git log -g) replaces the true parent list with the preceding commit in the reflog. This results in bogus commit diffs when combined with options such as -p; the diff is against the reflog predecessor, not the parent of the

[PATCH] remote-hg: add shared repo upgrade

2013-08-05 Thread Antoine Pelisse
From: Felipe Contreras felipe.contre...@gmail.com 6796d49 (remote-hg: use a shared repository store) introduced a bug by making the shared repository '.git/hg', which is already used before that patch, so clones that happened before that patch, fail after that patch, because there's no shared

Re: [PATCH 02/11] t8001/t8002: blame: demonstrate -L bounds checking bug

2013-08-05 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: A bounds checking bug allows the X in -LX to extend one line past the end of file. For example, given a file with 5 lines, -L6 is accepted as valid. Demonstrate this problem. While here, also add tests to check that the remaining cases of X and Y

[PATCH] remote-hg: add shared repo upgrade

2013-08-05 Thread Antoine Pelisse
From: Felipe Contreras felipe.contre...@gmail.com 6796d49 (remote-hg: use a shared repository store) introduced a bug by making the shared repository '.git/hg', which is already used before that patch, so clones that happened before that patch, fail after that patch, because there's no shared

Re: [PATCH] remote-hg: add shared repo upgrade

2013-08-05 Thread Felipe Contreras
On Mon, Aug 5, 2013 at 2:22 PM, Antoine Pelisse apeli...@gmail.com wrote: From: Felipe Contreras felipe.contre...@gmail.com 6796d49 (remote-hg: use a shared repository store) introduced a bug by making the shared repository '.git/hg', which is already used before that patch, so clones that

Re: [PATCH 02/11] t8001/t8002: blame: demonstrate -L bounds checking bug

2013-08-05 Thread Eric Sunshine
On Mon, Aug 5, 2013 at 3:29 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: A bounds checking bug allows the X in -LX to extend one line past the end of file. For example, given a file with 5 lines, -L6 is accepted as valid. Demonstrate this problem.

Re: [PATCH 02/11] t8001/t8002: blame: demonstrate -L bounds checking bug

2013-08-05 Thread Eric Sunshine
On Mon, Aug 5, 2013 at 3:35 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Mon, Aug 5, 2013 at 3:29 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: A bounds checking bug allows the X in -LX to extend one line past the end of file. For example,

Re: [PATCH] remote-hg: add shared repo upgrade

2013-08-05 Thread Antoine Pelisse
On Mon, Aug 5, 2013 at 9:31 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Mon, Aug 5, 2013 at 2:22 PM, Antoine Pelisse apeli...@gmail.com wrote: From: Felipe Contreras felipe.contre...@gmail.com 6796d49 (remote-hg: use a shared repository store) introduced a bug by making the

[PATCH] remote-hg: fix path when cloning with tilde expansion

2013-08-05 Thread Antoine Pelisse
The current code fixes the path to make it absolute when cloning, but doesn't consider tilde expansion, so that scenario fails throwing an exception because /home/myuser/~/my/repository doesn't exists: $ git clone hg::~/my/repository cd repository git fetch Fix that by using python

[PATCH ALTERNATIVE v6.v3 4/6] config: parse http.url.variable using urlmatch

2013-08-05 Thread Kyle J. McKay
Use the urlmatch_config_entry() to wrap the underlying http_options() two-level variable parser in order to set http.variable to the value with the most specific URL in the configuration. Signed-off-by: Jeff King p...@peff.net Signed-off-by: Kyle J. McKay mack...@gmail.com Signed-off-by: Junio C

Re: [PATCH] remote-hg: fix path when cloning with tilde expansion

2013-08-05 Thread Felipe Contreras
On Mon, Aug 5, 2013 at 3:12 PM, Antoine Pelisse apeli...@gmail.com wrote: The current code fixes the path to make it absolute when cloning, but doesn't consider tilde expansion, so that scenario fails throwing an exception because /home/myuser/~/my/repository doesn't exists: $ git clone

Re: [PATCH] remote-hg: fix path when cloning with tilde expansion

2013-08-05 Thread Antoine Pelisse
On Mon, Aug 5, 2013 at 10:30 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Mon, Aug 5, 2013 at 3:12 PM, Antoine Pelisse apeli...@gmail.com wrote: $ git clone hg::~/my/repository cd repository git fetch Fix that by using python os.path.expanduser method. Shouldn't that be

Re: [PATCH] remote-hg: add shared repo upgrade

2013-08-05 Thread Junio C Hamano
Antoine Pelisse apeli...@gmail.com writes: From: Felipe Contreras felipe.contre...@gmail.com 6796d49 (remote-hg: use a shared repository store) introduced a bug by making the shared repository '.git/hg', which is already used before that patch, so clones that happened before that patch, fail

Re: [PATCH ALTERNATIVE v6.v3 4/6] config: parse http.url.variable using urlmatch

2013-08-05 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: Use the urlmatch_config_entry() to wrap the underlying http_options() two-level variable parser in order to set http.variable to the value with the most specific URL in the configuration. Signed-off-by: Jeff King p...@peff.net Signed-off-by: Kyle J.

What's cooking in git.git (Aug 2013, #02; Mon, 5)

2013-08-05 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'. The first release candidate v1.8.4-rc1 has been tagged; only regression fixes and l10n updates from now on. You can find the changes described

Re: [PATCH 02/11] t8001/t8002: blame: demonstrate -L bounds checking bug

2013-08-05 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: The problem exists with and without the incomplete line. The comment mentioning incomplete line and wc was inserted to explain why it was necessary to add one to the result of wc, which might not otherwise be obvious. Would the comment be

Re: [PATCH ALTERNATIVE v6.v3 4/6] config: parse http.url.variable using urlmatch

2013-08-05 Thread Kyle J. McKay
On Aug 5, 2013, at 15:56, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com writes: Use the urlmatch_config_entry() to wrap the underlying http_options() two-level variable parser in order to set http.variable to the value with the most specific URL in the configuration. Signed-off-by:

Re: [BUG?] gc and impatience

2013-08-05 Thread Ramkumar Ramachandra
Duy Nguyen wrote: Good point. I think that is because gc does not check if gc is already running. Adding such a check should not be too hard. I think gc could save its pid in $GIT_DIR/auto-gc.pid. The next auto-gc checks this, if the pid is valid, skip auto-gc. Check. I also talked about gc

[PATCH] git exproll: steps to tackle gc aggression

2013-08-05 Thread Ramkumar Ramachandra
This is the rough explanation I wrote down after reading it: So, the problem is that my .git/objects/pack is polluted with little packs everytime I fetch (or push, if you're the server), and this is problematic from the perspective of a overtly (naively) aggressive gc that hammers out all

Re: [BUG?] gc and impatience

2013-08-05 Thread Ramkumar Ramachandra
Martin Fick wrote: I hope that someone more familiar with git gc than me might take this on some day. :) More likely scenario: someone who is unfamiliar with it will read and patch it little by little :) -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: [[TIG][PATCH] 1/3] Add log_select function to find commit from context in log view

2013-08-05 Thread Jonas Fonseca
On Fri, Aug 2, 2013 at 8:23 PM, Kumar Appaiah a.ku...@alumni.iitm.ac.in wrote: This commit introduces and uses the log_select function to find the correct commit in the unsplit log view. In the log view, if one scrolls down across a commit line, the current commit (as displayed in the status

Re: [[TIG][PATCH] 2/3] Display correct diff the context in split log view

2013-08-05 Thread Jonas Fonseca
On Fri, Aug 2, 2013 at 8:23 PM, Kumar Appaiah a.ku...@alumni.iitm.ac.in wrote: In the log view, when scrolling across a commit, the diff view should automatically switch to the commit whose context the cursor is on in the log view. This commit changes things to catch the REQ_ENTER in the log

Re: [[TIG][PATCH] 1/3] Add log_select function to find commit from context in log view

2013-08-05 Thread Jonas Fonseca
On Fri, Aug 2, 2013 at 8:23 PM, Kumar Appaiah a.ku...@alumni.iitm.ac.in wrote: diff --git a/tig.c b/tig.c index 72f132a..dd4b0f4 100644 --- a/tig.c +++ b/tig.c @@ -4427,11 +4454,30 @@ log_open(struct view *view, enum open_flags flags) static enum request log_request(struct view *view,

Re: [TIG][PATCH 0/3] Refactoring of the log view

2013-08-05 Thread Jonas Fonseca
On Fri, Aug 2, 2013 at 8:23 PM, Kumar Appaiah a.ku...@alumni.iitm.ac.in wrote: These set of patches refactor the log view to provide a behaviour that is quite similar to, say, e-mail with Mutt. The key improvements are: - The current commit is inferred based on the context. For example, if

Re: [[TIG][PATCH] 1/3] Add log_select function to find commit from context in log view

2013-08-05 Thread Kumar Appaiah
Dear Jonas, Thanks for the patient review. On Mon, Aug 05, 2013 at 11:27:44PM -0400, Jonas Fonseca wrote: On Fri, Aug 2, 2013 at 8:23 PM, Kumar Appaiah a.ku...@alumni.iitm.ac.in wrote: This commit introduces and uses the log_select function to find the correct commit in the unsplit log

[[TIG][PATCH v2] 0/3] Refactoring the log view

2013-08-05 Thread Kumar Appaiah
This is a second iteration. This handles the following: - remove unneeded comments - remove unneeded pager_request calls - rename update_commit_ref to recalculate_commit_context Now, the only thing missing is the recalculation of commits when the line number is changed. The trouble there is that

[[TIG][PATCH v2] 1/3] Add log_select function to find commit from context in log view

2013-08-05 Thread Kumar Appaiah
This commit introduces and uses the log_select function to find the correct commit in the unsplit log view. In the log view, if one scrolls down across a commit line, the current commit (as displayed in the status bar) gets updated, but not so when scrolling upward across a commit. The log_select

[[TIG][PATCH v2] 2/3] Display correct diff the context in split log view

2013-08-05 Thread Kumar Appaiah
In the log view, when scrolling across a commit, the diff view should automatically switch to the commit whose context the cursor is on in the log view. This commit changes things to catch the REQ_ENTER in the log view and handle recalculation of the commit and diff display from log_request,

[[TIG][PATCH v2] 3/3] Revert Scroll diff with arrow keys in log view

2013-08-05 Thread Kumar Appaiah
This reverts commit 888611dd5d407775245d574a3dc5c01b5963a5ba. This is because, in the re-engineered log view, scrolling the log with the arrows now updates the diff in the diff view when the screen is split. This resembles the earlier behaviour, and is also what users of software like Mutt (which