diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-25 16:00:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-25 16:00:07 -0700 |
| commit | 1952e102b702b977d6bdfcee7cb48b843cb92049 (patch) | |
| tree | 33dc912c82c724e819bbf735acd9ef362ed68dfc | |
| parent | b7fcd007153b5021ed70ddc0a224127f14601bbc (diff) | |
| parent | cd2b8ae983a277fb3f3c2b2c6747b0a075af1421 (diff) | |
| download | git-1952e102b702b977d6bdfcee7cb48b843cb92049.tar.gz git-1952e102b702b977d6bdfcee7cb48b843cb92049.tar.xz | |
Merge branch 'maint'
* maint:
whitespace: have SP on both sides of an assignment "="
update-ref: whitespace fix
| -rw-r--r-- | builtin/remote.c | 2 | ||||
| -rw-r--r-- | builtin/update-ref.c | 2 | ||||
| -rw-r--r-- | commit.c | 2 | ||||
| -rw-r--r-- | http-push.c | 2 | ||||
| -rw-r--r-- | read-cache.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/builtin/remote.c b/builtin/remote.c index 05b1f5b76..f2a9c26dc 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -1103,7 +1103,7 @@ static int show(int argc, const char **argv) url = states.remote->url; url_nr = states.remote->url_nr; } - for (i=0; i < url_nr; i++) + for (i = 0; i < url_nr; i++) printf(" Push URL: %s\n", url[i]); if (!i) printf(" Push URL: %s\n", "(no URL)"); diff --git a/builtin/update-ref.c b/builtin/update-ref.c index 76ba1d588..835c62ab1 100644 --- a/builtin/update-ref.c +++ b/builtin/update-ref.c @@ -11,7 +11,7 @@ static const char * const git_update_ref_usage[] = { int cmd_update_ref(int argc, const char **argv, const char *prefix) { - const char *refname, *oldval, *msg=NULL; + const char *refname, *oldval, *msg = NULL; unsigned char sha1[20], oldsha1[20]; int delete = 0, no_deref = 0, flags = 0; struct option options[] = { @@ -515,7 +515,7 @@ void sort_in_topological_order(struct commit_list ** list, int lifo) commit = work_item->item; for (parents = commit->parents; parents ; parents = parents->next) { - struct commit *parent=parents->item; + struct commit *parent = parents->item; if (!parent->indegree) continue; diff --git a/http-push.c b/http-push.c index 6e8f6d09a..376331a76 100644 --- a/http-push.c +++ b/http-push.c @@ -1655,7 +1655,7 @@ static int delete_remote_branch(const char *pattern, int force) return error("Remote HEAD is not a symref"); /* Remote branch must not be the remote HEAD */ - for (i=0; symref && i<MAXDEPTH; i++) { + for (i = 0; symref && i < MAXDEPTH; i++) { if (!strcmp(remote_ref->name, symref)) return error("Remote branch %s is the current HEAD", remote_ref->name); diff --git a/read-cache.c b/read-cache.c index 46a9e6070..01a0e2505 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1084,7 +1084,7 @@ static void show_file(const char * fmt, const char * name, int in_porcelain, { if (in_porcelain && *first && header_msg) { printf("%s\n", header_msg); - *first=0; + *first = 0; } printf(fmt, name); } |