All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] dim: Run gitk before tagging
@ 2017-03-21  9:08 Daniel Vetter
  2017-03-21  9:08 ` [PATCH 2/2] dim: Stop force-pushing tags Daniel Vetter
  0 siblings, 1 reply; 9+ messages in thread
From: Daniel Vetter @ 2017-03-21  9:08 UTC (permalink / raw)
  To: Intel Graphics Development; +Cc: Daniel Vetter, Daniel Vetter

Makes it easier to not fumble this and write the changelog for the
wrong thing ...

v2: use @{upstream}

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 dim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dim b/dim
index cd2fa76b1979..6a5987ac5c53 100755
--- a/dim
+++ b/dim
@@ -1412,6 +1412,7 @@ function dim_pull_request
 		repo="drm-intel"
 	else
 		tag=$branch-$today
+		gitk "$branch@{upstream}" ^$upstream &
 		$DRY git tag -f -a $tag "$branch@{upstream}"
 		$DRY git push -f $remote $tag
 		prep_pull_mail $tag
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 2/2] dim: Stop force-pushing tags
  2017-03-21  9:08 [PATCH 1/2] dim: Run gitk before tagging Daniel Vetter
@ 2017-03-21  9:08 ` Daniel Vetter
  2017-03-21 11:44   ` Jani Nikula
  0 siblings, 1 reply; 9+ messages in thread
From: Daniel Vetter @ 2017-03-21  9:08 UTC (permalink / raw)
  To: Intel Graphics Development; +Cc: Daniel Vetter, Daniel Vetter

It's evil. And if you've catastrophically screwed up a pull request
it's probably better to be forced to wait 1 day.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 dim | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dim b/dim
index 6a5987ac5c53..821147510dc5 100755
--- a/dim
+++ b/dim
@@ -1329,13 +1329,13 @@ function dim_update_next_continue
 
 	git push $DRY_RUN -f $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
-	git push $DRY_RUN -f $DIM_DRM_INTEL_REMOTE $tag
+	$DRY git tag -a $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next
+	git push $DRY_RUN $DIM_DRM_INTEL_REMOTE $tag
 
 	echo "Updating drm-intel-testing to latest drm-tip"
 	git push $DRY_RUN $DIM_DRM_INTEL_REMOTE +$remote/drm-tip:drm-intel-testing
-	$DRY git tag -f drm-intel-testing-$today $DIM_DRM_INTEL_REMOTE/drm-intel-testing
-	$DRY git push -f $DIM_DRM_INTEL_REMOTE drm-intel-testing-$today
+	$DRY git tag drm-intel-testing-$today $DIM_DRM_INTEL_REMOTE/drm-intel-testing
+	$DRY git push $DIM_DRM_INTEL_REMOTE drm-intel-testing-$today
 
 	cat > ~/tmp/test-request <<-HERE
 		Hi all,
@@ -1371,8 +1371,8 @@ function dim_tag_next
 		echo "Tagging current drm-intel-next"
 
 		tag=drm-intel-next-$today
-		$DRY git tag -f $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next
-		git push $DRY_RUN -f $DIM_DRM_INTEL_REMOTE $tag
+		$DRY git tag $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next
+		git push $DRY_RUN $DIM_DRM_INTEL_REMOTE $tag
 	else
 		echo "drm-intel-next not up-to-date, aborting"
 		exit
@@ -1413,8 +1413,8 @@ function dim_pull_request
 	else
 		tag=$branch-$today
 		gitk "$branch@{upstream}" ^$upstream &
-		$DRY git tag -f -a $tag "$branch@{upstream}"
-		$DRY git push -f $remote $tag
+		$DRY git tag -a $tag "$branch@{upstream}"
+		$DRY git push $remote $tag
 		prep_pull_mail $tag
 
 		repo=$(branch_to_repo $branch)
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] dim: Stop force-pushing tags
  2017-03-21  9:08 ` [PATCH 2/2] dim: Stop force-pushing tags Daniel Vetter
@ 2017-03-21 11:44   ` Jani Nikula
  2017-03-21 12:58     ` [PATCH 1/2] " Daniel Vetter
  0 siblings, 1 reply; 9+ messages in thread
From: Jani Nikula @ 2017-03-21 11:44 UTC (permalink / raw)
  To: Intel Graphics Development; +Cc: Daniel Vetter, Daniel Vetter

On Tue, 21 Mar 2017, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> It's evil. And if you've catastrophically screwed up a pull request
> it's probably better to be forced to wait 1 day.

I have to disagree with that. When I suggested we stop overwriting tags,
I meant we should check if the tag exists, and add a sequence number at
the end. Or always add HHMM there too.

BR,
Jani.


>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  dim | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/dim b/dim
> index 6a5987ac5c53..821147510dc5 100755
> --- a/dim
> +++ b/dim
> @@ -1329,13 +1329,13 @@ function dim_update_next_continue
>  
>  	git push $DRY_RUN -f $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
> -	git push $DRY_RUN -f $DIM_DRM_INTEL_REMOTE $tag
> +	$DRY git tag -a $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next
> +	git push $DRY_RUN $DIM_DRM_INTEL_REMOTE $tag
>  
>  	echo "Updating drm-intel-testing to latest drm-tip"
>  	git push $DRY_RUN $DIM_DRM_INTEL_REMOTE +$remote/drm-tip:drm-intel-testing
> -	$DRY git tag -f drm-intel-testing-$today $DIM_DRM_INTEL_REMOTE/drm-intel-testing
> -	$DRY git push -f $DIM_DRM_INTEL_REMOTE drm-intel-testing-$today
> +	$DRY git tag drm-intel-testing-$today $DIM_DRM_INTEL_REMOTE/drm-intel-testing
> +	$DRY git push $DIM_DRM_INTEL_REMOTE drm-intel-testing-$today
>  
>  	cat > ~/tmp/test-request <<-HERE
>  		Hi all,
> @@ -1371,8 +1371,8 @@ function dim_tag_next
>  		echo "Tagging current drm-intel-next"
>  
>  		tag=drm-intel-next-$today
> -		$DRY git tag -f $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next
> -		git push $DRY_RUN -f $DIM_DRM_INTEL_REMOTE $tag
> +		$DRY git tag $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next
> +		git push $DRY_RUN $DIM_DRM_INTEL_REMOTE $tag
>  	else
>  		echo "drm-intel-next not up-to-date, aborting"
>  		exit
> @@ -1413,8 +1413,8 @@ function dim_pull_request
>  	else
>  		tag=$branch-$today
>  		gitk "$branch@{upstream}" ^$upstream &
> -		$DRY git tag -f -a $tag "$branch@{upstream}"
> -		$DRY git push -f $remote $tag
> +		$DRY git tag -a $tag "$branch@{upstream}"
> +		$DRY git push $remote $tag
>  		prep_pull_mail $tag
>  
>  		repo=$(branch_to_repo $branch)

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH 1/2] dim: Stop force-pushing tags
  2017-03-21 11:44   ` Jani Nikula
@ 2017-03-21 12:58     ` Daniel Vetter
  2017-03-21 12:58       ` [PATCH 2/2] dim: really make the branch argument for dim retip optional Daniel Vetter
  2017-03-21 14:12       ` [PATCH 1/2] dim: Stop force-pushing tags Jani Nikula
  0 siblings, 2 replies; 9+ messages in thread
From: Daniel Vetter @ 2017-03-21 12:58 UTC (permalink / raw)
  To: Intel Graphics Development; +Cc: Daniel Vetter, Daniel Vetter

It's evil. And if you've catastrophically screwed up a pull request
it's probably better to be forced to wait 1 day.

v2: Autogenerate a new tag with increasing suffice, to make Jani
happy.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 dim | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/dim b/dim
index c4fb047deda2..e0c1909653b6 100755
--- a/dim
+++ b/dim
@@ -1329,7 +1329,7 @@ function dim_update_next
 
 function dim_update_next_continue
 {
-	local remote
+	local remote suffix
 
 	assert_branch drm-intel-next-queued
 
@@ -1337,13 +1337,18 @@ function dim_update_next_continue
 
 	git push $DRY_RUN -f $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
-	git push $DRY_RUN -f $DIM_DRM_INTEL_REMOTE $tag
+
+	while git tag -l $tag | grep -q $tag ; do
+		tag="drm-intel-next-$today-$((++suffix))"
+	done
+
+	$DRY git tag -a $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next
+	git push $DRY_RUN $DIM_DRM_INTEL_REMOTE $tag
 
 	echo "Updating drm-intel-testing to latest drm-tip"
 	git push $DRY_RUN $DIM_DRM_INTEL_REMOTE +$remote/drm-tip:drm-intel-testing
-	$DRY git tag -f drm-intel-testing-$today $DIM_DRM_INTEL_REMOTE/drm-intel-testing
-	$DRY git push -f $DIM_DRM_INTEL_REMOTE drm-intel-testing-$today
+	$DRY git tag drm-intel-testing-$today $DIM_DRM_INTEL_REMOTE/drm-intel-testing
+	$DRY git push $DIM_DRM_INTEL_REMOTE drm-intel-testing-$today
 
 	cat > ~/tmp/test-request <<-HERE
 		Hi all,
@@ -1372,6 +1377,8 @@ function dim_update_next_continue
 
 function dim_tag_next
 {
+	local tag suffix
+
 	cd $DIM_PREFIX/$DIM_DRM_INTEL
 	git fetch $DIM_DRM_INTEL_REMOTE
 
@@ -1379,8 +1386,12 @@ function dim_tag_next
 		echo "Tagging current drm-intel-next"
 
 		tag=drm-intel-next-$today
-		$DRY git tag -f $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next
-		git push $DRY_RUN -f $DIM_DRM_INTEL_REMOTE $tag
+		while git tag -l $tag | grep -q $tag ; do
+			tag="drm-intel-next-$today-$((++suffix))"
+		done
+
+		$DRY git tag $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next
+		git push $DRY_RUN $DIM_DRM_INTEL_REMOTE $tag
 	else
 		echo "drm-intel-next not up-to-date, aborting"
 		exit
@@ -1391,7 +1402,7 @@ function dim_tag_next
 # dim_pull_request branch upstream
 function dim_pull_request
 {
-	local branch upstream remote repo url git_url
+	local branch upstream remote repo url git_url suffix tag
 
 	if [[ "x$1" = "x" || "x$2" = "x" ]]; then
 		echo "usage: $dim $subcommand branch upstream"
@@ -1420,9 +1431,14 @@ function dim_pull_request
 		repo="drm-intel"
 	else
 		tag=$branch-$today
+
+		while git tag -l $tag | grep -q $tag ; do
+			tag="$branch-$today-$((++suffix))"
+		done
+
 		gitk "$branch@{upstream}" ^$upstream &
-		$DRY git tag -f -a $tag "$branch@{upstream}"
-		$DRY git push -f $remote $tag
+		$DRY git tag -a $tag "$branch@{upstream}"
+		$DRY git push $remote $tag
 		prep_pull_mail $tag
 
 		repo=$(branch_to_repo $branch)
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 2/2] dim: really make the branch argument for dim retip optional
  2017-03-21 12:58     ` [PATCH 1/2] " Daniel Vetter
@ 2017-03-21 12:58       ` Daniel Vetter
  2017-03-21 14:13         ` Jani Nikula
  2017-03-21 14:12       ` [PATCH 1/2] dim: Stop force-pushing tags Jani Nikula
  1 sibling, 1 reply; 9+ messages in thread
From: Daniel Vetter @ 2017-03-21 12:58 UTC (permalink / raw)
  To: Intel Graphics Development; +Cc: Daniel Vetter, Daniel Vetter

Some didn't work, at least here.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 dim | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dim b/dim
index e0c1909653b6..d7dcea625702 100755
--- a/dim
+++ b/dim
@@ -388,7 +388,13 @@ function dim_retip
 	local branch upstream remote
 
 	branch="$1"
-	shift
+
+	if [ -n "$branch" ] ; then
+		shift
+	else
+		branch=$(git symbolic-ref --short HEAD)
+	fi
+
 	remote=$(url_to_remote $drm_tip_ssh)
 	upstream=$(git_find_tip "$branch")
 
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] dim: Stop force-pushing tags
  2017-03-21 12:58     ` [PATCH 1/2] " Daniel Vetter
  2017-03-21 12:58       ` [PATCH 2/2] dim: really make the branch argument for dim retip optional Daniel Vetter
@ 2017-03-21 14:12       ` Jani Nikula
  1 sibling, 0 replies; 9+ messages in thread
From: Jani Nikula @ 2017-03-21 14:12 UTC (permalink / raw)
  To: Intel Graphics Development; +Cc: Daniel Vetter, Daniel Vetter

On Tue, 21 Mar 2017, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> It's evil. And if you've catastrophically screwed up a pull request
> it's probably better to be forced to wait 1 day.

Not true anymore. ;)

>
> v2: Autogenerate a new tag with increasing suffice, to make Jani
> happy.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  dim | 36 ++++++++++++++++++++++++++----------
>  1 file changed, 26 insertions(+), 10 deletions(-)
>
> diff --git a/dim b/dim
> index c4fb047deda2..e0c1909653b6 100755
> --- a/dim
> +++ b/dim
> @@ -1329,7 +1329,7 @@ function dim_update_next
>  
>  function dim_update_next_continue
>  {
> -	local remote
> +	local remote suffix
>  
>  	assert_branch drm-intel-next-queued
>  
> @@ -1337,13 +1337,18 @@ function dim_update_next_continue
>  
>  	git push $DRY_RUN -f $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
> -	git push $DRY_RUN -f $DIM_DRM_INTEL_REMOTE $tag
> +
> +	while git tag -l $tag | grep -q $tag ; do
> +		tag="drm-intel-next-$today-$((++suffix))"
> +	done
> +
> +	$DRY git tag -a $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next
> +	git push $DRY_RUN $DIM_DRM_INTEL_REMOTE $tag
>  
>  	echo "Updating drm-intel-testing to latest drm-tip"
>  	git push $DRY_RUN $DIM_DRM_INTEL_REMOTE +$remote/drm-tip:drm-intel-testing
> -	$DRY git tag -f drm-intel-testing-$today $DIM_DRM_INTEL_REMOTE/drm-intel-testing
> -	$DRY git push -f $DIM_DRM_INTEL_REMOTE drm-intel-testing-$today
> +	$DRY git tag drm-intel-testing-$today $DIM_DRM_INTEL_REMOTE/drm-intel-testing
> +	$DRY git push $DIM_DRM_INTEL_REMOTE drm-intel-testing-$today

So this would still fail? Dunno, maybe this could use -f.

Otherwise, LGTM.

>  
>  	cat > ~/tmp/test-request <<-HERE
>  		Hi all,
> @@ -1372,6 +1377,8 @@ function dim_update_next_continue
>  
>  function dim_tag_next
>  {
> +	local tag suffix
> +
>  	cd $DIM_PREFIX/$DIM_DRM_INTEL
>  	git fetch $DIM_DRM_INTEL_REMOTE
>  
> @@ -1379,8 +1386,12 @@ function dim_tag_next
>  		echo "Tagging current drm-intel-next"
>  
>  		tag=drm-intel-next-$today
> -		$DRY git tag -f $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next
> -		git push $DRY_RUN -f $DIM_DRM_INTEL_REMOTE $tag
> +		while git tag -l $tag | grep -q $tag ; do
> +			tag="drm-intel-next-$today-$((++suffix))"
> +		done
> +
> +		$DRY git tag $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next
> +		git push $DRY_RUN $DIM_DRM_INTEL_REMOTE $tag
>  	else
>  		echo "drm-intel-next not up-to-date, aborting"
>  		exit
> @@ -1391,7 +1402,7 @@ function dim_tag_next
>  # dim_pull_request branch upstream
>  function dim_pull_request
>  {
> -	local branch upstream remote repo url git_url
> +	local branch upstream remote repo url git_url suffix tag
>  
>  	if [[ "x$1" = "x" || "x$2" = "x" ]]; then
>  		echo "usage: $dim $subcommand branch upstream"
> @@ -1420,9 +1431,14 @@ function dim_pull_request
>  		repo="drm-intel"
>  	else
>  		tag=$branch-$today
> +
> +		while git tag -l $tag | grep -q $tag ; do
> +			tag="$branch-$today-$((++suffix))"
> +		done
> +
>  		gitk "$branch@{upstream}" ^$upstream &
> -		$DRY git tag -f -a $tag "$branch@{upstream}"
> -		$DRY git push -f $remote $tag
> +		$DRY git tag -a $tag "$branch@{upstream}"
> +		$DRY git push $remote $tag
>  		prep_pull_mail $tag
>  
>  		repo=$(branch_to_repo $branch)

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] dim: really make the branch argument for dim retip optional
  2017-03-21 12:58       ` [PATCH 2/2] dim: really make the branch argument for dim retip optional Daniel Vetter
@ 2017-03-21 14:13         ` Jani Nikula
  2017-03-21 15:27           ` Daniel Vetter
  0 siblings, 1 reply; 9+ messages in thread
From: Jani Nikula @ 2017-03-21 14:13 UTC (permalink / raw)
  To: Intel Graphics Development; +Cc: Daniel Vetter, Daniel Vetter

On Tue, 21 Mar 2017, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Some didn't work, at least here.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  dim | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/dim b/dim
> index e0c1909653b6..d7dcea625702 100755
> --- a/dim
> +++ b/dim
> @@ -388,7 +388,13 @@ function dim_retip
>  	local branch upstream remote
>  
>  	branch="$1"
> -	shift
> +
> +	if [ -n "$branch" ] ; then
> +		shift
> +	else
> +		branch=$(git symbolic-ref --short HEAD)
> +	fi

I guess this happens with worktrees? Ack if it works for you.

BR,
Jani.

> +
>  	remote=$(url_to_remote $drm_tip_ssh)
>  	upstream=$(git_find_tip "$branch")

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] dim: really make the branch argument for dim retip optional
  2017-03-21 14:13         ` Jani Nikula
@ 2017-03-21 15:27           ` Daniel Vetter
  2017-03-22  8:42             ` Jani Nikula
  0 siblings, 1 reply; 9+ messages in thread
From: Daniel Vetter @ 2017-03-21 15:27 UTC (permalink / raw)
  To: Jani Nikula; +Cc: Daniel Vetter, Intel Graphics Development, Daniel Vetter

On Tue, Mar 21, 2017 at 04:13:45PM +0200, Jani Nikula wrote:
> On Tue, 21 Mar 2017, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> > Some didn't work, at least here.
> >
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > ---
> >  dim | 8 +++++++-
> >  1 file changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/dim b/dim
> > index e0c1909653b6..d7dcea625702 100755
> > --- a/dim
> > +++ b/dim
> > @@ -388,7 +388,13 @@ function dim_retip
> >  	local branch upstream remote
> >  
> >  	branch="$1"
> > -	shift
> > +
> > +	if [ -n "$branch" ] ; then
> > +		shift
> > +	else
> > +		branch=$(git symbolic-ref --short HEAD)
> > +	fi
> 
> I guess this happens with worktrees? Ack if it works for you.

Nah, "dim retip" alone fails. The shift doesn't have anything to shift and
the cmd fails silently. This isn't on a worktree or anything, it's all
in the main checkout.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] dim: really make the branch argument for dim retip optional
  2017-03-21 15:27           ` Daniel Vetter
@ 2017-03-22  8:42             ` Jani Nikula
  0 siblings, 0 replies; 9+ messages in thread
From: Jani Nikula @ 2017-03-22  8:42 UTC (permalink / raw)
  To: Daniel Vetter; +Cc: Daniel Vetter, Intel Graphics Development, Daniel Vetter

On Tue, 21 Mar 2017, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Tue, Mar 21, 2017 at 04:13:45PM +0200, Jani Nikula wrote:
>> On Tue, 21 Mar 2017, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>> > Some didn't work, at least here.
>> >
>> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
>> > ---
>> >  dim | 8 +++++++-
>> >  1 file changed, 7 insertions(+), 1 deletion(-)
>> >
>> > diff --git a/dim b/dim
>> > index e0c1909653b6..d7dcea625702 100755
>> > --- a/dim
>> > +++ b/dim
>> > @@ -388,7 +388,13 @@ function dim_retip
>> >  	local branch upstream remote
>> >  
>> >  	branch="$1"
>> > -	shift
>> > +
>> > +	if [ -n "$branch" ] ; then
>> > +		shift
>> > +	else
>> > +		branch=$(git symbolic-ref --short HEAD)
>> > +	fi
>> 
>> I guess this happens with worktrees? Ack if it works for you.
>
> Nah, "dim retip" alone fails. The shift doesn't have anything to shift and
> the cmd fails silently. This isn't on a worktree or anything, it's all
> in the main checkout.

Right. I suck. *facepalm*.

J.


-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-03-22  8:42 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-21  9:08 [PATCH 1/2] dim: Run gitk before tagging Daniel Vetter
2017-03-21  9:08 ` [PATCH 2/2] dim: Stop force-pushing tags Daniel Vetter
2017-03-21 11:44   ` Jani Nikula
2017-03-21 12:58     ` [PATCH 1/2] " Daniel Vetter
2017-03-21 12:58       ` [PATCH 2/2] dim: really make the branch argument for dim retip optional Daniel Vetter
2017-03-21 14:13         ` Jani Nikula
2017-03-21 15:27           ` Daniel Vetter
2017-03-22  8:42             ` Jani Nikula
2017-03-21 14:12       ` [PATCH 1/2] dim: Stop force-pushing tags Jani Nikula

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.