diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2020-12-13 21:09:19 +0200 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-12-13 21:09:19 +0200 |
| commit | aa77e00f0e6ae7e4d3e1a813a326800e8d7f5bcf (patch) | |
| tree | 44b6460b74154f0d28d43335c934842b21a0e3ba /scripts/setlocalversion | |
| parent | 8102b85e3faf04bca28962ad5e351a8f6e96e1d4 (diff) | |
scripts/setlocalversion: Fix mismerge
Change-Id: I1acce8bda6c60e8212808810d9e834827cc69cc7
Diffstat (limited to 'scripts/setlocalversion')
| -rwxr-xr-x | scripts/setlocalversion | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 5d1925caa9e6..f3d95e38a330 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -83,7 +83,7 @@ scm_version() # hex chars. if atag="$(git describe --abbrev=12 2>/dev/null)"; then tag="`git describe --abbrev=0 2>/dev/null`" - commit="echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),substr($(NF),0,13))}'" + commit="`echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),substr($(NF),0,13))}'`" printf '%s%s%s' -g "`git show-ref -s --abbrev --tags $tag 2>/dev/null`" $commit # If we don't have a tag at all we print -g{commitish}, |