Re: [PATCH v16 6/6] bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C

2017-11-19 Thread Christian Couder
On Mon, Nov 20, 2017 at 4:05 AM, Junio C Hamano wrote: > Christian Couder writes: > >> On Fri, Sep 29, 2017 at 8:49 AM, Pranit Bauva wrote: >>> Reimplement `is_expected_rev` & `check_expected_revs` shell function in >>> C

Hello Dear

2017-11-19 Thread Mr Sheng Li Hung
Hello Dear I am Mr.Sheng Li Hung, from china I got your information while search for a reliable person, I have a very profitable business proposition for you and i can assure you that you will not regret been part of this mutual beneficial transaction after completion. Kindly get back to me for

Re: git pull

2017-11-19 Thread Linus Torvalds
On Sun, Nov 19, 2017 at 7:37 PM, Junio C Hamano wrote: >> ... >> Which is simple. Just create a .git/hooks/prepare-commit-msg file that >> contains >> >> #!/bin/sh >> sed -i 's|ssh://gitolite.kernel.org/|git://git.kernel.org/|g' "$1" >> >> and make it executable, and git

Re: git pull

2017-11-19 Thread Junio C Hamano
Linus Torvalds writes: > A few notes for other people who end up doing this: [this meaning use of insteadOf to redirect public URLs to ssh://git@gitolite URL] > (a) ssh is slower, and the gitolite machine is not as reachable. > > (b) it affects your merge

We really want to confirm whether you are terminal sick.

2017-11-19 Thread CENTRAL BANK OF NIGERIA
-- Dear Sir/Madam, We are hereby to confirmed whether it is true that you are terminal sick and you empower two gentlemen to came to our office to stand and claim your contract/inheritance funds due to your health condition, as they stand as Next-Of-Kin to you. Further more they provide bank

Re: [PATCH 1/2] Simplify tracing code by removing trace key normalization concept

2017-11-19 Thread Junio C Hamano
Junio C Hamano writes: > The thought behind the change flows much better in the above > explanation than your four-bullet list (which a reader would often > assume are parallel and orthogonal). "Remove this, because it is > not used" is the primary thing for this step, and

Re: [PATCH v3 5/5] Testing: provide tests requiring them with ellipses after SHA-1 values

2017-11-19 Thread Junio C Hamano
Ann T Ropea writes: > *1* We are being overly generous in t4013-diff-various.sh because we do > not want to destroy/take apart the here-document. Given that all this a > temporary measure, we should get away with it. I do not think the patch is being particularly generous.

Re: [PATCH v3 1/5] checkout: describe_detached_head: remove ellipsis after committish

2017-11-19 Thread Junio C Hamano
Ann T Ropea writes: > We do not want an ellipsis displayed following an (abbreviated) SHA-1 > value. > > The days when this was necessary to indicate the truncation to > lower-level Git commands and/or the user are bygone. > > However, to ease the transition, the ellipsis will

Re: [PATCH] contrib/git-jump: allow to configure the grep command

2017-11-19 Thread Junio C Hamano
Beat Bolli writes: > Add the configuration option "jump.grepCmd" that allows to configure the > command that is used to search in grep mode. This allows the users of > git-jump to use ag(1) or ack(1) as search engines. > > Signed-off-by: Beat Bolli > ---

Re: [PATCH v16 6/6] bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C

2017-11-19 Thread Junio C Hamano
Christian Couder writes: > On Fri, Sep 29, 2017 at 8:49 AM, Pranit Bauva wrote: >> Reimplement `is_expected_rev` & `check_expected_revs` shell function in >> C and add a `--check-expected-revs` subcommand to `git bisect--helper` to >> call it

Re: [PATCH] docs: checking out using @{-N} can lead to detached state

2017-11-19 Thread Junio C Hamano
Kaartic Sivaraam writes: > The commit message of 75d6e552a (Documentation: @{-N} can refer to > a commit, 2014-01-19) clearly specifies how @{-N} can be used to > refer not only to a branch but also to a commit. IOW, @{-N} is a > syntax for the N-th last "checkout"

Re: [PATCH v2 3/6] diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value

2017-11-19 Thread Junio C Hamano
Ann T Ropea writes: >> Notice the name of the function. We no longer even attempt to align >> the output, and in general the output column length of each line >> would be shorter than the original. I am wondering if the change >> would be of less impact if we try to

Re: Documentation of post-receive hook

2017-11-19 Thread Junio C Hamano
Christoph Michelbach writes: > On Fri, 2017-11-17 at 12:24 +0900, Junio C Hamano wrote: >> So an updated suggestion for the text would be: >> >> This hook is invoked by 'git-receive-pack' on the remote repository, >> which happens when a 'git push' is done on a

Re: [PATCH 1/1] exec_cmd: RUNTIME_PREFIX on some POSIX systems

2017-11-19 Thread Junio C Hamano
Dan Jacques writes: > Enable Git to resolve its own binary location using a variety of > OS-specific and generic methods, including: > > - procfs via "/proc/self/exe" (Linux) > - _NSGetExecutablePath (Darwin) > - KERN_PROC_PATHNAME sysctl on BSDs. > - argv0, if absolute (all,

Re: Why gc --auto is called so rarely?

2017-11-19 Thread Junio C Hamano
Ilya Kantor writes: > ...It seems sane to git gc --auto from command that are expected to take time. > > That's probably the reason why it's not called on commits and > called on receive-pack. > > But then why call it on merges? Especially on those that have no >

Re: [PATCH v3 3/3] worktree: make add dwim

2017-11-19 Thread Junio C Hamano
Eric Sunshine writes: > On Sun, Nov 19, 2017 at 2:04 PM, Eric Sunshine > wrote: >> On Sat, Nov 18, 2017 at 5:47 PM, Thomas Gummerer >> wrote: >>> +To disable the behaviour of trying to match the basename of to >>> +a

Re: [PATCH 1/6] t4051: add test for comments preceding function lines

2017-11-19 Thread Junio C Hamano
René Scharfe writes: > your suggested full-comment metric, i.e. more than nothing. But more > importantly it's the actual comment payload. The leading "/*" line is > included as a consequence of the employed heuristic, but a more > refined one might omit it as it doesn't actually

Re: [PATCH] git-rebase: clean up dashed-usages in messages

2017-11-19 Thread Junio C Hamano
Kaartic Sivaraam writes: > On Sunday 19 November 2017 07:42 AM, Junio C Hamano wrote: >>> test -f "$apply_dir"/applying && >>> - die "$(gettext "It looks like git-am is in progress. Cannot rebase.")" >>> + die "$(gettext "It looks like you are in the middle of

Re: [PATCH 1/2] Simplify tracing code by removing trace key normalization concept

2017-11-19 Thread Junio C Hamano
Gennady Kupava writes: >> The usual style comment on the subject applies here. > > Oh sure, 50 characters. 'Remove trace key normalization concept' would > be better? I was referring to #summary-section of Documentation/SubmittingPatches The first line of the

Re: [PATCH v2] launch_editor(): indicate that Git waits for user input

2017-11-19 Thread Junio C Hamano
Kaartic Sivaraam writes: >>> However, it's not clear how much benefit you gain from stashing this >>> away in a static variable. Premature optimization? >> >> The variable being "static" could be (but it was done primarily >> because it allowed me not to worry about

[PATCH] contrib/git-jump: allow to configure the grep command

2017-11-19 Thread Beat Bolli
Add the configuration option "jump.grepCmd" that allows to configure the command that is used to search in grep mode. This allows the users of git-jump to use ag(1) or ack(1) as search engines. Signed-off-by: Beat Bolli --- contrib/git-jump/README | 3 +++

Re: [PATCH v16 6/6] bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C

2017-11-19 Thread Christian Couder
On Fri, Sep 29, 2017 at 8:49 AM, Pranit Bauva wrote: > Reimplement `is_expected_rev` & `check_expected_revs` shell function in > C and add a `--check-expected-revs` subcommand to `git bisect--helper` to > call it from git-bisect.sh . It looks like this patch forgot to add

Re: [PATCH v3 3/3] worktree: make add dwim

2017-11-19 Thread Eric Sunshine
On Sun, Nov 19, 2017 at 2:04 PM, Eric Sunshine wrote: > On Sat, Nov 18, 2017 at 5:47 PM, Thomas Gummerer wrote: >> +To disable the behaviour of trying to match the basename of to >> +a remote, and always create a new branch from HEAD, the

Re: [PATCH v3 3/5] Documentation: user-manual: limit usage of ellipsis

2017-11-19 Thread Eric Sunshine
On Sun, Nov 19, 2017 at 1:41 PM, Ann T Ropea wrote: > Confusing the ellipsis with the three-dot operator should be made as > difficult as possible. > > Signed-off-by: Ann T Ropea > --- > v2: rename patch series & focus on removal of ellipses > v3: env var

Re: [PATCH v3 2/5] diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value

2017-11-19 Thread Eric Sunshine
On Sun, Nov 19, 2017 at 1:41 PM, Ann T Ropea wrote: > Neither Git nor the user are in need of this (visual) aid anymore, but > we must offer a transition period. > > Also, fix a typo: "abbbreviated" ---> "abbreviated". > > Signed-off-by: Ann T Ropea > --- >

Re: [PATCH v3 3/3] worktree: make add dwim

2017-11-19 Thread Eric Sunshine
On Sat, Nov 18, 2017 at 5:47 PM, Thomas Gummerer wrote: > Currently 'git worktree add ' creates a new branch named after the > basename of the , that matches the HEAD of whichever worktree we > were on when calling "git worktree add ". > > Make 'git worktree add behave more

Can I Trust You?

2017-11-19 Thread Sgt. Britta Lopez
Good Day, How are u doing today ? Apologies! I am a military woman ,seeking your kind assistance to move the sum of ($27M USD) to you, as far as i can be assured that my money will be safe in your care until i complete my service here in Afghanistan and come over next month. This is legitimate,

Re: Documentation of post-receive hook

2017-11-19 Thread Christoph Michelbach
On Sun, 2017-11-19 at 12:42 -0500, Robert P. J. Day wrote: > On Sun, 19 Nov 2017, Christoph Michelbach wrote: > > > > > On Fri, 2017-11-17 at 12:24 +0900, Junio C Hamano wrote: > > > > > > So an updated suggestion for the text would be: > > >   > > >   This hook is invoked by

Re: [PATCH v3 3/5] Documentation: user-manual: limit usage of ellipsis

2017-11-19 Thread Ann T Ropea
Confusing the ellipsis with the three-dot operator should be made as difficult as possible. Signed-off-by: Ann T Ropea --- v2: rename patch series & focus on removal of ellipses v3: env var instead of config option, use one-line comments where appropriate, preserve indent

Re: [PATCH v3 2/5] diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value

2017-11-19 Thread Ann T Ropea
Neither Git nor the user are in need of this (visual) aid anymore, but we must offer a transition period. Also, fix a typo: "abbbreviated" ---> "abbreviated". Signed-off-by: Ann T Ropea --- v2: rename patch series & focus on removal of ellipses v3: env var instead of config

Re: [PATCH v3 1/5] checkout: describe_detached_head: remove ellipsis after committish

2017-11-19 Thread Ann T Ropea
We do not want an ellipsis displayed following an (abbreviated) SHA-1 value. The days when this was necessary to indicate the truncation to lower-level Git commands and/or the user are bygone. However, to ease the transition, the ellipsis will still be printed if the user (actively!) sets the

Re: Why gc --auto is called so rarely?

2017-11-19 Thread Eric Sunshine
On Sun, Nov 19, 2017 at 12:04 PM, Ilya Kantor wrote: > P.S. The old gmane discussion referenced by some previous posts on this > subject is lost. You can find old gmane conversations at https://public-inbox.org/git/ by searching for "gmane:" in the search field, where

Can @{-N} always be used where a branch name is expected?

2017-11-19 Thread Kaartic Sivaraam
I was recently digging to find if there is any special syntax accepted for in "git branch -m " other than the plain branch name. I discovered the @{-N} notation. I was trying to play around with it and found that it didn't work as guaranteed by the last sentence of the following paragraph

Re: [PATCH 4/4] builtin/branch: strip refs/heads/ using skip_prefix

2017-11-19 Thread Eric Sunshine
On Sun, Nov 19, 2017 at 12:21 PM, Kaartic Sivaraam wrote: > On Sunday 19 November 2017 06:34 AM, Eric Sunshine wrote: >> On Sat, Nov 18, 2017 at 12:26 PM, Kaartic Sivaraam >> wrote: >>> >>> diff --git a/builtin/branch.c b/builtin/branch.c

Re: Why gc --auto is called so rarely?

2017-11-19 Thread Ilya Kantor
...It seems sane to git gc --auto from command that are expected to take time. That's probably the reason why it's not called on commits and called on receive-pack. But then why call it on merges? Especially on those that have no conflicts and should run fast. Also, merges are not supposed to

[PATCH] docs: checking out using @{-N} can lead to detached state

2017-11-19 Thread Kaartic Sivaraam
The commit message of 75d6e552a (Documentation: @{-N} can refer to a commit, 2014-01-19) clearly specifies how @{-N} can be used to refer not only to a branch but also to a commit. IOW, @{-N} is a syntax for the N-th last "checkout" and not the N-th last "branch" Therefore, in some cases using

Re: [PATCH v2] launch_editor(): indicate that Git waits for user input

2017-11-19 Thread Kaartic Sivaraam
On Saturday 18 November 2017 07:10 AM, Junio C Hamano wrote: Eric Sunshine writes: @@ -40,6 +40,32 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *en + static const char *close_notice = NULL; + + if

Re: Documentation of post-receive hook

2017-11-19 Thread Robert P. J. Day
On Sun, 19 Nov 2017, Christoph Michelbach wrote: > On Fri, 2017-11-17 at 12:24 +0900, Junio C Hamano wrote: > > So an updated suggestion for the text would be: > >  > >  This hook is invoked by 'git-receive-pack' on the remote repository, > >  which happens when a 'git push' is done on a

Re: [PATCH v3 2/3] worktree: make add dwim

2017-11-19 Thread Thomas Gummerer
On 11/19, Eric Sunshine wrote: > On Sat, Nov 18, 2017 at 5:47 PM, Thomas Gummerer wrote: > > Currently 'git worktree add ', errors out when 'branch' > > is not a local branch. It has no additional dwim'ing features that one > > might expect. > > > > Make it behave more

[PATCH v2 0/1] exec_cmd: RUNTIME_PREFIX on some POSIX systems

2017-11-19 Thread Dan Jacques
Previous round: - https://public-inbox.org/git/20171116170523.28696-1-...@google.com/ - https://public-inbox.org/git/20171116170523.28696-2-...@google.com/ Junio, Thanks for taking the time to review this patch. Responses inline: > The "regardless of whether the user has overridden it" part

[PATCH 1/1] exec_cmd: RUNTIME_PREFIX on some POSIX systems

2017-11-19 Thread Dan Jacques
Enable Git to resolve its own binary location using a variety of OS-specific and generic methods, including: - procfs via "/proc/self/exe" (Linux) - _NSGetExecutablePath (Darwin) - KERN_PROC_PATHNAME sysctl on BSDs. - argv0, if absolute (all, including Windows). This is used to enable

Re: Documentation of post-receive hook

2017-11-19 Thread Christoph Michelbach
On Fri, 2017-11-17 at 12:24 +0900, Junio C Hamano wrote: > So an updated suggestion for the text would be: >  >  This hook is invoked by 'git-receive-pack' on the remote repository, >  which happens when a 'git push' is done on a local repository. >  > Oh, wait.  That is what we already

Re: [PATCH] git-rebase: clean up dashed-usages in messages

2017-11-19 Thread Kaartic Sivaraam
On Sunday 19 November 2017 07:42 AM, Junio C Hamano wrote: test -f "$apply_dir"/applying && - die "$(gettext "It looks like git-am is in progress. Cannot rebase.")" + die "$(gettext "It looks like you are in the middle of an am session. Cannot rebase.")" Probably not, as 'am'

Re: [PATCH 4/4] builtin/branch: strip refs/heads/ using skip_prefix

2017-11-19 Thread Kaartic Sivaraam
On Sunday 19 November 2017 06:34 AM, Eric Sunshine wrote: On Sat, Nov 18, 2017 at 12:26 PM, Kaartic Sivaraam wrote: diff --git a/builtin/branch.c b/builtin/branch.c @@ -462,6 +462,8 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int

[PATCH 1/3] t7006: add tests for how git branch paginates

2017-11-19 Thread Martin Ågren
The next couple of commits will change how `git branch` handles `pager.branch`, similar to how de121ffe5 (tag: respect `pager.tag` in list-mode only, 2017-08-02) and ff1e72483 (tag: change default of `pager.tag` to "on", 2017-08-02) changed `git tag`. Add tests in this area to make sure that we

[PATCH 2/3] branch: respect `pager.branch` in list-mode only

2017-11-19 Thread Martin Ågren
Similar to de121ffe5 (tag: respect `pager.tag` in list-mode only, 2017-08-02), use the DELAY_PAGER_CONFIG-mechanism to only respect `pager.branch` when we are listing branches. We have two possibilities of generalizing what that earlier commit made to `git tag`. One is to interpret, e.g.,

[PATCH 3/3] branch: change default of `pager.branch` to "on"

2017-11-19 Thread Martin Ågren
This is similar to ff1e72483 (tag: change default of `pager.tag` to "on", 2017-08-02) and is safe now that we do not consider `pager.branch` at all when we are not listing branches. This change will help with listing many branches, but will not hurt users of `git branch --edit-description` as it

Why gc --auto is called so rarely?

2017-11-19 Thread Ilya Kantor
Hello, I tried to find places where git gc --auto is called, and found that there's only a few. First, in *some* merges. That is, if there was a conflict during the merge, that is resolved, then it's not called. Then in * receive-pack * fetch * am Is there any logic in such assignments? Why

[PATCH] git-pull: Pass -4/-6 option to git-fetch

2017-11-19 Thread Shuyu Wei
The -4/-6 option should be passed through to git-fetch to be consistent with the git-pull man page. Signed-off-by: Wei Shuyu --- builtin/pull.c | 12 1 file changed, 12 insertions(+) diff --git a/builtin/pull.c b/builtin/pull.c index f7e2c4f2e..166b777ed 100644

Re: [PATCH 2/2] Reduce performance cost of the trace if trace category is disabled

2017-11-19 Thread Gennady Kupava
Right, this trace is actually not used anywhere, so only check was compilation. Will fix that. On 19 November 2017 at 08:27, Johannes Sixt wrote: > Am 19.11.2017 um 01:42 schrieb gennady.kup...@gmail.com: >> >> +#define trace_printf_key(key, ...) >> \ >> + do { >> \ >> +

Re: [PATCH 1/2] Simplify tracing code by removing trace key normalization concept

2017-11-19 Thread Gennady Kupava
> The usual style comment on the subject applies here. Oh sure, 50 characters. 'Remove trace key normalization concept' would be better? > I cannot quite tell what it is trying to achive to make it a bulleted list. It's not like four things at the same conceptual level is enumerated; instead it

Re: [PATCH] git-send-email: honor $PATH

2017-11-19 Thread Florian Klink
On 17-11-19 10:04:58, Junio C Hamano wrote: "brian m. carlson" writes: This patch adds support for PATH, but it also removes the fixed paths. On many systems, unprivileged users don't have /usr/sbin in their PATH, and I know of no systems which provide /usr/lib

[PATCH] git-pull: Pass -4/-6 option to git-fetch

2017-11-19 Thread Shuyu Wei
The -4/-6 option should be passed through to git-fetch to be consistent with the git-pull man page. Signed-off-by: Wei Shuyu --- builtin/pull.c | 12 1 file changed, 12 insertions(+) diff --git a/builtin/pull.c b/builtin/pull.c index f7e2c4f2e..166b777ed 100644

Re: [PATCH 1/6] t4051: add test for comments preceding function lines

2017-11-19 Thread René Scharfe
Am 19.11.2017 um 02:18 schrieb Eric Sunshine: > On Sat, Nov 18, 2017 at 1:04 PM, René Scharfe wrote: >> When showing function context it would be helpful to show comments >> immediately before declarations, as they are most likely relevant. Add >> a test for that. >> >>

Re: [PATCH v3 2/3] worktree: make add dwim

2017-11-19 Thread Eric Sunshine
On Sat, Nov 18, 2017 at 5:47 PM, Thomas Gummerer wrote: > Currently 'git worktree add ', errors out when 'branch' > is not a local branch. It has no additional dwim'ing features that one > might expect. > > Make it behave more like 'git checkout ' when the branch doesn't

Re: [PATCH 2/2] Reduce performance cost of the trace if trace category is disabled

2017-11-19 Thread Johannes Sixt
Am 19.11.2017 um 01:42 schrieb gennady.kup...@gmail.com: +#define trace_printf_key(key, ...) \ + do {\ + if (trace_pass_fl(key)) \ +