diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-29 03:56:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-01 01:59:19 (GMT) |
| commit | 331fcb598ec0127fd89c992361bc573dcd3a4a63 (patch) | |
| tree | a6ef30a49739d914475a5c4bba38d98d2b8a6cae /builtin-commit.c | |
| parent | 388b2acd6e649145d4368a10cf4df5f5bbbac2c2 (diff) | |
| download | git-331fcb598ec0127fd89c992361bc573dcd3a4a63.zip git-331fcb598ec0127fd89c992361bc573dcd3a4a63.tar.gz git-331fcb598ec0127fd89c992361bc573dcd3a4a63.tar.bz2 | |
git add --intent-to-add: do not let an empty blob be committed by accident
Writing a tree out of an index with an "intent to add" entry is blocked.
This implies that you cannot "git commit" from such a state; however you
can still do "git commit -a" or "git commit $that_path".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-commit.c')
| -rw-r--r-- | builtin-commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index 1677e6b..2b499fa 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -639,7 +639,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix) active_cache_tree = cache_tree(); if (cache_tree_update(active_cache_tree, active_cache, active_nr, 0, 0) < 0) { - error("Error building trees; the index is unmerged?"); + error("Error building trees"); return 0; } |