With mutliple people pushing my branch doesn't necessarily match upstream, so be more careful. Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> --- dim | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dim b/dim index 78b3f3048a18..295e42ce39cc 100755 --- a/dim +++ b/dim @@ -868,7 +868,8 @@ case "$subcommand" in update-next) assert_branch drm-intel-next-queued - git fetch $DIM_DRM_INTEL_REMOTE + git pull --ff-only + if ! git branch --merged $DIM_DRM_INTEL_REMOTE/drm-intel-nightly | grep drm-intel-fixes &> /dev/null ; then echo "drm-intel-fixes not merged into -nigthly, please update!" exit 2 @@ -887,6 +888,9 @@ case "$subcommand" in gitk drm-intel-next-queued ^$DIM_DRM_UPSTREAM_REMOTE/drm-next & + # try to push dinq first in case someone raced + dim push-queued + git push $DRY_RUN $DIM_DRM_INTEL_REMOTE drm-intel-next-queued:drm-intel-next tag=drm-intel-next-$today $DRY git tag -f -a $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next -- 2.5.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
