H0llyW00dzZ/git
H0llyW00dzZ/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-03-25 03:50:37 +00:00
Code Releases Activity

Merge branch 'maint-1.6.0' into maint-1.6.1

Browse Source 
* maint-1.6.0:
  commit: abort commit if interactive add failed
  git-repack: use non-dashed update-server-info

Conflicts:
	builtin-commit.c
This commit is contained in:
Junio C Hamano 2009-04-05 01:04:38 -07:00
commit acb0b7b01f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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;
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;

2
git-repack.sh
View File

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