braid 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 07fd598555c607d5617f6cd2707362ef6ea9ffce
-  data.tar.gz: e7dcb8b70240e76d8f0f05b46956838d29f71e18
+SHA256:
+  metadata.gz: adb13d280f397cd42919d311d849056087324f1ffec5c57f7b126b82013048f9
+  data.tar.gz: cfb5432addac3a9167f3e8f61bed948cc2651af2a84d32d3984194759fcc1ee7
 SHA512:
-  metadata.gz: c9ce4a5239bf290606de2a828586d0f876cd8d3dfac0b465293eb8f0368326571ea7523244d9e70ae613337b9246f7dc46f99d3becdb458892d788a27d835f57
-  data.tar.gz: 3bd9e43d3a3bb6f838d4c9f02fb4ece0b10ca28e5120366933dee559cbbd07f9aa8771db4ea7b2d06a31ed3b43eb410f80979c72c5e032fbdbc6fcc5b2f1d1ff
+  metadata.gz: a4e725e85c4b487409575d530aa012c4cd5a3e1b90b71e14e09fd100bbdd7ee5fd3c11afde95548436df35a0286c105121953578af5cca2470c9674b68d60d59
+  data.tar.gz: 73ac1fc248da08c36d9b3fe5e77a12bdbda4f858efe48951a697ec352ea9e29422e3f4931001b6c2f729a9a91fb4679196cc1293eb5f01ab96bb91999412cc3f

data/README.md

@@ -144,6 +144,17 @@ Go back to tracking a particular branch.
 
     braid diff vendor/rails
 
+## Supported environments
+
+As of this writing (2022-01-20), we try to keep Braid working at least on Linux,
+OSX and Windows with recent versions of its dependencies (Git, Ruby, gems, etc.).
+Your mileage on other operating systems or with other versions of dependencies
+may vary.  We don't have a procedure in place to systematically test Braid in
+multiple environments; typically, Braid developers just run the test suite on
+their own systems with whatever is installed.  So breakages may sometimes occur.
+If you run into an environment-related problem, please report it and we'll fix
+it if feasible.  Contributions to improve testing of Braid would be welcome.
+
 ## Braid version compatibility
 
 Since Braid has been regularly changing the configuration format and adding new
@@ -208,6 +219,7 @@ re-add and maintain the Subversion support, please contact the authors.
 * Cristi Balan
 * Norbert Crombach
 * Peter Donald
+* Matt McCutchen
 
 ## Contributors (alphabetically)
 
@@ -216,7 +228,6 @@ re-add and maintain the Subversion support, please contact the authors.
 * Christoph Sturm
 * Dennis Muhlestein
 * Ferdinand Svehla
-* Matt McCutchen
 * Michael Klishin
 * Roman Heinrich
 * Travis Tilley

data/braid.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   s.version            = Braid::VERSION
   s.platform           = Gem::Platform::RUBY
 
-  s.authors            = ['Cristi Balan', 'Norbert Crombach', 'Peter Donald']
-  s.email              = %q{evil@che.lu norbert.crombach@primetheory.org peter@realityforge.org}
+  s.authors            = ['Cristi Balan', 'Norbert Crombach', 'Peter Donald', 'Matt McCutchen']
+  s.email              = %q{evil@che.lu norbert.crombach@primetheory.org peter@realityforge.org matt@mattmccutchen.net}
 
   s.homepage           = %q{https://github.com/cristibalan/braid}
   s.summary            = %q{A simple tool for tracking vendor branches in git.}
@@ -19,10 +19,8 @@ Gem::Specification.new do |s|
   s.files              = `git ls-files`.split("\n")
   s.test_files         = `git ls-files -- {spec}/*`.split("\n")
   s.executables        = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-  s.default_executable = %q{braid}
   s.require_paths      = %w(lib)
 
-  s.has_rdoc           = false
   s.rdoc_options       = %w(--line-numbers --inline-source --title braid --main)
 
   s.required_ruby_version = '>= 2.2.0'

data/braids-json.schema.json

@@ -0,0 +1,91 @@
+{
+  "title": "schema for .braids.json configuration file",
+  "type": "object",
+  "properties": {
+    "config_version": {
+      "type": "number",
+      "enum": [
+        1
+      ],
+      "description": "configuration format version (see https://cristibalan.github.io/braid/#braid-version-compatibility)",
+      "$comment": "So far, only version 1 is defined. (Version \"0\" is a mess and not worth writing a schema for.) When we have more than one defined version, we can look into the best way to make the rest of the schema dependent on the version."
+    },
+    "mirrors": {
+      "type": "object",
+      "description": "container for all added vendor repository mirrors",
+      "patternProperties": {
+        ".*": {
+          "allOf": [
+            {
+              "type": "object",
+              "description": "local path where the vendor content is placed, relative to the .braids.json file",
+              "properties": {
+                "url": {
+                  "type": "string",
+                  "description": "remote URL of the vendor repository"
+                },
+                "path": {
+                  "type": "string",
+                  "description": "path to a subdirectory or single file in the vendor tree (instead of the whole tree) to place at the specified local path"
+                },
+                "branch": {
+                  "type": "string",
+                  "description": "branch name of the vendor repository to track"
+                },
+                "tag": {
+                  "type": "string",
+                  "description": "tag name of the vendor repository to track"
+                },
+                "revision": {
+                  "type": "string",
+                  "description": "commit ID of the vendor repository currently used by the mirror"
+                }
+              },
+              "required": [
+                "url",
+                "revision"
+              ],
+              "additionalProperties": false
+            },
+            {
+              "$comment": "At most one of \"branch\" and \"tag\". Technique from https://stackoverflow.com/a/33358676 .",
+              "oneOf": [
+                {
+                  "not": {
+                    "anyOf": [
+                      {
+                        "required": [
+                          "branch"
+                        ]
+                      },
+                      {
+                        "required": [
+                          "tag"
+                        ]
+                      }
+                    ]
+                  }
+                },
+                {
+                  "required": [
+                    "branch"
+                  ]
+                },
+                {
+                  "required": [
+                    "tag"
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      }
+    }
+  },
+  "required": [
+    "config_version",
+    "mirrors"
+  ],
+  "additionalProperties": false
+}

data/lib/braid/commands/push.rb

@@ -68,9 +68,45 @@ module Braid
             f.puts(odb_paths)
           }
           git.fetch(remote_url, mirror.remote_ref)
-          git.checkout(base_revision)
-          git.rm_r(mirror.remote_path || '.')
-          git.add_item_to_index(local_mirror_item, mirror.remote_path || '', true)
+          new_tree = git.make_tree_with_item(base_revision,
+            mirror.remote_path || '', local_mirror_item)
+          if git.require_version('2.27')
+            # Skip checking files out into the working tree by turning on sparse
+            # checkout with an empty list of include patterns (which is an error
+            # before Git 2.27).  This improves performance and avoids problems
+            # with filters that are enabled globally but aren't set up properly
+            # in the temporary repository (e.g., potentially, Git LFS).
+            #
+            # It's not ideal to rely on an edge case of an advanced Git feature,
+            # but the alternatives aren't great either.  We want to run `git
+            # commit` interactively for the user; we can't just call
+            # git.make_tree_with_item + `git commit-tree`.  And if we populate
+            # the index and not the working tree without using sparse checkout,
+            # then `git commit` will show all files as deleted under "Changes
+            # not staged for commit", which is distracting.
+            #
+            # Manipulating index entries that are excluded by sparse checkout is
+            # extremely dicey: depending on the Git version, `git checkout` and
+            # `git rm` may leave them unchanged and not perform the operation we
+            # requested.  So it's safest to generate the new tree before we
+            # enable sparse checkout.  After enabling sparse checkout (if our
+            # copy of Git indeed supports it), `git read-tree -u` is one
+            # operation that should be safe: the index update is unconditional,
+            # and the working tree update honors sparse checkout.
+            #
+            # TODO: Audit Braid for operations that could be broken by use of
+            # sparse checkout by the user (rather than internal to `braid
+            # push`)?
+            git.config(['--local', 'core.sparsecheckout', 'true'])
+            File.open('.git/info/sparse-checkout', 'wb') { |f|
+              # Leave the file empty.
+            }
+          end
+          # Update HEAD the same way git.checkout(base_revision) would, but
+          # don't populate the index or working tree (to save us the trouble of
+          # emptying them again before the git.read_tree).
+          git.update_ref('--no-deref', 'HEAD', base_revision)
+          git.read_tree('-mu', new_tree)
           system('git commit -v')
           msg "Pushing changes to remote branch #{branch}."
           git.push(remote_url, "HEAD:refs/heads/#{branch}")

data/lib/braid/operations.rb

@@ -66,25 +66,11 @@ module Braid
       end
 
       def require_version(required)
-        required = required.split('.')
-        actual   = version.split('.')
-
-        actual.each_with_index do |actual_piece, idx|
-          required_piece = required[idx]
-
-          return true unless required_piece
-
-          case (actual_piece <=> required_piece)
-            when -1
-              return false
-            when 1
-              return true
-            when 0
-              next
-          end
-        end
-
-        return actual.length >= required.length
+        # Gem::Version is intended for Ruby gem versions, but various web sites
+        # suggest it as a convenient way of comparing version strings in
+        # general.  None of the fine points of its semantics compared to those
+        # of Git version numbers seem likely to cause a problem for Braid.
+        Gem::Version.new(version) >= Gem::Version.new(required)
       end
 
       def require_version!(required)
@@ -343,7 +329,10 @@ module Braid
 
       def make_tree_with_item(main_content, item_path, item)
         with_temporary_index do
-          if main_content
+          # If item_path is '', then rm_r_cached will fail.  But in that case,
+          # we can skip loading the main content because it would be deleted
+          # anyway.
+          if main_content && item_path != ''
             read_tree_im(main_content)
             rm_r_cached(item_path)
           end

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = '1.1.3'.freeze
+  VERSION = '1.1.4'.freeze
 end

data/lib/braid.rb

@@ -3,7 +3,18 @@ require 'braid/version'
 module Braid
   OLD_CONFIG_FILE      = '.braids'
   CONFIG_FILE          = '.braids.json'
-  REQUIRED_GIT_VERSION = '1.6'
+
+  # See the background in the "Supported environments" section of README.md.
+  #
+  # The newest Git feature that Braid is currently known to rely on is
+  # `receive.denyCurrentBranch = updateInstead` (in
+  # spec/integration/push_spec.rb), which was added in Git 2.3.0 (in 2015).  It
+  # doesn't seem worth even a small amount of work to remove that dependency and
+  # support even older versions of Git.  So set that as the declared requirement
+  # for now.  In general, a reasonable approach might be to try to support the
+  # oldest version of Git in current "long-term support" versions of popular OS
+  # distributions.
+  REQUIRED_GIT_VERSION = '2.3.0'
 
   def self.verbose
     !!@verbose

data/spec/fixtures/skit1.1_with_filter/.gitattributes

@@ -0,0 +1 @@
+*.png filter=broken

data/spec/fixtures/skit1.1_with_filter/layouts/layout.liquid

@@ -0,0 +1,219 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+{{ '/feed/atom.xml' | assign_to: 'global_feed' }}
+{{ '/feed/all_comments.xml' | assign_to: 'global_comments_feed' }}
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>
+  {{ site.title }}
+  {% if site.current_section %}
+    - {{ site.current_section.name }}
+  {% endif %}
+  {% if article %}
+    - {{ article.title }}
+  {% endif %}
+</title>
+<link rel="alternate" type="application/atom+xml" title="{{ site.title }} feed" href="{{ global_feed }}"/>
+<link rel="alternate" type="application/atom+xml" title="{{ site.title }} comments feed" href="{{ global_comments_feed }}"/>
+{{ 'base' | stylesheet }}
+{{ 'app' | javascript }}
+<!--[if IE]>
+{{ 'base_ie' | stylesheet }}
+<![endif]-->
+</head>
+
+<body class="fixed green">
+<script type="text/javascript">loadPreferences()</script>
+
+<div id="wrapper">
+
+<div id="header" class="clearfix">
+<div id="title" class="clearfix">
+  <h1><a href="/">{{ site.title }}</a></h1>
+</div>
+<h2>Sections</h2>
+<ul id="menu">
+{% for section in site.sections %}
+  {% if section.articles_count > 0 %}
+  {% if section.is_home  %}
+    <li{% if section.current %} class="selected"{% endif %}>{{ section | link_to_section }}</li>
+  {% else %}
+    {% if section.is_paged  %}
+    <li{% if section.current %} class="selected"{% endif %}>{{ section | link_to_section }}</li>
+    {% endif %}
+  {% endif %}
+  {% endif %}
+{% endfor %}
+</ul>
+</div>
+
+<div id="contentwrapper" class="clearfix">
+
+<div id="content">
+
+  <div id="innerwrapper">
+
+<div class="article">
+  <div class="body">
+  <h2>Skittlish Tips'n'Tricks</h2>
+  <ul>
+    <li>Change the classes for the body tag to set your default site style. also change these in the app.js file (line 66).</li>
+    <li>Remove the scripts and the #options div if you don't want the option switcher.</li>
+    <li>The top menu shows the home section and the sections that are not blogs.</li>
+    <li>Email me at <a href="mailto:evil@che.lu">evil@che.lu</a> if you have any questions.</li>
+    <li>Happy hacking!</li>
+  </ul>
+  </div>
+</div>
+
+{{ content_for_layout }}
+
+  </div>
+
+</div>
+
+<div id="sidebar">
+
+<div class="boxy short">
+<h3>boxy short</h3>
+
+<p>You can have, boxes with a short, tall or no background shade, just change the class of the containing div.</p>
+
+<p>Have boxes with smaller text with the class "minor". See the "Recent" boxy below.</p>
+
+</div>
+
+<div id="search" class="boxy short">
+  <h3>Search</h3>
+  <form method="get" action="/search">
+    <fieldset>
+      <input class="text" type="text" id="q" value="" name="q"/>
+    </fieldset>
+  </form>
+</div>
+
+<div class="boxy tall minor">
+  <h3>Recent</h3>
+
+<dl>
+<dt>Articles <a class="feed" href="{{ global_feed }}"><span>feed</span></a></dt>
+<dd>
+  <ul>
+  {% for article in site.latest_articles %}
+    <li>{{ article | link_to_article }} <em>({{ article.published_at | format_date: 'stub', true }})</em></li>
+  {% endfor %}
+  </ul>
+</dd>
+
+<dt>Comments <a class="feed" href="{{ global_comments_feed }}"><span>feed</span></a></dt>
+<dd>
+  <ul>
+  {% for comment in site.latest_comments %}
+    <li>{{ comment.author_link }} on <a href="{{ comment.url }}#comment-{{ comment.id }}">{{ comment.title }}</a></li>
+  {% endfor %}
+  </ul>
+</dd>
+</dl>
+</div>
+
+<div class="boxy short">
+  <h3>Archives</h3>
+  <p>This would be much nicer with jamis' month_drop thingy.</p>
+  {{ '' | section | months | assign_to: 'home_section' }}
+  <ul>
+  {% for month in home_section.months %}
+    {{ home_section | monthly_articles: month | size | assign_to: 'articles_count' }}
+    {% if articles_count > 0 %}
+    <li>{{ home_section | link_to_month: month }} ({{ articles_count }})</li>
+    {% endif %}
+  {% endfor %}
+  </ul>
+</div>
+
+{% if site.blog_sections.size > 1 %}
+<div class="boxy short">
+<h3>Categories</h3>
+<p>Lists only blog type categories with at least one article.</p>
+<p>This list uses an ul. You could use a dl with only dd's in it for the same effect. Wouldn't be semantic tho.</p>
+<ul class="sections">
+{% for section in site.blog_sections %}
+  {% if section.articles_count > 0 %}
+  {% unless section.is_home %}
+  <li>{{ section | link_to_section }} ({{ section.articles_count }})</li>
+  {% endunless %}
+  {% endif %}
+{% endfor %}
+</ul>
+</div>
+
+{% endif %}
+{% unless site.tags == empty %}
+<div class="boxy short">
+  <p>This would be nicer if we could get the number of articles for each tag.</p>
+  <h3>tags: </h3>
+  <ul>
+  {% for tag in site.tags %}
+    <li>{{ tag | link_to_tag }}</li>
+  {% endfor %}
+  </ul>
+</div>
+
+{% endunless %}
+<div class="boxy tall">
+<h3>boxy tall</h3>
+<p>When using a tall box, make sure it's got plenty of content or that it's immediately followed by a short boxy. It might look a bit chopped off otherwise.</p>
+<dl>
+  <dt>thing 1</dt>
+  <dd><a href="#">value 1</a></dd>
+  <dd><a href="#">value 2</a></dd>
+  <dd><a href="#">value 3</a></dd>
+  <dd><a href="#">value 4</a></dd>
+  <dd><a href="#">value 5</a></dd>
+  <dd><a href="#">value 6</a></dd>
+  <dd><a href="#">value 6</a></dd>
+
+  <dt>thing 1</dt>
+  <dd><a href="#">value 1</a></dd>
+  <dd><a href="#">value 2</a></dd>
+  <dd><a href="#">value 3</a></dd>
+  <dd>value 4</dd>
+  <dd>value 5</dd>
+  <dd><a href="#">value 6</a></dd>
+  <dd><a href="#">value 6</a></dd>
+
+</dl>
+</div>
+
+</div>
+
+</div>
+
+<div id="options">
+  <h2>Options:</h2>
+  <h3>Size</h3>
+  <ul id="option_size">
+    <li id="option_size_fixed"   class="fixed" ><a><span>fixed </span></a></li>
+    <li id="option_size_fluid"   class="fluid" ><a><span>fluid </span></a></li>
+  </ul>
+  <h3>Colors</h3>
+  <ul id="option_color">
+    <li id="option_color_orange" class="orange"><a><span>orange</span></a></li>
+    <li id="option_color_blue"   class="blue"  ><a><span>blue  </span></a></li>
+    <li id="option_color_green"  class="green" ><a><span>green </span></a></li>
+    <li id="option_color_pink"   class="pink"  ><a><span>pink  </span></a></li>
+    <li id="option_color_cyan"   class="cyan"  ><a><span>cyan  </span></a></li>
+    <li id="option_color_red"    class="red"   ><a><span>red   </span></a></li>
+    <li id="option_color_violet" class="violet"><a><span>violet</span></a></li>
+  </ul>
+</div>
+
+<div id="footer">
+<p>Copyright &copy; 2006, Your Name. Valid <a href="http://validator.w3.org/check/referer">XHTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a>.</p>
+<p>Using <a href="http://evil.che.lu/projects/skittlish">skittlish</a> on <a href="http://publishwithimpunity.com/">mephisto</a>.</p>
+</div>
+
+</div>
+
+</body>
+
+</html>

data/spec/fixtures/skit1_with_filter/.gitattributes

@@ -0,0 +1 @@
+*.png filter=broken

data/spec/fixtures/skit1_with_filter/layouts/layout.liquid

@@ -0,0 +1,219 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+{{ '/feed/atom.xml' | assign_to: 'global_feed' }}
+{{ '/feed/all_comments.xml' | assign_to: 'global_comments_feed' }}
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>
+  {{ site.title }}
+  {% if site.current_section %}
+    - {{ site.current_section.name }}
+  {% endif %}
+  {% if article %}
+    - {{ article.title }}
+  {% endif %}
+</title>
+<link rel="alternate" type="application/atom+xml" title="{{ site.title }} feed" href="{{ global_feed }}"/>
+<link rel="alternate" type="application/atom+xml" title="{{ site.title }} comments feed" href="{{ global_comments_feed }}"/>
+{{ 'base' | stylesheet }}
+{{ 'app' | javascript }}
+<!--[if IE]>
+{{ 'base_ie' | stylesheet }}
+<![endif]-->
+</head>
+
+<body class="fixed orange">
+<script type="text/javascript">loadPreferences()</script>
+
+<div id="wrapper">
+
+<div id="header" class="clearfix">
+<div id="title" class="clearfix">
+  <h1><a href="/">{{ site.title }}</a></h1>
+</div>
+<h2>Sections</h2>
+<ul id="menu">
+{% for section in site.sections %}
+  {% if section.articles_count > 0 %}
+  {% if section.is_home  %}
+    <li{% if section.current %} class="selected"{% endif %}>{{ section | link_to_section }}</li>
+  {% else %}
+    {% if section.is_paged  %}
+    <li{% if section.current %} class="selected"{% endif %}>{{ section | link_to_section }}</li>
+    {% endif %}
+  {% endif %}
+  {% endif %}
+{% endfor %}
+</ul>
+</div>
+
+<div id="contentwrapper" class="clearfix">
+
+<div id="content">
+
+  <div id="innerwrapper">
+
+<div class="article">
+  <div class="body">
+  <h2>Skittlish Tips'n'Tricks</h2>
+  <ul>
+    <li>Change the classes for the body tag to set your default site style. also change these in the app.js file (line 66).</li>
+    <li>Remove the scripts and the #options div if you don't want the option switcher.</li>
+    <li>The top menu shows the home section and the sections that are not blogs.</li>
+    <li>Email me at <a href="mailto:evil@che.lu">evil@che.lu</a> if you have any questions.</li>
+    <li>Happy hacking!</li>
+  </ul>
+  </div>
+</div>
+
+{{ content_for_layout }}
+
+  </div>
+
+</div>
+
+<div id="sidebar">
+
+<div class="boxy short">
+<h3>boxy short</h3>
+
+<p>You can have, boxes with a short, tall or no background shade, just change the class of the containing div.</p>
+
+<p>Have boxes with smaller text with the class "minor". See the "Recent" boxy below.</p>
+
+</div>
+
+<div id="search" class="boxy short">
+  <h3>Search</h3>
+  <form method="get" action="/search">
+    <fieldset>
+      <input class="text" type="text" id="q" value="" name="q"/>
+    </fieldset>
+  </form>
+</div>
+
+<div class="boxy tall minor">
+  <h3>Recent</h3>
+
+<dl>
+<dt>Articles <a class="feed" href="{{ global_feed }}"><span>feed</span></a></dt>
+<dd>
+  <ul>
+  {% for article in site.latest_articles %}
+    <li>{{ article | link_to_article }} <em>({{ article.published_at | format_date: 'stub', true }})</em></li>
+  {% endfor %}
+  </ul>
+</dd>
+
+<dt>Comments <a class="feed" href="{{ global_comments_feed }}"><span>feed</span></a></dt>
+<dd>
+  <ul>
+  {% for comment in site.latest_comments %}
+    <li>{{ comment.author_link }} on <a href="{{ comment.url }}#comment-{{ comment.id }}">{{ comment.title }}</a></li>
+  {% endfor %}
+  </ul>
+</dd>
+</dl>
+</div>
+
+<div class="boxy short">
+  <h3>Archives</h3>
+  <p>This would be much nicer with jamis' month_drop thingy.</p>
+  {{ '' | section | months | assign_to: 'home_section' }}
+  <ul>
+  {% for month in home_section.months %}
+    {{ home_section | monthly_articles: month | size | assign_to: 'articles_count' }}
+    {% if articles_count > 0 %}
+    <li>{{ home_section | link_to_month: month }} ({{ articles_count }})</li>
+    {% endif %}
+  {% endfor %}
+  </ul>
+</div>
+
+{% if site.blog_sections.size > 1 %}
+<div class="boxy short">
+<h3>Categories</h3>
+<p>Lists only blog type categories with at least one article.</p>
+<p>This list uses an ul. You could use a dl with only dd's in it for the same effect. Wouldn't be semantic tho.</p>
+<ul class="sections">
+{% for section in site.blog_sections %}
+  {% if section.articles_count > 0 %}
+  {% unless section.is_home %}
+  <li>{{ section | link_to_section }} ({{ section.articles_count }})</li>
+  {% endunless %}
+  {% endif %}
+{% endfor %}
+</ul>
+</div>
+
+{% endif %}
+{% unless site.tags == empty %}
+<div class="boxy short">
+  <p>This would be nicer if we could get the number of articles for each tag.</p>
+  <h3>tags: </h3>
+  <ul>
+  {% for tag in site.tags %}
+    <li>{{ tag | link_to_tag }}</li>
+  {% endfor %}
+  </ul>
+</div>
+
+{% endunless %}
+<div class="boxy tall">
+<h3>boxy tall</h3>
+<p>When using a tall box, make sure it's got plenty of content or that it's immediately followed by a short boxy. It might look a bit chopped off otherwise.</p>
+<dl>
+  <dt>thing 1</dt>
+  <dd><a href="#">value 1</a></dd>
+  <dd><a href="#">value 2</a></dd>
+  <dd><a href="#">value 3</a></dd>
+  <dd><a href="#">value 4</a></dd>
+  <dd><a href="#">value 5</a></dd>
+  <dd><a href="#">value 6</a></dd>
+  <dd><a href="#">value 6</a></dd>
+
+  <dt>thing 1</dt>
+  <dd><a href="#">value 1</a></dd>
+  <dd><a href="#">value 2</a></dd>
+  <dd><a href="#">value 3</a></dd>
+  <dd>value 4</dd>
+  <dd>value 5</dd>
+  <dd><a href="#">value 6</a></dd>
+  <dd><a href="#">value 6</a></dd>
+
+</dl>
+</div>
+
+</div>
+
+</div>
+
+<div id="options">
+  <h2>Options:</h2>
+  <h3>Size</h3>
+  <ul id="option_size">
+    <li id="option_size_fixed"   class="fixed" ><a><span>fixed </span></a></li>
+    <li id="option_size_fluid"   class="fluid" ><a><span>fluid </span></a></li>
+  </ul>
+  <h3>Colors</h3>
+  <ul id="option_color">
+    <li id="option_color_orange" class="orange"><a><span>orange</span></a></li>
+    <li id="option_color_blue"   class="blue"  ><a><span>blue  </span></a></li>
+    <li id="option_color_green"  class="green" ><a><span>green </span></a></li>
+    <li id="option_color_pink"   class="pink"  ><a><span>pink  </span></a></li>
+    <li id="option_color_cyan"   class="cyan"  ><a><span>cyan  </span></a></li>
+    <li id="option_color_red"    class="red"   ><a><span>red   </span></a></li>
+    <li id="option_color_violet" class="violet"><a><span>violet</span></a></li>
+  </ul>
+</div>
+
+<div id="footer">
+<p>Copyright &copy; 2006, Your Name. Valid <a href="http://validator.w3.org/check/referer">XHTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a>.</p>
+<p>Using <a href="http://evil.che.lu/projects/skittlish">skittlish</a> on <a href="http://publishwithimpunity.com/">mephisto</a>.</p>
+</div>
+
+</div>
+
+</body>
+
+</html>

data/spec/integration/diff_spec.rb

@@ -400,7 +400,7 @@ PATCH
     describe 'with changes' do
       before do
         FileUtils.cp_r(File.join(FIXTURE_PATH, 'skit1.1') + '/layouts/layout.liquid', "#{@repository_dir}/skit-layout.liquid",
-          {preserve: true})
+          preserve: true)
         in_dir(@repository_dir) do
           run_command('git add *')
           run_command('git commit -m "Some local changes"')
@@ -463,7 +463,7 @@ PATCH
           @filemode_enabled = filemode_enabled
         end
         FileUtils.cp_r(File.join(FIXTURE_PATH, 'skit1.1x') + '/layouts/layout.liquid', "#{@repository_dir}/skit-layout.liquid",
-          {preserve: true})
+          preserve: true)
         in_dir(@repository_dir) do
           run_command('git add *')
           run_command('git commit -m "Some local changes"')

data/spec/integration/integration_helper.rb

@@ -20,6 +20,12 @@ FileUtils.mkdir_p(TMP_PATH)
 
 BRAID_BIN = ((defined?(JRUBY_VERSION) || Gem.win_platform?) ? 'ruby ' : '') + File.join(BRAID_PATH, 'bin', 'braid')
 
+# Use a separate, clean cache for each test case (because TMP_PATH is deleted
+# and recreated for each test case).  We don't want to mess with the user's real
+# cache, and this ensures that previous cache contents can't affect the behavior
+# of the tests.
+ENV['BRAID_LOCAL_CACHE_DIR'] = File.join(TMP_PATH, 'braid-cache')
+
 # Must run in a git repository, though we expect the setting to be the same for
 # most repositories on a given OS.
 def filemode_enabled
@@ -83,10 +89,18 @@ def run_command_expect_failure(command)
   output
 end
 
+# Rough equivalent of git.require_version within Braid, but without pulling in a
+# bunch of dependencies from Braid::Operations.  This small amount of code
+# duplication seems like a lesser evil than sorting out all the dependencies.
+def git_require_version(required)
+  actual = run_command('git --version').sub(/^.* version/, '').strip
+  Gem::Version.new(actual) >= Gem::Version.new(required)
+end
+
 def update_dir_from_fixture(dir, fixture = dir)
   to_dir = File.join(TMP_PATH, dir)
   FileUtils.mkdir_p(to_dir)
-  FileUtils.cp_r(File.join(FIXTURE_PATH, fixture) + '/.', to_dir, {preserve: true})
+  FileUtils.cp_r(File.join(FIXTURE_PATH, fixture) + '/.', to_dir, preserve: true)
 end
 
 def create_git_repo_from_fixture(fixture_name, options = {})
@@ -97,6 +111,9 @@ def create_git_repo_from_fixture(fixture_name, options = {})
   update_dir_from_fixture(directory, fixture_name)
 
   in_dir(git_repo) do
+    # Avoid a warning emitted by because we use the old default default branch name
+    run_command('git config --global init.defaultBranch master')
+
     run_command('git init')
     run_command("git config --local user.email \"#{email}\"")
     run_command("git config --local user.name \"#{name}\"")

data/spec/integration/push_spec.rb

@@ -1,10 +1,17 @@
 require File.dirname(__FILE__) + '/integration_helper'
 
+BRAID_PUSH_USES_SPARSE_CHECKOUT = git_require_version('2.27')
+
 describe 'Pushing to a mirror' do
 
-  before do
+  # This code needs to run before the `around` hook in the required-filter test
+  # that sets up the virtual home directory inside TMP_PATH, but per-example
+  # `before` hooks always run after `around` hooks.  So make this an `around`
+  # hook just to get it to run at the time we want.
+  around do |example|
     FileUtils.rm_rf(TMP_PATH)
     FileUtils.mkdir_p(TMP_PATH)
+    example.run
   end
 
   describe 'from a git repository' do
@@ -166,7 +173,7 @@ describe 'Pushing to a mirror' do
       end
 
       FileUtils.cp_r(File.join(FIXTURE_PATH, 'skit1.1x') + '/layouts/layout.liquid', "#{@repository_dir}/skit-layout.liquid",
-        {preserve: true})
+        preserve: true)
       in_dir(@repository_dir) do
         run_command('git add *')
         run_command('git commit -m "Make some changes to vendored files"')
@@ -294,4 +301,102 @@ describe 'Pushing to a mirror' do
       end
     end
   end
+
+  describe 'from a git repository with a required filter', :if => BRAID_PUSH_USES_SPARSE_CHECKOUT do
+    # This tests that a Git filter that is configured as "required" at the user
+    # account level but fails without additional repository-level configuration
+    # (which currently may be the case for Git LFS:
+    # https://github.com/cristibalan/braid/pull/98) does not interfere with
+    # pushing using a temporary repository. Braid achieves this by using an
+    # empty sparse checkout in the temporary repository to avoid triggering the
+    # filter.
+
+    around do |example|
+      # In order to simulate configuring the filter at the user account level
+      # without modifying the user's real Git configuration, we have to
+      # temporarily change $HOME.  Unfortunately, this may break other things
+      # that need the real $HOME.  So far, the only problem we've seen is the
+      # Braid subprocess not finding Ruby gems, and setting $GEM_PATH seems to
+      # be a sufficient workaround.
+      orig_gem_path = run_command('gem environment gempath').strip
+      virtual_home = File.join(TMP_PATH, 'home')
+      FileUtils.mkdir_p(virtual_home)
+      Braid::Operations::with_modified_environment({
+        'HOME' => virtual_home,
+        # If the user has an $XDG_CONFIG_HOME-based configuration file, ensure
+        # that Git doesn't use it, to maintain consistency with not using the
+        # original ~/.gitconfig.  TODO: Would it be better to `include` both
+        # files in case they have a setting that we actually need?
+        'XDG_CONFIG_HOME' => nil,
+        'GEM_PATH' => orig_gem_path
+      }) do
+        example.run
+      end
+    end
+
+    before do
+      # create_git_repo_from_fixture('skit1_with_filter') would check out the
+      # working tree and trigger the broken filter before we have an opportunity
+      # to turn it off in the repository configuration.  Avoiding this problem
+      # would take some extra code, so as a workaround, we just don't configure
+      # the filter until after that step. :/
+      @vendor_repository_dir = create_git_repo_from_fixture('skit1_with_filter')
+
+      # Avoid a warning emitted by because we use the old default default branch name
+      run_command('git config --global init.defaultBranch master')
+
+      # Configure the broken filter globally.  Here, `false` is the command that
+      # always exits 1.
+      run_command('git config --global filter.broken.clean false')
+      run_command('git config --global filter.broken.smudge false')
+      run_command('git config --global filter.broken.required true')
+
+      # This won't trigger the filter because the .gitattributes file is only in
+      # the vendor repository.
+      @repository_dir = create_git_repo_from_fixture('shiny', :name => 'Some body', :email => 'somebody@example.com')
+      @file_name = 'layouts/layout.liquid'
+
+      in_dir(@repository_dir) do
+        # Make the filter a no-op in the superproject repository.
+        run_command('git config filter.broken.clean cat')
+        run_command('git config filter.broken.smudge cat')
+
+        run_command("#{BRAID_BIN} add #{@vendor_repository_dir} skit1")
+      end
+
+      in_dir(@vendor_repository_dir) do
+        run_command('git config receive.denyCurrentBranch updateInstead')
+      end
+
+      update_dir_from_fixture('shiny/skit1', 'skit1.1_with_filter')
+      in_dir(@repository_dir) do
+        run_command('git add *')
+        run_command('git commit -m "Make some changes to vendored files"')
+      end
+    end
+
+    it 'should push changes successfully' do
+      braid_output = nil
+      commit_message = 'Make some changes'
+      in_dir(@repository_dir) do
+        with_editor_message(commit_message) do
+          braid_output = run_command("#{BRAID_BIN} push skit1")
+        end
+      end
+      expect(braid_output).to match(/Braid: Cloning mirror with local changes./)
+      expect(braid_output).to match(/Make some changes/)
+      expect(braid_output).to match(/Braid: Pushing changes to remote branch master./)
+
+      assert_no_diff("#{FIXTURE_PATH}/skit1.1_with_filter/#{@file_name}", "#{@repository_dir}/skit1/#{@file_name}")
+      assert_no_diff("#{FIXTURE_PATH}/skit1.1_with_filter/#{@file_name}", "#{@vendor_repository_dir}/#{@file_name}")
+
+      in_dir(@vendor_repository_dir) do
+        run_command('git checkout master 2>&1')
+
+        assert_commit_subject(commit_message)
+        assert_commit_author('Some body')
+        assert_commit_email('somebody@example.com')
+      end
+    end
+  end
 end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: braid
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Cristi Balan
 - Norbert Crombach
 - Peter Donald
+- Matt McCutchen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -97,14 +98,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple tool for tracking vendor branches in git.
-email: evil@che.lu norbert.crombach@primetheory.org peter@realityforge.org
+email: evil@che.lu norbert.crombach@primetheory.org peter@realityforge.org matt@mattmccutchen.net
 executables:
 - braid
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-version"
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
@@ -114,6 +114,7 @@ files:
 - _config.yml
 - bin/braid
 - braid.gemspec
+- braids-json.schema.json
 - config_versions.md
 - lib/braid.rb
 - lib/braid/command.rb
@@ -164,12 +165,18 @@ files:
 - spec/fixtures/shiny_skit1_mergeable/layouts/layout.liquid
 - spec/fixtures/shiny_skit1_mergeable/preview.png
 - spec/fixtures/skit1.1/layouts/layout.liquid
+- spec/fixtures/skit1.1_with_filter/.gitattributes
+- spec/fixtures/skit1.1_with_filter/layouts/layout.liquid
+- spec/fixtures/skit1.1_with_filter/preview.png
 - spec/fixtures/skit1.1x/layouts/layout.liquid
 - spec/fixtures/skit1.2/layouts/layout.liquid
 - spec/fixtures/skit1.3/layouts/README.md
 - spec/fixtures/skit1.3/layouts/layout.liquid
 - spec/fixtures/skit1/layouts/layout.liquid
 - spec/fixtures/skit1/preview.png
+- spec/fixtures/skit1_with_filter/.gitattributes
+- spec/fixtures/skit1_with_filter/layouts/layout.liquid
+- spec/fixtures/skit1_with_filter/preview.png
 - spec/integration/adding_spec.rb
 - spec/integration/config_versioning_spec.rb
 - spec/integration/diff_spec.rb
@@ -204,8 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: braid
-rubygems_version: 2.5.2.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A simple tool for tracking vendor branches in git.

data/.ruby-version

@@ -1 +0,0 @@
-2.3.8