diff options
| author | Ian Lance Taylor <iant@golang.org> | 2022-02-18 13:10:34 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2022-02-18 13:12:08 -0800 |
| commit | 20a33efdf32bf0aedcb0c9813ddc7572bb1ab8c7 (patch) | |
| tree | 94aec72c2092a11fa49f0b45da8e036f13416209 /libgo/merge.sh | |
| parent | 1931cbad498e625b1e24452dcfffe02539b12224 (diff) | |
libgo: update to Go1.18rc1 release
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/386594
Diffstat (limited to 'libgo/merge.sh')
| -rwxr-xr-x | libgo/merge.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libgo/merge.sh b/libgo/merge.sh index 795028b8163..2ad0fe9df19 100755 --- a/libgo/merge.sh +++ b/libgo/merge.sh @@ -198,6 +198,18 @@ done libgofile=${libgotd}/$f merge ${name} ${oldfile} ${newfile} ${libgofile} done + (cd ${newtd} & git ls-files .) | while read f; do + if test "`basename -- $f`" = ".gitignore"; then + continue + fi + oldfile=${oldtd}/$f + if ! test -f ${oldfile}; then + name=$d/$f + newfile=${newtd}/$f + libgofile=${libgotd}/$f + merge ${name} ${oldfile} ${newfile} ${libgofile} + fi + done done (cd ${NEWDIR}/misc/cgo && find . -type f -print) | while read f; do |
