eac_git 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4cbae87c45a2fdda5919f2c7f51d6cec11a631cc5bb74e6fbeac1ba72e81689
-  data.tar.gz: 322c83c0156f8a0e0b080824c1685e8308f470ff98da5a3f814549a71aa64391
+  metadata.gz: 6d32eaed0f2452280704ed81b57451f95d483778aaef75d6eec7dcdbc2082cd4
+  data.tar.gz: d3d015e778d5f1ffb030077c7327c04ccc493cc278ca6e7e780989e3520e6aae
 SHA512:
-  metadata.gz: 83fbbefe8abddc387a6cf921d879789de1050d3295957e2b00e2c4bcf4f35ece91451358e812ee9ed9577da4a6615ccba2fff1759a5fc8aed5158253da380f97
-  data.tar.gz: 31a8c19e3b398a29b7412663ada61a6913647e03ea3a5ae2f3ef8a3c7b9e8cc19385d074245c2384af7ffc0cf31d1e5ad578e62f430c462dde10e80cbe2c2212
+  metadata.gz: d472751905e193ff6e611e9edeb57bfc0d729d8ed8fdeb263cc4660d223b9a9bc97a21770a7cc8cd5feb4ac487345dd4bd71cec698a28162b25a76ebf56ca4c7
+  data.tar.gz: a09a19a625eb6b54b00a6db0f4c39203c1af5a0dd238e5b52990f2e80ce2f027d97a49fa6c0fa4116b9a6babd72c6554bff5eecce4a9750f5f73d8892262dc2d

data/lib/eac_git/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacGit
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/vendor/git-subrepo/lib/git-subrepo

@@ -8,6 +8,8 @@
 # Exit on any errors:
 set -e
 
+export FILTER_BRANCH_SQUELCH_WARNING=1
+
 # Import Bash+ helper functions:
 SOURCE="$BASH_SOURCE"
 while [[ -h $SOURCE ]]; do
@@ -549,7 +551,7 @@ subrepo:pull() {
     fi
   else
     o "Merge in changes from $refs_subrepo_fetch"
-    FAIL=false OUT=true RUN git merge "$refs_subrepo_fetch"
+    FAIL=false RUN git merge "$refs_subrepo_fetch"
     if ! OK; then
       say "The \"git merge\" command failed:"
       say
@@ -765,8 +767,8 @@ subrepo:branch() {
         o "Create with content"
         local PREVIOUS_IFS=$IFS
         IFS=$'\n'
-        local author_info=( $(git log -1 --format=%ad%n%ae%n%an "$commit") )
-        local commiter_info=( $(git log -1 --format=%cd%n%ce%n%cn "$commit") )
+        local author_info=( $(git log -1 --date=default --format=%ad%n%ae%n%an "$commit") )
+        local commiter_info=( $(git log -1 --date=default --format=%cd%n%ce%n%cn "$commit") )
         IFS=$PREVIOUS_IFS
 
         # When we create new commits we leave the author information unchanged
@@ -774,7 +776,7 @@ subrepo:branch() {
         # This should be analog how cherrypicking is handled allowing git
         # to store both the original author but also the responsible committer
         # that created the local version of the commit and pushed it.
-        prev_commit=$(git log -n 1 --format=%B "$commit" |
+        prev_commit=$(git log -n 1 --date=default --format=%B "$commit" |
           GIT_AUTHOR_DATE="${author_info[0]}" \
           GIT_AUTHOR_EMAIL="${author_info[1]}" \
           GIT_AUTHOR_NAME="${author_info[2]}" \
@@ -959,7 +961,7 @@ subrepo:clean() {
 
   o "Clean $subdir"
   git:remove-worktree
-  if [[ -e .git/$ref ]]; then
+  if git:branch-exists "$branch"; then
     o "Remove branch '$branch'."
     RUN git update-ref -d "$ref"
     clean_list+=("branch '$branch'")
@@ -1505,7 +1507,7 @@ assert-subdir-ready-for-init() {
     error "The subdir '$subdir' is already a subrepo."
   fi
   # Check that subdir is part of the repo
-  if [[ -z $(git log -1 -- $subdir) ]]; then
+  if [[ -z $(git log -1 --date=default -- $subdir) ]]; then
     error "The subdir '$subdir' is not part of this repo."
   fi
 }
@@ -1535,7 +1537,7 @@ get-all-subrepos() {
 add-subrepo() {
   if ! $ALL_wanted; then
     for path in "${subrepos[@]}"; do
-      [[ $1 =~ ^$path ]] && return
+      [[ $1/ =~ ^$path/ ]] && return
     done
   fi
   subrepos+=("$1")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_git
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils