Merge branch 'jc/subdir'

diff --git a/apply.c b/apply.c
index 50be8f3..1742ab2 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -16,6 +16,9 @@
 //  --numstat does numeric diffstat, and doesn't actually apply
 //  --index-info shows the old and new index info for paths if available.
 //
+static const char *prefix;
+static int prefix_length = -1;
+
 static int allow_binary_replacement = 0;
 static int check_index = 0;
 static int write_index = 0;
@@ -1706,6 +1709,12 @@ static int use_patch(struct patch *p)
                        return 0;
                x = x->next;
        }
+       if (0 < prefix_length) {
+               int pathlen = strlen(pathname);
+               if (pathlen <= prefix_length ||
+                   memcmp(prefix, pathname, prefix_length))
+                       return 0;
+       }
        return 1;
 }
 
@@ -1845,6 +1854,15 @@ int main(int argc, char **argv)
                        line_termination = 0;
                        continue;
                }
+
+               if (check_index && prefix_length < 0) {
+                       prefix = setup_git_directory();
+                       prefix_length = prefix ? strlen(prefix) : 0;
+                       git_config(git_default_config);
+               }
+               if (0 < prefix_length)
+                       arg = prefix_filename(prefix, prefix_length, arg);
+
                fd = open(arg, O_RDONLY);
                if (fd < 0)
                        usage(apply_usage);

diff --git a/cache.h b/cache.h
index 634b5aa..f9b367f 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -147,8 +147,10 @@ extern char *get_graft_file(void);
 #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"
 
 extern const char **get_pathspec(const char *prefix, const char **pathspec);
+extern const char *setup_git_directory_gently(int *);
 extern const char *setup_git_directory(void);
 extern const char *prefix_path(const char *prefix, int len, const char *path);
+extern const char *prefix_filename(const char *prefix, int len, const char *path);
 
 #define alloc_nr(x) (((x)+16)*3/2)
 

diff --git a/checkout-index.c b/checkout-index.c
index dab3778..f1e716d 100644 (file)
--- a/checkout-index.c
+++ b/checkout-index.c
@@ -34,6 +34,9 @@
  */
 #include "cache.h"
 
+static const char *prefix;
+static int prefix_length;
+
 static struct checkout state = {
        .base_dir = "",
        .base_dir_len = 0,
@@ -69,6 +72,10 @@ static int checkout_all(void)
                struct cache_entry *ce = active_cache[i];
                if (ce_stage(ce))
                        continue;
+               if (prefix && *prefix &&
+                   ( ce_namelen(ce) <= prefix_length ||
+                     memcmp(prefix, ce->name, prefix_length) ))
+                       continue;
                if (checkout_entry(ce, &state) < 0)
                        errs++;
        }
@@ -91,6 +98,9 @@ int main(int argc, char **argv)
        int newfd = -1;
        int all = 0;
 
+       prefix = setup_git_directory();
+       prefix_length = prefix ? strlen(prefix) : 0;
+
        if (read_cache() < 0) {
                die("invalid cache");
        }
@@ -155,7 +165,7 @@ int main(int argc, char **argv)
 
                if (all)
                        die("git-checkout-index: don't mix '--all' and explicit filenames");
-               checkout_file(arg);
+               checkout_file(prefix_path(prefix, prefix_length, arg));
        }
 
        if (all)

diff --git a/clone-pack.c b/clone-pack.c
index 9609219..a99a95c 100644 (file)
--- a/clone-pack.c
+++ b/clone-pack.c
@@ -271,6 +271,8 @@ int main(int argc, char **argv)
        int fd[2];
        pid_t pid;
 
+       setup_git_directory();
+
        nr_heads = 0;
        heads = NULL;
        for (i = 1; i < argc; i++) {

diff --git a/commit-tree.c b/commit-tree.c
index b60299f..4634b50 100644 (file)
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -91,6 +91,8 @@ int main(int argc, char **argv)
        if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
                usage(commit_tree_usage);
 
+       setup_git_directory();
+
        check_valid(tree_sha1, "tree");
        for (i = 2; i < argc; i += 2) {
                char *a, *b;

diff --git a/convert-objects.c b/convert-objects.c
index a892013..d78a8b4 100644 (file)
--- a/convert-objects.c
+++ b/convert-objects.c
@@ -316,6 +316,8 @@ int main(int argc, char **argv)
        unsigned char sha1[20];
        struct entry *entry;
 
+       setup_git_directory();
+
        if (argc != 2 || get_sha1(argv[1], sha1))
                usage("git-convert-objects <sha1>");
 

diff --git a/fetch-pack.c b/fetch-pack.c
index 6565982..58ba209 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -424,6 +424,8 @@ int main(int argc, char **argv)
        int fd[2];
        pid_t pid;
 
+       setup_git_directory();
+
        nr_heads = 0;
        heads = NULL;
        for (i = 1; i < argc; i++) {

diff --git a/fsck-objects.c b/fsck-objects.c
index 0433a1d..90e638e 100644 (file)
--- a/fsck-objects.c
+++ b/fsck-objects.c
@@ -431,6 +431,8 @@ int main(int argc, char **argv)
 {
        int i, heads;
 
+       setup_git_directory();
+
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
 

diff --git a/git-add.sh b/git-add.sh
index b5fe46a..fdec86d 100755 (executable)
--- a/git-add.sh
+++ b/git-add.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+die () {
+    echo >&2 "$*"
+    exit 1
+}
+
 usage() {
     die "usage: git add [-n] [-v] <file>..."
 }

diff --git a/git-branch.sh b/git-branch.sh
index 4cd5da1..5306b27 100755 (executable)
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 
-. git-sh-setup
+GIT_DIR=`git-rev-parse --git-dir` || exit $?
+
+die () {
+    echo >&2 "$*"
+    exit 1
+}
 
 usage () {
     echo >&2 "usage: $(basename $0)"' [-d <branch>] | [[-f] <branch> [start-point]]
@@ -12,8 +17,7 @@ If two arguments, create a new branch <branchname> based off of <start-point>.
     exit 1
 }
 
-headref=$(GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD |
-       sed -e 's|^refs/heads/||')
+headref=$(git-symbolic-ref HEAD | sed -e 's|^refs/heads/||')
 
 delete_branch () {
     option="$1"
@@ -114,4 +118,3 @@ then
        fi
 fi
 git update-ref "refs/heads/$branchname" $rev
-

diff --git a/git-count-objects.sh b/git-count-objects.sh
index d6e9a32..40c58ef 100755 (executable)
--- a/git-count-objects.sh
+++ b/git-count-objects.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-. git-sh-setup
+GIT_DIR=`git-rev-parse --git-dir` || exit $?
 
 dc </dev/null 2>/dev/null || {
        # This is not a real DC at all -- it just knows how

diff --git a/git-diff.sh b/git-diff.sh
index 7baf704..b62e583 100755 (executable)
--- a/git-diff.sh
+++ b/git-diff.sh
@@ -7,6 +7,11 @@ rev=$(git-rev-parse --revs-only --no-flags --sq "$@") || exit
 flags=$(git-rev-parse --no-revs --flags --sq "$@")
 files=$(git-rev-parse --no-revs --no-flags --sq "$@")
 
+die () {
+    echo >&2 "$*"
+    exit 1
+}
+
 # I often say 'git diff --cached -p' and get scolded by git-diff-files, but
 # obviously I mean 'git diff --cached -p HEAD' in that case.
 case "$rev" in

diff --git a/git-lost-found.sh b/git-lost-found.sh
index 9dd7430..2beec2a 100755 (executable)
--- a/git-lost-found.sh
+++ b/git-lost-found.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-. git-sh-setup
-
+GIT_DIR=`git-rev-parse --git-dir` || exit $?
 laf="$GIT_DIR/lost-found"
 rm -fr "$laf" && mkdir -p "$laf/commit" "$laf/other" || exit
 

diff --git a/git-ls-remote.sh b/git-ls-remote.sh
index dc6a775..f699268 100755 (executable)
--- a/git-ls-remote.sh
+++ b/git-ls-remote.sh
@@ -6,6 +6,11 @@ usage () {
     exit 1;
 }
 
+die () {
+    echo >&2 "$*"
+    exit 1
+}
+
 while case "$#" in 0) break;; esac
 do
   case "$1" in

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index bb58e22..7adffdc 100755 (executable)
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -8,6 +8,11 @@
 LF='
 '
 
+die () {
+    echo >&2 "$*"
+    exit 1
+}
+
 # The first parameters up to -- are merge bases; the rest are heads.
 bases= head= remotes= sep_seen=
 for arg

diff --git a/git-tag.sh b/git-tag.sh
index 16efc5b..2435a75 100755 (executable)
--- a/git-tag.sh
+++ b/git-tag.sh
@@ -1,13 +1,18 @@
 #!/bin/sh
 # Copyright (c) 2005 Linus Torvalds
 
-. git-sh-setup
+GIT_DIR=`git-rev-parse --git-dir` || exit $?
 
 usage () {
     echo >&2 "Usage: git-tag [-a | -s | -u <key-id>] [-f | -d] [-m <msg>] <tagname> [<head>]"
     exit 1
 }
 
+die () {
+    echo >&2 "$*"
+    exit 1
+}
+
 annotate=
 signed=
 force=

diff --git a/git-verify-tag.sh b/git-verify-tag.sh
index 3c65f4a..1f44da5 100755 (executable)
--- a/git-verify-tag.sh
+++ b/git-verify-tag.sh
@@ -1,5 +1,11 @@
 #!/bin/sh
-. git-sh-setup
+
+GIT_DIR=`git-rev-parse --git-dir` || exit $?
+
+die () {
+    echo >&2 "$*"
+    exit 1
+}
 
 type="$(git-cat-file -t "$1" 2>/dev/null)" ||
        die "$1: no such object."
@@ -7,6 +13,9 @@ type="$(git-cat-file -t "$1" 2>/dev/null)" ||
 test "$type" = tag ||
        die "$1: cannot verify a non-tag object of type $type."
 
-git-cat-file tag "$1" > .tmp-vtag || exit 1
-cat .tmp-vtag | sed '/-----BEGIN PGP/Q' | gpg --verify .tmp-vtag - || exit 1
-rm -f .tmp-vtag
+git-cat-file tag "$1" >"$GIT_DIR/.tmp-vtag" || exit 1
+cat "$GIT_DIR/.tmp-vtag" |
+sed '/-----BEGIN PGP/Q' |
+gpg --verify "$GIT_DIR/.tmp-vtag" - || exit 1
+rm -f "$GIT_DIR/.tmp-vtag"
+

diff --git a/hash-object.c b/hash-object.c
index c8c9adb..ccba11c 100644 (file)
--- a/hash-object.c
+++ b/hash-object.c
@@ -29,6 +29,8 @@ int main(int argc, char **argv)
        int i;
        const char *type = "blob";
        int write_object = 0;
+       const char *prefix = NULL;
+       int prefix_length = -1;
 
        for (i = 1 ; i < argc; i++) {
                if (!strcmp(argv[i], "-t")) {
@@ -36,10 +38,20 @@ int main(int argc, char **argv)
                                die(hash_object_usage);
                        type = argv[i];
                }
-               else if (!strcmp(argv[i], "-w"))
+               else if (!strcmp(argv[i], "-w")) {
+                       if (prefix_length < 0) {
+                               prefix = setup_git_directory();
+                               prefix_length = prefix ? strlen(prefix) : 0;
+                       }
                        write_object = 1;
-               else
-                       hash_object(argv[i], type, write_object);
+               }
+               else {
+                       const char *arg = argv[i];
+                       if (0 <= prefix_length)
+                               arg = prefix_filename(prefix, prefix_length,
+                                                     arg);
+                       hash_object(arg, type, write_object);
+               }
        }
        return 0;
 }

diff --git a/http-fetch.c b/http-fetch.c
index 4353173..ad59f1c 100644 (file)
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -922,6 +922,8 @@ int main(int argc, char **argv)
        int arg = 1;
        int rc = 0;
 
+       setup_git_directory();
+
        while (arg < argc && argv[arg][0] == '-') {
                if (argv[arg][1] == 't') {
                        get_tree = 1;

diff --git a/http-push.c b/http-push.c
index fc013ec..fe92560 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -1237,6 +1237,7 @@ int main(int argc, char **argv)
        int rc = 0;
        int i;
 
+       setup_git_directory();
        setup_ident();
 
        remote = xmalloc(sizeof(*remote));

diff --git a/local-fetch.c b/local-fetch.c
index 0931109..fa9e697 100644 (file)
--- a/local-fetch.c
+++ b/local-fetch.c
@@ -207,6 +207,8 @@ int main(int argc, char **argv)
        char *commit_id;
        int arg = 1;
 
+       setup_git_directory();
+
        while (arg < argc && argv[arg][0] == '-') {
                if (argv[arg][1] == 't')
                        get_tree = 1;

diff --git a/merge-base.c b/merge-base.c
index 751c3c2..e73fca7 100644 (file)
--- a/merge-base.c
+++ b/merge-base.c
@@ -236,6 +236,8 @@ int main(int argc, char **argv)
        struct commit *rev1, *rev2;
        unsigned char rev1key[20], rev2key[20];
 
+       setup_git_directory();
+
        while (1 < argc && argv[1][0] == '-') {
                char *arg = argv[1];
                if (!strcmp(arg, "-a") || !strcmp(arg, "--all"))

diff --git a/merge-index.c b/merge-index.c
index 727527f..024196e 100644 (file)
--- a/merge-index.c
+++ b/merge-index.c
@@ -102,6 +102,7 @@ int main(int argc, char **argv)
        if (argc < 3)
                usage("git-merge-index [-o] [-q] <merge-program> (-a | <filename>*)");
 
+       setup_git_directory();
        read_cache();
 
        i = 1;

diff --git a/mktag.c b/mktag.c
index 585677e..97e270a 100644 (file)
--- a/mktag.c
+++ b/mktag.c
@@ -111,6 +111,8 @@ int main(int argc, char **argv)
        if (argc != 1)
                usage("cat <signaturefile> | git-mktag");
 
+       setup_git_directory();
+
        // Read the signature
        size = 0;
        for (;;) {

diff --git a/pack-objects.c b/pack-objects.c
index 8864a31..a62c9f8 100644 (file)
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -473,6 +473,8 @@ int main(int argc, char **argv)
        struct object_entry **list;
        int i;
 
+       setup_git_directory();
+
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
 

diff --git a/pack-redundant.c b/pack-redundant.c
index 793fa08..0a43278 100644 (file)
--- a/pack-redundant.c
+++ b/pack-redundant.c
@@ -600,6 +600,8 @@ int main(int argc, char **argv)
        unsigned char *sha1;
        char buf[42]; /* 40 byte sha1 + \n + \0 */
 
+       setup_git_directory();
+
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
                if(!strcmp(arg, "--")) {

diff --git a/peek-remote.c b/peek-remote.c
index ee49bf3..a90cf22 100644 (file)
--- a/peek-remote.c
+++ b/peek-remote.c
@@ -27,6 +27,9 @@ int main(int argc, char **argv)
        char *dest = NULL;
        int fd[2];
        pid_t pid;
+       int nongit = 0;
+
+       setup_git_directory_gently(&nongit);
 
        for (i = 1; i < argc; i++) {
                char *arg = argv[i];

diff --git a/prune-packed.c b/prune-packed.c
index 26123f7..d24b097 100644 (file)
--- a/prune-packed.c
+++ b/prune-packed.c
@@ -58,6 +58,8 @@ int main(int argc, char **argv)
 {
        int i;
 
+       setup_git_directory();
+
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
 

diff --git a/read-tree.c b/read-tree.c
index df156ea..e3b9c0d 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -629,6 +629,8 @@ int main(int argc, char **argv)
        unsigned char sha1[20];
        merge_fn_t fn = NULL;
 
+       setup_git_directory();
+
        newfd = hold_index_file_for_update(&cache_file, get_index_file());
        if (newfd < 0)
                die("unable to create new cachefile");

diff --git a/send-pack.c b/send-pack.c
index 3eeb18f..2a14b00 100644 (file)
--- a/send-pack.c
+++ b/send-pack.c
@@ -273,6 +273,7 @@ int main(int argc, char **argv)
        int fd[2], ret;
        pid_t pid;
 
+       setup_git_directory();
        argv++;
        for (i = 1; i < argc; i++, argv++) {
                char *arg = *argv;

diff --git a/setup.c b/setup.c
index 3286a56..d3556ed 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -47,6 +47,21 @@ const char *prefix_path(const char *prefix, int len, const char *path)
        return path;
 }
 
+/* 
+ * Unlike prefix_path, this should be used if the named file does
+ * not have to interact with index entry; i.e. name of a random file
+ * on the filesystem.
+ */
+const char *prefix_filename(const char *pfx, int pfx_len, const char *arg)
+{
+       static char path[PATH_MAX];
+       if (!pfx || !*pfx || arg[0] == '/')
+               return arg;
+       memcpy(path, pfx, pfx_len);
+       strcpy(path + pfx_len, arg);
+       return path;
+}
+
 const char **get_pathspec(const char *prefix, const char **pathspec)
 {
        const char *entry = *pathspec;
@@ -92,7 +107,7 @@ static int is_toplevel_directory(void)
        return 1;
 }
 
-static const char *setup_git_directory_1(void)
+const char *setup_git_directory_gently(int *nongit_ok)
 {
        static char cwd[PATH_MAX+1];
        int len, offset;
@@ -139,8 +154,15 @@ static const char *setup_git_directory_1(void)
                        break;
                chdir("..");
                do {
-                       if (!offset)
+                       if (!offset) {
+                               if (nongit_ok) {
+                                       if (chdir(cwd))
+                                               die("Cannot come back to cwd");
+                                       *nongit_ok = 1;
+                                       return NULL;
+                               }
                                die("Not a git repository");
+                       }
                } while (cwd[--offset] != '/');
        }
 
@@ -172,7 +194,7 @@ int check_repository_format(void)
 
 const char *setup_git_directory(void)
 {
-       const char *retval = setup_git_directory_1();
+       const char *retval = setup_git_directory_gently(NULL);
        check_repository_format();
        return retval;
 }

diff --git a/ssh-fetch.c b/ssh-fetch.c
index bf01fbc..4eb9e04 100644 (file)
--- a/ssh-fetch.c
+++ b/ssh-fetch.c
@@ -131,6 +131,8 @@ int main(int argc, char **argv)
        prog = getenv("GIT_SSH_PUSH");
        if (!prog) prog = "git-ssh-upload";
 
+       setup_git_directory();
+
        while (arg < argc && argv[arg][0] == '-') {
                if (argv[arg][1] == 't') {
                        get_tree = 1;

diff --git a/ssh-upload.c b/ssh-upload.c
index 603abcc..b675a0b 100644 (file)
--- a/ssh-upload.c
+++ b/ssh-upload.c
@@ -121,6 +121,9 @@ int main(int argc, char **argv)
 
        prog = getenv(COUNTERPART_ENV_NAME);
        if (!prog) prog = COUNTERPART_PROGRAM_NAME;
+
+       setup_git_directory();
+
        while (arg < argc && argv[arg][0] == '-') {
                if (argv[arg][1] == 'w')
                        arg++;

diff --git a/tar-tree.c b/tar-tree.c
index 970c4bb..bacb23a 100644 (file)
--- a/tar-tree.c
+++ b/tar-tree.c
@@ -407,6 +407,8 @@ int main(int argc, char **argv)
        void *buffer;
        unsigned long size;
 
+       setup_git_directory();
+
        switch (argc) {
        case 3:
                basedir = argv[2];

diff --git a/unpack-file.c b/unpack-file.c
index d4ac3a5..07303f8 100644 (file)
--- a/unpack-file.c
+++ b/unpack-file.c
@@ -29,6 +29,8 @@ int main(int argc, char **argv)
        if (argc != 2 || get_sha1(argv[1], sha1))
                usage("git-unpack-file <sha1>");
 
+       setup_git_directory();
+
        puts(create_temp_file(sha1));
        return 0;
 }

diff --git a/unpack-objects.c b/unpack-objects.c
index 8490895..cfd61ae 100644 (file)
--- a/unpack-objects.c
+++ b/unpack-objects.c
@@ -269,6 +269,8 @@ int main(int argc, char **argv)
        int i;
        unsigned char sha1[20];
 
+       setup_git_directory();
+
        for (i = 1 ; i < argc; i++) {
                const char *arg = argv[i];
 

diff --git a/update-server-info.c b/update-server-info.c
index e824f62..0b6c383 100644 (file)
--- a/update-server-info.c
+++ b/update-server-info.c
@@ -19,5 +19,7 @@ int main(int ac, char **av)
        if (i != ac)
                usage(update_server_info_usage);
 
+       setup_git_directory();
+
        return !!update_server_info(force);
 }

diff --git a/write-tree.c b/write-tree.c
index 2b2c6b7..0aac32f 100644 (file)
--- a/write-tree.c
+++ b/write-tree.c
@@ -86,9 +86,12 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
 int main(int argc, char **argv)
 {
        int i, funny;
-       int entries = read_cache();
+       int entries;
        unsigned char sha1[20];
        
+       setup_git_directory();
+
+       entries = read_cache();
        if (argc == 2) {
                if (!strcmp(argv[1], "--missing-ok"))
                        missing_ok = 1;