dows users to profit
even more, considered how expensive forking is there)
Acked-by: Jens Lehmann
Signed-off-by: Stefan Beller
---
The same as yesterday evening, just an entry added to .gitignore.
So we'll have a "git submodule--helper module_list" here.
.gitig
Am 05.08.2015 um 02:04 schrieb Stefan Beller:
The goal of this series being rewriting `git submodule update`,
we don't want to call out to the shell script for config lookups.
So reimplement the lookup of the submodule name in C.
Cool. This brings down the duration of the test suite from 3:13
Am 06.08.2015 um 19:35 schrieb Stefan Beller:
This implements the helper `module_name` in C instead of shell,
yielding a nice performance boost.
Before this patch, I measured a time (best out of three):
$ time ./t7400-submodule-basic.sh >/dev/null
real 0m11.066s
user 0
Am 05.08.2015 um 23:08 schrieb Stefan Beller:
This implements the helper `module_name` in C instead of shell,
yielding a nice performance boost.
Before this patch, I measured a time (best out of three):
$ time ./t7400-submodule-basic.sh >/dev/null
real 0m11.066s
user 0
Am 06.08.2015 um 21:49 schrieb Jens Lehmann:
And wouldn't it make more sense to keep this patch together with
the "submodule: implement `module_list` as a builtin helper" in
its own "submodule-helper" series and have the following three
patches in a separate "
Am 06.08.2015 um 19:35 schrieb Stefan Beller:
When I was looking at the branches of Jens for work done on submodules
not yet upstream I found a commit "WIP threaded submodule fetching[1],
and I was side tracked wanting to present a different approach to that.
Cool. I didn't follow that route fu
Am 07.09.2015 um 01:43 schrieb Eric Sunshine:
On Sun, Sep 6, 2015 at 6:08 PM, Anders Ro wrote:
On 04/09/15 07:02, Eric Sunshine wrote:
On Wed, Sep 2, 2015 at 7:34 PM, Anders Ro wrote:
git-submodule.sh: pin submodule when branch name is '@'
Setting branch name to '@' for a submodule will dis
Am 10.09.2015 um 22:06 schrieb Filip Gospodinov:
Hi!
I use the `--git-dir` flag in some scripts such that I don't need to `cd` back
and forth. Recently, I've discovered that `--git-dir` does not seem to work
correctly for `git submodule`. Here is a short snippet to reproduce that
behavior:
mkd
Am 07.06.2015 um 08:26 schrieb Stefan Beller:
On 06.06.2015 12:53, Luca Milanesio wrote:
On 6 Jun 2015, at 18:49, Phil Hord wrote:
On Fri, Jun 5, 2015, 2:58 AM lucamilanesio wrote:
Ideally, as a "git clone --recursive" already exists, I would like to
see a "git diff --recursive" that goes thr
Am 05.06.2015 um 01:20 schrieb Christopher Dunn:
(Seen in git versions: 2.1.0 and 1.9.3 et al.)
$ git format-patch --stdout X^..X | git apply check -
fatal: unrecognized input
This fails when the commit consists of nothing but a submodule change
(as in 'git add submodule foo'), but it passes wh
Am 11.06.2015 um 18:11 schrieb Phil Hord:
On Tue, Jun 9, 2015 at 2:40 PM, Jens Lehmann wrote:
Am 07.06.2015 um 08:26 schrieb Stefan Beller:
On 06.06.2015 12:53, Luca Milanesio wrote:
On 6 Jun 2015, at 18:49, Phil Hord wrote:
On Fri, Jun 5, 2015, 2:58 AM lucamilanesio
wrote:
Ideally, as
Am 18.06.2015 um 22:55 schrieb Lars Schneider:
AFAIK Git has two ways to clone a repository with respect to submodules:
(1) Plain clone of just the repository itself:
git clone git://github.com/foo/bar.git
(2) Recursive clone of the repository including all its submodules:
git clone --recursive
Am 09.07.2015 um 17:49 schrieb Jeff King:
On Thu, Jul 09, 2015 at 02:09:01PM +0200, Heiko Voigt wrote:
Instead of test-submodule-config.c to test this new module, it could
be useful to implement these as extensions to rev-parse:
git rev-parse --submodule-name [:]
git rev-parse --subm
Am 21.07.2016 um 01:22 schrieb Stefan Beller:
So maybe we want to drop that series and first talk about a migration plan from
the current state to a world where we have the existence depending not
on the url
parameter, but a boolean variable submodule...
Depending on a submodule would be ignored
Disclaimer: Due to my currently very limited Git time budget I only
glanced over the recent discussion and patches. If you think I missed
something already discussed, I'd be happy being pointed to the relevant
discussion so I can catch up and avoid wasting everybody's time.
Am 23.01.2016 um 01:31
Am 25.01.2016 um 19:59 schrieb Stefan Beller:
On Sun, Jan 24, 2016 at 11:38 AM, Jens Lehmann wrote:
Am 23.01.2016 um 01:31 schrieb Stefan Beller:
This series introduces labels which you can attach to submodules like so:
$ cat .gitmodules
[submodule "gcc"]
Am 26.01.2016 um 22:50 schrieb Stefan Beller:
On Tue, Jan 26, 2016 at 12:59 PM, Jens Lehmann wrote:
Ok. Though we might wanna call it submodule.autoUpdate, as initializing
it is only the prerequisite for automatically updating submodules. And
I believe automatically updating is the thing
Am 20.02.2016 um 01:11 schrieb Junio C Hamano:
Stefan Beller writes:
On Fri, Feb 19, 2016 at 2:29 PM, Junio C Hamano wrote:
Stefan Beller writes:
Doing a 'git fetch' only and not the fetch for the specific sha1 would be
incorrect?
I thought that was what you are attempting to address.
Am 16.03.2016 um 22:07 schrieb Stefan Beller:
---
Hi Jens,
I cannot find the edit button in the wiki[1] any more.
Oops. After you mentioned recently that every GitHub user had write
permissions to the Wiki I restricted it to be writable for known
collaborators and also added you to this
Am 07.10.2015 um 00:00 schrieb Stefan Beller:
So a discussing started in a Gerrit change [1] if we want to name it
submodule or subproject.
We decided to stick with the git core convention of naming it
subproject for now.
What convention? Isn't diff output the only place where we talk
about sub
Am 26.10.2015 um 17:34 schrieb Stefan Beller:
On Sun, Oct 25, 2015 at 8:12 AM, Lars Schneider
wrote:
On 20 Oct 2015, at 19:33, Junio C Hamano wrote:
I do not think this topic is specific to use of submodules. If you
want to encourage your engineers to fetch from nearby mirrors you
maintain,
Am 26.10.2015 um 05:48 schrieb Nazri Ramliy:
On Mon, Oct 26, 2015 at 7:10 AM, John Smith wrote:
When would people routinely check out a branch and want to stay with the
submodules as
the have been checked out for the old branch?
I do this a lot. At my $dayjob we have a super project with bun
Am 10.11.2015 um 19:12 schrieb Stefan Beller:
On Tue, Nov 10, 2015 at 8:31 AM, Jeremy Morton wrote:
It's recently come to my attention that the "git alias" config functionality
ignores all aliases that would override existing Git commands. This seems
like a bad idea to me.
This ensures that
Am 04.11.2015 um 01:37 schrieb Stefan Beller:
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
Am 10.11.2015 um 23:49 schrieb Stefan Beller:
On Tue, Nov 10, 2015 at 1:57 PM, Jens Lehmann wrote:
Am 10.11.2015 um 19:12 schrieb Stefan Beller:
On Tue, Nov 10, 2015 at 8:31 AM, Jeremy Morton
For example, I wanted to setup "git clone" to automatically act as "git
clone --recu
Am 10.11.2015 um 23:29 schrieb Stefan Beller:
On Tue, Nov 10, 2015 at 2:21 PM, Jens Lehmann wrote:
+submodule.jobs::
+ This is used to determine how many submodules can be operated on in
+ parallel. Specifying a positive integer allows up to that number
+ of submodules being
Am 11.11.2015 um 11:18 schrieb Boettger, Heiko:
i'm currently on a migration from svn to git and also have the task to convert
the svnexternal to git submodules. During the migration step I am doing an
automatic verification which needs a reliable way to switch the working tree to
another bran
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 relev
Am 14.11.2015 um 01:10 schrieb Stefan Beller:
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
Am 16.11.2015 um 19:31 schrieb Mike Crowe:
On Monday 16 November 2015 at 10:15:24 -0800, Stefan Beller wrote:
The code itself looks good to me, one nit in the tests though.
@@ -79,6 +87,119 @@ test_expect_success 'push succeeds after commit was pushed
to remote' '
)
'
+test_expect
Am 16.11.2015 um 20:25 schrieb Stefan Beller:
On Mon, Nov 16, 2015 at 10:59 AM, Jens Lehmann wrote:
Am 14.11.2015 um 01:10 schrieb Stefan Beller:
Thanks for pointing out that we already have some kind of server support.
I wonder if we should add an additional way to make fetching only some
Am 16.11.2015 um 23:56 schrieb Stefan Beller:
On Mon, Nov 16, 2015 at 1:42 PM, Jens Lehmann wrote:
Am 16.11.2015 um 20:25 schrieb Stefan Beller:
On Mon, Nov 16, 2015 at 10:59 AM, Jens Lehmann
wrote:
Am 14.11.2015 um 01:10 schrieb Stefan Beller:
Thanks for pointing out that we already
Am 17.11.2015 um 21:04 schrieb Stefan Beller:
On Tue, Nov 17, 2015 at 11:46 AM, Jens Lehmann wrote:
But for quite some time you'll have older servers out there that
don't support fetching a single sha1 or aren't configured to do so.
Only when talking about the open source si
Am 17.11.2015 um 21:49 schrieb Stefan Beller:
I assumed we'd have yet another flag to activate the new behavior,
but if you want to roll out that new feature as a default, I agree on
needing the fallback.
Ah, I was under the impression that users are surprised by --depth
not propagating into th
Am 25.11.2015 um 02:32 schrieb Stefan Beller:
This is also available at
https://github.com/stefanbeller/git/tree/submodule-groups
It applies on top of the submodule-parallel-patch series I sent a few minutes
ago.
Consider having a real large software project in Git with each component
in a sub
Am 25.11.2015 um 02:32 schrieb Stefan Beller:
This passes each group to the `submodule update` invocation and
additionally configures the groups to be automatically updated.
Signed-off-by: Stefan Beller
---
Documentation/git-clone.txt | 11
builtin/clone.c | 33 +
Am 25.11.2015 um 02:32 schrieb Stefan Beller:
This is also available at
https://github.com/stefanbeller/git/tree/submodule-groups
It applies on top of the submodule-parallel-patch series I sent a few minutes
ago.
Consider having a real large software project in Git with each component
in a sub
(Sorry for the resend of my last mail, but I received bounce messages
from my email provider)
Am 25.11.2015 um 19:00 schrieb Stefan Beller:
--cc Johannes Sixt
On Wed, Nov 25, 2015 at 9:35 AM, Jens Lehmann wrote:
[submodule "gcc"]
path = gcc
Am 25.11.2015 um 19:08 schrieb Stefan Beller:
On Wed, Nov 25, 2015 at 9:52 AM, Jens Lehmann wrote:
+--group::
+ After the clone is created, all submodules which are part of the
+ group are cloned. This option can be given multiple times to
specify
+ different groups.
Ah
Am 25.11.2015 um 21:03 schrieb Stefan Beller:
On Wed, Nov 25, 2015 at 11:50 AM, Jens Lehmann wrote:
My thinking is that groups are implying recursive, whereas recursive
implies
"all groups", so a git clone --group --recursive
makes not much sense to me as it begs the question,
Am 01.12.2015 um 00:54 schrieb Stefan Beller:
On Wed, Nov 25, 2015 at 11:18 AM, Jens Lehmann wrote:
Hmm, I doubt it makes much sense to add the --group option to "git
submodule init". I'd rather init all submodules and do the group
handling only in the "git submodule updat
Am 26.07.2017 um 23:06 schrieb Junio C Hamano:
Stefan Beller writes:
Rereading the archives, there was quite some discussion on the design
of these patches, but these lines of code did not get any attention
https://public-inbox.org/git/4cdb3063.5010...@web.de/
I cc'd Jens in the hope of
Hi Semyon,
Am 18.02.2014 18:49, schrieb Semyon Perepelitsa:
> I noticed the option in the man-page but there is still no configuration
> option available. Did you forget to add it after all?
Nope, we just didn't implement it yet. ;-)
It's one of the topics on my submodule ToDo list:
https://
es/origin/*
>
> So for me it seems that somehow the relative path inside
> MAINMODULE/.git/modules/platform/SUBMODULE/config gets configuread
> wrong during submodule init+update.
>
> I tried to update the
> MAINMODULE/.git/modules/platform/SUBMODULE/config to contain
> ../
ogic
>> in find_worktree() does not account for it.
>>
>> Use `git rev-parse --show-toplevel` to find the worktree so that
>> the dir-diff feature works inside a submodule.
>>
>> Reported-by: Gábor Lipták
>> Helped-by: Jens Lehmann
>> Helped-by:
Am 25.02.2014 18:02, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> Am 24.02.2014 17:55, schrieb Junio C Hamano:
>>> David Aguilar writes:
>>>
>>>> Modern versions of "git submodule" use .git-files to setup the
>>>
Am 25.02.2014 22:12, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>>>> +test_expect_success PERL 'difftool properly honours gitlink and
>>>> core.worktree' '
>>>> + git submodule add ./. submod/ule &&
>>>> +
cument this option in synopsis and man page too. While at it make it
more clear that only one of '--checkout', '--merge' or '--rebase' make
sense by grouping them together.
Reported-by: Matthijs Kooijman
Signed-off-by: Jens Lehmann
---
Am 25.02.2014 11:03, schrieb Mat
s option in usage string and the "OPTIONS"
section of man page too. While at it group the update-mode options into
a single set in the usage string.
Reported-by: Matthijs Kooijman
Signed-off-by: Jens Lehmann
---
Am 28.02.2014 21:39, schrieb Junio C Hamano:
> Jens Lehmann writes:
Am 03.03.2014 14:47, schrieb Henri GEIST:
> This new option prevent git submodule to clone the missing
> submodules with the --separate-git-dir option.
> Then the submodule will be regular repository and their gitdir will not
> be placed in the superproject gitdir/modules directory.
And what is y
Am 05.03.2014 00:01, schrieb Henri GEIST:
> Permit to do a 'git clone --recursive' through git-gui.
I really like where this is heading!
Some minor issues:
- I think we should be more verbose in the commit message,
including that and why the default should be "on". Maybe
like this?
"Permi
Am 03.03.2014 21:34, schrieb Henri GEIST:
> Le lundi 03 mars 2014 à 17:45 +0000, Jens Lehmann a écrit :
>> Am 03.03.2014 14:47, schrieb Henri GEIST:
>>> This new option prevent git submodule to clone the missing
>>> submodules with the --separate-git-dir option.
>
Am 06.03.2014 01:15, schrieb Henri GEIST:
> Le mercredi 05 mars 2014 à 19:00 +0100, Jens Lehmann a écrit :
>> Am 05.03.2014 00:01, schrieb Henri GEIST:
>> - Wouldn't it be easier to pass the '--recurse-submodules"
>> option to the "git clone" call f
Am 06.03.2014 02:25, schrieb Henri GEIST:
> Le mercredi 05 mars 2014 à 19:13 +0100, Jens Lehmann a écrit :
>> Am 03.03.2014 21:34, schrieb Henri GEIST:
>>> Le lundi 03 mars 2014 à 17:45 +, Jens Lehmann a écrit :
>>>> Am 03.03.2014 14:47, schrieb Henri GEIST:
>
Am 06.03.2014 21:15, schrieb Henri GEIST:
> Le jeudi 06 mars 2014 à 20:48 +0100, Jens Lehmann a écrit :
>> Am 06.03.2014 02:25, schrieb Henri GEIST:
>>> Le mercredi 05 mars 2014 à 19:13 +0100, Jens Lehmann a écrit :
>>>> Am 03.03.2014 21:34, schrieb Henri GEIST:
Am 06.03.2014 23:20, schrieb Henri GEIST:
> Le jeudi 06 mars 2014 à 21:51 +0100, Jens Lehmann a écrit :
>> Am 06.03.2014 21:15, schrieb Henri GEIST:
>>> Le jeudi 06 mars 2014 à 20:48 +0100, Jens Lehmann a écrit :
>>>> Am 06.03.2014 02:25, schrieb Henri GEIST:
>>
Am 11.03.2014 12:07, schrieb Henri GEIST:
> Le mercredi 05 mars 2014 à 19:00 +0100, Jens Lehmann a écrit :
>> Am 05.03.2014 00:01, schrieb Henri GEIST:
>>> Permit to do a 'git clone --recursive' through git-gui.
>>
>> I really like where this is heading!
>
Am 12.03.2014 14:44, schrieb Quint Guvernator:
> memcmp() is replaced with starts_with() when comparing strings from the
> beginning. starts_with() looks nicer and it saves the extra argument of
> the length of the comparing string.
>
> Signed-off-by: Quint Guvernator
> ---
...
> diff --git a/s
Am 12.03.2014 14:42, schrieb Orgad Shaneh:
> From: Orgad Shaneh
You don't need the line above when you are the sender ;-)
> Executes checkout without -q
That's a bit terse. What about:
"Add the verbose flag to add and update which displays the
progress of the actual submodule checkout when gi
Am 12.03.2014 17:46, schrieb Quint Guvernator:
> 2014-03-12 11:47 GMT-04:00 Jens Lehmann :
>> I think this hunk should be dropped as the memcmp() here doesn't mean
>> "starts with" but "is identical" (due to the "ce_namelen(ce) == 11" in
>>
" (which determines if the test is to
be skipped) is called after sourcing lib-terminal.sh (which sets up the
terminal using test_expect_success).
Fix that by calling "start_httpd" before sourcing lib-terminal.sh.
Signed-off-by: Jens Lehmann
---
Since recently t5541 fails for me
Note that in addition to setting up the prerequisite, the
> current test also defines test_terminal. Since we can't
> affect the environment from a lazy_prereq, we have to hoist
> that out. We previously depended on it _not_ being defined
> when the TTY prereq isn't set as a w
For the upcoming submodule test framework we often need to assert that an
empty directory exists in the work tree. Add the test_dir_is_empty()
function which asserts that the given argument is an empty directory.
Signed-off-by: Jens Lehmann
---
I believe this one is pretty straightforward
ct commit, as
any modifications to the submodule files will be lost) and is expected
to also destroy history in the - admittedly unlikely case - the new
commit adds a file named ".git" to the submodule directory.
Signed-off-by: Jens Lehmann
---
I think the first bug really
Test that the checkout command updates the work tree as expected with or
without the '-f' flag.
Signed-off-by: Jens Lehmann
---
I think this should explain how to use the framework with a single command
and some options.
t/t2013-checkout-submodule.sh | 5 +
1 file changed, 5
. And then there are am, apply, bisect, rebase, revert & stash
apply which still need to be covered.
Jens Lehmann (4):
test-lib: add test_dir_is_empty()
Submodules: Add the lib-submodule-update.sh test library
checkout: call the new submodule update test framework
apply: add t4137 for
Test that the apply command updates the work tree as expected for the
'--index' and the '--3way' options (for submodule changes which don't
result in conflicts).
Signed-off-by: Jens Lehmann
---
And this shows how to use the new framework when more than a single command
Am 25.03.2014 21:49, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> For the upcoming submodule test framework we often need to assert that an
>> empty directory exists in the work tree. Add the test_dir_is_empty()
>> function which asserts that the given argume
Am 26.03.2014 11:43, schrieb Michael Haggerty:
> On 03/26/2014 09:29 AM, Jens Lehmann wrote:
>> Am 25.03.2014 21:49, schrieb Junio C Hamano:
>>> Jens Lehmann writes:
>>>> t/test-lib-functions.sh | 11 +++
>>>> 1 file changed, 11 inser
Am 27.03.2014 16:52, schrieb W. Trevor King:
> On Thu, Mar 27, 2014 at 03:21:49PM +0100, Johan Herland wrote:
>> I just found a failure to checkout a project with submodules where
>> there is no explicit submodule branch configuration, and the
>> submodules happen to not have a "master" branch:
>
Am 27.03.2014 18:16, schrieb Junio C Hamano:
> Johan Herland writes:
>
>> I just found a failure to checkout a project with submodules where
>> there is no explicit submodule branch configuration, and the
>> submodules happen to not have a "master" branch:
>>
>> git clone git://gitorious.org/qt
Am 27.03.2014 19:30, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> Am 27.03.2014 16:52, schrieb W. Trevor King:
>>> On Thu, Mar 27, 2014 at 03:21:49PM +0100, Johan Herland wrote:
>>>> I just found a failure to checkout a project with submodules where
&g
Am 27.03.2014 21:27, schrieb Heiko Voigt:
> On Thu, Mar 27, 2014 at 12:39:03PM -0700, Junio C Hamano wrote:
>> "W. Trevor King" writes:
>>
>>> On Thu, Mar 27, 2014 at 06:31:27PM +0100, Jens Lehmann wrote:
>>>> Am 27.03.2014 18:16, schri
Am 27.03.2014 22:06, schrieb W. Trevor King:
> The transition from submodule..* to submodule..* happened
> in 73b0898d (Teach "git submodule add" the --name option, 2012-09-30),
> which landed in v1.8.1-rc0 on 2012-12-03.
Nope, the distinction between path and name is way older (AFAIK it
is there
Am 28.03.2014 04:58, schrieb W. Trevor King:
> On Thu, Mar 27, 2014 at 08:52:55PM -0700, W. Trevor King wrote:
>> On Thu, Mar 27, 2014 at 11:43:47PM -0400, Eric Sunshine wrote:
>>> On Thu, Mar 27, 2014 at 11:36 PM, W. Trevor King wrote:
submodule..branch::
A remote branch name f
I just noticed that the two patches Junio added to pu have a reworded
commit message I'm perfectly happy with.
Thanks all.
Am 28.03.2014 03:06, schrieb W. Trevor King:
> On Fri, Mar 28, 2014 at 12:15:00AM +0100, Jens Lehmann wrote:
>> Am 27.03.2014 22:06, schrieb W. Trevor
Am 28.03.2014 00:36, schrieb Ronald Weiss:
> Hello.
>
> As this is my first post to this list, let me first thank all the
> people involved in Git development - it's really a great tool.
Welcome and thanks for the feedback!
> Now to the point. Since Git 1.8 (I think), git commit command honours
Am 29.03.2014 16:39, schrieb Charles Bailey:
> AIX doesn't make a distiction between EEXIST and ENOTEMPTY so relying on
> the strerror string for the rmdir failure is fragile. Just test that the
> start of the string matches the Git controlled "failed to rmdir..."
> error. The exact text of the OS
Am 29.03.2014 23:50, schrieb Ronald Weiss:
> Git commit honors the 'ignore' setting from .gitmodules or .git/config,
> but didn't allow to override it from command line, like other commands do.
>
> Useful values for commit are 'all' (default) or 'none'. The others
> ('dirty' and 'untracked') have
Am 29.03.2014 23:56, schrieb Ronald Weiss:
> Submodules explicitly added to index by user should be never hidden in
> status output.
>
> This also fixes a bug in commit, where submodules with configured ignore
> setting (in .gitmodules or .git/config), added to index by user, are not
> displayed i
ignored submodules are
staged, as that command uses the "commitable" member of the wt_status
struct to determine if staged changes are present.
Change t7508 to reflect this new behavior. Also mention it in the
documentation of the ignore config options.
Signed-off-by: Jens Lehmann
---
Am 29.03.2014 23:50, schrieb Ronald Weiss:
> Git commit honors the 'ignore' setting from .gitmodules or .git/config,
> but didn't allow to override it from command line, like other commands do.
>
> Useful values for commit are 'all' (default) or 'none'. The others
> ('dirty' and 'untracked') have
in checkout.c) are
> needed to make it work for "commit -a" too.
>
> Signed-off-by: Ronald Weiss
> ---
> The previous patch version (v2) contained bug in the test, by mistake I
> have sent older version than I was testing with, sorry for that.
>
> On 30. 3. 2014
Am 28.03.2014 18:10, schrieb W. Trevor King:
> On Fri, Mar 28, 2014 at 05:57:50PM +0100, Jens Lehmann wrote:
>> Am 28.03.2014 04:58, schrieb W. Trevor King:
>>> On Thu, Mar 27, 2014 at 08:52:55PM -0700, W. Trevor King wrote:
>>>> No the remote branch is in the ups
Am 28.03.2014 04:36, schrieb W. Trevor King:
> gitmodule(5) mentioned 'master' as the default remote branch, but
> folks using checkout-style updates are unlikely to care which upstream
> branch their commit comes from (they only care that the clone fetches
> that commit). If they haven't set subm
Am 31.03.2014 20:58, schrieb Jens Lehmann:
> Am 31.03.2014 02:07, schrieb Ronald Weiss:
>> The tests immediately revealed, that the patch was not complete. It
>> didn't work with commit message given on command line (-m). To make
>> that work, I had to also patch the inde
Am 01.04.2014 01:35, schrieb Ronald Weiss:
> On 1. 4. 2014 0:50, Ronald Weiss wrote:
>> On 31. 3. 2014 23:47, Ronald Weiss wrote:
>>> On Mon, Mar 31, 2014 at 8:58 PM, Jens Lehmann wrote:
>>>> As Junio mentioned it would be great if you could teach the add
>&g
Am 01.04.2014 23:59, schrieb Ronald Weiss:
> On 1. 4. 2014 22:23, Jens Lehmann wrote:
>> Am 01.04.2014 01:35, schrieb Ronald Weiss:
>>> On 1. 4. 2014 0:50, Ronald Weiss wrote:
>>>> On 31. 3. 2014 23:47, Ronald Weiss wrote:
>>>>> On Mon, Mar 31, 2014 at
://article.gmane.org/gmane.comp.version-control.git/238173
Jens Lehmann (2):
status/commit: show staged submodules regardless of ignore config
commit -m: commit staged submodules regardless of ignore config
Documentation/config.txt | 8 +++--
Documentation/gitmodules.txt | 4
to reflect this new behavior and add three new tests to show
that a single staged submodule configured to be ignored will be committed
when the status output is generated and won't be if not. Also update the
documentation of the ignore config options accordingly.
Signed-off-by: Jens Lehmann
share the same ignore_submodule_arg variable
this makes the code more robust against accidental breakage and documents
how to correctly call index_differs_from().
Change the expected result of the test documenting this problem from
failure to success.
Signed-off-by: Jens Lehmann
---
built
Am 02.04.2014 23:52, schrieb Michal Sojka:
> Hello,
>
> I needed to convert a subdirectory of a repo to a submodule and have the
> histories of both repos linked together. I found that this was discussed
> few years back [1], but the code seemed quite complicated and was not
> merged.
>
> [1]:
>
Am 02.04.2014 21:56, schrieb Ronald Weiss:
> On 2. 4. 2014 20:53, Jens Lehmann wrote:
>> Am 01.04.2014 23:59, schrieb Ronald Weiss:
>>> On 1. 4. 2014 22:23, Jens Lehmann wrote:
>>>> Am 01.04.2014 01:35, schrieb Ronald Weiss:
>>>>> On 1. 4. 2014 0:50, Ro
Am 06.04.2014 23:18, schrieb Michal Sojka:
> On Sun, Apr 06 2014, Jens Lehmann wrote:
>> Am 02.04.2014 23:52, schrieb Michal Sojka:
>>> Hello,
>>>
>>> I needed to convert a subdirectory of a repo to a submodule and have the
>>> histories of both
Am 07.04.2014 23:46, schrieb Ronald Weiss:
> On 6. 4. 2014 18:28, Jens Lehmann wrote:
>> Am 02.04.2014 21:56, schrieb Ronald Weiss:
>>> On 2. 4. 2014 20:53, Jens Lehmann wrote:
>>>> Am 01.04.2014 23:59, schrieb Ronald Weiss:
>>>>> On 1. 4. 2014 22:23, J
Am 08.04.2014 00:19, schrieb Junio C Hamano:
> * jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
> - commit -m: commit staged submodules regardless of ignore config
> - status/commit: show staged submodules regardless of ignore config
I have two more patches for gitk and git-gu
Am 08.04.2014 01:03, schrieb Ronald Weiss:
> Git commit honors the 'ignore' setting from .gitmodules or .git/config,
> but didn't allow to override it from command line, like other commands do.
>
> Useful values for commit are 'all' (default) or 'none'. The others
> ('dirty' and 'untracked') have
Am 08.04.2014 20:46, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> Am 08.04.2014 00:19, schrieb Junio C Hamano:
>>> * jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
>>> - commit -m: commit staged submodules regardless of ignore config
>
p under
"Staged Changes (Will Commit)".
Fix that by using the '--ignore-submodules=dirty' option for both callers
of "git diff-index --cached" when the underlying git version supports that
option.
Signed-off-by: Jens Lehmann
---
git-gui.sh | 6 +-
lib/diff.tcl
up under
"Local changes checked in to index but not committed".
Fix that by using the '--ignore-submodules=dirty' option for both callers
of "git diff-index --cached" when the underlying git version supports that
option.
Signed-off-by: Jens Lehmann
---
gitk | 13 +
1 - 100 of 555 matches
Mail list logo
