delta/git.git/templates, branch ds/commit-graph

fsmonitor: simplify determining the git worktree under Windows

2017-11-13T01:02:20+00:00

Simplify and speed up the process of finding the git worktree when
running on Windows by keeping it in perl and avoiding spawning helper
processes.

Signed-off-by: Ben Peart 
Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

fsmonitor: read from getcwd(), not the PWD environment variable

2017-11-10T05:04:50+00:00

Though the process has chdir'd to the root of the working tree, the
PWD environment variable is only guaranteed to be updated accordingly
if a shell is involved -- which is not guaranteed to be the case.
That is, if `/usr/bin/perl` is a binary, $ENV{PWD} is unchanged from
whatever spawned `git` -- if `/usr/bin/perl` is a trivial shell
wrapper to the real `perl`, `$ENV{PWD}` will have been updated to the
root of the working copy.

Update to read from the Cwd module using the `getcwd` syscall, not the
PWD environment variable.  The Cygwin case is left unchanged, as it
necessarily _does_ go through a shell.

Signed-off-by: Alex Vandiver 
Signed-off-by: Junio C Hamano

fsmonitor: don't bother pretty-printing JSON from watchman

2017-10-30T02:45:56+00:00

This provides modest performance savings.  Benchmarking with the
following program, with and without `--no-pretty`, we find savings of
23% (0.316s -> 0.242s) in the git repository, and savings of 8% (5.24s
-> 4.86s) on a large repository with 580k files in the working copy.

    #!/usr/bin/perl

    use strict;
    use warnings;
    use IPC::Open2;
    use JSON::XS;

    my $pid = open2(\*CHLD_OUT, \*CHLD_IN, "watchman -j @ARGV")
        or die "open2() failed: $!\n" .
        "Falling back to scanning...\n";

    my $query = qq|["query", "$ENV{PWD}", {}]|;

    print CHLD_IN $query;
    close CHLD_IN;
    my $response = do {local $/; };

    JSON::XS->new->utf8->decode($response);

Signed-off-by: Alex Vandiver 
Signed-off-by: Junio C Hamano

fsmonitor: read entirety of watchman output

2017-10-04T09:58:53+00:00

In Perl, setting $/ sets the string that is used as the "record
separator," which sets the boundary that the `<>` construct reads to.
Setting `local $/ = 0666;` evaluates the octal, getting 438, and
stringifies it.  Thus, the later read from `` stops as soon
as it encounters the string "438" in the watchman output, yielding
invalid JSON; repositories containing filenames with SHA1 hashes are
able to trip this easily.

Set `$/` to undefined, thus slurping all output from watchman.  Also
close STDIN which is provided to watchman, to better guarantee that we
cannot deadlock with watchman while both attempting to read.

Signed-off-by: Alex Vandiver 
Signed-off-by: Junio C Hamano

fsmonitor: MINGW support for watchman integration

2017-10-04T02:10:24+00:00

Instead of just taking $ENV{'PWD'}, use the same logic that converts
PWD to $git_work_tree on MSYS_NT in the watchman integration hook
script also on MINGW.

Signed-off-by: Ben Peart 
Signed-off-by: Junio C Hamano

fsmonitor: add a sample integration script for Watchman

2017-10-01T08:23:05+00:00

This script integrates the new fsmonitor capabilities of git with the
cross platform Watchman file watching service. To use the script:

Download and install Watchman from https://facebook.github.io/watchman/.
Rename the sample integration hook from fsmonitor-watchman.sample to
fsmonitor-watchman. Configure git to use the extension:

git config core.fsmonitor .git/hooks/fsmonitor-watchman

Optionally turn on the untracked cache for optimal performance.

Signed-off-by: Ben Peart 
Signed-off-by: Johannes Schindelin 
Signed-off-by: Ævar Arnfjörð Bjarmason 
Signed-off-by: Christian Couder 
Signed-off-by: Junio C Hamano

Merge branch 'ma/up-to-date'

2017-09-10T08:08:22+00:00

Message and doc updates.

* ma/up-to-date:
  treewide: correct several "up-to-date" to "up to date"
  Documentation/user-manual: update outdated example output

Merge branch 'ks/prepare-commit-msg-sample-fix'

2017-08-23T21:13:07+00:00

An "oops" fix to a topic that is already in 'master'.

* ks/prepare-commit-msg-sample-fix:
  hook: use correct logical variable

treewide: correct several "up-to-date" to "up to date"

2017-08-23T19:17:22+00:00

Follow the Oxford style, which says to use "up-to-date" before the noun,
but "up to date" after it. Don't change plumbing (specifically
send-pack.c, but transport.c (git push) also has the same string).

This was produced by grepping for "up-to-date" and "up to date". It
turned out we only had to edit in one direction, removing the hyphens.

Fix a typo in Documentation/git-diff-index.txt while we're there.

Reported-by: Jeffrey Manian 
Reported-by: STEVEN WHITE 
Signed-off-by: Martin Ågren 
Signed-off-by: Junio C Hamano

hook: use correct logical variable

2017-08-14T18:19:50+00:00

Sign-off added should be that of the "committer", not that of the
"commit's author"; that is how the rest of Git adds sign-off using
sequencer.c::append_signoff().

Use the correct logical variable that identifies the committer.

Signed-off-by: Kaartic Sivaraam 
Signed-off-by: Junio C Hamano