Re: [PATCH 3/3] test-parse-options: --expect= option to simplify tests

On Thu, May 5, 2016 at 7:57 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> instead of filtering afterwards, i.e. each strbuf_add is guarded by >> an >> >> if (is_interesting_output(...)) >> strbuf_add(...) > > That's a good approach. >

Re: [PATCH v16 0/7] config commit verbose

On Thu, May 5, 2016 at 3:21 PM, Junio C Hamano wrote: > Pranit Bauva writes: >> This series of patches add a configuration variable for verbose in >> git-commit. >> >> Changes wrt v15: >> * Remove the previous patch 7/7 and split the tests. Include one

Re: [PATCH v16 7/7] commit: add a commit.verbose config variable

On Thu, May 5, 2016 at 3:14 PM, Junio C Hamano wrote: > Pranit Bauva writes: >> +static int config_verbose = -1; /* unspecified */ > > The name does not make it clear that config_verbose is only for > "commit" and not relevant to "status". > >> @@

Re: [PATCH v16 7/7] commit: add a commit.verbose config variable

On Fri, May 6, 2016 at 12:44 AM, Junio C Hamano wrote: > Pranit Bauva writes: > >> diff --git a/builtin/commit.c b/builtin/commit.c >> index 391126e..114ffc9 100644 >> --- a/builtin/commit.c >> +++ b/builtin/commit.c >> @@ -113,7 +113,9 @@ static char

Re: [PATCH v4 01/11] add fetch-pack --diag-url tests for some corner cases

On 05.05.16 23:52, Mike Hommey wrote: > On Wed, May 04, 2016 at 07:48:30AM +0900, Mike Hommey wrote: >> On Tue, May 03, 2016 at 09:07:41AM -0700, Junio C Hamano wrote: >>> Mike Hommey writes: >>> t5603-clone-dirname uses url patterns that are not tested with

[PATCH] remote-ext: fix typo

Fix a typo in builtin/remote-ext.c. Signed-off-by: Li Peng --- builtin/remote-ext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/remote-ext.c b/builtin/remote-ext.c index 7457c74..88eb8f9 100644 --- a/builtin/remote-ext.c +++

Re: [PATCH 3/3] test-parse-options: --expect= option to simplify tests

Stefan Beller writes: > instead of filtering afterwards, i.e. each strbuf_add is guarded by > an > > if (is_interesting_output(...)) > strbuf_add(...) That's a good approach. The implementation gets a bit trickier than the previous one, but it would look like

Re: [PATCH 3/3] test-parse-options: --expect= option to simplify tests

On Thu, May 5, 2016 at 8:41 PM, Stefan Beller wrote: > On Thu, May 5, 2016 at 2:50 PM, Junio C Hamano wrote: >> [...] >> But the only thing this test cares about is if "quiet: 3" is in the >> output. We should be able to write the above 18 lines with just

Re: [PATCH] submodule: stop sanitizing config options

On Thu, May 05, 2016 at 05:23:51PM -0700, Stefan Beller wrote: > >> -/* > >> - * This function is intended as a callback for use with > >> - * git_config_from_parameters(). It ignores any config options which > >> - * are not suitable for passing along to a submodule, and accumulates the > >>

Re: [PATCH 3/3] test-parse-options: --expect= option to simplify tests

On Thu, May 5, 2016 at 2:50 PM, Junio C Hamano wrote: > Existing tests in t0040 follow a rather verbose pattern: > > cat >expect <<\EOF > boolean: 0 > integer: 0 > magnitude: 0 > timestamp: 0 > string: (not set) > abbrev:

Re: [PATCH] pathspec: remove check_path_for_gitlink

On Thu, May 5, 2016 at 4:54 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> That was my first reaction as well. However after a while of thought I >> actually >> like that bug. Consider the possibilities how gitk/git-gui or other >> subsystems >>

Re: [PATCH] submodule: stop sanitizing config options

On Thu, May 5, 2016 at 4:33 PM, Junio C Hamano wrote: > Jeff King writes: > >> I had originally thought after the final one that we could further clean >> up by turning prepare_submodule_repo_env() into a static function. But >> we can't; it gets called in one

Re: [PATCH] pathspec: remove check_path_for_gitlink

Stefan Beller writes: > That was my first reaction as well. However after a while of thought I > actually > like that bug. Consider the possibilities how gitk/git-gui or other subsystems > can be developed. When accepting a patch for that you can either apply the > patch in

Re: [PATCH] pathspec: remove check_path_for_gitlink

On Thu, May 5, 2016 at 4:27 PM, Junio C Hamano wrote: > Stefan Beller writes: > >>> I wonder if the patches mentioned have something to do with the "git >>> add deep/in/the/tree" that fails to notice deep/in/ is an unrelated >>> repository in some way? >>

Re: [PATCH] submodule: stop sanitizing config options

Jeff King writes: > I had originally thought after the final one that we could further clean > up by turning prepare_submodule_repo_env() into a static function. But > we can't; it gets called in one spot from submodule--helper. However, > while looking at it, I did notice that we

Re: [PATCH] pathspec: remove check_path_for_gitlink

Stefan Beller writes: >> I wonder if the patches mentioned have something to do with the "git >> add deep/in/the/tree" that fails to notice deep/in/ is an unrelated >> repository in some way? > > Which is considered a feature now. Maybe we should add tests for that? > >

Re: [RFC PATCH] pathspec: get non matching arguments without reporting.

Junio C Hamano writes: > Stefan Beller writes: > >> When giving more than just pathspec arguments (e.g. submodule labels), >> we need a way to check all non-matching arguments for the pathspec parsing >> if these are the submodule labels or typos. >> >>

Re: [PATCH] pathspec: remove check_path_for_gitlink

On Thu, May 5, 2016 at 4:09 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> `check_path_for_gitlink` was introduced in 9d67b61f739a (2013-01-06, >> add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuse) >> but the implementation was

Re: [RFC PATCH] pathspec: get non matching arguments without reporting.

Stefan Beller writes: > When giving more than just pathspec arguments (e.g. submodule labels), > we need a way to check all non-matching arguments for the pathspec parsing > if these are the submodule labels or typos. > > This patch prepares for that use case by splitting up

Re: [PATCH] pathspec: remove check_path_for_gitlink

Stefan Beller writes: > `check_path_for_gitlink` was introduced in 9d67b61f739a (2013-01-06, > add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuse) > but the implementation was removed in 5a76aff1a6 (2013-07-14, add: > convert to use parse_pathspec). > >

Re: [PATCH 11/15] diff: ignore submodules excluded by groups

Stefan Beller writes: > I am aware that other operations such as a build system would be glad to > have the contents of the submodules there. But those would not use a > restrictive default group? The set of submodules you "init" to the working tree are the ones that are

[RFC PATCH] pathspec: get non matching arguments without reporting.

When giving more than just pathspec arguments (e.g. submodule labels), we need a way to check all non-matching arguments for the pathspec parsing if these are the submodule labels or typos. This patch prepares for that use case by splitting up `report_path_error` into a new checking function

Re: [PATCH v8 19/19] untracked-cache: config option

David Turner writes: > + if (!git_config_get_bool("index.adduntrackedcache", ) && > + untracked && > + !istate->untracked) > + add_untracked_cache(_index); The body is indented with HT + 4 spaces, replace it with two HTs. -- To unsubscribe

Re: [PATCH v8 10/19] index-helper: use watchman to avoid refreshing index with lstat()

David Turner writes: > +extern void write_watchman_ext(struct strbuf *sb, struct index_state* > istate); Asterisk sticks to the variable, not to the type. > + if (c == sb.buf) { > + strbuf_setlen(, 0); > + } Unnecessary braces {}. -- To

Re: [PATCH 11/15] diff: ignore submodules excluded by groups

On Thu, May 5, 2016 at 3:20 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> The first option is giving nothing: >> >> git config submodule.defaultGroup "*SomeLabel" >> git -C submodule-not-labeled reset --hard HEAD^ >> git status >>

Re: [PATCH v8 18/19] Add tracing to measure where most of the time is spent

David Turner writes: > From: Nguyễn Thái Ngọc Duy > Subject: Re: [PATCH v8 18/19] Add tracing to measure where most of the time > is spent trace: measure where the time is spent in the index-heavy operations -- To unsubscribe from this list: send

Re: [PATCH v8 09/19] Add watchman support to reduce index refresh cost

David Turner writes: > From: Nguyễn Thái Ngọc Duy > Subject: Re: [PATCH v8 09/19] Add watchman support to reduce index refresh > cost Subject: watchman: support watchman to reduce index refresh cost > +static struct watchman_query_result*

Re: [PATCH v8 08/19] read-cache: add watchman 'WAMA' extension

David Turner writes: > +void write_watchman_ext(struct strbuf *sb, struct index_state* istate) void write_watchman_ext(struct strbuf *sb, struct index_state *istate) Asterisk sticks to the variable, not to the type. -- To unsubscribe from this list: send the line

[PATCH] pathspec: remove check_path_for_gitlink

`check_path_for_gitlink` was introduced in 9d67b61f739a (2013-01-06, add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuse) but the implementation was removed in 5a76aff1a6 (2013-07-14, add: convert to use parse_pathspec). Remove the declaration from the header as well.

Re: [PATCH 11/15] diff: ignore submodules excluded by groups

Stefan Beller writes: > The first option is giving nothing: > > git config submodule.defaultGroup "*SomeLabel" > git -C submodule-not-labeled reset --hard HEAD^ > git status > # all good, no report about submodule-not-labeled > # because it is not in

Re: [PATCH] exec_cmd.c, sideband.c, Makefile: avoid multiple PREFIX definitions

Philip Oakley writes: > The short and sweet PREFIX can be confused when used in many places. > > Rename both usages to better describe their purpose. > > Noticed when compiling Git for Windows using MSVC/Visual Studio which > reports the conflict beteeen the command line

Re: [PATCH v4 01/11] add fetch-pack --diag-url tests for some corner cases

On Wed, May 04, 2016 at 07:48:30AM +0900, Mike Hommey wrote: > On Tue, May 03, 2016 at 09:07:41AM -0700, Junio C Hamano wrote: > > Mike Hommey writes: > > > > > t5603-clone-dirname uses url patterns that are not tested with > > > fetch-pack --diag-url, and it would be useful

[PATCH 1/3] test-parse-options: fix output when callback option fails

When test-parse-options detects an error on the command line, it gives the usage string just like any parse-options API users do, without showing any "variable dump". An exception is the callback test, where a "variable dump" for the option is done before the command line options are fully

[PATCH 0/3] test-parse-options update

During the review of Pranit's "commit.verbose" series, I noticed an overly verbose input and output used to drive test-parse-options helper in t0040. Here is a patch to teach the program to allow us to write the test in a more concise way. I'll leave it as an exercise to the readers to actually

[PATCH 3/3] test-parse-options: --expect= option to simplify tests

Existing tests in t0040 follow a rather verbose pattern: cat >expect <<\EOF boolean: 0 integer: 0 magnitude: 0 timestamp: 0 string: (not set) abbrev: 7 verbose: 0 quiet: 3 dry run: no file: (not set)

[PATCH 2/3] test-parse-options: hold output in a strbuf

In this step, all the output is held in a strbuf and unconditionally dumped at the end, so there is no behaviour change (other than that the processing may be a bit slower, now we do the buffering stdio has been doing for us). Signed-off-by: Junio C Hamano ---

[PATCH v8 16/19] index-helper: autorun mode

Soon, we'll want to automatically start index-helper, so we need a mode that silently exits if it can't start up (either because it's not in a git dir, or because another one is already running). Signed-off-by: David Turner --- Documentation/git-index-helper.txt | 4

[PATCH v8 04/19] index-helper: add --strict

From: Nguyễn Thái Ngọc Duy There are "holes" in the index-helper approach because the shared memory is not verified again by git. If $USER is compromised, shared memory could be modified. But anyone who could do this could already modify $GIT_DIR/index. A more realistic risk

[PATCH v8 05/19] index-helper: log warnings

Instead of writing warnings to stderr, write them to a log. Later, we'll probably be daemonized, so writing to stderr will be pointless. Signed-off-by: David Turner --- Documentation/git-index-helper.txt | 3 +++ index-helper.c | 32

[PATCH v8 06/19] daemonize(): set a flag before exiting the main process

From: Nguyễn Thái Ngọc Duy This allows signal handlers and atexit functions to realize this situation and not clean up. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: David Turner --- builtin/gc.c | 2 +- cache.h | 2 +-

[PATCH v8 15/19] index-helper: don't run if already running

Signed-off-by: David Turner --- index-helper.c | 7 +++ t/t7900-index-helper.sh | 9 + 2 files changed, 16 insertions(+) diff --git a/index-helper.c b/index-helper.c index 4ed1610..b275f6e 100644 --- a/index-helper.c +++ b/index-helper.c @@ -458,6

[PATCH v8 08/19] read-cache: add watchman 'WAMA' extension

From: Nguyễn Thái Ngọc Duy The extension contains a bitmap, one bit for each entry in the index. If the n-th bit is zero, the n-th entry is considered unchanged, we can ce_mark_uptodate() it without refreshing. If the bit is non-zero and we found out the corresponding file is

[PATCH v8 02/19] read-cache: allow to keep mmap'd memory after reading

From: Nguyễn Thái Ngọc Duy Later, we will introduce git index-helper to share this memory with other git processes. We only unmap it when we discard the index (although the kernel may of course choose to page it out). Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH v8 12/19] unpack-trees: preserve index extensions

Make git checkout (and other unpack_tree operations) preserve the untracked cache and watchman status. This is valuable for two reasons: 1. Often, an unpack_tree operation will not touch large parts of the working tree, and thus most of the untracked cache will continue to be valid. 2. Even if

[PATCH v8 11/19] update-index: enable/disable watchman support

From: Nguyễn Thái Ngọc Duy Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: David Turner --- Documentation/git-index-helper.txt | 3 +++ Documentation/git-update-index.txt | 6 ++ builtin/update-index.c | 16

[PATCH v8 07/19] index-helper: add --detach

From: Nguyễn Thái Ngọc Duy We detach after creating and opening the socket, because otherwise we might return control to the shell before index-helper is ready to accept commands. This might lead to flaky tests. Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH v8 18/19] Add tracing to measure where most of the time is spent

From: Nguyễn Thái Ngọc Duy All the known heavy code blocks are measured (except object database access). This should help identify if an optimization is effective or not. An unoptimized git-status would give something like below (92% of time is accounted). To sum up the effort

[PATCH v8 13/19] watchman: add a config option to enable the extension

For installations that have centrally-managed configuration, it's easier to set a config once than to run update-index on every repository. Signed-off-by: David Turner --- .gitignore| 1 + Documentation/config.txt | 4 Makefile

[PATCH v8 19/19] untracked-cache: config option

Add a config option to populate the untracked cache. For installations that have centrally-managed configuration, it's easier to set a config once than to run update-index on every repository. Signed-off-by: David Turner --- Documentation/config.txt | 4

[PATCH v8 09/19] Add watchman support to reduce index refresh cost

From: Nguyễn Thái Ngọc Duy The previous patch has the logic to clear bits in 'WAMA' bitmap. This patch has logic to set bits as told by watchman. The missing bit, _using_ these bits, are not here yet. A lot of this code is written by David Turner originally, mostly from [1].

[PATCH v8 03/19] index-helper: new daemon for caching index and related stuff

From: Nguyễn Thái Ngọc Duy Instead of reading the index from disk and worrying about disk corruption, the index is cached in memory (memory bit-flips happen too, but hopefully less often). The result is faster read. Read time is reduced by 70%. The biggest gain is not having

[PATCH v8 14/19] index-helper: kill mode

Add a new command (and command-line arg) to allow index-helpers to exit cleanly. This is mainly useful for tests. Signed-off-by: David Turner --- Documentation/git-index-helper.txt | 3 +++ index-helper.c | 31 ++-

[PATCH v8 17/19] index-helper: optionally automatically run

Introduce a new config option, indexhelper.autorun, to automatically run git index-helper before starting up a builtin git command. This enables users to keep index-helper running without manual intervention. Signed-off-by: David Turner --- Documentation/config.txt |

[PATCH v8 10/19] index-helper: use watchman to avoid refreshing index with lstat()

From: Nguyễn Thái Ngọc Duy Watchman is hidden behind index-helper. Before git tries to read the index from shm, it notifies index-helper through the socket and waits for index-helper to prepare a file for sharing memory (with MAP_SHARED). index-helper then contacts watchman,

[PATCH v8 01/19] read-cache.c: fix constness of verify_hdr()

From: Nguyễn Thái Ngọc Duy Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: David Turner --- read-cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/read-cache.c b/read-cache.c index d9fb78b..16cc487

[PATCH v8 00/19] index-helper/watchman

This version corrects defects noticed by Ramsay Jones: index-helper now works when USE_WATCHMAN is not set sigpipe is handled post-test cleanup is improved a test now uses a more idiomatic check restored an index verification check from a previous version of the series David Turner (8):

Re: /* compiler workaround */ - what was the issue?

"Philip Oakley" writes: > int saved_namelen = saved_namelen; /* compiler workaround */ > > Which then becomes an MSVC compile warning C4700: uninitialized local > variable. > > I'm wondering what was the compiler workaround being referred to? i.e. why > does it need

Re: unary minus operator applied to unsigned type, result still unsigned?

From: "Junio C Hamano" "Philip Oakley" writes: I'm working on building Git on Visual Studio as part of the Git for Windows capability. The MSVC compiler is reporting: 1>..\sha1-lookup.c(100) : warning C4146: unary minus operator applied to unsigned

Re: t7900-*.sh tesr #5 failure

On Tue, 2016-05-03 at 22:34 +0100, Ramsay Jones wrote: > Hi David, > > Test t7900.5 fails for me, thus: > > $ ./t7900-index-helper.sh -i -v -x -d > > ... > > + test -S .git/index-helper.sock > + git status > On branch master > Untracked files: > (use "git add ..." to

[PATCH] exec_cmd.c, sideband.c, Makefile: avoid multiple PREFIX definitions

The short and sweet PREFIX can be confused when used in many places. Rename both usages to better describe their purpose. Noticed when compiling Git for Windows using MSVC/Visual Studio which reports the conflict beteeen the command line definition and the definition in sideband.c

[PATCH] Conflicting PREFIX usage

While trying to resurrect the MSVC/Visual Studio capability for Git for Windows I noticed this little nuance. The PREFIX in Windows was introduced in 35fb0e8 (Compute prefix at runtime if RUNTIME_PREFIX is set, 2009-01-18) and in sideband.c at ebe8fa7 (fix display overlap between remote and local

Re: [PATCH 11/15] diff: ignore submodules excluded by groups

On Thu, May 5, 2016 at 1:19 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> Any thoughts on my thoughts below? >> >>> So here is a thought experiment: >>> >>> # get all submodules into the work tree >>> git submodule update --recursive --init

Re: [PATCHv5] submodule deinit: require '--all' instead of '.' for all submodules

On Thu, May 5, 2016 at 1:37 PM, Jonathan Nieder wrote: > Stefan Beller wrote: > >>>$ rungit v2.6.6 submodule deinit . >>>error: pathspec '.' did not match any file(s) known to git. >>>Did you forget to 'git add'? > [...] >> So instead of a pathspec add

/* compiler workaround */ - what was the issue?

Duy, In https://github.com/git-for-windows/git/commit/b3c96fb158f05152336f167076f5d81d23c3a5e5 (split-index: strip pathname of on-disk replaced entries, 13 Jun 2014) Nguyễn Thái Ngọc Duy you have read-cache.c#L1790 (in that commit, now ~L1873) int saved_namelen =

Re: [PATCHv5] submodule deinit: require '--all' instead of '.' for all submodules

Stefan Beller wrote: >>$ rungit v2.6.6 submodule deinit . >>error: pathspec '.' did not match any file(s) known to git. >>Did you forget to 'git add'? [...] > So instead of a pathspec add the '--all' option to deinit all submodules > and add a test to check for the corner

Re: [PATCH 11/15] diff: ignore submodules excluded by groups

Stefan Beller writes: > Any thoughts on my thoughts below? > >> So here is a thought experiment: >> >> # get all submodules into the work tree >> git submodule update --recursive --init >> >> # The selected default group will not include all submodules >> git

Re: [PATCH] submodule: stop sanitizing config options

On Thu, May 05, 2016 at 09:59:15AM -0700, Junio C Hamano wrote: > Sorry for the trouble. > > I queued jk/submodule-c-credential to be mergeable to 'maint', as it > could be argued two ways. We can say that not propagating -c down > is a bug and the series is a bugfix. Or it is merely a known >

Re: [PATCH 80/83] run-command: make dup_devnull() non static

Am 05.05.2016 um 11:50 schrieb Christian Couder: On Mon, Apr 25, 2016 at 5:05 PM, Johannes Schindelin wrote: Hi Chris, On Sun, 24 Apr 2016, Christian Couder wrote: diff --git a/run-command.c b/run-command.c index 8c7115a..29d2bda 100644 --- a/run-command.c +++

Re: [PATCH v6 1/2] http: support sending custom HTTP headers

On Thu, May 05, 2016 at 09:10:21PM +0200, Lars Schneider wrote: > > + > > + > > + Require expr %{HTTP:x-magic-one} == 'abra' > > + Require expr %{HTTP:x-magic-two} == 'cadabra' > > + > > I think "" depends on mod_authz_core which is only > available in Apache HTTPD 2.3

Re: [PATCH 11/15] diff: ignore submodules excluded by groups

Any thoughts on my thoughts below? On Fri, Apr 29, 2016 at 12:17 PM, Stefan Beller wrote: > On Fri, Apr 29, 2016 at 11:37 AM, Junio C Hamano wrote: >> Stefan Beller writes: >> >>> We do not need to do anything special to initialize the

[PATCHv5] submodule deinit: require '--all' instead of '.' for all submodules

The discussion in [1] pointed out that '.' is a faulty suggestion as there is a corner case where it fails: > "submodule deinit ." may have "worked" in the sense that you would > have at least one path in your tree and avoided this "nothing > matches" most of the time. It would have still failed

Re: [PATCH] git-gui: l10n: add Portuguese translation

Às 11:23 de 05-05-2016, Vasco Almeida escreveu: > Add Portuguese glossary. > > Signed-off-by: Vasco Almeida > --- > po/glossary/pt_pt.po | 177 > po/pt_pt.po | 2574 ++ > 2 files changed, 2751 insertions(+) >

Re: [PATCH v6 1/2] http: support sending custom HTTP headers

Lars Schneider writes: [administrivia: next time please snip the 224 lines you are not responding to when commenting on only five lines]. >> + >> + >> +Require expr %{HTTP:x-magic-one} == 'abra' >> +Require expr %{HTTP:x-magic-two} ==

Re: [PATCHv4] submodule deinit: require '--all' instead of '.' for all submodules

On Thu, May 5, 2016 at 12:20 PM, Jonathan Nieder wrote: > Junio C Hamano wrote: >> Jonathan Nieder writes: > >>> I mean low level as in implementation detail. The human user would >>> wonder "what is incompatible about them? Why are you stopping me from

Re: Submodule's .git file contains absolute path when created using 'git clone --recursive'

On Thu, May 5, 2016 at 12:20 PM, Loet Avramson wrote: > It happened on 2.8.1, also reproducible on 2.8.2. > Haven't had the time to dive deeper into the code but my guess is that > relative_path() returns different results in those 2 cases or maybe > the way git-submodule.sh

Re: [PATCH v16 0/7] config commit verbose

Pranit Bauva writes: > This series of patches add a configuration variable for verbose in > git-commit. > > Link to v15: > http://thread.gmane.org/gmane.comp.version-control.git/293127 > > Changes wrt v15: > * Remove the previous patch 7/7 and split the tests. Include

Re: Submodule's .git file contains absolute path when created using 'git clone --recursive'

It happened on 2.8.1, also reproducible on 2.8.2. Haven't had the time to dive deeper into the code but my guess is that relative_path() returns different results in those 2 cases or maybe the way git-submodule.sh handles it. On Thu, May 5, 2016 at 8:22 PM, Stefan Beller

Re: [PATCHv4] submodule deinit: require '--all' instead of '.' for all submodules

Junio C Hamano wrote: > Jonathan Nieder writes: >> I mean low level as in implementation detail. The human user would >> wonder "what is incompatible about them? Why are you stopping me from >> what I am trying to do?" > > Maybe s/incompatible/inconsistent/ is what you are

Re: [PATCH v16 7/7] commit: add a commit.verbose config variable

Pranit Bauva writes: > diff --git a/builtin/commit.c b/builtin/commit.c > index 391126e..114ffc9 100644 > --- a/builtin/commit.c > +++ b/builtin/commit.c > @@ -113,7 +113,9 @@ static char *edit_message, *use_message; > static char *fixup_message, *squash_message; >

Re: [PATCH v6 1/2] http: support sending custom HTTP headers

On 04 May 2016, at 08:14, Johannes Schindelin wrote: > We introduce a way to send custom HTTP headers with all requests. > > This allows us, for example, to send an extra token from build agents > for temporary access to private repositories. (This is the use case

Re: [PATCHv4] submodule deinit: require '--all' instead of '.' for all submodules

On Wed, May 4, 2016 at 4:59 PM, Jonathan Nieder wrote: >>> >>> Another option would be to call 'usage' and be done. >> >> I had that idea as well, but I think pointing out the low level is better >> than giving the high level again, so the user immediately sees what's wrong.

Re: [PATCHv4] submodule deinit: require '--all' instead of '.' for all submodules

On Thu, May 5, 2016 at 10:59 AM, Junio C Hamano wrote: > Stefan Beller writes: > +When the command is run without pathspec, it errors out, +instead of deinit-ing everything, to prevent mistakes. In +version 2.8 and before the command gave a

Re: [PATCHv4] submodule deinit: require '--all' instead of '.' for all submodules

Jonathan Nieder writes: > I mean low level as in implementation detail. The human user would > wonder "what is incompatible about them? Why are you stopping me from > what I am trying to do?" Maybe s/incompatible/inconsistent/ is what you are after? Why are you stopping

[PATCH v2] gitk: Add Portuguese translation

Signed-off-by: Vasco Almeida --- po/pt_pt.po | 1376 +++ 1 file changed, 1376 insertions(+) create mode 100644 po/pt_pt.po diff --git a/po/pt_pt.po b/po/pt_pt.po new file mode 100644 index 000..c181acc ---

Re: [PATCHv4] submodule deinit: require '--all' instead of '.' for all submodules

Stefan Beller writes: >>> +When the command is run without pathspec, it errors out, >>> +instead of deinit-ing everything, to prevent mistakes. In >>> +version 2.8 and before the command gave a suggestion to use >>> +'.' to unregister all submodules when it was invoked

[PATCH] gitk: Makefile: create install bin directory

Force creation of destination bin directory. Before this commit, gitk would fail to install if this directory didn't already exist. Signed-off-by: Vasco Almeida --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 5acdc90..5bdd52a

Re: [PATCH] git-gui: Do not reset author details on amend

Pat, we haven't heard from you for a long time. Are you still around and interested in helping us by maintaining git-gui? Otherwise we may have to start recruiting a volunteer or two to take this over. Thanks. Orgad Shaneh writes: > git commit --amend preserves the author

Re: Submodule's .git file contains absolute path when created using 'git clone --recursive'

On Thu, May 5, 2016 at 5:51 AM, Loet Avramson wrote: > Hi, > > According to git-clone man page - running 'git clone --recursive' "...is > equivalent to running 'git submodule update --init --recursive' immediately > after the clone is finished...", though I found a little

Re: Submodule's .git file contains absolute path when created using 'git clone --recursive'

Loet Avramson writes: > According to git-clone man page - running 'git clone --recursive' "...is > equivalent to running 'git submodule update --init --recursive' immediately > after the clone is finished...", though I found a little difference between > the two regarding the

Re: [PATCH] submodule: stop sanitizing config options

Jeff King writes: > Here's a version of my patch that should apply for you (no > semantic changes, just differences in the surrounding context): Sorry for the trouble. I queued jk/submodule-c-credential to be mergeable to 'maint', as it could be argued two ways. We can say that

Re: [RFC PATCH] gc --auto: don't lie about running in background on Windows

SZEDER Gábor writes: > Arguably this helper function could be just a simple variable. I > opted for a function because: > > - I preferred a single '#ifdef NO_POSIX_GOODIES', and putting a > static variable so near to EOF felt just wrong. (And this is why > it's not

[RFC PATCH] gc --auto: don't lie about running in background on Windows

When 'git gc --auto' is invoked it tells the user whether it is about to auto pack the repository in the background or in the foreground depending on 'gc.autoDetach' (enabled by default). However, going to the background is not supported at all on Windows, yet 'git gc --auto' by default claims

Re: [PATCH] t5510: run auto-gc in the foreground

Quoting Johannes Schindelin : Hi Gábor, On Tue, 3 May 2016, SZEDER Gábor wrote: Quoting SZEDER Gábor : >Quoting Johannes Schindelin : > > >Hi Gábor, > > > >On Sun, 1 May 2016, SZEDER Gábor wrote: > > > > >diff --git

[PATCH] git-gui: Do not reset author details on amend

git commit --amend preserves the author details unless --reset-author is given. git-gui discards the author details on amend. Fix by reading the author details along with the commit message, and setting the appropriate environment variables required for preserving them. Reported long ago in the

Submodule's .git file contains absolute path when created using 'git clone --recursive'

Hi, According to git-clone man page - running 'git clone --recursive' "...is equivalent to running 'git submodule update --init --recursive' immediately after the clone is finished...", though I found a little difference between the two regarding the submodule's .git file: 1. Running 'git

[PATCH] git-gui: l10n: add Portuguese translation

Add Portuguese glossary. Signed-off-by: Vasco Almeida --- po/glossary/pt_pt.po | 177 po/pt_pt.po | 2574 ++ 2 files changed, 2751 insertions(+) create mode 100644 po/glossary/pt_pt.po create mode 100644

Found possible branch point, then "Use of uninitialized value $u in substitution/concatenation"

Hi, I am converting my SVN repository to Git. git version 2.8.2.windows.1 Windows 8.1 Pro 64bits, running Git For Windows 32bits. I have found this error mentioned here: http://stackoverflow.com/questions/15387812/git-svn-found-possible-branch-point and here:

Re: [PATCH v2] gitweb: apply fallback encoding before highlight

> Oh, don't get me wrong. I do think what the patch does is very > sensible and have no intention of rejecting it. I'm sorry for making you worry, my poor English had caused some misunderstanding. I raised this Shift_JIS related problem (a.k.a "ダメ文字" in Japanese) might attract your interest

Re: [PATCH 83/83] builtin/am: use apply api in run_apply()

Hi Dscho, On Mon, Apr 25, 2016 at 5:03 PM, Johannes Schindelin wrote: > Hi Chris, > > On Sun, 24 Apr 2016, Christian Couder wrote: > >> [...] >> /* >>* If we are allowed to fall back on 3-way merge, don't give false >>* errors during the initial

[PATCH v16 6/7] t7507-commit-verbose: improve test coverage by testing number of diffs

Make the fake "editor" store output of grep in a file so that we can see how many diffs were contained in the message and use them in individual tests where ever it is required. A subsequent commit will introduce scenarios where it is important to be able to exactly determine how many diffs were

  1   2   >