[PATCH v2 0/2] Documentation/githooks: mention pwd, $GIT_PREFIX

2015-01-10 Thread Richard Hansen
patch 1/2 is the same as v1 patch 2/2 has been reworked to incorporate Hannes's feedback (thank you!) -Richard Richard Hansen (2): Documentation/githooks: mention pwd, $GIT_PREFIX t1020-subdirectory.sh: check hook pwd, $GIT_PREFIX Documentation/githooks.txt | 6 ++ t/t1020-subdirector

[PATCH v2 2/2] t1020-subdirectory.sh: check hook pwd, $GIT_PREFIX

2015-01-10 Thread Richard Hansen
Make sure hooks are executed at the top-level directory and that GIT_PREFIX is set (as documented). Signed-off-by: Richard Hansen --- t/t1020-subdirectory.sh | 23 +++ 1 file changed, 23 insertions(+) diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh index 2edb4

[PATCH v2 1/2] Documentation/githooks: mention pwd, $GIT_PREFIX

2015-01-10 Thread Richard Hansen
Document that hooks are run from the top-level directory and that GIT_PREFIX is set to the name of the original subdirectory (relative to the top-level directory). Signed-off-by: Richard Hansen --- Documentation/githooks.txt | 6 ++ 1 file changed, 6 insertions(+) diff --git a/Documentation

Re: [PATCH] git-svn: show progress in working_head_info()

2015-01-10 Thread Eric Wong
Ramkumar Ramachandra wrote: > The working_head_info routine takes a very long time to execute on large > repositories. The least we can do is to comfort users that some progress > is being made. > > Signed-off-by: Ramkumar Ramachandra > --- > I was worried because of the long wait, so I wrote t

Re: [PATCH] Git::SVN: handle missing ref_id case correctly

2015-01-10 Thread Ramkumar Ramachandra
Ramkumar Ramachandra wrote: >> It is functional, maybe someone will use GIT_SVN_ID=0 ? > > Right. Kindly drop the first hunk. Amendment: there are actually many other places where variables are checked without "defined", so I doubt we want to put up with the extra ugliness to allow "0". -- To unsu

Re: [PATCH] Git::SVN: handle missing ref_id case correctly

2015-01-10 Thread Ramkumar Ramachandra
Eric Wong wrote: > It is functional, maybe someone will use GIT_SVN_ID=0 ? Right. Kindly drop the first hunk. -- 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] git-svn: make it play nicely with submodules

2015-01-10 Thread Ramkumar Ramachandra
Eric Wong wrote: > How portable is open on a directory? Perhaps it'd be better to > check if it's a file, first: Sure, that works; feel free to fix it up locally before committing. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.

Re: [PATCH] Git::SVN: handle missing ref_id case correctly

2015-01-10 Thread Eric Wong
Ramkumar Ramachandra wrote: > Ramkumar Ramachandra wrote: > > -our $default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn'; > > +our $default_ref_id = defined $ENV{GIT_SVN_ID} ? $ENV{GIT_SVN_ID} : > > 'git-svn'; > > This is probably not a functional change; please look at the second hunk. It is funct

Re: [PATCH] git-svn: make it play nicely with submodules

2015-01-10 Thread Eric Wong
Ramkumar Ramachandra wrote: > +++ b/git-svn.perl > @@ -337,6 +337,10 @@ for (my $i = 0; $i < @ARGV; $i++) { > # make sure we're always running at the top-level working directory > if ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) { > $ENV{GIT_DIR} ||= ".git"; > + # catch the submodule

[PATCH] blame.c: fix garbled error message

2015-01-10 Thread Lukas Fleischer
The helper functions prepare_final() and prepare_initial() return a pointer to a string that is a member of an object in the revs->pending array. This array is later rebuilt when running prepare_revision_walk() which potentially transforms the pointer target into a bogus string. Fix this by maintai

Re: [PATCH v3] doc: core.ignoreStat update, and clarify the --assume-unchanged effect

2015-01-10 Thread Philip Oakley
From: "Junio C Hamano" "Philip Oakley" writes: diff --git a/Documentation/config.txt b/Documentation/config.txt index 52eeadd..fe179d0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -375,15 +375,18 @@ This is useful for excluding servers inside a firewall from proxy

Re: [git] Distributed code review discussion

2015-01-10 Thread W. Trevor King
On Sat, Jan 10, 2015 at 01:05:35PM -0500, Matus Faro wrote: > What I mean is a distributed code review system where a merge > request along with review comments would be stored within the git > repository and allowed to be pushed and pulled between repository > clones. This would allow users to ret

Re: Distributed code review discussion

2015-01-10 Thread Junio C Hamano
On Sat, Jan 10, 2015 at 10:05 AM, Matus Faro wrote: > Are there any plans for supporting merge requests and code reviews > natively in git? > > What I mean is a distributed code review system where a merge request > along with review comments would be stored within the git repository > and allowed

[PATCH] cat-file: remove unnecessary #include

2015-01-10 Thread Alexander Kuleshov
"cache.h" is already included in "builtin.h" It appeared at e83c51 (Initial revision of "git", the information manager from hell., 8 Apr 2005) and used cache.c API (get_sha1_hex and read_sha1_file). After this in the commit f81dae (Builtin git-cat-file., ) was included "builtin.h", which already i

[PATCH] cat-file: remove definition of already defined variables

2015-01-10 Thread Alexander Kuleshov
'enum object_type type' and 'unsigned long size' are already defined at the top of cat_one_file routine Signed-off-by: Alexander Kuleshov --- builtin/cat-file.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 750b5a2..31b133b 100644 --- a/builti

Re: [PATCH] git.c: prevent change of environment variables

2015-01-10 Thread Alexander Kuleshov
There is aliasing of git -c in t1300-repo-config.sh, but I see: die("alias '%s' changes environment variables\n" "You can use '!git' in the alias to do this.", alias_command); at git.c, how to be here? Thank you. 2015-01-10 18:53 GMT+06:00 Alexander Kuleshov : > We can't change

Distributed code review discussion

2015-01-10 Thread Matus Faro
Are there any plans for supporting merge requests and code reviews natively in git? What I mean is a distributed code review system where a merge request along with review comments would be stored within the git repository and allowed to be pushed and pulled between repository clones. This would a

Re: [PATCH] Git::SVN: handle missing ref_id case correctly

2015-01-10 Thread Ramkumar Ramachandra
Ramkumar Ramachandra wrote: > -our $default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn'; > +our $default_ref_id = defined $ENV{GIT_SVN_ID} ? $ENV{GIT_SVN_ID} : > 'git-svn'; This is probably not a functional change; please look at the second hunk. -- To unsubscribe from this list: send the line "unsu

[PATCH] git-svn: make it play nicely with submodules

2015-01-10 Thread Ramkumar Ramachandra
It's a simple matter of opening the directory specified in the gitfile. Signed-off-by: Ramkumar Ramachandra --- git-svn.perl | 4 1 file changed, 4 insertions(+) diff --git a/git-svn.perl b/git-svn.perl index 6aa156c..8642783 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -337,6 +337,10 @

[PATCH] Git::SVN: handle missing ref_id case correctly

2015-01-10 Thread Ramkumar Ramachandra
$ENV{GIT_SVN_ID} will return a string, so check it with defined. Also, ref_id should not match "refs/remotes/". Signed-off-by: Ramkumar Ramachandra --- perl/Git/SVN.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index d9a52a5..06ff216

[PATCH] git-svn: show progress in working_head_info()

2015-01-10 Thread Ramkumar Ramachandra
The working_head_info routine takes a very long time to execute on large repositories. The least we can do is to comfort users that some progress is being made. Signed-off-by: Ramkumar Ramachandra --- I was worried because of the long wait, so I wrote this to convince myself that git-svn wasn't

[PATCH] git.c: prevent change of environment variables

2015-01-10 Thread Alexander Kuleshov
We can't change environment variables in aliases which doesn't start with '!' * 'git --exec-path=path' changes $GIT_EXEC_PATH variable in git_set_argv_exec_path * 'git -p/--paginate' sets 'use_pager' to 1 and commit_pager_choice will change $GIT_PAGER_IN_USE variable in setup_pager(void) from pag

Re: [PATCH 2/2] t1020-subdirectory.sh: check hook pwd, $GIT_PREFIX

2015-01-10 Thread Johannes Sixt
Am 10.01.2015 um 07:49 schrieb Richard Hansen: > Make sure hooks are executed at the top-level directory and that > GIT_PREFIX is set (as documented). > > Signed-off-by: Richard Hansen > --- > t/t1020-subdirectory.sh | 34 ++ > 1 file changed, 34 insertions(+) >