Merge pull request #138 from github/only-link-dist-popd-dirs

Only use --link-dest when backing up populated directories

Author: lildude

share/github-backup-utils/ghe-backup-userdata

@@ -26,9 +26,9 @@ ghe_remote_version_required "$host"
 # to an older version of GHE or no data has been added to this directory yet.
 ghe-ssh "$host" -- "[ -d '$GHE_REMOTE_DATA_USER_DIR/$dirname' ]" || exit 0
 
-# If we have a previous increment, avoid transferring existing files via rsync's
+# If we have a previous increment and it is not empty, avoid transferring existing files via rsync's
 # --link-dest support. This also decreases physical space usage considerably.
-if [ -d "$GHE_DATA_DIR/current/$dirname" ]; then
+if [ -d "$GHE_DATA_DIR/current/$dirname" ] && [ "$(ls -A $GHE_DATA_DIR/current/$dirname)" ]; then
     link_dest="--link-dest=../../current/$dirname"
 fi
 

test/test-ghe-backup.sh

@@ -251,3 +251,16 @@ begin_test "ghe-backup without manage-password file"
     [ ! -f "$GHE_DATA_DIR/current/manage-password" ]
 )
 end_test
+
+begin_test "ghe-backup empty hookshot directory"
+(
+  set -e
+
+  rm -rf $GHE_REMOTE_DATA_USER_DIR/hookshot/repository-*
+  rm -rf $GHE_DATA_DIR/current/hookshot/repository-*
+  ghe-backup
+
+  # Check that the "--link-dest arg does not exist" message hasn't occurred.
+  [ ! "$(grep "[l]ink-dest arg does not exist" $TRASHDIR/out)" ]
+)
+end_test