From 81b50f3ce40bfdd66e5d967bf82be001039a9a98 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 22 Feb 2010 08:42:18 -0800 Subject: Move 'builtin-*' into a 'builtin/' subdirectory This shrinks the top-level directory a bit, and makes it much more pleasant to use auto-completion on the thing. Instead of [torvalds@nehalem git]$ em buil Display all 180 possibilities? (y or n) [torvalds@nehalem git]$ em builtin-sh builtin-shortlog.c builtin-show-branch.c builtin-show-ref.c builtin-shortlog.o builtin-show-branch.o builtin-show-ref.o [torvalds@nehalem git]$ em builtin-shor builtin-shortlog.c builtin-shortlog.o [torvalds@nehalem git]$ em builtin-shortlog.c you get [torvalds@nehalem git]$ em buil [type] builtin/ builtin.h [torvalds@nehalem git]$ em builtin [auto-completes to] [torvalds@nehalem git]$ em builtin/sh [type] shortlog.c shortlog.o show-branch.c show-branch.o show-ref.c show-ref.o [torvalds@nehalem git]$ em builtin/sho [auto-completes to] [torvalds@nehalem git]$ em builtin/shor [type] shortlog.c shortlog.o [torvalds@nehalem git]$ em builtin/shortlog.c which doesn't seem all that different, but not having that annoying break in "Display all 180 possibilities?" is quite a relief. NOTE! If you do this in a clean tree (no object files etc), or using an editor that has auto-completion rules that ignores '*.o' files, you won't see that annoying 'Display all 180 possibilities?' message - it will just show the choices instead. I think bash has some cut-off around 100 choices or something. So the reason I see this is that I'm using an odd editory, and thus don't have the rules to cut down on auto-completion. But you can simulate that by using 'ls' instead, or something similar. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano --- builtin-write-tree.c | 56 ---------------------------------------------------- 1 file changed, 56 deletions(-) delete mode 100644 builtin-write-tree.c (limited to 'builtin-write-tree.c') diff --git a/builtin-write-tree.c b/builtin-write-tree.c deleted file mode 100644 index b223af416f..0000000000 --- a/builtin-write-tree.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * GIT - The information manager from hell - * - * Copyright (C) Linus Torvalds, 2005 - */ -#include "builtin.h" -#include "cache.h" -#include "tree.h" -#include "cache-tree.h" -#include "parse-options.h" - -static const char * const write_tree_usage[] = { - "git write-tree [--missing-ok] [--prefix=/]", - NULL -}; - -int cmd_write_tree(int argc, const char **argv, const char *unused_prefix) -{ - int flags = 0, ret; - const char *prefix = NULL; - unsigned char sha1[20]; - const char *me = "git-write-tree"; - struct option write_tree_options[] = { - OPT_BIT(0, "missing-ok", &flags, "allow missing objects", - WRITE_TREE_MISSING_OK), - { OPTION_STRING, 0, "prefix", &prefix, "/", - "write tree object for a subdirectory " , - PARSE_OPT_LITERAL_ARGHELP }, - { OPTION_BIT, 0, "ignore-cache-tree", &flags, NULL, - "only useful for debugging", - PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, NULL, - WRITE_TREE_IGNORE_CACHE_TREE }, - OPT_END() - }; - - git_config(git_default_config, NULL); - argc = parse_options(argc, argv, unused_prefix, write_tree_options, - write_tree_usage, 0); - - ret = write_cache_as_tree(sha1, flags, prefix); - switch (ret) { - case 0: - printf("%s\n", sha1_to_hex(sha1)); - break; - case WRITE_TREE_UNREADABLE_INDEX: - die("%s: error reading the index", me); - break; - case WRITE_TREE_UNMERGED_INDEX: - die("%s: error building trees", me); - break; - case WRITE_TREE_PREFIX_ERROR: - die("%s: prefix %s not found", me, prefix); - break; - } - return ret; -} -- cgit v1.2.1