development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-07 19:39:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  whitespace: have SP on both sides of an assignment "="
  update-ref: whitespace fix
This commit is contained in:
Junio C Hamano 2011-08-25 16:00:07 -07:00
commit 1952e102b7
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/remote.c
View File

@ -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)");

2
builtin/update-ref.c
View File

@ -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[] = {

2
commit.c
View File

@ -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;

2
http-push.c
View File

@ -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);

2
read-cache.c
View File

@ -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);
}