From 02107c35d9d4ac250273b60f6e4cd72650c905a9 Mon Sep 17 00:00:00 2001
From: Tim Byrne <sultan@locehilios.com>
Date: Fri, 20 Jan 2017 16:31:51 -0600
Subject: [PATCH] Add tests for stashed conflicting data during clone (#44)

---
 test/105_accept_clone.bats | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/test/105_accept_clone.bats b/test/105_accept_clone.bats
index 0f32453..a55e0c9 100644
--- a/test/105_accept_clone.bats
+++ b/test/105_accept_clone.bats
@@ -176,4 +176,20 @@ setup() {
   local remote_output
   remote_output=$(GIT_DIR="$T_DIR_REPO" git remote show)
   [ "$remote_output" = "origin" ]
+
+  #; confirm yadm repo is clean
+  cd "$T_DIR_WORK" ||:
+  clean_status=$("${T_YADM_Y[@]}" status -uno --porcelain)
+  echo "clean_status:'$clean_status'"
+  [ -z "$clean_status" ]
+
+  #; confirm conflicts are stashed
+  existing_stash=$("${T_YADM_Y[@]}" stash list)
+  echo "existing_stash:'$existing_stash'"
+  [[ "$existing_stash" =~ Conflicts\ preserved ]]
+
+  stashed_conflicts=$("${T_YADM_Y[@]}" stash show -p)
+  echo "stashed_conflicts:'$stashed_conflicts'"
+  [[ "$stashed_conflicts" =~ \+conflict ]]
+
 }