Merge branch 'maint'

gitster · gitster · commit 6e4ece61ff9c · 2009-09-20T12:13:47.000-07:00
* maint:
  push: Correctly initialize nonfastforward in transport_push.
diff --git a/transport.c b/transport.c
@@ -869,8 +869,9 @@ int transport_set_option(struct transport *transport,
 
 int transport_push(struct transport *transport,
 		   int refspec_nr, const char **refspec, int flags,
-		   int * nonfastforward)
+		   int *nonfastforward)
 {
+	*nonfastforward = 0;
 	verify_remote_names(refspec_nr, refspec);
 
 	if (transport->push)

Original file line number	Diff line number	Diff line change
`@@ -869,8 +869,9 @@ int transport_set_option(struct transport *transport,`
`869`	`869`
`870`	`870`	`int transport_push(struct transport *transport,`
`871`	`871`	`int refspec_nr, const char **refspec, int flags,`
`872`		`- int * nonfastforward)`
	`872`	`+ int *nonfastforward)`
`873`	`873`	`{`
	`874`	`+ *nonfastforward = 0;`
`874`	`875`	`verify_remote_names(refspec_nr, refspec);`
`875`	`876`
`876`	`877`	`if (transport->push)`