[meta-intel] [PATCH] gstreamer-vaapi: Update 0.6.1-> 0.7.0

Jianxun Zhang jianxun.zhang at linux.intel.com
Mon Jan 25 15:32:16 PST 2016



On 01/25/2016 03:01 PM, Burton, Ross wrote:
>
> On 25 January 2016 at 22:48, Saul Wold <saul.wold at intel.com
> <mailto:saul.wold at intel.com>> wrote:
>
>     Please use git mv instead of deleting and creating update recipes, that
>     way we preserve the history.
>
>
> Actually git doesn't track moves, only additions and deletions.  What we
> want here is -M being passed to send-email or format-patch, which
> hopefully will then notice that the files are renamed and edited.

I think Ross's answer hits the point and it could be confusing because 
its up to the similarity.

() Apply this patch
() git mv gstreamer-vaapi-1.0_0.7.0.bb junky.bb
() git commit -s -m "junky"
() git format-patch -M -1
() cat 0001-junky.patch

git will show what you want:
...
similarity index 100%
rename from common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.7.0.bb
rename to common/recipes-multimedia/gstreamer/junky.bb
...

() git mv junky.bb junky_again.bb
() echo "I am a real junky" > junky_again.bb
() git add .
() git commit -s -m "junky again"
() git format-patch -M -1
() cat 0001-junky-again.patch

git will show you don't want:
...
deleted file mode 100644
index cdcac54..0000000
--- a/common/recipes-multimedia/gstreamer/junky.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require gstreamer-vaapi.inc
...

>
> Ross


More information about the meta-intel mailing list