From 293f5a93b77d92fd65db7f3d0df654f102e46cfb Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Sun, 11 Dec 2016 16:04:20 -0800 Subject: Move to flat package hierarchy 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 --- core/git/config.h | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 core/git/config.h (limited to 'core/git/config.h') diff --git a/core/git/config.h b/core/git/config.h deleted file mode 100644 index 47cb9d5b..00000000 --- a/core/git/config.h +++ /dev/null @@ -1,13 +0,0 @@ -#define DEFAULT_GIT_TEMPLATE_DIR "share/git-core/templates" -#define ETC_GITATTRIBUTES "/etc/gitattributes" -#define ETC_GITCONFIG "/etc/gitconfig" -#define GIT_EXEC_PATH "libexec/git-core" -#define GIT_HTML_PATH "share/doc/git-doc" -#define GIT_INFO_PATH "share/info" -#define GIT_LOCALE_PATH "/share/locale" -#define GIT_MAN_PATH "share/man" -#define GIT_USER_AGENT "git/" GIT_VERSION -#define GIT_VERSION "2.11.0" -#define NO_SYS_POLL_H -#define PAGER_ENV "LESS=FRX LV=-c" -#define SHA1_HEADER -- cgit v1.2.3