[PATCH 2/3] t7800: cleanup cruft left behind by tests

Signed-off-by: David Aguilar --- More cleanup, this is needed because the final patch adds a test to t7800 that was sensitive to the cruft left behind. t/t7800-difftool.sh | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index e1ec

[PATCH 3/3] difftool: handle modified symlinks in dir-diff mode

Detect the null object ID for symlinks in dir-diff so that difftool can detect when symlinks are modified in the worktree. Previously, a null symlink object ID would crash difftool. Handle null object IDs as unknown content that must be read from the worktree. Helped-by: Johannes Schindelin Sign

[PATCH 1/3] t7800: remove whitespace before redirect

Signed-off-by: David Aguilar --- Cleanup before the fix. t/t7800-difftool.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 25241f4096..e1ec292718 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -428,7 +428,7 @@ r

Re: [Bug] Unicode display

Hi, On Wed, Mar 15, 2017 at 5:51 PM, Dũng Đặng Minh wrote: > Hi Git team, > > Thank you all for create a great tool. > Last week, I updated the last version of git (2.12.0 x64-Windows) and > all Unicode characters are display un-correctly. You can see: > http://imgur.com/a/eriKQ > Looks like the

[Bug] Unicode display

Hi Git team, Thank you all for create a great tool. Last week, I updated the last version of git (2.12.0 x64-Windows) and all Unicode characters are display un-correctly. You can see: http://imgur.com/a/eriKQ -- Dzung Dang Minh - Software Engineer Email: dungd...@gmail.com Phone: (+84) 94.505.10

Re: [PATCHv9 00/19] Checkout aware of Submodules!

On 03/14, Stefan Beller wrote: > previous work: > https://public-inbox.org/git/20170309221543.15897-1-sbel...@google.com/ > > v9: > * inderdiff to current origin/sb/checkout-recurse-submodules below > * fixed a '\' that was violating the style guide. > * reordered the patches, such that >->

Re: [PATCH v2 1/4] grep: fix help text typo

On 03/14, Stefan Beller wrote: > On Tue, Mar 14, 2017 at 3:10 PM, Brandon Williams wrote: > > Missing SoB here, too. I guess I'm having an off day...Will fix. > > > --- > > builtin/grep.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/builtin/grep.c b/builtin/g

Re: [RFC PATCH] Move SHA-1 implementation selection into a header file

On 14/03/17 23:46, brian m. carlson wrote: > On Tue, Mar 14, 2017 at 11:42:20PM +, Ramsay Jones wrote: >> >> >> On 14/03/17 20:44, Junio C Hamano wrote: >>> OK, then I'll queue this. The selection still goes to BASIC_CFLAGS >>> so the dependencies for re-compilation should be right, I'd thin

Re: [PATCH v3 04/10] submodule--helper clone: check for configured submodules using helper

On 03/14, Stefan Beller wrote: > On Tue, Mar 14, 2017 at 11:06 AM, Junio C Hamano wrote: > > Brandon Williams writes: > > > >> - /* > >> - * Looking up the url in .git/config. > >> - * We must not fall back to .gitmodules as we only want > >> - * to process configured submodule

Re: [PATCH v3 03/10] submodule sync: use submodule--helper is-active

On 03/14, Junio C Hamano wrote: > Brandon Williams writes: > > > Signed-off-by: Brandon Williams > > --- > > git-submodule.sh | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/git-submodule.sh b/git-submodule.sh > > index ab233712d..e2d08595f 100755 > > --- a/git-su

Re: [RFC PATCH] Move SHA-1 implementation selection into a header file

On Tue, Mar 14, 2017 at 11:42:20PM +, Ramsay Jones wrote: > > > On 14/03/17 20:44, Junio C Hamano wrote: > > OK, then I'll queue this. The selection still goes to BASIC_CFLAGS > > so the dependencies for re-compilation should be right, I'd think. > > > > -- >8 -- > > From: "brian m. carlson

Re: [RFC PATCH] Move SHA-1 implementation selection into a header file

On 14/03/17 20:44, Junio C Hamano wrote: > OK, then I'll queue this. The selection still goes to BASIC_CFLAGS > so the dependencies for re-compilation should be right, I'd think. > > -- >8 -- > From: "brian m. carlson" > Date: Sat, 11 Mar 2017 22:28:18 + > Subject: [PATCH] hash.h: move SHA

Re: What's cooking in git.git (Mar 2017, #06; Tue, 14)

Junio C Hamano writes: > Among the topics merged to 'master' since v2.12 was tagged, 40+ of > them could be also merged to 'maint' (some of these are new features > and by default should not be, though). Among them two are fixes for > regressions found in v2.12: > > * The patch subcommand of "g

Re: [PATCH v3 02/10] submodule status: use submodule--helper is-active

On 03/14, Brandon Williams wrote: > On 03/14, Junio C Hamano wrote: > > Brandon Williams writes: > > > > > Signed-off-by: Brandon Williams > > > --- > > > git-submodule.sh | 3 +-- > > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > > > diff --git a/git-submodule.sh b/git-submodule.sh

What's cooking in git.git (Mar 2017, #06; Tue, 14)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. Among the topics merged to 'master

BUG: "git revert -m 0 " considered to be "git revert "

Both of these emit the "is a merge but no -m option was given" when is a merge. I tried to track this down for a bit in the options parsing code but couldn't see where it was happening, but at some point we're setting opts->mainline to 0 both when it's not provided, and when it's explicitly provi

Re: [PATCH v2 4/4] ls-files: fix bug when recursing with relative pathspec

On Tue, Mar 14, 2017 at 3:11 PM, Brandon Williams wrote: > When using the --recurse-submodules flag with a relative pathspec which > includes "..", an error is produced inside the child process spawned for a > submodule. When creating the pathspec struct in the child, the ".." is > interpreted to

Re: [PATCH v2 3/4] grep: fix bug when recursing with relative pathspec

On Tue, Mar 14, 2017 at 3:10 PM, Brandon Williams wrote: > This patch fixes the bug by passing the 'prefix' to the child process. > Now each child process that works on a submodule has two points of > reference to the superproject: (1) the 'super_prefix' which is the path > from the root of the su

Proposal for "fetch-any-blob Git protocol" and server design

As described in "Background" below, there have been at least 2 patch sets to support "partial clones" and on-demand blob fetches, where the server part that supports on-demand blob fetches was treated at least in outline. Here is a proposal treating that server part in detail. == Background T

Re: [PATCH v3 02/10] submodule status: use submodule--helper is-active

On 03/14, Junio C Hamano wrote: > Brandon Williams writes: > > > Signed-off-by: Brandon Williams > > --- > > git-submodule.sh | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/git-submodule.sh b/git-submodule.sh > > index 136e26a2c..ab233712d 100755 > > --- a/git-

Re: [PATCH v2 1/4] grep: fix help text typo

On Tue, Mar 14, 2017 at 3:10 PM, Brandon Williams wrote: Missing SoB here, too. > --- > builtin/grep.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/builtin/grep.c b/builtin/grep.c > index 9304c33e7..4694e68f3 100644 > --- a/builtin/grep.c > +++ b/builtin/grep.c > @@

Re: [PATCH v3 01/10] submodule--helper: add is_active command

On 03/14, Junio C Hamano wrote: > Here is my attempt to rewrite the whole thing. > > The definition of which submodules are of interest by the user > is tied to the configuration submodule..url; when it is > set to a non-empty string, it is of interest. We'd want to be > able to l

Re: [PATCH v2 2/4] setup: allow for prefix to be passed to git commands

On 03/14, Johannes Schindelin wrote: > Hi Brandon, > > On Tue, 14 Mar 2017, Brandon Williams wrote: > > > In a future patch child processes which act on submodules need a little > > more context about the original command that was invoked. This patch > > teaches git to use the prefix stored in `

Re: [PATCH v2 2/4] setup: allow for prefix to be passed to git commands

Hi Brandon, On Tue, 14 Mar 2017, Brandon Williams wrote: > In a future patch child processes which act on submodules need a little > more context about the original command that was invoked. This patch > teaches git to use the prefix stored in `GIT_INTERNAL_TOPLEVEL_PREFIX` > if another prefix w

Re: [PATCH v3 00/10] decoupling a submodule's existence and its url

On 03/14, Junio C Hamano wrote: > Brandon Williams writes: > > > changes in v3: > > > > * Droped a patch which tried to use a more accurate URL for deinit. It > > didn't > > really fit inside the scope of this series. It may be something we want > > to > > revisit later though. > > > > *

[PATCH] submodule-config: correct error reporting for invalid ignore value

As 'var' contains the whole value we get error messages that repeat the section and key currently: warning: Invalid parameter 'true' for config option 'submodule.submodule.plugins/hooks.ignore.ignore' Fix this by only giving the section name in the warning. Signed-off-by: Stefan Beller --- su

[PATCH v2 1/4] grep: fix help text typo

--- builtin/grep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/grep.c b/builtin/grep.c index 9304c33e7..4694e68f3 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -979,7 +979,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) OPT_

[PATCH v2 2/4] setup: allow for prefix to be passed to git commands

In a future patch child processes which act on submodules need a little more context about the original command that was invoked. This patch teaches git to use the prefix stored in `GIT_INTERNAL_TOPLEVEL_PREFIX` if another prefix wasn't found during the git directory setup process. --- cache.h |

[PATCH v2 0/4] recursing submodules with relative pathspec (grep and ls-files)

v2 of the series tackles the problem slightly differently than v1 did, and in a less invasive way in my opinion. v1 also didn't fix everything. v2 introduces a way to pass a 'prefix' that is respected by a git process. This allows the git child processes (which operate on submodules) to have the

[PATCH v2 4/4] ls-files: fix bug when recursing with relative pathspec

When using the --recurse-submodules flag with a relative pathspec which includes "..", an error is produced inside the child process spawned for a submodule. When creating the pathspec struct in the child, the ".." is interpreted to mean "go up a directory" which causes an error stating that the p

[PATCH v2 3/4] grep: fix bug when recursing with relative pathspec

When using the --recurse-submodules flag with a relative pathspec which includes "..", an error is produced inside the child process spawned for a submodule. When creating the pathspec struct in the child, the ".." is interpreted to mean "go up a directory" which causes an error stating that the p

Re: [PATCH] add--interactive: do not expand pathspecs with ls-files

On Tue, Mar 14, 2017 at 03:03:34PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > We can improve this by skipping "ls-files" completely, and > > just feeding the original pathspecs to the diff commands. > > This solution was discussed in 2010: > > > > > > http://public-inbox.org/git/2

Re: [PATCH] git-status: make porcelain more robust

Michael J Gruber writes: > git status provides a porcelain mode for porcelain writers with a > supposedly stable (plumbing) interface. > 7a76c28ff2 ("status: disable translation when --porcelain is used", > 2014-03-20) > made sure that ahead/behind info is not translated (i.e. is stable). > > Ma

Re: [PATCH] add--interactive: do not expand pathspecs with ls-files

Jeff King writes: > We can improve this by skipping "ls-files" completely, and > just feeding the original pathspecs to the diff commands. > This solution was discussed in 2010: > > http://public-inbox.org/git/20100105041438.gb12...@coredump.intra.peff.net/ > > but at the time the diff code's p

Re: [RFC PATCH] Move SHA-1 implementation selection into a header file

Jeff King wrote: > On Tue, Mar 14, 2017 at 11:41:26AM -0700, Jonathan Nieder wrote: >> brian m. carlson wrote: >>> --- a/cache.h >>> +++ b/cache.h >>> @@ -10,8 +10,8 @@ >>> #include "trace.h" >>> #include "string-list.h" >>> #include "pack-revindex.h" >>> +#include "hash.h" >>> >>> -#include SH

Re: [RFC PATCH] Move SHA-1 implementation selection into a header file

Junio C Hamano wrote: > [jc: make BLK_SHA1 the fallback default as discussed on list, > e.g. <20170314201424.vccij5z2ortq4...@sigill.intra.peff.net>; also > remove SHA1_HEADER and SHA1_HEADER_SQ that are no longer used]. > > Signed-off-by: brian m. carlson > Signed-off-by: Junio C Hamano Review

[PATCH 12/19] update submodules: move up prepare_submodule_repo_env

In a later patch we need to prepare the submodule environment with another git directory, so split up the function. Also move it up in the file such that we do not need to declare the function later before using it. Signed-off-by: Stefan Beller --- submodule.c | 29 +

[PATCH 13/19] submodule.c: get_super_prefix_or_empty

In a later patch we need to use the super_prefix, and in case it is NULL we can just assume it is empty. Create a helper function for this. We already have some use cases for this helper function, convert them, too. Signed-off-by: Stefan Beller --- submodule.c | 16 ++-- 1 file chan

[PATCH 03/19] lib-submodule-update.sh: reorder create_lib_submodule_repo

Redraw the ASCII art describing the setup using more space, such that it is easier to understand. The leaf commits are now ordered the same way the actual code is ordered. Add empty lines to the setup code separating each of the leaf commits, each starting with a "checkout -b". Signed-off-by: St

[PATCH 15/19] unpack-trees: pass old oid to verify_clean_submodule

The check (which uses the old oid) is yet to be implemented, but this part is just a refactor, so it can go separately first. Signed-off-by: Stefan Beller --- unpack-trees.c | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c ind

[PATCH 06/19] lib-submodule-update.sh: replace sha1 by hash

Cleaning up code by generalising it. Currently the mailing list discusses yet again how to migrate away from sha1. Signed-off-by: Stefan Beller --- t/lib-submodule-update.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-upda

[PATCH 08/19] make is_submodule_populated gently

We need the gentle version in a later patch. As we have just one caller, migrate the caller. Signed-off-by: Stefan Beller --- builtin/grep.c | 2 +- submodule.c| 7 ++- submodule.h| 8 +++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/builtin/grep.c b/builtin/g

[PATCH 10/19] update submodules: add a config option to determine if submodules are updated

In later patches we introduce the options and flag for commands that modify the working directory, e.g. git-checkout. Have a central place to store such settings whether we want to update a submodule. Signed-off-by: Stefan Beller --- submodule.c | 6 ++ submodule.h | 1 + 2 files changed, 7

[PATCH 19/19] builtin/read-tree: add --recurse-submodules switch

A new known failure mode is introduced[1], which is actually not a failure but a feature in read-tree. Unlike checkout for which the recursive submodule tests were originally written, read-tree does warn about ignored untracked files that would be overwritten. For the sake of keeping the test libra

[PATCH 14/19] update submodules: add submodule_move_head

In later patches we introduce the options and flag for commands that modify the working directory, e.g. git-checkout. This piece of code will be used universally for all these working tree modifications as it * supports dry run to answer the question: "Is it safe to change the submodule to this

[PATCH 16/19] unpack-trees: check if we can perform the operation for submodules

In a later patch we'll support submodule entries to be in sync with the tree in working tree changing commands, such as checkout or read-tree. When a new submodule entry changes in the tree, we need to check if there are conflicts (directory/file conflicts) for the tree. Add this check for submodu

[PATCH 17/19] entry.c: create submodules when interesting

When a submodule is introduced with a new revision we need to create the submodule in the worktree as well. As 'submodule_move_head' handles edge cases, all we have to do is call it from within the function that creates new files in the working tree for workingtree operations. Signed-off-by: Stefa

[PATCH 09/19] update submodules: add submodule config parsing

Similar to b33a15b08 (push: add recurseSubmodules config option, 2015-11-17) and 027771fcb1 (submodule: allow erroneous values for the fetchRecurseSubmodules option, 2015-08-17), we add submodule-config code that is later used to parse whether we are interested in updating submodules. We need the

[PATCH 18/19] builtin/checkout: add --recurse-submodules switch

This exposes a flag to recurse into submodules in builtin/checkout making use of the code implemented in prior patches. A new failure mode is introduced in the submodule update library, as the directory/submodule conflict is not solved in prior patches. Signed-off-by: Stefan Beller --- Document

[PATCH 07/19] lib-submodule-update.sh: define tests for recursing into submodules

Currently lib-submodule-update.sh provides 2 functions test_submodule_switch and test_submodule_forced_switch that are used by a variety of tests to ensure that submodules behave as expected. The current expected behavior is that submodules are not touched at all (see 42639d2317a for the exact setu

[PATCH 02/19] submodule--helper.c: remove duplicate code

From: Valery Tolstov Remove code fragment from module_clone that duplicates functionality of connect_work_tree_and_git_dir in dir.c Signed-off-by: Valery Tolstov Reviewed-by: Brandon Williams Signed-off-by: Junio C Hamano Signed-off-by: Stefan Beller --- builtin/submodule--helper.c | 22 ++-

[PATCH 11/19] submodules: introduce check to see whether to touch a submodule

In later patches we introduce the --recurse-submodule flag for commands that modify the working directory, e.g. git-checkout. It is potentially expensive to check if a submodule needs an update, because a common theme to interact with submodules is to spawn a child process for each interaction. S

[PATCH 05/19] lib-submodule-update: teach test_submodule_content the -C flag

Signed-off-by: Stefan Beller --- t/lib-submodule-update.sh | 5 + 1 file changed, 5 insertions(+) diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh index c0d6325133..00128f28b5 100755 --- a/t/lib-submodule-update.sh +++ b/t/lib-submodule-update.sh @@ -193,6 +193,11 @@ test_s

[PATCH 01/19] connect_work_tree_and_git_dir: safely create leading directories

In a later patch we'll use connect_work_tree_and_git_dir when the directory for the gitlink file doesn't exist yet. This patch makes connect_work_tree_and_git_dir safe to use for both cases of either the git dir or the working dir missing. To do so, we need to call safe_create_leading_directories[

[PATCH 04/19] lib-submodule-update.sh: do not use ./. as submodule remote

Adding the repository itself as a submodule does not make sense in the real world. In our test suite we used to do that out of convenience in some tests as the current repository has easiest access for setting up 'just a submodule'. However this doesn't quite test the real world, so let's do not f

[PATCHv9 00/19] Checkout aware of Submodules!

previous work: https://public-inbox.org/git/20170309221543.15897-1-sbel...@google.com/ v9: * inderdiff to current origin/sb/checkout-recurse-submodules below * fixed a '\' that was violating the style guide. * reordered the patches, such that -> the first two patches are Valerys series and c

Re: [PATCH v3 00/10] decoupling a submodule's existence and its url

Brandon Williams writes: > changes in v3: > > * Droped a patch which tried to use a more accurate URL for deinit. It didn't > really fit inside the scope of this series. It may be something we want to > revisit later though. > > * The --init-active flag now ensure that all submodules which

Re: [PATCH v3 05/10] submodule: decouple url and submodule existence

Junio C Hamano writes: > Also submodule.active that takes pathspec and not name is an oddball > (use of "name" not "path" is to prepare for a submodule whose > location in the superproject changes depending on the commit in the > superproject), and we need to justify with an explanation. I think

Re: [PATCH v3 02/10] submodule status: use submodule--helper is-active

Stefan Beller writes: > So to answer your original question, I think the codebase currently > thinks by_path is handier, the name is a mere internal field in > "struct submodule", useful for looking up its git dir. OK, that makes sense at the conceptual level, too. When you have a specific vers

Re: [RFC PATCH] Move SHA-1 implementation selection into a header file

On Tue, Mar 14, 2017 at 01:44:48PM -0700, Junio C Hamano wrote: > OK, then I'll queue this. The selection still goes to BASIC_CFLAGS > so the dependencies for re-compilation should be right, I'd think. Yeah, I think that part should be fine. > -- >8 -- > From: "brian m. carlson" > Date: Sat, 1

Re: [PATCH] l10n: add framework for localizing the manpages

Ævar Arnfjörð Bjarmason writes: > I think this series is on the right track, and that po4a is the right > tool for the job. OK, thanks for the input.

Re: [PATCH] l10n: add framework for localizing the manpages

On Mon, Mar 13, 2017 at 1:01 AM, Junio C Hamano wrote: > Jean-Noel Avila writes: Jean: Comments on the patch: - Firstly thanks for working on this. When I hacked up the initial po support in v1.7.8-rc2-1-g5e9637c629 I always meant to try out po4a, but never got around to it. It's much easier th

Re: [RFC PATCH] Move SHA-1 implementation selection into a header file

OK, then I'll queue this. The selection still goes to BASIC_CFLAGS so the dependencies for re-compilation should be right, I'd think. -- >8 -- From: "brian m. carlson" Date: Sat, 11 Mar 2017 22:28:18 + Subject: [PATCH] hash.h: move SHA-1 implementation selection into a header file Many deve

Re: [PATCH v3 04/10] submodule--helper clone: check for configured submodules using helper

Stefan Beller writes: >> I am wondering what was meant by the comment "We must not fall back to..." >> that is being removed---is that because sub->url can come from .gitmodules >> that is in-tree, not from .git/config? > > Yes. We want to check for the submodule being "initialized", i.e. > havin

Re: [PATCH v3 02/10] submodule status: use submodule--helper is-active

Stefan Beller writes: > There we take the path as name and if a real name exists, the name > is overwritten with the real name, i.e. > > name = name_for_path(path) ? name_for_path(path) : path; > > which IMHO is overly accepting and we should just die in case of > !name_for_path. Yes, I agre

Re: [RFC PATCH] Move SHA-1 implementation selection into a header file

On Tue, Mar 14, 2017 at 11:41:26AM -0700, Jonathan Nieder wrote: > brian m. carlson wrote: > > [...] > > --- a/cache.h > > +++ b/cache.h > > @@ -10,8 +10,8 @@ > > #include "trace.h" > > #include "string-list.h" > > #include "pack-revindex.h" > > +#include "hash.h" > > > > -#include SHA1_HEAD

Re: [PATCH v3 10/10] submodule add: respect submodule.active and submodule..active

Brandon Williams writes: > + if git config --get submodule.active >/dev/null > + then > + # If the submodule being adding isn't already covered by the > + # current configured pathspec, set the submodule's active flag > + if ! git submodule--helper is-a

Re: [PATCH v3 09/10] submodule--helper init: set submodule..active

Brandon Williams writes: > When initializing a submodule set the submodule..active config to > true to indicate that the submodule is active. > > Signed-off-by: Brandon Williams > --- Hmph. When you do git clone --submodule-spec=lib/ and resulting repository says "submodule.active =

Re: [PATCH v3 07/10] clone: add --submodule-spec= switch

Brandon Williams writes: > The new switch passes the pathspec to `git submodule update > --init-active` which is called after the actual clone is done. > > Additionally this configures the submodule.active option to > be the given pathspec, such that any future invocation of > `git submodule upda

Re: [PATCH v3 06/10] submodule update: add `--init-active` switch

Brandon Williams writes: > +static void module_list_active(struct module_list *list) > +{ > + int i; > + > + if (read_cache() < 0) > + die(_("index file corrupt")); > + > + gitmodules_config(); > + > + for (i = 0; i < active_nr; i++) { > + const struct cach

Re: [PATCH v3 06/10] submodule update: add `--init-active` switch

Brandon Williams writes: > +--init-active:: > + This option is only valid for the update command. > + Initialize all submodules configured in "`submodule.active`" > + that have not been updated before. You mean s/not been updated/not been initialized/ here? > diff --git a/builtin/su

Re: [PATCH v3 05/10] submodule: decouple url and submodule existence

Brandon Williams writes: > Currently the submodule..url config option is used to determine > if a given submodule exists and is interesting to the user. This > however doesn't work very well because the URL is a config option for > the scope of a repository, whereas the existence of a submodule

Re: [RFC PATCH] Move SHA-1 implementation selection into a header file

Hi, brian m. carlson wrote: [...] > --- a/cache.h > +++ b/cache.h > @@ -10,8 +10,8 @@ > #include "trace.h" > #include "string-list.h" > #include "pack-revindex.h" > +#include "hash.h" > > -#include SHA1_HEADER For what it's worth, the bazel build tool doesn't like this '#include SHA1_HEADER

Re: [PATCH v3 04/10] submodule--helper clone: check for configured submodules using helper

On Tue, Mar 14, 2017 at 11:06 AM, Junio C Hamano wrote: > Brandon Williams writes: > >> - /* >> - * Looking up the url in .git/config. >> - * We must not fall back to .gitmodules as we only want >> - * to process configured submodules. >> - */ >> - strbuf_reset(&sb); >

Re: What's cooking in git.git (Mar 2017, #05; Mon, 13)

On 03/13/2017 03:43 PM, Junio C Hamano wrote: * jt/mark-tree-uninteresting-for-uninteresting-commit (2017-02-28) 3 commits - upload-pack: compute blob reachability correctly - revision: exclude trees/blobs given commit - revision: unify {tree,blob}_objects in rev_info The revision/object tra

Re: [PATCH v3 02/10] submodule status: use submodule--helper is-active

On Tue, Mar 14, 2017 at 10:46 AM, Junio C Hamano wrote: > Brandon Williams writes: > >> Signed-off-by: Brandon Williams >> --- >> git-submodule.sh | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/git-submodule.sh b/git-submodule.sh >> index 136e26a2c..ab233712d 1007

Re: [PATCH v3 04/10] submodule--helper clone: check for configured submodules using helper

Brandon Williams writes: > - /* > - * Looking up the url in .git/config. > - * We must not fall back to .gitmodules as we only want > - * to process configured submodules. > - */ > - strbuf_reset(&sb); > - strbuf_addf(&sb, "submodule.%s.url", sub->name); > - gi

Re: [PATCH v6 00/12] Fix the early config

On Mon, Mar 13, 2017 at 03:31:15PM -0700, Junio C Hamano wrote: > Johannes Schindelin writes: > > > These patches are an attempt to make Git's startup sequence a bit less > > surprising. > > I think this is ready for 'next', so let's ask reviewers to really > pay attention to this round, wait f

Re: fatal: Could not get current working directory: Permission denied | affected 2.10,2.11,2.12, but not 1.9.5 |

Am 14.03.2017 um 08:44 schrieb Zenobiusz Kunegunda: Od: "René Scharfe" Do: "Zenobiusz Kunegunda" ; Wysłane: 22:31 Poniedziałek 2017-03-13 Temat: Re: fatal: Could not get current working directory: Permission denied | affected 2.10,2.11,2.12, but not

Re: [PATCH v3 03/10] submodule sync: use submodule--helper is-active

Brandon Williams writes: > Signed-off-by: Brandon Williams > --- > git-submodule.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/git-submodule.sh b/git-submodule.sh > index ab233712d..e2d08595f 100755 > --- a/git-submodule.sh > +++ b/git-submodule.sh > @@ -,7 +11

Re: [PATCH v3 01/10] submodule--helper: add is_active command

Brandon Williams writes: > There are a lot of places where an explicit check for > submodule."".url is done to see if a submodule exists. In order > to centralize this check introduce a helper which can be used to query > if a submodule is active or not. "Right now, is_submodule_initialized

Re: [PATCH v3 02/10] submodule status: use submodule--helper is-active

Brandon Williams writes: > Signed-off-by: Brandon Williams > --- > git-submodule.sh | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/git-submodule.sh b/git-submodule.sh > index 136e26a2c..ab233712d 100755 > --- a/git-submodule.sh > +++ b/git-submodule.sh > @@ -1010,14

Re: [PATCH] add--interactive: do not expand pathspecs with ls-files

On Tue, Mar 14, 2017 at 10:25:04AM -0700, Brandon Williams wrote: > On 03/14, Jeff King wrote: > > b. If the repository contains filenames with literal wildcard > > characters (e.g., "foo*"), the original code expanded > > them via "ls-files" and then fed those wildcard names > >

Re: [PATCH] add--interactive: do not expand pathspecs with ls-files

On 03/14, Jeff King wrote: > b. If the repository contains filenames with literal wildcard > characters (e.g., "foo*"), the original code expanded > them via "ls-files" and then fed those wildcard names > to "diff-index", which would have treated them as > wildcards. This was

Re: [GSoC][PATCH/RFC v3 3/3] credential-cache: only use user_socket if a socket

On 03/13, Devin Lehmacher wrote: > > Best practice for submitting patches would be to ensure that each patch > > compiles without errors (with the DEVELOPER=1 flag set) and that the > > entire test suite passes with no errors; this is to maintain > > bisect-ability. Only after you've done this sho

Re: [PATCH] add--interactive: do not expand pathspecs with ls-files

On Tue, Mar 14, 2017 at 12:30:24PM -0400, Jeff King wrote: > 2. Even when it does work, it's really slow. The pathspec > code is not optimized for huge numbers of paths. Here's > the same case without the ulimit: > >$ time git add -p drivers >No changes. > >re

[PATCH] add--interactive: do not expand pathspecs with ls-files

When we want to get the list of modified files, we first expand any user-provided pathspecs with "ls-files", and then feed the resulting list of paths as arguments to "diff-index" and "diff-files". If your pathspec expands into a large number of paths, you may run into one of two problems: 1. Th

[PATCH] git-status: make porcelain more robust

git status provides a porcelain mode for porcelain writers with a supposedly stable (plumbing) interface. 7a76c28ff2 ("status: disable translation when --porcelain is used", 2014-03-20) made sure that ahead/behind info is not translated (i.e. is stable). Make sure that the remaining two strings (i

WITH DUE RESPECT

Dear Friend, I know that this mail will come to you as a surprise as we have never met before, but need not to worry as I am contacting you independently of my investigation and no one is informed of this communication. I need your urgent assistance in transferring the sum of $11.3 million immedia

Re: fatal: Could not get current working directory: Permission denied | affected 2.10,2.11,2.12, but not 1.9.5 |

Output of truss git status 2>&1 >/dev/null |grep chdir is empty when git status fails. Also git status succeeded when run as root.Od: "René Scharfe" Do: "Zenobiusz Kunegunda" ; Wysłane: 18:32 Poniedziałek 2017-03-13 Temat: Re: fatal: Could not ge

Hello

Hello, its my pleasure to contact you, my name is Faith Williams and am very beautiful girl with good heart, i will like to know you more but please i will like you to contact me back through my email [ williams4lovefa...@gmail.com ]

Hello Beautiful,

Good day dear, i hope this mail meets you well? my name is Jack, from the U.S. I know this may seem inappropriate so i ask for your forgiveness but i wish to get to know you better, if I may be so bold. I consider myself an easy-going man, adventurous, honest and fun loving person but I am curre

Re: Stable GnuPG interface, git should use GPGME

Bernhard E. Reiter venit, vidit, dixit 13.03.2017 13:49: > Am Montag 13 März 2017 11:14:57 schrieb Michael J Gruber: >> Ævar Arnfjörð Bjarmason venit, vidit, dixit 10.03.2017 15:23: >>> On Fri, Mar 10, 2017 at 11:00 AM, Bernhard E. Reiter > please consider using libgpgme interfacing to GnuPG,

Re: git checkout exit value and post-commit hooks

Junio C Hamano writes: > Andreas Politz writes: > >> the exit value of a `git checkout' seems to depend on the exit values of >> the hooks it runs. This breaks for example `git bisect', as seen in the >> following example. > > I am a bit puzzled why you have "checkout" and "post-commit" on the >

Re: fatal: Could not get current working directory: Permission denied | affected 2.10,2.11,2.12, but not 1.9.5 |

Od: "René Scharfe" Do: "Zenobiusz Kunegunda" ; Wysłane: 22:31 Poniedziałek 2017-03-13 Temat: Re: fatal: Could not get current working directory: Permission denied | affected 2.10,2.11,2.12, but not 1.9.5 | > >> Am 13.03.2017 um 14:23 schrieb Zenobi

Regards From Amy

My name are Amy Riddering, 41 years old, wife of late Mr. Michael James Riddering, who was killed On 15 January 2016 in Al Qaeda terrorist attack in Burkina Faso, I am a cancer victim, I need a very honest and reliable person to establish a charity work. Please for more details my direct email