Merge branch 'maint'

* maint:
whitespace: have SP on both sides of an assignment "="
update-ref: whitespace fix

diff --git a/builtin/remote.c b/builtin/remote.c
index 05b1f5b76de36b19ef4bebba32aff1b40cbc2030..f2a9c26dc3494c0881ca3f91b44785c4b52caae7 100644 (file)
--- 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 76ba1d5881b3cddc527bd363dec340c83dde605f..835c62ab15c742af2f75e7bf66e35501701ed15a 100644 (file)
--- 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[] = {

diff --git a/commit.c b/commit.c
index ac337c7d7dc1724fa918f9340816d3102edb10bd..913dbabd1c12772d574f5814f73a12ed6bd4a9da 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -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 6e8f6d09abb6397f1782fa32d9d273fc4fc740fe..376331a76fcde24e6828eba0b88fec26d93fe56f 100644 (file)
--- 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 46a9e60708ad98db5299f9242db05de5915a0ebb..01a0e2505121f10544ee03948e545d07c24f366e 100644 (file)
--- 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);
 }