Oxfam Individual Donation.

2017-09-17 Thread Oxfam Worldwide
You won a donation funds of one million united states dollar. get back for more details

Re: [PATCH 1/3] sha1_name: Create perf test for find_unique_abbrev()

2017-09-17 Thread Junio C Hamano
Derrick Stolee writes: > +int cmd_main(int ac, const char **av) > +{ > + setup_git_directory(); As far as I recall, we do not (yet) allow declaration after statement in our codebase. Move this down to make it after all decls. > + > + unsigned int hash_delt =

Re: [PATCH] for_each_string_list_item(): behave correctly for empty list

2017-09-17 Thread Junio C Hamano
Michael Haggerty writes: > *sigh* of course you're right. I should know better than to "fire off a > quick fix to the mailing list". > > I guess the two proposals that are still in the running for rescuing > this macro are Jonathan's and Gábor's. I have no strong preference

[PATCH 2/2] t9010-*.sh: skip all tests if the PIPE prereq is missing

2017-09-17 Thread Ramsay Jones
Every test in this file, except one, is marked with the PIPE prereq. However, that lone test ('set up svn repo'), only performs some setup work and checks whether the following test should be executed (by setting an additional SVNREPO prerequisite). Since the following test also requires the PIPE

[PATCH 1/2] test-lib: use more compact expression in PIPE prerequisite

2017-09-17 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- t/test-lib.sh | 10 ++ 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 32f9b2001..9b61f16f7 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1067,14 +1067,8 @@ test_i18ngrep

[PATCH 0/2] minor PIPE prerequisite updates

2017-09-17 Thread Ramsay Jones
These patches were developed on top of 'pu', but should apply cleanly on top of the 'rj/test-ulimit-on-windows' branch. Ramsay Jones (2): test-lib: use more compact expression in PIPE prerequisite t9010-*.sh: skip all tests if the PIPE prereq is missing t/t9010-svn-fe.sh | 55

[PATCH 1/4] t1502: demonstrate rev-parse --parseopt option mis-parsing

2017-09-17 Thread Brandon Casey
Since commit 2d893df rev-parse will scan forward from the beginning of the option string looking for a flag character. If there are no flag characters then the scan will spill over into the help text and will interpret the characters preceding the "flag" as part of the option-spec i.e. the long

[PATCH 2/4] rev-parse parseopt: do not search help text for flag chars

2017-09-17 Thread Brandon Casey
When searching for flag characters in the option spec, we should ensure the search stays within the bounds of the option spec and does not enter the help text portion of the spec. So when we find the boundary white space marking the start of the help text, let's mark it with a nul character.

[PATCH 3/4] rev-parse parseopt: interpret any whitespace as start of help text

2017-09-17 Thread Brandon Casey
Currently, rev-parse only interprets a space ' ' character as the delimiter between the option spec and the help text. So if a tab character is placed between the option spec and the help text, it will be interpreted as part of the long option name or as part of the arg hint. If it is

[PATCH 4/4] git-rebase: don't ignore unexpected command line arguments

2017-09-17 Thread Brandon Casey
Currently, git-rebase will silently ignore any unexpected command-line switches and arguments (the command-line produced by git rev-parse). This allowed the rev-parse bug, fixed in the preceding commits, to go unnoticed. Let's make sure that doesn't happen again. We shouldn't be ignoring

Re: [PATCH] pack: make packed_git_mru global a value instead of a pointer

2017-09-17 Thread Christian Couder
On Sun, Sep 17, 2017 at 10:42 PM, Christian Couder wrote: > On Sun, Sep 17, 2017 at 10:17 PM, phionah bugosi wrote: >> Signed-off-by: phionah bugosi >> --- >> builtin/pack-objects.c | 5 +++-- >> cache.h| 7

Re: [PATCH] pack: make packed_git_mru global a value instead of a pointer

2017-09-17 Thread Christian Couder
On Sun, Sep 17, 2017 at 10:17 PM, phionah bugosi wrote: > Signed-off-by: phionah bugosi > --- > builtin/pack-objects.c | 5 +++-- > cache.h| 7 --- > list.h | 6 ++ > packfile.c | 12 ++-- > 4

Draft of Git Rev News edition 31

2017-09-17 Thread Christian Couder
Hi, A draft of a new Git Rev News edition is available here: https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-31.md Everyone is welcome to contribute in any section either by editing the above page on GitHub and sending a pull request, or by commenting on this GitHub

Re: [PATCH] t2018: remove unwanted empty line

2017-09-17 Thread Kevin Daudt
On Sun, Sep 17, 2017 at 10:19:28AM +, Kaartic Sivaraam wrote: > Signed-off-by: Kaartic Sivaraam > --- > t/t2018-checkout-branch.sh | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh > index

Re: [PATCH] doc: update information about windows build

2017-09-17 Thread Phillip Wood
On 17/09/17 14:42, Kaartic Sivaraam wrote: On Sun, 2017-09-17 at 14:24 +0100, Phillip Wood wrote: From that commit: diff --git a/ci/run-windows-build.sh b/ci/run-windows-build.sh new file mode 100755 index 0..4e3a50b60 --- /dev/null +++ b/ci/run-windows-build.sh @@ -0,0 +1,74 @@

[PATCH] protocol: make parse_protocol_version() private

2017-09-17 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Brandon, If you need to re-roll your 'bw/protocol-v1' branch, could you please squash this into the relevant patch (commit 45954f179e, "protocol: introduce protocol extention mechanisms", 13-09-2017). This assumes you agree that

[PATCH] test-drop-caches: mark file local symbols with static

2017-09-17 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Ben, If you need to re-roll your 'bp/fsmonitor' branch, could you please squash this into the relevant patch (commit c6b5a28941, "fsmonitor: add a performance test", 15-09-2017). Thanks! ATB, Ramsay Jones

[PATCH] describe: teach --match to handle branches and remotes

2017-09-17 Thread Max Kirillov
When `git describe` uses `--match`, it matches only tags, basically ignoring the `--all` argument even when it is specified. Fix it by also matching branch name and $remote_name/$remote_branch_name, for remote-tracking references, with the specified patterns. Update documentation accordingly and

Re: [PATCH] doc: update information about windows build

2017-09-17 Thread Kaartic Sivaraam
On Sun, 2017-09-17 at 14:24 +0100, Phillip Wood wrote: > > From that commit: > diff --git a/ci/run-windows-build.sh b/ci/run-windows-build.sh > new file mode 100755 > index 0..4e3a50b60 > --- /dev/null > +++ b/ci/run-windows-build.sh > @@ -0,0 +1,74 @@ > +#!/usr/bin/env bash > +# > +#

Re: Commit dropped when swapping commits with rebase -i -p

2017-09-17 Thread Phillip Wood
On 16/09/17 14:45, Sebastian Schuberth wrote: On Sat, Sep 16, 2017 at 12:41 PM, Andreas Heiduk wrote: Therefore I would avoid "definitive wording" like "will drop" and use vague wording along "there are various dragons out there" like this: The todo list presented

Re: [PATCH] doc: update information about windows build

2017-09-17 Thread Phillip Wood
On 17/09/17 06:28, Kaartic Sivaraam wrote: 029aeeed5 (travis-ci: build and test Git on Windows, 2017-03-24) added support for testing the git build for Windows. So, update the documentation and the example used in it. From that commit: diff --git a/ci/run-windows-build.sh

Re: [PATCH] for_each_string_list_item(): behave correctly for empty list

2017-09-17 Thread Michael Haggerty
On 09/17/2017 02:59 AM, Junio C Hamano wrote: > Michael Haggerty writes: > >> If you pass a newly-initialized or newly-cleared `string_list` to >> `for_each_string_list_item()`, then the latter does >> >> for ( >> item = (list)->items; /* note, this is NULL

Re: [PATCH] for_each_string_list_item(): behave correctly for empty list

2017-09-17 Thread Michael Haggerty
On 09/16/2017 01:51 PM, SZEDER Gábor wrote: It would be a pain to have to change the signature of this macro, and we'd prefer not to add overhead to each iteration of the loop. So instead, whenever `list->items` is NULL, initialize `item` to point at a dummy `string_list_item`

[PATCH] t2018: remove unwanted empty line

2017-09-17 Thread Kaartic Sivaraam
Signed-off-by: Kaartic Sivaraam --- t/t2018-checkout-branch.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh index 2131fb2a5682c..e0a52334a22dd 100755 --- a/t/t2018-checkout-branch.sh +++

[PATCH] t/README: fix typo and grammatically improve a sentence

2017-09-17 Thread Kaartic Sivaraam
Signed-off-by: Kaartic Sivaraam --- t/README | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/README b/t/README index 2f95860369751..4b079e4494d93 100644 --- a/t/README +++ b/t/README @@ -265,12 +265,12 @@ or: $ sh

Re: [PATCH v2 4/4] Subject: filter-branch: stash away ref map in a branch

2017-09-17 Thread Ian Campbell
On Sun, 2017-09-17 at 08:36 +0100, Ian Campbell wrote: > +if test -n "$state_branch" > +then > > + echo "Saving rewrite state to $state_branch" 1>&2 > > + state_blob=$( > > + perl -e'opendir D, "../map" or die; > > + open H, "|-", "git hash-object -w --stdin" or

[PATCH v2 1/4] mktag: add option which allows the tagger field to be omitted

2017-09-17 Thread Ian Campbell
This can be useful e.g. in `filter-branch` when rewritting tags produced by older versions of Git, such as v2.6.12-rc2..v2.6.13-rc3 in the Linux kernel source tree: $ git cat-file tag v2.6.12-rc2 object 1da177e4c3f41524e886b7f1b8a0c1fc7321cac2 type commit tag

[PATCH v2 3/4] filter-branch: preserve and restore $GIT_AUTHOR_* and $GIT_COMMITTER_*

2017-09-17 Thread Ian Campbell
These are modified by set_ident() but a subsequent patch would like to operate on their original values. Signed-off-by: Ian Campbell --- git-filter-branch.sh | 33 + 1 file changed, 33 insertions(+) diff --git a/git-filter-branch.sh

[PATCH v2 2/4] filter-branch: reset $GIT_* before cleaning up

2017-09-17 Thread Ian Campbell
This is pure code motion to enable a subsequent patch to add code which needs to happen with the reset $GIT_* but before the temporary directory has been cleaned up. Signed-off-by: Ian Campbell --- git-filter-branch.sh | 10 +- 1 file changed, 5 insertions(+), 5

[PATCH v2 0/4] filter-branch: support for incremental update + fix for ancient tag format

2017-09-17 Thread Ian Campbell
This is the second version of my patches to add incremental support to git-filter-branch. Since the last time I have: * addressed the review feedback (see changelog embedded in final patch) * switched to using the (newly introduced) `--allow-missing-tagger` option to `git mktag` to allow

[PATCH v2 4/4] Subject: filter-branch: stash away ref map in a branch

2017-09-17 Thread Ian Campbell
With "--state-branch=" option, the mapping from old object names and filtered ones in ./map/ directory is stashed away in the object database, and the one from the previous run is read to populate the ./map/ directory, allowing for incremental updates of large trees. Signed-off-by: Ian Campbell

Re: [PATCH v6 05/12] fsmonitor: add documentation for the fsmonitor extension.

2017-09-17 Thread Junio C Hamano
Ben Peart writes: > +[[fsmonitor-watchman]] > +fsmonitor-watchman > +~~~ I've queued a mini squash on top to make sure the line aligns with the length of the string above it by adding three ~'s here.

Re: [PATCH v6 08/12] fsmonitor: add a test tool to dump the index extension

2017-09-17 Thread Junio C Hamano
Ben Peart writes: > diff --git a/t/helper/test-dump-fsmonitor.c b/t/helper/test-dump-fsmonitor.c > new file mode 100644 > index 00..482d749bb9 > --- /dev/null > +++ b/t/helper/test-dump-fsmonitor.c > @@ -0,0 +1,21 @@ > +#include "cache.h" > + > +int cmd_main(int