From f877fd825e97a5e851b655e6fde5e796f53fc03e Mon Sep 17 00:00:00 2001 From: Pang Yan Han Date: Thu, 25 Aug 2011 23:40:50 +0800 Subject: [PATCH 1/2] update-ref: whitespace fix Signed-off-by: Pang Yan Han Signed-off-by: Junio C Hamano --- builtin/update-ref.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/update-ref.c b/builtin/update-ref.c index 76ba1d5881..835c62ab15 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[] = { From cd2b8ae983a277fb3f3c2b2c6747b0a075af1421 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 25 Aug 2011 14:46:52 -0700 Subject: [PATCH 2/2] whitespace: have SP on both sides of an assignment "=" I've deliberately excluded the borrowed code in compat/nedmalloc directory. Signed-off-by: Junio C Hamano --- builtin/remote.c | 2 +- commit.c | 2 +- http-push.c | 2 +- read-cache.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index 9ff1cac69b..1fb441c964 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -1113,7 +1113,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/commit.c b/commit.c index ac337c7d7d..913dbabd1c 100644 --- 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 6e8f6d09ab..376331a76f 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 && iname, symref)) return error("Remote branch %s is the current HEAD", remote_ref->name); diff --git a/read-cache.c b/read-cache.c index 4ac9a037f4..0a641034ce 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1087,7 +1087,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); }