Browse Source

Make the rest of commands work from a subdirectory.

These commands are converted to run from a subdirectory.

    commit-tree convert-objects merge-base merge-index mktag
    pack-objects pack-redundant prune-packed read-tree tar-tree
    unpack-file unpack-objects update-server-info write-tree

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 19 years ago
parent
commit
53228a5fb8
  1. 2
      commit-tree.c
  2. 2
      convert-objects.c
  3. 2
      merge-base.c
  4. 1
      merge-index.c
  5. 2
      mktag.c
  6. 2
      pack-objects.c
  7. 2
      pack-redundant.c
  8. 2
      prune-packed.c
  9. 2
      read-tree.c
  10. 2
      tar-tree.c
  11. 2
      unpack-file.c
  12. 2
      unpack-objects.c
  13. 2
      update-server-info.c
  14. 5
      write-tree.c

2
commit-tree.c

@ -91,6 +91,8 @@ int main(int argc, char **argv) @@ -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;

2
convert-objects.c

@ -316,6 +316,8 @@ int main(int argc, char **argv) @@ -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>");


2
merge-base.c

@ -236,6 +236,8 @@ int main(int argc, char **argv) @@ -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"))

1
merge-index.c

@ -102,6 +102,7 @@ int main(int argc, char **argv) @@ -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;

2
mktag.c

@ -111,6 +111,8 @@ int main(int argc, char **argv) @@ -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 (;;) {

2
pack-objects.c

@ -473,6 +473,8 @@ int main(int argc, char **argv) @@ -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];


2
pack-redundant.c

@ -600,6 +600,8 @@ int main(int argc, char **argv) @@ -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, "--")) {

2
prune-packed.c

@ -58,6 +58,8 @@ int main(int argc, char **argv) @@ -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];


2
read-tree.c

@ -629,6 +629,8 @@ int main(int argc, char **argv) @@ -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");

2
tar-tree.c

@ -407,6 +407,8 @@ int main(int argc, char **argv) @@ -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];

2
unpack-file.c

@ -29,6 +29,8 @@ int main(int argc, char **argv) @@ -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;
}

2
unpack-objects.c

@ -269,6 +269,8 @@ int main(int argc, char **argv) @@ -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];


2
update-server-info.c

@ -19,5 +19,7 @@ int main(int ac, char **av) @@ -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);
}

5
write-tree.c

@ -86,9 +86,12 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b @@ -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;

Loading…
Cancel
Save