Skip to contentSkip to conversation

dim: Enable --scissors by default

PATCH In review Daniel Vetter 3 participants 3 messages Nov 22, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dim: Enable --scissors by default

I never knew this even was a thing, and plain git am cuts everything below the scissors line (since it matches the --- of a diffstat start).

---
 dim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
dim +1 -1
index 8697eaee92cc..0b437c9c0a18 100755
@@ -556,7 +556,7 @@ function dim_apply_branch
 		sob=-s
 	fi
 
-	cat $file | git am -3 $sob "$@"
+	cat $file | git am --scissors -3 $sob "$@"
 
 	if [ -n "$message_id" ]; then
 		dim_commit_add_tag "Link: http://patchwork.freedesktop.org/patch/msgid/$message_id"
Signature · 6 lines
2.10.2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 15 lines · Daniel Vetter

I never knew this even was a thing, and plain git am cuts everything below the scissors line (since it matches the --- of a diffstat start).

---
 dim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
dim +0 -0
index 8697eaee92cc..0b437c9c0a18 100755

dim function dim_apply_branch · line 559

Quoted 5 lines
dim +1 -1
@@ -556,7 +556,7 @@ function dim_apply_branch
 		sob=-s
 	fi
 
-	cat $file | git am -3 $sob "$@"
+	cat $file | git am --scissors -3 $sob "$@"

Side note, -3 rarely helps for us because nightly moves on, and the tree info in the patch is lost.

BR,
Jani.

Quoted 3 lines
dim +0 -0
 	if [ -n "$message_id" ]; then
 		dim_commit_add_tag "Link: http://patchwork.freedesktop.org/patch/msgid/$message_id"
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw
Quoted 19 lines · Jani Nikula
Quoted 18 lines · Daniel Vetter

I never knew this even was a thing, and plain git am cuts everything below the scissors line (since it matches the --- of a diffstat start).

---
 dim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
dim +0 -0
index 8697eaee92cc..0b437c9c0a18 100755
@@ -556,7 +556,7 @@ function dim_apply_branch
 		sob=-s
 	fi
 
Quoted 5 lines

dim function dim_apply_branch · line 559

Quoted 2 lines
dim +1 -1
-	cat $file | git am -3 $sob "$@"
+	cat $file | git am --scissors -3 $sob "$@"

Side note, -3 rarely helps for us because nightly moves on, and the tree info in the patch is lost.

It was still useful for me 1y ago when I pushed most of the patches, and hence likelihood that people based their patches on a -nightly I pushed and hence still had available locally was pretty good. Also, anyone who git worktree shares the dim tree with his own branch repo will benefit from this (at least me for my own patches). So -3 still helps a lot, at least here.
-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx