Re: [PATCH 8/8] gpg-interface: handle alternative signature types

2018-04-10 Thread Junio C Hamano
Ben Toews writes: > From: Ben Toews > > Currently you can only sign commits and tags using "gpg". > ... > have asked before on the list about using OpenBSD signify). > --- Missing sign-off. > -gpg.program:: > - Use this custom program instead of

Re: [PATCH 6/8] gpg-interface: find the last gpg signature line

2018-04-10 Thread Junio C Hamano
Ben Toews writes: > diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh > index ee093b393d..e3f1e014aa 100755 > --- a/t/t7004-tag.sh > +++ b/t/t7004-tag.sh > @@ -1059,6 +1059,17 @@ test_expect_success GPG \ > git tag -v blanknonlfile-signed-tag > ' > >

git log slow - due to fetching ref name prefixes despite format string not needing them

2018-04-10 Thread Ofer Koren
Slow: >> time git log --oneline --no-color --format="%h %ae %at" >> bd4d00302a^1..bd4d00302a^2 1049ee2882 e...@weka.io 1518954558 c0e107f167 e...@weka.io 1518954522 real 0m0.119s user 0m0.104s sys 0m0.012s Fast: >> time git log --no-decorate --oneline

Re: [RFC PATCH 1/1] completion: load completion file for external subcommand

2018-04-10 Thread Florian Gamböck
On 2018-04-10 07:06, Junio C Hamano wrote: Florian Gamböck writes: Does my reasoning make sense? Not at all. :-( That actually hurt a bit. But ... I mean, the result will be exactly the same, we are clearly only talking about readability here. ... I agree, and I also

Re: [PATCH 6/8] gpg-interface: find the last gpg signature line

2018-04-10 Thread Ben Toews
On Tue, Apr 10, 2018 at 3:44 AM, Junio C Hamano wrote: > Ben Toews writes: > >> diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh >> index ee093b393d..e3f1e014aa 100755 >> --- a/t/t7004-tag.sh >> +++ b/t/t7004-tag.sh >> @@ -1059,6 +1059,17 @@

[PATCH v6 12/15] rebase --rebase-merges: avoid "empty merges"

2018-04-10 Thread Johannes Schindelin
The `git merge` command does not allow merging commits that are already reachable from HEAD: `git merge HEAD^`, for example, will report that we are already up to date and not change a thing. In an interactive rebase, such a merge could occur previously, e.g. when competing (or slightly modified)

[PATCH v6 08/15] rebase: introduce the --rebase-merges option

2018-04-10 Thread Johannes Schindelin
Once upon a time, this here developer thought: wouldn't it be nice if, say, Git for Windows' patches on top of core Git could be represented as a thicket of branches, and be rebased on top of core Git in order to maintain a cherry-pick'able set of patch series? The original attempt to answer this

[PATCH v6 09/15] rebase --rebase-merges: add test for --keep-empty

2018-04-10 Thread Johannes Schindelin
From: Phillip Wood If there are empty commits on the left hand side of $upstream...HEAD then the empty commits on the right hand side that we want to keep are being pruned. Signed-off-by: Phillip Wood ---

[PATCH v6 07/15] rebase-helper --make-script: introduce a flag to rebase merges

2018-04-10 Thread Johannes Schindelin
The sequencer just learned new commands intended to recreate branch structure (similar in spirit to --preserve-merges, but with a substantially less-broken design). Let's allow the rebase--helper to generate todo lists making use of these commands, triggered by the new --rebase-merges option. For

[PATCH v6 10/15] sequencer: make refs generated by the `label` command worktree-local

2018-04-10 Thread Johannes Schindelin
This allows for rebases to be run in parallel in separate worktrees (think: interrupted in the middle of one rebase, being asked to perform a different rebase, adding a separate worktree just for that job). Signed-off-by: Johannes Schindelin --- refs.c

[PATCH v6 01/15] sequencer: avoid using errno clobbered by rollback_lock_file()

2018-04-10 Thread Johannes Schindelin
As pointed out in a review of the `--rebase-merges` patch series, `rollback_lock_file()` clobbers errno. Therefore, we have to report the error message that uses errno before calling said function. Signed-off-by: Johannes Schindelin --- sequencer.c | 10 ++ 1

[PATCH v6 02/15] sequencer: make rearrange_squash() a bit more obvious

2018-04-10 Thread Johannes Schindelin
There are some commands that have to be skipped from rearranging by virtue of not handling any commits. However, the logic was not quite obvious: it skipped commands based on their position in the enum todo_command. Instead, let's make it explicit that we skip all commands that do not handle any

[PATCH v2 1/1] perl: fix installing modules from contrib

2018-04-10 Thread Christian Hesse
Commit 20d2a30f (Makefile: replace perl/Makefile.PL with simple make rules) removed a target that allowed Makefiles from contrib/ to get the correct install path. This introduces a new target for main Makefile and fixes installation for Mediawiki module. v2: Pass prefix as that can have influence

Re: [PATCH 07/16] refs: add repository argument to get_main_ref_store

2018-04-10 Thread Michael Haggerty
On 04/10/2018 12:45 AM, Stefan Beller wrote: > Add a repository argument to allow the get_main_ref_store caller > to be more specific about which repository to handle. This is a small > mechanical change; it doesn't change the implementation to handle > repositories other than the_repository yet.

Re: [PATCH 12/16] refs: store the main ref store inside the repository struct

2018-04-10 Thread Michael Haggerty
On 04/10/2018 12:45 AM, Stefan Beller wrote: > Signed-off-by: Stefan Beller > --- > refs.c | 13 + > refs.h | 4 +--- > repository.h | 3 +++ > 3 files changed, 9 insertions(+), 11 deletions(-) > > diff --git a/refs.c b/refs.c > index

Re: [PATCH 1/8] gpg-interface: handle bool user.signingkey

2018-04-10 Thread Jeff King
On Mon, Apr 09, 2018 at 04:55:26PM -0400, Eric Sunshine wrote: > Peff's Signed-off-by: is missing. Also, since you're forwarding this > patch on Peff's behalf, your Signed-off-by: should follow his. Same > comment applies to all patches by Peff in this series. I usually sign-off as I send to the

[PATCH v6 04/15] sequencer: introduce new commands to reset the revision

2018-04-10 Thread Johannes Schindelin
In the upcoming commits, we will teach the sequencer to rebase merges. This will be done in a very different way from the unfortunate design of `git rebase --preserve-merges` (which does not allow for reordering commits, or changing the branch topology). The main idea is to introduce new todo

[PATCH v6 00/15] rebase -i: offer to recreate commit topology

2018-04-10 Thread Johannes Schindelin
Once upon a time, I dreamt of an interactive rebase that would not flatten branch structure, but instead recreate the commit topology faithfully. My original attempt was --preserve-merges, but that design was so limited that I did not even enable it in interactive mode. Subsequently, it *was*

[PATCH v6 05/15] sequencer: introduce the `merge` command

2018-04-10 Thread Johannes Schindelin
This patch is part of the effort to reimplement `--preserve-merges` with a substantially improved design, a design that has been developed in the Git for Windows project to maintain the dozens of Windows-specific patch series on top of upstream Git. The previous patch implemented the `label` and

[PATCH v6 03/15] git-rebase--interactive: clarify arguments

2018-04-10 Thread Johannes Schindelin
From: Stefan Beller Up to now each command took a commit as its first argument and ignored the rest of the line (usually the subject of the commit) Now that we are about to introduce commands that take different arguments, clarify each command by giving the argument

[PATCH v6 06/15] sequencer: fast-forward `merge` commands, if possible

2018-04-10 Thread Johannes Schindelin
Just like with regular `pick` commands, if we are trying to rebase a merge commit, we now test whether the parents of said commit match HEAD and the commits to be merged, and fast-forward if possible. This is not only faster, but also avoids unnecessary proliferation of new objects.

Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Johannes Schindelin
Hi Junio, On Mon, 9 Apr 2018, Junio C Hamano wrote: > * js/t5404-path-fix (2018-04-09) 1 commit > - t5404: relax overzealous test > > Test fix. Please note that it is not a "path fix". It is a fix for when the test is looking for an error message, and may currently mistake something else for

[PATCH v8 14/14] commit-graph: implement "--append" option

2018-04-10 Thread Derrick Stolee
From: Derrick Stolee Teach git-commit-graph to add all commits from the existing commit-graph file to the file about to be written. This should be used when adding new commits without performing garbage collection. Signed-off-by: Derrick Stolee ---

Re: core.fsmonitor always perform rescans

2018-04-10 Thread Ben Peart
On 3/26/2018 12:41 AM, Tatsuyuki Ishi wrote: Hello, I'm facing issue with core.fsmonitor. I'm currently using the provided watchman hook, but it doesn't seem to record the fact that it has queried the fsmonitor backend, and as a result the timestamp passed to the hook doesn't seem to change.

Re: [PATCH v6 00/15] rebase -i: offer to recreate commit topology

2018-04-10 Thread Sergey Organov
Hi Johannes, Johannes Schindelin writes: > Once upon a time, I dreamt of an interactive rebase that would not > flatten branch structure, but instead recreate the commit topology > faithfully. [...] > Think of --rebase-merges as "--preserve-merges done right".

[PATCH v8 2/5] Makefile: add Perl runtime prefix support

2018-04-10 Thread Dan Jacques
Broaden the RUNTIME_PREFIX flag to configure Git's Perl scripts to locate the Git installation's Perl support libraries by resolving against the script's path, rather than hard-coding that path at build-time. Hard-coding at build time worked on previous RUNTIME_PREFIX configurations (i.e.,

[PATCH v8 0/5] RUNTIME_PREFIX relocatable Git

2018-04-10 Thread Dan Jacques
This is a minor update based on comments from the v6 series. I'm hoping this set is good to go! This patch set expands support for the RUNTIME_PREFIX configuration flag, currently only used on Windows builds, to include Linux, Darwin, and FreeBSD. When Git is built with RUNTIME_PREFIX enabled, it

[PATCH v8 3/5] exec_cmd: RUNTIME_PREFIX on some POSIX systems

2018-04-10 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

[PATCH v8 4/5] exec_cmd: provide a new-style RUNTIME_PREFIX helper for Windows

2018-04-10 Thread Dan Jacques
From: Johannes Schindelin The RUNTIME_PREFIX feature comes from Git for Windows, but it was enhanced to allow support for other platforms. While changing the original idea, the concept was also improved by not forcing argv[0] to be adjusted. Let's allow the same for

[PATCH v8 5/5] mingw/msvc: use the new-style RUNTIME_PREFIX helper

2018-04-10 Thread Dan Jacques
From: Johannes Schindelin This change also allows us to stop overriding argv[0] with the absolute path of the executable, allowing us to preserve e.g. the case of the executable's file name. This fixes https://github.com/git-for-windows/git/issues/1496 partially.

[PATCH v8 1/5] Makefile: generate Perl header from template file

2018-04-10 Thread Dan Jacques
Currently, the generated Perl script headers are emitted by commands in the Makefile. This mechanism restricts options to introduce alternative header content, needed by Perl runtime prefix support, and obscures the origin of the Perl script header. Change the Makefile to generate a header by

Re: [PATCH 8/8] gpg-interface: handle alternative signature types

2018-04-10 Thread Ben Toews
On Tue, Apr 10, 2018 at 2:24 AM, Eric Sunshine wrote: > On Mon, Apr 9, 2018 at 4:41 PM, Ben Toews wrote: >> [...] >> This patch introduces a set of configuration options for >> defining a "signing tool", of which gpg may be just one. >> With this

Re: git-gui ignores core.hooksPath

2018-04-10 Thread Chris Maes
Hello, using git 2.16 the same problem is still present. I see that the pull request https://github.com/patthoyts/git-gui/pull/12 (along with 15 other pull requests) are lying around since about one year without any sign of life from patthoyts. Is there any hope from here that anyone will

[PATCH v8 13/14] commit-graph: build graph from starting commits

2018-04-10 Thread Derrick Stolee
From: Derrick Stolee Teach git-commit-graph to read commits from stdin when the --stdin-commits flag is specified. Commits reachable from these commits are added to the graph. This is a much faster way to construct the graph than inspecting all packed objects, but is

[PATCH v8 11/14] commit: integrate commit graph with commit parsing

2018-04-10 Thread Derrick Stolee
From: Derrick Stolee Teach Git to inspect a commit graph file to supply the contents of a struct commit when calling parse_commit_gently(). This implementation satisfies all post-conditions on the struct commit, including loading parents, the root tree, and the commit

[PATCH v8 09/14] commit-graph: add core.commitGraph setting

2018-04-10 Thread Derrick Stolee
From: Derrick Stolee The commit graph feature is controlled by the new core.commitGraph config setting. This defaults to 0, so the feature is opt-in. The intention of core.commitGraph is that a user can always stop checking for or parsing commit graph files if

[PATCH v8 12/14] commit-graph: read only from specific pack-indexes

2018-04-10 Thread Derrick Stolee
From: Derrick Stolee Teach git-commit-graph to inspect the objects only in a certain list of pack-indexes within the given pack directory. This allows updating the commit graph iteratively. Signed-off-by: Derrick Stolee ---

Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Derrick Stolee
On 4/9/2018 6:08 PM, Junio C Hamano wrote: I guess we'd want a final cleaned-up round after all ;-) Thanks. v8 sent [1]. Thanks. -Stolee [1] https://public-inbox.org/git/20180410125608.39443-1-dsto...@microsoft.com/T/#u

[PATCH v8 10/14] commit-graph: close under reachability

2018-04-10 Thread Derrick Stolee
From: Derrick Stolee Teach write_commit_graph() to walk all parents from the commits discovered in packfiles. This prevents gaps given by loose objects or previously-missed packfiles. Also automatically add commits from the existing graph file, if it exists.

[PATCH v8 07/14] commit-graph: implement git-commit-graph write

2018-04-10 Thread Derrick Stolee
From: Derrick Stolee Teach git-commit-graph to write graph files. Create new test script to verify this command succeeds without failure. Signed-off-by: Derrick Stolee --- Documentation/git-commit-graph.txt | 41 ++ builtin/commit-graph.c

Re: [PATCH 8/8] gpg-interface: handle alternative signature types

2018-04-10 Thread Ben Toews
On Tue, Apr 10, 2018 at 3:35 AM, Junio C Hamano wrote: > Ben Toews writes: > >> From: Ben Toews >> >> Currently you can only sign commits and tags using "gpg". >> ... >> have asked before on the list about using OpenBSD signify). >>

Re: [PATCH 02/16] replace_object.c: rename to use dash in file name

2018-04-10 Thread Stefan Beller
Hi Junio, On Mon, Apr 9, 2018 at 8:00 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> This is more consistent with the project style. The majority of >> Git's source files use dashes in preference to underscores in their file >> names. >> >> Noticed

[PATCH v6 14/15] rebase -i: introduce --rebase-merges=[no-]rebase-cousins

2018-04-10 Thread Johannes Schindelin
This one is a bit tricky to explain, so let's try with a diagram: C / \ A - B - E - F \ / D To illustrate what this new mode is all about, let's consider what happens upon `git rebase -i --rebase-merges B`, in particular to the commit `D`. So far, the new branch structure

[PATCH v6 11/15] sequencer: handle post-rewrite for merge commands

2018-04-10 Thread Johannes Schindelin
In the previous patches, we implemented the basic functionality of the `git rebase -i --rebase-merges` command, in particular the `merge` command to create merge commits in the sequencer. The interactive rebase is a lot more these days, though, than a simple cherry-pick in a loop. For example, it

[PATCH v6 13/15] pull: accept --rebase=merges to recreate the branch topology

2018-04-10 Thread Johannes Schindelin
Similar to the `preserve` mode simply passing the `--preserve-merges` option to the `rebase` command, the `merges` mode simply passes the `--rebase-merges` option. This will allow users to conveniently rebase non-trivial commit topologies when pulling new commits, without flattening them.

[PATCH v6 15/15] rebase -i --rebase-merges: add a section to the man page

2018-04-10 Thread Johannes Schindelin
The --rebase-merges mode is probably not half as intuitive to use as its inventor hopes, so let's document it some. Signed-off-by: Johannes Schindelin --- Documentation/git-rebase.txt | 125 +++ 1 file changed, 125 insertions(+) diff

[PATCH v8 04/14] graph: add commit graph design document

2018-04-10 Thread Derrick Stolee
From: Derrick Stolee Add Documentation/technical/commit-graph.txt with details of the planned commit graph feature, including future plans. Signed-off-by: Derrick Stolee --- Documentation/technical/commit-graph.txt | 163 +++ 1

[PATCH v8 08/14] commit-graph: implement git commit-graph read

2018-04-10 Thread Derrick Stolee
From: Derrick Stolee Teach git-commit-graph to read commit graph files and summarize their contents. Use the read subcommand to verify the contents of a commit graph file in the tests. Signed-off-by: Derrick Stolee ---

[PATCH v8 06/14] commit-graph: implement write_commit_graph()

2018-04-10 Thread Derrick Stolee
From: Derrick Stolee Teach Git to write a commit graph file by checking all packed objects to see if they are commits, then store the file in the given object directory. Helped-by: Jeff King Signed-off-by: Derrick Stolee ---

[PATCH v8 02/14] csum-file: refactor finalize_hashfile() method

2018-04-10 Thread Derrick Stolee
From: Derrick Stolee If we want to use a hashfile on the temporary file for a lockfile, then we need finalize_hashfile() to fully write the trailing hash but also keep the file descriptor open. Do this by adding a new CSUM_HASH_IN_STREAM flag along with a functional

[PATCH v8 03/14] commit-graph: add format document

2018-04-10 Thread Derrick Stolee
From: Derrick Stolee Add document specifying the binary format for commit graphs. This format allows for: * New versions. * New hash functions and hash lengths. * Optional extensions. Basic header information is followed by a binary table of contents into "chunks" that

[PATCH v8 05/14] commit-graph: create git-commit-graph builtin

2018-04-10 Thread Derrick Stolee
From: Derrick Stolee Teach git the 'commit-graph' builtin that will be used for writing and reading packed graph files. The current implementation is mostly empty, except for an '--object-dir' option. Signed-off-by: Derrick Stolee --- .gitignore

[PATCH v8 01/14] csum-file: rename hashclose() to finalize_hashfile()

2018-04-10 Thread Derrick Stolee
From: Derrick Stolee The hashclose() method behaves very differently depending on the flags parameter. In particular, the file descriptor is not always closed. Perform a simple rename of "hashclose()" to "finalize_hashfile()" in preparation for functional changes.

[PATCH v8 00/14] Serialized Git Commit Graph

2018-04-10 Thread Derrick Stolee
This version covers the review that I missed when rerolling v7. The file diff is below from previous version, and also PATCH 14/14 was reworded to use "--append" properly. diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index 41c4f76caf..37420ae0fd 100644 --- a/builtin/commit-graph.c

[PATCH v1] fsmonitor: force index write after full scan

2018-04-10 Thread Ben Peart
fsmonitor currently only flags the index as dirty if the extension is being added or removed. This is a performance optimization that recognizes you can stat() a lot of files in less time than it takes to write out an updated index. This patch makes a small enhancement and flags the index dirty

Re: [PATCH 2/6] doc: align 'diff --no-index' in text with synopsis

2018-04-10 Thread Martin Ågren
On 10 April 2018 at 20:32, Andreas Heiduk wrote: > Comparing > The two '' parameters are not optional but the option > '--no-index' is. Also move the `--options` part to the same > place where the other variants show them. That first line should probably not be there. The

Re: Great Investment Offer

2018-04-10 Thread Gagum Melvin Sikze Kakha
Hello In my search for a business partner i got your contact in google search. My client is willing to invest $10 Million to $500 million but my client said he need a trusted partner who he can have a meeting at the point of releasing his funds. I told my client that you have a good profile

Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Derrick Stolee
On 4/10/2018 3:21 PM, Ramsay Jones wrote: On 10/04/18 13:57, Derrick Stolee wrote: On 4/9/2018 6:08 PM, Junio C Hamano wrote: I guess we'd want a final cleaned-up round after all ;-)  Thanks. v8 sent [1]. Thanks. I just tried to 'git am' this series and I could not get it to apply cleanly

[PATCH 5/6] git-svn: commit-diff does not support --add-author-from

2018-04-10 Thread Andreas Heiduk
Signed-off-by: Andreas Heiduk --- Documentation/git-svn.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 636e09048e..11aefadf7a 100644 --- a/Documentation/git-svn.txt +++

Re: [PATCH v6 15/15] rebase -i --rebase-merges: add a section to the man page

2018-04-10 Thread Martin Ågren
On 10 April 2018 at 14:30, Johannes Schindelin wrote: > The --rebase-merges mode is probably not half as intuitive to use as > its inventor hopes, so let's document it some. I quite like this documentation. Well-structured and well-paced. Already after the first

Re: [PATCH 4/6] doc: added '-d' and '-q' for 'git push'

2018-04-10 Thread Martin Ågren
On 10 April 2018 at 20:32, Andreas Heiduk wrote: > Add the missing `-o` shortcut for `--push-option` to the synposis. > Add the missing `-d` shortcut for `--delete` in the main section. s/synposis/synopsis/ The subject of this patch says -q, which should be -o. The subject

Re: [PATCH 07/16] refs: add repository argument to get_main_ref_store

2018-04-10 Thread Stefan Beller
Hi Michael, On Tue, Apr 10, 2018 at 6:36 AM, Michael Haggerty wrote: > On 04/10/2018 12:45 AM, Stefan Beller wrote: >> Add a repository argument to allow the get_main_ref_store caller >> to be more specific about which repository to handle. This is a small >> mechanical

[PATCH 4/6] doc: added '-d' and '-q' for 'git push'

2018-04-10 Thread Andreas Heiduk
Add the missing `-o` shortcut for `--push-option` to the synposis. Add the missing `-d` shortcut for `--delete` in the main section. Signed-off-by: Andreas Heiduk --- Documentation/git-push.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git

[PATCH 3/6] doc: clarify ignore rules for git ls-files

2018-04-10 Thread Andreas Heiduk
Explain that `git ls-files --ignored` requires at least one of the `--exclude*` options to do its job. Signed-off-by: Andreas Heiduk --- Documentation/git-ls-files.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-ls-files.txt

[PATCH 6/6] doc: add note about shell quoting to revision.txt

2018-04-10 Thread Andreas Heiduk
Signed-off-by: Andreas Heiduk --- Documentation/revisions.txt | 6 ++ 1 file changed, 6 insertions(+) diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index dfcc49c72c..c1d3a40a90 100644 --- a/Documentation/revisions.txt +++

[PATCH v1] fsmonitor: fix incorrect buffer size when printing version number

2018-04-10 Thread Ben Peart
This is a trivial bug fix for passing the incorrect size to snprintf() when outputing the version. It should be passing the size of the destination buffer rather than the size of the value being printed. Signed-off-by: Ben Peart --- Notes: Base Ref: v2.17.0

Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Stefan Beller
On Tue, Apr 10, 2018 at 5:57 AM, Derrick Stolee wrote: > On 4/9/2018 6:08 PM, Junio C Hamano wrote: >> >> >> I guess we'd want a final cleaned-up round after all ;-) Thanks. > > > v8 sent [1]. Thanks. > > -Stolee I gave the series another read and think it is ready. Stefan

Re: [PATCH 2/6] doc: align 'diff --no-index' in text with synopsis

2018-04-10 Thread Andreas Heiduk
Am 10.04.2018 um 21:14 schrieb Martin Ågren: > On 10 April 2018 at 20:32, Andreas Heiduk wrote: >> Comparing > > That first line should probably not be there. The diff LGTM. > > Martin > ACK, Thanks

Re: [PATCH 4/6] doc: added '-d' and '-q' for 'git push'

2018-04-10 Thread Andreas Heiduk
Am 10.04.2018 um 21:17 schrieb Martin Ågren: > On 10 April 2018 at 20:32, Andreas Heiduk wrote: >> Add the missing `-o` shortcut for `--push-option` to the synposis. >> Add the missing `-d` shortcut for `--delete` in the main section. > > s/synposis/synopsis/ > > The subject

[PATCH 0/6] Some doc-fixes

2018-04-10 Thread Andreas Heiduk
I'm flushing a queue of small fixes to the docs. Handling these indiviually is just to much hassle - at least I hope so :-) Andreas Heiduk (6): doc: fix formatting inconsistency in githooks.txt doc: align 'diff --no-index' in text with synopsis doc: clarify ignore rules for git ls-files

[PATCH 1/6] doc: fix formatting inconsistency in githooks.txt

2018-04-10 Thread Andreas Heiduk
The section 'post-rewrite' in 'githooks.txt' renders only one command using backticks (`git commit`) but the other commands using single quotes ('git-rebase'). Align this formatting to use single quotes. Signed-off-by: Andreas Heiduk --- Documentation/githooks.txt | 4 ++--

[PATCH 2/6] doc: align 'diff --no-index' in text with synopsis

2018-04-10 Thread Andreas Heiduk
Comparing The two '' parameters are not optional but the option '--no-index' is. Also move the `--options` part to the same place where the other variants show them. All three items are already correct in the synopsis. Signed-off-by: Andreas Heiduk ---

Re: [PATCH v8 03/14] commit-graph: add format document

2018-04-10 Thread Stefan Beller
Hi Derrick, On Tue, Apr 10, 2018 at 5:55 AM, Derrick Stolee wrote: > + OID Fanout (ID: {'O', 'I', 'D', 'F'}) (256 * 4 bytes) > + The ith entry, F[i], stores the number of OIDs with first > + byte at most i. Thus F[255] stores the total > + number of commits

Re: [PATCH v8 03/14] commit-graph: add format document

2018-04-10 Thread Derrick Stolee
On 4/10/2018 3:10 PM, Stefan Beller wrote: Hi Derrick, On Tue, Apr 10, 2018 at 5:55 AM, Derrick Stolee wrote: + OID Fanout (ID: {'O', 'I', 'D', 'F'}) (256 * 4 bytes) + The ith entry, F[i], stores the number of OIDs with first + byte at most i. Thus F[255] stores

Re: [PATCH 12/16] refs: store the main ref store inside the repository struct

2018-04-10 Thread Stefan Beller
Hi Michael, On Tue, Apr 10, 2018 at 7:02 AM, Michael Haggerty wrote: > This also makes sense to me, as far as it goes. I have a few comments > and questions: > > Why do you call the new member `main_ref_store`? Is there expected to be > some other `ref_store` associated

Re: [PATCH 1/6] doc: fix formatting inconsistency in githooks.txt

2018-04-10 Thread Martin Ågren
On 10 April 2018 at 20:32, Andreas Heiduk wrote: > The section 'post-rewrite' in 'githooks.txt' renders only one command > using backticks (`git commit`) but the other commands using single quotes > ('git-rebase'). Align this formatting to use single quotes. > > Signed-off-by:

Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Ramsay Jones
On 10/04/18 13:57, Derrick Stolee wrote: > On 4/9/2018 6:08 PM, Junio C Hamano wrote: >> >> I guess we'd want a final cleaned-up round after all ;-)  Thanks. > > v8 sent [1]. Thanks. I just tried to 'git am' this series and I could not get it to apply cleanly to current 'master', 'next' or

Re: git-gui ignores core.hooksPath

2018-04-10 Thread Johannes Schindelin
Hi Chris, On Tue, 10 Apr 2018, Chris Maes wrote: > using git 2.16 the same problem is still present. And probably 2.17, too. > I see that the pull request https://github.com/patthoyts/git-gui/pull/12 > (along with 15 other pull requests) are lying around since about one > year without any sign

Re: git-gui ignores core.hooksPath

2018-04-10 Thread Junio C Hamano
Chris Maes writes: > Is there any hope from here that anyone will pick up this / these > changes? Will anyone else be assigned the main responsible for this > git-gui repository? > > Just hoping to revive the discussion here, since the > https://github.com/patthoyts/git-gui/

Re: git-gui ignores core.hooksPath

2018-04-10 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 10 2018, Junio C. Hamano wrote: > Chris Maes writes: > >> Is there any hope from here that anyone will pick up this / these >> changes? Will anyone else be assigned the main responsible for this >> git-gui repository? >> >> Just hoping to revive the discussion

Re: [PATCH v1 1/2] fsexcludes: add a programmatic way to exclude files from git's working directory traversal logic

2018-04-10 Thread Martin Ågren
On 10 April 2018 at 23:04, Ben Peart wrote: > The File System Excludes module is a new programmatic way to exclude files and > folders from git's traversal of the working directory. fsexcludes_init() > should > be called with a string buffer that contains a NUL

Re: git-gui branches, was Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Johannes Schindelin
Hi Junio, On Wed, 11 Apr 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Mon, 9 Apr 2018, Junio C Hamano wrote: > > > >> * bb/git-gui-ssh-key-files (2018-03-02) 2 commits > >> * bp/git-gui-bind-kp-enter (2018-03-02) 2 commits > >> *

Re: git remote rename problem with trailing \\ for remote.url config entries (on Windows)

2018-04-10 Thread Johannes Schindelin
Hi, [I know, blast from the past...] On Mon, 13 Feb 2017, Junio C Hamano wrote: > Marc Strapetz writes: > > > One of our users has just reported that: > > > > $ git remote rename origin origin2 > > > > will turn following remote entry: > > > > [remote "origin"] > >

Re: git remote rename problem with trailing \\ for remote.url config entries (on Windows)

2018-04-10 Thread Junio C Hamano
Johannes Schindelin writes: > A quick test with my `empty-config-section` patch series shows that it > addresses this issue. A quick bisec confirms that the patch with the > online "git_config_set: make use of the config parser's event stream" is > responsible for

Re: [PATCH v6 00/15] rebase -i: offer to recreate commit topology

2018-04-10 Thread Johannes Schindelin
Hi Sergey, On Tue, 10 Apr 2018, Sergey Organov wrote: > Johannes Schindelin writes: > > > Once upon a time, I dreamt of an interactive rebase that would not > > flatten branch structure, but instead recreate the commit topology > > faithfully. > > [...] > > >

Re: [PATCH 6/8] gpg-interface: find the last gpg signature line

2018-04-10 Thread Junio C Hamano
Junio C Hamano writes: >> That test was fixed a week ago: >> https://github.com/git/git/commit/a99d903f21d102a5768f19157085a9733aeb68dd > > Well, you cannot expect any reviewer to know about a change that has > never been sent to the list and has never been part of even 'pu' >

Re: [PATCH 0/6] Rename files to use dashes instead of underscores

2018-04-10 Thread Johannes Schindelin
Hi Stefan, On Tue, 10 Apr 2018, Stefan Beller wrote: > This is the followup for > https://public-inbox.org/git/xmqqbmer4vfh@gitster-ct.c.googlers.com/ > > We have no files left with underscores in their names. Yaaay! > Stefan Beller (6): > write_or_die.c: rename to use dashes in file

Re: [PATCH 0/6] Rename files to use dashes instead of underscores

2018-04-10 Thread Stefan Beller
Hi Johannes, On Tue, Apr 10, 2018 at 3:39 PM, Johannes Schindelin wrote: > Hi Stefan, > > On Tue, 10 Apr 2018, Stefan Beller wrote: > >> This is the followup for >> https://public-inbox.org/git/xmqqbmer4vfh@gitster-ct.c.googlers.com/ >> >> We have no files left

Re: [PATCH 1/6] doc: fix formatting inconsistency in githooks.txt

2018-04-10 Thread Martin Ågren
On 10 April 2018 at 22:04, Andreas Heiduk wrote: > Am 10.04.2018 um 21:13 schrieb Martin Ågren: >> On 10 April 2018 at 20:32, Andreas Heiduk wrote: >> Hmm, I wonder if that is actually intentional. `git commit --amend` >> could be run exactly like that and

git-gui branches, was Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Johannes Schindelin
Hi Junio, On Mon, 9 Apr 2018, Junio C Hamano wrote: > * bb/git-gui-ssh-key-files (2018-03-02) 2 commits > - Merge branch 'bb/ssh-key-files' of git-gui into bb/git-gui-ssh-key-files > - git-gui: search for all current SSH key types > > "git gui" learned that "~/.ssh/id_ecdsa.pub" and >

Re: [PATCH 0/6] Rename files to use dashes instead of underscores

2018-04-10 Thread Stefan Beller
On Tue, Apr 10, 2018 at 2:26 PM, Stefan Beller wrote: > This is the followup for > https://public-inbox.org/git/xmqqbmer4vfh@gitster-ct.c.googlers.com/ > > We have no files left with underscores in their names. > It applies on master, and also contains that patch for

Re: git-gui branches, was Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Junio C Hamano
Johannes Schindelin writes: > On Mon, 9 Apr 2018, Junio C Hamano wrote: > >> * bb/git-gui-ssh-key-files (2018-03-02) 2 commits >> * bp/git-gui-bind-kp-enter (2018-03-02) 2 commits >> * cb/git-gui-ttk-style (2018-03-05) 2 commits > > What is your plan with those? I

Re: [PATCH v2 1/1] perl: fix installing modules from contrib

2018-04-10 Thread Junio C Hamano
Christian Hesse writes: > Commit 20d2a30f (Makefile: replace perl/Makefile.PL with simple make rules) > removed a target that allowed Makefiles from contrib/ to get the correct > install path. This introduces a new target for main Makefile and fixes > installation for Mediawiki

Re: [PATCH 1/6] doc: fix formatting inconsistency in githooks.txt

2018-04-10 Thread Andreas Heiduk
Am 10.04.2018 um 21:13 schrieb Martin Ågren: > On 10 April 2018 at 20:32, Andreas Heiduk wrote: >> The section 'post-rewrite' in 'githooks.txt' renders only one command >> using backticks (`git commit`) but the other commands using single quotes >> ('git-rebase'). Align this

Re: [PATCH 4/6] doc: added '-d' and '-q' for 'git push'

2018-04-10 Thread Martin Ågren
On 10 April 2018 at 21:38, Andreas Heiduk wrote: > Can I add "Reviewed-by: $YOU" to this one and 2/6? Sure!

Re: [PATCH v1] fsmonitor: fix incorrect buffer size when printing version number

2018-04-10 Thread Eric Sunshine
On Tue, Apr 10, 2018 at 2:43 PM, Ben Peart wrote: > This is a trivial bug fix for passing the incorrect size to snprintf() when > outputing the version. It should be passing the size of the destination > buffer s/outputing/outputting/ > rather than the size of the

[PATCH v2 1/1] completion: load completion file for external subcommand

2018-04-10 Thread Florian Gamböck
Adding external subcommands to Git is as easy as to put an executable file git-foo into PATH. Packaging such subcommands for a Linux distribution can be achieved by unpacking the executable into /usr/bin of the user's system. Adding system-wide completion scripts for new subcommands, however, can

[PATCH v2 0/1] completion: dynamic completion loading

2018-04-10 Thread Florian Gamböck
In this small patch I want to introduce a way to dynamically load completion scripts for external subcommands. A few years ago, you would put a completion script (which defines a Bash function _git_foo for a custom git subcommand foo) into /etc/bash_completion.d, or save it somewhere in your

Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

2018-04-10 Thread Ramsay Jones
On 10/04/18 21:22, Ramsay Jones wrote: > > > On 10/04/18 20:35, Derrick Stolee wrote: >> On 4/10/2018 3:21 PM, Ramsay Jones wrote: >>> >>> On 10/04/18 13:57, Derrick Stolee wrote: On 4/9/2018 6:08 PM, Junio C Hamano wrote: > I guess we'd want a final cleaned-up round after all ;-) 

Inbox SMTP, Inbox Webmail, I Sell Sure Spamming Toolz

2018-04-10 Thread Mr Spamming
I Sell Sure Spamming Toolz What we have on Stock Daily Inbox Webmail Inbox SMTP Fresh USA email leads Fresh Canada email leads Fresh Loan email leads Fresh Business emails leads Real Eastate email leads Conference delegates email leads Fresh Job Seaker emails cPanel HTTP and HTTPs Shell

  1   2   >