From f31a42b65404dbefe01e4aab69e673a44e38b203 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@gmail.com>
Date: Tue, 21 Jan 2020 12:40:47 +0530
Subject: [PATCH] Adding autoStash true for pull --rebase

---
 apis.sh           | 1 +
 deploy/install.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apis.sh b/apis.sh
index 9499eb7708..1ec6b9369d 100644
--- a/apis.sh
+++ b/apis.sh
@@ -29,6 +29,7 @@ medium=("english" "hindi" "malayalam")
 gradeLevel=("class1" "class2" "class3")
 subject=("maths" "english" "science")
 source 3node.vars
+default_users=("creator" "publisher" "reviewer")
 learning_host="${kp_ip}:8080/learning-service"
 
 #}}}
diff --git a/deploy/install.sh b/deploy/install.sh
index 900a3f3ffd..3bc6b6ce1e 100755
--- a/deploy/install.sh
+++ b/deploy/install.sh
@@ -173,7 +173,7 @@ ansible-playbook -i ../ansible/inventory/env ../ansible/deploy-plugins.yml -e"fo
 module=KnowledgePlatform
 source 3node.vars
 # Checking out specific revision of KP
-[[ -d ~/sunbird-learning-platform ]] || git clone https://github.com/project-sunbird/sunbird-learning-platform -b release-$version ~/sunbird-learning-platform && cd ~/sunbird-learning-platform; git pull --rebase origin release-$version; cd -
+[[ -d ~/sunbird-learning-platform ]] || git clone https://github.com/project-sunbird/sunbird-learning-platform -b release-$version ~/sunbird-learning-platform && cd ~/sunbird-learning-platform; git config rebase.autoStash true; git pull --rebase origin release-$version; cd -
 
 # Creating inventory strucure
 cp $inventory_path/$module/* ../ansible/inventory/env/