diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-06-05 13:31:20 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-06-05 13:31:20 +0200 |
| commit | 317f9b2c09375609306fd7c8ed53b7cb53b1b16b (patch) | |
| tree | c431fe4da8ebdc1f9b0193dfd665066981ee9408 /scripts | |
| parent | fc514a83d009b854b1aac233e45d4940dacd61f4 (diff) | |
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
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/git-cherry-gerrit | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/git-cherry-gerrit b/scripts/git-cherry-gerrit index f1f6e763..5dc7ebb7 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 |