* [PATCH 5/9] builtin-rev-list.c: use parse_options()
From: Michele Ballabio @ 2008-07-23 21:42 UTC (permalink / raw)
To: git; +Cc: gitster
In-Reply-To: <1216849332-26813-1-git-send-email-barra_cuda@katamail.com>
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
---
builtin-rev-list.c | 132 +++++++++++++++++++++++++--------------------------
1 files changed, 65 insertions(+), 67 deletions(-)
diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index 893762c..9200b20 100644
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -11,44 +11,16 @@
#include "builtin.h"
#include "log-tree.h"
#include "graph.h"
+#include "parse-options.h"
/* bits #0-15 in revision.h */
#define COUNTED (1u<<16)
-static const char rev_list_usage[] =
-"git rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
-" limiting output:\n"
-" --max-count=nr\n"
-" --max-age=epoch\n"
-" --min-age=epoch\n"
-" --sparse\n"
-" --no-merges\n"
-" --remove-empty\n"
-" --all\n"
-" --branches\n"
-" --tags\n"
-" --remotes\n"
-" --stdin\n"
-" --quiet\n"
-" ordering output:\n"
-" --topo-order\n"
-" --date-order\n"
-" --reverse\n"
-" formatting output:\n"
-" --parents\n"
-" --children\n"
-" --objects | --objects-edge\n"
-" --unpacked\n"
-" --header | --pretty\n"
-" --abbrev=nr | --no-abbrev\n"
-" --abbrev-commit\n"
-" --left-right\n"
-" special purpose:\n"
-" --bisect\n"
-" --bisect-vars\n"
-" --bisect-all"
-;
+static const char * const rev_list_usage[] = {
+ "git rev-list [OPTION] <commit-id>... [ -- paths... ]",
+ NULL
+};
static struct rev_info revs;
@@ -575,15 +547,65 @@ static struct commit_list *find_bisection(struct commit_list *list,
return best;
}
+static int parse_header_cb(const struct option *opt, const char *arg, int unset)
+{
+ struct rev_info *t_revs = opt->value;
+ t_revs->verbose_header = unset ? 0 : 1;
+ return 0;
+}
+
int cmd_rev_list(int argc, const char **argv, const char *prefix)
{
struct commit_list *list;
- int i;
int read_from_stdin = 0;
int bisect_show_vars = 0;
int bisect_find_all = 0;
int quiet = 0;
+ const struct option options[] = {
+ OPT_GROUP("limiting output:"),
+ OPT_ARGUMENT("max-count=nr", "limit number of commits output"),
+ OPT_ARGUMENT("max-age=epoch", "limit commits output by time"),
+ OPT_ARGUMENT("min-age=epoch", "limit commits output by time"),
+ OPT_ARGUMENT("sparse", ""),
+ OPT_ARGUMENT("no-merges", "do not print merges"),
+ OPT_ARGUMENT("remove-empty", "stop when a given path disappears from the tree"),
+ OPT_ARGUMENT("all", "all refs"),
+ OPT_ARGUMENT("branches", "show local branches"),
+ OPT_ARGUMENT("tags", "show tags"),
+ OPT_ARGUMENT("remotes", "show remote-tracking branches"),
+ OPT_BOOLEAN(0, "stdin", &read_from_stdin,
+ "read commits also from command line"),
+ OPT__QUIET(&quiet),
+ OPT_GROUP("ordering output:"),
+ OPT_ARGUMENT("topo-order", "show commits in topological order"),
+ OPT_ARGUMENT("date-order", "use date order, preserving topology"),
+ OPT_ARGUMENT("reverse", "output commits in reverse order"),
+ OPT_GROUP("formatting output:"),
+ OPT_ARGUMENT("parents", "print the parents of the commit"),
+ OPT_ARGUMENT("children", "print the children of the commit"),
+ OPT_ARGUMENT("objects", "print all objects"),
+ OPT_ARGUMENT("objects-edge", "similar to --objects, used by git-pack-objects"),
+ OPT_ARGUMENT("unpacked", "print objects not in packs"),
+ { OPTION_CALLBACK, 0, "header", &revs, NULL,
+ "use raw-format", PARSE_OPT_NOARG, parse_header_cb, 0 },
+ OPT_ARGUMENT("pretty", "print contents in a given format"),
+ OPT_BOOLEAN(0, "timestamp", &show_timestamp,
+ "print the raw commit timestamp"),
+ OPT_ARGUMENT("abbrev-commit", "show short sha1"),
+ OPT_ARGUMENT("abbrev=nr", "number of digits used for short sha1"),
+ OPT_ARGUMENT("no-abbrev", "do not use short sha1"),
+ OPT_ARGUMENT("left-right", "mark side of symmetric diff"),
+ OPT_ARGUMENT("graph", "show an ASCII graph"),
+ OPT_GROUP("special purpose:"),
+ OPT_BOOLEAN(0, "bisect", &bisect_list, "useful for binary searches"),
+ OPT_BOOLEAN(0, "bisect-all", &bisect_find_all,
+ "order commits by their distance from given commits"),
+ OPT_BOOLEAN(0, "bisect-vars", &bisect_show_vars,
+ "like --bisect, but ready to be eval'ed"),
+ OPT_END()
+ };
+
git_config(git_default_config, NULL);
init_revisions(&revs, prefix);
revs.abbrev = 0;
@@ -591,40 +613,16 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
argc = setup_revisions(argc, argv, &revs, NULL);
quiet = DIFF_OPT_TST(&revs.diffopt, QUIET);
- for (i = 1 ; i < argc; i++) {
- const char *arg = argv[i];
+ argc = parse_options(argc, argv, options, rev_list_usage, 0);
- if (!strcmp(arg, "--header")) {
- revs.verbose_header = 1;
- continue;
- }
- if (!strcmp(arg, "--timestamp")) {
- show_timestamp = 1;
- continue;
- }
- if (!strcmp(arg, "--bisect")) {
- bisect_list = 1;
- continue;
- }
- if (!strcmp(arg, "--bisect-all")) {
- bisect_list = 1;
- bisect_find_all = 1;
- continue;
- }
- if (!strcmp(arg, "--bisect-vars")) {
- bisect_list = 1;
- bisect_show_vars = 1;
- continue;
- }
- if (!strcmp(arg, "--stdin")) {
- if (read_from_stdin++)
- die("--stdin given twice?");
- read_revisions_from_stdin(&revs);
- continue;
- }
- usage(rev_list_usage);
+ if (argc > 0)
+ usage_with_options(rev_list_usage, options);
+
+ if (bisect_find_all || bisect_show_vars)
+ bisect_list = 1;
+ if (read_from_stdin)
+ read_revisions_from_stdin(&revs);
- }
if (revs.commit_format != CMIT_FMT_UNSPECIFIED) {
/* The command line has a --pretty */
hdr_termination = '\n';
@@ -643,7 +641,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
(!(revs.tag_objects||revs.tree_objects||revs.blob_objects) &&
!revs.pending.nr)) ||
revs.diff)
- usage(rev_list_usage);
+ usage_with_options(rev_list_usage, options);
save_commit_buffer = revs.verbose_header || revs.grep_filter;
if (bisect_list)
--
1.5.6.3
^ permalink raw reply related
* [PATCH 7/9] builtin-checkout-index.c: use parse_options()
From: Michele Ballabio @ 2008-07-23 21:42 UTC (permalink / raw)
To: git; +Cc: gitster
In-Reply-To: <1216849332-26813-1-git-send-email-barra_cuda@katamail.com>
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
---
builtin-checkout-index.c | 146 +++++++++++++++++++++++++---------------------
1 files changed, 79 insertions(+), 67 deletions(-)
diff --git a/builtin-checkout-index.c b/builtin-checkout-index.c
index 71ebabf..429c850 100644
--- a/builtin-checkout-index.c
+++ b/builtin-checkout-index.c
@@ -40,6 +40,7 @@
#include "cache.h"
#include "quote.h"
#include "cache-tree.h"
+#include "parse-options.h"
#define CHECKOUT_ALL 4
static int line_termination = '\n';
@@ -153,18 +154,76 @@ static void checkout_all(const char *prefix, int prefix_length)
exit(128);
}
-static const char checkout_cache_usage[] =
-"git checkout-index [-u] [-q] [-a] [-f] [-n] [--stage=[123]|all] [--prefix=<string>] [--temp] [--] <file>...";
+static const char * const checkout_cache_usage[] = {
+ "git checkout-index [options] [--] <file>...",
+ NULL
+};
+
+static int parse_state_force_cb(const struct option *opt, const char *arg, int unset)
+{
+ struct checkout *t_state = opt->value;
+ t_state->force = unset ? 0 : 1;
+ return 0;
+}
+
+static int parse_state_quiet_cb(const struct option *opt, const char *arg, int unset)
+{
+ struct checkout *t_state = opt->value;
+ t_state->quiet = unset ? 0 : 1;
+ return 0;
+}
+
+static int parse_state_no_create_cb(const struct option *opt, const char *arg, int unset)
+{
+ struct checkout *t_state = opt->value;
+ t_state->not_new = 1;
+ return 0;
+}
+
+static int parse_state_index_cb(const struct option *opt, const char *arg, int unset)
+{
+ struct checkout *t_state = opt->value;
+ t_state->refresh_cache = unset ? 0 : 1;
+ return 0;
+}
static struct lock_file lock_file;
int cmd_checkout_index(int argc, const char **argv, const char *prefix)
{
- int i;
int newfd = -1;
int all = 0;
int read_from_stdin = 0;
int prefix_length;
+ char *stage = NULL;
+
+ const struct option options[] = {
+ OPT_BOOLEAN('a', "all", &all,
+ "checks out all files in the index"),
+ { OPTION_CALLBACK, 'f', "force", &state, NULL,
+ "force overwrite of existing files",
+ PARSE_OPT_NOARG, parse_state_force_cb, 0 },
+ { OPTION_CALLBACK, 'q', "quiet", &state, NULL, "be quiet",
+ PARSE_OPT_NOARG, parse_state_quiet_cb, 0 },
+ { OPTION_CALLBACK, 'n', "no-create", &state, NULL,
+ "do not checkout new files, refresh existing ones",
+ PARSE_OPT_NOARG | PARSE_OPT_NONEG,
+ parse_state_no_create_cb, 0 },
+ { OPTION_CALLBACK, 'u', "index", &state, NULL,
+ "update stat information in the index",
+ PARSE_OPT_NOARG, parse_state_index_cb, 0 },
+ OPT_SET_INT('z', NULL, &line_termination,
+ "separate paths with NUL", 0),
+ OPT_BOOLEAN(0, "stdin", &read_from_stdin,
+ "read paths from stdin"),
+ OPT_BOOLEAN(0, "temp", &to_tempfile,
+ "write content to temporary files"),
+ OPT_STRING(0, "prefix", &state.base_dir, "string",
+ "prepend <string> when creating files"),
+ OPT_STRING(0, "stage", &stage, "1|2|3|all",
+ "copy out files from the named stage"),
+ OPT_END()
+ };
git_config(git_default_config, NULL);
state.base_dir = "";
@@ -174,71 +233,24 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
die("invalid cache");
}
- for (i = 1; i < argc; i++) {
- const char *arg = argv[i];
+ argc = parse_options(argc, argv, options, checkout_cache_usage, 0);
- if (!strcmp(arg, "--")) {
- i++;
- break;
- }
- if (!strcmp(arg, "-a") || !strcmp(arg, "--all")) {
- all = 1;
- continue;
- }
- if (!strcmp(arg, "-f") || !strcmp(arg, "--force")) {
- state.force = 1;
- continue;
- }
- if (!strcmp(arg, "-q") || !strcmp(arg, "--quiet")) {
- state.quiet = 1;
- continue;
- }
- if (!strcmp(arg, "-n") || !strcmp(arg, "--no-create")) {
- state.not_new = 1;
- continue;
- }
- if (!strcmp(arg, "-u") || !strcmp(arg, "--index")) {
- state.refresh_cache = 1;
- if (newfd < 0)
- newfd = hold_locked_index(&lock_file, 1);
- continue;
- }
- if (!strcmp(arg, "-z")) {
- line_termination = 0;
- continue;
- }
- if (!strcmp(arg, "--stdin")) {
- if (i != argc - 1)
- die("--stdin must be at the end");
- read_from_stdin = 1;
- i++; /* do not consider arg as a file name */
- break;
- }
- if (!strcmp(arg, "--temp")) {
+ if ((state.refresh_cache) && (newfd < 0))
+ newfd = hold_locked_index(&lock_file, 1);
+ if (state.base_dir)
+ state.base_dir_len = strlen(state.base_dir);
+
+ if (stage) {
+ if (!strcmp(stage, "all")) {
to_tempfile = 1;
- continue;
- }
- if (!prefixcmp(arg, "--prefix=")) {
- state.base_dir = arg+9;
- state.base_dir_len = strlen(state.base_dir);
- continue;
- }
- if (!prefixcmp(arg, "--stage=")) {
- if (!strcmp(arg + 8, "all")) {
- to_tempfile = 1;
- checkout_stage = CHECKOUT_ALL;
- } else {
- int ch = arg[8];
- if ('1' <= ch && ch <= '3')
- checkout_stage = arg[8] - '0';
- else
- die("stage should be between 1 and 3 or all");
- }
- continue;
+ checkout_stage = CHECKOUT_ALL;
+ } else {
+ int ch = stage[0];
+ if ('1' <= ch && ch <= '3')
+ checkout_stage = stage[0] - '0';
+ else
+ die("stage should be between 1 and 3 or all");
}
- if (arg[0] == '-')
- usage(checkout_cache_usage);
- break;
}
if (state.base_dir_len || to_tempfile) {
@@ -253,8 +265,8 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
}
/* Check out named files first */
- for ( ; i < argc; i++) {
- const char *arg = argv[i];
+ while (argc-- > 0) {
+ const char *arg = *argv++;
const char *p;
if (all)
--
1.5.6.3
^ permalink raw reply related
* [PATCH 6/9] builtin-init-db.c: use parse_options()
From: Michele Ballabio @ 2008-07-23 21:42 UTC (permalink / raw)
To: git; +Cc: gitster
In-Reply-To: <1216849332-26813-1-git-send-email-barra_cuda@katamail.com>
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
---
builtin-init-db.c | 56 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/builtin-init-db.c b/builtin-init-db.c
index 38b4fcb..ea1bed7 100644
--- a/builtin-init-db.c
+++ b/builtin-init-db.c
@@ -6,6 +6,7 @@
#include "cache.h"
#include "builtin.h"
#include "exec_cmd.h"
+#include "parse-options.h"
#ifndef DEFAULT_GIT_TEMPLATE_DIR
#define DEFAULT_GIT_TEMPLATE_DIR "/usr/share/git-core/templates"
@@ -353,8 +354,17 @@ static int guess_repository_type(const char *git_dir)
return 1;
}
-static const char init_db_usage[] =
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared[=<permissions>]]";
+static const char * const init_db_usage[] = {
+ "git init [-q | --quiet] [--bare] [--template=<dir>] [--shared[=<type>]]",
+ NULL
+};
+
+static int parse_opt_shared_cb(const struct option *opt, const char *arg,
+ int unset)
+{
+ *(int *)(opt->value) = unset ? 0 : git_config_perm("arg", arg);
+ return 0;
+}
/*
* If you want to, you can share the DB area with any number of branches.
@@ -367,25 +377,29 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
const char *git_dir;
const char *template_dir = NULL;
unsigned int flags = 0;
- int i;
-
- for (i = 1; i < argc; i++, argv++) {
- const char *arg = argv[1];
- if (!prefixcmp(arg, "--template="))
- template_dir = arg+11;
- else if (!strcmp(arg, "--bare")) {
- static char git_dir[PATH_MAX+1];
- is_bare_repository_cfg = 1;
- setenv(GIT_DIR_ENVIRONMENT, getcwd(git_dir,
- sizeof(git_dir)), 0);
- } else if (!strcmp(arg, "--shared"))
- shared_repository = PERM_GROUP;
- else if (!prefixcmp(arg, "--shared="))
- shared_repository = git_config_perm("arg", arg+9);
- else if (!strcmp(arg, "-q") || !strcmp(arg, "--quiet"))
- flags |= INIT_DB_QUIET;
- else
- usage(init_db_usage);
+ int bare = 0;
+
+ const struct option options[] = {
+ OPT_STRING(0, "template", &template_dir, "dir",
+ "directory from which templates will be used"),
+ OPT_BOOLEAN(0, "bare", &bare, "set up a bare repo"),
+ { OPTION_CALLBACK, 0, "shared", &shared_repository,
+ "type", "type of shared repository",
+ PARSE_OPT_OPTARG, parse_opt_shared_cb, PERM_GROUP },
+ OPT_BIT('q', "quiet", &flags, "be quiet", INIT_DB_QUIET),
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, options, init_db_usage, 0);
+
+ if (argc > 0)
+ usage_with_options(init_db_usage, options);
+
+ if (bare) {
+ static char git_dir[PATH_MAX+1];
+ is_bare_repository_cfg = 1;
+ setenv(GIT_DIR_ENVIRONMENT, getcwd(git_dir,
+ sizeof(git_dir)), 0);
}
/*
--
1.5.6.3
^ permalink raw reply related
* [PATCH 9/9] builtin-mailinfo.c: use parse_options()
From: Michele Ballabio @ 2008-07-23 21:42 UTC (permalink / raw)
To: git; +Cc: gitster
In-Reply-To: <1216849332-26813-1-git-send-email-barra_cuda@katamail.com>
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
---
builtin-mailinfo.c | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index f974b9d..f1ed269 100644
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -6,6 +6,7 @@
#include "builtin.h"
#include "utf8.h"
#include "strbuf.h"
+#include "parse-options.h"
static FILE *cmitmsg, *patchfile, *fin, *fout;
@@ -905,8 +906,10 @@ static int mailinfo(FILE *in, FILE *out, int ks, const char *encoding,
return 0;
}
-static const char mailinfo_usage[] =
- "git mailinfo [-k] [-u | --encoding=<encoding> | -n] msg patch <mail >info";
+static const char * const mailinfo_usage[] = {
+ "git mailinfo [-k] [-u | --encoding=<encoding> | -n] msg patch <mail >info",
+ NULL
+};
int cmd_mailinfo(int argc, const char **argv, const char *prefix)
{
@@ -920,22 +923,22 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix)
def_charset = (git_commit_encoding ? git_commit_encoding : "utf-8");
metainfo_charset = def_charset;
- while (1 < argc && argv[1][0] == '-') {
- if (!strcmp(argv[1], "-k"))
- keep_subject = 1;
- else if (!strcmp(argv[1], "-u"))
- metainfo_charset = def_charset;
- else if (!strcmp(argv[1], "-n"))
- metainfo_charset = NULL;
- else if (!prefixcmp(argv[1], "--encoding="))
- metainfo_charset = argv[1] + 11;
- else
- usage(mailinfo_usage);
- argc--; argv++;
- }
+ const struct option options[] = {
+ OPT_BOOLEAN('k', NULL, &keep_subject,
+ "keep subject, don't clean it up"),
+ OPT_SET_PTR('u', NULL, &metainfo_charset,
+ "re-code in UTF-8", (intptr_t)def_charset),
+ OPT_SET_PTR('n', NULL, &metainfo_charset,
+ "disable re-coding", (intptr_t)NULL),
+ OPT_STRING(0, "encoding", &metainfo_charset,
+ "encoding", "override default encoding"),
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, options, mailinfo_usage, 0);
- if (argc != 3)
- usage(mailinfo_usage);
+ if (argc != 2)
+ usage_with_options(mailinfo_usage, options);
- return !!mailinfo(stdin, stdout, keep_subject, metainfo_charset, argv[1], argv[2]);
+ return !!mailinfo(stdin, stdout, keep_subject, metainfo_charset, argv[0], argv[1]);
}
--
1.5.6.3
^ permalink raw reply related
* [PATCH] git-completion.bash: provide completion for 'show-branch'
From: Thomas Rast @ 2008-07-23 21:36 UTC (permalink / raw)
To: git; +Cc: gitster, Shawn O. Pearce
It previously used the same as 'log', but the options are quite
different and the arguments must be single refs (or globs).
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
contrib/completion/git-completion.bash | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 5d260e2..4cfe927 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1210,6 +1210,22 @@ _git_show ()
__git_complete_file
}
+_git_show_branch ()
+{
+ local cur="${COMP_WORDS[COMP_CWORD]}"
+ case "$cur" in
+ --*)
+ __gitcomp "
+ --all --remotes --topo-order --current --more=
+ --list --independent --merge-base --no-name
+ --sha1-name --topics --reflog
+ "
+ return
+ ;;
+ esac
+ __git_complete_revlist
+}
+
_git_stash ()
{
local subcommands='save list show apply clear drop pop create'
@@ -1428,7 +1444,7 @@ _git ()
send-email) _git_send_email ;;
shortlog) _git_shortlog ;;
show) _git_show ;;
- show-branch) _git_log ;;
+ show-branch) _git_show_branch ;;
stash) _git_stash ;;
submodule) _git_submodule ;;
svn) _git_svn ;;
--
1.6.0.rc0.16.g0680f
^ permalink raw reply related
* [PATCH 8/9] builtin-fetch-pack.c: use parse_options()
From: Michele Ballabio @ 2008-07-23 21:42 UTC (permalink / raw)
To: git; +Cc: gitster
In-Reply-To: <1216849332-26813-1-git-send-email-barra_cuda@katamail.com>
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
---
builtin-fetch-pack.c | 144 +++++++++++++++++++++++++++++++-------------------
1 files changed, 90 insertions(+), 54 deletions(-)
diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c
index 273239a..701be41 100644
--- a/builtin-fetch-pack.c
+++ b/builtin-fetch-pack.c
@@ -9,6 +9,7 @@
#include "fetch-pack.h"
#include "remote.h"
#include "run-command.h"
+#include "parse-options.h"
static int transfer_unpack_limit = -1;
static int fetch_unpack_limit = -1;
@@ -17,8 +18,10 @@ static struct fetch_pack_args args = {
/* .uploadpack = */ "git-upload-pack",
};
-static const char fetch_pack_usage[] =
-"git fetch-pack [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag] [--upload-pack=<git-upload-pack>] [--depth=<n>] [--no-progress] [-v] [<host>:]<directory> [<refs>...]";
+static const char * const fetch_pack_usage[] = {
+ "git fetch-pack [options] [<host>:]<directory> [<refs>...]",
+ NULL
+};
#define COMPLETE (1U << 0)
#define COMMON (1U << 1)
@@ -667,6 +670,56 @@ static void fetch_pack_setup(void)
did_setup = 1;
}
+static int parse_opt_keep_pack_cb(const struct option *opt, const char *arg, int unset)
+{
+ struct fetch_pack_args *t_args = opt->value;
+ t_args->lock_pack = t_args->keep_pack;
+ t_args->keep_pack = 1;
+ return 0;
+}
+
+static int parse_opt_thin_cb(const struct option *opt, const char *arg, int unset)
+{
+ struct fetch_pack_args *t_args = opt->value;
+ t_args->use_thin_pack = unset ? 0 : 1;
+ return 0;
+}
+
+static int parse_opt_include_tag_cb(const struct option *opt, const char *arg, int unset)
+{
+ struct fetch_pack_args *t_args = opt->value;
+ t_args->include_tag = unset ? 0 : 1;
+ return 0;
+}
+
+static int parse_opt_no_progress_cb(const struct option *opt, const char *arg, int unset)
+{
+ struct fetch_pack_args *t_args = opt->value;
+ t_args->no_progress = 1;
+ return 0;
+}
+
+static int parse_opt_fetch_all_cb(const struct option *opt, const char *arg, int unset)
+{
+ struct fetch_pack_args *t_args = opt->value;
+ t_args->fetch_all = unset ? 0 : 1;
+ return 0;
+}
+
+static int parse_opt_quiet_cb(const struct option *opt, const char *arg, int unset)
+{
+ struct fetch_pack_args *t_args = opt->value;
+ t_args->quiet = unset ? 0 : 1;
+ return 0;
+}
+
+static int parse_opt_verbose_cb(const struct option *opt, const char *arg, int unset)
+{
+ struct fetch_pack_args *t_args = opt->value;
+ t_args->verbose = unset ? 0 : 1;
+ return 0;
+}
+
int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
{
int i, ret, nr_heads;
@@ -677,60 +730,43 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
nr_heads = 0;
heads = NULL;
- for (i = 1; i < argc; i++) {
- const char *arg = argv[i];
- if (*arg == '-') {
- if (!prefixcmp(arg, "--upload-pack=")) {
- args.uploadpack = arg + 14;
- continue;
- }
- if (!prefixcmp(arg, "--exec=")) {
- args.uploadpack = arg + 7;
- continue;
- }
- if (!strcmp("--quiet", arg) || !strcmp("-q", arg)) {
- args.quiet = 1;
- continue;
- }
- if (!strcmp("--keep", arg) || !strcmp("-k", arg)) {
- args.lock_pack = args.keep_pack;
- args.keep_pack = 1;
- continue;
- }
- if (!strcmp("--thin", arg)) {
- args.use_thin_pack = 1;
- continue;
- }
- if (!strcmp("--include-tag", arg)) {
- args.include_tag = 1;
- continue;
- }
- if (!strcmp("--all", arg)) {
- args.fetch_all = 1;
- continue;
- }
- if (!strcmp("-v", arg)) {
- args.verbose = 1;
- continue;
- }
- if (!prefixcmp(arg, "--depth=")) {
- args.depth = strtol(arg + 8, NULL, 0);
- continue;
- }
- if (!strcmp("--no-progress", arg)) {
- args.no_progress = 1;
- continue;
- }
- usage(fetch_pack_usage);
- }
- dest = (char *)arg;
- heads = (char **)(argv + i + 1);
- nr_heads = argc - i - 1;
- break;
- }
+ const struct option options[] = {
+ { OPTION_CALLBACK, 0, "all", &args, NULL,
+ "fetch all remote refs", PARSE_OPT_NOARG,
+ parse_opt_fetch_all_cb },
+ OPT_STRING(0, "upload-pack", &args.uploadpack, "git-upload-pack",
+ "specify path to git-upload-pack on remote"),
+ OPT_STRING(0, "exec", &args.uploadpack, "git-upload-pack",
+ "same as --upload-pack <git-upload-pack>."),
+ { OPTION_CALLBACK, 0, "no-progress", &args, NULL,
+ "do not show the progress", PARSE_OPT_NOARG | PARSE_OPT_NONEG,
+ parse_opt_no_progress_cb },
+ { OPTION_CALLBACK, 'q', "quiet", &args, NULL,
+ "be quiet", PARSE_OPT_NOARG, parse_opt_quiet_cb },
+ { OPTION_CALLBACK, 'v', "verbose", &args, NULL,
+ "be verbose", PARSE_OPT_NOARG, parse_opt_verbose_cb },
+ OPT_INTEGER(0, "depth", &args.depth, "fetch chains not longer than <n>"),
+ { OPTION_CALLBACK, 'k', "keep", &args, NULL,
+ "create a single packfile of received data",
+ PARSE_OPT_NOARG | PARSE_OPT_NONEG, parse_opt_keep_pack_cb },
+ { OPTION_CALLBACK, 0, "include-tag", &args, NULL,
+ "download annotated tags too", PARSE_OPT_NOARG,
+ parse_opt_include_tag_cb },
+ { OPTION_CALLBACK, 0, "thin", &args, NULL,
+ "minimize number of objects to be sent",
+ PARSE_OPT_NOARG, parse_opt_thin_cb },
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, options, fetch_pack_usage, 0);
+
+ dest = (char *)argv[0];
+ heads = (char **)(argv + 1);
+ nr_heads = argc - 1;
+
if (!dest)
- usage(fetch_pack_usage);
+ usage_with_options(fetch_pack_usage, options);
conn = git_connect(fd, (char *)dest, args.uploadpack,
args.verbose ? CONNECT_VERBOSE : 0);
--
1.5.6.3
^ permalink raw reply related
* Re: HP-UX issues (WAS: Re: [RFC] Git User's Survey 2008)
From: Jakub Narebski @ 2008-07-23 21:38 UTC (permalink / raw)
To: Miklos Vajna; +Cc: Junio C Hamano, git
In-Reply-To: <20080723074747.GA32057@genesis.frugalware.org>
On Wed, 23 July 2008, Miklos Vajna wrote:
> Being more constructive, what a user using HP-UX is supported to do?
>
> 1) Use the patched git from HP.
>
> 2) Have coreutils installed. (But then I think it would be good to list
> this dependency in INSTALL.)
It would be good idea, although "POSIX-compliant shells" implies
coreutils somewhat; shell scripts usually do require some utilities,
like sed, grep, cat, test etc.
> 3) Patch git to use automake's install-sh. (Would such a patch be ever
> accepted?)
I think it would. It would allow us also to uncomment the
AC_PROG_INSTALL line in configure.ac file to find 'install'
automatically (autoconf requires having install.sh or install-sh
fallback in the sources).
The problem is coming up with minimal yet portable (at least as
portable as git itself) fallback install.sh script.
--
Jakub Narebski
Poland
^ permalink raw reply
* Re: [RFC] Git User's Survey 2008
From: Petr Baudis @ 2008-07-23 21:44 UTC (permalink / raw)
To: Jakub Narebski; +Cc: git, Stephan Beyer
In-Reply-To: <200807230325.04184.jnareb@gmail.com>
On Wed, Jul 23, 2008 at 03:25:03AM +0200, Jakub Narebski wrote:
> 18. Which (main) git web interface do you use for your projects?
> (zero or more: multiple choice)
> - gitweb, cgit, wit (Ruby), git-php, viewgit (PHP), other
> + should there be a question about web server (Apache, IIS, ...)
> used to host git web interface?
> 18b.If you selected "other web interface", what it was?
> (free form)
I think many people "just use GitHub", or repo.or.cz, or Gitorious; for
GitHub or Gitorious, there's even no good answer to the question above.
So I would either make a separate question for these or include them in
the list above.
> 19. How do you publish/propagate your changes?
> (zero or more: multiple choice)
> - push, pull request, format-patch + email, bundle, other
I agree about the git-svn mention.
Petr "Pasky" Baudis
^ permalink raw reply
* Re: [PATCH 2/2] sort_in_topological_order(): avoid setting a commit flag
From: Petr Baudis @ 2008-07-23 21:49 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Johannes Schindelin, git
In-Reply-To: <7v7ibdifbp.fsf@gitster.siamese.dyndns.org>
On Tue, Jul 22, 2008 at 06:01:30PM -0700, Junio C Hamano wrote:
> Do people still actively use show-branch as a G/CUI, especially after that
> "log --graph" thing was introduced?
To me, show-branch is just more convenient to use; I can see more easily
which patches are with which branches, which is useful especially for my
new sick-twisted use of feature branches for individual patches, thus
having a lot of interdependencies.
> If that is the case, it might also make sense to stop using the object
> flags but allocate necessary number of bits (not restricted to 25 or so)
> pointed at by commit->util field to remove its limitation.
>
> Hint, hint...
Maybe I will hit it soon... ;-)
--
Petr "Pasky" Baudis
As in certain cults it is possible to kill a process if you know
its true name. -- Ken Thompson and Dennis M. Ritchie
^ permalink raw reply
* Re: [RFC] Git User's Survey 2008
From: Jakub Narebski @ 2008-07-23 21:49 UTC (permalink / raw)
To: Dmitry Potapov; +Cc: git
In-Reply-To: <20080723143810.GR2925@dpotapov.dyndns.org>
On Wed, 23 Jul 2008, Dmitry Potapov wrote:
> On Wed, Jul 23, 2008 at 03:25:03AM +0200, Jakub Narebski wrote:
> >
> > 02. What is your preferred non-programming language?
> > (or) What is the language you want computer communicate with you?
>
> IMHO, the later wording of the question is much better.
First just satisfies demographic curiosity. Second is more question
about internationalization (i18n).
I'm not sure however if it is worth it, and not just simply remove
this question from the survey.
> > 05. How did you hear about Git?
> > (single choice?, in 2007 it was free-form)
> > - Linux kernel news (LKML, LWN, KernelTrap, KernelTraffic,...),
> > news site or magazine, blog entry, some project uses it,
> > presentation or seminar (real life, not on-line), SCM research,
> > IRC, mailing list, other Internet, other off-line, other(*)
>
> I think "friend" would be a reasonable choice here too.
Or: "word of mouth (off-line)". Good catch, thanks.
> > 09. When did you start using git? From which version?
> > - pre 1.0, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5
> > + might be important when checking "what did you find hardest" etc.
> > + perhaps we should ask in addition to this question, or in place
> > of this question (replacing it) what git version one uses; it
> > should be multiple choice, and allow 'master', 'next', 'pu',
> > 'dirty (with own modifications)' versions in addition.
>
> I think: "What version do you use now?" and "How long do you use git?"
> may be more useful here. From which version may give rather confusing
> results because someone may "start" with 1.4 a week ago just because
> that is the version included in Debian Etch and after realizing that
> version 1.4 has serious usability issues upgraded git to 1.5. Besides,
> 1.5 is around for a long time now (as most as long as all previous
> versions), so 1.5 can mean either one month of usage or 18 months...
Good idea (provided that for "How long do you use git?" there is an
answer "Don't remember").
Should "What version do you use now?" be multiple choice (using git
on more than one machine / operating system)? What should be possible
choices for "How long do you use git?"? Perhaps.
10. How long do you use git?
(single choice)
- never/few days/few weeks/month/few months/year/few years/
from beginning/I wrote it(*)
+ (*) just kidding ;-)
--
Jakub Narebski
Poland
^ permalink raw reply
* [PATCH] git-filter-branch.sh: Allow running in bare repositories
From: Petr Baudis @ 2008-07-23 21:55 UTC (permalink / raw)
To: gitster; +Cc: git
In-Reply-To: <7v8wvtjwa8.fsf@gitster.siamese.dyndns.org>
Commit 46eb449c restricted git-filter-branch to non-bare repositories
unnecessarily; git-filter-branch can work on bare repositories just
fine.
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Petr Baudis <pasky@suse.cz>
---
I have my own opinion about the readability-fork ratio in this particular
case, but there's no use arguing about this. ;-)
git-filter-branch.sh | 36 ++++++++++++++++++++----------------
t/t7003-filter-branch.sh | 8 ++++++++
2 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index d04c346..ddf7187 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -97,9 +97,11 @@ USAGE="[--env-filter <command>] [--tree-filter <command>] \
OPTIONS_SPEC=
. git-sh-setup
-git diff-files --quiet &&
- git diff-index --cached --quiet HEAD -- ||
- die "Cannot rewrite branch(es) with a dirty working directory."
+if [ "$(is_bare_repository)" = false ]; then
+ git diff-files --quiet &&
+ git diff-index --cached --quiet HEAD --) ||
+ die "Cannot rewrite branch(es) with a dirty working directory.
+fi
tempdir=.git-rewrite
filter_env=
@@ -434,18 +436,20 @@ rm -rf "$tempdir"
trap - 0
-unset GIT_DIR GIT_WORK_TREE GIT_INDEX_FILE
-test -z "$ORIG_GIT_DIR" || {
- GIT_DIR="$ORIG_GIT_DIR" && export GIT_DIR
-}
-test -z "$ORIG_GIT_WORK_TREE" || {
- GIT_WORK_TREE="$ORIG_GIT_WORK_TREE" &&
- export GIT_WORK_TREE
-}
-test -z "$ORIG_GIT_INDEX_FILE" || {
- GIT_INDEX_FILE="$ORIG_GIT_INDEX_FILE" &&
- export GIT_INDEX_FILE
-}
-git read-tree -u -m HEAD
+if [ "$(is_bare_repository)" = false ]; then
+ unset GIT_DIR GIT_WORK_TREE GIT_INDEX_FILE
+ test -z "$ORIG_GIT_DIR" || {
+ GIT_DIR="$ORIG_GIT_DIR" && export GIT_DIR
+ }
+ test -z "$ORIG_GIT_WORK_TREE" || {
+ GIT_WORK_TREE="$ORIG_GIT_WORK_TREE" &&
+ export GIT_WORK_TREE
+ }
+ test -z "$ORIG_GIT_INDEX_FILE" || {
+ GIT_INDEX_FILE="$ORIG_GIT_INDEX_FILE" &&
+ export GIT_INDEX_FILE
+ }
+ git read-tree -u -m HEAD
+fi
exit $ret
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index e26f726..a0ab096 100755
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -38,6 +38,14 @@ test_expect_success 'result is really identical' '
test $H = $(git rev-parse HEAD)
'
+test_expect_success 'rewrite bare repository identically' '
+ (git config core.bare true && cd .git && git-filter-branch branch)
+'
+git config core.bare false
+test_expect_success 'result is really identical' '
+ test $H = $(git rev-parse HEAD)
+'
+
test_expect_success 'rewrite, renaming a specific file' '
git-filter-branch -f --tree-filter "mv d doh || :" HEAD
'
^ permalink raw reply related
* Re: [PATCH] git-filter-branch.sh: Allow running in bare repositories
From: Johannes Schindelin @ 2008-07-23 21:59 UTC (permalink / raw)
To: Petr Baudis; +Cc: gitster, git
In-Reply-To: <20080723215509.32438.49155.stgit@localhost>
Hi,
On Wed, 23 Jul 2008, Petr Baudis wrote:
> Commit 46eb449c restricted git-filter-branch to non-bare repositories
> unnecessarily; git-filter-branch can work on bare repositories just
> fine.
>
> Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Funny, I did not get Cc:ed.
> -git diff-files --quiet &&
> - git diff-index --cached --quiet HEAD -- ||
> - die "Cannot rewrite branch(es) with a dirty working directory."
> +if [ "$(is_bare_repository)" = false ]; then
> + git diff-files --quiet &&
> + git diff-index --cached --quiet HEAD --) ||
^
I doubt this has ever passed the test suite, let alone run.
Besides, this extra-funny extra indent is quite brutal on my eyes.
Ciao,
Dscho
^ permalink raw reply
* Re: [RFC] Git User's Survey 2008
From: Jakub Narebski @ 2008-07-23 21:59 UTC (permalink / raw)
To: Petr Baudis; +Cc: git
In-Reply-To: <20080723214433.GO32184@machine.or.cz>
On Wed, 23 Jul 2008, Petr Baudis wrote:
> On Wed, Jul 23, 2008 at 03:25:03AM +0200, Jakub Narebski wrote:
> >
> > 18. Which (main) git web interface do you use for your projects?
> > (zero or more: multiple choice)
> > - gitweb, cgit, wit (Ruby), git-php, viewgit (PHP), other
> > + should there be a question about web server (Apache, IIS, ...)
> > used to host git web interface?
> > 18b.If you selected "other web interface", what it was?
> > (free form)
>
> I think many people "just use GitHub", or repo.or.cz, or Gitorious; for
> GitHub or Gitorious, there's even no good answer to the question above.
For Gitorious there is a good answer: Gitorious web interface (which
is OSS, and you can deploy on your own).
> So I would either make a separate question for these or include them in
> the list above.
Fact, I have forgot to add question about which git hosting site one
uses; I have meant to add it in the second version of proposal for
Git User's Survey 2008 questions list.
xx. Which git hosting site do you use for your projects?
(zero or more: multiple choice)
- repo.or.cz, GitHub, Gitorious, kernel.org, freedesktop.org,
Savannah, Assembla, Unfuddle, Alioth, Fedora Hosted, other
+ of course "if other, which"
+ should some other web hosting sites be included as well?
> > 19. How do you publish/propagate your changes?
> > (zero or more: multiple choice)
> > - push, pull request, format-patch + email, bundle, other
>
> I agree about the git-svn mention.
I'll add it, then.
--
Jakub Narebski
Poland
^ permalink raw reply
* Re: [PATCH] Documentation/git-filter-branch: Remove Useless Use of Plumbing
From: Petr Baudis @ 2008-07-23 22:02 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vd4l5jwi4.fsf@gitster.siamese.dyndns.org>
On Tue, Jul 22, 2008 at 05:05:07PM -0700, Junio C Hamano wrote:
> Petr Baudis <pasky@suse.cz> writes:
>
> > The example to remove file using index-filter uses git update-index
> > --remove where git rm --cached works as well.
>
> I am not sure "works as well" is a good enough justification to choose a
> Porcelain command over a plumbing command in this particular context.
> After all, filter-branch is a scripting enviornment, isn't it?
But one of the few that are regularly used even by "mere users", who
would be probably put off unnecessarily by using this mysterious command.
(We might also say that I'm testing Dscho's suggestions, though this
patch was of course provoked by a "huh" of a user I was helping.)
> There also is another subtle difference. "git rm" takes pathspecs while
> "update-index" takes paths.
>
> So after running one of these commands:
>
> $ git rm --cached 'Makefil?'
> $ git update-index --force-remove 'Makefil?'
>
> output from:
>
> $ git diff --cached --stat
>
> would be different.
I don't think this is relevant for the example in question. Users are as
likely to be bit by or take advantage of this as by regular git rm
usage.
--
Petr "Pasky" Baudis
As in certain cults it is possible to kill a process if you know
its true name. -- Ken Thompson and Dennis M. Ritchie
^ permalink raw reply
* Re: [PATCH] git-filter-branch.sh: Allow running in bare repositories
From: Petr Baudis @ 2008-07-23 22:06 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: gitster, git
In-Reply-To: <alpine.DEB.1.00.0807232257500.8986@racer>
Hi,
On Wed, Jul 23, 2008 at 10:59:03PM +0100, Johannes Schindelin wrote:
> On Wed, 23 Jul 2008, Petr Baudis wrote:
>
> > Commit 46eb449c restricted git-filter-branch to non-bare repositories
> > unnecessarily; git-filter-branch can work on bare repositories just
> > fine.
> >
> > Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
>
> Funny, I did not get Cc:ed.
sorry, I have to copy the Cc around manually with StGIT. :/
> > -git diff-files --quiet &&
> > - git diff-index --cached --quiet HEAD -- ||
> > - die "Cannot rewrite branch(es) with a dirty working directory."
> > +if [ "$(is_bare_repository)" = false ]; then
> > + git diff-files --quiet &&
> > + git diff-index --cached --quiet HEAD --) ||
>
> ^
>
> I doubt this has ever passed the test suite, let alone run.
It did... provided that I didn't make after modifying the script.
> Besides, this extra-funny extra indent is quite brutal on my eyes.
I kept the original indentation.
Petr "Pasky" Baudis
^ permalink raw reply
* Re: [PATCH 2/2] sort_in_topological_order(): avoid setting a commit flag
From: Junio C Hamano @ 2008-07-23 22:07 UTC (permalink / raw)
To: Petr Baudis; +Cc: Johannes Schindelin, git
In-Reply-To: <20080723214942.GZ10151@machine.or.cz>
Petr Baudis <pasky@suse.cz> writes:
> On Tue, Jul 22, 2008 at 06:01:30PM -0700, Junio C Hamano wrote:
>> Do people still actively use show-branch as a G/CUI, especially after that
>> "log --graph" thing was introduced?
>
> To me, show-branch is just more convenient to use; I can see more easily
> which patches are with which branches, which is useful especially for my
> new sick-twisted use of feature branches for individual patches, thus
> having a lot of interdependencies.
Heh, I still recall hearing from many people that its output is hard to
decipher and UI is unintuitive. What changed their mind, I have to
wonder...
^ permalink raw reply
* [PATCH 1/2] builtin-branch.c: remove unused code in append_ref() callback function
From: Junio C Hamano @ 2008-07-23 22:09 UTC (permalink / raw)
To: Ingo Molnar; +Cc: SZEDER Gábor, git
In-Reply-To: <7vy73seb2p.fsf@gitster.siamese.dyndns.org>
We let for_each_ref() to feed all refs to append_ref() but we are only
ever interested in local or remote tracking branches.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* I ended up splitting the patch into two, not three as I originally
thought I would.
builtin-branch.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/builtin-branch.c b/builtin-branch.c
index b885bd1..3708a50 100644
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -22,10 +22,8 @@ static const char * const builtin_branch_usage[] = {
NULL
};
-#define REF_UNKNOWN_TYPE 0x00
#define REF_LOCAL_BRANCH 0x01
#define REF_REMOTE_BRANCH 0x02
-#define REF_TAG 0x04
static const char *head;
static unsigned char head_sha1[20];
@@ -215,7 +213,7 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
{
struct ref_list *ref_list = (struct ref_list*)(cb_data);
struct ref_item *newitem;
- int kind = REF_UNKNOWN_TYPE;
+ int kind;
int len;
static struct commit_list branch;
@@ -226,10 +224,8 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
} else if (!prefixcmp(refname, "refs/remotes/")) {
kind = REF_REMOTE_BRANCH;
refname += 13;
- } else if (!prefixcmp(refname, "refs/tags/")) {
- kind = REF_TAG;
- refname += 10;
- }
+ } else
+ return 0;
/* Filter with with_commit if specified */
if (!has_commit(sha1, ref_list->with_commit))
--
1.6.0.rc0.31.g128c7
^ permalink raw reply related
* [PATCHv3] git-filter-branch.sh: Allow running in bare repositories
From: Petr Baudis @ 2008-07-23 22:15 UTC (permalink / raw)
To: gitster; +Cc: Johannes Schindelin, git
In-Reply-To: <20080723220657.GA10151@machine.or.cz>
Commit 46eb449c restricted git-filter-branch to non-bare repositories
unnecessarily; git-filter-branch can work on bare repositories just
fine.
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Petr Baudis <pasky@suse.cz>
---
Sorry for the spam. This time I actually did make git-filter-branch
before running the testsuite.
git-filter-branch.sh | 36 ++++++++++++++++++++----------------
t/t7003-filter-branch.sh | 8 ++++++++
2 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index d04c346..507c50e 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -97,9 +97,11 @@ USAGE="[--env-filter <command>] [--tree-filter <command>] \
OPTIONS_SPEC=
. git-sh-setup
-git diff-files --quiet &&
- git diff-index --cached --quiet HEAD -- ||
- die "Cannot rewrite branch(es) with a dirty working directory."
+if [ "$(is_bare_repository)" = false ]; then
+ git diff-files --quiet &&
+ git diff-index --cached --quiet HEAD -- ||
+ die "Cannot rewrite branch(es) with a dirty working directory."
+fi
tempdir=.git-rewrite
filter_env=
@@ -434,18 +436,20 @@ rm -rf "$tempdir"
trap - 0
-unset GIT_DIR GIT_WORK_TREE GIT_INDEX_FILE
-test -z "$ORIG_GIT_DIR" || {
- GIT_DIR="$ORIG_GIT_DIR" && export GIT_DIR
-}
-test -z "$ORIG_GIT_WORK_TREE" || {
- GIT_WORK_TREE="$ORIG_GIT_WORK_TREE" &&
- export GIT_WORK_TREE
-}
-test -z "$ORIG_GIT_INDEX_FILE" || {
- GIT_INDEX_FILE="$ORIG_GIT_INDEX_FILE" &&
- export GIT_INDEX_FILE
-}
-git read-tree -u -m HEAD
+if [ "$(is_bare_repository)" = false ]; then
+ unset GIT_DIR GIT_WORK_TREE GIT_INDEX_FILE
+ test -z "$ORIG_GIT_DIR" || {
+ GIT_DIR="$ORIG_GIT_DIR" && export GIT_DIR
+ }
+ test -z "$ORIG_GIT_WORK_TREE" || {
+ GIT_WORK_TREE="$ORIG_GIT_WORK_TREE" &&
+ export GIT_WORK_TREE
+ }
+ test -z "$ORIG_GIT_INDEX_FILE" || {
+ GIT_INDEX_FILE="$ORIG_GIT_INDEX_FILE" &&
+ export GIT_INDEX_FILE
+ }
+ git read-tree -u -m HEAD
+fi
exit $ret
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index e26f726..a0ab096 100755
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -38,6 +38,14 @@ test_expect_success 'result is really identical' '
test $H = $(git rev-parse HEAD)
'
+test_expect_success 'rewrite bare repository identically' '
+ (git config core.bare true && cd .git && git-filter-branch branch)
+'
+git config core.bare false
+test_expect_success 'result is really identical' '
+ test $H = $(git rev-parse HEAD)
+'
+
test_expect_success 'rewrite, renaming a specific file' '
git-filter-branch -f --tree-filter "mv d doh || :" HEAD
'
^ permalink raw reply related
* [PATCH] builtin-branch.c: optimize --merged and --no-merged
From: Junio C Hamano @ 2008-07-23 22:15 UTC (permalink / raw)
To: Ingo Molnar; +Cc: SZEDER Gábor, git
In-Reply-To: <7vy73seb2p.fsf@gitster.siamese.dyndns.org>
"git branch --no-merged $commit" used to compute the merge base between
the tip of each and every branch with the named $commit, but this was
wasteful when you have many branches. Inside append_ref() we literally
ran has_commit() between the tip of the branch and the merge_filter_ref.
Instead, we can let the revision machinery traverse the history as if we
are running:
$ git rev-list --branches --not $commit
by queueing the tips of branches we encounter as positive refs (this
mimicks the "--branches" option in the above command line) and then
appending the merge_filter_ref commit as a negative one, and finally
calling prepare_revision_walk() to limit the list..
After the traversal is done, branch tips that are reachable from $commit
are painted UNINTERESTING; they are already fully contained in $commit
(i.e. --merged). Tips that are not painted UNINTERESTING still have
commits that are not reachable from $commit, thus "--no-merged" will show
them.
With an artificial repository that has "master" and 1000 test-$i branches
where they were created by "git branch test-$i master~$i":
(with patch)
$ /usr/bin/time git-branch --no-merged master >/dev/null
0.12user 0.02system 0:00.15elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+1588minor)pagefaults 0swaps
$ /usr/bin/time git-branch --no-merged test-200 >/dev/null
0.15user 0.03system 0:00.18elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+1711minor)pagefaults 0swaps
(without patch)
$ /usr/bin/time git-branch --no-merged master >/dev/null
0.69user 0.03system 0:00.72elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+2229minor)pagefaults 0swaps
$ /usr/bin/time git-branch --no-merged test-200 >/dev/null
0.58user 0.03system 0:00.61elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+2248minor)pagefaults 0swaps
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin-branch.c | 59 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/builtin-branch.c b/builtin-branch.c
index 3708a50..5db8ad8 100644
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -13,6 +13,8 @@
#include "remote.h"
#include "parse-options.h"
#include "branch.h"
+#include "diff.h"
+#include "revision.h"
static const char * const builtin_branch_usage[] = {
"git branch [options] [-r | -a] [--merged | --no-merged]",
@@ -179,25 +181,21 @@ static int delete_branches(int argc, const char **argv, int force, int kinds)
struct ref_item {
char *name;
unsigned int kind;
- unsigned char sha1[20];
+ struct commit *commit;
};
struct ref_list {
+ struct rev_info revs;
int index, alloc, maxwidth;
struct ref_item *list;
struct commit_list *with_commit;
int kinds;
};
-static int has_commit(const unsigned char *sha1, struct commit_list *with_commit)
+static int has_commit(struct commit *commit, struct commit_list *with_commit)
{
- struct commit *commit;
-
if (!with_commit)
return 1;
- commit = lookup_commit_reference_gently(sha1, 1);
- if (!commit)
- return 0;
while (with_commit) {
struct commit *other;
@@ -213,6 +211,7 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
{
struct ref_list *ref_list = (struct ref_list*)(cb_data);
struct ref_item *newitem;
+ struct commit *commit;
int kind;
int len;
static struct commit_list branch;
@@ -227,8 +226,12 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
} else
return 0;
+ commit = lookup_commit_reference_gently(sha1, 1);
+ if (!commit)
+ return error("branch '%s' does not point at a commit", refname);
+
/* Filter with with_commit if specified */
- if (!has_commit(sha1, ref_list->with_commit))
+ if (!has_commit(commit, ref_list->with_commit))
return 0;
/* Don't add types the caller doesn't want */
@@ -239,12 +242,8 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
branch.item = lookup_commit_reference_gently(sha1, 1);
if (!branch.item)
die("Unable to lookup tip of branch %s", refname);
- if (merge_filter == SHOW_NOT_MERGED &&
- has_commit(merge_filter_ref, &branch))
- return 0;
- if (merge_filter == SHOW_MERGED &&
- !has_commit(merge_filter_ref, &branch))
- return 0;
+ add_pending_object(&ref_list->revs,
+ (struct object *)branch.item, refname);
}
/* Resize buffer */
@@ -258,7 +257,7 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
newitem = &(ref_list->list[ref_list->index++]);
newitem->name = xstrdup(refname);
newitem->kind = kind;
- hashcpy(newitem->sha1, sha1);
+ newitem->commit = commit;
len = strlen(newitem->name);
if (len > ref_list->maxwidth)
ref_list->maxwidth = len;
@@ -305,7 +304,13 @@ static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
{
char c;
int color;
- struct commit *commit;
+ struct commit *commit = item->commit;
+
+ if (merge_filter != NO_FILTER) {
+ int is_merged = !!(item->commit->object.flags & UNINTERESTING);
+ if (is_merged != (merge_filter == SHOW_MERGED))
+ return;
+ }
switch (item->kind) {
case REF_LOCAL_BRANCH:
@@ -333,7 +338,7 @@ static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
strbuf_init(&subject, 0);
stat[0] = '\0';
- commit = lookup_commit(item->sha1);
+ commit = item->commit;
if (commit && !parse_commit(commit)) {
pretty_print_commit(CMIT_FMT_ONELINE, commit,
&subject, 0, NULL, NULL, 0, 0);
@@ -346,7 +351,7 @@ static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
printf("%c %s%-*s%s %s %s%s\n", c, branch_get_color(color),
maxwidth, item->name,
branch_get_color(COLOR_BRANCH_RESET),
- find_unique_abbrev(item->sha1, abbrev),
+ find_unique_abbrev(item->commit->object.sha1, abbrev),
stat, sub);
strbuf_release(&subject);
} else {
@@ -359,22 +364,34 @@ static void print_ref_list(int kinds, int detached, int verbose, int abbrev, str
{
int i;
struct ref_list ref_list;
+ struct commit *head_commit = lookup_commit_reference_gently(head_sha1, 1);
memset(&ref_list, 0, sizeof(ref_list));
ref_list.kinds = kinds;
ref_list.with_commit = with_commit;
+ if (merge_filter != NO_FILTER)
+ init_revisions(&ref_list.revs, NULL);
for_each_ref(append_ref, &ref_list);
+ if (merge_filter != NO_FILTER) {
+ struct commit *filter;
+ filter = lookup_commit_reference_gently(merge_filter_ref, 0);
+ filter->object.flags |= UNINTERESTING;
+ add_pending_object(&ref_list.revs,
+ (struct object *) filter, "");
+ ref_list.revs.limited = 1;
+ prepare_revision_walk(&ref_list.revs);
+ }
qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp);
detached = (detached && (kinds & REF_LOCAL_BRANCH));
- if (detached && has_commit(head_sha1, with_commit)) {
+ if (detached && head_commit && has_commit(head_commit, with_commit)) {
struct ref_item item;
item.name = xstrdup("(no branch)");
item.kind = REF_LOCAL_BRANCH;
- hashcpy(item.sha1, head_sha1);
+ item.commit = head_commit;
if (strlen(item.name) > ref_list.maxwidth)
- ref_list.maxwidth = strlen(item.name);
+ ref_list.maxwidth = strlen(item.name);
print_ref_item(&item, ref_list.maxwidth, verbose, abbrev, 1);
free(item.name);
}
--
1.6.0.rc0.31.g128c7
^ permalink raw reply related
* Re: [PATCH] git-filter-branch.sh: Allow running in bare repositories
From: Junio C Hamano @ 2008-07-23 22:29 UTC (permalink / raw)
To: Petr Baudis; +Cc: git
In-Reply-To: <20080723215509.32438.49155.stgit@localhost>
Petr Baudis <pasky@suse.cz> writes:
> Commit 46eb449c restricted git-filter-branch to non-bare repositories
> unnecessarily; git-filter-branch can work on bare repositories just
> fine.
>
> Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
> Signed-off-by: Petr Baudis <pasky@suse.cz>
> ---
>
> I have my own opinion about the readability-fork ratio in this particular
> case, but there's no use arguing about this. ;-)
Grouping commands is perfectly fine when you think the readers may find it
easlier to follow the logic if you grouped them. Use { } for that kind of
grouping; I do not have any problem with that.
Use of subshell ( ) is often done by inexperienced people or by careless
people without thinking. Sometimes you would explicitly want to have a
subshell (e.g. when you want to chdir to do something there but do not
want to affect the main program), and sometimes you don't (e.g. you are
grouping just for precedence, and want assignments and side effects done
inside the group visible by the main program).
Careless uses of ( ) wastes reviewer's time because the code inside has to
be studied to find out if the writer really wanted to have an isolated
separate process that subshell gives, or just being plain careless.
^ permalink raw reply
* Re: [PATCHv3] git-filter-branch.sh: Allow running in bare repositories
From: Junio C Hamano @ 2008-07-23 22:29 UTC (permalink / raw)
To: Petr Baudis; +Cc: Johannes Schindelin, git
In-Reply-To: <20080723221221.12055.8509.stgit@localhost>
Thanks. Applied.
^ permalink raw reply
* Re: [RFC] Git User's Survey 2008
From: Miguel Arroz @ 2008-07-23 22:46 UTC (permalink / raw)
To: Jean-François Veillette; +Cc: Jakub Narebski, Git
In-Reply-To: <169F15EC-1A58-4C2A-84FC-3D14F7B4F1C5@yahoo.ca>
[-- Attachment #1: Type: text/plain, Size: 1615 bytes --]
Hello all,
Jakub, by now you should already have received an invitation to
join the Survs beta.
Information about the beta is included in the email. I don't know
if your project will go beyond the beta period and I cannot comment
about costs right now, but rest assured we'll have very competitive
pricing plans.
We sincerely hope our application proves to be useful to achieve
your goals.
Finally thank you Jean-François for mentioning us, we really
appreciate it.
Regards,
Miguel Arroz
On 2008/07/23, at 16:14, Jean-François Veillette wrote:
> Le 08-07-22 à 21:25, Jakub Narebski a écrit :
>
>>
>> First there is a question about the form of survey. Should we use web
>> based survey, as the survey before (http://www.survey.net.nz),
>> sending
>> emails with link to this survey, or perhaps do email based survey,
>> with email Reply-To: address put for this survey alone? Should we
>> use
>> the same web survey service as before (found by Paolo Ciarrocchi for
>> first, 2006 survey, and used also for 2007 survey), or is there one
>> better (it would better be free, and without limitations on the
>> number
>> of responses; in 2006 there were around 117 responses, in 2007 there
>> were 683 individual responses).
>
> Consider
> http://www.survs.com
> It is still in beta but already years ahead of the proposed solution.
> I don't know about the specific of the beta (cost, availability,
> etc.) but I had a live presentation of the product and it is an
> amazingly great product !
>
> - jfv
>
http://www.survs.com
[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 2417 bytes --]
^ permalink raw reply
* Re: git-svn - failed to clone repository
From: Derek Fawcus @ 2008-07-23 22:59 UTC (permalink / raw)
To: Avery Pennarun; +Cc: SZEDER Gábor, git
In-Reply-To: <32541b130807231249l1028a757i2f29e9ca6e38fc5a@mail.gmail.com>
On Wed, Jul 23, 2008 at 03:49:00PM -0400, Avery Pennarun wrote:
> I believe this was fixed by my patch
> 29c70e0b3e3183f86f93500882177d0c74069988, which was included in git
> 1.5.6.2.
Thanks folks. Building my own 1.5.6.4 allowed the clone to complete.
^ permalink raw reply
* Re: [PATCH 2/2] git-checkout: improve error messages, detect ambiguities.
From: Junio C Hamano @ 2008-07-23 23:04 UTC (permalink / raw)
To: Pierre Habouzit; +Cc: git
In-Reply-To: <1216808133-31919-3-git-send-email-madcoder@debian.org>
Pierre Habouzit <madcoder@debian.org> writes:
> The patch is twofold: it moves the option consistency checks just under
> the parse_options call so that it doesn't get in the way of the tree
> reference vs. pathspecs desambiguation.
I think this goes a bit too far.
Even if you have a file called 'master' tracked in your project, when you
say:
$ git checkout master
that's almost always branch switching. Forcing "git checkout master --"
disambiguation for such a common case is simply a wrong thing to do from
the usability point of view.
So how about (obviously we are interested only in the case without
disambiguating '--' here):
(3-1) if there is only one token left and if it is a rev, that's the
branch to check out or commit to detach to.
(3-2) otherwise the user might have mistyped one of the paths, so help
avoiding by making sure the first token is unambiguously either
a rev or a path (but not both).
^ permalink raw reply
* Re: [PATCH] editor.c: Libify launch_editor()
From: Stephan Beyer @ 2008-07-23 23:09 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git, Junio C Hamano
In-Reply-To: <alpine.DEB.1.00.0807181405510.3932@eeepc-johanness>
Hi,
Johannes Schindelin wrote:
> > This patch removes exit()/die() calls and builtin-specific messages from
> > launch_editor(), so that it can be used as a general libgit.a function
> > to launch an editor.
>
> Thanks. Now we have to convince Junio that it is a good idea :-)
Well, I've seen that *a lot* of lib code (15 functions, see below) is in
the builtins.
Cleaning that up seems to be good to have a real separation between
libgit and builtins, but I guess such a change would not find its way
into 1.6.0, would it?
Regards,
Stephan
PS: I've spontaneously decided to make a list:
defined-in func-name - used in builtin-\1.c
builtin-add.c:
add_files_to_cache() - add, checkout, commit
interactive_add() - add, commit
builtin-archive.c:
parse_pathspec_arg() - archive, uploard-archive
builtin-init-db.c:
init_db() - init-db, clone
builtin-ls-files.c:
overlay_tree_on_cache() - ls-files, commit
report_path_error() - ls-files, checkout, commit
builtin-mailsplit.c:
read_line_with_nul() - mailsplit, mailinfo
builtin-merge-recursive.c:
write_tree_from_memory() - merge-recursive, checkout
builtin-prune-packed.c:
prune_packed_objects() - prune-packed, prune
builtin-shortlog.c:
shortlog_add_commit() - shortlog, log
shortlog_init() - shortlog, log
shortlog_output() - shortlog, log
shortlog_init() - shortlog, log
builtin-stripspace.c:
stripspace() - stripspace, commit, tag
And launch_editor() that is handled by the patch in this thread.
Then there are functions that are non-static, but not declined in
any .h file. A patch that makes them static follows in a separate mail.
--
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox