Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  whitespace: have SP on both sides of an assignment "="
  update-ref: whitespace fix
  • Loading branch information
Junio C Hamano committed Aug 25, 2011
2 parents b7fcd00 + cd2b8ae commit 1952e10
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion builtin/remote.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)");
Expand Down
2 changes: 1 addition & 1 deletion builtin/update-ref.c
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = {
Expand Down
2 changes: 1 addition & 1 deletion commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion http-push.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion read-cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 1952e10

Please sign in to comment.