From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 5 Apr 2009 08:04:38 +0000 (-0700)
Subject: Merge branch 'maint-1.6.0' into maint-1.6.1
X-Git-Tag: v1.6.2.3~1^2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=acb0b7b01f64cf55d508b469eb2a351359c0cd82;p=git.git

Merge branch 'maint-1.6.0' into maint-1.6.1

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

Conflicts:
	builtin-commit.c
---

acb0b7b01f64cf55d508b469eb2a351359c0cd82
diff --cc builtin-commit.c
index 2f0b00a17,fde7b891d..72dd0b955
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@@ -224,8 -224,9 +224,9 @@@ static char *prepare_index(int argc, co
  	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() < 0)
 +		if (read_cache_preload(NULL) < 0)
  			die("index file corrupt");
  		commit_style = COMMIT_AS_IS;
  		return get_index_file();