diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-10-30 12:10:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-30 12:10:06 -0700 |
| commit | 0bfc7c10d865697cc59081a4bc55a3add4958be0 (patch) | |
| tree | d73eda3413bed427be382df53d172de761e0b544 /builtin/read-tree.c | |
| parent | Merge branch 'jc/upload-pack-send-symref' (diff) | |
| parent | block-sha1/sha1.c: have SP around arithmetic operators (diff) | |
| download | tgif-0bfc7c10d865697cc59081a4bc55a3add4958be0.tar.xz | |
Merge branch 'fc/styles'
C coding style fixes.
* fc/styles:
block-sha1/sha1.c: have SP around arithmetic operators
base85.c: have SP around arithmetic operators
archive.c: have SP around arithmetic operators
alloc.c: have SP around arithmetic operators
abspath.c: have SP around arithmetic operators
alias: have SP around arithmetic operators
C: have space around && and || operators
Diffstat (limited to 'builtin/read-tree.c')
| -rw-r--r-- | builtin/read-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/read-tree.c b/builtin/read-tree.c index 0f5d7fe23f..0d7ef847a7 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -178,7 +178,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix) if (1 < opts.index_only + opts.update) die("-u and -i at the same time makes no sense"); - if ((opts.update||opts.index_only) && !opts.merge) + if ((opts.update || opts.index_only) && !opts.merge) die("%s is meaningless without -m, --reset, or --prefix", opts.update ? "-u" : "-i"); if ((opts.dir && !opts.update)) |