From b926d2d8184e97ff03c57b42ac3d2e53ef05c4ce Mon Sep 17 00:00:00 2001 From: Leo Yan Date: Thu, 2 Jun 2016 14:00:05 +0800 Subject: [PATCH] lisa_shell: fix lisa-update failure In patch 3f5553ffb2 "lisa_shell: teach lisa-update to update itself" it search "ARM-software/lisa.git" to generate "remote_name". But in some case, for example clone LISA's repo with below command: git clone https://github.com/ARM-software/lisa; so finally it cannot find out "ARM-software/lisa.git" due without suffix ".git". To compatible both cloning methods, change to search "ARM-software/lisa". Signed-off-by: Leo Yan --- src/shell/lisa_shell | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shell/lisa_shell b/src/shell/lisa_shell index 17d956ffc..08e0ab7e9 100755 --- a/src/shell/lisa_shell +++ b/src/shell/lisa_shell @@ -114,7 +114,7 @@ if [ $ret -ne 0 ]; then fi curr_commit=$(git rev-parse HEAD) -remote_name=$(git remote -v | grep ARM-software/lisa.git | grep -m 1 fetch | awk '{print $1}') +remote_name=$(git remote -v | grep ARM-software/lisa | grep -m 1 fetch | awk '{print $1}') git merge-base --is-ancestor $curr_commit $remote_name/master ret=$? if [ $ret -ne 0 ]; then -- GitLab