Merge pull request #433 from mstandley-tempus/handle-non-initial-commits-without-parents

handle non-initial orphan commits as current resource version

Author: taylorsilva

assets/check

@@ -103,14 +103,18 @@ else
 fi
 
 if [ -n "$ref" ] && git cat-file -e "$ref"; then
-  init_commit=$(git rev-list --max-parents=0 HEAD | tail -n 1)
-  if [ "${ref}" = "${init_commit}" ]; then
-    reverse=true
-    log_range="HEAD"
-  else
-    reverse=true
-    log_range="${ref}~1..HEAD"
-  fi
+  reverse=true
+  log_range="${ref}~1..HEAD"
+
+  # if ${ref} does not have parents, ${ref}~1 raises the error: "unknown revision or path not in the working tree"
+  # the initial commit in a branch will never have parents, but rarely, subsequent commits can also be parentless
+  orphan_commits=$(git rev-list --max-parents=0 HEAD)
+  for orphan_commit in ${orphan_commits}; do
+    if [ "${ref}" = "${orphan_commit}" ]; then
+      log_range="HEAD"
+      break
+    fi
+  done
 else
   log_range=""
   ref=""

test/check.sh

@@ -956,6 +956,28 @@ it_can_check_a_repo_having_multiple_root_commits() {
   "
 }
 
+it_can_check_a_repo_having_multiple_root_commits_from_the_orphan_commit() {
+  local repo=$(init_repo)
+  local ref1=$(get_initial_ref $repo)
+  local ref2=$(make_commit $repo)
+
+  # Same as above, but where the current version is the orphan commit.
+  git -C $repo checkout --orphan temp $ref2
+  git -C $repo commit -m "second root" --allow-empty
+  git -C $repo checkout master
+  git -C $repo merge temp --allow-unrelated-histories -m "merge commit"
+  second_root=$(git -C $repo rev-parse HEAD^2)
+  ref3=$(git -C $repo rev-parse HEAD)
+
+  check_uri_from $repo $second_root | jq -e "
+    . == [
+      {ref: $(echo $ref1 | jq -R .)},
+      {ref: $(echo $ref2 | jq -R .)},
+      {ref: $(echo $ref3 | jq -R .)}
+    ]
+  "
+}
+
 it_checks_with_version_depth() {
   local repo=$(init_repo)
   local ref1=$(make_commit_to_future $repo)
@@ -1040,5 +1062,6 @@ run it_can_check_with_tag_filter_given_branch_first_ref
 run it_can_check_with_tag_regex_given_branch_first_ref
 run it_checks_lastest_commit
 run it_can_check_a_repo_having_multiple_root_commits
+run it_can_check_a_repo_having_multiple_root_commits_from_the_orphan_commit
 run it_checks_with_version_depth
 run it_checks_uri_with_tag_filter_and_version_depth

test/helpers.sh

@@ -39,15 +39,15 @@ init_repo() {
       commit -q --allow-empty -m "init"
 
     # create some bogus branch
-    git checkout -b bogus
+    git checkout -q -b bogus
 
     git \
       -c user.name='test' \
       -c user.email='test@example.com' \
       commit -q --allow-empty -m "commit on other branch"
 
     # back to master
-    git checkout master
+    git checkout -q master
 
     # print resulting repo
     pwd