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 | |
| parent | 9907d1359ccb1e670a408e5ab91d2b6048bd997b (diff) | |
| parent | 6b2dd0e56ba2bd668396afe9e983dddfd1f441ca (diff) | |
| download | git-0bfc7c10d865697cc59081a4bc55a3add4958be0.tar.gz git-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')
| -rw-r--r-- | builtin/read-tree.c | 2 | ||||
| -rw-r--r-- | builtin/rev-list.c | 2 | ||||
| -rw-r--r-- | builtin/symbolic-ref.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/builtin/read-tree.c b/builtin/read-tree.c index 0f5d7fe23..0d7ef847a 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)) diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 4fc161663..0745e2d05 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -322,7 +322,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) revs.commit_format = CMIT_FMT_RAW; if ((!revs.commits && - (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) && + (!(revs.tag_objects || revs.tree_objects || revs.blob_objects) && !revs.pending.nr)) || revs.diff) usage(rev_list_usage); diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c index f48195942..71286b4fa 100644 --- a/builtin/symbolic-ref.c +++ b/builtin/symbolic-ref.c @@ -47,7 +47,7 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix) git_config(git_default_config, NULL); argc = parse_options(argc, argv, prefix, options, git_symbolic_ref_usage, 0); - if (msg &&!*msg) + if (msg && !*msg) die("Refusing to perform update with empty message"); if (delete) { |