[PATCH] qf: Allow rebase function to start from anywhere.
Rodrigo Vivi
rodrigo.vivi at intel.com
Wed Jan 24 22:58:58 UTC 2018
Like we now allow qf checkout to start from an unknown
baseline we should also allow qf rebase.
But also qf rebase only starts if there are already quilt
patches applied, what doesn't make sense when you need to
start a rebase from a clean machine.
In reality what happens is that we are using checkout
or manual quilt pushes to actually rebase the patches
and the rebase function to only validate what we have
done.
By allowing the rebase to perform from anywhere we
are actually fixing the meaning of rebase and making
it more useful.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
---
qf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/qf b/qf
index 533f55f85128..b28ca70ddcfd 100755
--- a/qf
+++ b/qf
@@ -259,7 +259,7 @@ function qf_checkout
function qf_rebase
{
cd_toplevel
- repo_check 0
+ repo_start 0
if [[ -z $1 ]] ; then
echo No commit given
@@ -269,7 +269,7 @@ function qf_rebase
new_baseline=$(git rev-parse $1)
current_top=$(quilt top)
- quiet_pop_all
+ quiet_pop_all -f
echo Resetting baseline to $new_baseline
git reset --hard $new_baseline
sed -e "s/BASELINE=.*$/BASELINE=$new_baseline/" -i patches/config
--
2.13.6
More information about the dim-tools
mailing list