lmi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[lmi-commits] [lmi] master ee4adea 1/3: Roll back some changes to avoid


From: Greg Chicares
Subject: [lmi-commits] [lmi] master ee4adea 1/3: Roll back some changes to avoid cherry-pick conflict
Date: Sat, 7 Apr 2018 03:46:58 -0400 (EDT)

branch: master
commit ee4adeaf8304560eaeffbb9a2938e9872e25962d
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Roll back some changes to avoid cherry-pick conflict
    
    The 'shellcheck' changes rolled back affected only lines that will be
    replaced in the next commit.
---
 install_wx.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/install_wx.sh b/install_wx.sh
index 8bb783d..fc969b0 100755
--- a/install_wx.sh
+++ b/install_wx.sh
@@ -52,12 +52,12 @@ then
     cd $wx_dir
 else
     cd $wx_dir
-    git rev-parse --quiet --verify "$wx_commit_sha^{commit}" >/dev/null || git 
fetch "$wx_git_url"
+    git rev-parse --quiet --verify "$wx_commit_sha^{commit}" >/dev/null || git 
fetch $wx_git_url
 fi
 
-if [ $(git rev-parse HEAD) != "$wx_commit_sha" ]
+if [ `git rev-parse HEAD` != $wx_commit_sha ]
 then
-    git checkout "$wx_commit_sha"
+    git checkout $wx_commit_sha
     git submodule update --init
 fi
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]