Re: [PATCH 1/2] git-fast-import.txt: improve documentation for quoted paths

2012-11-30 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: That shell-style contradicts with what fast-import.c says, though. It claims to grok \octal and described as C-style. As Peff mentionned, my last version is better, although still a bit incomplete. My new version documents things that _must_ be escaped,

Re: [PATCH/RFC 0/5] win32: support echo for terminal-prompt

2012-11-30 Thread Erik Faye-Lund
Ping? On Tue, Nov 13, 2012 at 3:04 PM, Erik Faye-Lund kusmab...@gmail.com wrote: We currently only support getpass, which does not echo at all, for git_terminal_prompt on Windows. The Windows console is perfectly capable of doing this, so let's make it so. This implementation tries to reuse

Re: [PATCH] Extend runtime prefix computation

2012-11-30 Thread Erik Faye-Lund
On Tue, Nov 27, 2012 at 5:30 PM, Michael Weiser m.wei...@science-computing.de wrote: Support determining the binaries' installation path at runtime even if called without any path components (i.e. via search path). Implement fallback to compiled-in prefix if determination fails or is

Re: [PATCH] Extend runtime prefix computation

2012-11-30 Thread Michael Weiser
Hello Erik, On Fri, Nov 30, 2012 at 11:20:52AM +0100, Erik Faye-Lund wrote: +#if defined(__linux__) + struct stat st; + if (!stat(/proc/self/exe, st)) { + abs_argv0 = xstrdup(real_path(/proc/self/exe)); + } +#elif

Re: [Query] Can we ignore case for commiters name in shortlog?

2012-11-30 Thread Max Horn
On 30.11.2012, at 04:35, viresh kumar wrote: On 30 November 2012 09:03, Nicolas Pitre nicolas.pi...@linaro.org wrote: Have a look at the .mailmap file in the top directory of your repo. Repeating what i said to David in other mail: I have my name there :) I thought using names with

[PATCH v2 0/4] t4041 (diff-submodule-option): minor cleanup

2012-11-30 Thread Ramkumar Ramachandra
Hi, v1 is here: 1354005692-2809-1-git-send-email-artag...@gmail.com This is in response to Junio's review of v1. Thanks. Ram Ramkumar Ramachandra (4): t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs t4041 (diff-submodule-option): parse digests sensibly t4041

[PATCH v2 1/4] t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs

2012-11-30 Thread Ramkumar Ramachandra
The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- t/t4041-diff-submodule-option.sh | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git

[PATCH v2 3/4] t4041 (diff-submodule-option): rewrite add_file() routine

2012-11-30 Thread Ramkumar Ramachandra
Instead of cd there and then come back, use the cd there in a subshell pattern. Also fix '' chaining in one place. Suggested-by: Junio C Hamano gits...@pobox.com Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- t/t4041-diff-submodule-option.sh | 23 +++ 1 files

[PATCH v2 4/4] t4041 (diff-submodule-option): modernize style

2012-11-30 Thread Ramkumar Ramachandra
- Enclose tests in single quotes as opposed to double quotes. This is the prevalent style in other tests. - Remove the unused variable $head4_full. - Indent the expected output so that it lines up with the rest of the test text. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com ---

Re: [Query] Can we ignore case for commiters name in shortlog?

2012-11-30 Thread Damien Robert
David Aguilar wrote in message cajddkr7yr2jsutcey1mz-sfmq8zdnzr3+s++ooenn5+wd-l...@mail.gmail.com: There's a feature that does exactly this. http://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html By the way, the mailmap ignore case which is annoying. I have commits as

Re: [PATCH 6/8] imap-send: change msg_data from storing (char *, len) to storing strbuf

2012-11-30 Thread Michael Haggerty
On 11/29/2012 10:30 PM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: struct msg_data stored (char *, len) of the data to be included in a That (type, varname) is a bit funny notation, even though it is understandable. I understand that it is funny, but it seems like

Re: [PATCH 8/8] wrap_in_html(): process message in bulk rather than line-by-line

2012-11-30 Thread Michael Haggerty
On 11/29/2012 10:33 PM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: Now that we can xml-quote an arbitrary string in O(N), there is no reason to process the message line by line. This change saves lots of memory allocations and copying. The old code would have

Re: [Query] Can we ignore case for commiters name in shortlog?

2012-11-30 Thread Viresh Kumar
On 30 November 2012 16:49, Max Horn m...@quendi.de wrote: I don't see how wrong case is different from any other form of misspelling. And mailmap is there precisely to handle such problems. Now, if these case issues were for some reasons very frequent, it might be worth adding dedicated

Re: Operations on unborn branch

2012-11-30 Thread Martin von Zweigbergk
On Tue, Nov 27, 2012 at 11:12 PM, Junio C Hamano gits...@pobox.com wrote: You have to special case the edges whichever way you go. [...] If I understand you correctly, you're saying that revision walking would need a different special case. This is the most obvious difference, it seems. git

Re: [RFC/PATCH 1/2] reset: learn to reset to tree

2012-11-30 Thread Martin von Zweigbergk
On Thu, Nov 29, 2012 at 2:00 PM, Martin von Zweigbergk martinv...@gmail.com wrote: Slightly off topic, but another difference (or somehow another aspect of the same difference?) that has tripped me up a few times is that git checkout $rev . only affects added and modified files (in $rev

[RFC] remove/deprecate 'submodule init' and 'sync'

2012-11-30 Thread W. Trevor King
On Wed, Nov 28, 2012 at 12:19:04AM +0100, Jens Lehmann wrote: Am 26.11.2012 22:00, schrieb W. Trevor King: From: W. Trevor King wk...@tremily.us This allows users to override the .gitmodules value with a per-repository value. Your intentions makes lots of sense, but your patch does

Re: [msysGit] [PATCH/RFC 1/5] mingw: make fgetc raise SIGINT if apropriate

2012-11-30 Thread Johannes Schindelin
Hi, On Tue, 13 Nov 2012, Erik Faye-Lund wrote: Set a control-handler to prevent the process from terminating, and simulate SIGINT so it can be handled by a signal-handler as usual. One thing you might want to mention is that the fgetc() handling is not thread-safe, and intentionally so: if

Re: [msysGit] [PATCH/RFC 2/5] compat/terminal: factor out echo-disabling

2012-11-30 Thread Johannes Schindelin
Hi, On Tue, 13 Nov 2012, Erik Faye-Lund wrote: By moving the echo-disabling code to a separate function, we can implement OS-specific versions of it for non-POSIX platforms. Signed-off-by: Erik Faye-Lund kusmab...@gmail.com --- compat/terminal.c | 43

Re: [msysGit] [PATCH/RFC 4/5] mingw: reuse tty-version of git_terminal_prompt

2012-11-30 Thread Johannes Schindelin
Hi kusma, On Tue, 13 Nov 2012, Erik Faye-Lund wrote: The getpass-implementation we use on Windows isn't at all ideal; it works in raw-mode (as opposed to cooked mode), and as a result does not deal correcly with deletion, arrow-keys etc. Instead, use cooked mode to read a line at the time,

Re: [msysGit] [PATCH/RFC 5/5] mingw: get rid of getpass implementation

2012-11-30 Thread Johannes Schindelin
Hi kusma, On Tue, 13 Nov 2012, Erik Faye-Lund wrote: There's no remaining call-sites, and as pointed out in the previous commit message, it's not quite ideal. So let's just lose it. Awesome! Dscho -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [msysGit] [PATCH/RFC 1/5] mingw: make fgetc raise SIGINT if apropriate

2012-11-30 Thread Jeff King
On Fri, Nov 30, 2012 at 06:58:11PM +0100, Johannes Schindelin wrote: Hi, On Tue, 13 Nov 2012, Erik Faye-Lund wrote: Set a control-handler to prevent the process from terminating, and simulate SIGINT so it can be handled by a signal-handler as usual. One thing you might want to

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-11-30 Thread W. Trevor King
On Fri, Nov 30, 2012 at 12:53:09PM -0500, W. Trevor King wrote: Likewise for `submodule sync`, which seems to be quite similar to `init`. Ah, I'd remove the part of `sync` that touches the superproject's .git/config, but keep the part that stores the superproject-reorded URL in the submodule's

Re: [msysGit] [PATCH/RFC 2/5] compat/terminal: factor out echo-disabling

2012-11-30 Thread Jeff King
On Fri, Nov 30, 2012 at 06:59:30PM +0100, Johannes Schindelin wrote: diff --git a/compat/terminal.c b/compat/terminal.c index bbb038d..3217838 100644 --- a/compat/terminal.c +++ b/compat/terminal.c @@ -14,6 +14,7 @@ static void restore_term(void) return;

Re: [PATCH/RFC 3/5] compat/terminal: separate input and output handles

2012-11-30 Thread Jeff King
On Tue, Nov 13, 2012 at 03:04:05PM +0100, Erik Faye-Lund wrote: On Windows, the terminal cannot be opened in read-write mode, so we need distinct pairs for reading and writing. Since this works fine on other platforms as well, always open them in pairs. Looks OK. We're now opening /dev/tty

Re: [PATCH/RFC 4/5] mingw: reuse tty-version of git_terminal_prompt

2012-11-30 Thread Jeff King
On Tue, Nov 13, 2012 at 03:04:06PM +0100, Erik Faye-Lund wrote: The getpass-implementation we use on Windows isn't at all ideal; it works in raw-mode (as opposed to cooked mode), and as a result does not deal correcly with deletion, arrow-keys etc. Instead, use cooked mode to read a line at

Re: [PATCH/RFC 5/5] mingw: get rid of getpass implementation

2012-11-30 Thread Jeff King
On Tue, Nov 13, 2012 at 03:04:07PM +0100, Erik Faye-Lund wrote: There's no remaining call-sites, and as pointed out in the previous commit message, it's not quite ideal. So let's just lose it. Signed-off-by: Erik Faye-Lund kusmab...@gmail.com --- compat/mingw.c | 15 ---

Re: [PATCH/RFC 0/5] win32: support echo for terminal-prompt

2012-11-30 Thread Jeff King
On Fri, Nov 30, 2012 at 11:16:59AM +0100, Erik Faye-Lund wrote: Ping? Thanks for the reminder; your initial series came while I was traveling. I think it looks good. The compat/terminal code ends up a little uglier, but I think you overall did a good job of balancing code reuse across

Re: [PATCH] fsck: warn about .git in trees

2012-11-30 Thread Torsten Bögershausen
Having a .git entry inside a tree can cause confusing results on checkout. At the top-level, you could not checkout such a tree, as it would complain about overwriting the real .git directory. In a subdirectory, you might check it out, but performing operations in the subdirectory would

Re: [PATCH] fsck: warn about .git in trees

2012-11-30 Thread Jeff King
On Fri, Nov 30, 2012 at 08:50:41PM +0100, Torsten Bögershausen wrote: Having a .git entry inside a tree can cause confusing results on checkout. At the top-level, you could not checkout such a tree, as it would complain about overwriting the real .git directory. In a subdirectory, you might

Re: [PATCH 5/5] launch_editor: propagate SIGINT from editor to git

2012-11-30 Thread Jeff King
On Sun, Nov 11, 2012 at 08:48:38PM +0100, Johannes Sixt wrote: Am 11.11.2012 17:57, schrieb Jeff King: @@ -51,6 +51,8 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *en sigchain_push(SIGINT, SIG_IGN); ret = finish_command(p);

[PATCH] gitk: add a checkbox to control the visibility of tags

2012-11-30 Thread Łukasz Stelmach
Enable hiding of tags displayed in the tree as yellow labels. If a repository is used together with a system like Gerrit there may be quite a lot of tags used to control building and there may be hardly any place left for commit subjects. Signed-off-by: Łukasz Stelmach stl...@poczta.fm ---

[PATCH 0/5] ignore SIG{INT,QUIT} when launching editor

2012-11-30 Thread Jeff King
This is a re-roll of the pf/editor-ignore-sigint series. There are two changes from the original: 1. We ignore both SIGINT and SIGQUIT for least surprise compared to system(3). 2. We now use code + 128 to look for signal death (instead of WTERMSIG), as per run-command's

[PATCH 1/5] run-command: drop silent_exec_failure arg from wait_or_whine

2012-11-30 Thread Jeff King
We do not actually use this parameter; instead we complain from the child itself (for fork/exec) or from start_command (if we are using spawn on Windows). Signed-off-by: Jeff King p...@peff.net --- run-command.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git

[PATCH 2/5] launch_editor: refactor to use start/finish_command

2012-11-30 Thread Jeff King
The launch_editor function uses the convenient run_command_* interface. Let's use the more flexible start_command and finish_command functions, which will let us manipulate the parent state while we're waiting for the child to finish. Signed-off-by: Jeff King p...@peff.net --- editor.c | 10

[PATCH 3/5] launch_editor: ignore terminal signals while editor has control

2012-11-30 Thread Jeff King
From: Paul Fox p...@foxharp.boston.ma.us The user's editor likely catches SIGINT (ctrl-C). but if the user spawns a command from the editor and uses ctrl-C to kill that command, the SIGINT will likely also kill git itself (depending on the editor, this can leave the terminal in an unusable

[PATCH 4/5] run-command: do not warn about child death from terminal

2012-11-30 Thread Jeff King
SIGINT and SIGQUIT are not generally interesting signals to the user, since they are typically caused by them hitting ^C or otherwise telling their terminal to send the signal. Signed-off-by: Jeff King p...@peff.net --- run-command.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff

[PATCH 5/5] launch_editor: propagate signals from editor to git

2012-11-30 Thread Jeff King
We block SIGINT and SIGQUIT while the editor runs so that git is not killed accidentally by a stray ^C meant for the editor or its subprocesses. This works because most editors ignore SIGINT. However, some editor wrappers, like emacsclient, expect to die due to ^C. We detect the signal death in

Re: Topics currently in the Stalled category

2012-11-30 Thread Adam Spiers
On Wed, Nov 21, 2012 at 12:05 AM, Junio C Hamano gits...@pobox.com wrote: Here is a list of stalled topics I am having trouble deciding what to do (the default is to dismiss them around feature freeze). [snipped] * as/check-ignore (2012-11-08) 14 commits - t0007: fix tests on Windows -