Skip to main content

Browse the archive

Revision b91a13bbdca0095b1dc9ffb06bcb5caf4aab56b6 authored by Junio C Hamano on 12 March 2012, 22:43:06 UTC, committed by Junio C Hamano on 12 March 2012, 22:43:15 UTC 
Merge branch 'jc/am-3-nonstandard-popt' into maint
 
The code to synthesize the fake ancestor tree used by 3-way merge
fallback in "git am" was not prepared to read a patch created with
a non-standard -p<num> value.

* jc/am-3-nonstandard-popt:
  test: "am -3" can accept non-standard -p<num>
  am -3: allow nonstandard -p<num> option
2 parent s 0dbe659 + a61ba26
Raw File
send-pack.h 
#ifndef SEND_PACK_H
#define SEND_PACK_H

struct send_pack_args {
	unsigned verbose:1,
		quiet:1,
		porcelain:1,
		progress:1,
		send_mirror:1,
		force_update:1,
		use_thin_pack:1,
		use_ofs_delta:1,
		dry_run:1,
		stateless_rpc:1;
};

int send_pack(struct send_pack_args *args,
	      int fd[], struct child_process *conn,
	      struct ref *remote_refs, struct extra_have_objects *extra_have);

#endif
back to top