[PATCH 5/7] qf: Don't check baseline on qf pull.
Rodrigo Vivi
rodrigo.vivi at intel.com
Mon Jan 22 20:00:38 UTC 2018
At this point we are only pulling the branches so in a
distributed environment it is expected that you don't
have the latest baseline on your environment yet.
For years, all qf users were doing the initial pull
manually or with other wrap scripts. so, let's fix
it now and properly just use qf for initial pull and
start the rebase process.
Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
Cc: Michel Thierry <michel.thierry at intel.com>
Cc: James Ausmus <james.ausmus at intel.com>
Cc: Lucas De Marchi <lucas.demarchi at intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
---
qf | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/qf b/qf
index 4989f3691e04..1e8ae75b4f46 100755
--- a/qf
+++ b/qf
@@ -74,7 +74,7 @@ function quiet_pop_all
quilt pop -a -q "$@" > /dev/null || test $? = 2
}
-function repo_check # allow-detached
+function repo_start # allow-detached
{
cd patches
quilt_branch=$(git rev-parse --abbrev-ref HEAD)
@@ -98,6 +98,11 @@ function repo_check # allow-detached
# shellcheck source=/dev/null
baseline=$(source patches/config ; echo ${BASELINE:-})
+}
+
+function repo_check # allow-detached
+{
+ repo_start $1
if [[ $(git rev-parse HEAD) != "$baseline" ]] ; then
echo Baseline commit doesn\'t match with quilt config
@@ -393,7 +398,7 @@ function qf_push
function qf_fetch
{
cd_toplevel
- repo_check 0
+ repo_start 0
remote=$(git config branch.$branch.remote)
@@ -409,7 +414,6 @@ function qf_fetch
function qf_pull
{
cd_toplevel
- repo_check 0
qf fetch
cd patches
--
2.13.6
More information about the dim-tools
mailing list