Stefan Beller writes:
> So I guess we should test a bit more extensively, maybe
>
> git status >expect
> git submodule embedgitdirs
> git status >actual
> test_cmp expect actual
> # further testing via
> test -f ..
> test -d ..
Something along that line. "status shou
Stefan Beller writes:
> On Mon, Nov 21, 2016 at 1:03 PM, Stefan Beller wrote:
>> On Mon, Nov 21, 2016 at 1:01 PM, Junio C Hamano wrote:
>>>
>>> Can the effect of this change demonstrated in a new test? There
>>> must be a scenario where the current behaviour is broken and this
>>> change fixes
Dear Friend,
I am Mr.Daouda Ali the head of file department of Bank of
Africa(B.O.A) here in Burkina Faso / Ouagadougou. In my department we
discover an abandoned sum of (US$18 million US Dollars) in an account
that belongs to one of our foreign customer who died along with his
family in plane c
Stefan Beller writes:
> +Whenever a submodule configuration is parsed in
> `parse_submodule_config_option`
> +via e.g. `gitmodules_config()`, it will be overwrite the null_sha1 entry.
It will overwrite? It will be overwritten? I guess it is the latter?
> +So in the normal case, when HEAD:.gi
Jonathan Nieder writes:
> This trips reproducibly for
>
> git ls-remote https://kernel.googlesource.com/pub/scm/git/git
>
> when run outside of a git repository.
>
> Backtrace:
>
> #0 setup_git_env () at environment.c:172
> #1 get_git_dir () at environment.c:214
> #2 get_helper at tran
Stefan Beller writes:
> It is also possible to pass in a tree hash to lookup a submodule config.
> Make it clear by naming the variables accrodingly. Looking up a submodule
> config by tree hash will come in handy in a later patch.
>
> Signed-off-by: Stefan Beller
> ---
Yeah, I noticed that whi
Stefan Beller writes:
> There is no other user of config_from_{name, path}, such that there is no
> reason for the existence of these one liner functions. Just inline these
> to increase readability.
>
> Signed-off-by: Stefan Beller
> Signed-off-by: Junio C Hamano
> ---
Makes sense.
On Mon, Nov 21, 2016 at 04:44:21PM -0800, Jonathan Nieder wrote:
> > git_dir = getenv(GIT_DIR_ENVIRONMENT);
> > - if (!git_dir)
> > + if (!git_dir) {
> > + if (!startup_info->have_repository)
> > + die("BUG: setup_git_env called without repository");
> >
On Mon, Nov 21, 2016 at 1:14 PM, Junio C Hamano wrote:
>
> Does this format correctly?
>
> I somehow thought that second and subsequent paragraphs continued
> with "+" want no indentation before them. See for example the
> Values section in config.txt and see how entries for boolean:: and
> color
replacing sb/submodule-config-cleanup
v3:
diff to current origin/sb/submodule-config-cleanup:
diff --git a/Documentation/technical/api-submodule-config.txt
b/Documentation/technical/api-submodule-config.txt
index 1df7a827ff..e06a3fd2de 100644
--- a/Documentation/technical/api-submodule-config.txt
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
Documentation/technical/api-submodule-config.txt | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/technical/api-submodule-config.txt
b/Documentation/technical/api-submodule-config.txt
index 76
It is also possible to pass in a tree hash to lookup a submodule config.
Make it clear by naming the variables accrodingly. Looking up a submodule
config by tree hash will come in handy in a later patch.
Signed-off-by: Stefan Beller
---
Documentation/technical/api-submodule-config.txt | 8 ++---
There is no other user of config_from_{name, path}, such that there is no
reason for the existence of these one liner functions. Just inline these
to increase readability.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
submodule-config.c | 16 ++--
1 file changed, 2
On Mon, Nov 21, 2016 at 4:16 PM, Brandon Williams wrote:
> On 11/21, Stefan Beller wrote:
>> On Mon, Nov 21, 2016 at 4:11 PM, Brandon Williams wrote:
>> > On 11/21, Stefan Beller wrote:
>> >>
>> >> switch (lookup_type) {
>> >> @@ -448,7 +448,8 @@ static const struct submodule *config_from(s
Okay Pranit,
this is the last patch for me to review in this series.
Now that I have a coarse overview of what you did, I have the general
remark that imho the "terms" variable should simply be global instead of
being passed around all the time.
I also had some other remarks but I forgot them...
Hi,
Jeff King wrote:
> This passes the test suite (after the adjustments in the
> previous patches), but there's a risk of regression for any
> cases where the fallback usually works fine but the code
> isn't exercised by the test suite. So by itself, this
> commit is a potential step backward,
On 11/21, Stefan Beller wrote:
> On Mon, Nov 21, 2016 at 4:11 PM, Brandon Williams wrote:
> > On 11/21, Stefan Beller wrote:
> >>
> >> switch (lookup_type) {
> >> @@ -448,7 +448,8 @@ static const struct submodule *config_from(struct
> >> submodule_cache *cache,
> >>
> >> /* fill the s
On Mon, Nov 21, 2016 at 4:11 PM, Brandon Williams wrote:
> On 11/21, Stefan Beller wrote:
>>
>> switch (lookup_type) {
>> @@ -448,7 +448,8 @@ static const struct submodule *config_from(struct
>> submodule_cache *cache,
>>
>> /* fill the submodule config into the cache */
>> para
Hi,
On 10/14/2016 04:14 PM, Pranit Bauva wrote:
> Reimplement the `bisect_state` shell function in C and also add a
> subcommand `--bisect-state` to `git-bisect--helper` to call it from
> git-bisect.sh .
>
> Using `--bisect-state` subcommand is a temporary measure to port shell
> function to C so
On 11/21, Stefan Beller wrote:
>
> switch (lookup_type) {
> @@ -448,7 +448,8 @@ static const struct submodule *config_from(struct
> submodule_cache *cache,
>
> /* fill the submodule config into the cache */
> parameter.cache = cache;
> - parameter.commit_sha1 = commit_sha
On 11/21, Stefan Beller wrote:
> Signed-off-by: Stefan Beller
> Signed-off-by: Junio C Hamano
> ---
> Documentation/technical/api-submodule-config.txt | 7 +--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/technical/api-submodule-config.txt
> b/Documentat
On Mon, Nov 21, 2016 at 1:03 PM, Stefan Beller wrote:
> On Mon, Nov 21, 2016 at 1:01 PM, Junio C Hamano wrote:
>>
>> Can the effect of this change demonstrated in a new test? There
>> must be a scenario where the current behaviour is broken and this
>> change fixes an incorrect computation of re
On Mon, Nov 21, 2016 at 11:12:39AM -0800, Junio C Hamano wrote:
> > Yeah, I noticed that while reading the patch. My b9605bc4f2 did regress
> > this case, but called out the fact that "cd subdir && git stripspace"
> > would never have worked. So one step back, 2 steps forward, and Dscho's
> > patc
There is no other user of config_from_{name, path}, such that there is no
reason for the existence of these one liner functions. Just inline these
to increase readability.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
submodule-config.c | 16 ++--
1 file changed, 2
It is also possible to pass in a tree hash to lookup a submodule config.
Make it clear by naming the variables accrodingly. Looking up a submodule
config by tree hash will come in handy in a later patch.
Signed-off-by: Stefan Beller
---
Documentation/technical/api-submodule-config.txt | 8 ++--
replacing sb/submodule-config-cleanup
v2:
addressed Jacobs concerns in patch2, fixing all occurrences of commit_sha1.
Thanks,
Stefan
interdiff to v1:
diff --git a/Documentation/technical/api-submodule-config.txt
b/Documentation/technical/api-submodule-config.txt
index 1df7a827ff..a91c1f085e 100
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
Documentation/technical/api-submodule-config.txt | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/technical/api-submodule-config.txt
b/Documentation/technical/api-submodule-config.txt
index 76
On Mon, Nov 21, 2016 at 3:14 PM, Junio C Hamano wrote:
>>
>> I did review both off and on list and I think the latest version is good.
>
> I thought that there were strange mixups of two enumeration types
> that are incompatible, at least. Is there an update that I didn't
> see, or you didn't rea
Stefan Beller writes:
>> * bw/grep-recurse-submodules (2016-11-18) 6 commits
>> - grep: search history of moved submodules
>> - grep: enable recurse-submodules to work on objects
>> - grep: optionally recurse into submodules
>> - grep: add submodules as a grep source type
>> - submodules: l
Stefan Beller writes:
>> * sb/push-make-submodule-check-the-default (2016-10-10) 2 commits
>> - push: change submodule default to check when submodules exist
>> - submodule add: extend force flag to add existing repos
>>
>> Turn the default of "push.recurseSubmodules" to "check" when
>> submo
> * sb/push-make-submodule-check-the-default (2016-10-10) 2 commits
> - push: change submodule default to check when submodules exist
> - submodule add: extend force flag to add existing repos
>
> Turn the default of "push.recurseSubmodules" to "check" when
> submodules seem to be in use.
>
>
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.
You can find the changes described
On 11/21, Stefan Beller wrote:
> diff --git a/t/t7412-submodule-interngitdirs.sh
> b/t/t7412-submodule-interngitdirs.sh
> new file mode 100755
> index 00..8938a4c8b7
> --- /dev/null
> +++ b/t/t7412-submodule-interngitdirs.sh
> @@ -0,0 +1,41 @@
> +#!/bin/sh
> +
> +test_description='Test sub
Hi Pranit,
in this mail I review the "second part" of your patch: the transition of
bisect_next and bisect_auto_next to C.
On 10/14/2016 04:14 PM, Pranit Bauva wrote:
> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
> index 1d3e17f..fcd7574 100644
> --- a/builtin/bisect--helper.
Stefan Beller writes:
> +interngitdirs::
> + Move the git directory of submodules into its superprojects
> + `$GIT_DIR/modules` path and then connect the git directory and
> + its working directory by setting the `core.worktree` and adding
> + a .git file pointing to the git direc
Jonathan Tan writes:
> In commit 1462450 ("trailer: allow non-trailers in trailer block",
> 2016-10-21), functionality was added (and tested [1]) to allow
> non-trailer lines in trailer blocks, as long as those blocks contain at
> least one Git-generated or user-configured trailer, and consists o
Stefan Beller writes:
> 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
On Mon, Nov 21, 2016 at 1:01 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> Subject: Re: [PATCH 1/3] submodule: use absolute path for computing relative
>> path connecting
>
> connecting what? IOW, has the subject line somehow truncated?
>
>> This addresses a similar concern as in f8eaa
Stefan Beller writes:
> Subject: Re: [PATCH 1/3] submodule: use absolute path for computing relative
> path connecting
connecting what? IOW, has the subject line somehow truncated?
> This addresses a similar concern as in f8eaa0ba98b (submodule--helper,
> module_clone: always operate on absol
On Mon, Nov 21, 2016 at 12:48 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> The discussion of the submodule checkout series revealed to me
>> that a command is needed to move the git directory from the
>> submodules working tree to be embedded into the superprojects git
>> directory.
>
>
Stefan Beller writes:
> The discussion of the submodule checkout series revealed to me
> that a command is needed to move the git directory from the
> submodules working tree to be embedded into the superprojects git
> directory.
You used "move" here, and "migrate" in the function name in 3/3,
b
In commit 1462450 ("trailer: allow non-trailers in trailer block",
2016-10-21), functionality was added (and tested [1]) to allow
non-trailer lines in trailer blocks, as long as those blocks contain at
least one Git-generated or user-configured trailer, and consists of at
least 25% trailers. The do
The discussion of the submodule checkout series revealed to me that a command
is needed to move the git directory from the submodules working tree to be
embedded into the superprojects git directory.
So I wrote the code to intern the submodules git dir into the superproject,
but whilst writing th
This addresses a similar concern as in f8eaa0ba98b (submodule--helper,
module_clone: always operate on absolute paths, 2016-03-31)
When computing the relative path from one to another location, we
need to provide both locations as absolute paths to make sure the
computation of the relative path is
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 embedded
into the superprojects git directory.
Signed-off-by: Stefan Beller
---
Documentation/git-subm
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
---
t/test-lib-fu
Junio C Hamano writes:
> @@ -93,8 +93,17 @@ eval '
> GIT_CHERRY_PICK_HELP="$resolvemsg"
> export GIT_CHERRY_PICK_HELP
>
> -comment_char=$(git config --get core.commentchar 2>/dev/null | cut -c1)
> -: ${comment_char:=#}
> +comment_char=$(git config --get core.commentchar 2>/dev/null)
> +case "
Junio C Hamano writes:
> From: Johannes Schindelin
>
> The way "git stripspace" reads the configuration was not quite
> correct, in that it forgot to probe for a possibly existing
> repository (note: stripspace is designed to be usable outside the
> repository as well) before doing so. Due to t
Junio C Hamano writes:
> From: Johannes Schindelin
>
> The interactive rebase does not currently play well with
> core.commentchar. Let's add some tests to highlight those problems
> that will be fixed in the remainder of the series.
>
> Signed-off-by: Johannes Schindelin
> Signed-off-by: Junio
Dear Friend,
I am soliciting your partnership to relocation $9 Million to your country for
investment on my behalf and you will be entitled to 30% of the sum once the
transaction is successful made, please indicate your interest if you are
capable so that i will send you details of the transact
Am 21.11.2016 um 20:07 schrieb Junio C Hamano:
Setting comment-char to multi-letter sequence is not supported at
all, and this code is protecting itself from that nonsense---it does
not need to be fast, and Dscho already gives a fast path for a
single letter case in his patch.
Fair enough, no p
Jeff King writes:
> On Mon, Nov 21, 2016 at 10:15:43AM -0800, Junio C Hamano wrote:
>
>> > + test_cmp expect actual
>> > +'
>> > +
>>
>> Is this a recent regression? When applied on top of 'maint' or
>> older, it seems to pass just fine.
>>
>> ... Goes and looks ...
>>
>> Interesting. P
Johannes Sixt writes:
> Am 21.11.2016 um 19:40 schrieb Junio C Hamano:
>> Johannes Sixt writes:
>>> It could be written without forking a process:
>>>
>>> comment_char=${comment_char%${comment_char#?}}
>>>
>>> (aka "remove from the end what remains after removing the first character")
>>
>>
From: Johannes Schindelin
The way "git stripspace" reads the configuration was not quite
correct, in that it forgot to probe for a possibly existing
repository (note: stripspace is designed to be usable outside the
repository as well) before doing so. Due to this, .git/config was
read only when
From: Johannes Schindelin
When 84c9dc2 (commit: allow core.commentChar=auto for character auto
selection, 2014-05-17) extended the core.commentChar functionality to
allow for the value 'auto', it forgot that rebase -i was already taught to
handle core.commentChar, and in turn forgot to let rebase
From: Johannes Schindelin
The interactive rebase does not currently play well with
core.commentchar. Let's add some tests to highlight those problems
that will be fixed in the remainder of the series.
Signed-off-by: Johannes Schindelin
Signed-off-by: Junio C Hamano
---
t/t0030-stripspace.sh
Am 21.11.2016 um 19:40 schrieb Junio C Hamano:
Johannes Sixt writes:
It could be written without forking a process:
comment_char=${comment_char%${comment_char#?}}
(aka "remove from the end what remains after removing the first character")
Hopefully nobody would include any glob meta
On Mon, Nov 21, 2016 at 10:17 AM, Stefan Beller wrote:
> On Mon, Nov 21, 2016 at 8:56 AM, Jacob Keller wrote:
>> On Mon, Nov 21, 2016 at 12:11 AM, KES wrote:
>>> Hi.
>>>
>>
>> Hi,
>>
>>> I have some question about how diff works then give proposal:
>>>
>>> it will be very useful for each "symbol
On Mon, Nov 21, 2016 at 10:15:43AM -0800, Junio C Hamano wrote:
> > + test_cmp expect actual
> > +'
> > +
>
> Is this a recent regression? When applied on top of 'maint' or
> older, it seems to pass just fine.
>
> ... Goes and looks ...
>
> Interesting. Peff's b9605bc4f2 ("config: only
Johannes Sixt writes:
> comment_char is a command? Did you mean
>
> comment_char=$(echo "$comment_char" | cut -c1)
;-)
> It could be written without forking a process:
>
> comment_char=${comment_char%${comment_char#?}}
>
> (aka "remove from the end what remains after removing the fi
Am 21.11.2016 um 15:18 schrieb Johannes Schindelin:
-comment_char=$(git config --get core.commentchar 2>/dev/null | cut -c1)
-: ${comment_char:=#}
+comment_char=$(git config --get core.commentchar 2>/dev/null)
+case "$comment_char" in
+''|auto)
+ comment_char=#
+ ;;
+?)
+ ;;
+*)
Junio C Hamano writes:
>> +test_expect_failure '-c with comment char defined in .git/config' '
>> +test_config core.commentchar = &&
>> +printf "= foo\n" >expect &&
>> +printf "foo" | git stripspace -c >actual &&
>
> We'd want "\n" on this printf to match the one before as well, as
>
On Mon, Nov 21, 2016 at 8:56 AM, Jacob Keller wrote:
> On Mon, Nov 21, 2016 at 12:11 AM, KES wrote:
>> Hi.
>>
>
> Hi,
>
>> I have some question about how diff works then give proposal:
>>
>> it will be very useful for each "symbol" store additional meta info as
>> source line length. So in this
Johannes Schindelin writes:
> diff --git a/t/t0030-stripspace.sh b/t/t0030-stripspace.sh
> index 29e91d8..202ac07 100755
> --- a/t/t0030-stripspace.sh
> +++ b/t/t0030-stripspace.sh
> @@ -432,6 +432,13 @@ test_expect_success '-c with changed comment char' '
> test_cmp expect actual
> '
>
On 11/18, Brandon Williams wrote:
> Also, in order to use the tree_entry_interesting code it looks like I'll
> either have to pipe through a flag saying 'yes i want to match against
> submodules' like I did for the other pathspec codepath. Either that or
> add functionality to perform wildmatchin
> -Original Message-
> From: Stefan Beller [mailto:sbel...@google.com]
> >> + if (submodule_is_interesting(old->name,
> null_sha1)
> >> + && ok_to_remove_submodule(old->name))
> >> + return 0;
Johannes Schindelin writes:
> Hi,
>
> On Sun, 20 Nov 2016, Jiang Xin wrote:
>
>> Fixed unmatched single quote introduced by commit:
>>
>> * f56fffef9a sequencer: teach write_message() to append an optional LF
>>
>> Signed-off-by: Jiang Xin
>
> ACK!
>
> Thank you,
> Dscho
Thanks, both.
Jacob Keller writes:
>> We have %s and %b so that we can reconstruct the whole thing by
>> using both. It is unclear how %bT fits in this picture. I wonder
>> if we also need another placeholder that expands to the body of the
>> message without the trailer---otherwise the whole set would becom
On Mon, Nov 21, 2016 at 6:18 AM, Johannes Schindelin
wrote:
> The Git for Windows project recently got a bug report that detailed how
> `git rebase -i` fails when core.commentchar=auto:
>
> https://groups.google.com/forum/#!topic/git-for-windows/eOZKjkgyX1Q
>
> This patch series fixes reba
On Mon, Nov 21, 2016 at 12:11 AM, KES wrote:
> Hi.
>
Hi,
> I have some question about how diff works then give proposal:
>
> it will be very useful for each "symbol" store additional meta info as source
> line length. So in this case when git counter two equal sequence of commands
> it will do
When eff80a9 (Allow custom "comment char", 2013-01-16) taught the
`stripspace` command to respect the config setting `core.commentChar`,
it forgot that this variable may be defined in .git/config.
So when rebasing interactively with a commentChar defined in the current
repository's config, the hel
Hi,
On Sun, 20 Nov 2016, Jiang Xin wrote:
> Fixed unmatched single quote introduced by commit:
>
> * f56fffef9a sequencer: teach write_message() to append an optional LF
>
> Signed-off-by: Jiang Xin
ACK!
Thank you,
Dscho
When 84c9dc2 (commit: allow core.commentChar=auto for character auto
selection, 2014-05-17) extended the core.commentChar functionality to
allow for the value 'auto', it forgot that rebase -i was already taught to
handle core.commentChar, and in turn forgot to let rebase -i handle that
new value gr
The interactive rebase does not currently play well with
core.commentchar. Let's add some tests to identify those problems.
Signed-off-by: Johannes Schindelin
---
t/t0030-stripspace.sh | 7 +++
t/t3404-rebase-interactive.sh | 12
2 files changed, 19 insertions(+)
diff
The Git for Windows project recently got a bug report that detailed how
`git rebase -i` fails when core.commentchar=auto:
https://groups.google.com/forum/#!topic/git-for-windows/eOZKjkgyX1Q
This patch series fixes rebase -i's handling of core.commentchar.
Johannes Schindelin (3):
reba
As the subject says, these two commands give identical behaviour:
git rebase --interactive --keep-empty --root
and:
git rebase --interactive --root
I.e. --keep-empty has no effect when --root is specified.
Ideas for workaround welcome.
Regards
--
Pierre Ossman Softw
Karthik Nayak writes:
> cc'in Matthieu since he wrote the patch.
>
> On Sat, Nov 19, 2016 at 4:16 AM, Jakub Narębski wrote:
>> W dniu 08.11.2016 o 21:12, Karthik Nayak pisze:
>>> From: Karthik Nayak
>>>
>>> Introduce setup_ref_filter_porcelain_msg() so that the messages used in
>>> the atom %(u
Hi.
I have some question about how diff works then give proposal:
it will be very useful for each "symbol" store additional meta info as source
line length. So in this case when git counter two equal sequence of commands it
will do further comparison: Adds 23 chars deletes none VS adds 75 chars
78 matches
Mail list logo
