X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-add.c;h=3d8b8b4f89514e0a8f7af1c2c7dc2f8ae372129e;hb=refs%2Ftags%2Fv1.5.3.2;hp=b08e68831a3d3b5ff91e679b4e1862bf65f22bff;hpb=67c10b422c179b9ce2e4537f7c2a1e7d50649cd4;p=git.git

diff --git a/builtin-add.c b/builtin-add.c
index b08e68831..3d8b8b4f8 100644
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -95,9 +95,10 @@ static void update_callback(struct diff_queue_struct *q,
 		const char *path = p->one->path;
 		switch (p->status) {
 		default:
-			die("unexpacted diff status %c", p->status);
+			die("unexpected diff status %c", p->status);
 		case DIFF_STATUS_UNMERGED:
 		case DIFF_STATUS_MODIFIED:
+		case DIFF_STATUS_TYPE_CHANGED:
 			add_file_to_cache(path, verbose);
 			break;
 		case DIFF_STATUS_DELETED:
@@ -155,7 +156,7 @@ static int git_add_config(const char *var, const char *value)
 
 static struct lock_file lock_file;
 
-static const char ignore_warning[] =
+static const char ignore_error[] =
 "The following paths are ignored by one of your .gitignore files:\n";
 
 int cmd_add(int argc, const char **argv, const char *prefix)
@@ -250,12 +251,12 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 		die("index file corrupt");
 
 	if (dir.ignored_nr) {
-		fprintf(stderr, ignore_warning);
+		fprintf(stderr, ignore_error);
 		for (i = 0; i < dir.ignored_nr; i++) {
 			fprintf(stderr, "%s\n", dir.ignored[i]->name);
 		}
 		fprintf(stderr, "Use -f if you really want to add them.\n");
-		exit(1);
+		die("no files added");
 	}
 
 	for (i = 0; i < dir.nr; i++)