mirror of
https://github.com/oasislinux/oasis.git
synced 2026-02-05 11:33:57 +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
35 lines
728 B
Diff
35 lines
728 B
Diff
From e969e57612df9b24df2ac16ac545466fca0989f1 Mon Sep 17 00:00:00 2001
|
|
From: Michael Forney <mforney@mforney.org>
|
|
Date: Sun, 5 Jun 2016 18:21:02 -0700
|
|
Subject: [PATCH] Add missing includes
|
|
|
|
stddef.h for offsetof
|
|
sys/param.h for MIN
|
|
---
|
|
sshfs.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/sshfs.c b/sshfs.c
|
|
index 4f3bfe4..cd6abf6 100644
|
|
--- a/sshfs.c
|
|
+++ b/sshfs.c
|
|
@@ -17,6 +17,7 @@
|
|
#endif
|
|
#include <assert.h>
|
|
#include <stdbool.h>
|
|
+#include <stddef.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
@@ -37,6 +38,7 @@
|
|
#include <sys/socket.h>
|
|
#include <sys/utsname.h>
|
|
#include <sys/mman.h>
|
|
+#include <sys/param.h>
|
|
#include <sys/poll.h>
|
|
#include <netinet/in.h>
|
|
#include <netinet/tcp.h>
|
|
--
|
|
2.9.0
|
|
|