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 of
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 jens.lehm...@web.de
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 jens.lehm...@web.de
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
Am 26.12.2013 17:22, schrieb Jonathan Nieder:
From: Jens Lehmann jens.lehm...@web.de
Date: Wed, 13 Jun 2012 18:50:10 +0200
Signed-off-by: Jens Lehmann jens.lehm...@web.de
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
---
This is the patch that actually introduces the --recurse
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 g3orge@gmail.com
Signed-off-by: Jens Lehmann jens.lehm...@web.de
---
Am 09.12.2013 18:49, schrieb Jens Lehmann:
Am 09.12.2013 11
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: teach
Am 06.01.2014 23:40, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de 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-mv.txt | 10
Am 07.01.2014 18:57, schrieb Jens Lehmann:
Am 06.01.2014 23:40, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de 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
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 g3orge@gmail.com
Signed-off-by: Jens Lehmann jens.lehm...@web.de
---
Documentation/git-mv.txt | 12
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 jens.lehm...@web.de
---
Documentation/git-rm.txt | 9 +
t/t3600-rm.sh
Am 09.01.2014 02:09, schrieb Francesco Pretto:
2014/1/9 W. Trevor King wk...@tremily.us:
However, submodule.name.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]
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 wk...@tremily.us:
However, submodule.name.local-branch has nothing to do with remote
repositories or tracking
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/config doesn't work
very well. I
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.gitmodules
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 has
Am 23.01.2014 22:09, schrieb Junio C Hamano:
Nguyễn Thái Ngọc Duy pclo...@gmail.com 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
Am 07.01.2014 18:55, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de 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: teach unpack_trees() to update
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 Lehmann
functionality, that will be added to unpack_trees()
in subsequent commits.
Signed-off-by: Jens Lehmann jens.lehm...@web.de
---
Documentation/git-reset.txt | 4
builtin/reset.c | 14 ++
2 files changed, 18 insertions(+)
diff --git a/Documentation/git-reset.txt b
functionality, that will be added to unpack_trees() in
subsequent commits.
Signed-off-by: Jens Lehmann jens.lehm...@web.de
---
Documentation/git-checkout.txt | 2 +
builtin/checkout.c | 14 +++
t/t2013-checkout-submodule.sh | 215 -
3 files
having the helper learn the command line representation of the
different option values himself.
Signed-off-by: Jens Lehmann jens.lehm...@web.de
---
bisect.c | 33 ++---
bisect.h | 3 ++-
builtin/bisect--helper.c | 9
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 jens.lehm...@web.de
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 jens.lehm...@web.de
---
entry.c| 4
submodule.c| 44 +---
submodule.h| 1 +
unpack-trees.c
for 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 jens.lehm...@web.de
---
submodule.c| 37 +
submodule.h| 1 +
unpack-trees.c | 7
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 jens.lehm
functionality, that will be added to unpack_trees() in subsequent commits.
Signed-off-by: Jens Lehmann jens.lehm...@web.de
---
Documentation/git-merge.txt | 2 ++
builtin/merge.c | 14 ++
2 files changed, 16 insertions(+)
diff --git a/Documentation/git-merge.txt b/Documentation/git
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 pass ;).
Fair enough
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
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
+initialized submodules according to the commit
Am 03.02.2014 23:23, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de 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-submodules-update.txt
@@ -0,0 +1,8
Am 03.02.2014 23:40, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de 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 in the superproject
Am 03.02.2014 23:56, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de writes:
+set_config_update_recurse_submodules(
+
parse_update_recurse_submodules_arg(--recurse-submodules-default,
+recurse_submodules_default
Am 04.02.2014 00:01, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de 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 match the SHA-1
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 files of the submodule
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 the work tree of any
Am 04.02.2014 01:11, schrieb Duy Nguyen:
On Tue, Feb 4, 2014 at 2:54 AM, Jens Lehmann jens.lehm...@web.de 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 tree of any
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:
started, but the compare tree was not usable. For file changes it
displayed always: X.java: Dangling symlink. So this is still not a
complete solution somehow.
Regards,
Gábor Lipták
2014-02-07 Jens Lehmann jens.lehm...@web.de:
Am 07.02.2014 10:15, schrieb Gábor Lipták:
I think I have
so that
the dir-diff feature works inside a submodule.
Reported-by: Gábor Lipták gabor.lip...@gmail.com
Helped-by: Jens Lehmann jens.lehm...@web.de
Helped-by: John Keeping j...@keeping.me.uk
Signed-off-by: David Aguilar dav...@gmail.com
---
Looks good; thanks.
FWIW:
Tested-by: Jens
Am 25.02.2014 18:02, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de writes:
Am 24.02.2014 17:55, schrieb Junio C Hamano:
David Aguilar dav...@gmail.com writes:
Modern versions of git submodule use .git-files to setup the
submodule directory. When run in a git submodule-created
Am 25.02.2014 22:12, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de writes:
+test_expect_success PERL 'difftool properly honours gitlink and
core.worktree' '
+ git submodule add ./. submod/ule
+ (
+ cd submod/ule
+ git difftool --tool=echo --dir-diff
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 matth...@stdin.nl
Signed-off-by: Jens Lehmann jens.lehm...@web.de
---
Am 25.02.2014 11:03, schrieb Matthijs Kooijman:
it seems
page too. While at it group the update-mode options into
a single set in the usage string.
Reported-by: Matthijs Kooijman matth...@stdin.nl
Signed-off-by: Jens Lehmann jens.lehm...@web.de
---
Am 28.02.2014 21:39, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de writes:
Good point
Am 03.03.2014 14:47, schrieb Henri GEIST:
This new option prevent git submodule add|update 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
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?
Permit
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:
This new option prevent git submodule add|update to clone the missing
submodules with the --separate-git-dir option.
Then the submodule
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 for the superproject instead
of adding
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:
This new option prevent git submodule add
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:
- I use an other patch which I plane
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:
Wow, that shouldn't even work (as everything
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!
Some minor issues:
- I think we should be more
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 quintus.pub...@gmail.com
---
Am 12.03.2014 14:42, schrieb Orgad Shaneh:
From: Orgad Shaneh org...@gmail.com
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
Am 12.03.2014 17:46, schrieb Quint Guvernator:
2014-03-12 11:47 GMT-04:00 Jens Lehmann jens.lehm...@web.de:
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
the line above).
There is an issue with negation
) 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 jens.lehm...@web.de
---
Since recently t5541 fails for me on master and pu. I'm not sure what
detail in my
on it _not_ being defined
when the TTY prereq isn't set as a way to ensure that tests
properly declare their dependency on TTY. However, we still
cover the case (see the in-code comment for details).
Reported-by: Jens Lehmann jens.lehm...@web.de
Signed-off-by: Jeff King p...@peff.net
---
t
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 jens.lehm...@web.de
---
I believe this one is pretty
) 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 jens.lehm...@web.de
---
I think the first bug really needs to be fixed, as that behavior is extremely
nasty. We should always
. 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 submodule
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 jens.lehm...@web.de writes:
t/test-lib-functions.sh | 11 +++
1 file changed, 11 insertions(+)
diff --git a/t/test-lib-functions.sh b
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:
The docs
Am 27.03.2014 18:16, schrieb Junio C Hamano:
Johan Herland jo...@herland.net 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
Am 27.03.2014 19:30, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de 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
there is no explicit submodule
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 wk...@tremily.us writes:
On Thu, Mar 27, 2014 at 06:31:27PM +0100, Jens Lehmann wrote:
Am 27.03.2014 18:16, schrieb Junio C Hamano:
Johan Herland jo...@herland.net writes
Am 27.03.2014 22:06, schrieb W. Trevor King:
The transition from submodule.path.* to submodule.name.* 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
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 wk...@tremily.us wrote:
submodule.name.branch::
A remote branch
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 King:
The transition
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
the
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 when 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 in the
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 when values for commit are 'all' (default) or 'none'. The others
('dirty' and 'untracked') have
...@gmail.com
---
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 21:48, Jens Lehmann wrote:
Looking good so far, but we definitely need tests for this new option.
I added two simple tests
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 upstream subproject. I suppose I meant
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
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 index_differs_from function in
diff
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 jens.lehm...@web.de wrote:
As Junio mentioned it would be great if you could teach the add
command also honor the --ignore
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 8:58 PM, Jens Lehmann jens.lehm...@web.de wrote:
As Junio
://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
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 jens.lehm...@web.de
---
Documentation/config.txt | 8 +++--
Documentation
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 jens.lehm...@web.de
---
builtin/commit.c | 18
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 repos linked together. I found that this was discussed
few years
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, Jens Lehmann wrote:
Am 01.04.2014 01:35, schrieb Ronald
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-gui
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 when 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 jens.lehm...@web.de 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
- status/commit: show
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 jens.lehm...@web.de
---
git-gui.sh | 6 +-
lib/diff.tcl | 3 +++
2 files changed, 8
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 jens.lehm...@web.de
---
gitk | 13 ++---
1 file changed, 10
Am 11.04.2014 21:23, schrieb Junio C Hamano:
Jeff King p...@peff.net 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.
However,
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 procedure
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 history if it uses a .git
Am 17.04.2014 21:23, schrieb Junio C Hamano:
W. Trevor King wk...@tremily.us 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
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, coming
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 Lehmann's
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. That might need
more discussion, let's see
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 tracked file of the same name
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 the 'ignore' setting from .gitmodules or .git/config
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:tmp$ mkdir foo
judge.pack...@gmail.com
Reported-by: Yann Dirson ydir...@free.fr
Signed-off-by: Jens Lehmann jens.lehm...@web.de
---
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 judge.pack...@gmail.com writes:
On Tue, Apr 29
1 - 100 of 522 matches
Mail list logo