commit: 6b932406db7cb90a2a39638832fef861cb85e815
parent dee95f64d26b887c6f79b86a14dffcc88ed314fd
Author: Michael Forney <mforney@mforney.org>
Date: Mon, 7 Aug 2017 10:10:02 -0700
git: Install built-in symlinks in GIT_EXEC_DIR
These are required for git aliases to work. I don't use those, but others might.
Diffstat:
4 files changed, 112 insertions(+), 216 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -59,7 +59,7 @@
[submodule "pkg/git/src"]
path = pkg/git/src
url = https://github.com/git/git
- ignore = all
+ ignore = untracked
[submodule "pkg/hostap/src"]
path = pkg/hostap/src
url = git://w1.fi/hostap.git
diff --git a/pkg/git/gen.rc b/pkg/git/gen.rc
@@ -208,114 +208,117 @@ lib libxdiff.a xdiff/^(\
)
# src/Makefile:/^BUILTIN_OBJS.\+=
-exe git -d '$dir'/deps git.c common-main.c.o builtin/^(\
- add.c\
- am.c\
- annotate.c\
- apply.c\
- archive.c\
- bisect--helper.c\
- blame.c\
- branch.c\
- bundle.c\
- cat-file.c\
- check-attr.c\
- check-ignore.c\
- check-mailmap.c\
- check-ref-format.c\
- checkout-index.c\
- checkout.c\
- clean.c\
- clone.c\
- column.c\
- commit-tree.c\
- commit.c\
- config.c\
- count-objects.c\
- credential.c\
- describe.c\
- diff-files.c\
- diff-index.c\
- diff-tree.c\
- diff.c\
- difftool.c\
- fast-export.c\
- fetch-pack.c\
- fetch.c\
- fmt-merge-msg.c\
- for-each-ref.c\
- fsck.c\
- gc.c\
- get-tar-commit-id.c\
- grep.c\
- hash-object.c\
- help.c\
- index-pack.c\
- init-db.c\
- interpret-trailers.c\
- log.c\
- ls-files.c\
- ls-remote.c\
- ls-tree.c\
- mailinfo.c\
- mailsplit.c\
- merge.c\
- merge-base.c\
- merge-file.c\
- merge-index.c\
- merge-ours.c\
- merge-recursive.c\
- merge-tree.c\
- mktag.c\
- mktree.c\
- mv.c\
- name-rev.c\
- notes.c\
- pack-objects.c\
- pack-redundant.c\
- pack-refs.c\
- patch-id.c\
- prune-packed.c\
- prune.c\
- pull.c\
- push.c\
- read-tree.c\
- rebase--helper.c\
- receive-pack.c\
- reflog.c\
- remote.c\
- remote-ext.c\
- remote-fd.c\
- repack.c\
- replace.c\
- rerere.c\
- reset.c\
- rev-list.c\
- rev-parse.c\
- revert.c\
- rm.c\
- send-pack.c\
- shortlog.c\
- show-branch.c\
- show-ref.c\
- stripspace.c\
- submodule--helper.c\
- symbolic-ref.c\
- tag.c\
- unpack-file.c\
- unpack-objects.c\
- update-index.c\
- update-ref.c\
- update-server-info.c\
- upload-archive.c\
- var.c\
- verify-commit.c\
- verify-pack.c\
- verify-tag.c\
- worktree.c\
- write-tree.c\
-) libgit.a.d
+builtins=(\
+ add\
+ am\
+ annotate\
+ apply\
+ archive\
+ bisect--helper\
+ blame\
+ branch\
+ bundle\
+ cat-file\
+ check-attr\
+ check-ignore\
+ check-mailmap\
+ check-ref-format\
+ checkout-index\
+ checkout\
+ clean\
+ clone\
+ column\
+ commit-tree\
+ commit\
+ config\
+ count-objects\
+ credential\
+ describe\
+ diff-files\
+ diff-index\
+ diff-tree\
+ diff\
+ difftool\
+ fast-export\
+ fetch-pack\
+ fetch\
+ fmt-merge-msg\
+ for-each-ref\
+ fsck\
+ gc\
+ get-tar-commit-id\
+ grep\
+ hash-object\
+ help\
+ index-pack\
+ init-db\
+ interpret-trailers\
+ log\
+ ls-files\
+ ls-remote\
+ ls-tree\
+ mailinfo\
+ mailsplit\
+ merge\
+ merge-base\
+ merge-file\
+ merge-index\
+ merge-ours\
+ merge-recursive\
+ merge-tree\
+ mktag\
+ mktree\
+ mv\
+ name-rev\
+ notes\
+ pack-objects\
+ pack-redundant\
+ pack-refs\
+ patch-id\
+ prune-packed\
+ prune\
+ pull\
+ push\
+ read-tree\
+ rebase--helper\
+ receive-pack\
+ reflog\
+ remote\
+ remote-ext\
+ remote-fd\
+ repack\
+ replace\
+ rerere\
+ reset\
+ rev-list\
+ rev-parse\
+ revert\
+ rm\
+ send-pack\
+ shortlog\
+ show-branch\
+ show-ref\
+ stripspace\
+ submodule--helper\
+ symbolic-ref\
+ tag\
+ unpack-file\
+ unpack-objects\
+ update-index\
+ update-ref\
+ update-server-info\
+ upload-archive\
+ var\
+ verify-commit\
+ verify-pack\
+ verify-tag\
+ worktree\
+ write-tree\
+)
+exe git -d '$dir'/deps git.c common-main.c.o builtin/$builtins.c libgit.a.d
file bin/git '$outdir'/git 755
+for(name in $builtins cherry cherry-pick format-patch fsck-objects init merge-subtree show stage status whatchanged)
+ sym libexec/git-core/git-$name ../../bin/git
fn x {
name=$1
diff --git a/pkg/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch b/pkg/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch
@@ -1,107 +0,0 @@
-From 04ab5cf17fdc9252910817a1e1e73900239b18ed Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 3 Dec 2016 00:41:41 -0800
-Subject: [PATCH] Drop dashes from builtin invocations in scripts
-
----
- git-merge-octopus.sh | 2 +-
- git-merge-one-file.sh | 8 ++++----
- git-merge-resolve.sh | 2 +-
- git-parse-remote.sh | 2 +-
- git-submodule.sh | 6 +++---
- 5 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
-index bcf0d92ec..6c390d6c2 100755
---- a/git-merge-octopus.sh
-+++ b/git-merge-octopus.sh
-@@ -100,7 +100,7 @@ do
- if test $? -ne 0
- then
- gettextln "Simple merge did not work, trying automatic merge."
-- git-merge-index -o git-merge-one-file -a ||
-+ git merge-index -o git-merge-one-file -a ||
- OCTOPUS_FAILURE=1
- next=$(git write-tree 2>/dev/null)
- fi
-diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
-index 424b034e3..9879c5939 100755
---- a/git-merge-one-file.sh
-+++ b/git-merge-one-file.sh
-@@ -115,16 +115,16 @@ case "${1:-.}${2:-.}${3:-.}" in
- ;;
- esac
-
-- src1=$(git-unpack-file $2)
-- src2=$(git-unpack-file $3)
-+ src1=$(git unpack-file $2)
-+ src2=$(git unpack-file $3)
- case "$1" in
- '')
- echo "Added $4 in both, but differently."
-- orig=$(git-unpack-file e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
-+ orig=$(git unpack-file e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
- ;;
- *)
- echo "Auto-merging $4"
-- orig=$(git-unpack-file $1)
-+ orig=$(git unpack-file $1)
- ;;
- esac
-
-diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
-index c9da747fc..343fe7bcc 100755
---- a/git-merge-resolve.sh
-+++ b/git-merge-resolve.sh
-@@ -45,7 +45,7 @@ then
- exit 0
- else
- echo "Simple merge failed, trying Automatic merge."
-- if git-merge-index -o git-merge-one-file -a
-+ if git merge-index -o git-merge-one-file -a
- then
- exit 0
- else
-diff --git a/git-parse-remote.sh b/git-parse-remote.sh
-index d3c39980f..dcfa27177 100644
---- a/git-parse-remote.sh
-+++ b/git-parse-remote.sh
-@@ -2,7 +2,7 @@
- # upstream branch that should be pulled by "git pull" from the current
- # branch.
-
--# git-ls-remote could be called from outside a git managed repository;
-+# git ls-remote could be called from outside a git managed repository;
- # this would fail in that case and would issue an error message.
- GIT_DIR=$(git rev-parse -q --git-dir) || :;
-
-diff --git a/git-submodule.sh b/git-submodule.sh
-index e131760ee..ffa2d6648 100755
---- a/git-submodule.sh
-+++ b/git-submodule.sh
-@@ -864,7 +864,7 @@ cmd_summary() {
- test $status != A && test $ignore_config = all && continue
- fi
- # Also show added or modified modules which are checked out
-- GIT_DIR="$sm_path/.git" git-rev-parse --git-dir >/dev/null 2>&1 &&
-+ GIT_DIR="$sm_path/.git" git rev-parse --git-dir >/dev/null 2>&1 &&
- printf '%s\n' "$sm_path"
- done
- )
-@@ -898,11 +898,11 @@ cmd_summary() {
- missing_dst=
-
- test $mod_src = 160000 &&
-- ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null &&
-+ ! GIT_DIR="$name/.git" git rev-parse -q --verify $sha1_src^0 >/dev/null &&
- missing_src=t
-
- test $mod_dst = 160000 &&
-- ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null &&
-+ ! GIT_DIR="$name/.git" git rev-parse -q --verify $sha1_dst^0 >/dev/null &&
- missing_dst=t
-
- display_name=$(git submodule--helper relative-path "$name" "$wt_prefix")
---
-2.13.4
-
diff --git a/pkg/git/rev b/pkg/git/rev
@@ -1 +1 @@
-19
+20
