No functional change. Only moving from the case to its own function, with the arguments now shifted. Cc: Jani Nikula <jani.nikula@xxxxxxxxx> Cc: Daniel Vetter <daniel.vetter@xxxxxxxx> Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> --- qf | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/qf b/qf index 6413c2dd4732..534338dc5f01 100755 --- a/qf +++ b/qf @@ -170,21 +170,6 @@ function quilt_clean_check } case "$1" in - pull) - cd_toplevel - repo_check 0 - - qf fetch - cd patches - - if [[ $2 == "--rebase" ]] ; then - git rebase @{upstream} - else - git merge @{upstream} - fi - - qf co - ;; stage) cd_toplevel repo_check 1 @@ -487,6 +472,23 @@ function qf_fetch git fetch $remote } +function qf_pull +{ + cd_toplevel + repo_check 0 + + qf fetch + cd patches + + if [[ $1 == "--rebase" ]] ; then + git rebase @{upstream} + else + git merge @{upstream} + fi + + qf co +} + function qf_help { manpage=$DIM_PREFIX/maintainer-tools/qf.rst -- 2.13.2 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx