Am 11.04.2014 21:23, schrieb Junio C Hamano:
> Jeff King writes:
>
>> On Fri, Apr 11, 2014 at 01:24:02AM -0700, Kyle J. McKay wrote:
>>
>>> Since 11502468 and 04c1ee57 (both first appearing in v1.8.5), the
>>> t7001-mv test has used "cp -a" to perform a copy in several of the
>>> tests.
>>>
>>> H
Am 17.04.2014 10:02, schrieb Gerhard Gappmeier:
> Hi all
>
> in our cross-platform projects we always have a certain Windows-only
> submodule, which contains all the compatibility stuff and missing libraries
> for
> Windows.
>
> When cloning such a repository on a Linux machine the typical pro
Am 17.04.2014 18:41, schrieb W. Trevor King:
> On Tue, Mar 25, 2014 at 06:05:05PM +0100, Jens Lehmann wrote:
>> *) When a submodule is replaced with a tracked file of the same name
>>the submodule work tree including any local modifications (and
>>even the whole hist
Am 17.04.2014 21:23, schrieb Junio C Hamano:
> "W. Trevor King" writes:
>
>> There have been a number of submodule series in
>> flight recently, and I'm having trouble keeping track of them all ;).
>
> Unfortunately I share that same feeling X-<.
>
> Could you guys collectively summarize what i
Am 13.04.2014 00:45, schrieb Ronald Weiss:
> Allow ignoring submodules (or not) by command line switch, like diff
> and status do.
>
> Git add currently doesn't honor ignore from .gitmodules or .git/config,
> which is related functionality, however I'd like to change that in
> another patch, comin
Am 13.04.2014 00:49, schrieb Ronald Weiss:
> Allow ignoring submodules (or not) by command line switch, like diff
> and status do.
>
> Git commit honors the 'ignore' setting from .gitmodules or .git/config,
> but didn't allow to override it from command line.
>
> This patch depends on Jens Lehman
Am 13.04.2014 01:41, schrieb Ronald Weiss:
> On 8. 4. 2014 20:26, Jens Lehmann wrote:
>> Am 07.04.2014 23:46, schrieb Ronald Weiss:
>>> Then, on top of that, I'll prepare patches for add to honor ignore
>>> from .gitmodules, and -f implying --ignore-submodules. Tha
Am 17.04.2014 23:55, schrieb W. Trevor King:
> On Thu, Apr 17, 2014 at 11:08:06PM +0200, Jens Lehmann wrote:
>> Am 17.04.2014 18:41, schrieb W. Trevor King:
>>> On Tue, Mar 25, 2014 at 06:05:05PM +0100, Jens Lehmann wrote:
>>>> *) When a submodule is replaced with a
Hi José,
Am 02.09.2014 um 09:53 schrieb Jose Paredes:
Is there any way to run "git submodule update" in multiple threads?
The use case:
---
"git submodule update" seems to be inefficient when running
sequentially on a large .gitmodules file.
Assuming a git forest with over 7K gi
Am 11.09.2014 um 19:11 schrieb Cole Minnaar:
Currently when specifying the `--depth` option to the 'submodule add'
command, it can only create a shallow submodule clone of the currently active
branch from the cloned repository. If a branch is specified using the
`--branch` command, the 'submodule
Am 11.09.2014 um 19:50 schrieb ezyang:
Hello all,
In many situations, if you have a submodule conflict during a rebase,
and you type 'git diff' to get a summary of the situation, you will get
an empty diff. Here's a simple transcript for one such case (I'm sorry
I can't make it much shorter), t
Am 08.09.2014 um 19:29 schrieb Junio C Hamano:
Thomas Rast writes:
The existing code passed revs->dense_combined_merges along revs itself
into the combine-diff functions, which is rather redundant. Remove
the 'dense' argument until much further down the callchain to simplify
callers.
It was
Am 12.09.2014 um 15:03 schrieb Edward Z. Yang:
Hello Jens,
Excerpts from Jens Lehmann's message of 2014-09-11 15:29:28 -0400:
Git does know what's going on, just fails to display it properly
in the diff, as the output of ls-files shows:
$git ls-files -u
16 6a6e215138b7f343fba67ba
Am 12.09.2014 um 07:21 schrieb Fredrik Gustafsson:
On Thu, Sep 11, 2014 at 10:33:51PM +0200, Cole wrote:
Also if there is anything else you are currently looking at regarding
submodules or thinking about, I would be glad to hear about it or to try
look at it while I am working on these changes.
Am 11.09.2014 um 22:33 schrieb Cole:
Thanks for the feedback, really appreciate it, and will try to reformat
the patches as you have asked.
Thanks!
When you say you would like the patches split, do you mean into two
separate threads, or just different patches part of the same thread?
I thin
Am 12.09.2014 um 15:58 schrieb Edward Z. Yang:
tl;dr You can't git-new-workdir checkouts which use core.worktree. This
is unfortunate because 'git submodule init' uses core.worktree by
default, which means you can't recursively git-new-workdir without a
hack.
In the beginning, the Developer cre
Am 20.09.2014 um 18:20 schrieb Daniel Hahler:
After staging the removal of a submodule, diff-index does not consider this when
"--ignore-submodules" is being used:
# In a repository with submodule "sm":
% git rm --cached sm
% git diff-index --cached --quiet --ignore-submodules HE
Am 30.09.2014 um 15:25 schrieb Michal Sojka:
I'd like to shorten the time needed by our continuous integration (CI)
tool to clone the source repositories. Currently the full clone takes
about 10 minutes (even from local server). Our main repository has
several submodules so the CI tool runs "git
Am 03.10.2014 um 13:56 schrieb Michal Sojka:
On Fri, Oct 03 2014, Jens Lehmann wrote:
Am 30.09.2014 um 15:25 schrieb Michal Sojka:
I'd like to shorten the time needed by our continuous integration (CI)
tool to clone the source repositories. Currently the full clone takes
about 10 minutes
Am 07.10.2014 um 21:12 schrieb Mikael Magnusson:
On 7 October 2014 20:25, Junio C Hamano wrote:
Olaf Hering writes:
How can I teach 'git grep $string' to also consider subprojects?
The build system of xen.git clones 4 other trees into a directory in its
source tree during build. It would be
Am 08.10.2014 um 08:59 schrieb Olaf Hering:
On Wed, Oct 08, Jens Lehmann wrote:
git foo && git submodule foreach --recursive git foo
Looks like a submodule is yet another thing, or I have to learn what a
submodule is:
olaf@bax:~/xen $ find . -name .git
./.git
./tools/qemu-xen-di
Am 14.10.2014 um 14:17 schrieb Duy Nguyen:
On Sun, Oct 12, 2014 at 12:13 PM, Max Kirillov wrote:
These are fixes of issues with submodules with use of multiple working
trees.
I think the patches look fine from the nd/multiple-work-trees writer's
perspective. I know too little about submodules
Am 14.10.2014 um 20:34 schrieb Max Kirillov:
On Tue, Oct 14, 2014 at 10:26:42AM -0700, Junio C Hamano wrote:
And multiple-worktree _is_ about keeping the same repository and
history data (i.e. object database, refs, rerere database, reflogs for
refs/*) only once, while allowing multiple working
Am 15.10.2014 um 00:15 schrieb Max Kirillov:
On Tue, Oct 14, 2014 at 09:51:22PM +0200, Jens Lehmann wrote:
Am 14.10.2014 um 20:34 schrieb Max Kirillov:
But here are a lot of nuances. For example, it makes
sense to have a superproject checkout without submodules
being initialized (so that they
Am 16.10.2014 um 22:54 schrieb Max Kirillov:
On Wed, Oct 15, 2014 at 08:57:20PM +0200, Jens Lehmann wrote:
Am 15.10.2014 um 00:15 schrieb Max Kirillov:
I think the logic can be simple: it a submodule is not
checked-out in the repository "checkout --to" is called
from, then it is n
Am 17.10.2014 um 11:14 schrieb Duy Nguyen:
On Thu, Oct 16, 2014 at 12:09 AM, Junio C Hamano wrote:
Hmph. I was hoping that the multiple-work-trees topic was ready for
'next' by now, but we may want to wait to see how the interaction
with submodule plays out to have another chance of a clean re
Am 03.11.2014 um 20:02 schrieb Junio C Hamano:
Michal Sojka writes:
The documentation says that submodule.$name.update can be overridden by
--checkout only if its value is `none`. This is not true, because both
implementation and documentation of --checkout specifies that the
override applies
2014 at 09:30:15PM +0200, Jens Lehmann wrote:
Am 16.10.2014 um 22:54 schrieb Max Kirillov:
On Wed, Oct 15, 2014 at 08:57:20PM +0200, Jens Lehmann wrote:
Am 15.10.2014 um 00:15 schrieb Max Kirillov:
I think the logic can be simple: it a submodule is not
checked-out in the repository "checkout --
Am 03.11.2014 um 21:53 schrieb Junio C Hamano:
I did a bit more digging of the history, and came up with this,
which would be with a clearer and fairer description. Also to
clarify, I spelled what Michal's "This" meant to refer to.
-- >8 --
From: Michal Sojka
Date: Mon, 3 Nov 2014 11:09:51 +01
Am 04.11.2014 um 00:08 schrieb Junio C Hamano:
Michal Sojka writes:
Or something perhaps? Or the detailed description of
submodule.$name.update should be dropped from here and refer the
reader to config.txt instead?
I guess you mean gitmodules.txt.
Actually, I do mean the configuration. .
Am 09.11.2014 um 12:39 schrieb Tom Freudenberg:
Hi, a few weeks ago I send out attached message and patch to
gitster-at-pobox.com tried to follow the guidelines.
Have not get any feedback until now, neither acceptance nor decline … just
no feedback.
I am not sure if the message was received or
Am 07.11.2014 um 20:20 schrieb Junio C Hamano:
Johannes Schindelin writes:
They are not affected by the update anyway.
Signed-off-by: Johannes Schindelin
---
builtin/receive-pack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/receive-pack.c b/builtin/receive
Am 22.04.2014 00:08, schrieb Ronald Weiss:
> On 18. 4. 2014 14:09, Jens Lehmann wrote:
>> Am 13.04.2014 00:49, schrieb Ronald Weiss:
>>> Allow ignoring submodules (or not) by command line switch, like diff
>>> and status do.
>>>
>>> Git commit honors
Thanks for the reminder, I'm currently looking into that.
Am 13.05.2014 10:30, schrieb Chris Packham:
> Hi,
>
> On 13/05/14 11:45, Yann Dirson wrote:
>> In 2.0rc2, git-gui is unable to work inside submodules, where 1.9.2
>> did not show such a problem:
>>
>>
>> yann@home:~$ cd /tmp/
>> yann@home:
eported-by: Chris Packham
Reported-by: Yann Dirson
Signed-off-by: Jens Lehmann
---
Am 07.05.2014 09:49, schrieb Chris Packham:
> On 07/05/14 19:28, Chris Packham wrote:
>> On 07/05/14 00:10, Pat Thoyts wrote:
>>> Chris Packham writes:
>>>
>>>> On Tue, A
avior for
pre-2 versions), he might like Chris' proposal better.
Am 13.05.2014 23:24, schrieb Jens Lehmann:
> Since git 2.0.0 starting git gui in a submodule using a gitfile fails with
> the following error:
>
>No working directory ../../../
>
>couldn't chang
the git version is tested
for another feature.
Reported-by: Chris Packham
Reported-by: Yann Dirson
Helped-by: Pat Thoyts
Signed-off-by: Jens Lehmann
---
Am 17.05.2014 14:23, schrieb Pat Thoyts:
> Junio C Hamano writes:
>
>> Junio C Hamano writes:
>>
>>> Jens Lehmann w
Am 29.05.2014 04:07, schrieb Jonathan Leonard:
> The title pretty much says it all.
But you do not give much information about your special use
case. I assume you have submodule repositories for which some
developers have a valid ssh key and others don't (maybe
because they should only have read a
Am 04.06.2014 19:24, schrieb Junio C Hamano:
> Chris Packham writes:
>
>> On 04/06/14 09:05, Junio C Hamano wrote:
Also, going --recursive when the user did not want is a lot more
expensive mistake to fix than not being --recursive when the user
wanted to.
>>>
>>> Having said all t
Am 04.06.2014 00:16, 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
>
> There also are a few patches Ronald We
Am 04.06.2014 22:50, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> Am 04.06.2014 00:16, 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
>
Am 06.06.2014 07:54, schrieb Heiko Voigt:
> On Thu, Jun 05, 2014 at 07:48:33PM +1200, Chris Packham wrote:
>> On 05/06/14 07:42, Heiko Voigt wrote:
>>> So either we do this "magically" and all valid boolean values are
>>> forbidden as tags or we would need a different config option. Further
>>> thi
Am 13.06.2014 00:04, schrieb Junio C Hamano:
> Hmph, this seems to conflict in a meaningful (and painful) way with
> Jens's "jl/submodule-recursive-checkout".
Then you might wanna drop my series for now, I need to rebase it
above Heiko's series myself to make new submodules work anyway.
--
To unsu
tches.
The only work tree changing command I didn't cover here is checkout-index, as
that updates the work tree to the content of the index but doesn't remove any
formerly tracked files, which means it doesn't do a full transition from one
commit to another. If I overlooked another comma
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
---
t/test-lib-functions.sh | 11 +++
1 file
project 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
---
t/lib-submodule-update.sh | 63
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
---
t/t4137-apply-submodule.sh | 20
1 file changed, 20 i
Test that the read-tree command updates the work tree as expected for
changes which don't result in conflicts with the '-m' and '--reset' flag.
Signed-off-by: Jens Lehmann
---
t/t1013-read-tree-submodule.sh | 12
1 file changed, 12 insertions(+)
create
Test that the reset command updates the work tree as expected for changes
with '--keep', '--merge' (for changes which don't result in conflicts) and
'--hard'.
Signed-off-by: Jens Lehmann
---
t/t7112-reset-submodule.sh | 14 ++
1 file changed, 14
the good commit which makes bisect change the work tree to the
commit in between, which is the commit given.
Signed-off-by: Jens Lehmann
---
t/t6041-bisect-submodule.sh | 32
1 file changed, 32 insertions(+)
create mode 100755 t/t6041-bisect-submodule.sh
diff
r submodule directory
with those of the removed submodule.
Signed-off-by: Jens Lehmann
---
t/lib-submodule-update.sh | 24 +---
t/t7613-merge-submodule.sh | 19 +++
2 files changed, 40 insertions(+), 3 deletions(-)
create mode 100755 t/t7613-merge-submodu
to the current
HEAD so that pull is doing the transition from HEAD to the given branch.
Set KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES
and KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR to
document that pull has the same --no-ff known failures merge has.
Signed
Set KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR to
document that "replace directory with submodule" fails for an
interactive rebase because a directory "sub1" already exists.
Signed-off-by: Jens Lehmann
---
t/t3426-rebase-submodule.sh | 46 +++
bly due to conflict resolution.".
Signed-off-by: Jens Lehmann
---
t/lib-submodule-update.sh| 15 ---
t/t3512-cherry-pick-submodule.sh | 13 +
2 files changed, 25 insertions(+), 3 deletions(-)
create mode 100755 t/t3512-cherry-pick-submodule.sh
diff --git a/
ch to expect the known failure that --no-ff merges attempt to merge
the new files in the former submodule directory with those of the removed
submodule.
Signed-off-by: Jens Lehmann
---
t/t4255-am-submodule.sh | 21 +
1 file changed, 21 insertions(+)
create mode 100755 t/t42
Test that the checkout command updates the work tree as expected with
and without the '-f' flag.
Signed-off-by: Jens Lehmann
---
t/t2013-checkout-submodule.sh | 5 +
1 file changed, 5 insertions(+)
diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh
ind
stash.
Implement the KNOWN_FAILURE_STASH_DOES_IGNORE_SUBMODULE_CHANGES switch
and reuse two other already present switches to expect the known
failure that stash does ignore submodule changes.
Signed-off-by: Jens Lehmann
---
t/lib-submodule-update.sh | 23 ++-
t/t3906-stash-submodu
t the KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT and
KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR switches to
document that revert has the similar failures.
Signed-off-by: Jens Lehmann
---
t/t3513-revert-submodule.sh | 32
1 file changed, 32 insertions(+)
create mode 100755 t/t3513-r
Am 17.06.2014 00:05, 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 17.06.2014 00:49, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> Add this test library to simplify covering all combinations of submodule
>> update scenarios without having to add those to a test of each work tree
>> manipulating command over and over ag
Am 16.06.2014 11:57, schrieb Eric Sunshine:
> On Sun, Jun 15, 2014 at 1:02 PM, Jens Lehmann wrote:
>> Test that the rebase command updates the work tree as expected for
>> changes which don't result in conflicts. To make that work add two
>> helper functions that add a
Am 17.06.2014 20:44, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> Am 17.06.2014 00:49, schrieb Junio C Hamano:
>>> Jens Lehmann writes:
>>>> + GIT_WORK_TREE=. git config --unset core.worktree
>>>
>>> Hmph. What does GIT_WORK_T
the good commit which makes bisect change the work tree to the
commit in between, which is the commit given.
Signed-off-by: Jens Lehmann
---
Changes to v1:
*) use "expect" instead of "expected"
t/t6041-bisect-submodule.sh | 32
1 file ch
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
---
Changes to v1:
*) Added "-n" to test
project 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
---
Changes to v1:
*) avoid non-
stash.
Implement the KNOWN_FAILURE_STASH_DOES_IGNORE_SUBMODULE_CHANGES switch
and reuse two other already present switches to expect the known
failure that stash does ignore submodule changes.
Signed-off-by: Jens Lehmann
---
Changes to v1:
*) use "expect" instead of "expected"
Set KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR to
document that "replace directory with submodule" fails for an
interactive rebase because a directory "sub1" already exists.
Signed-off-by: Jens Lehmann
---
Changes to v1:
*) fix broken &&-chain (you h
t the KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT and
KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR switches to
document that revert has the similar failures.
Signed-off-by: Jens Lehmann
---
Changes to v1:
*) use "expect" instead of "expected"
t/t3513-revert-submodule.sh | 32 +++
Am 22.06.2014 16:09, schrieb Stephen Kelly:
>
> Hello,
>
> boost.git, is using submodules.
>
> If I run gitk after a pull, there are some messages along the lines of
>
>
> Update preprocessor from develop.
>
> Submodule libs/preprocessor 9d2d1ff..1422fce:
> Merge branch 'master' i
Am 22.06.2014 17:45, schrieb Stephen Kelly:
> Jens Lehmann wrote:
>
>> Am 22.06.2014 16:09, schrieb Stephen Kelly:
>> But I agree that this is suboptimal for your workflow. What about adding
>> a "Visualize These Changes In The Submodule" menu entry for the c
Am 23.06.2014 20:24, schrieb Stephen Kelly:
> Stephen Kelly wrote:
>
>> I see that gitk is showing the output of git diff --submodule, similar to
>> git submodule summary.
Right, and for your use case --submodule would have to learn a
different value in addition to 'log' and 'short'. And the defa
project 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
---
Am 20.06.2014 19:31
Am 02.07.2014 16:54, schrieb Torsten Bögershausen:
> (Not sure if this is the right thread)
> (I haven't checked if this is fixed in your latest version)
Yes, this is the right thread and no, it isn't fixed yet.
> On what I have on pu 7a0da7902cbbc9a876b90c9, Tue Jul 1 14:51:53 2014 -0700
>
> Ma
Am 03.07.2014 07:56, schrieb Torsten Bögershausen:
> On 07/02/2014 09:57 PM, Jens Lehmann wrote:
>> Am 02.07.2014 16:54, schrieb Torsten Bögershausen:
>>> (Not sure if this is the right thread)
>>> (I haven't checked if this is fixed in your latest version)
>>
;make test-lint" (and thus the test-lint-shell-syntax
target) in the test directory.
The second patch then uses all lint tests in the test run.
Jens Lehmann (2):
t/Makefile: check helper scripts for non-portable shell commands too
t/Makefile: always test all lint targets when running t
Currently only the "t[0-9][0-9][0-9][0-9]-*.sh" scripts are tested for
shell incompatibilities using the check-non-portable-shell.pl script. This
makes it easy to miss non-POSIX constructs added to one of the t/*lib*.sh
helper scripts, as they aren't automatically detected.
Fix that by adding a TH
Only the two targets "test-lint-duplicates" and "test-lint-executable" are
currently executed when running the test target. This was done on purpose
when the TEST_LINT variable was added in 81127d74. But as this does not
include the "test-lint-shell-syntax" target added the same day in commit
c7ce7
Am 07.07.2014 20:13, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> Only the two targets "test-lint-duplicates" and "test-lint-executable" are
>> currently executed when running the test target. This was done on purpose
>> when the TEST_LINT vari
Am 07.07.2014 21:40, schrieb Torsten Bögershausen:
> On 2014-07-07 19.05, Junio C Hamano wrote:
>> Jens Lehmann writes:
>>
>>> Junio, do you want me to resend 02/14 without the non-portable "echo -n"
>>> or could you just squash the following diff in?
Am 09.07.2014 08:14, schrieb Torsten Bögershausen:
>
>>> There seems to be some other trouble under Mac OS, not yet fully tracked
>>> down,
>>> (may be related to the "diff -r")
>> Torsten sees failures of this kind under Mac OS:
>>
>> diff -r .git/modules/sub1/config sub1/.git/config
>> 6d5
>> <
hat by adding a THELPERS variable containing all shell scripts that
aren't tests and add these to the "test-lint-shell-syntax" target too.
Signed-off-by: Jens Lehmann
---
t/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/t/Makefile b/t/Makefile
index 8
all lint test unless the TEST_LINT
variable is overridden. If we hit false positives more often than helping
developers to avoid non-portable code (or add less accurate or slow tests
later) we could still fall back to exclude them like 81127d74 proposed.
Signed-off-by: Jens Lehmann
---
t/Mak
Am 09.07.2014 07:42, schrieb Junio C Hamano:
> On Tue, Jul 8, 2014 at 12:24 PM, Jens Lehmann wrote:
>>
>> Am 07.07.2014 20:13, schrieb Junio C Hamano:
>>>
>>> So I am not very enthusiastic to see this change myself.
>>
>> Ok, I understand we do not wa
Am 10.07.2014 22:52, schrieb Junio C Hamano:
> Junio C Hamano writes:
>
>> Jens Lehmann writes:
>>
>>> I agree, but this case is special. The test asserts that nobody
>>> added, modified or removed *anything* inside the .git directory.
>>> The re
Am 14.07.2014 03:01, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>>> Perhaps squashing this to 7e8e5af9 instead?
>>
>> Yes please, this is much better than my first attempt.
>
> One thing that I found troubling is the ../../../ "three levels up"
&
Am 18.07.2014 15:02, schrieb Fredrik Gustafsson:
> On Fri, Jul 18, 2014 at 02:08:36PM +0200, Thomas Braun wrote:
>> Am 18.07.2014 12:14, schrieb Armbruster Joachim (BEG/EMS1):
>>> Hello,
>>>
>>> We split a monolithic repository into ~50 submodules. The stored data
>>> has the same size. In the 1:1
Am 06.08.2014 um 20:18 schrieb Robert Dailey:
> On Wed, Aug 6, 2014 at 12:51 PM, Junio C Hamano wrote:
>> My knee-jerk reaction would be "subtree would break submodules
>> badly, don't use it" ;-).
>>
>> After all, I invented subtree merge as an ugly interim workaround
>> before submodule subsyste
Hi Ari,
Am 10.11.2013 22:49, schrieb Ari Pollak:
> I'm using git 1.8.4.2, and I've set the "diff.submodule = log" option
> globally. If I change the revision that a submodule is set to, then run
> "git commit -av", The submodule shortlog is appended to the log message
> without
> any #s before
recursion
(which was the goal of adding the orig_flags variable in 98dbe63db).
Signed-off-by: Jens Lehmann
---
git-submodule.sh| 5 +
t/t7406-submodule-update.sh | 11 +++
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
Am 11.11.2013 21:48, schrieb Ari Pollak:
> Jens Lehmann writes:
>> And after adding a modified file the log message also shows the diff of
>> that file (and without leading "# "s too), so I doubt that diffs aren't
>> normally included in the commit message wit
Am 11.11.2013 22:29, schrieb Jens Lehmann:
> And while testing this issue I noticed another problem: When using
> "git commit -a" not only the staged commits of a submodule get
> committed, but also the unstaged commits. Will look into that too.
Ok, scrap that. This is exact
Am 12.11.2013 08:46, schrieb Johannes Sixt:
> Am 11.11.2013 22:29, schrieb Jens Lehmann:
>> The diff below fixes the problem you describe for me. (But I do not
>> consider it a worthwhile fix in its current form because a line
>> starting with "Submodule " might appe
Am 12.11.2013 23:20, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> Am 12.11.2013 08:46, schrieb Johannes Sixt:
>>> Am 11.11.2013 22:29, schrieb Jens Lehmann:
>>>> The diff below fixes the problem you describe for me. (But I do not
>>>> con
Am 16.11.2013 22:42, schrieb Thomas Rast:
> Dmitry Neverov writes:
>
>> git -c core.askpass=pass.sh clone main-repo
>> cd main-repo
>> git submodule init
>> git submodule sync
>> git -c core.askpass=pass.sh submodule update
>>
>> The last command asks for a password interactively.
>>
>> I've run
atter what the user enters there.
Turn a known test failure fixed by this change into a successful test and
add another one for a diff starting with a submodule log.
Reported-by: Ari Pollak
Signed-off-by: Jens Lehmann
---
Am 13.11.2013 21:04, schrieb Junio C Hamano:
> Jens Lehmann writes:
Am 17.11.2013 10:09, schrieb Jeff King:
>
>> diff --git a/builtin/commit.c b/builtin/commit.c
>> index 6ab4605..091a6e7 100644
>> --- a/builtin/commit.c
>> +++ b/builtin/commit.c
>> @@ -1602,9 +1602,9 @@ int cmd_commit(int argc, const char **argv, const char
>> *prefix)
>>
>> /* Truncate the
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 and add another one for a diff starting with
a submodule log.
Reported-by: Ari Pollak
Signed-off-by: Jens Lehmann
---
Am 18.11.2013 17:01, schrieb Junio C
Am 19.11.2013 21:34, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> Am 18.11.2013 17:01, schrieb Junio C Hamano:
>>> Jeff King writes:
>>>
>>>> I found this hard to parse, I think because of the "keeping" (why would
>>>> I
Am 20.11.2013 20:35, schrieb Ramsay Jones:
> On 20/11/13 17:22, Junio C Hamano wrote:
>> Ramsay Jones writes:
>>
>>> Signed-off-by: Ramsay Jones
>>> ---
>>>
>>> Hi Jens,
>>>
>>> commit 61b6a633 ("commit -v: strip diffs and submodule shortlogs
>>> from the commit message", 19-11-2013) in 'pu' fail
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 commen
101 - 200 of 555 matches
Mail list logo
