Skip to main content

Browse the archive

Staging
v0.8.1
Revision c36c5b845e1958bad1b69ee42e3da926de4f948b authored by Marc-Andre Lureau on 12 March 2008, 19:54:21 UTC, committed by Junio C Hamano on 13 March 2008, 04:03:39 UTC 
git-cvsimport: fix merging with remote parent branch
 
commit-tree fails when specifying a remote name (via -r option) and
one of the parent branch has a name. Prefixing with "$remote/" fix it.

Signed-off-by: Marc-Andre Lureau <marcandre.lureau@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 7863c61
Raw File
fetch-pack.h 
#ifndef FETCH_PACK_H
#define FETCH_PACK_H

struct fetch_pack_args
{
	const char *uploadpack;
	int unpacklimit;
	int depth;
	unsigned quiet:1,
		keep_pack:1,
		lock_pack:1,
		use_thin_pack:1,
		fetch_all:1,
		verbose:1,
		no_progress:1;
};

struct ref *fetch_pack(struct fetch_pack_args *args,
		const char *dest,
		int nr_heads,
		char **heads,
		char **pack_lockfile);

#endif
back to top