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

Submitted by Rodger Combs on Sept. 26, 2017, 8:38 p.m.

Details

Message ID 20170926203812.90093-1-rodger.combs@gmail.com
State New
Headers show

Commit Message

Rodger Combs Sept. 26, 2017, 8:38 p.m.
---
 tools/libav-merge-next-commit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

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