undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano 2009-04-05 01:17:08 -07:00
commit 81aa964976
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-pack-refs.txt
View File

@ -26,7 +26,7 @@ problem by stashing the refs in a single file,
traditional `$GIT_DIR/refs` hierarchy, it is looked up in this traditional `$GIT_DIR/refs` hierarchy, it is looked up in this
file and used if found. 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. `$GIT_DIR/refs` hierarchy.
A recommended practice to deal with a repository with too many 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 definition stationary and are not expected to change. Branch
heads will be packed with the initial `pack-refs --all`, but heads will be packed with the initial `pack-refs --all`, but
only the currently active branch heads will become unpacked, 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. unpacked.

3
builtin-commit.c
View File

@ -224,7 +224,8 @@ static char *prepare_index(int argc, const char **argv, const char *prefix)
const char **pathspec = NULL; const char **pathspec = NULL;
if (interactive) { if (interactive) {
interactive_add(argc, argv, prefix); if (interactive_add(argc, argv, prefix) != 0)
die("interactive add failed");
if (read_cache_preload(NULL) < 0) if (read_cache_preload(NULL) < 0)
die("index file corrupt"); die("index file corrupt");
commit_style = COMMIT_AS_IS; commit_style = COMMIT_AS_IS;

2
git-repack.sh
View File

@ -181,5 +181,5 @@ fi
case "$no_update_info" in case "$no_update_info" in
t) : ;; t) : ;;
*) git-update-server-info ;; *) git update-server-info ;;
esac esac

2
git-submodule.sh
View File

@ -5,7 +5,7 @@
# Copyright (c) 2007 Lars Hjemli # Copyright (c) 2007 Lars Hjemli
USAGE="[--quiet] [--cached] \ 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>...]]" [--] [<path>...]|[foreach <command>]|[sync [--] [<path>...]]"
OPTIONS_SPEC= OPTIONS_SPEC=
. git-sh-setup . git-sh-setup