git-svn --preserve-empty-dirs: Failed to strip path

2013-04-27 Thread Ilya Basin
Hi. I ran 'git svn init', then git config svn-remote.svn.preserve-empty-dirs true git config svn-remote.svn.placeholder-filename .gitignore then 'git svn fetch' and I get this: ... r897 = dc26a4628a0e1fb79452a3f1953fbdc1feae69d1 (refs/remotes/svn/trunk) M pom.xml

Re: [ANNOUNCE] Git v1.8.3-rc0

2013-04-27 Thread John Keeping
On Fri, Apr 26, 2013 at 05:22:22PM -0700, Junio C Hamano wrote: * git difftool allows the user to write into the temporary files being shown; if the user makes changes to the working tree at the same time, one of the changes has to be lost in such a case, but it tells the user what

[PATCH 00/11] completion: general cleanups

2013-04-27 Thread Felipe Contreras
Hi, Basically while trying to understand the code for path completion, I found that a lot of code was duplicated, and for not much gain. I also noticed that doing 'git add file' doesn't add the trailing space as before. It's not clear if it should be possible to do that with -o filenames, but

[PATCH 01/11] completion: add file completion tests

2013-04-27 Thread Felipe Contreras
The commit fea16b4 (git-completion.bash: add support for path completion) introduced quite a few changes, without the usual tests. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t9902-completion.sh | 68 +++ 1 file changed, 68

[PATCH 02/11] completion: document tilde expansion failure in tests

2013-04-27 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t9902-completion.sh | 9 + 1 file changed, 9 insertions(+) diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 385e1e4..81a1657 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -415,4 +415,13

[PATCH 03/11] completion; remove unuseful comments

2013-04-27 Thread Felipe Contreras
The only caller, __git_complete_index_file() doesn't specify any limits to the options for 'git ls-files', neither should this function. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/completion/git-completion.bash | 2 -- 1 file changed, 2 deletions(-) diff --git

[PATCH 04/11] completion: use __gitcompadd for __gitcomp_file

2013-04-27 Thread Felipe Contreras
Like the rest of the script does; let's not access COMPREPLY directly. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash

[PATCH 06/11] completion: refactor __git_complete_index_file()

2013-04-27 Thread Felipe Contreras
The calls to __gitcomp_file() are essentially the same, but with different prefix. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/completion/git-completion.bash | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git

[PATCH 07/11] completion: avoid compopt -o filenames

2013-04-27 Thread Felipe Contreras
If this option causes so much trouble, lets just not use it. The supposed advantages of specifying the 'filenames' is that 1) a slash is added at the end, 2) trailing spaces are removed (which doesn't seem to be true), and 3) special characters are quoted. We can do all those things by ourselves.

[PATCH 08/11] completion: get rid of __gitcomp_file()

2013-04-27 Thread Felipe Contreras
Now that we don't use -o filenames, it's no different from __gitcomp_nl(). The only reason we might want it is for other shells, like zsh, which can do more useful things if they know it's a file, like colouring the output. But that can be done in the zsh completion. Signed-off-by: Felipe

[PATCH 10/11] completion: remove __git_index_file_list_filter()

2013-04-27 Thread Felipe Contreras
Refactor the code into the only caller; __git_index_files(). Also, Somehow messing up with the 'path' variable messes up the 'PATH' variable. So let's not do that. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/completion/git-completion.bash | 26

[PATCH 09/11] completion: add space after completed filename

2013-04-27 Thread Felipe Contreras
Just like before fea16b4 (git-completion.bash: add support for path completion). Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/completion/git-completion.bash | 2 +- t/t9902-completion.sh | 28 ++-- 2 files changed, 15

[PATCH 11/11] completion: zsh: add proper file support

2013-04-27 Thread Felipe Contreras
So the files are completed and coloured nicely. The code would be only a couple of lines if only _multi_parts or _path_files worked correctly, but alas, they don't. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/completion/git-completion.zsh | 42

[PATCH 05/11] completion: refactor diff_index wrappers

2013-04-27 Thread Felipe Contreras
At the end of the day what we really need is to find out the files that have been staged, or modified, because those files are the ones that make sense to pass as arguments to 'git commit'. We need diff-index to find those out, since 'git ls-files' doesn't do that. But we don't need wrappers and

Re: [PATCH] t/Makefile: remove smoke test targets

2013-04-27 Thread Thomas Rast
John Keeping j...@keeping.me.uk writes: Commit d24fbca (Remove Git's support for smoke testing - 2011-12-23) removed the smoke test support from the test suite but it was re-added by commit 342e9ef (Introduce a performance testing framework - 2012-02-17). This appears to be the result of a

Re: [PATCH 00/11] completion: general cleanups

2013-04-27 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 27/04/2013 12:19, Felipe Contreras ha scritto: Hi, Basically while trying to understand the code for path completion, I found that a lot of code was duplicated, and for not much gain. I also noticed that doing 'git add file' doesn't add

Re: [PATCH v2] merge-tree: don't print entries that match local

2013-04-27 Thread René Scharfe
Am 07.04.2013 23:07, schrieb John Keeping: The documentation says: the output from the command omits entries that match the branch1 tree. But currently added in branch1 and removed in branch1 (both while unchanged in branch2) do print output. Change this so that the behaviour

Re: [PATCH 00/11] completion: general cleanups

2013-04-27 Thread Felipe Contreras
On Sat, Apr 27, 2013 at 6:33 AM, Manlio Perillo manlio.peri...@gmail.com wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 27/04/2013 12:19, Felipe Contreras ha scritto: Hi, Basically while trying to understand the code for path completion, I found that a lot of code was

Re: [PATCH v2] merge-tree: don't print entries that match local

2013-04-27 Thread John Keeping
On Sat, Apr 27, 2013 at 01:35:57PM +0200, René Scharfe wrote: Am 07.04.2013 23:07, schrieb John Keeping: The documentation says: the output from the command omits entries that match the branch1 tree. But currently added in branch1 and removed in branch1 (both while unchanged

[PATCH] merge-tree: fix typo in both changed identically

2013-04-27 Thread John Keeping
Commit aacecc3 (merge-tree: don't print entries that match local - 2013-04-07) had a typo causing the same in both check to be incorrect and check if both the base and their versions are empty instead of checking that both the our and their versions are empty. Fix this. Reported-by: René Scharfe

Re: [PATCH 00/11] completion: general cleanups

2013-04-27 Thread Felipe Contreras
On Sat, Apr 27, 2013 at 7:36 AM, Felipe Contreras felipe.contre...@gmail.com wrote: On Sat, Apr 27, 2013 at 6:33 AM, Manlio Perillo manlio.peri...@gmail.com wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 27/04/2013 12:19, Felipe Contreras ha scritto: Hi, Basically while trying to

git-icing: sugary wrapper around git-cherry

2013-04-27 Thread Adam Spiers
Hi all, I just wrote a wrapper around git cherry which adds a splash of colour, and facilitates exclusion of commits which should never be upstreamed, by using a git-notes(1) namespace as a blacklist. It's just a quick hack and Ruby probably won't be to everyone's taste, but I thought I'd

Re: [PATCH] merge-tree: fix typo in both changed identically

2013-04-27 Thread René Scharfe
How about squashing in this test? René --- t/t4300-merge-tree.sh | 13 + 1 file changed, 13 insertions(+) diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh index bd43b3d..2defb42 100755 --- a/t/t4300-merge-tree.sh +++ b/t/t4300-merge-tree.sh @@ -205,6 +205,19 @@ EXPECTED

[PATCH] git-gui: fix file name handling with non-empty prefix

2013-04-27 Thread John Keeping
Commit e3d06ca (git-gui: Detect full path when parsing arguments - 2012-10-02) fixed the handling of absolute paths passed to the browser and blame subcommands by checking whether the file exists without the prefix before prepending the prefix and checking again. Since we have chdir'd to the top

Re: [PATCH] merge-tree: fix typo in both changed identically

2013-04-27 Thread John Keeping
On Sat, Apr 27, 2013 at 03:23:18PM +0200, René Scharfe wrote: How about squashing in this test? René --- t/t4300-merge-tree.sh | 13 + 1 file changed, 13 insertions(+) diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh index bd43b3d..2defb42 100755 ---

[PATCH v2] merge-tree: fix typo in both changed identically

2013-04-27 Thread John Keeping
Commit aacecc3 (merge-tree: don't print entries that match local - 2013-04-07) had a typo causing the same in both check to be incorrect and check if both the base and their versions are removed instead of checking that both the our and their versions are removed. Fix this. Reported-by: René

Re: git grep parallelism question

2013-04-27 Thread Thomas Rast
Linus Torvalds torva...@linux-foundation.org writes: Anyway, I think your patch is good if for no other reason that it allows this kind of testing, but at least for my machine, clearly the current default of eight threads is actually good enough. Maybe somebody with a very different machine

Re: [PATCH] inotify to minimize stat() calls

2013-04-27 Thread Thomas Rast
Thomas Rast tr...@inf.ethz.ch writes: Robert Zeh robert.allan@gmail.com writes: On Thu, Apr 25, 2013 at 3:18 AM, Thomas Rast tr...@inf.ethz.ch wrote: I don't get this bit. The lstat() are run over all files listed in the index. So shouldn't your daemon watch exactly those (or rather,

Making a (quick) commit to another branch

2013-04-27 Thread Johannes Schneider
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi guys, I love git. And I use it every day. But there is one minor thing, that bugs me a little bit: I am implementing something on a feature branch. Now I detect a minor typo/bug/whatever that just needs a one line commit. But of course I don't

Re: [PATCH] git-gui: fix file name handling with non-empty prefix

2013-04-27 Thread John Keeping
I got a bounce with 550 no such user for Pat's email address when sending this. Does anyone have more up-to-date contact details? Or is it just SourceForge being broken? On Sat, Apr 27, 2013 at 02:24:16PM +0100, John Keeping wrote: Commit e3d06ca (git-gui: Detect full path when parsing

Re: Making a (quick) commit to another branch

2013-04-27 Thread Javier Domingo
2013/4/27 Johannes Schneider maili...@cedarsoft.com: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi guys, I love git. And I use it every day. But there is one minor thing, that bugs me a little bit: I am implementing something on a feature branch. Now I detect a minor typo/bug/whatever

[PATCH] gitk: Add menu item for reverting commits

2013-04-27 Thread Knut Franke
Sometimes it's helpful (at least psychologically) to have this feature easily accessible. Code borrows heavily from cherrypick. Signed-off-by: Knut Franke knut.fra...@gmx.de --- gitk | 62 ++ 1 file changed, 62 insertions(+) diff

Re: Making a (quick) commit to another branch

2013-04-27 Thread Patrik Gornicz
I've also encountered this desire to quickly fix something in another branch. My need is more driven by the fact that it's a large project and stashing changes / switching branches frequently results in 2-6 minute build times afterward. Thus the commit to another branch suggestion would be

Re: git-svn --preserve-empty-dirs: Failed to strip path

2013-04-27 Thread Ilya Basin
Small test script: rm -rf testrepo.svn testrepo.gitsvn svnadmin create testrepo.svn url=file://`pwd`/testrepo.svn svn mkdir -m $url/trunk $url/branches $url/tags rm -rf testrepo svn co $url testrepo cd testrepo/trunk mkdir -p foo/bar/ svn add foo/ svn

[PATCH v2] Add support for -i/--interactive to git-clean

2013-04-27 Thread Jiang Xin
Show what would be done and a confirmation dialog before actually cleaning. In the confirmation dialog, the user can input a space separated prefix list, and each clean candidate that matches with one of prefix, will be excluded from cleaning. When the user feels it's OK, press ENTER to start

Possible meaningless block in perl/Git/SVN/Fetcher.pm: sub find_empty_directories

2013-04-27 Thread Ilya Basin
Hi list, Hi Ray. Ray Chen who coded this part didn't show up in this list since 2011, so I'm asking everyone else. Also, I don't know perl. Excuse me, if the question is stupid. Here's the function. It's supposed to return a list of directories that became empty during this commit. The returned

Re: Re* [PATCH] git-remote-testgit: avoid process substitution

2013-04-27 Thread Johannes Sixt
Am 27.04.2013 01:26, schrieb Junio C Hamano: Felipe Contreras felipe.contre...@gmail.com writes: No, it wouldn't, but I don't think there's any way to do \\ or \b in globs. This should do in the meantime, but it further needs: - J6t's sign off for the follow-up part to remove remaining

Re: [PATCH 00/11] completion: general cleanups

2013-04-27 Thread Felipe Contreras
On Sat, Apr 27, 2013 at 10:40 AM, Manlio Perillo manlio.peri...@gmail.com wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 27/04/2013 15:07, Felipe Contreras ha scritto: [...] This should do the trick. No? --- a/contrib/completion/git-completion.bash +++

Re: [PATCH 00/11] completion: general cleanups

2013-04-27 Thread Felipe Contreras
On Sat, Apr 27, 2013 at 2:15 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Sat, Apr 27, 2013 at 10:40 AM, Manlio Perillo manlio.peri...@gmail.com wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 27/04/2013 15:07, Felipe Contreras ha scritto: [...] This should do the

[PATCH 0/6] misc sparse patches (part 1)

2013-04-27 Thread Ramsay Jones
Hi Junio, As you know, I like to catch sparse errors/warnings while they are still in pu. The topics addressed by the first two patches progressed from pu during the easter break, so I missed them. Sorry about that. I have refrained from sending patches to (parts of) the compat area because I

[PATCH 1/6] clone: Make the 'junk_mode' symbol a file static

2013-04-27 Thread Ramsay Jones
Sparse issues an 'junk_mode' not declared. Should it be static? warning. In order to suppress the warning, since this symbol does not need more than file visibility, we simply add the static modifier to it's declaration. Signed-off-by: Ramsay Jones ram...@ramsay1.demon.co.uk --- builtin/clone.c

[PATCH 2/6] path: Make the 'get_st_mode_bits' symbol a file static

2013-04-27 Thread Ramsay Jones
On MinGW, sparse issues an 'get_st_mode_bits' not declared. Should it be static? warning. The MinGW and MSVC builds do not see the declaration of this function, within git-compat-util.h, due to it's placement within an preprocessor conditional. (So, one solution would be to simply move the

[PATCH 3/6] compat/regex/regexec.c: Fix some sparse warnings

2013-04-27 Thread Ramsay Jones
Sparse issues an Using plain integer as NULL pointer warning along with two symbol was not declared. Should it be static? type warnings for the 'merge_state_with_log' and 'find_recover_state' functions. In order to suppress the warnings, we replace the use of '0' as a null pointer constant with

[PATCH 4/6] compat/fnmatch/fnmatch.c: Fix a sparse error

2013-04-27 Thread Ramsay Jones
Sparse issues the following error and warnings: SP compat/fnmatch/fnmatch.c .../fnmatch.c:144:17: warning: Using plain integer as NULL pointer .../fnmatch.c:238:67: warning: Using plain integer as NULL pointer .../fnmatch.c:303:40: error: too many arguments for function getenv The error is

[PATCH 5/6] compat/nedmalloc: Fix some sparse warnings

2013-04-27 Thread Ramsay Jones
Sparse issues many Using plain integer as NULL pointer warnings while checking nedmalloc.c (at least 98 such warnings before giving up due to too many warnings). In addition, sparse issues some non-ANSI function declaration type warnings for the symbols 'win32_getcurrentthreadid', 'malloc_stats'

[PATCH 6/6] compat/nedmalloc: Fix compiler warnings on linux

2013-04-27 Thread Ramsay Jones
On linux, when the build variable USE_NED_ALLOCATOR is set, gcc issues the following warnings: In file included from compat/nedmalloc/nedmalloc.c:63: .../malloc.c.h: In function 'mmap_resize': .../malloc.c.h:3762: warning: implicit declaration of function 'mremap' .../malloc.c.h:

[PATCH 0/6] misc sparse patches (part 2)

2013-04-27 Thread Ramsay Jones
Hi Junio, These patches are from a long running branch on MinGW; I have been updating this branch for about four years now! The main reason for not submitting these patches before is simply that I haven't sent my patches to port sparse to MinGW upstream yet. So, as far as I know, nobody can

[PATCH 1/6] compat/unsetenv.c: Fix a sparse warning

2013-04-27 Thread Ramsay Jones
The gitunsetenv function includes an (redundant) declaration of the 'environ' symbol, which is a pointer to the table of environment variables. Unfortunately, on MinGW, this provokes sparse to issue the following warning: compat/unsetenv.c:5:20: warning: non-ANSI function declaration of \

[PATCH 2/6] compat/win32/pthread.c: Fix a sparse warning

2013-04-27 Thread Ramsay Jones
Sparse issues a 'Using plain integer as NULL pointer' warning when initializing an pthread_t structure with an '{ 0 }' initializer. The first field of the pthread_t structure has type HANDLE (void *), so in order to suppress the warning, we replace the initializer expression with '{ NULL }'.

[PATCH 3/6] compat/poll/poll.c: Fix a sparse warning

2013-04-27 Thread Ramsay Jones
Sparse issues an 'Using plain integer as NULL pointer' warning when passing the constant '0' as the second parameter in the call to the WSAEventSelect() function. The function parameter has a pointer type (WSAEVENT, aka HANDLE, aka void *) so that, in order to suppress the warning, we simply pass

[PATCH 4/6] compat/win32mmap.c: Fix some sparse warnings

2013-04-27 Thread Ramsay Jones
Sparse issues two 'Using plain integer as NULL pointer' warnings against the call to the CreateFileMapping() function. The warnings relate to the second and sixth parameters, which both have pointer type. In order to suppress the warnings, we simply pass the NULL pointer, rather than '0', to

[PATCH 5/6] compat/mingw.c: Fix some sparse warnings

2013-04-27 Thread Ramsay Jones
Sparse issues the following warnings: SP compat/mingw.c compat/mingw.c:795:3: warning: symbol 'pinfo_t' was not declared. \ Should it be static? compat/mingw.c:796:16: warning: symbol 'pinfo' was not declared. \ Should it be static? compat/mingw.c:797:18:

[PATCH 6/6] sparse: Fix mingw_main() argument number/type errors

2013-04-27 Thread Ramsay Jones
Sparse issues 68 errors (two errors for each main() function) such as the following: SP git.c git.c:510:5: error: too many arguments for function mingw_main git.c:510:5: error: symbol 'mingw_main' redeclared with different type \ (originally declared at git.c:510) - different

[PATCH 0/2] Remove the CYGWIN_V15_WIN32API build variable

2013-04-27 Thread Ramsay Jones
Hi Junio, I have tested these patches on cygwin 1.5; the test suite threw up one additional test failure (t4205-*.sh test 18-20, 27), but it was not caused by these patches. (I will be sending a patch to fix this issue). Unfortunately, I can't test them on cygwin 1.7, but I suspect they will

[PATCH 1/2] mingw: rename WIN32 cpp macro to GIT_NATIVE_WINDOWS

2013-04-27 Thread Ramsay Jones
From: Jonathan Nieder jrnie...@gmail.com Throughout git, it is assumed that the WIN32 preprocessor symbol is defined on native Windows setups (mingw and msvc) and not on Cygwin. On Cygwin, most of the time git can pretend this is just another Unix machine, and Windows-specific magic is generally

[PATCH 2/2] cygwin: Remove the CYGWIN_V15_WIN32API build variable

2013-04-27 Thread Ramsay Jones
Signed-off-by: Ramsay Jones ram...@ramsay1.demon.co.uk --- Makefile | 7 --- compat/cygwin.c | 5 - config.mak.uname | 1 - 3 files changed, 13 deletions(-) diff --git a/Makefile b/Makefile index 0f931a2..32c49ba 100644 --- a/Makefile +++ b/Makefile @@ -290,10 +290,6 @@ all::

[PATCH] pretty: Fix bug in truncation support for %, % and %

2013-04-27 Thread Ramsay Jones
Some systems experience failures in t4205-*.sh (tests 18-20, 27) which all relate to the use of truncation with the % padding placeholder. This capability was added in the commit a7f01c6b (pretty: support truncating in %, % and %, 19-04-2013). The truncation support was implemented with the

Re: [PATCH] clone: allow cloning local paths with colons in them

2013-04-27 Thread William Giokas
On Sat, Apr 27, 2013 at 10:36:18AM +0700, Nguyễn Thái Ngọc Duy wrote: Usually foo:bar is interpreted as an ssh url. This patch allows to clone from such paths by putting at least one slash before the colon (i.e. /path/to/foo:bar or just ./foo:bar). file://foo:bar should also work, but local

[PATCH v2 0/9] completion: general cleanups

2013-04-27 Thread Felipe Contreras
Hi, In the previous series I didn't notice -o filenames actually did something useful, so in this series it's still used, however, for versions older than 4, we use a hack to enable it. This allows us to get rid of a lot of compat code. I also got rid of some wrappers, and fixed a regression:

[PATCH v2 1/9] completion: add file completion tests

2013-04-27 Thread Felipe Contreras
The commit fea16b4 (git-completion.bash: add support for path completion) introduced quite a few changes, without the usual tests. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t9902-completion.sh | 68 +++ 1 file changed, 68

[PATCH v2 2/9] completion: document tilde expansion failure in tests

2013-04-27 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t9902-completion.sh | 9 + 1 file changed, 9 insertions(+) diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 385e1e4..81a1657 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -415,4 +415,13

[PATCH v2 3/9] completion; remove unuseful comments

2013-04-27 Thread Felipe Contreras
The only caller, __git_complete_index_file() doesn't specify any limits to the options for 'git ls-files', neither should this function. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/completion/git-completion.bash | 2 -- 1 file changed, 2 deletions(-) diff --git

[PATCH v2 4/9] completion: use __gitcompadd for __gitcomp_file

2013-04-27 Thread Felipe Contreras
Like the rest of the script does; let's not access COMPREPLY directly. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash

[PATCH v2 5/9] completion: refactor diff_index wrappers

2013-04-27 Thread Felipe Contreras
At the end of the day what we really need is to find out the files that have been staged, or modified, because those files are the ones that make sense to pass as arguments to 'git commit'. We need diff-index to find those out, since 'git ls-files' doesn't do that. But we don't need wrappers and

[PATCH v2 6/9] completion: refactor __git_complete_index_file()

2013-04-27 Thread Felipe Contreras
The calls to __gitcomp_file() are essentially the same, but with different prefix. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/completion/git-completion.bash | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git

[PATCH v2 7/9] completion: add hack to enable file mode in bash 4

2013-04-27 Thread Felipe Contreras
This way we don't need all the compat stuff, different filters, and so on. Also, now we complete exactly the same in bash 3 and bash 4. This is the way bash-completion did it for quite some time, when bash 3 was supported. For more information about the hack:

[PATCH v2 8/9] completion: add space after completed filename

2013-04-27 Thread Felipe Contreras
Just like before fea16b4 (git-completion.bash: add support for path completion). Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash

[PATCH v2 9/9] completion: remove __git_index_file_list_filter()

2013-04-27 Thread Felipe Contreras
Refactor the code into the only caller; __git_index_files(). Also, Somehow messing up with the 'path' variable messes up the 'PATH' variable. So let's not do that. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/completion/git-completion.bash | 28

Re: [PATCH 00/11] completion: general cleanups

2013-04-27 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 27/04/2013 21:15, Felipe Contreras ha scritto: [...] @@ -480,7 +481,7 @@ __git_complete_revlist_file () # The exception is --committable, which finds the files appropriate commit. __git_complete_index_file () { - local pfx= cur_=$cur

[PATCH 0/2] completion: zsh: nice stuff

2013-04-27 Thread Felipe Contreras
Hi, Our thin wrapper seems to be doing a good job of providing all the bash functionality, to zsh, however, we can do more. This patch enables zsh-specific functionality to list the main commands, and general options. So we get: % git tab add -- add file contents to the index bisect

[PATCH 1/2] complete: zsh: trivial simplification

2013-04-27 Thread Felipe Contreras
There should be no functional changes. The only reason I wrapped this code around a sub-function is because zsh did the same in it's bashcompinit script in order to declare the special variable 'words' as hidden, but only in this context. There's no need for that any more since we access

[PATCH 2/2] complete: zsh: use zsh completion for the main cmd

2013-04-27 Thread Felipe Contreras
So that we can have a nice zsh completion output: % git tab add -- add file contents to the index bisect-- find by binary search the change that introduced a bug branch-- list, create, or delete branches checkout -- checkout a branch or paths to the working tree clone -- clone

Re: Making a (quick) commit to another branch

2013-04-27 Thread Johannes Schneider
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 27.04.2013 16:21, Javier Domingo wrote: I would first recommend you, instead of cherry-picking the commit, you did this: -- stash -- go to the master branch -- fix the line -- commit the fix -- got to the feature branch -- unstash Yeah, of

Re: [PATCH] clone: allow cloning local paths with colons in them

2013-04-27 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: diff --git a/connect.c b/connect.c index f57efd0..b568f10 100644 --- a/connect.c +++ b/connect.c @@ -551,8 +551,11 @@ struct child_process *git_connect(int fd[2], const char *url_orig, path = strchr(end, c); if (path

Re: [PATCH v2 1/9] completion: add file completion tests

2013-04-27 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: The commit fea16b4 (git-completion.bash: add support for path completion) introduced quite a few changes, without the usual tests. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t9902-completion.sh | 68

Re: [PATCH v2 5/9] completion: refactor diff_index wrappers

2013-04-27 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: At the end of the day what we really need is to find out the files that have been staged, or modified, because those files are the ones that make sense to pass as arguments to 'git commit'. We need diff-index to find those out, since 'git

Re: [PATCH v2 0/9] completion: general cleanups

2013-04-27 Thread Junio C Hamano
Overall this looks like a nice clean-up. I didn't look at the 5/9 carefully to verify its claim that the change is a no-op, though. Will queue. -- 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

Re: [PATCH] completion: add missiong format-patch options

2013-04-27 Thread Junio C Hamano
Looks like a no-brainer-safe update that could even go to maint. I prefer not to have too many patches in the trivially correct category in flight, so will apply directly on top of 'master'. Thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH 2/2] complete: zsh: use zsh completion for the main cmd

2013-04-27 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: +__git_zsh_cmd_common () +{ + local -a list + list=( + add:'add file contents to the index' + bisect:'find by binary search the change that introduced a bug' + branch:'list, create, or delete branches' +

Re: [PATCH] completion: add missiong format-patch options

2013-04-27 Thread Felipe Contreras
On Sat, Apr 27, 2013 at 4:36 PM, Junio C Hamano gits...@pobox.com wrote: Looks like a no-brainer-safe update that could even go to maint. I prefer not to have too many patches in the trivially correct category in flight, so will apply directly on top of 'master'. I just noticed that --cc= is

Re: [PATCH v2] Add support for -i/--interactive to git-clean

2013-04-27 Thread Matthieu Moy
Jiang Xin worldhello@gmail.com writes: Reviewed-by: Matthieu Moy matthieu@grenoble-inp.fr Err, no: I commented on the intention of the first patch, but did not _review_ it, and didn't read this version yet. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this

Re: [PATCH 2/2] complete: zsh: use zsh completion for the main cmd

2013-04-27 Thread Felipe Contreras
On Sat, Apr 27, 2013 at 4:39 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: +__git_zsh_cmd_common () +{ + local -a list + list=( + add:'add file contents to the index' + bisect:'find by binary search the change that

[PATCH] documentation: trivial whitespace cleanups

2013-04-27 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/config.txt | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index c67038b..6e53fc5 100644 --- a/Documentation/config.txt +++

[PATCH] gitk: simplify file filtering

2013-04-27 Thread Felipe Contreras
git diff is perfectly able to do this with '-- files', no need for manual filtering. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- gitk-git/gitk | 20 +++- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/gitk-git/gitk b/gitk-git/gitk index

[PATCH] send-email: improve recipients_cmd()

2013-04-27 Thread Felipe Contreras
We don't need to quote the filename to pass to the command, we can use an array of all the arguments to pass to the command, which is safer, and more extensible. Commit a47eab0 (send-email: use the three-arg form of open in recipients_cmd) stated we couldn't pass $file directly, but in fact, we

Re: [RFC/PATCH 1/3] revision.c: tighten up TREESAME handling of merges

2013-04-27 Thread Junio C Hamano
Kevin Bracey ke...@bracey.fi writes: Historically TREESAME was set on a commit if it was TREESAME to _any_ of its parents. This is not optimal, as such a merge could still be worth showing, particularly if it is an odd -s ours merge that (possibly accidentally) dropped a change. ... and with

Re: [RFC/PATCH 1/3] revision.c: tighten up TREESAME handling of merges

2013-04-27 Thread David Aguilar
On Sat, Apr 27, 2013 at 3:36 PM, Junio C Hamano gits...@pobox.com wrote: Kevin Bracey ke...@bracey.fi writes: diff --git a/revision.c b/revision.c index a67b615..176eb7b 100644 --- a/revision.c +++ b/revision.c @@ -1971,6 +2066,70 @@ static struct merge_simplify_state

Re: [RFC/PATCH 2/3] simplify-merges: never remove all TREESAME parents

2013-04-27 Thread Junio C Hamano
Kevin Bracey ke...@bracey.fi writes: In the event of an odd merge, we may find ourselves TREESAME to apparently redundant parents. Prevent simplify_merges() from removing every TREESAME parent - in the event of such a merge it's useful to see where we came actually from came. Signed-off-by:

Re: [PATCH v2] Add support for -i/--interactive to git-clean

2013-04-27 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Jiang Xin worldhello@gmail.com writes: Reviewed-by: Matthieu Moy matthieu@grenoble-inp.fr Err, no: I commented on the intention of the first patch, but did not _review_ it, and didn't read this version yet. Yeah I suspected as such.

Re: [PATCH 1/6] clone: Make the 'junk_mode' symbol a file static

2013-04-27 Thread Jeff King
On Sat, Apr 27, 2013 at 07:39:04PM +0100, Ramsay Jones wrote: Sparse issues an 'junk_mode' not declared. Should it be static? warning. In order to suppress the warning, since this symbol does not need more than file visibility, we simply add the static modifier to it's declaration. [...]

Re: [PATCH] inotify to minimize stat() calls

2013-04-27 Thread Duy Nguyen
On Thu, Apr 25, 2013 at 12:20 AM, Robert Zeh robert.allan@gmail.com wrote: +int cached_lstat(const char *path, struct stat *buf) +{ + int stat_return_value = 0; + struct stat_cache_entry *entry = 0; + + read_stat_cache(); + + entry = get_stat_cache_entry(path);

Re: [PATCH] pretty: Fix bug in truncation support for %, % and %

2013-04-27 Thread Duy Nguyen
On Sun, Apr 28, 2013 at 2:43 AM, Ramsay Jones ram...@ramsay1.demon.co.uk wrote: The truncation support was implemented with the assistance of a new strbuf function (strbuf_utf8_replace). This function contains the following code: strbuf_attach(sb_src, strbuf_detach(sb_dst, NULL),

Re: [PATCH] clone: allow cloning local paths with colons in them

2013-04-27 Thread Duy Nguyen
On Sun, Apr 28, 2013 at 4:16 AM, Junio C Hamano gits...@pobox.com wrote: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: diff --git a/connect.c b/connect.c index f57efd0..b568f10 100644 --- a/connect.c +++ b/connect.c @@ -551,8 +551,11 @@ struct child_process *git_connect(int fd[2], const

Re: [PATCH 6/6] sparse: Fix mingw_main() argument number/type errors

2013-04-27 Thread René Scharfe
Am 27.04.2013 21:19, schrieb Ramsay Jones: In order to suppress these warnings, since both of the main functions need to be declared with the same prototype, we change the declaration of the 9 main functions, thus: int main(int argc, char **argv) Why not take the opposite direction

Re: [PATCH v2 9/9] completion: remove __git_index_file_list_filter()

2013-04-27 Thread Eric Sunshine
On Sat, Apr 27, 2013 at 4:10 PM, Felipe Contreras felipe.contre...@gmail.com wrote: Refactor the code into the only caller; __git_index_files(). Also, Somehow messing up with the 'path' variable messes up the 'PATH' s/Somehow/somehow/ s/messing up/messing/ variable. So let's not do that.

Re: [PATCH v2 9/9] completion: remove __git_index_file_list_filter()

2013-04-27 Thread Felipe Contreras
On Sat, Apr 27, 2013 at 8:41 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Sat, Apr 27, 2013 at 4:10 PM, Felipe Contreras felipe.contre...@gmail.com wrote: Refactor the code into the only caller; __git_index_files(). Also, Somehow messing up with the 'path' variable messes up the 'PATH'

Re: [PATCH] clone: allow cloning local paths with colons in them

2013-04-27 Thread Eric Sunshine
On Sat, Apr 27, 2013 at 8:19 PM, Duy Nguyen pclo...@gmail.com wrote: On Sun, Apr 28, 2013 at 4:16 AM, Junio C Hamano gits...@pobox.com wrote: That was fairly hard to grok. Is that equivalent to this? if (c == ':' path strchrnul(host, '/')) { /* is the

Re: [PATCH 1/6] clone: Make the 'junk_mode' symbol a file static

2013-04-27 Thread Eric Sunshine
On Sat, Apr 27, 2013 at 2:39 PM, Ramsay Jones ram...@ramsay1.demon.co.uk wrote: Sparse issues an 'junk_mode' not declared. Should it be static? warning. In order to suppress the warning, since this symbol does not need more than file visibility, we simply add the static modifier to it's

Re: [PATCH v2] Add support for -i/--interactive to git-clean

2013-04-27 Thread Eric Sunshine
On Sat, Apr 27, 2013 at 12:13 PM, Jiang Xin worldhello@gmail.com wrote: --- a/builtin/clean.c +++ b/builtin/clean.c @@ -257,26 +261,92 @@ int cmd_clean(int argc, const char **argv, const char *prefix) } if (S_ISDIR(st.st_mode)) { -

Re: [PATCH] clone: allow cloning local paths with colons in them

2013-04-27 Thread Duy Nguyen
On Sun, Apr 28, 2013 at 8:48 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Sat, Apr 27, 2013 at 8:19 PM, Duy Nguyen pclo...@gmail.com wrote: On Sun, Apr 28, 2013 at 4:16 AM, Junio C Hamano gits...@pobox.com wrote: That was fairly hard to grok. Is that equivalent to this?

  1   2   >