Am 21.11.2013 00:04, schrieb Junio C Hamano:
> Jens Lehmann writes:
>> diff --git a/wt-status.c b/wt-status.c
>> index b4e44ba..734f94b 100644
>> --- a/wt-status.c
>> +++ b/wt-status.c
>> @@ -16,6 +16,9 @@
>> #include "column.h"
>> #i
Am 22.11.2013 17:12, schrieb Ramkumar Ramachandra:
> Jeff King wrote:
>>> I just checked it out: it uses `git ls-files -m` to get the list of
>>> unstaged changes; `git diff --name-only HEAD --` will list staged
>>> changes as well.
>>
>> That diff command compares the working tree and HEAD; if you
Am 22.11.2013 19:11, schrieb Ramkumar Ramachandra:
> Sergey Sharybin wrote:
>> To reproduce the issue:
>>
>> - Run git submodule update --recursive to make sure their SHA is
>> changed. Then `git add /path/to/changed submodule` or just `git add .`
>> - Modify any file from the parent repository
>>
Am 22.11.2013 23:09, schrieb Jonathan Nieder:
> Heiko Voigt wrote:
>
>> After that we can discuss whether add should add submodules that are
>> tracked but not shown. How about commit -a ? Should it also ignore the
>> change? I am undecided here. There does not seem to be any good
>> decision. Fro
Am 22.11.2013 22:54, schrieb Heiko Voigt:
> What I think needs fixing here first is that the ignore setting should not
> apply to any diffs between HEAD and index. IMO, it should only apply
> to the diff between worktree and index.
Not only that. It should also apply to diffs between commits/trees
Am 24.11.2013 01:52, schrieb Heiko Voigt:
> Hi,
>
> On Sat, Nov 23, 2013 at 09:10:44PM +0100, Jens Lehmann wrote:
>> Am 22.11.2013 23:09, schrieb Jonathan Nieder:
>>> Heiko Voigt wrote:
>>>
>>>> After that we can discuss whether add should add submod
Am 25.11.2013 22:01, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> Looking good to me. Please add tests for "diff.ignoreSubmodules"
>> and "submodule..ignore", the latter both in .gitmodules and
>> .git/config. While doing some testing for th
Am 26.11.2013 16:17, schrieb René Scharfe:
> Am 26.11.2013 01:04, schrieb Nick Townsend:
>> diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
>> index b97aaab..b4df735 100644
>> --- a/Documentation/git-archive.txt
>> +++ b/Documentation/git-archive.txt
>> @@ -11,6 +11,7 @@
Am 05.12.2013 00:01, schrieb Martin Langhoff:
> Hi folks.
>
> currently working on a project based on Moodle (the LMS that got me
> into git in the first place). This is a highly modular software, and I
> would like to maintain a bunch of "out of tree" modules in a single
> repository, and be able
eliably detect the start of the diff so it can be
chopped off from the commit message, no matter what the user enters there.
Turn a known test failure fixed by this change into a successful test;
also add one for a diff starting with a submodule log and another one for
proper handling of the co
Am 05.12.2013 20:27, schrieb Martin Langhoff:
> On Thu, Dec 5, 2013 at 2:18 PM, Jens Lehmann wrote:
>> Without knowing more I can't think of a reason why submodules should
>> not suit your use case (but you'd have to script branching and tagging
>> yourself until
Am 05.12.2013 00:19, schrieb Heiko Voigt:
> On Wed, Dec 04, 2013 at 02:32:46PM -0800, Junio C Hamano wrote:
> This series tries to achieve the following goals for the
> submodule..ignore=all configuration or the --ignore-submodules=all
> command line switch.
Thanks for the summary.
> * Make git
Am 05.12.2013 23:06, schrieb Martin Langhoff:
> On Thu, Dec 5, 2013 at 2:54 PM, Jens Lehmann wrote:
>> Am 05.12.2013 20:27, schrieb Martin Langhoff:
>>> On Thu, Dec 5, 2013 at 2:18 PM, Jens Lehmann wrote:
>>>> Without knowing more I can't think of a reason
Am 09.12.2013 16:16, schrieb Jonathan Nieder:
> Thomas Gummerer wrote:
>
>> git diff --no-index ... currently reads the index, during setup, when
>> calling gitmodules_config(). In the usual case this gives us some
>> performance drawbacks,
>
> Makes sense.
Hmm, but this will disable the submod
Am 09.12.2013 11:59, schrieb George Papanikolaou:
> I was just playing with the new features of 'git mv' in 1.8.5 and
> realized that both rm
> and mv don't change the .git/config file. Is that on purpuse?
Yes. Only the "path" entry in .gitmodules needs to be updated
when a submodule is moved. Its
Am 10.12.2013 00:56, schrieb Junio C Hamano:
> Heiko Voigt writes:
>
>> On Fri, Dec 06, 2013 at 02:40:15PM -0500, Martin Langhoff wrote:
>>> On Fri, Dec 6, 2013 at 3:48 AM, Jens Lehmann wrote:
>>>> Right you are, we need tutorials for the most prominent use ca
Am 10.12.2013 00:40, schrieb Junio C Hamano:
> Heiko Voigt writes:
>
>> This notion has changed in a way that only the url (by that the name)
>> should be copied on init. The default for everything else should come
>> from .gitmodules or gits own default.
>
> I think you need to be a bit careful
Am 12.12.2013 02:16, schrieb Junio C Hamano:
> "W. Trevor King" writes:
>
>> For
>> safety, maybe the default `init` should copy *everything* into
>> .git/config, after which users can remove stuff they'd like to
>> delegate to .gitmodules.
>
> Copying everything into config is "be unsafe and in
Am 19.12.2013 00:32, schrieb fREW Schmidt:
> I tried to make a script to repro this from scratch but ran into other
> issues, which may or may not be a bug. I'll put that at the end.
>
> To repro all you have to do is:
>
> git checkout git://github.com/frioux/dotfiles
> git reset --hard 92c85
Am 21.12.2013 10:48, schrieb fREW Schmidt:
> Hello all,
>
> I was on a plane, moving around some of the many (30ish) submodules in
> my dotfiles and got really annoyed at how much work it is (move the
> dir, remove old from git, add new to git, fix .gitmodules, fix
> .git/config, fix all the parts
Am 26.12.2013 16:58, schrieb Jonathan Nieder:
> This patch series comes from
> https://github.com/jlehmann/git-submod-enhancements branch
> recursive_submodule_checkout. It needed some tiny tweaks to apply to
> current "master" and build without warnings, but nothing major, and I
> haven't sanity
Am 26.12.2013 17:02, schrieb Jonathan Nieder:
> From: Jens Lehmann
> Date: Mon, 18 Jun 2012 22:17:59 +0200
>
> This commit adds the functions needed for configuration, for setting the
> default behavior and for determining if a submodule path should be updated
> automatically.
Am 26.12.2013 17:12, schrieb Jonathan Nieder:
> From: Jens Lehmann
> Date: Tue, 19 Jun 2012 20:55:45 +0200
>
> Implement the functionality needed to enable work tree manipulating
> commands to that a deleted submodule should not only affect the index
> (leaving all the files o
Am 26.12.2013 17:22, schrieb Jonathan Nieder:
> From: Jens Lehmann
> Date: Wed, 13 Jun 2012 18:50:10 +0200
>
> Signed-off-by: Jens Lehmann
> Signed-off-by: Jonathan Nieder
> ---
> This is the patch that actually introduces the --recurse-submodules
> option, which makes
rk tree like using
the mv command did the first time.
Explain what happens and what the user has to do manually to fix that.
Also document this in a new test.
Reported-by: George Papanikolaou
Signed-off-by: Jens Lehmann
---
Am 09.12.2013 18:49, schrieb Jens Lehmann:
> Am 09.12.2013 11:59,
Am 06.01.2014 23:36, schrieb Junio C Hamano:
> * jl/submodule-recursive-checkout (2013-12-26) 5 commits
> - Teach checkout to recursively checkout submodules
> - submodule: teach unpack_trees() to update submodules
> - submodule: teach unpack_trees() to repopulate submodules
> - submodule: teac
Am 06.01.2014 23:40, schrieb Junio C Hamano:
> Jens Lehmann writes:
>> Does this new paragraph make it clearer?
>
> Don't we have bugs section that we can use to list the known
> limitations like this?
Right, will change accordingly in v2.
>> Documentation/git
Am 07.01.2014 18:57, schrieb Jens Lehmann:
> Am 06.01.2014 23:40, schrieb Junio C Hamano:
>> Jens Lehmann writes:
>>> Does this new paragraph make it clearer?
>>
>> Don't we have bugs section that we can use to list the known
>> limitations like this?
rk tree like using
the mv command did the first time.
Explain what happens and what the user has to do manually to fix that in
the new BUGS section. Also document this behavior in a new test.
Reported-by: George Papanikolaou
Signed-off-by: Jens Lehmann
---
Documentation/git-mv.txt | 12 ++
e submodule from the
work tree like using the rm command did the first time.
Explain what happens and what the user has to do manually to fix that in
the new BUGS section. Also document this behavior in a new test.
Signed-off-by: Jens Lehmann
---
Documentation/git-rm.txt | 9 +
t/t3
Am 09.01.2014 02:09, schrieb Francesco Pretto:
> 2014/1/9 W. Trevor King :
>>
>> However, submodule..local-branch has nothing to do with remote
>> repositories or tracking branches.
>
> My bad: this means the feature is still not entirely clear to me.
>
>>
>> [branch "my-feature"]
>> re
Am 09.01.2014 18:32, schrieb W. Trevor King:
> On Thu, Jan 09, 2014 at 09:31:13AM +0100, Jens Lehmann wrote:
>> Am 09.01.2014 02:09, schrieb Francesco Pretto:
>>> 2014/1/9 W. Trevor King :
>>>>
>>>> However, submodule..local-branch has nothing to do
Am 09.01.2014 20:55, schrieb W. Trevor King:
> On Thu, Jan 09, 2014 at 08:23:07PM +0100, Jens Lehmann wrote:
>> Am 09.01.2014 18:32, schrieb W. Trevor King:
>>> However, the local-branch setting needs to be both
>>> per-submodule and per-superproject-branch, so .git/c
Thanks for the writeup, comments below.
Am 12.01.2014 02:08, schrieb W. Trevor King:
> Gitlinked commit hash
> -
>
> The submodule model revolves around links to commits (“gitlinks”):
>
> $ git ls-tree HEAD
> 100644 blob 189fc359d3dc1ed5019b9834b93f0dfb49c5851f.gitmod
Am 20.01.2014 19:25, schrieb Paweł Sikora:
> i've noticed that 'git log submodule-dir' and 'git log submodule-dir/'
> return different results (module's head changes vs. nothing). is it a bug?
> looks like a trailing slash is a problem for git-log.
I think this is a bug, and for example "git diff"
Am 23.01.2014 22:09, schrieb Junio C Hamano:
> Nguyễn Thái Ngọc Duy writes:
>> diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh
>> index 15a4912..b54251a 100755
>> --- a/t/t4010-diff-pathspec.sh
>> +++ b/t/t4010-diff-pathspec.sh
>> @@ -127,4 +127,10 @@ test_expect_success 'diff-tr
Am 07.01.2014 18:55, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> Am 06.01.2014 23:36, schrieb Junio C Hamano:
>>> * jl/submodule-recursive-checkout (2013-12-26) 5 commits
>>> - Teach checkout to recursively checkout submodules
>>> - submodule: te
This commit adds the functions and files needed for configuration,
documentation, setting the default behavior and determining if a
submodule path should be updated automatically.
It won't really enable recursive submodule update. This will be done
by later commits.
Signed-off-by: Jens Le
functionality, that will be added to unpack_trees()
in subsequent commits.
Signed-off-by: Jens Lehmann
---
Documentation/git-reset.txt | 4
builtin/reset.c | 14 ++
2 files changed, 18 insertions(+)
diff --git a/Documentation/git-reset.txt b/Documentation/git
functionality, that will be added to unpack_trees() in
subsequent commits.
Signed-off-by: Jens Lehmann
---
Documentation/git-checkout.txt | 2 +
builtin/checkout.c | 14 +++
t/t2013-checkout-submodule.sh | 215 -
3 files changed, 228 insertions
() is added
to avoid having the helper learn the command line representation of the
different option values himself.
Signed-off-by: Jens Lehmann
---
bisect.c | 33 ++---
bisect.h | 3 ++-
builtin/bisect--helper.c | 9 ++
prone.
If the option is given it is stored in the BISECT_RECURSE_SUBMODULES file
in the git directory so that later bisection steps can reuse it. But this
commit only adds the option without any functionality, that will be added
to unpack_trees() in subsequent commits.
Signed-off-by: Jens Lehmann
--
the .gitmodules blob of the tree we are updating to
will be used for the path <-> name mapping in a later commit.
Signed-off-by: Jens Lehmann
---
entry.c| 4
submodule.c| 44 +---
submodule.h| 1 +
unpack-trees.
removal. Also teach verify_clean_submodule() to check
that a submodule configured to be removed is not modified before scheduling
it for removal.
Signed-off-by: Jens Lehmann
---
submodule.c| 37 +
submodule.h| 1 +
unpack-trees.c | 7 ---
wrapper.c
Implement the functionality needed to enable work tree manipulating
commands so that an changed submodule does not only affect the index but
it also updates the work tree of any initialized submodule according to
the SHA-1 recorded in the superproject.
Signed-off-by: Jens Lehmann
---
entry.c
functionality, that will be added to unpack_trees() in subsequent commits.
Signed-off-by: Jens Lehmann
---
Documentation/git-merge.txt | 2 ++
builtin/merge.c | 14 ++
2 files changed, 16 insertions(+)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index
Am 03.02.2014 21:04, schrieb W. Trevor King:
> On Mon, Feb 03, 2014 at 08:51:57PM +0100, Jens Lehmann wrote:
>> submodule update' eacht time obsolete, which was tedious and error prone.
> ^ each
>
> I'm just reading the commit messages this pas
Am 07.02.2014 10:15, schrieb Gábor Lipták:
> I think I have found a bug related to submodules and directory diff.
> See the details at hXXp://stackoverflow.com/q/21623155/337621.
Let's inline the recipe one finds after decrypting this link:
~/Projects/MAINMODULE/platform/SUBMODULE [master]$ git d
Am 04.02.2014 01:01, schrieb Jonathan Nieder:
> Jens Lehmann wrote:
>> --- /dev/null
>> +++ b/Documentation/recurse-submodules-update.txt
>> @@ -0,0 +1,8 @@
>> +--[no-]recurse-submodules::
>> +Using --recurse-submodules will update the work tree of all
>>
Am 03.02.2014 23:23, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> This commit adds the functions and files needed for configuration,
>
> Please just say "Add the functions and files needed for ...".
Roger that.
>> +++ b/Documentation/recurse-sub
Am 03.02.2014 23:40, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> This new option will allow the user to not only reset the work tree of
>> the superproject but to also update the work tree of all initialized
>> submodules (so they match the SHA-1 recorded i
Am 03.02.2014 23:56, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> +set_config_update_recurse_submodules(
>> +
>> parse_update_recurse_submodules_arg("--recurse-submodules-default",
>> +
Am 04.02.2014 00:01, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> This new option will allow the user to not only update the work tree of
>> the superproject according to the merge result but to also update the
>> work tree of all initialized submodules (so they
Am 03.02.2014 21:10, schrieb W. Trevor King:
> On Mon, Feb 03, 2014 at 08:52:49PM +0100, Jens Lehmann wrote:
>> Implement the functionality needed to enable work tree manipulating
>> commands to that a deleted submodule should not only affect the index
>> (leaving all the file
Am 03.02.2014 21:19, schrieb W. Trevor King:
> On Mon, Feb 03, 2014 at 08:54:17PM +0100, Jens Lehmann wrote:
>> Implement the functionality needed to enable work tree manipulating
>> commands so that an changed submodule does not only affect the index but
>> it also updates
Am 04.02.2014 01:11, schrieb Duy Nguyen:
> On Tue, Feb 4, 2014 at 2:54 AM, Jens Lehmann wrote:
>> Implement the functionality needed to enable work tree manipulating
>> commands so that an changed submodule does not only affect the index but
>> it also updates the work tr
Am 28.11.2014 um 18:54 schrieb Timothy M. Redaelli:
I have a repository with a submodule and I'd like to force git to
checkout the LAST version of the submodule and not the stored one (like
git submodule update --remote), but only on some branches and without
the need to remember to add --remote
Am 01.12.2014 um 00:27 schrieb Max Kirillov:
builtin/checkout.c: use absolute path instead of given argument for
picking worktree name, it happens to be needed because for submodule
checkout the new worktree is always "."
environment.c: add GIT_COMMON_DIR to local_repo_env
git-submodule.sh: i
Am 02.12.2014 um 23:16 schrieb Max Kirillov:
On Tue, Dec 02, 2014 at 09:45:24PM +0100, Jens Lehmann wrote:
But, while hacking the submodule init I became more
convinced that the modules directory should be common and
submodules in checkout should be a checkouts of the
submodule. Because this is
Am 05.12.2014 um 02:33 schrieb Duy Nguyen:
On Fri, Dec 5, 2014 at 3:06 AM, Jens Lehmann wrote:
Wow, so the .git/config is shared between all worktrees? I
suspect you have very good reasons for that,
most of config vars are at repo-level, not worktree-level, except
maybe submodule.* and
Am 05.12.2014 um 07:32 schrieb Max Kirillov:
On Thu, Dec 4, 2014 at 10:06 PM, Jens Lehmann wrote:
But I'd need to have separate settings for
our CI server, e.g. to checkout the sources without the
largish documentation submodule in one test job (=worktree)
while checking out the
Am 07.12.2014 um 07:42 schrieb Max Kirillov:
On Sat, Dec 06, 2014 at 02:06:08PM +0100, Jens Lehmann wrote:
Am 05.12.2014 um 07:32 schrieb Max Kirillov:
Currently I'm estimating approach when submodules which have .git
file or directory inside are updated, and those which do not have it ar
Am 07.01.2015 um 01:02 schrieb Junio C Hamano:
^"Kyle J. McKay" writes:
I can't find anything in that thread about why vsatisfies was
preferred over vcompare other than the obvious that the vsatisfies
version is only a 1-character change. And that would be more than
enough except that Tcl 8.4
Am 19.01.2015 um 21:19 schrieb Maximilian Held:
I have a directory with nested submodules, such as:
supermodule/submodule/sub-submodule/sub-sub-submodule
When I cd to supermodule and do:
"git push --recurse-submodule=check" (or on-demand),
git only pushes the submodule, but not the sub-submod
Am 26.01.2015 um 06:39 schrieb Junio C Hamano:
Craig Silverstein writes:
This patch, in adding submodule support, I expect would be
similarly useful to people even though it, also, imposes those
same constraints to the submodule's config files.
I would expect that you would see exactly the s
Am 30.01.2015 um 16:14 schrieb Patrick Steinhardt:
When we add a new submodule the path of the submodule is being normalized. We
fail to normalize multiple adjacent '/./', though. Thus 'path/to/././submodule'
will become 'path/to/./submodule' where it should be 'path/to/submodule'
instead.
Than
Am 08.02.2015 um 05:16 schrieb Nguyễn Thái Ngọc Duy:
1/3 is a more complete version of a patch I posted earlier [1]. It
makes sure that worktree.* config keys are stored in a different place
than $GIT_DIR/config. This allows us to work around the core.worktree
issue in multiple worktree setting.
Am 08.02.2015 um 09:36 schrieb Jens Lehmann:
Am 08.02.2015 um 05:16 schrieb Nguyễn Thái Ngọc Duy:
1/3 is a more complete version of a patch I posted earlier [1]. It
makes sure that worktree.* config keys are stored in a different place
than $GIT_DIR/config. This allows us to work around the
Am 13.02.2015 um 11:57 schrieb Junio C Hamano:
Nguyễn Thái Ngọc Duy writes:
These patches are on top of what's in 'pu'. They add
--ignore-other-worktrees and make a note about current submodule
support status. I don't think submodule support is ready yet even
with Max Kirillov's series [1]. H
Am 28.08.2013 14:47, schrieb Matthieu Moy:
> Signed-off-by: Matthieu Moy
> ---
> (--for-status was undocumented, so I didn't bother documenting this either)
That's fine, as both if these options will - hopefully - only be used
by wt-status.c internally.
But I'm not terribly happy about having th
Am 29.08.2013 15:05, schrieb Matthieu Moy:
> The --for-status option was an undocumented option used only by
> wt-status.c, which inserted a header and commented out the output. We can
> achieve the same result within wt-status.c, without polluting the
> submodule command-line options.
>
> This wi
Am 30.08.2013 21:51, schrieb Jens Lehmann:
> Am 30.08.2013 21:40, schrieb Jens Lehmann:
>> Am 29.08.2013 23:23, schrieb Matthieu Moy:
>>> Jens Lehmann writes:
>>>
>>>> Am 29.08.2013 15:05, schrieb Matthieu Moy:
>>>>> The --for-status o
Am 30.08.2013 21:40, schrieb Jens Lehmann:
> Am 29.08.2013 23:23, schrieb Matthieu Moy:
>> Jens Lehmann writes:
>>
>>> Am 29.08.2013 15:05, schrieb Matthieu Moy:
>>>> The --for-status option was an undocumented option used only by
>>>> wt-status.
Am 29.08.2013 23:23, schrieb Matthieu Moy:
> Jens Lehmann writes:
>
>> Am 29.08.2013 15:05, schrieb Matthieu Moy:
>>> The --for-status option was an undocumented option used only by
>>> wt-status.c, which inserted a header and commented out the output. We can
>
Am 29.08.2013 01:24, schrieb Junio C Hamano:
> * bc/submodule-status-ignored (2013-08-20) 2 commits
> - submodule: don't print status output with ignore=all
> - submodule: fix confusing variable name
>
> Originally merged to 'next' on 2013-08-22
>
> Will merge to 'next'.
Looks like you didn'
Am 31.08.2013 19:08, schrieb brian m. carlson:
> On Fri, Aug 30, 2013 at 10:08:53PM +0200, Jens Lehmann wrote:
>> Am 30.08.2013 21:51, schrieb Jens Lehmann:
>>> Am 30.08.2013 21:40, schrieb Jens Lehmann:
>>>> Am 29.08.2013 23:23, schrieb Matthieu Moy:
>>>&
Am 29.08.2013 21:54, schrieb Jens Lehmann:
> Am 29.08.2013 15:05, schrieb Matthieu Moy:
>> The --for-status option was an undocumented option used only by
>> wt-status.c, which inserted a header and commented out the output. We can
>> achieve the same result within wt-status
Am 01.09.2013 22:06, schrieb brian m. carlson:
> git status prints information for submodules, but it should ignore the status
> of
> those which have submodule..ignore set to all. Fix it so that it does
> properly ignore those which have that setting either in .git/config or in
> .gitmodules.
>
Am 03.09.2013 21:53, schrieb Junio C Hamano:
> Jens, I see 1/2 is the same as the previous one you already acked.
Yep.
> Does this update to 2/2 look good to you? Sorry, but I lost track
> of the discussion that led to this reroll, hence a ping.
v3 fixes the bug Matthieu noticed, I only had som
Am 04.09.2013 21:19, schrieb Junio C Hamano:
> Matthieu Moy writes:
>
>> Junio C Hamano writes:
>>
>>> * mm/status-without-comment-char (2013-08-29) 5 commits
>>> - status: introduce status.displayCommentChar to disable display of #
>>> - SQUASH: do not fprintf() random strings
>>> - get rid
Am 04.09.2013 08:31, schrieb Matthieu Moy:
> "brian m. carlson" writes:
>
>> Tests are included which verify that this change has no effect on git
>> submodule
>> summary without the --for-status option.
>
> I still don't understand why this is needed.
To avoid a change in behavior for "git su
Am 04.09.2013 22:57, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> Am 03.09.2013 21:53, schrieb Junio C Hamano:
>>> Does this update to 2/2 look good to you? Sorry, but I lost track
>>> of the discussion that led to this reroll, hence a ping.
>>
>
Am 10.09.2013 00:53, schrieb Junio C Hamano:
> * bc/submodule-status-ignored (2013-09-04) 2 commits
> - submodule: don't print status output with ignore=all
> - submodule: fix confusing variable name
>
> Originally merged to 'next' on 2013-08-22
>
> Will merge to 'next'.
I propose to cook th
Am 10.09.2013 21:13, schrieb John Keeping:
> When using tab-completion, a directory path will often end with a
> trailing slash which currently confuses "git rm" when dealing with
I think you meant to say "git reset" in the line above. Apart from
that I'm all for it.
> submodules. Now that we ha
ubmodules" and "submodule..ignore" are described to
better explain these dependencies.
Thanks-to: Matthieu Moy
Signed-off-by: Jens Lehmann
---
Am 10.09.2013 18:27, schrieb Jens Lehmann:
> Am 10.09.2013 00:53, schrieb Junio C Hamano:
>> * bc/submodule-status-ignored (20
Am 15.09.2013 19:38, schrieb Tay Ray Chuan:
> When 'update' is run with no path in a repository with uninitialized
> submodules, the program terminates with no output, and zero status code.
> Be more helpful to users by mentioning this.
Hmm, this patch is changing the default behavior, right? I as
Am 18.09.2013 12:12, schrieb Tay Ray Chuan:
> On Tue, Sep 17, 2013 at 1:06 AM, Jens Lehmann wrote:
>
> Thanks Jens for having a look!
>
>> Am 15.09.2013 19:38, schrieb Tay Ray Chuan:
>>> When 'update' is run with no path in a repository with uninitialized
&
Am 21.09.2013 00:29, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> Am 10.09.2013 00:53, schrieb Junio C Hamano:
>>> * bc/submodule-status-ignored (2013-09-04) 2 commits
>>> - submodule: don't print status output with ignore=all
>>&g
Hi Matthieu,
Am 11.10.2013 16:29, schrieb Matthieu Moy:
> I'm getting this warning:
>
> warning: Could not find section in .gitmodules where path=XXX
>
> whenever I use "git mv" to move a file in a repository containing a
> submodule. The file is outside the submodule and is completely
> unrel
en cloning submodules, repositories cloned with older git
versions will still use this layout.
Reported-by: Matthieu Moy
Signed-off-by: Jens Lehmann
---
Am 11.10.2013 19:53, schrieb Jens Lehmann:
> Am 11.10.2013 16:29, schrieb Matthieu Moy:
>> I'm getting this warning:
>>
>&g
Am 13.10.2013 17:05, schrieb Matthieu Moy:
> Jens Lehmann writes:
>
>> static struct lock_file lock_file;
>> +#define SUBMODULE_WITH_GITDIR ((const char *)1)
>
> I don't like very much hardcoded addresses like this. Are you 100% sure
> address 1 will nev
Am 15.10.2013 02:12, schrieb Jonathan Nieder:
> * jl/submodule-mv (2013-10-13) 1 commit
> - mv: Fix spurious warning when moving a file in presence of submodules
>
> Moving a regular file in a repository with a .gitmodules file was
> producing a warning 'Could not find section in .gitmodules wh
Am 15.10.2013 21:16, schrieb Jonathan Nieder:
> So I suspect this will fix more scripts than it breaks, though it may
> still break some. :/
Hmm, I'm really not sure if we should do this or not.
> It might make sense to warn when passed multiple arguments and some
> include shell metacharacters,
Am 15.10.2013 22:05, schrieb Jonathan Nieder:
> Jens Lehmann wrote:
>> Am 15.10.2013 21:16, schrieb Jonathan Nieder:
>
>>> So I suspect this will fix more scripts than it breaks, though it may
>>> still break some. :/
>>
>> Hmm, I'm really not sure i
Am 18.10.2013 02:42, schrieb Karsten Blees:
> Am 17.10.2013 23:07, schrieb Junio C Hamano:
>> Junio C Hamano writes:
>>
>>> Karsten Blees writes:
>>>
Am 16.10.2013 23:43, schrieb Junio C Hamano:
> * kb/fast-hashmap (2013-09-25) 6 commits
> - fixup! diffcore-rename.c: simplify findin
Am 18.10.2013 21:09, schrieb Junio C Hamano:
> Karsten Blees writes:
>> Can't we just use add_file_to_cache here (which replaces
>> cache_entries by creating a copy)?
>>
>> diff --git a/submodule.c b/submodule.c
>> index 1905d75..e388487 100644
>> --- a/submodule.c
>> +++ b/submodule.c
>> @@ -116,
gular use cases (and by then just silently adding it to the
index we do the right thing).
Thanks-to: Karsten Blees
Signed-off-by: Jens Lehmann
---
Am 18.10.2013 21:52, schrieb Jens Lehmann:
> Am 18.10.2013 21:09, schrieb Junio C Hamano:
>> Karsten Blees writes:
>>> Can't we
Am 09.03.2015 um 20:43 schrieb Jeff King:
On Thu, Mar 05, 2015 at 04:20:10PM +0100, Aschemann Gerd wrote:
seems to be a bug: If adding a submodule from an https URL with a certificate
issued by StartSSL (or even a private/self-signed one?) leads to the following
error:
$ git -c http.sslve
Am 20.03.2015 um 01:13 schrieb Trevor Saunders:
On Thu, Mar 19, 2015 at 02:15:19PM -0700, Junio C Hamano wrote:
Trevor Saunders writes:
I have a feeling that an optional feature that allows "git submodule
update" to happen automatically from this codepath might be
acceptable by the submodule fo
Am 17.03.2015 um 08:56 schrieb Patrick Steinhardt:
On Mon, Mar 16, 2015 at 01:03:53PM -0700, Jonathan Nieder wrote:
(+cc: Jens and Heiko, submodule experts)
Hi,
Patrick Steinhardt wrote:
This proposal is just for discussion. If there is any interest I
will implement the feature and send some
201 - 300 of 555 matches
Mail list logo
