[PATCH 06/10] dim: Nuke nightly-forget

[Jani Nikula]

On Tue, 18 Oct 2016, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> With our proliferation of branches it's become long useless. Nowadays
> my MO is to revert the offending commit in the rerere-cache branch
> explicitly, remove drm-intel-nightly/.git/rr-cache and then re-run
> rebuild-nightly. That works much better, hence nuke this helper.

Agreed.

Later, we should add a helper to do the better MO.

BR,
Jani.


>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> ---
>  TODO | 2 --
>  dim  | 9 ---------
>  2 files changed, 11 deletions(-)
>
> diff --git a/TODO b/TODO
> index ac0f27763dfa..c1c6e20eb0e3 100644
> --- a/TODO
> +++ b/TODO
> @@ -1,8 +1,6 @@
>  dim:
>  - extract the integration tree logic and make it generally useful, maybe for a
>    drm-integration tree ...
> -- Improve nightly-forget to forget a specific merge instead of just the first
> -  dinq/dif merge.
>  - add option to check-patch to check stdin
>  - integrate ninja-check? Or too much checkers considered harmful?
>    https://lists.linuxfoundation.org/pipermail/ksummit-discuss/2014-May/000554.html
> diff --git a/dim b/dim
> index 80baf24e4ad7..48d5e7b6477a 100755
> --- a/dim
> +++ b/dim
> @@ -395,15 +395,6 @@ function dim_rebuild_nightly
>  	update_linux_next
>  }
>  
> -function dim_nightly_forget
> -{
> -	cd $DIM_PREFIX/drm-intel-nightly
> -	git fetch origin >& /dev/null
> -	git reset --hard origin/drm-intel-next-queued >& /dev/null
> -	git merge origin/drm-intel-fixes
> -	git rerere forget
> -}
> -
>  # push branch $1, rebuild nightly. the rest of the arguments are passed to git
>  # push.
>  function dim_push_branch

-- 
Jani Nikula, Intel Open Source Technology Center