diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-05 01:17:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-05 01:17:08 -0700 |
| commit | 81aa96497686bd31c5a9a3cdf110c2e10c799c03 (patch) | |
| tree | 58e9c7e1f74d2d002ca8cc0c59eec8ade805f9f5 | |
| parent | 5dba35912474770d0df45ed801d78c4c9ed5e949 (diff) | |
| parent | 835a3eea3e18695e29b1d4c3adca37d1caaa16ef (diff) | |
| download | git-81aa96497686bd31c5a9a3cdf110c2e10c799c03.tar.gz | |
Merge branch 'maint'
* maint:
git submodule: fix usage line
doc/git-pack-refs: fix two grammar issues
commit: abort commit if interactive add failed
git-repack: use non-dashed update-server-info
| -rw-r--r-- | Documentation/git-pack-refs.txt | 4 | ||||
| -rw-r--r-- | builtin-commit.c | 3 | ||||
| -rwxr-xr-x | git-repack.sh | 2 | ||||
| -rwxr-xr-x | git-submodule.sh | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/git-pack-refs.txt b/Documentation/git-pack-refs.txt index a5244d35f4..1ee99c208c 100644 --- a/Documentation/git-pack-refs.txt +++ b/Documentation/git-pack-refs.txt @@ -26,7 +26,7 @@ problem by stashing the refs in a single file, traditional `$GIT_DIR/refs` hierarchy, it is looked up in this file and used if found. -Subsequent updates to branches always creates new file under +Subsequent updates to branches always create new files under `$GIT_DIR/refs` hierarchy. A recommended practice to deal with a repository with too many @@ -35,7 +35,7 @@ occasionally run `git pack-refs \--prune`. Tags are by definition stationary and are not expected to change. Branch heads will be packed with the initial `pack-refs --all`, but only the currently active branch heads will become unpacked, -and next `pack-refs` (without `--all`) will leave them +and the next `pack-refs` (without `--all`) will leave them unpacked. diff --git a/builtin-commit.c b/builtin-commit.c index 46e649cd7c..81371b1d26 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -224,7 +224,8 @@ static char *prepare_index(int argc, const char **argv, const char *prefix) const char **pathspec = NULL; if (interactive) { - interactive_add(argc, argv, prefix); + if (interactive_add(argc, argv, prefix) != 0) + die("interactive add failed"); if (read_cache_preload(NULL) < 0) die("index file corrupt"); commit_style = COMMIT_AS_IS; diff --git a/git-repack.sh b/git-repack.sh index 1782a23b26..0868734723 100755 --- a/git-repack.sh +++ b/git-repack.sh @@ -181,5 +181,5 @@ fi case "$no_update_info" in t) : ;; -*) git-update-server-info ;; +*) git update-server-info ;; esac diff --git a/git-submodule.sh b/git-submodule.sh index 0a27232b90..7c2e060ae7 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -5,7 +5,7 @@ # Copyright (c) 2007 Lars Hjemli USAGE="[--quiet] [--cached] \ -[add <repo> [-b branch] <path>]|[status|init|update [-i|--init] [-N|--no-fetch]|summary [-n|--summary-limit <n>] [<commit>]] \ +[add [-b branch] <repo> <path>]|[status|init|update [-i|--init] [-N|--no-fetch]|summary [-n|--summary-limit <n>] [<commit>]] \ [--] [<path>...]|[foreach <command>]|[sync [--] [<path>...]]" OPTIONS_SPEC= . git-sh-setup |