[FFmpeg-devel] [PATCH] tools/libav-merge-next-commit: run properly on a branch that isn't master

Rodger Combs rodger.combs at gmail.com
Tue Sep 26 23:38:12 EEST 2017


---
 tools/libav-merge-next-commit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/libav-merge-next-commit b/tools/libav-merge-next-commit
index 9bd03fabf8..e2674008f6 100755
--- a/tools/libav-merge-next-commit
+++ b/tools/libav-merge-next-commit
@@ -7,7 +7,7 @@ fi
 
 [ "$1" = "noop" ] && merge_opts="-s ours"
 
-nextrev=$(git rev-list libav/master --not master --no-merges | tail -n1)
+nextrev=$(git rev-list libav/master --not HEAD --no-merges | tail -n1)
 if [ -z "$nextrev" ]; then
     printf "Nothing to merge..\n"
     exit 0
-- 
2.14.1



More information about the ffmpeg-devel mailing list