Skip to main content

Browse the archive

Staging
v0.5.1
Revision a6dbf8814f433a7fbfa9cde6333c98019f6db1e4 authored by Junio C Hamano on 13 September 2009, 20:38:48 UTC, committed by Junio C Hamano on 23 September 2009, 05:26:27 UTC 
pull: Clarify "helpful" message for another corner case
 
When the remote branch we asked for merging did not exist in the set of
fetched refs, we unconditionally hinted that it was because of lack of
configuration.  It is not necessarily so, and risks sending users for a
wild goose chase.

Make sure to check if that is indeed the case before telling a wild guess
to the user.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 3ddcb19
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,
		include_tag:1;
};

struct ref *fetch_pack(struct fetch_pack_args *args,
		int fd[], struct child_process *conn,
		const struct ref *ref,
		const char *dest,
		int nr_heads,
		char **heads,
		char **pack_lockfile);

#endif
back to top