[PATCH 2/3] submodule update: Expose parallelism to the user

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

[PATCH 3/3] clone: Allow an explicit argument for parallel submodule clones

Just pass it along to "git submodule update", which may pick reasonable defaults if you don't specify an explicit number. TODO: Add a test for this. Signed-off-by: Stefan Beller --- Documentation/git-clone.txt | 5 - builtin/clone.c | 23

[PATCH 1/3] git submodule update: have a dedicated helper for cloning

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

Re: Bug: gitk crashes for single file with German environment

On Fri, 23 Oct 2015 15:32:10 +0200 Jörg Bühmann wrote: > gitk crashes for single file with German environment [...] http://thread.gmane.org/gmane.comp.version-control.git/279910 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

Question about about a trivial merge conflict that git should resolve alone

Hi, I have a simple merge conflict use case: $ mkdir foo $ cd foo/ $ git init $ echo line1 > a $ git add . $ git commit -q -m init $ echo line2 >>a $ git commit -a -q -m "add line2" $ git checkout -b foo HEAD~1 $ git cherry-pick -x master $ echo line3 >>a $ git stage a $ git commit -q -m "add

Bug: gitk crashes for single file with German environment

gitk crashes for single file with German environment Git 2.6.2 Installed with homebrew Platform Apple OS X 10.10.5 shell: zsh 5.0.5 (x86_64-apple-darwin14.0) environment: LANG=de_DE.UTF-8 gitk is very useful to show the commit history of one file. However it crashes on

Re: [PATCH 1/2 jk/war-on-sprintf] read_branches_file: plug a FILE* leak

On Fri, Oct 23, 2015 at 08:02:51AM +0200, Johannes Sixt wrote: > The earlier rewrite f28e3ab2 (read_branches_file: simplify string handling) > of read_branches_file() lost an fclose() call. Put it back. > > As on Windows files that are open cannot be removed, the leak manifests in > a failure of

[PATCH v2] Add git-grep threads-num param

It's a follow up to "[PATCH] Add git-grep threads-num param": Make number of git-grep worker threads a configuration parameter. I have run several tests on systems with different number of CPU cores. It appeared that the hard-coded number 8 lowers performance on both of my systems: on my 4-core

Re: [PATCH 2/2 jk/war-on-sprintf] compat/mingw.c: remove printf format warning

On Fri, Oct 23, 2015 at 08:02:52AM +0200, Johannes Sixt wrote: > 5096d490 (convert trivial sprintf / strcpy calls to xsnprintf) converted > two sprintf calls. Now GCC warns that "format '%u' expects argument of > type 'unsigned int', but argument 4 has type 'long unsigned int'". > Instead of

Re: git-cherry doesn't detect a "copied" commit

On Tue, Oct 20, 2015 at 06:32:12PM +0200, Francis Moreau wrote: > Hi, > > I'm seeing something odd with git-cherry: it doesn't seem to detect > that a commit has been cherry-picked from master branch. > > This happens with the systemd git repository (from github) so it > should be fairly simple

Re: git-cherry doesn't detect a "copied" commit

On Fri, Oct 23, 2015 at 12:57 PM, Kevin Daudt wrote: > On Tue, Oct 20, 2015 at 06:32:12PM +0200, Francis Moreau wrote: >> Hi, >> >> I'm seeing something odd with git-cherry: it doesn't seem to detect >> that a commit has been cherry-picked from master branch. >> >> This happens

Re: Make "git checkout" automatically update submodules?

On Thu, Oct 15, 2015 at 3:50 PM, Kannan Goundan wrote: > Git submodules seem to be a great fit for one of our repos. The biggest > pain point is that it's too easy to forget to update submodules. > > 1. I often forget since most repos don't need it. > 2. Infrequent users of

Re: ancestor and descendant ~ clarification needed

Xue Fuqiao writes: > Hi Junio, > > On Fri, Oct 23, 2015 at 4:22 AM, Junio C Hamano wrote: > >> Yeah, that is the other way around. >> >> (1) If the current branch is a descendant of the other--so every >> commit present in the other branch is already

Re: [PATCH 1/5] gc: remove unused #include "sigchain.h"

Tobias Klauser writes: > On 2015-10-22 at 22:14:29 +0200, Junio C Hamano wrote: >> Tobias Klauser writes: >> >> > After switching to use the tempfile module in commit ebebeaea (gc: use >> > tempfile module to handle gc.pid file), no

Re: Make "git checkout" automatically update submodules?

Kannan Goundan writes: > I think the way I described it ("sponsoring a feature") doesn't really > reflect how I was imagining it. In my head, it looked like this: > ... > I could try doing that myself, but someone familiar with the Git > codebase/community/history would be

Re: [PATCH 1/2 jk/war-on-sprintf] read_branches_file: plug a FILE* leak

Johannes Sixt writes: > The earlier rewrite f28e3ab2 (read_branches_file: simplify string handling) > of read_branches_file() lost an fclose() call. Put it back. > > As on Windows files that are open cannot be removed, the leak manifests in > a failure of 'git remote rename origin

Reply

Hello My Name is Capt. Lucas Alves from the US Army base here in Damascus, Syria. I have a Deal of Sixteen Million Two Hundred Thousand United States I would like to partner with you. Kindly get back to me if it would be of interest to you for more details. Regards, Lucas Alves

[PATCH 0/3] expose parallelism for submodule {update, clone}

This goes on top of origin/sb/submodule-parallel-fetch^ The first patch replaces the last patch of origin/sb/submodule-parallel-fetch using clearer names for the callback functions. The patches 2 and 3 introduce CLI options for {submodule update, clone} to instruct Git to be parallel for cloning

Re: Make "git checkout" automatically update submodules?

Stefan Beller writes: > Checkout [1]. There are lots of good patches, but hard to find. > (Including, but not limited to a recursive git checkout enhancement!) > ... > [1] https://github.com/jlehmann/git-submod-enhancements/wiki Yes, Jens is not just one of the people who

Re: [PATCH 0/3] expose parallelism for submodule {update, clone}

Stefan Beller writes: > submodule update: Expose parallelism to the user > clone: Allow an explicit argument for parallel submodule clones downcase Expose and Allow, perhaps? I was looking at the previous one and I am getting the feeling that everything up to

Re: [PATCH 0/3] expose parallelism for submodule {update, clone}

On Fri, Oct 23, 2015 at 12:25 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> submodule update: Expose parallelism to the user >> clone: Allow an explicit argument for parallel submodule clones > > downcase Expose and Allow, perhaps? Will do,

Re: Question about about a trivial merge conflict that git should resolve alone

Hi Francis, On Fri, 23 Oct 2015, Francis Moreau wrote: > I have a simple merge conflict use case: > > $ mkdir foo > $ cd foo/ > $ git init > $ echo line1 > a > $ git add . > $ git commit -q -m init > $ echo line2 >>a > $ git commit -a -q -m "add line2" > $ git checkout -b foo HEAD~1 > $ git

Re: git-cherry doesn't detect a "copied" commit

Hi, On Tue, Oct 20, 2015 at 6:32 PM, Francis Moreau wrote: > Hi, > > I'm seeing something odd with git-cherry: it doesn't seem to detect > that a commit has been cherry-picked from master branch. > > This happens with the systemd git repository (from github) so it >

Re: [PATCH 1/5] gc: remove unused #include "sigchain.h"

On 2015-10-22 at 22:14:29 +0200, Junio C Hamano wrote: > Tobias Klauser writes: > > > After switching to use the tempfile module in commit ebebeaea (gc: use > > tempfile module to handle gc.pid file), no declarations from sigchain.h > > are used in

[PATCH 2/2 jk/war-on-sprintf] compat/mingw.c: remove printf format warning

5096d490 (convert trivial sprintf / strcpy calls to xsnprintf) converted two sprintf calls. Now GCC warns that "format '%u' expects argument of type 'unsigned int', but argument 4 has type 'long unsigned int'". Instead of changing the format string, use a variable of type unsigned in place of the

[PATCH 1/2 jk/war-on-sprintf] read_branches_file: plug a FILE* leak

The earlier rewrite f28e3ab2 (read_branches_file: simplify string handling) of read_branches_file() lost an fclose() call. Put it back. As on Windows files that are open cannot be removed, the leak manifests in a failure of 'git remote rename origin origin' when the remote's URL is specified in

Re: Make "git checkout" automatically update submodules?

On Fri, Oct 23, 2015 at 5:46 AM, Kannan Goundan wrote: > Junio C Hamano pobox.com> writes: > >> We are unfortunately not set up to handle money well. For a >> background explanation, please go read [*1*], which I wrote my take >> on "money" some time ago. Note that it is an

Re: ancestor and descendant ~ clarification needed

Hi Junio, On Fri, Oct 23, 2015 at 4:22 AM, Junio C Hamano wrote: > Yeah, that is the other way around. > > (1) If the current branch is a descendant of the other--so every > commit present in the other branch is already contained in the > current branch--then

Re: ancestor and descendant ~ clarification needed

On Sat, Oct 24, 2015 at 12:56 AM, Junio C Hamano wrote: >> I see. Thank you. What do you think about the following minor patch >> for user-manual.txt? > > While the updated text is more correct than the original, I do not > know if that is sufficient, or we would also want to

git --literal-pathspecs add -u says "fatal: pathspec ':/' did not match any files"

~/tmp/tmprepo$ git init Initialized empty Git repository in /home/npostavs/tmp/tmprepo/.git/ ~/tmp/tmprepo$ git --literal-pathspecs add -u fatal: pathspec ':/' did not match any files ~/tmp/tmprepo$ git --version git version 2.6.1 It was reported[1] that 2.0.2 and several following versions also

Re: git-cherry doesn't detect a "copied" commit

Francis Moreau writes: > I was mislead by the git-cherry manpage somehow which says: > > "git-cherry therefore > detects when commits have been "copied" by means of git-cherry-pick(1), > > which is not exactly true. Yeah, I agree; the sentence is merely giving a

Re: Make "git checkout" automatically update submodules?

Stefan Beller google.com> writes: > [1] https://github.com/jlehmann/git-submod-enhancements/wiki Oh wow, Christmas came early! I'll give this code a try. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info

Re: [PATCH v2] Add git-grep threads-num param

Please pay attention to your title. It no longer matches what the patch does. It may also be beneficial to study recent titles and log messages from other developers (you can find them in "git log --no-merges" and "git shortlog --no-merges") and learn and imitate their format, style and tone.