diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-28 19:56:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-30 17:59:19 -0800 |
| commit | 331fcb598ec0127fd89c992361bc573dcd3a4a63 (patch) | |
| tree | a6ef30a49739d914475a5c4bba38d98d2b8a6cae /builtin-write-tree.c | |
| parent | 388b2acd6e649145d4368a10cf4df5f5bbbac2c2 (diff) | |
| download | git-331fcb598ec0127fd89c992361bc573dcd3a4a63.tar.gz git-331fcb598ec0127fd89c992361bc573dcd3a4a63.tar.xz | |
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-write-tree.c')
| -rw-r--r-- | builtin-write-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-write-tree.c b/builtin-write-tree.c index 52a3c015f..9d640508d 100644 --- a/builtin-write-tree.c +++ b/builtin-write-tree.c @@ -42,7 +42,7 @@ int cmd_write_tree(int argc, const char **argv, const char *unused_prefix) die("%s: error reading the index", me); break; case WRITE_TREE_UNMERGED_INDEX: - die("%s: error building trees; the index is unmerged?", me); + die("%s: error building trees", me); break; case WRITE_TREE_PREFIX_ERROR: die("%s: prefix %s not found", me, prefix); |