Stash changes in git pull repo script

anandhu-eng · Nov 7, 2024 · c4e45d4 · c4e45d4
1 parent aa5bfac
commit c4e45d4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/script/pull-git-repo/customize.py b/script/pull-git-repo/customize.py
@@ -15,7 +15,7 @@ def preprocess(i):
     if 'CM_GIT_CHECKOUT_PATH' not in env:
         return {'return':1, 'error': 'CM_GIT_CHECKOUT_PATH is not set'}
 
-    env['CM_GIT_PULL_CMD'] = "git pull --rebase"
+    env['CM_GIT_PULL_CMD'] = "git stash && git pull --rebase && git stash apply"
 
     return {'return':0}