Message ID | 1461054083-29837-1-git-send-email-j.remmet@phytec.de |
---|---|
State | Accepted |
Headers | show |
On 19 Apr 10:21, Jan Remmet wrote: > patches which descripes renamed files show different hashes with git > show and pwclient. Use git show -C (Detect copies as well as renames.) > > Signed-off-by: Jan Remmet <j.remmet@phytec.de> Reviewed-by: Stephen Finucane <stephen.finucane@intel.com> ...and merged. Thanks for the change, and sorry this took so long to get to - I've been away on business travel recently. Stephen
diff --git a/tools/post-receive.hook b/tools/post-receive.hook index 8f05b8d..78ddf9b 100755 --- a/tools/post-receive.hook +++ b/tools/post-receive.hook @@ -23,7 +23,7 @@ trap "do_exit=1" INT get_patchwork_hash() { local hash - hash=$(git show $1 | python $PWDIR/parser.py --hash) + hash=$(git show -C $1 | python $PWDIR/parser.py --hash) echo $hash test -n "$hash" }
patches which descripes renamed files show different hashes with git show and pwclient. Use git show -C (Detect copies as well as renames.) Signed-off-by: Jan Remmet <j.remmet@phytec.de> --- $ git --version git version 1.9.1 $ pwclient view 1453 | python /home/share/tools/patchwork/apps/patchwork/parser.py --hash c144f83c228155ad0111bf36a45991eeb5ab8c68 $ git show 7482dae | python /home/share/tools/patchwork/apps/patchwork/parser.py --hash e74e44602c685136ab6ad4bad2356d7bdf0a53a9 $ git show -C 7482dae | python /home/share/tools/patchwork/apps/patchwork/parser.py --hash c144f83c228155ad0111bf36a45991eeb5ab8c68 tools/post-receive.hook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)