Hi,
Quoting Jacob Keller :
From: Jacob Keller
Extract email aliases from the sendemail.aliasesfile according to the
known types. Implementation only extracts the alias name and does not
attempt to complete email addresses.
Add a few tests for simple layouts of the currently supported alias
We need the submodule update strategies in a later patch.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
submodule-config.c | 11 +++
submodule-config.h | 1 +
2 files changed, 12 insertions(+)
diff --git a/submodule-config.c b/submodule-config.c
index afe0ea8..4239b0e
This replaces sb/submodule-parallel-update.
It applies on top of d075d2604c0 (Merge branch
'rs/daemon-plug-child-leak' into sb/submodule-parallel-update,
with additionally having merged submodule-parallel-fetch,
which has applied "run-command: detect finished
children by closed pipe rather than wai
`name_and_item_from_var` does not provide the proper abstraction
we need here in a later patch.
Signed-off-by: Stefan Beller
---
submodule-config.c | 48
1 file changed, 16 insertions(+), 32 deletions(-)
diff --git a/submodule-config.c b/submodul
This allows to configure fetching and updating in parallel
without having the command line option.
This moved the responsibility to determine how many parallel processes
to start from builtin/fetch to submodule.c as we need a way to communicate
"The user did not specify the number of parallel proc
This introduces a new helper function in git submodule--helper
which takes care of cloning all submodules, which we want to
parallelize eventually.
Some tests (such as empty URL, update_mode=none) are required in the
helper to make the decision for cloning. These checks have been
moved into the C
This commit serves 2 purposes. First this may help the user who
tries to diagnose intermixed process calls. Second this may be used
in a later patch for testing. As the output of a command should not
change visibly except for going faster, grepping for the trace output
seems like a viable testing s
This rewrites parse_config to distinguish between configs specific to
one submodule and configs which apply generically to all submodules.
We do not have generic submodule configs yet, but the next patch will
introduce "submodule.jobs".
Signed-off-by: Stefan Beller
---
submodule-config.c | 41 ++
Expose possible parallelism either via the "--jobs" CLI parameter or
the "submodule.jobs" setting.
By having the variable initialized to -1, we make sure 0 can be passed
into the parallel processing machine, which will then pick as many parallel
workers as there are CPUs.
Signed-off-by: Stefan Be
Just pass it along to "git submodule update", which may pick reasonable
defaults if you don't specify an explicit number.
Signed-off-by: Stefan Beller
---
Documentation/git-clone.txt | 6 +-
builtin/clone.c | 19 +--
t/t7406-submodule-update.sh | 15 +
Adhere to the common coding style of Git and not check explicitly
for NULL throughout the file. There are still other occurrences in the
code base but that is usually inside of conditions with side effects.
Signed-off-by: Stefan Beller
---
submodule-config.c | 8
1 file changed, 4 inser
On Fri, Nov 13, 2015 at 4:10 PM, Doug Kelly wrote:
> When checking for pack garbage, .bitmap files are now detected as
> garbage when not associated with another .pack/.idx file.
>
> Signed-off-by: Doug Kelly
> ---
> t/t5304-prune.sh | 24 +---
> 1 file changed, 21 insertions
Yes, without a doubt. I think I'm blaming this one on being late on a
Friday afternoon, and really not thinking out the logic clearly. :)
On Fri, Nov 13, 2015 at 4:43 PM, Stefan Beller wrote:
>> + else if (seen_bits & PACKDIR_FILE_PACK && seen_bits ^
>> ~PACKDIR_FILE_IDX)
>
> as just talk
.bitmap and .keep files without .idx/.pack don't make much sense, so
make sure these are reported as garbage as well. At the same time,
refactoring report_garbage to handle extra bits.
Signed-off-by: Doug Kelly
---
builtin/count-objects.c | 16 ++--
cache.h | 4 +++-
Similar to cleaning up excess .idx files, clean any garbage .bitmap
files that are not otherwise associated with any .idx/.pack files.
Signed-off-by: Doug Kelly
---
builtin/gc.c | 12 ++--
t/t5304-prune.sh | 2 +-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/built
When checking for pack garbage, .bitmap files are now detected as
garbage when not associated with another .pack/.idx file.
Signed-off-by: Doug Kelly
---
t/t5304-prune.sh | 24 +---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/t/t5304-prune.sh b/t/t5304-prun
> + else if (seen_bits & PACKDIR_FILE_PACK && seen_bits ^
> ~PACKDIR_FILE_IDX)
as just talked about: did you mention && !(seen_bits & FILE_IDX)
>
> + if (seen_bits ==
> (PACKDIR_FILE_PACK|PACKDIR_FILE_IDX|PACKDIR_FILE_BITMAP))
> + return;
> +
> + if (seen_bits ==
Test message. Please ignore.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
.bitmap and .keep files without .idx/.pack don't make much sense, so
make sure these are reported as garbage as well. At the same time,
refactoring report_garbage to handle extra bits.
Signed-off-by: Doug Kelly
---
builtin/count-objects.c | 16 ++--
cache.h | 4 +++-
Following Peff and Junio's comments when adding support for cleaning garbage
.idx files left in the pack directory, this patch introduces the ability to
detect garbage .bitmap files. Additionally, .keep files are still reported,
but no action is taken to clean them.
This includes some refactor ar
Similar to cleaning up excess .idx files, clean any garbage .bitmap
files that are not otherwise associated with any .idx/.pack files.
Signed-off-by: Doug Kelly
---
builtin/gc.c | 12 ++--
t/t5304-prune.sh | 2 +-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/built
When checking for pack garbage, .bitmap files are now detected as
garbage when not associated with another .pack/.idx file.
Signed-off-by: Doug Kelly
---
t/t5304-prune.sh | 24 +---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/t/t5304-prune.sh b/t/t5304-prun
On Fri, Nov 13, 2015 at 3:41 PM, Jeff King wrote:
> On Fri, Nov 13, 2015 at 06:38:07PM -0500, Jeff King wrote:
>
>> On Fri, Nov 13, 2015 at 03:16:01PM -0800, Stefan Beller wrote:
>>
>> > Junio wrote on Oct 09, 2014:
>> > > This is so non-standard a thing to do that I doubt it is worth
>> > > suppo
On Fri, Nov 13, 2015 at 04:29:15PM +0100, Andreas Krey wrote:
> > Likewise, I think dir.c:remove_dir_recurse is in a similar boat.
> > Grepping for resolve_gitlink_ref, it looks like there may be others,
> > too.
>
> Can't we handle this in resolve_gitlink_ref itself? As I understand it,
> it sho
On Fri, Nov 13, 2015 at 03:19:07PM +0100, Andreas Krey wrote:
> On Sat, 04 Apr 2015 15:55:07 +, Jeff King wrote:
> ...
> > I think this is the same issue that was discussed here:
> >
> > http://thread.gmane.org/gmane.comp.version-control.git/265560/focus&5585
> >
> > There is some discussi
On Fri, Nov 13, 2015 at 06:38:07PM -0500, Jeff King wrote:
> On Fri, Nov 13, 2015 at 03:16:01PM -0800, Stefan Beller wrote:
>
> > Junio wrote on Oct 09, 2014:
> > > This is so non-standard a thing to do that I doubt it is worth
> > > supporting with "git clone". "git clone --branch", which is ab
On Fri, Nov 13, 2015 at 03:16:01PM -0800, Stefan Beller wrote:
> Junio wrote on Oct 09, 2014:
> > This is so non-standard a thing to do that I doubt it is worth
> > supporting with "git clone". "git clone --branch", which is about
> "> I want to follow that particular branch", would not mesh well
On Fri, Nov 13, 2015 at 11:10:44PM +, Dominik Rauch wrote:
> However, I don't think the default simplification algorithm is a good
> default when used in combination with "--merges". "git log --merges
> file" looks very natural if I want to answer the question "When has
> file been merged into
On Fri, Nov 13, 2015 at 10:33:03AM +0100, Clemens Buchacher wrote:
> Since ec7dbd145 (receive-pack: allow hooks to ignore its standard input
> stream)
> the pre-receive and post-receive hooks ignore SIGPIPE. Do the same for the
> remaining hooks pre-push and post-rewrite, which read from standard
On Fri, Nov 13, 2015 at 10:41 AM, Stefan Beller wrote:
> On Thu, Nov 12, 2015 at 9:35 PM, Jeff King wrote:
>>
>> Hrm. Do we want to make these workarounds work correctly? Or is the
>> final solution going to be that the first command you gave simply works,
>> and no workarounds are needed. If th
Thank you Jeff for your elaboration! The algorithm is now clear to me and I can
see why the log has been empty.
However, I don't think the default simplification algorithm is a good default
when used in combination with "--merges". "git log --merges file" looks very
natural if I want to answer
On Fri, Nov 13, 2015 at 11:47:40PM +0100, Fredrik Medley wrote:
> > Hmm. Now I'm a bit puzzled. It sounds like the installed file does have
> > @SHELL_PATH@ set to /bin/sh, which is normal. And presumably the setting
> > containing space is coming from the $SHELL environment variable.
> I wrote th
2015-11-13 23:27 GMT+01:00 Jeff King :
> On Fri, Nov 13, 2015 at 04:25:18PM +0100, Fredrik Medley wrote:
>
>> >> - ${SHELL:-@SHELL_PATH@} -c "$rest" # Actual execution
>> >> + "${SHELL:-@SHELL_PATH@}" -c "$rest" # Actual execution
>> >
>> > I think this is the right thing to
On Fri, Nov 13, 2015 at 04:21:36PM +, Dominik Rauch wrote:
> (This is my first post to this mailing list and I couldn't find a FAQ
> section - please excuse me, if I haven't followed all the established
> posting guidelines yet.)
This is the right place. Welcome. :)
> I have the following re
On Fri, Nov 13, 2015 at 04:25:18PM +0100, Fredrik Medley wrote:
> >> - ${SHELL:-@SHELL_PATH@} -c "$rest" # Actual execution
> >> + "${SHELL:-@SHELL_PATH@}" -c "$rest" # Actual execution
> >
> > I think this is the right thing to do (at least I could not think of a
> > case
On Fri, Nov 13, 2015 at 01:41:23PM -0800, Jacob Keller wrote:
> On Thu, Nov 12, 2015 at 9:38 PM, Jeff King wrote:
> >> Is it possible to exactly replicate the default "git log" format with a
> >> format string?
> >
> > Sadly, no, I don't think it is possible with the current format
> > specifiers
On Thu, Nov 12, 2015 at 9:38 PM, Jeff King wrote:
>> Is it possible to exactly replicate the default "git log" format with a
>> format string?
>
> Sadly, no, I don't think it is possible with the current format
> specifiers. It would be nice if it was, though.
>
> -Peff
> --
Isn't this something
On Fri, Nov 13, 2015 at 12:47 PM, Jens Lehmann wrote:
> Am 12.11.2015 um 00:34 schrieb Stefan Beller:
>>
>> On Wed, Nov 11, 2015 at 11:55 AM, Jens Lehmann
>> wrote:
TL;DR: checkout is serial, network-related stuff only will be using
submodule.jobs
>>>
>>>
>>>
>>> My point bein
Am 12.11.2015 um 00:34 schrieb Stefan Beller:
On Wed, Nov 11, 2015 at 11:55 AM, Jens Lehmann wrote:
TL;DR: checkout is serial, network-related stuff only will be using
submodule.jobs
My point being: isn't "jobs" a bit too generic for a config option that
is only relevant for network-related
On 13/11/15 08:57, Eric Sunshine wrote:
> On Fri, Nov 13, 2015 at 3:46 AM, Lars Schneider
> wrote:
>> On 11 Nov 2015, at 18:49, Ramsay Jones wrote:
>>> On 11/11/15 02:00, Stefan Beller wrote:
On Tue, Nov 10, 2015 at 5:22 PM, Eric Sunshine
wrote:
> On Tue, Nov 10, 2015 at 7:23 PM
On Thu, Nov 12, 2015 at 9:35 PM, Jeff King wrote:
>
> Hrm. Do we want to make these workarounds work correctly? Or is the
> final solution going to be that the first command you gave simply works,
> and no workarounds are needed. If the latter, I wonder if we want to be
> adding tests for the wor
From: Jacob Keller
Extract email aliases from the sendemail.aliasesfile according to the
known types. Implementation only extracts the alias name and does not
attempt to complete email addresses.
Add a few tests for simple layouts of the currently supported alias
filetypes.
Signed-off-by: Jacob
If a subtree was added using a tag ref, the tag ref is stored in
the subtree commit message instead of the underlying commit's ref.
To split or push subsequent changes to the subtree, the subtree
command needs to unwrap the tag ref. This patch makes it do so.
The problem was described in a messag
Fredrik Medley writes:
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -610,7 +610,7 @@ do_next () {
> read -r command rest < "$todo"
> mark_action_done
> printf 'Executing: %s\n' "$rest"
> - ${SHELL:-@SHELL_PATH@} -
Hello!
(This is my first post to this mailing list and I couldn't find a FAQ section -
please excuse me, if I haven't followed all the established posting guidelines
yet.)
I have the following repository tree:
C
|\
| B
| /
A
Commit A: Parents=(). Initial commit. Contains file foo with conten
Hi all,
we also ran into the maximum rename limit
in the rename detection. (Yes, we get a lot
of rename candidates when cherry-picking
between two specific releases.)
The code talks about limiting the size
of the rename matrix, but as far as I
can see, the matrix itself never exists
as such, and
From: Jacob Keller
Create a new expansion function, expand_loose_notes_ref which will
expand any ref using get_sha1, but falls back to expand_notes_ref if
this fails. The contents of the strbuf will be either the hex string of
the sha1, or the expanded notes ref. It is expected to be re-expanded
On Tue, 17 Mar 2015 01:48:00 +, Jeff King wrote:
> On Mon, Mar 16, 2015 at 10:35:18PM -0700, Junio C Hamano wrote:
>
> > > It looks like we don't even really care about the value of HEAD. We just
> > > want to know "is it a git directory?". I think in other places (like
> > > "git add"), we ju
2015-11-13 7:25 GMT+01:00 Jeff King :
> On Fri, Nov 13, 2015 at 07:03:19AM +0100, Fredrik Medley wrote:
>
>> On Windows, when Git is installed under "C:\Program Files\Git", SHELL_PATH
>> will include a space. Fix "git rebase --interactive --exec" so that it
>> works with spaces in SHELL_PATH.
>>
>>
On Thu, Nov 12, 2015 at 08:32:29PM -0600, David Greene wrote:
> Sending again with a proper From: address after rebasing on latest master.
>
> Copying the maintainers because the origin patchset didn't get any
> comments and I'm unsure of how to proceed.
>
> These are some old changes I have lyin
On Sat, 04 Apr 2015 15:55:07 +, Jeff King wrote:
...
> I think this is the same issue that was discussed here:
>
> http://thread.gmane.org/gmane.comp.version-control.git/265560/focus&5585
>
> There is some discussion of a possible fix in that thread. I was hoping
> that Andreas was going to
> On 13 Nov 2015, at 11:32, Torsten Bögershausen wrote:
>
> On 2015-11-13 09.57, Eric Sunshine wrote:
>> On Fri, Nov 13, 2015 at 3:46 AM, Lars Schneider
>> wrote:
>>> On 11 Nov 2015, at 18:49, Ramsay Jones wrote:
On 11/11/15 02:00, Stefan Beller wrote:
> On Tue, Nov 10, 2015 at 5:22 P
On 2015-11-13 09.57, Eric Sunshine wrote:
> On Fri, Nov 13, 2015 at 3:46 AM, Lars Schneider
> wrote:
>> On 11 Nov 2015, at 18:49, Ramsay Jones wrote:
>>> On 11/11/15 02:00, Stefan Beller wrote:
On Tue, Nov 10, 2015 at 5:22 PM, Eric Sunshine
wrote:
> On Tue, Nov 10, 2015 at 7:23 PM
On Fri, Nov 13, 2015 at 01:17:29AM -0500, Jeff King wrote:
>
> The test below reliably fails without your patch and passes with it, and
> seems to run reasonably quickly for me:
Thank you. I confirm the same behavior on my system. Below I have added
your change to the patch.
-->o--
Since ec7dbd1
On Fri, Nov 13, 2015 at 3:46 AM, Lars Schneider
wrote:
> On 11 Nov 2015, at 18:49, Ramsay Jones wrote:
>> On 11/11/15 02:00, Stefan Beller wrote:
>>> On Tue, Nov 10, 2015 at 5:22 PM, Eric Sunshine
>>> wrote:
On Tue, Nov 10, 2015 at 7:23 PM, Ramsay Jones
wrote:
> Commit f8117f55 (
On 11 Nov 2015, at 18:49, Ramsay Jones wrote:
>
>
> On 11/11/15 02:00, Stefan Beller wrote:
>> On Tue, Nov 10, 2015 at 5:22 PM, Eric Sunshine
>> wrote:
>>> On Tue, Nov 10, 2015 at 7:23 PM, Ramsay Jones
>>> wrote:
Commit f8117f55 ("http: use off_t to store partial file size",
02-11
56 matches
Mail list logo
