Re: [PATCH] completion: fix completion of certain aliases

2013-12-13 Thread SZEDER Gábor
Hi, On Sat, Dec 07, 2013 at 07:11:13AM -0600, Felipe Contreras wrote: Some commands need the first word to determine the actual action that is being executed, however, the command is wrong when we use an alias, This first sentence was hard to understand for me because of the wrong terminology

Re: [PATCH/POC 1/7] Make git_path() beware of file relocation in $GIT_DIR

2013-12-13 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: +static void adjust_git_path(char *buf, int git_dir_len) +{ + /* XXX buffer overflow */ + char *base = buf + git_dir_len; + if (git_graft_env !strcmp(base, info/grafts)) + strcpy(buf, get_graft_file()); + else if

Re: [PATCH 3/4] remote-hg: fix 'shared path' path

2013-12-13 Thread Antoine Pelisse
On Sat, Dec 7, 2013 at 2:09 PM, Felipe Contreras felipe.contre...@gmail.com wrote: If the repository is moved, the absolute path of the shared repository would fail. Make sure it's always up-to-date. Reported-by: Michael Davis mjmda...@gmail.com Signed-off-by: Felipe Contreras

Re: [PATCH/POC 2/7] Add new environment variable $GIT_SUPER_DIR

2013-12-13 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: This is the base for git-new-workdir integration. The git-new-workdir script creates a separate worktree that shares everything except worktree-related stuff. The sharing is eanbled by this new env variable. In the new worktree, both variables

Re: [PATCH/POC 3/7] setup.c: add split-repo support to .git files

2013-12-13 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: If a .git file contains gitsuper: path gitdir: id then we set GIT_SUPER_DIR to path and GIT_DIR to $GIT_SUPER_DIR/repos/id. I initially thought: what is with that complexity? isn't it just the matter of replacing 'gitdir: path' with

[PATCH] gitk: Comply with XDG base directory specification

2013-12-13 Thread Astril Hayato
Write the gitk config data to $XDG_CONFIG_HOME/git/gitk ($HOME/.config/git/gitk by default) in line with the XDG specification. This makes it consistent with git which also follows the spec. If $HOME/.gitk already exists use that for backward compatibility, so only new installations are affected.

Re: [PATCH] contrib/git-credential-gnome-keyring.c: small stylistic cleanups

2013-12-13 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: John Szakmeister j...@szakmeister.net writes: On Mon, Dec 9, 2013 at 1:06 PM, Junio C Hamano gits...@pobox.com wrote: [snip] I thought we cast without SP after the (typename), i.e. gpointer *data = (gpointer *)user_data; I've found a

Re: [PATCH/POC 3/7] setup.c: add split-repo support to .git files

2013-12-13 Thread Jonathan Nieder
Junio C Hamano wrote: - Do we want to record where the working tree directory is in $GIT_SUPER_DIR/repos/id somewhere? Would it help to have such a record? That could be nice for the purpose of garbage collecting them. I fear that for users it is too tempting to remove a worktree

Re: What's cooking in git.git (Dec 2013, #03; Thu, 12)

2013-12-13 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: On 12/13/2013 01:57 AM, Junio C Hamano wrote: [Cooking] * fc/transport-helper-fixes (2013-12-09) 6 commits - remote-bzr: support the new 'force' option - test-hg.sh: tests are now expected to pass - transport-helper: check for 'forced

Re: [PATCH] send-pack.c: mark a file-local function static

2013-12-13 Thread Ramsay Jones
On 13/12/13 00:58, Duy Nguyen wrote: On Fri, Dec 13, 2013 at 6:15 AM, Ramsay Jones ram...@ramsay1.demon.co.uk wrote: BTW, I have not been following these patches, but I noticed that the 'remove_nonexistent_ours_in_pack()' function has no callers. (There are two commented out callers - but

Re: [PATCH v4 1/2] diff: move no-index detection to builtin/diff.c

2013-12-13 Thread Jonathan Nieder
Hi, Thomas Gummerer wrote: Signed-off-by: Thomas Gummerer t.gumme...@gmail.com Thanks, and sorry for the slow follow-up. [...] --- a/builtin/diff.c +++ b/builtin/diff.c @@ -16,6 +16,9 @@ [...] @@ -283,14 +286,57 @@ int cmd_diff(int argc, const char **argv, const char *prefix) *

Re: [PATCH v4 2/2] diff: don't read index when --no-index is given

2013-12-13 Thread Jonathan Nieder
Thomas Gummerer wrote: Also add a test to guard against future breakages, and a performance test to show the improvements. Very nice. Signed-off-by: Thomas Gummerer t.gumme...@gmail.com Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- To unsubscribe from this list: send the line

Re: [PATCH/POC 2/7] Add new environment variable $GIT_SUPER_DIR

2013-12-13 Thread Duy Nguyen
On Sat, Dec 14, 2013 at 1:12 AM, Junio C Hamano gits...@pobox.com wrote: diff --git a/path.c b/path.c index eda9176..86a7c15 100644 --- a/path.c +++ b/path.c @@ -75,6 +75,16 @@ static void adjust_git_path(char *buf, int git_dir_len) strcpy(buf, get_index_file()); else if

Re: [PATCH/POC 3/7] setup.c: add split-repo support to .git files

2013-12-13 Thread Duy Nguyen
On Sat, Dec 14, 2013 at 3:43 AM, Jonathan Nieder jrnie...@gmail.com wrote: Junio C Hamano wrote: - Do we want to record where the working tree directory is in $GIT_SUPER_DIR/repos/id somewhere? Would it help to have such a record? That could be nice for the purpose of garbage

Re: [PATCH v5 02/14] add a hashtable implementation that supports O(1) removal

2013-12-13 Thread Jonathan Nieder
Hi, Karsten Blees wrote: test-hashmap.c | 340 Here come two small tweaks on top (meant for squashing in or applying to the series, whichever is more convenient). Thanks, Jonathan Nieder (2): Add test-hashmap to .gitignore Drop

[PATCH 1/2] Add test-hashmap to .gitignore

2013-12-13 Thread Jonathan Nieder
Prevent the test-hashmap program from being accidentally tracked with git add or cluttering git status output. Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b5f9def..dc600f9 100644 ---

[PATCH 2/2] Drop unnecessary #includes from test-hashmap

2013-12-13 Thread Jonathan Nieder
Per Documentation/CodingGuidelines most C files in git start with a #include of git-compat-util.h or another header file that includes it, such as cache.h or builtin.h. This file doesn't need anything beyond git-compat-util.h, so use that. Remove a #include of the system header stdio.h since it

Re: [PATCH] l10n:gitk: Init Vietnamese translation

2013-12-13 Thread Trần Ngọc Quân
On 14/12/2013 09:42, Tran Ngoc Quan wrote: Signed-off-by: Tran Ngoc Quan vnwild...@gmail.com --- gitk-git/po/vi.po | 1350 + po/vi.po | 594 +++ Sorry, not include po/vi.po I Will sent other patch! -- Trần

[PATCH] l10n:gitk: Init Vietnamese translation

2013-12-13 Thread Tran Ngoc Quan
Signed-off-by: Tran Ngoc Quan vnwild...@gmail.com --- gitk-git/po/vi.po | 1350 + 1 file changed, 1350 insertions(+) create mode 100644 gitk-git/po/vi.po diff --git a/gitk-git/po/vi.po b/gitk-git/po/vi.po new file mode 100644 index

Re: [PATCH] l10n:gitk: Init Vietnamese translation

2013-12-13 Thread Duy Nguyen
You should have copied Paul, gitk maintainer. I think Junio only pulls gitk patches from him, not random ones on the list. +Paul as I have something to say about gitk itself, not just the translations. 2013/12/14 Tran Ngoc Quan vnwild...@gmail.com: +#: gitk:494 gitk:4429 +msgid Reading