scripts/git-cherry-gerrit | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 317f9b2c09375609306fd7c8ed53b7cb53b1b16b
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Wed Jun 5 13:31:20 2019 +0200
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Wed Jun 5 13:31:20 2019 +0200
git-cherry-gerrit: Fix typo preventing finding the merge-base correctly.
Without this, it all worked when you were switched to the right branch;
but otherwise was generating empty lists.
Change-Id: If18c31652aa3ffe75c896e5302e89f1621e96aec
diff --git a/scripts/git-cherry-gerrit b/scripts/git-cherry-gerrit
index f1f6e76..5dc7ebb 100755
--- a/scripts/git-cherry-gerrit
+++ b/scripts/git-cherry-gerrit
@@ -21,7 +21,7 @@ fi
merge_base=$(git merge-base $cherry_from $cherry_to)
if [ -z "$branch_point" ] ; then
- branch_point=${merge_mase}
+ branch_point=${merge_base}
fi
: > /tmp/tohashes
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
