<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/git.git, branch vs/submodule-clone-nested-submodules-alternates</title>
<subtitle>github.com: git/git.git
</subtitle>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/'/>
<entry>
<title>submodule--helper: set alternateLocation for cloned submodules</title>
<updated>2016-12-12T17:56:52+00:00</updated>
<author>
<name>Vitaly "_Vi" Shukela</name>
<email>vi0oss@gmail.com</email>
</author>
<published>2016-12-08T01:38:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=bf03b790471d57d1bf2a6efca6e0c640c9f37d2e'/>
<id>bf03b790471d57d1bf2a6efca6e0c640c9f37d2e</id>
<content type='text'>
In 31224cbdc7 (clone: recursive and reference option triggers
submodule alternates, 2016-08-17) a mechanism was added to
have submodules referenced.  It did not address _nested_
submodules, however.

This patch makes all not just the root repository, but also
all submodules (recursively) have submodule.alternateLocation
and submodule.alternateErrorStrategy configured, making Git
search for possible alternates for nested submodules as well.

As submodule's alternate target does not end in .git/objects
(rather .git/modules/qqqqqq/objects), this alternate target
path restriction for in add_possible_reference_from_superproject
relates from "*.git/objects" to just */objects".

New tests have been added to t7408-submodule-reference.

Signed-off-by: Vitaly _Vi Shukela &lt;vi0oss@gmail.com&gt;
Reviewed-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
In 31224cbdc7 (clone: recursive and reference option triggers
submodule alternates, 2016-08-17) a mechanism was added to
have submodules referenced.  It did not address _nested_
submodules, however.

This patch makes all not just the root repository, but also
all submodules (recursively) have submodule.alternateLocation
and submodule.alternateErrorStrategy configured, making Git
search for possible alternates for nested submodules as well.

As submodule's alternate target does not end in .git/objects
(rather .git/modules/qqqqqq/objects), this alternate target
path restriction for in add_possible_reference_from_superproject
relates from "*.git/objects" to just */objects".

New tests have been added to t7408-submodule-reference.

Signed-off-by: Vitaly _Vi Shukela &lt;vi0oss@gmail.com&gt;
Reviewed-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Start post 2.11 cycle</title>
<updated>2016-12-05T19:31:47+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2016-12-05T19:31:47+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=8d7a455ed52e2a96debc080dfc011b6bb00db5d2'/>
<id>8d7a455ed52e2a96debc080dfc011b6bb00db5d2</id>
<content type='text'>
For now, let's call it 2.12 tentatively.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
For now, let's call it 2.12 tentatively.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Sync with maint-2.10</title>
<updated>2016-12-05T19:25:47+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2016-12-05T19:25:47+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=a274e0a036ea886a31f8b216564ab1b4a3142f6c'/>
<id>a274e0a036ea886a31f8b216564ab1b4a3142f6c</id>
<content type='text'>
* maint-2.10:
  preparing for 2.10.3
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* maint-2.10:
  preparing for 2.10.3
</pre>
</div>
</content>
</entry>
<entry>
<title>preparing for 2.10.3</title>
<updated>2016-12-05T19:25:02+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2016-12-05T19:25:02+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=c3808ca6982b0ad7ee9b87eca9b50b9a24ec08b0'/>
<id>c3808ca6982b0ad7ee9b87eca9b50b9a24ec08b0</id>
<content type='text'>
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'jk/common-main' into maint-2.10</title>
<updated>2016-12-05T19:24:28+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2016-12-05T19:24:17+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=cd1c2e7301820f9a198c8d665cd72d930233d02a'/>
<id>cd1c2e7301820f9a198c8d665cd72d930233d02a</id>
<content type='text'>
* jk/common-main:
  common-main: stop munging argv[0] path
  git-compat-util: move content inside ifdef/endif guards
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* jk/common-main:
  common-main: stop munging argv[0] path
  git-compat-util: move content inside ifdef/endif guards
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'tk/diffcore-delta-remove-unused' into maint</title>
<updated>2016-11-29T21:28:03+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2016-11-29T21:28:03+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=0a79ccaac7dcfaf93294979fd9608d0f95fd7a47'/>
<id>0a79ccaac7dcfaf93294979fd9608d0f95fd7a47</id>
<content type='text'>
Code cleanup.

* tk/diffcore-delta-remove-unused:
  diffcore-delta: remove unused parameter to diffcore_count_changes()
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Code cleanup.

* tk/diffcore-delta-remove-unused:
  diffcore-delta: remove unused parameter to diffcore_count_changes()
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'jk/create-branch-remove-unused-param' into maint</title>
<updated>2016-11-29T21:28:02+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2016-11-29T21:28:02+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=af8d6a9821d79f18c8b645582b5b5d251066ae2f'/>
<id>af8d6a9821d79f18c8b645582b5b5d251066ae2f</id>
<content type='text'>
Code clean-up.

* jk/create-branch-remove-unused-param:
  create_branch: drop unused "head" parameter
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Code clean-up.

* jk/create-branch-remove-unused-param:
  create_branch: drop unused "head" parameter
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'nd/worktree-lock' into maint</title>
<updated>2016-11-29T21:28:02+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2016-11-29T21:28:02+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=797d1a4672c67ed4e560c67c5d1fe208e31f0b47'/>
<id>797d1a4672c67ed4e560c67c5d1fe208e31f0b47</id>
<content type='text'>
Typofix.

* nd/worktree-lock:
  git-worktree.txt: fix typo "to"/"two", and add comma
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Typofix.

* nd/worktree-lock:
  git-worktree.txt: fix typo "to"/"two", and add comma
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'ps/common-info-doc' into maint</title>
<updated>2016-11-29T21:28:01+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2016-11-29T21:28:01+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=d92466ee25ca2dd79c6f0f7a804f765a5930990c'/>
<id>d92466ee25ca2dd79c6f0f7a804f765a5930990c</id>
<content type='text'>
Doc fix.

* ps/common-info-doc:
  doc: fix location of 'info/' with $GIT_COMMON_DIR
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Doc fix.

* ps/common-info-doc:
  doc: fix location of 'info/' with $GIT_COMMON_DIR
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'rs/cocci' into maint</title>
<updated>2016-11-29T21:28:00+00:00</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2016-11-29T21:28:00+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/git.git/commit/?id=e3c4323e23b59038c354ced895be7d9c2f3bbd4c'/>
<id>e3c4323e23b59038c354ced895be7d9c2f3bbd4c</id>
<content type='text'>
Improve the rule to convert "unsigned char [20]" into "struct
object_id *" in contrib/coccinelle/

* rs/cocci:
  cocci: avoid self-references in object_id transformations
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Improve the rule to convert "unsigned char [20]" into "struct
object_id *" in contrib/coccinelle/

* rs/cocci:
  cocci: avoid self-references in object_id transformations
</pre>
</div>
</content>
</entry>
</feed>
