Re: [PATCH] git-send-pack: Fix --all option when used with directory

2016-03-24 Thread Junio C Hamano
Stanislav Kolotinskiy writes: > Subject: Re: [PATCH] git-send-pack: Fix --all option when used with directory Please see "git shortlog --no-merges" output from recent history and notice that s/Fix/fix/ would make things more consistent. > When using git send-pack with --all option and a target

Re: [PATCH] api-parse-options.txt: document OPT_CMDMODE()

2016-03-24 Thread Junio C Hamano
Pranit Bauva writes: > OPT_CMDMODE() was introduced in the release of 1.8.5 which makes the use > of subcommands in the form of arguments a lot cleaner and easier. > --- Sign-off? > Documentation/technical/api-parse-options.txt | 6 ++ > 1 file changed, 6 insertions(+) > > diff --git a/Doc

Re: [PATCH v2 09/17] Add watchman support to reduce index refresh cost

2016-03-24 Thread Jeff Hostetler
I'm seeing wm->name have value ".git" rather than ".git/" on Linux. On 03/18/2016 09:04 PM, David Turner wrote: + if (!strncmp(wm->name, ".git/", 5) || + strstr(wm->name, "/.git/")) + continue; thanks, Jeff -- To unsubscribe from this li

Re: Resumable git clone?

2016-03-24 Thread Junio C Hamano
"Philip Oakley" writes: > From: "Junio C Hamano" >> >>> If you clone a repository, and the connection drops, the next attempt >>> will have to start from scratch. This can add significant time and >>> expense if you're on a low-bandwidth or metered connection trying to >>> clone something like

Re: [PATCH v3 0/5] Expanding tabs in "git log" output

2016-03-24 Thread Junio C Hamano
Torsten Bögershausen writes: >> [5/5] adds a new option --no-expand-tabs that controls the bit 4/5 >>introduces, so that "git log [--pretty] --no-expand-tabs" >>would show the log message indented by 4 spaces, without tab >>expansion. > > Does this introduce an unnecessar

Re: [PATCH] mergetools: implemented new mergetool file for ExamDiff

2016-03-24 Thread Junio C Hamano
David Aguilar writes: > We can probably do this without introducing a new file. One > possible home for this is with the rest of the "default" > definitions of the functions in git-mergetool--lib.sh's > setup_tool() function. > > But, that hints that we expect tools to override it. > > A better

[Outreachy] Git remote whitelist/blacklist

2016-03-24 Thread elena petrashen
Hi, I'm thinking of applying to Outreachy program this round with Git and the project I'm really interested in is "Git remote whitelist/blacklist" project (http://git.github.io/SoC-2016-Ideas/). I have drafted the description/timeline for this project and it would be great to get feedback/suggesti

Re: [PATCH v2] git-send-pack: Fix --all option when used with directory

2016-03-24 Thread Stanislav Kolotinskiy
Please ignore this thread, I sent the email without making sure that I copied commit message. I'm sorry for that. On 24/03/16 16:14, Stanislav Kolotinskiy wrote: --- builtin/send-pack.c | 2 +- t/t5400-send-pack.sh | 12 2 files changed, 13 insertions(+), 1 deletion(-) diff

[PATCH v3] git-send-pack: Fix --all option when used with directory

2016-03-24 Thread Stanislav Kolotinskiy
When using git send-pack with --all option and a target directory, usage message is being displayed instead of performing the actual transmission. The reason for this issue is that refspecs variable is being calculated in a different way comparing to previous versions, and even though the number o

[PATCH v2] git-send-pack: Fix --all option when used with directory

2016-03-24 Thread Stanislav Kolotinskiy
--- builtin/send-pack.c | 2 +- t/t5400-send-pack.sh | 12 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/builtin/send-pack.c b/builtin/send-pack.c index f6e5d64..19f0577 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -225,7 +225,7 @@ int cmd_send_pack

Re: [PATCH] git-send-pack: Fix --all option when used with directory

2016-03-24 Thread Stanislav Kolotinskiy
On 23/03/16 23:22, Jeff King wrote: Not that it matters for this bug, but for my own curiosity, what do you use "send-pack --all" for? I've generally assumed that nobody directly calls send-pack themselves these days, but of course we have no data to support that either way. So I am always intere

Re: [PATCH v2] branch -D: allow - as abbreviation of '@{-1}'

2016-03-24 Thread elena petrashen
On Tue, Mar 22, 2016 at 8:07 PM, Junio C Hamano wrote: > Elena Petrashen writes: > >> +static int expand_dash_shortcut(const char **argv, int dash_position) >> +{ >> + if (!strcmp(argv[dash_position], "-")){ >> + argv[dash_position] = "@{-1}"; >> + return 1; >> + }

Re: "git svn fetch" error: [main] perl 9296 child_info_fork::abort: unable to map

2016-03-24 Thread Johannes Schindelin
Hi Siyuan, On Thu, 24 Mar 2016, Fu, Siyuan wrote: > I meet below error when using the "git svn" related command, and I tried > to reinstall the GIT but the issue is still there. Has anybody ever meet > this and know how to solve it? > > GIT version: git version 2.7.4.windows.1 > OS: Windows 8 6

Re: GSoC 2016: application period ongoing, deadline = tomorrow

2016-03-24 Thread Matthieu Moy
Hi, The GSoC deadline is approaching. A few reminders for students: * You need to submit a final application before the (strict) deadline. Your draft won't be turned into a final version automatically. * You may submit your "final application" multiple times. We (admins & mentors) don't see

[PATCH 4/4] apply: report patch skipping in verbose mode

2016-03-24 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/apply.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builtin/apply.c b/builtin/apply.c index 01e1d5e..9cbb186 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -4384,6 +4384,8 @@ static int apply_patch(int fd, const char *filename, int

[PATCH 3/4] apply: add --whole to apply git patch without prefix filtering

2016-03-24 Thread Nguyễn Thái Ngọc Duy
Back in edf2e37 (git-apply: work from subdirectory. - 2005-11-25), git-apply is made to work from a subdir of a worktree. When applying a git patch this way, only paths in the subdir are patched, the rest is filtered out. To apply without filtering, the user has to move back to toplevel. Add --whol

[PATCH 2/4] git-apply.txt: mention the behavior inside a subdir

2016-03-24 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-apply.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 5444d2f..8ddb207 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -21,6 +21,8 @@ S

[PATCH 1/4] git-apply.txt: remove a space

2016-03-24 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-apply.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index d9ed6a1..5444d2f 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -1

Re: git-apply does not work in a sub-directory of a Git repository

2016-03-24 Thread Nguyễn Thái Ngọc Duy
+Brian who also had issues with git-apply. On Thu, Mar 24, 2016 at 5:49 PM, Duy Nguyen wrote: > On Wed, Mar 23, 2016 at 11:55 PM, Junio C Hamano wrote: >> Junio C Hamano writes: >> >>> See >>> >>> http://thread.gmane.org/gmane.comp.version-control.git/288316/focus=288321 >>> >>> I agree it is

[PATCH v9 2/3] t7507-commit-verbose: make test suite use write_script

2016-03-24 Thread SZEDER Gábor
> Also remove test_set_editor from global scope and use it in whichever > test it is required. Why? test_set_editor sets and exports shell variables. Since you don't invoke test_set_editor in a subshell, after the first invocation the editor will be part of the global scope anyway. Also missing

Re: git-apply does not work in a sub-directory of a Git repository

2016-03-24 Thread Duy Nguyen
On Wed, Mar 23, 2016 at 11:55 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> See >> >> http://thread.gmane.org/gmane.comp.version-control.git/288316/focus=288321 >> >> I agree it is bad that it silently ignores the path outside the >> directory. When run with --verbose, we should say

Re: [PATCH v9 1/3] parse-options.c: make OPTION__COUNTUP consider negative values

2016-03-24 Thread Pranit Bauva
On Thu, Mar 24, 2016 at 4:03 PM, SZEDER Gábor wrote: >> The reason to make it consider negative values or more specifically >> "unspecified" values is to give the ability to differentiate between >> once, multiple time or with --no-option. >> >> Eg. : >> initialize verbose = -1 >> `git commit` =>

[PATCH v9 1/3] parse-options.c: make OPTION__COUNTUP consider negative values

2016-03-24 Thread SZEDER Gábor
> The reason to make it consider negative values or more specifically > "unspecified" values is to give the ability to differentiate between > once, multiple time or with --no-option. > > Eg. : > initialize verbose = -1 > `git commit` => verbose = -1 > `git commit -v` => verbose = 1 > `git commit

Re: [PATCH v9 3/3] commit: add a commit.verbose config variable

2016-03-24 Thread Pranit Bauva
I got it. The verbose is initialised to -1 before. When cmd_commit runs, it changes the value of verbose accordingly to 0 or positive. But when cmd_status runs, it will retain the value -1 and the if clause which accepts all values except 0 will execute. I guess a if statement inside cmd_status whi

Re: [PATCH v9 3/3] commit: add a commit.verbose config variable

2016-03-24 Thread Pranit Bauva
On Thu, Mar 24, 2016 at 3:34 PM, SZEDER Gábor wrote: >> Add commit.verbose configuration variable as a convenience for those >> who always prefer --verbose. >> >> Helped-by: Junio C Hamano >> Helped-by: Eric Sunshine >> Signed-off-by: Pranit Bauva >> >> --- >> The previous version of the patch

Re: [PATCH v9 3/3] commit: add a commit.verbose config variable

2016-03-24 Thread SZEDER Gábor
> Add commit.verbose configuration variable as a convenience for those > who always prefer --verbose. > > Helped-by: Junio C Hamano > Helped-by: Eric Sunshine > Signed-off-by: Pranit Bauva > > --- > The previous version of the patch are: > - [v8] $gmane/288820 > - [v7] $gmane/288820 > - [v6

Re: [PATCH v2] worktree: add: introduce --checkout option

2016-03-24 Thread Zhang Lei
hi Duy, My PATCH v1 did follow git-clone -n, however, Junio C Hamano and Eric Sunshine suggested that we should avoid doing so , as --no-no-checkout could be confusing. Yes, core.sparsecheckout is the global switch for all worktrees, but every worktree can have its own info/sparse-checkout. 2016-

Re: Gitk "External diff" broken when using worktree

2016-03-24 Thread Duy Nguyen
On Thu, Mar 24, 2016 at 9:55 AM, Daryl Van Den Brink wrote: > Hi, > > I'm using git 2.7.3 on cygwin, and have been taking advantage of the > new "git worktree" feature. I noticed that when I launch gitk from one > of the attached working directories, its "external diff" feature > doesn't seem to w

Re: [PATCH v2] worktree: add: introduce --checkout option

2016-03-24 Thread Duy Nguyen
On Thu, Mar 24, 2016 at 1:07 PM, Ray Zhang wrote: > By adding this option which defaults to true, we can use the > corresponding --no-checkout to make some customizations before > the checkout, like sparse checkout, etc. I think we can follow git-clone and use '-n' for this. But if it's sparse ch

[PATCH] api-parse-options.txt: document OPT_CMDMODE()

2016-03-24 Thread Pranit Bauva
OPT_CMDMODE() was introduced in the release of 1.8.5 which makes the use of subcommands in the form of arguments a lot cleaner and easier. --- Documentation/technical/api-parse-options.txt | 6 ++ 1 file changed, 6 insertions(+) diff --git a/Documentation/technical/api-parse-options.txt b/Do

[PATCH v9 3/3] commit: add a commit.verbose config variable

2016-03-24 Thread Pranit Bauva
Add commit.verbose configuration variable as a convenience for those who always prefer --verbose. Helped-by: Junio C Hamano Helped-by: Eric Sunshine Signed-off-by: Pranit Bauva --- The previous version of the patch are: - [v8] $gmane/288820 - [v7] $gmane/288820 - [v6] $gmane/288728 - [v5]

[PATCH v9 1/3] parse-options.c: make OPTION__COUNTUP consider negative values

2016-03-24 Thread Pranit Bauva
The reason to make it consider negative values or more specifically "unspecified" values is to give the ability to differentiate between once, multiple time or with --no-option. Eg. : initialize verbose = -1 `git commit` => verbose = -1 `git commit -v` => verbose = 1 `git commit -v -v` => verbose

[PATCH v9 2/3] t7507-commit-verbose: make test suite use write_script

2016-03-24 Thread Pranit Bauva
Also remove test_set_editor from global scope and use it in whichever test it is required. --- t/t7507-commit-verbose.sh | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh index 2ddf28c..cf95efb 100755 --- a/t/t750

Re: Resumable git clone?

2016-03-24 Thread Philip Oakley
From: "Junio C Hamano" Sent: Wednesday, March 02, 2016 8:41 AM Josh Triplett writes: If you clone a repository, and the connection drops, the next attempt will have to start from scratch. This can add significant time and expense if you're on a low-bandwidth or metered connection trying to c

Re: [PATCH] mergetools: implemented new mergetool file for ExamDiff

2016-03-24 Thread David Aguilar
On Wed, Mar 23, 2016 at 03:55:45PM -0700, Jacob Nisnevich wrote: > Signed-off-by: Jacob Nisnevich > --- Please write commit message in an imperative tone. e.g. "mergetools: add support for ExamDiff" might be a good summary. > mergetools/examdiff | 20 > mergetool

Re: What's cooking in git.git (Mar 2016, #04; Wed, 23)

2016-03-24 Thread Philip Oakley
- Original Message - From: "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 ones marked with '.' do not appear in any of the integration branches, but I am

Re: [PATCH v7 14/33] refs: add methods to init refs db

2016-03-24 Thread Michael Haggerty
On 03/01/2016 01:52 AM, David Turner wrote: > Alternate refs backends might not need the refs/heads directory and so > on, so we make ref db initialization part of the backend. > > Signed-off-by: David Turner > Signed-off-by: Junio C Hamano > --- > builtin/init-db.c| 20 ++--

Re: [PATCH/GSoC 3/3] Nousage message in error

2016-03-24 Thread Pranit Bauva
On Thu, Mar 24, 2016 at 7:33 AM, Diwas Joshi wrote: > - To show only error text instead of full usage message > - Adds exits to callback function in parse-options-cb.c instead of returning > -1 which results in display of usage message. I forgot to mention that this microproject is already picke

Submit Your Manuscript For Proofreading

2016-03-24 Thread CityHills Proofreading
Dear colleague(s), Proofreading is a crucial part of writing and publication process, often influencing the acceptance or rejection of a manuscript. We have taken this into recognition and therefore request that writers in all fields should submit their manuscripts for proofreading. We have a

Re: [PATCH v7 09/33] refs: reduce the visibility of do_for_each_ref()

2016-03-24 Thread Michael Haggerty
On 03/01/2016 01:52 AM, David Turner wrote: > From: Ramsay Jones > > Now that we have moved do_for_each_ref into refs.c, it no longer needs > to be public. > > Signed-off-by: Ramsay Jones > Signed-off-by: Junio C Hamano > --- > refs.c | 19 +++ > refs/refs-intern

Re: [PATCH v3 0/5] Expanding tabs in "git log" output

2016-03-24 Thread Torsten Bögershausen
> [5/5] adds a new option --no-expand-tabs that controls the bit 4/5 >introduces, so that "git log [--pretty] --no-expand-tabs" >would show the log message indented by 4 spaces, without tab >expansion. Does this introduce an unnecessary regression out of the sudden ? Woul

<    1   2