mirror of
https://github.com/oasislinux/oasis.git
synced 2026-02-09 20:26:26 +01:00
293f5a93b7
Note to self: never try to move submodules again
To migrate your existing submodules (more or less):
set -x
set -e
mkdir .git/modules/pkg
for old in */*/src ; do
new="pkg/${old#*/}"
if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then
continue
fi
git -C ".git/modules/$old" config core.worktree "../../../../../$new"
rmdir "$new"
mv "$old" "$new"
sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp"
mv "$new/.git.tmp" "$new/.git"
mkdir ".git/modules/${new%/src}"
mv ".git/modules/$old" ".git/modules/$new"
rm "${old%/src}"/*.ninja
mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/"
rmdir "${old%/src}" || true
done
sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp
mv .git/config.tmp .git/config
38 lines
915 B
Diff
38 lines
915 B
Diff
From cd4851a8e922a6bda085b6d345df2a291004ffb8 Mon Sep 17 00:00:00 2001
|
|
From: Michael Forney <mforney@mforney.org>
|
|
Date: Sat, 4 Jun 2016 14:48:20 -0700
|
|
Subject: [PATCH] diff: Add missing includes
|
|
|
|
---
|
|
usr.bin/diff/diff.c | 1 +
|
|
usr.bin/diff/diffreg.c | 1 +
|
|
2 files changed, 2 insertions(+)
|
|
|
|
diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c
|
|
index 2b075f12c49..80c7f842ef6 100644
|
|
--- a/usr.bin/diff/diff.c
|
|
+++ b/usr.bin/diff/diff.c
|
|
@@ -20,6 +20,7 @@
|
|
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
|
|
*/
|
|
|
|
+#include <sys/cdefs.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include <ctype.h>
|
|
diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c
|
|
index 35d61c349cb..953018cf553 100644
|
|
--- a/usr.bin/diff/diffreg.c
|
|
+++ b/usr.bin/diff/diffreg.c
|
|
@@ -77,6 +77,7 @@
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
+#include <time.h>
|
|
#include <unistd.h>
|
|
#include <limits.h>
|
|
|
|
--
|
|
2.11.0
|
|
|