From c4e45d45a3bda44e57d86a3aa5cfbdca4ff34541 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Thu, 7 Nov 2024 15:22:13 +0530 Subject: [PATCH] Stash changes in git pull repo script --- script/pull-git-repo/customize.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/pull-git-repo/customize.py b/script/pull-git-repo/customize.py index 021d42465e..39de6a15b6 100644 --- 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}