by remembering which submodule uses a gitfile by storing the
result of read_gitfile() of each submodule. If that is not NULL the new
function connect_work_tree_and_git_dir() is called after renaming the
submodule's work tree which updates the two settings to the new values.
Signed-off-by:
mv would have done that for him). Only when .gitmodules
is found and contains merge conflicts the mv command will fail and tell
the user to resolve the conflict before trying again.
Signed-off-by: Jens Lehmann
---
builtin/mv.c | 8 +++-
submodule.c | 62 ++
. As it doesn't find any index entries inside the submodule it
claims the directory would be empty even though it isn't.
Fix that by searching for the name without a trailing slash and continue
if it is a submodule. Then rename() will move the submodule work tree just
like it moves a f
Am 04.04.2013 19:10, schrieb Chris Wilson:
> If your git repo's .gitmodules contains a URL that you don't have access to
> (for example you download someone else's code and it references a submodule
> using their writable g...@github.com URL) then:
>
> * git submodule init will add them to .git/
Am 04.04.2013 21:17, schrieb Junio C Hamano:
> Linus Torvalds writes:
>
>> ... The features you seem to be after (ie that whole
>> floating/refname thing) don't seem fundamentally antithetical to the
>> current model (a "commit" SHA1 of all zeroes for floating, with a new
>> refname field in .sub
Am 04.04.2013 21:04, schrieb Linus Torvalds:
> My gut feel is that yes, .gitmodules was always a bit of a hack, but
> it's a *working* hack, and it does have advantages exactly because
> it's more fluid than an actual git object (which by definition has to
> be set 100% in stone).
Exactly. The fle
Am 05.04.2013 07:27, schrieb Duy Nguyen:
> On Fri, Apr 5, 2013 at 3:53 PM, Junio C Hamano wrote:
>>> A brief summary or outcome from these links in the comment would
>>> be nice.
>>
>> A summary of what to consider in Documentation/technical/ somewhere
>> may be a very welcome addition. Thanks fo
Am 07.04.2013 20:21, schrieb John Keeping:
> On Sun, Apr 07, 2013 at 11:37:02PM +0530, Ramkumar Ramachandra wrote:
>> John Keeping wrote:
>>> On Sun, Apr 07, 2013 at 10:52:50PM +0530, Ramkumar Ramachandra wrote:
3. Ability to have very many large submodule repositories without the
perform
Am 07.04.2013 21:55, schrieb John Keeping:
> With the recent discussion, I wondered how hard it would be to add
> SUBDIRECTORY_OK=Yes to git-submodule.sh and it doesn't seem that bad.
>
> Note that this series currently lacks both tests and documentation
> updates. Also I have made no attempt to
Am 07.04.2013 20:44, schrieb Ramkumar Ramachandra:
> Jens Lehmann wrote:
>> The whole feature list is full of red herrings like this which
>> have nothing to do with the advantages of a new object, but talk
>> about UI issues which are easy to solve in both worlds.
>
>
Am 07.04.2013 23:30, schrieb Ramkumar Ramachandra:
> Jonathan Nieder wrote:
>> What's stopping the core object code of git parsing .gitmodules?
Just to clarify that: git core already does that. A "git grep
gitmodules_config" shows it is parsed by some git core commands:
checkout, commit, the diff
Ok, here comes an updated version of our comparison list which
I updated with what I read in recent discussions. As I said
earlier, please speak up if I missed anything (or forgot to add
anyone to the CC).
I picked up one advantage ("no need to cd-to-toplevel to edit
.gitmodules) two new disadvant
Am 10.04.2013 01:08, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> diff --git a/submodule.c b/submodule.c
>> index 975bc87..eba9b42 100644
>> --- a/submodule.c
>> +++ b/submodule.c
>> @@ -1001,3 +1001,67 @@ int merge_submodule(unsigned c
ion/git-submodule.txt too please.
And the commit message is still too short, as I said in that
other thread:
On Tue, Sep 4, 2012 at 6:28 PM, Jens Lehmann wrote:
> Before the "Signed-off-by" is the place where you should have
> explained why this would be a worthwhile change ;-)
Jens Lehmann
---
Am 10.04.2013 18:59, schrieb Jens Lehmann:
> Am 10.04.2013 01:08, schrieb Junio C Hamano:
>> Jens Lehmann writes:
>>
>>> diff --git a/submodule.c b/submodule.c
>>> index 975bc87..eba9b42 100644
>>> --- a/submodule.c
>>> +++ b/su
untouched. Also in t7400 the tests for the remaining settings in
the .gitmodules file had to be changed to assert that these settings are
missing.
Signed-off-by: Jens Lehmann
---
This patch applies on top of my mv-submodules series as it reuses the
stage_updated_gitmodules() function introduc
Am 13.04.2013 06:04, schrieb eacousineau:
> Signed-off-by: eacousineau
> ---
> I see what you meant by the extra variables, so I've fixed that so the
> original flags aren't needed with recursion.
Thanks, the code is looking much better now and you nicely
described the changes you made since the
message for an empty
submodule directory where nothing is to be cleared.
Fix that by using 'test ! -d "$(find "$sm_path" -maxdepth 0 -empty)"' to
test for the directory being not empty before removing and recreating it.
Thanks-to: Phil Hord
Signed-off-by: Jens Lehmann
Am 17.04.2013 07:16, schrieb Junio C Hamano:
> Phil Hord writes:
>
>> On Mon, Apr 1, 2013 at 3:02 PM, Jens Lehmann wrote:
>>> Okay, so here is the patch for that. If someone could point out
>>> a portable and efficient way to check if a directory is already
>
Am 17.04.2013 01:52, schrieb Junio C Hamano:
>> * jk/submodule-subdirectory-ok (2013-04-10) 2 commits
>> - submodule: drop the top-level requirement
>> - rev-parse: add --prefix option
>>
>> Allow various subcommands of "git submodule" to be run not from the
>> top of the working tree of the su
Am 18.04.2013 01:17, schrieb Philip Oakley:
> Would it be possible to summarise the key points and proposals of where the
> subject is now?
Here you go, time to post our third iteration of the comparison
list, containing two updates:
- "easier coding" was removed from the advantages
- "git subm
Am 03.05.2013 15:45, schrieb shawn wilson:
> So, I actually have another question I wasn't able to get to in this
> example (which has color - sorry - less -F displays it decently)
>
> What is shown here is that trying to add submodules in this repo
> doesn't add the .gitmodules file - I can do it
Am 03.05.2013 03:23, schrieb Dale R. Worley:
> Several people have made similar mistakes in beliving that "git
> submodule init" can be used for adding submodules to a working
> directory, whereas "git submodule add" is the command that should be
> used. That *is* documented at the top of the manu
Am 06.05.2013 02:19, schrieb Chris Packham:
> This did get me thinking. Why does an uninitialized submodule need to
> have an empty directory? If it didn't the maintainer in question
> probably would have realized that he needed to run "git submodule
> update --init" when his "cd submodule" command
Am 23.08.2012 03:43, schrieb Junio C Hamano:
> Stefan Zager writes:
>
>> Currently, it will only do a checkout if the sha1 registered in the
>> containing
>> repository doesn't match the HEAD of the submodule, regardless of whether the
>> submodule is dirty. As discussed on the mailing list, th
Am 24.08.2012 10:31, schrieb David Aguilar:
> On Thu, Aug 23, 2012 at 10:39 AM, Junio C Hamano wrote:
>> David Aguilar writes:
>>> Would the ability to resolve the various merge situations using
>>> the command-line be a wanted addition?
>>>
>>> This would let a submodule or deleted/modified enco
git directory inside the work trees
top level directory will just error out like it did before, forced or not.
In the future git could either provide a message informing the user to
convert the submodule to use a gitfile or even attempt to do the
conversion itself, but that is not part of this
Am 27.08.2012 22:59, schrieb Junio C Hamano:
> Jens Lehmann writes:
>> +{
>> +int i;
>> +int errs = 0;
>> +
>> +for (i = 0; i < list.nr; i++) {
>> +const char *name = list.entry[i].name;
>> +
Am 29.08.2012 11:55, schrieb Stijn Souffriau:
> I am using a repository that has a sub module which is being committed to
> frequently by myself as well as others. Because of the heavy concurrent
> development I need to do a lot of rebasing. Since the sub module commit
> hashes referenced by the
Am 01.09.2012 13:27, schrieb Jeff King:
> Fetch invokes itself recursively when recursing into
> submodules or handling "fetch --multiple". In both cases, it
> builds the child's command line by pushing options onto a
> statically-sized array. In both cases, the array is
> currently just big enough
push them to the
argv_array just before the run_command() call (including the option
separating them) and pop them from the argv_array right after that.
Signed-off-by: Jens Lehmann
---
Am 01.09.2012 16:34, schrieb Jens Lehmann:
> Am 01.09.2012 13:27, schrieb Jeff King:
>
Am 04.09.2012 09:31, schrieb Orgad Shaneh:
> Signed-off-by: Orgad Shaneh
Before the "Signed-off-by" is the place where you should have
explained why this would be a worthwhile change ;-)
To me this looks like you make the default noisier and require an
explicit "-q" to make it quiet again. There
Am 05.09.2012 13:42, schrieb Orgad and Raizel Shaneh:
> On Tue, Sep 4, 2012 at 6:28 PM, Jens Lehmann wrote:
>>
>> Am 04.09.2012 09:31, schrieb Orgad Shaneh:
>>> Signed-off-by: Orgad Shaneh
>>
>> Before the "Signed-off-by" is the place where yo
git directory inside the work trees
top level directory will just error out like it did before to protect the
repository, even when forced. In the future git could either provide a
message informing the user to convert the submodule to use a gitfile or
even attempt to do the conversion itself, bu
Am 11.09.2012 21:41, schrieb Junio C Hamano:
> Thanks. I wish all others paid attention to "What's cooking" like
> you did here.
>
> And if it is hard to do so for whatever reason, suggest a better way
> for me to publish "What's cooking" or an equivalent (I am interested
> in finding the least b
Am 11.09.2012 21:41, schrieb Junio C Hamano:
> Lilewise. It may make sense to introduce a helper function to tell
> if it is a submodule on our side by checking only the stage #2 entry
> when you see a nagetive pos returned from cache_name_pos() and call
> it "is_ours_submodule?()" or something.
Am 18.09.2012 05:12, schrieb Kenny Simpson:
> Is there any nice way to get a diff and/or diffstat of both a project and
> its submodules between two revisions of the main project?
>
> Something like 'git diff --stat tag_a tag_b' but also including the diffstat
> on the submodule from the revis
Am 20.09.2012 00:31, schrieb Junio C Hamano:
> Junio C Hamano writes:
>
>> I also suspect that you do not have to change "git diff" at all to
>> show the patch recursively by using the attribute mechanism (look in
>> Documentation/gitattributes.text for a string GIT_EXTERNAL_DIFF).
>> It might be
Am 22.09.2012 22:31, schrieb Junio C Hamano:
> Ramkumar Ramachandra writes:
>> diff --git a/git-submodule.sh b/git-submodule.sh
>> index a7e933e..dfec45d 100755
>> --- a/git-submodule.sh
>> +++ b/git-submodule.sh
>> @@ -1108,7 +1108,15 @@ do
>> done
>>
>> # No command word defaults to "status"
>
Am 23.09.2012 10:37, schrieb Junio C Hamano:
> I see Jens added with 302ad7a (Submodules: Use "ignore" settings
> from .gitmodules too for diff and status, 2010-08-06) the call to
> gitmodules_config() to "git status" and "git diff" family, but I
> suspect that was a huge mistake. Once a submodule
Am 24.09.2012 18:27, schrieb Junio C Hamano:
> Junio C Hamano writes:
>> In any case, the log message I suggested in the review needs to be
>> updated in the reroll to make it clear that this is about reading
>> from .gitmodules, not "configuration". AFAICS, gitmodule_config()
>> does not even re
Am 24.09.2012 21:16, schrieb Orgad Shaneh:
> On Mon, Sep 24, 2012 at 9:06 PM, Junio C Hamano wrote:
>> Orgad Shaneh writes:
>>
>>> That is not correct. git-config is ignored as well for commit.
>>
>> What do you mean? As far as I can tell, if you have
>>
>> [submodule "var"]
>> path
Am 24.09.2012 21:30, schrieb Orgad Shaneh:
> In order to read diff options for a submodule, its path must be configured
> ---
> git-submodule.sh |2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/git-submodule.sh b/git-submodule.sh
> index 3e2045e..f97bb62 100755
> --- a/git-submodule.
Am 24.09.2012 21:59, schrieb Orgad Shaneh:
> On Mon, Sep 24, 2012 at 9:56 PM, Jens Lehmann wrote:
>> Am 24.09.2012 21:16, schrieb Orgad Shaneh:
>>> On Mon, Sep 24, 2012 at 9:06 PM, Junio C Hamano wrote:
>>>> Orgad Shaneh writes:
>>>>
>>>>&g
Am 24.09.2012 22:43, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> Am 24.09.2012 21:30, schrieb Orgad Shaneh:
>>> In order to read diff options for a submodule, its path must be configured
>>> ---
>>> git-submodule.sh |2 ++
>>> 1 file c
git directory inside the work trees
top level directory will just error out like it did before to protect the
repository, even when forced. In the future git could either provide a
message informing the user to convert the submodule to use a gitfile or
even attempt to do the conversion itself, bu
Am 26.09.2012 06:18, schrieb Jonathan Johnson:
> I believe I have found an issue with the way `submodule add` detects a
> submodule that already exists in the repository.
Yes, this is an issue and thanks for the detailed report.
> To reproduce
>
> 1) add a git submodule in a specific location
Am 27.09.2012 18:53, schrieb Junio C Hamano:
> Jens Lehmann writes:
>> +/*
>> + * Skip unmerged entries except for populated submodules
>> + * that could loose history when removed.
>> + */
I'm not against the change per se, but do we really want to risk breaking
scripts which parse the output of "git submodule status" without even
providing a commit message explaining why we did that?
Am 29.09.2012 15:43, schrieb Ramkumar Ramachandra:
> Signed-off-by: Ramkumar Ramachandra
> ---
>
Am 29.09.2012 15:43, schrieb Ramkumar Ramachandra:
> Signed-off-by: Ramkumar Ramachandra
> ---
> Like 'git remote show', 'git stash show'.
I understand the analogy to "git stash show" (as that also displays
a diff similar to what " git submodule summary" does). But "git
remote show" just display
Am 29.09.2012 16:45, schrieb Ramkumar Ramachandra:
> Jens Lehmann wrote:
>> I'm not against the change per se, but do we really want to risk breaking
>> scripts which parse the output of "git submodule status" without even
>> providing a commit message explainin
Am 29.09.2012 17:07, schrieb Ramkumar Ramachandra:
> Jens Lehmann wrote:
>> Am 29.09.2012 15:43, schrieb Ramkumar Ramachandra:
>>> Signed-off-by: Ramkumar Ramachandra
>>> ---
>>> Like 'git remote show', 'git stash show'.
>>
>>
Am 26.09.2012 22:56, schrieb Jens Lehmann:
> Am 26.09.2012 06:18, schrieb Jonathan Johnson:
>> To reproduce
>>
>> 1) add a git submodule in a specific location (we'll say it's at
>> `./submodule/location`)
>> 2) go through the normal steps of remov
e_clone() already
know the name and can provide it as argument number two.
Reported-by: Jonathan Johnson
Signed-off-by: Jens Lehmann
---
Documentation/git-submodule.txt | 7 ++-
Documentation/gitmodules.txt| 4 +++-
git-submodule.sh| 32 -
t
ly removed submodule.
Reported-by: Jonathan Johnson
Signed-off-by: Jens Lehmann
---
git-submodule.sh| 3 ++-
t/t7400-submodule-basic.sh | 18 ++
t/t7406-submodule-update.sh | 2 +-
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/git-submodule.sh b/git-submod
Am 30.09.2012 06:47, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>>> The only long term solution I can think of is to use some kind of UUID for
>>> the name, so that the names of newly added submodules won't have a chance
>>> to clash anymore. For the
e option had to be added to "git submodule
add", as that test re-adds a formerly removed submodule.
Reported-by: Jonathan Johnson
Signed-off-by: Jens Lehmann
---
Am 30.09.2012 21:19, schrieb Jens Lehmann:
> Am 30.09.2012 06:47, schrieb Junio C Hamano:
>> I think failing with a b
Am 01.10.2012 14:05, schrieb Howard Miller:
>>
>> Perhaps:
>>
>> git rm -f --cached path/to/subdir # remove from index, keep files
>> git add path/to/subdir
>>
>> -- Hannes
>
> Fantastic worked perfectly. I'll write that down somewhere for
> the next time I do it :)
>
> Is there a bett
Am 01.10.2012 08:42, schrieb Ramkumar Ramachandra:
> Jens Lehmann wrote:
>> That is just a single user so far indicating your patch /could/ be an
>> improvement. I think we need quite some more votes on that before we
>> should do a change like this.
>
> I thought it
Am 01.10.2012 08:45, schrieb Ramkumar Ramachandra:
> Jens Lehmann wrote:
>> I'm very interested in your feedback as a first time submodule user,
>> what you wrote above makes sense and explains why you did that patch
>> (and it would have been nice to read some o
Am 01.10.2012 19:33, schrieb Ramkumar Ramachandra:
> Jens Lehmann wrote:
>> Am 01.10.2012 08:45, schrieb Ramkumar Ramachandra:
>>> Jens Lehmann wrote:
>>>> I'm very interested in your feedback as a first time submodule user,
>>>> what you wrote above
Am 02.10.2012 18:51, schrieb Ramkumar Ramachandra:
> Currently, the diff code does not differentiate between an explicit
> '--submodule=short' being passed, and no submodule option being passed
> on the command line. Making this differentiation will be important
> when the command-line option can
Am 02.10.2012 18:51, schrieb Ramkumar Ramachandra:
> Introduce a diff.submoduleFormat configuration variable corresponding
> to the '--submodule' command-line option of 'git diff'.
Nice. Maybe a better name would be "diff.submodule", as this sets the
default for the "--submodule" option of diff?
Am 03.10.2012 13:35, schrieb Nguyen Thai Ngoc Duy:
> On Tue, Oct 2, 2012 at 3:24 PM, Ramkumar Ramachandra
> wrote:
>> Stefano Lattarini wrote:
>>> On 10/02/2012 09:21 AM, Ramkumar Ramachandra wrote:
Hi,
I've often found the '**' (extended) shell glob useful for matching
any st
Am 02.10.2012 21:44, schrieb Jens Lehmann:
> Am 02.10.2012 18:51, schrieb Ramkumar Ramachandra:
>> Introduce a diff.submoduleFormat configuration variable corresponding
>> to the '--submodule' command-line option of 'git diff'.
>
> Nice. Maybe a better nam
Am 03.10.2012 15:42, schrieb Nguyen Thai Ngoc Duy:
> On Wed, Oct 3, 2012 at 8:35 PM, Jens Lehmann wrote:
>> */foo/bar
>> */*/foo/bar
>> */*/*/foo/bar
>>
>> Using "**/foo/bar" instead would be a great improvement
>
> If this "**/foo/bar&qu
Am 07.10.2012 17:22, schrieb Ramkumar Ramachandra:
> Jens Lehmann wrote:
>> Am 02.10.2012 18:51, schrieb Ramkumar Ramachandra:
>>> Currently, the diff code does not differentiate between an explicit
>>> '--submodule=short' being passed, and no submodule option
Am 07.10.2012 21:49, schrieb Jens Lehmann:
> I forgot to mention that testing submodule_format_cfg would have to
> happen in cmd_diff() (between reading the config and parsing the
> command line options) instead of builtin_diff(). Something like this
> should do the trick (untested
Am 09.10.2012 20:24, schrieb Junio C Hamano:
> Jay Soffian writes:
>
>> On Tue, Oct 9, 2012 at 2:12 AM, Junio C Hamano wrote:
>>> Junio C Hamano writes:
>>>
Assuming that the above guess is correct (which is a huge
assumption, given the lack of clarity in the description), I think
>>>
Am 14.10.2012 12:19, schrieb Lauri Alanko:
> Quoting "Junio C Hamano" :
>
>>> If the
>>> submodules ever get reorganized and foo is moved to ./bar, then it is
>>> impossible to check out older versions or alternate branches, since
>>> the submodule is no longer where it is expected to be at the or
Am 14.10.2012 17:27, schrieb Lauri Alanko:
> Quoting "Jens Lehmann" :
>
>>>>> If the
>>>>> submodules ever get reorganized and foo is moved to ./bar, then it is
>>>>> impossible to check out older versions or alternate branches, since
&
Am 14.10.2012 17:27, schrieb Lauri Alanko:
> Quoting "Jens Lehmann" :
>> What's wrong with making git clone all submodules together with the
>> superproject (when the user said he wants to update all submodules on
>> clone too by setting a - still to be added -
Am 14.10.2012 17:27, schrieb Lauri Alanko:
> Quoting "Jens Lehmann" :
>> Did you notice that "git fetch" fetches all those submodules too which
>> have been updated in the commits fetched for the superproject, no matter
>> on what branch they are on?
>
Am 14.10.2012 20:04, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> Again, the user experience is currently suboptimal.
>
> You mentioned multiple things in your responses that you are
> planning to address, but I am wondering if the first step before
> doing an
Am 15.10.2012 00:59, schrieb Lauri Alanko:
>>> la@bq:~/tmp/super$ git mv sub movedsub
>>> fatal: source directory is empty, source=sub, destination=movedsub
>>
>> This error here indicates that we didn't teach git to properly move
>> a submodule yet. It is one of my next goals to make "git [submodu
Am 17.10.2012 01:20, schrieb Phil Hord:
> I noticed that this is not supported:
>
> git submodule sync --recursive
>
>
> I do not see any discussion in the relevant commits about why it
> cannot or should not be supported. Is it just an itch no one has
> scratched?
I can't remember any dis
Am 19.10.2012 02:31, schrieb Lauri Alanko:
> I think I finally agree that it's best to develop submodules further
> rather than introduce a new tool for the functionality I require. Here
> are some explicit proposals for submodules so we can at least establish
> agreement on what should be done. Th
Am 23.10.2012 21:16, schrieb Nahor:
> On 2012-10-22 09:34, W. Trevor King wrote:
>> From: "W. Trevor King"
>>
>> This removes a configuration step if you're trying to setup Ævar's
>>
>>$ git submodule foreach 'git checkout $(git config --file
>> $toplevel/.gitmodules submodule.$name.branch) &
Am 22.10.2012 14:37, schrieb W. Trevor King:
> I have a bunch of branches in my repo (a, b, c, …), and I'd like to
> check them out into subdirectories of another branch (index). My
> initial inclination was to use something like
>
> $ git checkout index
> $ git branch
> a
> b
> c
Am 24.10.2012 00:02, schrieb Nahor:
> On 2012-10-23 13:36, Jens Lehmann wrote:
>> Am 23.10.2012 21:16, schrieb Nahor:
>>> Last issue, the branch that exists in your local repository may not
>>> exist in someone else's repository, either because the branch is
>&
I still fail to see what adding that functionality to the submodule
command buys us (unless we also add code which really uses the branch
setting). What's wrong with doing a simple:
git config -f .gitmodules submodule..branch
on the command line when you want to use the branch setting for you
Am 25.10.2012 12:45, schrieb W. Trevor King:
> On Thu, Oct 25, 2012 at 04:36:26AM -0400, Jeff King wrote:
>> On Wed, Oct 24, 2012 at 09:52:52PM -0700, sza...@google.com wrote:
>>> diff --git a/git-submodule.sh b/git-submodule.sh
>>> index ab6b110..dcceb43 100755
>>> --- a/git-submodule.sh
>>> +++ b
recursing, as that variable is never set.
Fix that by renaming orig_args to orig_flags there too and add a test to
catch that bug.
Signed-off-by: Jens Lehmann
---
I noticed that when reviewing Phil's "Teach --recursive to submodule
sync" patch.
git-submodule.sh
Am 24.10.2012 01:15, schrieb Phil Hord:
> The submodule sync command was somehow left out when
> --recursive was added to the other submodule commands.
>
> Teach sync to handle the --recursive switch by recursing
> when we're in a submodule we are sync'ing.
>
> Change the report during sync to sh
Am 25.10.2012 17:06, schrieb Nicolas Morey-Chaisemartin:
> At work, we use a lot of submodules (several levels of submodules actually).
> As we also work with development branches, we use scripts to resync the whole
> checked-out tree (mainly in automated integration)
>
> We recently run across a
Am 26.10.2012 19:55, schrieb Phil Hord:
> On Fri, Oct 26, 2012 at 1:19 PM, Phil Hord wrote:
>>
>> Yes, thanks for catching that. I think I should add a test for that
>> except I notice that sync doesn't take any other flags useful for passing.
>
> Which, of course, suggests that I should not add
Am 26.10.2012 16:07, schrieb Francis Moreau:
> I'm trying to use the --submodule switch with git-diff but doesnt
> understand the following behaviour:
>
> $ git diff 2c9a257718d1803de720f95766ff256d33accad5 HEAD
> diff --git a/configs b/configs
> index 16c6a89..ce12289 16
> --- a/configs
> +++
Am 26.10.2012 21:07, schrieb Phil Hord:
> On Fri, Oct 26, 2012 at 9:15 AM, Jeff King wrote:
>> On Fri, Oct 26, 2012 at 12:20:29AM +0200, Jens Lehmann wrote:
>>
>>> When renaming orig_args to orig_flags in 98dbe63d (submodule: only
>>> preserve flags across recursi
Am 26.10.2012 21:13, schrieb Phil Hord:
> A test in t7404-submodule-foreach purports to test that
> the --cached flag is properly noticed by --recursive calls
> to the foreach command as it descends into nested
> submodules. However, the test really does not perform this
> test since the change it
Am 26.10.2012 16:03, schrieb Francis Moreau:
> it seems to me that when passed an unknown rev or a wrong commit/sha1,
> git-submodule-summary should at least exit with an error status. Even better
> would be a error output.
>
> Test was done with git version 1.7.10.4 from debian wheezy.
Thanks fo
Am 26.10.2012 21:54, schrieb Francis Moreau:
> On Fri, Oct 26, 2012 at 9:08 PM, Jens Lehmann wrote:
>> Am 26.10.2012 16:07, schrieb Francis Moreau:
>>> I'm trying to use the --submodule switch with git-diff but doesnt
>>> understand the followi
Am 26.10.2012 22:43, schrieb Francis Moreau:
> On Fri, Oct 26, 2012 at 10:05 PM, Jens Lehmann wrote:
> [...]
>>
>> That is weird, "git diff --submodule" should show that too. Is there
>> anything unusual about your setup? (The only explanation I can come
>>
Am 25.10.2012 02:53, schrieb W. Trevor King:
> On Wed, Oct 24, 2012 at 09:15:32PM +0200, Jens Lehmann wrote:
>> I still fail to see what adding that functionality to the submodule
>> command buys us (unless we also add code which really uses the branch
>> setting). What's
are looking good.
Acked-By: Jens Lehmann
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
let's just remove them from cmd_status().
Thanks-to: Phil Hord
Signed-off-by: Jens Lehmann
---
Am 26.10.2012 21:29, schrieb Jens Lehmann:
> Am 26.10.2012 21:13, schrieb Phil Hord:
>> A test in t7404-submodule-foreach purports to test that
>> the --cached flag is properly not
appended to the path of a
submodule. Achieve this by chopping off trailing slashes from the path
names given if they represent directories. Add tests to make sure that
logic only applies to directories and not to files.
Signed-off-by: Jens Lehmann
---
This patch applies on top of the jl/submodule
Am 28.10.2012 01:02, schrieb Jens Lehmann:
> Am 26.10.2012 22:43, schrieb Francis Moreau:
>> On Fri, Oct 26, 2012 at 10:05 PM, Jens Lehmann wrote:
>> [...]
>>>
>>> That is weird, "git diff --submodule" should show that too. Is there
>>> anythi
Am 29.10.2012 11:30, schrieb Ramkumar Ramachandra:
> Jens Lehmann wrote:
>> Am 02.10.2012 21:44, schrieb Jens Lehmann:
>>> Am 02.10.2012 18:51, schrieb Ramkumar Ramachandra:
>>>> Introduce a diff.submoduleFormat configuration variable corresponding
>>>> t
Am 29.10.2012 08:11, schrieb Johannes Sixt:
> Am 10/29/2012 0:28, schrieb Jens Lehmann:
>> +/* Remove trailing '/' from directories to find submodules in the index
>> */
>> +for (i = 0; i < argc; i++) {
>> +size_t pathlen = strl
Am 01.11.2012 11:43, schrieb Ramkumar Ramachandra:
> Hi,
>
> v1 is here:
> http://mid.gmane.org/1349196670-2844-1-git-send-email-artag...@gmail.com
>
> I've fixed the issues pointed out in the review by Jens.
Thanks, looking good to me.
--
To unsubscribe from this list: send the line "unsubscrib
401 - 500 of 555 matches
Mail list logo
