Skip to content

Commit 1952e10

Browse files
committed
Merge branch 'maint'
* maint: whitespace: have SP on both sides of an assignment "=" update-ref: whitespace fix
2 parents b7fcd00 + cd2b8ae commit 1952e10

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

builtin/remote.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,7 @@ static int show(int argc, const char **argv)
11031103
url = states.remote->url;
11041104
url_nr = states.remote->url_nr;
11051105
}
1106-
for (i=0; i < url_nr; i++)
1106+
for (i = 0; i < url_nr; i++)
11071107
printf(" Push URL: %s\n", url[i]);
11081108
if (!i)
11091109
printf(" Push URL: %s\n", "(no URL)");

builtin/update-ref.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ static const char * const git_update_ref_usage[] = {
1111

1212
int cmd_update_ref(int argc, const char **argv, const char *prefix)
1313
{
14-
const char *refname, *oldval, *msg=NULL;
14+
const char *refname, *oldval, *msg = NULL;
1515
unsigned char sha1[20], oldsha1[20];
1616
int delete = 0, no_deref = 0, flags = 0;
1717
struct option options[] = {

commit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ void sort_in_topological_order(struct commit_list ** list, int lifo)
515515

516516
commit = work_item->item;
517517
for (parents = commit->parents; parents ; parents = parents->next) {
518-
struct commit *parent=parents->item;
518+
struct commit *parent = parents->item;
519519

520520
if (!parent->indegree)
521521
continue;

http-push.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1655,7 +1655,7 @@ static int delete_remote_branch(const char *pattern, int force)
16551655
return error("Remote HEAD is not a symref");
16561656

16571657
/* Remote branch must not be the remote HEAD */
1658-
for (i=0; symref && i<MAXDEPTH; i++) {
1658+
for (i = 0; symref && i < MAXDEPTH; i++) {
16591659
if (!strcmp(remote_ref->name, symref))
16601660
return error("Remote branch %s is the current HEAD",
16611661
remote_ref->name);

read-cache.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1084,7 +1084,7 @@ static void show_file(const char * fmt, const char * name, int in_porcelain,
10841084
{
10851085
if (in_porcelain && *first && header_msg) {
10861086
printf("%s\n", header_msg);
1087-
*first=0;
1087+
*first = 0;
10881088
}
10891089
printf(fmt, name);
10901090
}

0 commit comments

Comments
 (0)