`pull --rebase --autostash` fails when fast forward in dirty repo

Hi, This script explains and tests what's going on: https://gist.github.com/tylerbrazier/4478e76fe44bf6657d4d3da6c789531d pull is failing because it shortcuts to --ff-only then calls run_merge(), which does not know how to autostash. Removing the shortcut fixes the problem: diff --git

Options to avoid docs generation/installation

Hi, The INSTALL file says that docs are not built by default, but that's not my experience. "make all" results in the generation of several Perl man pages, e.g. "Git.3pm". Is it the case that the behaviour documented is not propagated to the perl subdir? Also, setting --mandir=/dev/null still

Re: [PATCH v3 15/30] perf: add a GIT_PERF_MAKE_COMMAND for when *_MAKE_OPTS won't do

Ævar Arnfjörð Bjarmason writes: > diff --git a/t/perf/README b/t/perf/README > index 49ea4349be..b3d95042a8 100644 > --- a/t/perf/README > +++ b/t/perf/README > @@ -60,8 +60,23 @@ You can set the following variables (also in your > config.mak): > > GIT_PERF_MAKE_OPTS >

Re: [PATCH v3 05/30] log: make --regexp-ignore-case work with --perl-regexp

Ævar Arnfjörð Bjarmason writes: > Make the --regexp-ignore-case option work with --perl-regexp. This > never worked, and there was no test for this. Fix the bug and add a > test. > > When PCRE support was added in commit 63e7e9d8b6 ("git-grep: Learn > PCRE", 2011-05-09)

Re: [PATCH v3 00/30] Easy to review grep & pre-PCRE changes

Ævar Arnfjörð Bjarmason writes: > Easy to review? 29 (I mean 30) patches? Are you kidding me?! > > As noted in v1 (<20170511091829.5634-1-ava...@gmail.com>; > https://public-inbox.org/git/20170511091829.5634-1-ava...@gmail.com/) > these are all doc, test, refactoring etc.

Re: [PATCH v2 1/2] refs: Add for_each_worktree_ref for iterating over all worktree HEADs

Manish Goregaokar writes: > One thing which I think hasn't been covered yet is the rebase > ORIG_HEAD. I'll see if that's still a problem on `pu` and make a patch > for it if so. IIRC, ORIG_HEAD, FETCH_HEAD, MERGE_HEAD and others are be transitory and never served as the

[PATCH] diff: mark some file local symbols as static

Signed-off-by: Ramsay Jones --- Hi Stefan, If you need to re-roll your 'sb/diff-color-move' branch, could you please squash this into to the relevant patches. (Each hunk would be squashed into a separate commit, thus: - commit 9b68d54c11, "diff: buffer all output

Re: [PATCH] name-rev: use larger timestamp for is_better_name

Ramsay Jones writes: > I test on 32-bit Linux from time to time, and tonight's 'pu' > branch fails t4202.44, t6007.2,5-6,12-13,16, t6012.2-11, > t6111.2-65. I bisected the t4202 failure to a merge commit > (99d31e1378, merge branch 'jc/name-rev-lw-tag') and I spotted

Re: [PATCHv2 12/20] submodule.c: convert show_submodule_summary to use emit_line_fmt

On Fri, May 19, 2017 at 9:50 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> That could be added in ws.c:ws_check_emit, as these certain words >> are similar to coloring whitespace. > > I actually was envisioning of highlighting a part of a line,

[PATCH v3 25/30] grep: move is_fixed() earlier to avoid forward declaration

Move the is_fixed() function which are currently only used in compile_regexp() earlier so it can be used in the PCRE family of functions in a later change. Signed-off-by: Ævar Arnfjörð Bjarmason --- grep.c | 24 1 file changed, 12 insertions(+), 12

[PATCH v3 27/30] pack-objects & index-pack: add test for --threads warning

Add a test for the warning that's emitted when --threads or pack.threads is provided under NO_PTHREADS=YesPlease. This uses the new PTHREADS prerequisite. The assertion for C_LOCALE_OUTPUT in the latter test is currently redundant, since unlike index-pack the pack-objects warnings aren't i18n'd.

[PATCH v3 10/30] grep: amend submodule recursion test for regex engine testing

Amend the submodule recursion test to prepare it for subsequent tests of whether it passes along the grep.patternType to the submodule greps. This is the result of searching & replacing: foobar -> (1|2)d(3|4) foo-> (1|2) bar-> (3|4) Currently there's no tests for whether

[PATCH v3 13/30] grep: prepare for testing binary regexes containing rx metacharacters

Add setup code needed for testing regexes that contain both binary data and regex metacharacters. The POSIX regcomp() function inherently can't support that, because it takes a \0-delimited char *, but other regex engines APIs like PCRE v2 take a pattern/length pair, and are thus able to handle

[PATCH v3 09/30] grep: add tests for --threads=N and grep.threads

Add tests for --threads=N being supplied on the command-line, or when grep.threads=N being supplied in the configuration. When the threading support was made run-time configurable in commit 89f09dd34e ("grep: add --threads= option and grep.threads configuration", 2015-12-15) no tests were added

[PATCH v3 15/30] perf: add a GIT_PERF_MAKE_COMMAND for when *_MAKE_OPTS won't do

Add a git GIT_PERF_MAKE_COMMAND variable to compliment the existing GIT_PERF_MAKE_OPTS facility. This allows specifying an arbitrary shell command to execute instead of 'make'. This is useful e.g. in cases where the name, semantics or defaults of a Makefile flag have changed over time. It can

[PATCH v3 18/30] perf: add a comparison test of grep regex engines with -F

Add a performance comparison test which compares both case-sensitive & case-insensitive fixed-string grep, as well as non-ASCII case-sensitive & case-insensitive grep. $ GIT_PERF_REPEAT_COUNT=10 GIT_PERF_LARGE_REPO=~/g/linux ./run p7821-grep-engines-fixed.sh [...] Test

[PATCH v3 16/30] perf: emit progress output when unpacking & building

Amend the t/perf/run output so that in addition to the "Running N tests" heading currently being emitted, it also emits "Unpacking $rev" and "Building $rev" when setting up the build/$rev directory & when building it, respectively. This makes it easier to see what's going on and what revision is

[PATCH v3 11/30] grep: add tests for grep pattern types being passed to submodules

Add testing for grep pattern types being correctly passed to submodules. The pattern "(.|.)[\d]" matches differently under fixed (not at all), and then matches different lines under basic/extended & perl regular expressions, so this change asserts that the pattern type is passed along correctly.

[PATCH v3 23/30] grep: change the internal PCRE macro names to be PCRE1

Change the internal USE_LIBPCRE define, & build options flag to use a naming convention ending in PCRE1, without changing the long-standing USE_LIBPCRE Makefile flag which enables this code. This is for preparation for libpcre2 support where having things like USE_LIBPCRE and USE_LIBPCRE2 in any

[PATCH v3 29/30] grep: given --threads with NO_PTHREADS=YesPlease, warn

Add a warning about missing thread support when grep.threads or --threads is set to a non 0 (default) or 1 (no parallelism) value under NO_PTHREADS=YesPlease. This is for consistency with the index-pack & pack-objects commands, which also take a --threads option & are configurable via

[PATCH v3 30/30] grep: assert that threading is enabled when calling grep_{lock,unlock}

Change the grep_{lock,unlock} functions to assert that num_threads is true, instead of only locking & unlocking the pthread mutex lock when it is. These functions are never called when num_threads isn't true, this logic has gone through multiple iterations since the initial introduction of grep

[PATCH v3 22/30] grep: factor test for \0 in grep patterns into a function

Factor the test for \0 in grep patterns into a function. Since commit 9eceddeec6 ("Use kwset in grep", 2011-08-21) any pattern containing a \0 is considered fixed as regcomp() can't handle it. This change makes later changes that make use of either has_null() or is_fixed() (but not both) smaller.

[PATCH v3 26/30] test-lib: add a PTHREADS prerequisite

Add a PTHREADS prerequisite which is false when git is compiled with NO_PTHREADS=YesPlease. There's lots of custom code that runs when threading isn't available, but before this prerequisite there was no way to test it. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile

[PATCH v3 21/30] grep: remove redundant regflags assignments

Remove redundant assignments to the "regflags" variable. This variable is only used set under GREP_PATTERN_TYPE_ERE, so there's no need to un-set it under GREP_PATTERN_TYPE_{FIXED,BRE,PCRE}. Back in 5010cb5fcc[1], we did do "opt.regflags &= ~REG_EXTENDED" upon seeing "-G" on the command line and

[PATCH v3 20/30] grep: catch a missing enum in switch statement

Add a die(...) to a default case for the switch statement selecting between grep pattern types under --recurse-submodules. Normally this would be caught by -Wswitch, but the grep_pattern_type type is converted to int by going through parse_options(). Changing the argument type passed to

[PATCH v3 17/30] perf: add a comparison test of grep regex engines

Add a very basic performance comparison test comparing the POSIX basic, extended and perl engines. In theory the "basic" and "extended" engines should be implemented using the same underlying code with a slightly different pattern parser, but some implementations may not do this. Jump through

[PATCH v3 19/30] perf: add a comparison test of log --grep regex engines

Add a very basic performance comparison test comparing the POSIX basic, extended and perl engines with patterns matching log messages via --grep=. $ GIT_PERF_REPEAT_COUNT=10 GIT_PERF_LARGE_REPO=~/g/linux ./run p4220-log-grep-engines.sh [...] Test

[PATCH v3 28/30] pack-objects: fix buggy warning about threads

Fix a buggy warning about threads under NO_PTHREADS=YesPlease. Due to re-using the delta_search_threads variable for both the state of the "pack.threads" config & the --threads option, setting "pack.threads" but not supplying --threads would trigger the warning for both "pack.threads" & --threads.

[PATCH v3 24/30] grep: change internal *pcre* variable & function names to be *pcre1*

Change the internal PCRE variable & function names to have a "1" suffix. This is for preparation for libpcre2 support, where having non-versioned names would be confusing. An earlier change in this series ("grep: change the internal PCRE macro names to be PCRE1", 2017-04-07) elaborates on the

[PATCH v3 06/30] grep: add a test asserting that --perl-regexp dies when !PCRE

Add a test asserting that when --perl-regexp (and -P for grep) is given to git-grep & git-log that we die with an error. In developing the PCRE v2 series I introduced a regression where -P would (through control-flow fall-through) become synonymous with basic POSIX matching. I.e. 'git grep -P

[PATCH v3 00/30] Easy to review grep & pre-PCRE changes

Easy to review? 29 (I mean 30) patches? Are you kidding me?! As noted in v1 (<20170511091829.5634-1-ava...@gmail.com>; https://public-inbox.org/git/20170511091829.5634-1-ava...@gmail.com/) these are all doc, test, refactoring etc. changes needed by the subsequent "PCRE v2, PCRE v1 JIT, log -P &

[PATCH v3 03/30] test-lib: rename the LIBPCRE prerequisite to PCRE

Rename the LIBPCRE prerequisite to PCRE. This is for preparation for libpcre2 support, where having just "LIBPCRE" would be confusing as it implies v1 of the library. None of these tests are incompatible between versions 1 & 2 of libpcre, it's less confusing to give them a more general name to

[PATCH v3 04/30] log: add exhaustive tests for pattern style options & config

Add exhaustive tests for how the different grep.patternType options & the corresponding command-line options affect git-log. Before this change it was possible to patch revision.c so that the --basic-regexp option was synonymous with --extended-regexp, and --perl-regexp wasn't recognized at all,

[PATCH v3 08/30] grep: change non-ASCII -i test to stop using --debug

Change a non-ASCII case-insensitive test case to stop using --debug, and instead simply test for the expected results. The test coverage remains the same with this change, but the test won't break due to internal refactoring. This test was added in commit 793dc676e0 ("grep/icase: avoid kwsset

[PATCH v3 12/30] grep: add a test helper function for less verbose -f \0 tests

Add a helper function to make the tests which check for patterns with \0 in them more succinct. Right now this isn't a big win, but subsequent commits will add a lot more of these tests. The helper is based on the match() function in t3070-wildmatch.sh. Signed-off-by: Ævar Arnfjörð Bjarmason

[PATCH v3 02/30] grep & rev-list doc: stop promising libpcre for --perl-regexp

Stop promising in our grep & rev-list options documentation that we're always going to be using libpcre when given the --perl-regexp option. Instead talk about using "Perl-compatible regular expressions" and using these types of patterns using "a compile-time dependency". Saying "libpcre" means

[PATCH v3 07/30] grep: add a test for backreferences in PCRE patterns

Add a test for backreferences such as (.)\1 in PCRE patterns. This test ensures that the PCRE_NO_AUTO_CAPTURE option isn't turned on. Before this change turning it on would break these sort of patterns, but wouldn't break any tests. Signed-off-by: Ævar Arnfjörð Bjarmason ---

[PATCH v3 05/30] log: make --regexp-ignore-case work with --perl-regexp

Make the --regexp-ignore-case option work with --perl-regexp. This never worked, and there was no test for this. Fix the bug and add a test. When PCRE support was added in commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09) compile_pcre_regexp() would only check opt->ignore_case, but when the

[PATCH v3 01/30] Makefile & configure: reword inaccurate comment about PCRE

Reword an outdated & inaccurate comment which suggests that only git-grep can use PCRE. This comment was added back when PCRE support was initially added in commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09), and was true at the time. It hasn't been telling the full truth since git-log

Re: [WIP/RFC 00/23] repository object

On Thu, May 18, 2017 at 4:21 PM, Brandon Williams wrote: > This is still very much in a WIP state, though it does pass all tests. What > I'm hoping for here is to get a discussion started about the feasibility of a > change like this and hopefully to get the ball rolling. Is

Re: [WIP/RFC 18/23] repo: add index_state to struct repo

> int > +repo_read_index(struct repo *repo, const char *index_file) ... > + > +int > repo_init(struct repo *repo, const char *gitdir, const char *worktree) The version 2.13.0.303.g4ebf302169-goog doesn't have diff slider heuristics on by default, and you also did not enable it? (I am curious if

Re: [WIP/RFC 17/23] repo: introduce new repository object

On Thu, May 18, 2017 at 4:21 PM, Brandon Williams wrote: > Introduce 'struct repo' an object used to represent a repository. Is this the right place to outline what you expect from a repo object? Are you planning to use it everywhere? Is it lazy-init'd and it takes care of it

Re: [PATCH] name-rev: use larger timestamp for is_better_name

On 20/05/17 21:36, Eric Wong wrote: > This fixes t4202 for me at "44 - log --graph with full output" > on 32-bit x86. > > Signed-off-by: Eric Wong > --- > This is for pu, I'm still using the machine I used git with in 2005 :) > > builtin/name-rev.c | 2 +- > 1 file changed,

[PATCH] name-rev: use larger timestamp for is_better_name

This fixes t4202 for me at "44 - log --graph with full output" on 32-bit x86. Signed-off-by: Eric Wong --- This is for pu, I'm still using the machine I used git with in 2005 :) builtin/name-rev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Loan Offer

Contact us for personal and business loan today, we can be of assistance regarding financial help. Kindly write back to us via company email: (actionfinancia...@gmail.com) if you are interested. --- This email has been checked for viruses by Avast antivirus software.

Re: [PATCH] mingw: simplify PATH handling

Am 20.05.2017 um 19:00 schrieb Johannes Sixt: Am 20.05.2017 um 17:29 schrieb René Scharfe: -static char *path_lookup(const char *cmd, char **path, int exe_only) +static char *path_lookup(const char *cmd, int exe_only) { +const char *path; char *prog = NULL; int len =

[PATCH v2] mingw: simplify PATH handling

On Windows the environment variable PATH contains a semicolon-separated list of directories to search for, in order, when looking for the location of a binary to run. get_path_split() parses it and returns an array of string copies, which is iterated by path_lookup(), which in turn passes each

Re: [PATCH v2 1/2] refs: Add for_each_worktree_ref for iterating over all worktree HEADs

Yes, you are right (on both counts). One thing which I think hasn't been covered yet is the rebase ORIG_HEAD. I'll see if that's still a problem on `pu` and make a patch for it if so. (I recall `git prune` during a rebase messing up repo state, though it's really my fault for trying that in the

Re: [PATCH] mingw: simplify PATH handling

Am 20.05.2017 um 17:29 schrieb René Scharfe: -static char *path_lookup(const char *cmd, char **path, int exe_only) +static char *path_lookup(const char *cmd, int exe_only) { + const char *path; char *prog = NULL; int len = strlen(cmd); int isexe = len >= 4 &&

Re: [PATCH v2 4/6] fsmonitor: add test cases for fsmonitor extension

> diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh > new file mode 100755 > index 00..d3cffc758f > --- /dev/null > +++ b/t/t7519-status-fsmonitor.sh > @@ -0,0 +1,153 @@ > +#!/bin/sh > + > +test_description='git status with file system watcher' > + > +. ./test-lib.sh >

[PATCH] mingw: simplify PATH handling

On Windows the environment variable PATH contains a semicolon-separated list of directories to search for, in order, when looking for the location of a binary to run. get_path_split() parses it and returns an array of string copies, which is iterated by path_lookup(), which in turn passes each

Re: [PATCH 01/15] handle_revision_arg: reset "dotdot" consistently

From: "Jeff King" When we are parsing a range like "a..b", we write a temporary NUL over the first ".", so that we can access the names "a" and "b" as C strings. But our restoration of the original "." is done at inconsistent times, which can lead to confusing results. For most

Can You Handle This Project

I Am: Mr.Kaba Djibril Attention Please, This Message Might Meet You In Utmost Suprise. However It's Just My Urgent Need For A Foreign Partner That Made Me Contact You For This Transaction. I Am A Banker By Profession From Guinea Conakry In West Africa And Currently Holding The Post Of Director

Re: [PATCH v2 5/6] fsmonitor: add documentation for the fsmonitor extension.

On Thu, May 18, 2017 at 10:13 PM, Ben Peart wrote: > This includes the core.fsmonitor setting, the query-fsmonitor hook, > and the fsmonitor index extension. > > Signed-off-by: Ben Peart > --- > Documentation/config.txt | 7 +++ >

[PATCH v2 2/2] sha1dc: optionally use sha1collisiondetection as a submodule

Add an option to use the sha1collisiondetection library from the submodule in sha1collisiondetection/ instead of in the copy in the sha1dc/ directory. This allows us to try out the submodule in sha1collisiondetection without breaking the build for anyone who's not expecting them as we work out

[PATCH v2 0/2] Update sha1dc from upstream & optionally make it a submodule

On Sat, May 20, 2017 at 1:13 PM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> Replace the forked sha1dc directory with a copy of the upstream code >> imported as a submodule. This is the exact same code as now exists in >> the sha1dc/

[PATCH v2 1/2] sha1dc: update from upstream

Update sha1dc from the latest version by the upstream maintainer[1]. This version includes a commit of mine which allows for replacing the local modifications done to the upstream files in git.git with macro definitions to monkeypatch it in place. It also brings in a change[2] upstream made for

Re: [PATCH v2 5/6] fsmonitor: add documentation for the fsmonitor extension.

Ben Peart writes: > diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt > index 706091a569..f7b4b4a844 100644 > --- a/Documentation/githooks.txt > +++ b/Documentation/githooks.txt > @@ -448,6 +448,29 @@ The commits are guaranteed to be listed in the order >

Re: [PATCH 2/3] sha1dc: use sha1collisiondetection as a submodule

Ævar Arnfjörð Bjarmason writes: > Replace the forked sha1dc directory with a copy of the upstream code > imported as a submodule. This is the exact same code as now exists in > the sha1dc/ directory. > > The initial reason for copy/pasting the code into sha1dc and locally >

Re: [PATCH v2 3/6] fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files.

Ben Peart writes: > After sending this, I noticed that using a different compiler > generated a couple of warnings I should fix. I'm assuming I'll need > another re-roll but if not, here are the changes that will be squashed > in. > > Ben Thanks, in addition, I am missing

Re: [PATCH v2 1/2] refs: Add for_each_worktree_ref for iterating over all worktree HEADs

manishea...@gmail.com writes: > +int for_each_worktree_ref(each_ref_fn fn, void *cb_data) > +{ > + int i, flag, retval = 0; > + struct object_id oid; > + struct worktree **worktrees = get_worktrees(GWT_SORT_LINKED); > + struct commit* commit; > + for (i = 0; worktrees[i]; i++)

[PATCH] revision.c: ignore broken tags with ignore_missing_links

When peeling a tag for prepare_revision_walk(), we do not respect the ignore_missing_links flag. This can lead to a bogus error when pack-objects walks the possibly-broken unreachable-but-recent part of the object graph. The other link-following all happens via traverse_commit_list(), which

Re: die("bad object.. for duplicate tagged tag in remote

On Fri, May 19, 2017 at 06:28:56PM +0100, Chris West wrote: > If you have an annotated tag of an annotated tag, and `remote update` > elects not to fetch this tag (perhaps because it has a name collision > locally), then the repo ends up corrupt: you can't gc it, but fsck > doesn't notice. > >

Re: [PATCH v2] send-email: Net::SMTP::SSL is obsolete, use only when necessary

On Fri, May 19, 2017 at 10:54 PM, Dennis Kaarsemaker wrote: > Second ping. This problem is not going away, so if this solution is not > acceptable, I'd like to know what needs to be improved. FWIW: Reviewed-by: Ævar Arnfjörð Bjarmason > On Thu,

Re: persistent-https, url insteadof, and `git submodule`

On Fri, May 19, 2017 at 11:55:34PM +0200, Dennis Kaarsemaker wrote: > > > Presumably this isn't intended behaviour? > > > > It actually is. git-submodule sets GIT_PROTOCOL_FROM_USER to 0, which > > makes git not trust any urls except http(s), git, ssh and file urls > > unless you explicitely

Re: [PATCH] Remove useless assignments

On Sat, May 20, 2017 at 05:52:16AM +, Дилян Палаузов wrote: > Signed-off-by: Дилян Палаузов I assume this is just going through the results of clang's static analyzer and quieting it. I think most of these are not the right fix, though, as I discussed in

Re: [Bug] git branch -v has problems with carriage returns

Am 19.05.2017 um 23:55 schrieb Atousa Duprat: I have tried to repro this issue but git goes out of its way to store the commit messages using unix end-of-line format. I think that git itself cannot create a repo exhibiting this problem. Here is a recipe to reproduce the error: git init

[PATCH 0/2] Fix warnings on access of a remote with Windows paths

This small series fixes these warnings on Windows: C:\Temp\gittest>git fetch C:\Temp\gittest warning: unable to access '.git/remotes/C:\Temp\gittest': Invalid argument warning: unable to access '.git/branches/C:\Temp\gittest': Invalid argument >From C:\Temp\gittest * branchHEAD

[PATCH 2/2] Windows: do not treat a path with backslashes as a remote's nick name

Fetching from a remote using a native Windows path produces these warnings: C:\Temp\gittest>git fetch C:\Temp\gittest warning: unable to access '.git/remotes/C:\Temp\gittest': Invalid argument warning: unable to access '.git/branches/C:\Temp\gittest': Invalid argument >From C:\Temp\gittest *

[PATCH 1/2] mingw.h: permit arguments with side effects for is_dir_sep

The implementation of is_dir_sep in git-compat-util.h uses an inline function. Use one also for the implementation in compat/mingw.h to support non-trivial argument expressions. Signed-off-by: Johannes Sixt --- compat/mingw.h | 6 +- 1 file changed, 5 insertions(+), 1

[PATCH] Remove useless assignments

Signed-off-by: Дилян Палаузов diff --git a/archive.c b/archive.c index 60b889198..e2534d186 100644 --- a/archive.c +++ b/archive.c @@ -503,7 +503,7 @@ int write_archive(int argc, const char **argv, const char *prefix, init_tar_archiver(); init_zip_archiver();