Any interest in 'git merge --continue' as a command

I hit this at $dayjob recently. A developer had got themselves into a confused state when needing to resolve a merge conflict. They knew about git rebase --continue (and git am and git cherry-pick) but they were unsure how to "continue" a merge (it didn't help that the advice saying to use 'git

git bash error

Dear git support, My app is crashing whenever i launch the git bash tool. I am attaching the error log file from the event viewer. Can you please let me know what the issue is with it. https://www.dropbox.com/sh/mhkmjn8bmh3x1oh/AABUKmhnn-HW2Kv5UVxdckN6a?dl=0 Thanks Karamjeet

Re: [BUG] regarding `git add -p` and files containing wildcard characters

On Fri, Dec 09, 2016 at 04:46:49AM +0300, unixway.dr...@gmail.com wrote: > The problem is that `git-diff-files` does some globbing on the 'path' > arguments on its own and has no option to disable that (and > `git-add--interactive`'s `run_cmd_pipe` already handles all other sorts of > unsafe

[PATCH] commit: remove 'Clever' message for --only --amend

That behavior is now documented, and we don't need a reward afterwards. Signed-off-by: Andreas Krey --- > Sorry for making you send an extra round; let's queue the original, > and if you still are interested, have the "Clever" removal as its > own patch. Here you go.

Re: [PATCH v2 1/4] real_path: resolve symlinks by hand

On Thu, Dec 8, 2016 at 3:58 PM, Brandon Williams wrote: > The current implementation of real_path uses chdir() in order to resolve > symlinks. Unfortunately this isn't thread-safe as chdir() affects a > process as a whole and not just an individual thread. Instead perform >

[BUG] regarding `git add -p` and files containing wildcard characters

`git add -p` behaves incorrectly if modified file contains any wildcard character. Consider 'random.diff' (attached). For this, interactive 'add' would first ask to add hunk with two diff headers (or with some "random" header at the end): $ git add -p diff --git a/Random * b/Random *

Re: [PATCH v8 00/19] port branch.c to use ref-filter's printing options

On Thu, Dec 8, 2016 at 10:58 AM, Junio C Hamano wrote: > > *1* A malformed formatting request (e.g. %(if) that is not closed) > cannot be satisified but that is true for all refs and is > outside of the scope of this discussion. The command should die > and I think

Re: [PATCH v2 14/16] pathspec: create strip submodule slash helpers

Brandon Williams writes: > +static void strip_submodule_slash_cheap(struct pathspec_item *item) > +{ > + int i; > + > + if ((item->len >= 1 && item->match[item->len - 1] == '/') && > + (i = cache_name_pos(item->match, item->len - 1)) >= 0 && > +

Re: [PATCH v2 00/16] pathspec cleanup

Will queue, but with fixes on issues spotted by my pre-acceptance mechanical filter squashed in, to fix style issues in the destination of code movements. pathspec.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pathspec.c b/pathspec.c index

Re: [PATCH v4] diff: handle --no-abbrev in no-index case

On 08/12/16 03:53 PM, Junio C Hamano wrote: Jack Bates writes: @@ -3364,6 +3365,7 @@ void diff_setup(struct diff_options *options) options->file = stdout; + options->abbrev = DEFAULT_ABBREV; This is a new change relative to your earlier one. I looked

[PATCH v2 3/4] real_path: create real_pathdup

Create real_pathdup which returns a caller owned string of the resolved realpath based on the provide path. Signed-off-by: Brandon Williams --- abspath.c | 13 + cache.h | 1 + 2 files changed, 14 insertions(+) diff --git a/abspath.c b/abspath.c index

[PATCH v2 4/4] real_path: have callers use real_pathdup and strbuf_realpath

Migrate callers of real_path() who duplicate the retern value to use real_pathdup or strbuf_realpath. Signed-off-by: Brandon Williams --- builtin/init-db.c | 6 +++--- environment.c | 2 +- setup.c | 15 +-- sha1_file.c | 2 +- submodule.c

Re: [PATCH v8 00/19] port branch.c to use ref-filter's printing options

Thanks. Will replace, with the attached stylistic fixes squashed in for minor issues that were spotted by my mechanical pre-acceptance filter. ref-filter.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git b/ref-filter.c a/ref-filter.c index a68ed7b147..a9d2c6a89d

[PATCH v2 1/4] real_path: resolve symlinks by hand

The current implementation of real_path uses chdir() in order to resolve symlinks. Unfortunately this isn't thread-safe as chdir() affects a process as a whole and not just an individual thread. Instead perform the symlink resolution by hand so that the calls to chdir() can be removed, making

[PATCH v2 0/4] road to reentrant real_path

Thanks for all of the comments on v1 of the series. Hopefully this series addresses the issues with windows and actually passes the first test :) Some changes in v2: * the 1st component of a path should now be handled correctly on windows as well as unix. * Pushed the static strbuf to the

[PATCH v2 2/4] real_path: convert real_path_internal to strbuf_realpath

Change the name of real_path_internal to strbuf_realpath. In addition push the static strbuf up to its callers and instead take as a parameter a pointer to a strbuf to use for the final result. This change makes strbuf_realpath reentrant. Signed-off-by: Brandon Williams ---

Re: [PATCH v4] diff: handle --no-abbrev in no-index case

Jack Bates writes: > There are two different places where the --no-abbrev option is parsed, > and two different places where SHA-1s are abbreviated. We normally parse > --no-abbrev with setup_revisions(), but in the no-index case, "git diff" > calls diff_opt_parse()

[PATCHv7 3/6] test-lib-functions.sh: teach test_commit -C

Specifically when setting up submodule tests, it comes in handy if we can create commits in repositories that are not at the root of the tested trash dir. Add "-C " similar to gits -C parameter that will perform the operation in the given directory. Signed-off-by: Stefan Beller

[PATCHv7 4/6] worktree: have a function to check if worktrees are in use

In a later patch we want to move around the the git directory of a submodule. Both submodules as well as worktrees are involved in placing git directories at unusual places, so their functionality may collide. To react appropriately to situations where worktrees in submodules are in use, offer a

[PATCHv7 5/6] move connect_work_tree_and_git_dir to dir.h

That function was primarily used by submodule code, but the function itself is not inherently about submodules. In the next patch we'll introduce relocate_git_dir, which can be used by worktrees as well, so find a neutral middle ground in dir.h. Signed-off-by: Stefan Beller

[PATCHv7 6/6] submodule: add absorb-git-dir function

When a submodule has its git dir inside the working dir, the submodule support for checkout that we plan to add in a later patch will fail. Add functionality to migrate the git directory to be absorbed into the superprojects git directory. The newly added code in this patch is structured such

[PATCHv7 0/6] submodule absorbgitdirs

v7: * do not expose submodule_get_worktrees. The values may be wrong internally, but for our purpose we do not care about the actual values, only the count. Document the wrong values! * more strings are _(marked up) * renamed variables in connect_work_tree_and_git_dir * unsigned instead of int

[PATCHv7 2/6] submodule helper: support super prefix

Just like main commands in Git, the submodule helper needs access to the superproject prefix. Enable this in the git.c but have its own fuse in the helper code by having a flag to turn on the super prefix. Signed-off-by: Stefan Beller --- builtin/submodule--helper.c | 31

[PATCHv7 1/6] submodule: use absolute path for computing relative path connecting

The current caller of connect_work_tree_and_git_dir passes an absolute path for the `git_dir` parameter. In the future patch we will also pass in relative path for `git_dir`. Extend the functionality of connect_work_tree_and_git_dir to take relative paths for parameters. We could work around this

Re: [PATCHv6 2/7] submodule helper: support super prefix

> > unsigned int is probably safer for variables that are used as bit-flags. done > If it's meant for users to see, please _() the string. done >> + { "submodule--helper", cmd_submodule__helper, RUN_SETUP | >> SUPPORT_SUPER_PREFIX}, > > The same macro defined twice in two separate .c

Feature request: read git config from parent directory

Hello I use the same machine for work and open-source contribution. In both cases, I deal with a lot of repositories. Depending on whether I commit for work or open-source activities, I must use a different mail address. I used to setup work address for each work repo in git local config, but

Re: [PATCHv2 7/7] versioncmp: generalize version sort suffix reordering

SZEDER Gábor writes: > The 'versionsort.prereleaseSuffix' configuration variable, as its name > suggests, is supposed to only deal with tagnames with prerelease > suffixes, and allows sorting those prerelease tags in a user-defined > order before the suffixless main release

Re: [PATCHv6 5/7] worktree: add function to check if worktrees are in use

On Thu, Dec 8, 2016 at 2:51 AM, Duy Nguyen wrote: > On Thu, Dec 8, 2016 at 5:40 PM, Duy Nguyen wrote: >> Alternatively, we could add a new flag to get_worktrees() to tell it >> to return all worktrees if there is a least one linked worktree, or >> return

Re: [PATCH 4/5] Make sequencer abort safer

Hi, I'm a little afraid of feeding Parkinson's law of triviality here, but... ;) On 12/08/2016 06:27 PM, Junio C Hamano wrote: > Johannes Schindelin writes: > >> On Wed, 7 Dec 2016, Stephan Beyer wrote: >> >>> diff --git a/sequencer.c b/sequencer.c >>> index

[PATCH v2 07/16] pathspec: remove unused variable from unsupported_magic

Removed unused variable 'n' from the 'unsupported_magic()' function. Signed-off-by: Brandon Williams --- pathspec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pathspec.c b/pathspec.c index 8f367f0..ec0d590 100644 --- a/pathspec.c +++ b/pathspec.c

Re: [PATCH] real_path: make real_path thread-safe

On 12/08, Johannes Sixt wrote: > Am 08.12.2016 um 08:55 schrieb Torsten Bögershausen: > >Some conversion may be done in mingw.c: > >https://github.com/github/git-msysgit/blob/master/compat/mingw.c > >So what I understand, '/' in Git are already converted into '\' if needed ? > > Only if needed,

[PATCH v2 05/16] pathspec: remove the deprecated get_pathspec function

Now that all callers of the old 'get_pathspec' interface have been migrated to use the new pathspec struct interface it can be removed from the codebase. Since there are no more users of the '_raw' field in the pathspec struct it can also be removed. This patch also removes the old functionality

[PATCH v2 08/16] pathspec: always show mnemonic and name in unsupported_magic

For better clarity, always show the mnemonic and name of the unsupported magic being used. This lets users have a more clear understanding of what magic feature isn't supported. And if they supplied a mnemonic, the user will be told what its corresponding name is which will allow them to more

[PATCH v2 15/16] pathspec: small readability changes

A few small changes to improve readability. This is done by grouping related assignments, adding blank lines, ensuring lines are <80 characters, and adding additional comments. Signed-off-by: Brandon Williams --- pathspec.c | 15 ++- 1 file changed, 10

[PATCH v2 04/16] ls-tree: convert show_recursive to use the pathspec struct interface

Convert 'show_recursive()' to use the pathspec struct interface from using the '_raw' entry in the pathspec struct. Signed-off-by: Brandon Williams --- builtin/ls-tree.c | 16 +++- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/builtin/ls-tree.c

[PATCH v2 14/16] pathspec: create strip submodule slash helpers

Factor out the logic responsible for stripping the trailing slash on pathspecs referencing submodules into its own function. Signed-off-by: Brandon Williams --- pathspec.c | 68 ++ 1 file changed, 42 insertions(+),

[PATCH v2 13/16] pathspec: create parse_element_magic helper

Factor out the logic responsible for the magic in a pathspec element into its own function. Also avoid calling into the parsing functions when `PATHSPEC_LITERAL_PATH` is specified since it causes magic to be ignored and all paths to be treated as literals. Signed-off-by: Brandon Williams

[PATCH v2 16/16] pathspec: rename prefix_pathspec to init_pathspec_item

Give a more relevant name to the prefix_pathspec function as it does more than just prefix a pathspec element. Signed-off-by: Brandon Williams --- pathspec.c | 24 +++- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/pathspec.c b/pathspec.c

[PATCH v2 12/16] pathspec: create parse_long_magic function

Factor out the logic responsible for parsing long magic into its own function. As well as hoist the prefix check logic outside of the inner loop as there isn't anything that needs to be done after matching "prefix:". Signed-off-by: Brandon Williams --- pathspec.c | 92

[PATCH v2 02/16] dir: convert create_simplify to use the pathspec struct interface

Convert 'create_simplify()' to use the pathspec struct interface from using the '_raw' entry in the pathspec. Signed-off-by: Brandon Williams --- dir.c | 25 - 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dir.c b/dir.c index

[PATCH v2 06/16] pathspec: copy and free owned memory

The 'original' string entry in a pathspec_item is only duplicated some of the time, instead always make a copy of the original and take ownership of the memory. Since both 'match' and 'original' string entries in a pathspec_item are owned by the pathspec struct, they need to be freed when

[PATCH v2 11/16] pathspec: create parse_short_magic function

Factor out the logic responsible for parsing short magic into its own function. Signed-off-by: Brandon Williams --- pathspec.c | 54 -- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/pathspec.c b/pathspec.c

[PATCH v2 10/16] pathspec: factor global magic into its own function

Create helper functions to read the global magic environment variables in additon to factoring out the global magic gathering logic into its own function. Signed-off-by: Brandon Williams --- pathspec.c | 127 + 1

[PATCH v2 03/16] dir: convert fill_directory to use the pathspec struct interface

Convert 'fill_directory()' to use the pathspec struct interface from using the '_raw' entry in the pathspec struct. Signed-off-by: Brandon Williams --- dir.c | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dir.c b/dir.c index 7df292b..a50b6f0

[PATCH v2 09/16] pathspec: simpler logic to prefix original pathspec elements

The logic used to prefix an original pathspec element with 'prefix' magic is more general purpose and can be used for more than just short magic. Remove the extra code paths and rename 'prefix_short_magic' to 'prefix_magic' to better indicate that it can be used in more general situations. Also,

[PATCH v2 00/16] pathspec cleanup

v2 of this series addresses the comments brought up in v1, most of which were small cosmetic changes (since this is mostly a cosmetic series to begin with). Brandon Williams (16): mv: remove use of deprecated 'get_pathspec()' dir: convert create_simplify to use the pathspec struct interface

[PATCH v2 01/16] mv: remove use of deprecated 'get_pathspec()'

Convert the 'internal_copy_pathspec()' function to 'prefix_path()' instead of using the deprecated 'get_pathspec()' interface. Also, rename 'internal_copy_pathspec()' to 'internal_prefix_pathspec()' to be more descriptive of what the funciton is actually doing. In addition to this, fix a memory

Re: [PATCH 2/2] ref-filter: add function to parse atoms from a nul-terminated string

On Wed, Dec 7, 2016 at 5:09 PM, SZEDER Gábor wrote: > ref-filter's parse_ref_filter_atom() function parses an atom between > the start and end pointers it gets as arguments. This is fine for two > of its callers, which process '%(atom)' format specifiers and the end >

Re: [PATCH v8 00/19] port branch.c to use ref-filter's printing options

Jacob Keller writes: >> + are left behind. If a displayed ref has fewer components than >> + ``, the command aborts with an error. >> > > Would it make more sense to not die and instead just return the empty > string? On the one hand, if we die() it's obvious

Re: [PATCHv6 4/7] worktree: get worktrees from submodules

On Thu, Dec 8, 2016 at 2:09 AM, Duy Nguyen wrote: > On Thu, Dec 8, 2016 at 8:46 AM, Stefan Beller wrote: >> >> worktree = xcalloc(1, sizeof(*worktree)); >> worktree->path = strbuf_detach(_path, NULL); >> @@ -101,7 +101,8 @@ static struct

Re: [PATCH] submodule--helper: set alternateLocation for cloned submodules

On Thu, Dec 08, 2016 at 09:04:46PM +0300, vi0oss wrote: > Why Git test use &&-chains instead of proper "set -e"? Because "set -e" comes with all kinds of confusing corner cases. Using && chains is annoying, but rarely surprising. One of my favorite examples is: set -e ( false echo

Re: [PATCH] real_path: make real_path thread-safe

Am 08.12.2016 um 08:55 schrieb Torsten Bögershausen: Some conversion may be done in mingw.c: https://github.com/github/git-msysgit/blob/master/compat/mingw.c So what I understand, '/' in Git are already converted into '\' if needed ? Only if needed, and there are not many places where this is

Re: [PATCH 02/17] dir: convert create_simplify to use the pathspec struct interface

On 12/08, Duy Nguyen wrote: > On Thu, Dec 8, 2016 at 7:03 AM, Brandon Williams wrote: > > On 12/07, Duy Nguyen wrote: > >> On Wed, Dec 7, 2016 at 4:51 AM, Brandon Williams wrote: > >> > Convert 'create_simplify()' to use the pathspec struct interface from >

Re: [PATCH 3/3] lockfile: LOCK_REPORT_ON_ERROR

Johannes Schindelin writes: > Sorry for the breakage. Apologies from me, too. Once a topic is merged, the credit still remains with the contributor, but the blame is shared by the project as a whole, with those who missed breakages during their reviews, and those

Re: [PATCH] submodule--helper: set alternateLocation for cloned submodules

On Thu, Dec 8, 2016 at 10:04 AM, vi0oss wrote: > On 12/08/2016 08:46 PM, Jeff King wrote: >> >> On Wed, Dec 07, 2016 at 05:22:30PM -0800, Stefan Beller wrote: >> >>> On Wed, Dec 7, 2016 at 4:39 PM, wrote: >>> Previously test contained errorneous

Re: [PATCH 3/3] lockfile: LOCK_REPORT_ON_ERROR

Thanks all for taking a look at this, I didn't expect such a quick response :). No hard feelings re: breakage; I know how gnarly these sorts of refactors can be (and more libification is always better :)). Robbie On Thu, Dec 8, 2016 at 3:53 AM, Johannes Schindelin

Re: [PATCH 01/17] mv: convert to using pathspec struct interface

On 12/08, Duy Nguyen wrote: > On Thu, Dec 8, 2016 at 7:36 AM, Brandon Williams wrote: > >> > @@ -25,25 +26,43 @@ static const char **internal_copy_pathspec(const > >> > char *prefix, > >> > { > >> > int i; > >> > const char **result; > >> > + struct

Re: [PATCH] submodule--helper: set alternateLocation for cloned submodules

On 12/08/2016 08:46 PM, Jeff King wrote: On Wed, Dec 07, 2016 at 05:22:30PM -0800, Stefan Beller wrote: On Wed, Dec 7, 2016 at 4:39 PM, wrote: Previously test contained errorneous test_must_fail, which was masked by missing &&. I wonder if we could make

Re: [PATCH] submodule--helper: set alternateLocation for cloned submodules

On Thu, Dec 8, 2016 at 9:46 AM, Jeff King wrote: > > will both trigger on the &&-chain linter, because it uses a magic exit > code to detect the breakage. I think the problem is just that the > &&-chain linter cannot peek inside subshells, and that's where the bug > was in this

Re: [PATCH 1/3] wt-status: implement opportunisitc index update correctly

Paul Tan writes: > Hmm, to add on, looking at the three other call sites of this > function, two of them (builtin/commit.c and builtin/describe.c) > basically do: > > if (0 <= fd) > update_index_if_able(...) > > with that 0 <= fd conditional. With this patch it

Re: [PATCH] real_path: make real_path thread-safe

On 12/08, Duy Nguyen wrote: > On Tue, Dec 6, 2016 at 3:16 AM, Brandon Williams wrote: > > On 12/05, Stefan Beller wrote: > >> > static const char *real_path_internal(const char *path, int > >> > die_on_error) > >> > { > >> > - static struct strbuf sb = STRBUF_INIT; >

Re: [PATCH] submodule--helper: set alternateLocation for cloned submodules

On Wed, Dec 07, 2016 at 05:22:30PM -0800, Stefan Beller wrote: > On Wed, Dec 7, 2016 at 4:39 PM, wrote: > > > > > Previously test contained errorneous > > test_must_fail, which was masked by > > missing &&. > > I wonder if we could make either > the

Re: [PATCH 4/5] Make sequencer abort safer

Johannes Schindelin writes: > On Wed, 7 Dec 2016, Stephan Beyer wrote: > >> diff --git a/sequencer.c b/sequencer.c >> index 30b10ba14..c9b560ac1 100644 >> --- a/sequencer.c >> +++ b/sequencer.c >> @@ -27,6 +27,7 @@ GIT_PATH_FUNC(git_path_seq_dir, "sequencer") >>

Re: [PATCH/RFC 0/7] Pie-in-the-sky attempt to fix the early config

On Thu, Dec 08, 2016 at 04:35:56PM +0100, Johannes Schindelin wrote: > The idea here is to discover the .git/ directory gently (i.e. without > changing the current working directory), and to use it to read the > .git/config file early, before we actually called setup_git_directory() > (if we ever

Re: [PATCH] real_path: make real_path thread-safe

Johannes Sixt writes: > Am 07.12.2016 um 23:29 schrieb Brandon Williams: >> Instead of assuming root is "/" >> I'll need to extract what root is from an absolute path. Aside from >> what root looks like, do most other path constructs behave similarly in >> unix and windows? (like

Re: [PATCH v2] commit: make --only --allow-empty work without paths

Andreas Krey writes: > Ok, I've removed the clever message, as Junio suggested. > I don't know what else to do to make it acceptable. :-) > We're going to deploy it internally anyway, but I think > it belongs in git.git as well (aka 'Can I has "will queue"?'). Oh, sorry for being

[PATCH/RFC 7/7] WIP: read_early_config(): add tests

Signed-off-by: Johannes Schindelin --- t/helper/test-config.c | 15 +++ t/t1309-early-config.sh | 50 + 2 files changed, 65 insertions(+) create mode 100755 t/t1309-early-config.sh diff --git

Re: Serious bug with Git-2.11.0-64-bit and Git-LFS

On 8 December 2016 at 14:18, Lars Schneider wrote: > >> On 08 Dec 2016, at 15:00, Nick Warr wrote: >> >> That looks pretty much like the error we're dealing with, any reason >> why going back a point version on Git (not git-lfs) would resolve

[PATCH/RFC 6/7] WIP read_config_early(): respect ceiling directories

This ports the part from setup_git_directory_gently_1() where the GIT_CEILING_DIRECTORIES environment variable is handled. TODO: DRY up code again (exporting canonicalize_ceiling_directories()?) Signed-off-by: Johannes Schindelin --- config.c | 56

[PATCH/RFC 2/7] read_early_config(): avoid .git/config hack when unneeded

So far, we only look whether the startup_info claims to have seen a git_dir. However, do_git_config_sequence() (and consequently the git_config_with_options() call used by read_early_config() asks the have_git_dir() function whether we have a .git/ directory, which in turn also looks at git_dir

[PATCH/RFC 4/7] read_early_config(): special-case `init` and `clone`

The `init` and `clone` commands create their own .git/ directory, therefore we must be careful not to read any repository config when determining the pager settings. Signed-off-by: Johannes Schindelin --- builtin/am.c| 2 +- builtin/blame.c | 2 +-

[PATCH/RFC 0/7] Pie-in-the-sky attempt to fix the early config

Hopefully these patches will lead to something that we can integrate, and that eventually will make Git's startup sequence much less surprising. The idea here is to discover the .git/ directory gently (i.e. without changing the current working directory), and to use it to read the .git/config

[PATCH/RFC 1/7] Make read_early_config() reusable

The pager configuration needs to be read early, possibly before discovering any .git/ directory. Let's not hide this function in pager.c, but make it available to other callers. Signed-off-by: Johannes Schindelin --- cache.h | 1 + config.c | 31

[PATCH/RFC 5/7] read_early_config(): really discover .git/

Earlier, we punted and simply assumed that we are in the top-level directory of the project, and that there is no .git file but a .git/ directory so that we can read directly from .git/config. Let's discover the .git/ directory correctly. Signed-off-by: Johannes Schindelin

[PATCH/RFC 3/7] Mark builtins that create .git/ directories

To refactor read_early_config() so that it discovers .git/config properly, we have to make certain that commands such as `git init` (i.e. commands that create their own .git/ and therefore do *not* want to be affected by any other .git/ directory) skip this discovery. Let's introduce a flag that

Re: [PATCH 4/5] Make sequencer abort safer

Hi, On Wed, 7 Dec 2016, Stephan Beyer wrote: > diff --git a/sequencer.c b/sequencer.c > index 30b10ba14..c9b560ac1 100644 > --- a/sequencer.c > +++ b/sequencer.c > @@ -27,6 +27,7 @@ GIT_PATH_FUNC(git_path_seq_dir, "sequencer") > static GIT_PATH_FUNC(git_path_todo_file, "sequencer/todo") >

[PATCHv2 6.5/7] squash! versioncmp: use earliest-longest contained suffix to determine sorting order

As the number of identical steps to be done for both tagnames grows, extract them into a helper function, with the additional benefit that the conditionals near the end of swap_prereleases() will use more meaningful variable names. Signed-off-by: SZEDER Gábor --- I was not

[REGRESSION 2.10.2] problematic "empty auth" changes

Hi Dave, I got a couple of bug reports that claim that 2.10.2 regressed on using network credentials. That is, users regularly hit Enter twice when being asked for user name and password while fetching via https://, and cURL automatically used to fall back to using the login credentials (i.e.

Re: Serious bug with Git-2.11.0-64-bit and Git-LFS

> On 08 Dec 2016, at 15:00, Nick Warr wrote: > > That looks pretty much like the error we're dealing with, any reason > why going back a point version on Git (not git-lfs) would resolve the > issue however? Going back to GitLFS 1.4.* would make the error disappear.

[PATCHv2 5/7] versioncmp: cope with common part overlapping with prerelease suffix

Version sort with prerelease reordering sometimes puts tagnames in the wrong order, when the common part of two compared tagnames overlaps with the leading character(s) of one or more configured prerelease suffixes. Note the position of "v2.1.0-beta-1": $ git -c

[PATCHv2 7/7] versioncmp: generalize version sort suffix reordering

The 'versionsort.prereleaseSuffix' configuration variable, as its name suggests, is supposed to only deal with tagnames with prerelease suffixes, and allows sorting those prerelease tags in a user-defined order before the suffixless main release tag, instead of sorting them simply

[PATCHv2 2/7] t7004-tag: use test_config helper

... instead of setting and then manually unsetting configuration variables, on one occasion even outside the test_expect_success block. Signed-off-by: SZEDER Gábor --- t/t7004-tag.sh | 23 ++- 1 file changed, 10 insertions(+), 13 deletions(-) diff

[PATCHv2 4/7] versioncmp: pass full tagnames to swap_prereleases()

The swap_prereleases() helper function is responsible for finding configured prerelease suffixes in a pair of tagnames to be compared, but this function currently gets to see only the parts of those two tagnames starting at the first different character. To fix some issues related to the common

[PATCHv2 6/7] versioncmp: use earliest-longest contained suffix to determine sorting order

When comparing tagnames, it is possible that a tagname contains more than one of the configured prerelease suffixes around the first different character. After fixing a bug in the previous commit such a tagname is sorted according to the contained suffix which comes first in the configuration.

[PATCHv2 0/7] Fix and generalize version sort reordering

> After having slept on this a couple of times After having slept on it a few (erm...) more times... > I think the longest > matching prerelease suffix should determine the sorting order. > > A release tag usually consists of an optional prefix, e.g. 'v' or > 'snapshot-', followed by the actual

[PATCHv2 3/7] t7004-tag: add version sort tests to show prerelease reordering issues

Version sort with prerelease reordering sometimes puts tagnames in the wrong order, when the common part of two compared tagnames ends with the leading character(s) of one or more configured prerelease suffixes. Add tests that demonstrate these issues. The unrelated '--format should list tags as

[PATCHv2 1/7] t7004-tag: delete unnecessary tags with test_when_finished

The '--force is moot with a non-existing tag name' test creates two new tags, which are then deleted right after the test is finished, outside the test_expect_success block, allowing 'git tag -d's output to pollute the test output. Use test_when_finished to delete those tags. Signed-off-by:

Re: Serious bug with Git-2.11.0-64-bit and Git-LFS

That looks pretty much like the error we're dealing with, any reason why going back a point version on Git (not git-lfs) would resolve the issue however? On 8 December 2016 at 13:57, Lars Schneider wrote: > >> On 08 Dec 2016, at 12:46, Nick Warr

Re: Serious bug with Git-2.11.0-64-bit and Git-LFS

> On 08 Dec 2016, at 12:46, Nick Warr wrote: > > Using Git-2.11.0 with the latest git-lfs 1.5.2 (also tested with > 1.5.3) cloning from our locally hosted gitlab CE server via HTTPS. > > When cloning a repo (large, 3.3 gig in git, 10.3 in LFS) for the > first time

[PATCH v2] commit: make --only --allow-empty work without paths

--only is implied when paths are present, and required them unless --amend. But with --allow-empty it should be allowed as well - it is the only way to create an empty commit in the presence of staged changes. Also remove the post-fact cleverness indication; it's in the man page anyway.

Re:Christmas Is Here!

Hi, My name is Julinda, i'm single and looking.

Re: [PATCH 3/3] lockfile: LOCK_REPORT_ON_ERROR

Hi Junio, On Wed, 7 Dec 2016, Junio C Hamano wrote: > The "libify sequencer" topic stopped passing the die_on_error option > to hold_locked_index(), and this lost an error message from "git > merge --ff-only $commit" when there are competing updates in > progress. Sorry for the breakage. When

Serious bug with Git-2.11.0-64-bit and Git-LFS

Using Git-2.11.0 with the latest git-lfs 1.5.2 (also tested with 1.5.3) cloning from our locally hosted gitlab CE server via HTTPS. When cloning a repo (large, 3.3 gig in git, 10.3 in LFS) for the first time the clone will finish the checkout of the git part, then when it starts downloading the

Re: [PATCH] real_path: make real_path thread-safe

Am 07.12.2016 um 23:29 schrieb Brandon Williams: Instead of assuming root is "/" I'll need to extract what root is from an absolute path. Aside from what root looks like, do most other path constructs behave similarly in unix and windows? (like ".." and "." as examples) Yes, .. and . work the

Re: [PATCH 02/17] dir: convert create_simplify to use the pathspec struct interface

On Thu, Dec 8, 2016 at 7:03 AM, Brandon Williams wrote: > On 12/07, Duy Nguyen wrote: >> On Wed, Dec 7, 2016 at 4:51 AM, Brandon Williams wrote: >> > Convert 'create_simplify()' to use the pathspec struct interface from >> > using the '_raw' entry in the

Re: [PATCH 01/17] mv: convert to using pathspec struct interface

On Thu, Dec 8, 2016 at 7:36 AM, Brandon Williams wrote: >> > @@ -25,25 +26,43 @@ static const char **internal_copy_pathspec(const char >> > *prefix, >> > { >> > int i; >> > const char **result; >> > + struct pathspec ps; >> > ALLOC_ARRAY(result,

Re: [PATCHv5 5/5] submodule: add embed-git-dir function

On Thu, Dec 8, 2016 at 4:01 AM, Stefan Beller wrote: > +/* > + * Migrate the git directory of the given `path` from `old_git_dir` to > + * `new_git_dir`. If an error occurs, append it to `err` and return the > + * error code. > + */ > +int relocate_gitdir(const char *path,

Re: [PATCHv6 7/7] submodule: add absorb-git-dir function

On Thu, Dec 8, 2016 at 8:46 AM, Stefan Beller wrote: > diff --git a/dir.c b/dir.c > index 8b74997c66..cc5729f733 100644 > --- a/dir.c > +++ b/dir.c > @@ -2774,3 +2774,15 @@ void connect_work_tree_and_git_dir(const char > *work_tree, const char *git_dir) >

Re: [PATCHv6 5/7] worktree: add function to check if worktrees are in use

On Thu, Dec 8, 2016 at 5:40 PM, Duy Nguyen wrote: > Alternatively, we could add a new flag to get_worktrees() to tell it > to return all worktrees if there is a least one linked worktree, or > return NULL if there's only main worktree. I'm not sure if this is > clever or very

Re: [PATCHv6 5/7] worktree: add function to check if worktrees are in use

On Thu, Dec 8, 2016 at 8:46 AM, Stefan Beller wrote: > Signed-off-by: Stefan Beller > --- > worktree.c | 24 > worktree.h | 7 +++ > 2 files changed, 31 insertions(+) > > diff --git a/worktree.c b/worktree.c > index

  1   2   >