diff options
| author | Ian Lance Taylor <iant@golang.org> | 2022-03-16 10:31:57 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2022-03-16 13:52:32 -0700 |
| commit | 69921f4a7ec081c5b37dae13e3372003e4efd49f (patch) | |
| tree | 3c485503e44039e60d49bc2450e9a28153496706 /libgo/merge.sh | |
| parent | 7fd6e36ea9aa8575841ff1da08b4aebc0298abe2 (diff) | |
libgo: update to final Go 1.18 release
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/393377
Diffstat (limited to 'libgo/merge.sh')
| -rwxr-xr-x | libgo/merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libgo/merge.sh b/libgo/merge.sh index 2ad0fe9df19..cd2510bb76c 100755 --- a/libgo/merge.sh +++ b/libgo/merge.sh @@ -198,7 +198,7 @@ done libgofile=${libgotd}/$f merge ${name} ${oldfile} ${newfile} ${libgofile} done - (cd ${newtd} & git ls-files .) | while read f; do + (cd ${newtd} && git ls-files .) | while read f; do if test "`basename -- $f`" = ".gitignore"; then continue fi |