[thirdparty/git.git] / builtin-branch.c

/*
 * Builtin "git branch"
 *
 * Copyright (c) 2006 Kristian Høgsberg <krh@redhat.com>
 * Based on git-branch.sh by Junio C Hamano.
 */

#include "cache.h"
#include "color.h"
#include "refs.h"
#include "commit.h"
#include "builtin.h"
#include "remote.h"
#include "parse-options.h"
#include "branch.h"

static const char * const builtin_branch_usage[] = {
	"git-branch [options] [-r | -a]",
	"git-branch [options] [-l] [-f] <branchname> [<start-point>]",
	"git-branch [options] [-r] (-d | -D) <branchname>",
	"git-branch [options] (-m | -M) [<oldbranch>] <newbranch>",
	NULL
};

#define REF_UNKNOWN_TYPE    0x00
#define REF_LOCAL_BRANCH    0x01
#define REF_REMOTE_BRANCH   0x02
#define REF_TAG             0x04

static const char *head;
static unsigned char head_sha1[20];

static int branch_track = 1;

static int branch_use_color;
static char branch_colors[][COLOR_MAXLEN] = {
	"\033[m",	/* reset */
	"",		/* PLAIN (normal) */
	"\033[31m",	/* REMOTE (red) */
	"",		/* LOCAL (normal) */
	"\033[32m",	/* CURRENT (green) */
};
enum color_branch {
	COLOR_BRANCH_RESET = 0,
	COLOR_BRANCH_PLAIN = 1,
	COLOR_BRANCH_REMOTE = 2,
	COLOR_BRANCH_LOCAL = 3,
	COLOR_BRANCH_CURRENT = 4,
};

static int parse_branch_color_slot(const char *var, int ofs)
{
	if (!strcasecmp(var+ofs, "plain"))
		return COLOR_BRANCH_PLAIN;
	if (!strcasecmp(var+ofs, "reset"))
		return COLOR_BRANCH_RESET;
	if (!strcasecmp(var+ofs, "remote"))
		return COLOR_BRANCH_REMOTE;
	if (!strcasecmp(var+ofs, "local"))
		return COLOR_BRANCH_LOCAL;
	if (!strcasecmp(var+ofs, "current"))
		return COLOR_BRANCH_CURRENT;
	die("bad config variable '%s'", var);
}

static int git_branch_config(const char *var, const char *value)
{
	if (!strcmp(var, "color.branch")) {
		branch_use_color = git_config_colorbool(var, value, -1);
		return 0;
	}
	if (!prefixcmp(var, "color.branch.")) {
		int slot = parse_branch_color_slot(var, 13);
		color_parse(value, var, branch_colors[slot]);
		return 0;
	}
	if (!strcmp(var, "branch.autosetupmerge"))
			branch_track = git_config_bool(var, value);

	return git_default_config(var, value);
}

static const char *branch_get_color(enum color_branch ix)
{
	if (branch_use_color)
		return branch_colors[ix];
	return "";
}

static int delete_branches(int argc, const char **argv, int force, int kinds)
{
	struct commit *rev, *head_rev = head_rev;
	unsigned char sha1[20];
	char *name = NULL;
	const char *fmt, *remote;
	char section[PATH_MAX];
	int i;
	int ret = 0;

	switch (kinds) {
	case REF_REMOTE_BRANCH:
		fmt = "refs/remotes/%s";
		remote = "remote ";
		force = 1;
		break;
	case REF_LOCAL_BRANCH:
		fmt = "refs/heads/%s";
		remote = "";
		break;
	default:
		die("cannot use -a with -d");
	}

	if (!force) {
		head_rev = lookup_commit_reference(head_sha1);
		if (!head_rev)
			die("Couldn't look up commit object for HEAD");
	}
	for (i = 0; i < argc; i++) {
		if (kinds == REF_LOCAL_BRANCH && !strcmp(head, argv[i])) {
			error("Cannot delete the branch '%s' "
				"which you are currently on.", argv[i]);
			ret = 1;
			continue;
		}

		if (name)
			free(name);

		name = xstrdup(mkpath(fmt, argv[i]));
		if (!resolve_ref(name, sha1, 1, NULL)) {
			error("%sbranch '%s' not found.",
					remote, argv[i]);
			ret = 1;
			continue;
		}

		rev = lookup_commit_reference(sha1);
		if (!rev) {
			error("Couldn't look up commit object for '%s'", name);
			ret = 1;
			continue;
		}

		/* This checks whether the merge bases of branch and
		 * HEAD contains branch -- which means that the HEAD
		 * contains everything in both.
		 */

		if (!force &&
		    !in_merge_bases(rev, &head_rev, 1)) {
			error("The branch '%s' is not an ancestor of "
				"your current HEAD.\n"
				"If you are sure you want to delete it, "
				"run 'git branch -D %s'.", argv[i], argv[i]);
			ret = 1;
			continue;
		}

		if (delete_ref(name, sha1)) {
			error("Error deleting %sbranch '%s'", remote,
			       argv[i]);
			ret = 1;
		} else {
			printf("Deleted %sbranch %s.\n", remote, argv[i]);
			snprintf(section, sizeof(section), "branch.%s",
				 argv[i]);
			if (git_config_rename_section(section, NULL) < 0)
				warning("Update of config-file failed");
		}
	}

	if (name)
		free(name);

	return(ret);
}

struct ref_item {
	char *name;
	unsigned int kind;
	unsigned char sha1[20];
};

struct ref_list {
	int index, alloc, maxwidth;
	struct ref_item *list;
	struct commit_list *with_commit;
	int kinds;
};

static int has_commit(const unsigned char *sha1, struct commit_list *with_commit)
{
	struct commit *commit;

	if (!with_commit)
		return 1;
	commit = lookup_commit_reference_gently(sha1, 1);
	if (!commit)
		return 0;
	while (with_commit) {
		struct commit *other;

		other = with_commit->item;
		with_commit = with_commit->next;
		if (in_merge_bases(other, &commit, 1))
			return 1;
	}
	return 0;
}

static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
{
	struct ref_list *ref_list = (struct ref_list*)(cb_data);
	struct ref_item *newitem;
	int kind = REF_UNKNOWN_TYPE;
	int len;

	/* Detect kind */
	if (!prefixcmp(refname, "refs/heads/")) {
		kind = REF_LOCAL_BRANCH;
		refname += 11;
	} else if (!prefixcmp(refname, "refs/remotes/")) {
		kind = REF_REMOTE_BRANCH;
		refname += 13;
	} else if (!prefixcmp(refname, "refs/tags/")) {
		kind = REF_TAG;
		refname += 10;
	}

	/* Filter with with_commit if specified */
	if (!has_commit(sha1, ref_list->with_commit))
		return 0;

	/* Don't add types the caller doesn't want */
	if ((kind & ref_list->kinds) == 0)
		return 0;

	/* Resize buffer */
	if (ref_list->index >= ref_list->alloc) {
		ref_list->alloc = alloc_nr(ref_list->alloc);
		ref_list->list = xrealloc(ref_list->list,
				ref_list->alloc * sizeof(struct ref_item));
	}

	/* Record the new item */
	newitem = &(ref_list->list[ref_list->index++]);
	newitem->name = xstrdup(refname);
	newitem->kind = kind;
	hashcpy(newitem->sha1, sha1);
	len = strlen(newitem->name);
	if (len > ref_list->maxwidth)
		ref_list->maxwidth = len;

	return 0;
}

static void free_ref_list(struct ref_list *ref_list)
{
	int i;

	for (i = 0; i < ref_list->index; i++)
		free(ref_list->list[i].name);
	free(ref_list->list);
}

static int ref_cmp(const void *r1, const void *r2)
{
	struct ref_item *c1 = (struct ref_item *)(r1);
	struct ref_item *c2 = (struct ref_item *)(r2);

	if (c1->kind != c2->kind)
		return c1->kind - c2->kind;
	return strcmp(c1->name, c2->name);
}

static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
			   int abbrev, int current)
{
	char c;
	int color;
	struct commit *commit;

	switch (item->kind) {
	case REF_LOCAL_BRANCH:
		color = COLOR_BRANCH_LOCAL;
		break;
	case REF_REMOTE_BRANCH:
		color = COLOR_BRANCH_REMOTE;
		break;
	default:
		color = COLOR_BRANCH_PLAIN;
		break;
	}

	c = ' ';
	if (current) {
		c = '*';
		color = COLOR_BRANCH_CURRENT;
	}

	if (verbose) {
		struct strbuf subject;
		const char *sub = " **** invalid ref ****";

		strbuf_init(&subject, 0);

		commit = lookup_commit(item->sha1);
		if (commit && !parse_commit(commit)) {
			pretty_print_commit(CMIT_FMT_ONELINE, commit,
					    &subject, 0, NULL, NULL, 0, 0);
			sub = subject.buf;
		}
		printf("%c %s%-*s%s %s %s\n", c, branch_get_color(color),
		       maxwidth, item->name,
		       branch_get_color(COLOR_BRANCH_RESET),
		       find_unique_abbrev(item->sha1, abbrev), sub);
		strbuf_release(&subject);
	} else {
		printf("%c %s%s%s\n", c, branch_get_color(color), item->name,
		       branch_get_color(COLOR_BRANCH_RESET));
	}
}

static void print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit)
{
	int i;
	struct ref_list ref_list;

	memset(&ref_list, 0, sizeof(ref_list));
	ref_list.kinds = kinds;
	ref_list.with_commit = with_commit;
	for_each_ref(append_ref, &ref_list);

	qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp);

	detached = (detached && (kinds & REF_LOCAL_BRANCH));
	if (detached && has_commit(head_sha1, with_commit)) {
		struct ref_item item;
		item.name = xstrdup("(no branch)");
		item.kind = REF_LOCAL_BRANCH;
		hashcpy(item.sha1, head_sha1);
		if (strlen(item.name) > ref_list.maxwidth)
			      ref_list.maxwidth = strlen(item.name);
		print_ref_item(&item, ref_list.maxwidth, verbose, abbrev, 1);
		free(item.name);
	}

	for (i = 0; i < ref_list.index; i++) {
		int current = !detached &&
			(ref_list.list[i].kind == REF_LOCAL_BRANCH) &&
			!strcmp(ref_list.list[i].name, head);
		print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose,
			       abbrev, current);
	}

	free_ref_list(&ref_list);
}

static void rename_branch(const char *oldname, const char *newname, int force)
{
	char oldref[PATH_MAX], newref[PATH_MAX], logmsg[PATH_MAX*2 + 100];
	unsigned char sha1[20];
	char oldsection[PATH_MAX], newsection[PATH_MAX];

	if (!oldname)
		die("cannot rename the current branch while not on any.");

	if (snprintf(oldref, sizeof(oldref), "refs/heads/%s", oldname) > sizeof(oldref))
		die("Old branchname too long");

	if (check_ref_format(oldref))
		die("Invalid branch name: %s", oldref);

	if (snprintf(newref, sizeof(newref), "refs/heads/%s", newname) > sizeof(newref))
		die("New branchname too long");

	if (check_ref_format(newref))
		die("Invalid branch name: %s", newref);

	if (resolve_ref(newref, sha1, 1, NULL) && !force)
		die("A branch named '%s' already exists.", newname);

	snprintf(logmsg, sizeof(logmsg), "Branch: renamed %s to %s",
		 oldref, newref);

	if (rename_ref(oldref, newref, logmsg))
		die("Branch rename failed");

	/* no need to pass logmsg here as HEAD didn't really move */
	if (!strcmp(oldname, head) && create_symref("HEAD", newref, NULL))
		die("Branch renamed to %s, but HEAD is not updated!", newname);

	snprintf(oldsection, sizeof(oldsection), "branch.%s", oldref + 11);
	snprintf(newsection, sizeof(newsection), "branch.%s", newref + 11);
	if (git_config_rename_section(oldsection, newsection) < 0)
		die("Branch is renamed, but update of config-file failed");
}

static int opt_parse_with_commit(const struct option *opt, const char *arg, int unset)
{
	unsigned char sha1[20];
	struct commit *commit;

	if (!arg)
		return -1;
	if (get_sha1(arg, sha1))
		die("malformed object name %s", arg);
	commit = lookup_commit_reference(sha1);
	if (!commit)
		die("no such commit %s", arg);
	commit_list_insert(commit, opt->value);
	return 0;
}

int cmd_branch(int argc, const char **argv, const char *prefix)
{
	int delete = 0, rename = 0, force_create = 0;
	int verbose = 0, abbrev = DEFAULT_ABBREV, detached = 0;
	int reflog = 0, track;
	int kinds = REF_LOCAL_BRANCH;
	struct commit_list *with_commit = NULL;

	struct option options[] = {
		OPT_GROUP("Generic options"),
		OPT__VERBOSE(&verbose),
		OPT_BOOLEAN( 0 , "track",  &track, "set up tracking mode (see git-pull(1))"),
		OPT_BOOLEAN( 0 , "color",  &branch_use_color, "use colored output"),
		OPT_SET_INT('r', NULL,     &kinds, "act on remote-tracking branches",
			REF_REMOTE_BRANCH),
		OPT_CALLBACK(0, "contains", &with_commit, "commit",
			     "print only branches that contain the commit",
			     opt_parse_with_commit),
		{
			OPTION_CALLBACK, 0, "with", &with_commit, "commit",
			"print only branches that contain the commit",
			PARSE_OPT_HIDDEN, opt_parse_with_commit,
		},
		OPT__ABBREV(&abbrev),

		OPT_GROUP("Specific git-branch actions:"),
		OPT_SET_INT('a', NULL, &kinds, "list both remote-tracking and local branches",
			REF_REMOTE_BRANCH | REF_LOCAL_BRANCH),
		OPT_BIT('d', NULL, &delete, "delete fully merged branch", 1),
		OPT_BIT('D', NULL, &delete, "delete branch (even if not merged)", 2),
		OPT_BIT('m', NULL, &rename, "move/rename a branch and its reflog", 1),
		OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2),
		OPT_BOOLEAN('l', NULL, &reflog, "create the branch's reflog"),
		OPT_BOOLEAN('f', NULL, &force_create, "force creation (when already exists)"),
		OPT_END(),
	};

	git_config(git_branch_config);
	track = branch_track;
	argc = parse_options(argc, argv, options, builtin_branch_usage, 0);
	if (!!delete + !!rename + !!force_create > 1)
		usage_with_options(builtin_branch_usage, options);

	head = resolve_ref("HEAD", head_sha1, 0, NULL);
	if (!head)
		die("Failed to resolve HEAD as a valid ref.");
	head = xstrdup(head);
	if (!strcmp(head, "HEAD")) {
		detached = 1;
	} else {
		if (prefixcmp(head, "refs/heads/"))
			die("HEAD not found below refs/heads!");
		head += 11;
	}

	if (delete)
		return delete_branches(argc, argv, delete > 1, kinds);
	else if (argc == 0)
		print_ref_list(kinds, detached, verbose, abbrev, with_commit);
	else if (rename && (argc == 1))
		rename_branch(head, argv[0], rename > 1);
	else if (rename && (argc == 2))
		rename_branch(argv[0], argv[1], rename > 1);
	else if (argc <= 2)
		create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
			      force_create, reflog, track);
	else
		usage_with_options(builtin_branch_usage, options);

	return 0;
}
Commit	Line	Data
c31820c2 LH	1	/*
	2	* Builtin "git branch"
	3	*
d972cce0	4	* Copyright (c) 2006 Kristian Høgsberg <krh@redhat.com>
c31820c2 LH	5	* Based on git-branch.sh by Junio C Hamano.
	6	*/
	7
	8	#include "cache.h"
85023577	9	#include "color.h"
c31820c2 LH	10	#include "refs.h"
	11	#include "commit.h"
	12	#include "builtin.h"
6f084a56	13	#include "remote.h"
a8dfd5ea	14	#include "parse-options.h"
e496c003	15	#include "branch.h"
a8dfd5ea PH	16
	17	static const char * const builtin_branch_usage[] = {
	18	"git-branch [options] [-r \| -a]",
	19	"git-branch [options] [-l] [-f] <branchname> [<start-point>]",
	20	"git-branch [options] [-r] (-d \| -D) <branchname>",
	21	"git-branch [options] (-m \| -M) [<oldbranch>] <newbranch>",
	22	NULL
	23	};
c31820c2	24
f3d985c3 JH	25	#define REF_UNKNOWN_TYPE 0x00
	26	#define REF_LOCAL_BRANCH 0x01
	27	#define REF_REMOTE_BRANCH 0x02
	28	#define REF_TAG 0x04
c31820c2 LH	29
	30	static const char *head;
	31	static unsigned char head_sha1[20];
	32
6f084a56	33	static int branch_track = 1;
0746d19a	34
a1158cae AP	35	static int branch_use_color;
	36	static char branch_colors[][COLOR_MAXLEN] = {
	37	"\033[m", /* reset */
	38	"", /* PLAIN (normal) */
	39	"\033[31m", /* REMOTE (red) */
753f96a4 JH	40	"", /* LOCAL (normal) */
753f96a4 JH	41	"\033[32m", /* CURRENT (green) */
a1158cae AP	42	};
	43	enum color_branch {
	44	COLOR_BRANCH_RESET = 0,
	45	COLOR_BRANCH_PLAIN = 1,
	46	COLOR_BRANCH_REMOTE = 2,
	47	COLOR_BRANCH_LOCAL = 3,
	48	COLOR_BRANCH_CURRENT = 4,
	49	};
	50
	51	static int parse_branch_color_slot(const char *var, int ofs)
	52	{
	53	if (!strcasecmp(var+ofs, "plain"))
	54	return COLOR_BRANCH_PLAIN;
	55	if (!strcasecmp(var+ofs, "reset"))
	56	return COLOR_BRANCH_RESET;
	57	if (!strcasecmp(var+ofs, "remote"))
	58	return COLOR_BRANCH_REMOTE;
	59	if (!strcasecmp(var+ofs, "local"))
	60	return COLOR_BRANCH_LOCAL;
	61	if (!strcasecmp(var+ofs, "current"))
	62	return COLOR_BRANCH_CURRENT;
	63	die("bad config variable '%s'", var);
	64	}
	65
52fae7de	66	static int git_branch_config(const char var, const char value)
a1158cae AP	67	{
a1158cae AP	68	if (!strcmp(var, "color.branch")) {
0f6f5a40	69	branch_use_color = git_config_colorbool(var, value, -1);
a1158cae AP	70	return 0;
a1158cae AP	71	}
cc44c765	72	if (!prefixcmp(var, "color.branch.")) {
a1158cae AP	73	int slot = parse_branch_color_slot(var, 13);
	74	color_parse(value, var, branch_colors[slot]);
	75	return 0;
	76	}
6f084a56	77	if (!strcmp(var, "branch.autosetupmerge"))
4017761f	78	branch_track = git_config_bool(var, value);
0746d19a	79
a1158cae AP	80	return git_default_config(var, value);
	81	}
	82
52fae7de	83	static const char *branch_get_color(enum color_branch ix)
a1158cae AP	84	{
	85	if (branch_use_color)
	86	return branch_colors[ix];
	87	return "";
	88	}
	89
b8e9a00d	90	static int delete_branches(int argc, const char **argv, int force, int kinds)
c31820c2	91	{
67affd51	92	struct commit rev, head_rev = head_rev;
c31820c2	93	unsigned char sha1[20];
b8e9a00d	94	char *name = NULL;
f3d985c3	95	const char fmt, remote;
f1eccbab	96	char section[PATH_MAX];
c31820c2	97	int i;
b8e9a00d	98	int ret = 0;
c31820c2	99
f3d985c3 JH	100	switch (kinds) {
	101	case REF_REMOTE_BRANCH:
	102	fmt = "refs/remotes/%s";
	103	remote = "remote ";
	104	force = 1;
	105	break;
	106	case REF_LOCAL_BRANCH:
	107	fmt = "refs/heads/%s";
	108	remote = "";
	109	break;
	110	default:
	111	die("cannot use -a with -d");
	112	}
c31820c2	113
67affd51 JH	114	if (!force) {
	115	head_rev = lookup_commit_reference(head_sha1);
	116	if (!head_rev)
	117	die("Couldn't look up commit object for HEAD");
	118	}
c31820c2	119	for (i = 0; i < argc; i++) {
b8e9a00d QT	120	if (kinds == REF_LOCAL_BRANCH && !strcmp(head, argv[i])) {
	121	error("Cannot delete the branch '%s' "
	122	"which you are currently on.", argv[i]);
	123	ret = 1;
	124	continue;
	125	}
	126
	127	if (name)
	128	free(name);
c31820c2	129
f3d985c3	130	name = xstrdup(mkpath(fmt, argv[i]));
b8e9a00d QT	131	if (!resolve_ref(name, sha1, 1, NULL)) {
	132	error("%sbranch '%s' not found.",
	133	remote, argv[i]);
	134	ret = 1;
	135	continue;
	136	}
c31820c2 LH	137
c31820c2 LH	138	rev = lookup_commit_reference(sha1);
b8e9a00d QT	139	if (!rev) {
	140	error("Couldn't look up commit object for '%s'", name);
	141	ret = 1;
	142	continue;
	143	}
c31820c2 LH	144
	145	/* This checks whether the merge bases of branch and
	146	* HEAD contains branch -- which means that the HEAD
	147	* contains everything in both.
	148	*/
	149
	150	if (!force &&
03840fc3	151	!in_merge_bases(rev, &head_rev, 1)) {
00ae8289	152	error("The branch '%s' is not an ancestor of "
b8e9a00d QT	153	"your current HEAD.\n"
	154	"If you are sure you want to delete it, "
	155	"run 'git branch -D %s'.", argv[i], argv[i]);
	156	ret = 1;
	157	continue;
c31820c2 LH	158	}
c31820c2 LH	159
b8e9a00d QT	160	if (delete_ref(name, sha1)) {
b8e9a00d QT	161	error("Error deleting %sbranch '%s'", remote,
f3d985c3	162	argv[i]);
b8e9a00d	163	ret = 1;
f1eccbab	164	} else {
f3d985c3	165	printf("Deleted %sbranch %s.\n", remote, argv[i]);
f1eccbab GP	166	snprintf(section, sizeof(section), "branch.%s",
	167	argv[i]);
	168	if (git_config_rename_section(section, NULL) < 0)
	169	warning("Update of config-file failed");
	170	}
c31820c2	171	}
c31820c2	172
b8e9a00d QT	173	if (name)
	174	free(name);
	175
	176	return(ret);
c31820c2	177	}
c31820c2	178
bfcc9214 AP	179	struct ref_item {
	180	char *name;
	181	unsigned int kind;
75e6e213	182	unsigned char sha1[20];
bfcc9214 AP	183	};
	184
	185	struct ref_list {
75e6e213	186	int index, alloc, maxwidth;
bfcc9214	187	struct ref_item *list;
694a5775	188	struct commit_list *with_commit;
bfcc9214 AP	189	int kinds;
	190	};
	191
694a5775 JH	192	static int has_commit(const unsigned char sha1, struct commit_list with_commit)
	193	{
	194	struct commit *commit;
	195
	196	if (!with_commit)
	197	return 1;
	198	commit = lookup_commit_reference_gently(sha1, 1);
	199	if (!commit)
	200	return 0;
	201	while (with_commit) {
	202	struct commit *other;
	203
	204	other = with_commit->item;
	205	with_commit = with_commit->next;
	206	if (in_merge_bases(other, &commit, 1))
	207	return 1;
	208	}
	209	return 0;
	210	}
	211
bfcc9214	212	static int append_ref(const char refname, const unsigned char sha1, int flags, void *cb_data)
c31820c2	213	{
bfcc9214 AP	214	struct ref_list ref_list = (struct ref_list)(cb_data);
	215	struct ref_item *newitem;
	216	int kind = REF_UNKNOWN_TYPE;
75e6e213	217	int len;
bfcc9214 AP	218
bfcc9214 AP	219	/* Detect kind */
cc44c765	220	if (!prefixcmp(refname, "refs/heads/")) {
bfcc9214 AP	221	kind = REF_LOCAL_BRANCH;
bfcc9214 AP	222	refname += 11;
cc44c765	223	} else if (!prefixcmp(refname, "refs/remotes/")) {
bfcc9214 AP	224	kind = REF_REMOTE_BRANCH;
bfcc9214 AP	225	refname += 13;
cc44c765	226	} else if (!prefixcmp(refname, "refs/tags/")) {
bfcc9214 AP	227	kind = REF_TAG;
	228	refname += 10;
	229	}
	230
694a5775 JH	231	/* Filter with with_commit if specified */
	232	if (!has_commit(sha1, ref_list->with_commit))
	233	return 0;
	234
bfcc9214 AP	235	/* Don't add types the caller doesn't want */
	236	if ((kind & ref_list->kinds) == 0)
	237	return 0;
	238
	239	/* Resize buffer */
	240	if (ref_list->index >= ref_list->alloc) {
	241	ref_list->alloc = alloc_nr(ref_list->alloc);
	242	ref_list->list = xrealloc(ref_list->list,
	243	ref_list->alloc * sizeof(struct ref_item));
c31820c2 LH	244	}
c31820c2 LH	245
bfcc9214 AP	246	/* Record the new item */
	247	newitem = &(ref_list->list[ref_list->index++]);
	248	newitem->name = xstrdup(refname);
	249	newitem->kind = kind;
75e6e213 LH	250	hashcpy(newitem->sha1, sha1);
	251	len = strlen(newitem->name);
	252	if (len > ref_list->maxwidth)
	253	ref_list->maxwidth = len;
c31820c2 LH	254
	255	return 0;
	256	}
	257
bfcc9214 AP	258	static void free_ref_list(struct ref_list *ref_list)
	259	{
	260	int i;
	261
	262	for (i = 0; i < ref_list->index; i++)
	263	free(ref_list->list[i].name);
	264	free(ref_list->list);
	265	}
	266
c31820c2 LH	267	static int ref_cmp(const void r1, const void r2)
c31820c2 LH	268	{
bfcc9214 AP	269	struct ref_item c1 = (struct ref_item )(r1);
	270	struct ref_item c2 = (struct ref_item )(r2);
	271
	272	if (c1->kind != c2->kind)
	273	return c1->kind - c2->kind;
	274	return strcmp(c1->name, c2->name);
c31820c2 LH	275	}
c31820c2 LH	276
af0e4ac0 LH	277	static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
af0e4ac0 LH	278	int abbrev, int current)
75e6e213	279	{
af0e4ac0 LH	280	char c;
af0e4ac0 LH	281	int color;
75e6e213	282	struct commit *commit;
75e6e213	283
af0e4ac0 LH	284	switch (item->kind) {
	285	case REF_LOCAL_BRANCH:
	286	color = COLOR_BRANCH_LOCAL;
	287	break;
	288	case REF_REMOTE_BRANCH:
	289	color = COLOR_BRANCH_REMOTE;
	290	break;
	291	default:
	292	color = COLOR_BRANCH_PLAIN;
	293	break;
	294	}
75e6e213	295
af0e4ac0 LH	296	c = ' ';
	297	if (current) {
	298	c = '*';
	299	color = COLOR_BRANCH_CURRENT;
	300	}
75e6e213	301
af0e4ac0	302	if (verbose) {
674d1727	303	struct strbuf subject;
80583c0e JH	304	const char sub = " * invalid ref **";
80583c0e JH	305
674d1727 PH	306	strbuf_init(&subject, 0);
674d1727 PH	307
af0e4ac0	308	commit = lookup_commit(item->sha1);
80583c0e	309	if (commit && !parse_commit(commit)) {
674d1727	310	pretty_print_commit(CMIT_FMT_ONELINE, commit,
4593fb84	311	&subject, 0, NULL, NULL, 0, 0);
674d1727	312	sub = subject.buf;
80583c0e	313	}
af0e4ac0 LH	314	printf("%c %s%-*s%s %s %s\n", c, branch_get_color(color),
	315	maxwidth, item->name,
	316	branch_get_color(COLOR_BRANCH_RESET),
80583c0e	317	find_unique_abbrev(item->sha1, abbrev), sub);
674d1727	318	strbuf_release(&subject);
af0e4ac0 LH	319	} else {
	320	printf("%c %s%s%s\n", c, branch_get_color(color), item->name,
	321	branch_get_color(COLOR_BRANCH_RESET));
	322	}
75e6e213 LH	323	}
75e6e213 LH	324
694a5775	325	static void print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit)
c31820c2 LH	326	{
c31820c2 LH	327	int i;
bfcc9214	328	struct ref_list ref_list;
c31820c2	329
bfcc9214 AP	330	memset(&ref_list, 0, sizeof(ref_list));
bfcc9214 AP	331	ref_list.kinds = kinds;
694a5775	332	ref_list.with_commit = with_commit;
bfcc9214	333	for_each_ref(append_ref, &ref_list);
c31820c2	334
bfcc9214	335	qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp);
c31820c2	336
0016a482	337	detached = (detached && (kinds & REF_LOCAL_BRANCH));
694a5775	338	if (detached && has_commit(head_sha1, with_commit)) {
0016a482	339	struct ref_item item;
3a55602e	340	item.name = xstrdup("(no branch)");
0016a482 LH	341	item.kind = REF_LOCAL_BRANCH;
	342	hashcpy(item.sha1, head_sha1);
	343	if (strlen(item.name) > ref_list.maxwidth)
	344	ref_list.maxwidth = strlen(item.name);
	345	print_ref_item(&item, ref_list.maxwidth, verbose, abbrev, 1);
3a55602e	346	free(item.name);
0016a482 LH	347	}
0016a482 LH	348
bfcc9214	349	for (i = 0; i < ref_list.index; i++) {
0016a482 LH	350	int current = !detached &&
0016a482 LH	351	(ref_list.list[i].kind == REF_LOCAL_BRANCH) &&
af0e4ac0 LH	352	!strcmp(ref_list.list[i].name, head);
	353	print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose,
	354	abbrev, current);
c31820c2	355	}
bfcc9214 AP	356
bfcc9214 AP	357	free_ref_list(&ref_list);
c31820c2 LH	358	}
c31820c2 LH	359
c976d415 LH	360	static void rename_branch(const char oldname, const char newname, int force)
c976d415 LH	361	{
678d0f4c	362	char oldref[PATH_MAX], newref[PATH_MAX], logmsg[PATH_MAX*2 + 100];
c976d415	363	unsigned char sha1[20];
19eba151	364	char oldsection[PATH_MAX], newsection[PATH_MAX];
c976d415	365
c847f537	366	if (!oldname)
3dff5379	367	die("cannot rename the current branch while not on any.");
c847f537	368
c976d415 LH	369	if (snprintf(oldref, sizeof(oldref), "refs/heads/%s", oldname) > sizeof(oldref))
	370	die("Old branchname too long");
	371
	372	if (check_ref_format(oldref))
	373	die("Invalid branch name: %s", oldref);
	374
	375	if (snprintf(newref, sizeof(newref), "refs/heads/%s", newname) > sizeof(newref))
	376	die("New branchname too long");
	377
	378	if (check_ref_format(newref))
	379	die("Invalid branch name: %s", newref);
	380
	381	if (resolve_ref(newref, sha1, 1, NULL) && !force)
	382	die("A branch named '%s' already exists.", newname);
	383
678d0f4c LH	384	snprintf(logmsg, sizeof(logmsg), "Branch: renamed %s to %s",
	385	oldref, newref);
	386
	387	if (rename_ref(oldref, newref, logmsg))
c976d415 LH	388	die("Branch rename failed");
c976d415 LH	389
8b5157e4 NP	390	/* no need to pass logmsg here as HEAD didn't really move */
8b5157e4 NP	391	if (!strcmp(oldname, head) && create_symref("HEAD", newref, NULL))
c976d415	392	die("Branch renamed to %s, but HEAD is not updated!", newname);
19eba151 LH	393
	394	snprintf(oldsection, sizeof(oldsection), "branch.%s", oldref + 11);
	395	snprintf(newsection, sizeof(newsection), "branch.%s", newref + 11);
	396	if (git_config_rename_section(oldsection, newsection) < 0)
	397	die("Branch is renamed, but update of config-file failed");
c976d415 LH	398	}
c976d415 LH	399
694a5775 JH	400	static int opt_parse_with_commit(const struct option opt, const char arg, int unset)
	401	{
	402	unsigned char sha1[20];
	403	struct commit *commit;
	404
	405	if (!arg)
	406	return -1;
	407	if (get_sha1(arg, sha1))
	408	die("malformed object name %s", arg);
	409	commit = lookup_commit_reference(sha1);
	410	if (!commit)
	411	die("no such commit %s", arg);
	412	commit_list_insert(commit, opt->value);
	413	return 0;
	414	}
	415
c31820c2 LH	416	int cmd_branch(int argc, const char *argv, const char prefix)
c31820c2 LH	417	{
d11d44fa	418	int delete = 0, rename = 0, force_create = 0;
0016a482	419	int verbose = 0, abbrev = DEFAULT_ABBREV, detached = 0;
0746d19a	420	int reflog = 0, track;
d11d44fa	421	int kinds = REF_LOCAL_BRANCH;
694a5775	422	struct commit_list *with_commit = NULL;
a8dfd5ea PH	423
	424	struct option options[] = {
	425	OPT_GROUP("Generic options"),
	426	OPT__VERBOSE(&verbose),
	427	OPT_BOOLEAN( 0 , "track", &track, "set up tracking mode (see git-pull(1))"),
	428	OPT_BOOLEAN( 0 , "color", &branch_use_color, "use colored output"),
d11d44fa PH	429	OPT_SET_INT('r', NULL, &kinds, "act on remote-tracking branches",
d11d44fa PH	430	REF_REMOTE_BRANCH),
694a5775 JH	431	OPT_CALLBACK(0, "contains", &with_commit, "commit",
	432	"print only branches that contain the commit",
	433	opt_parse_with_commit),
	434	{
	435	OPTION_CALLBACK, 0, "with", &with_commit, "commit",
	436	"print only branches that contain the commit",
	437	PARSE_OPT_HIDDEN, opt_parse_with_commit,
	438	},
a8dfd5ea PH	439	OPT__ABBREV(&abbrev),
	440
	441	OPT_GROUP("Specific git-branch actions:"),
d11d44fa PH	442	OPT_SET_INT('a', NULL, &kinds, "list both remote-tracking and local branches",
	443	REF_REMOTE_BRANCH \| REF_LOCAL_BRANCH),
	444	OPT_BIT('d', NULL, &delete, "delete fully merged branch", 1),
	445	OPT_BIT('D', NULL, &delete, "delete branch (even if not merged)", 2),
	446	OPT_BIT('m', NULL, &rename, "move/rename a branch and its reflog", 1),
	447	OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2),
	448	OPT_BOOLEAN('l', NULL, &reflog, "create the branch's reflog"),
	449	OPT_BOOLEAN('f', NULL, &force_create, "force creation (when already exists)"),
a8dfd5ea PH	450	OPT_END(),
a8dfd5ea PH	451	};
c31820c2	452
a1158cae	453	git_config(git_branch_config);
4017761f	454	track = branch_track;
a8dfd5ea	455	argc = parse_options(argc, argv, options, builtin_branch_usage, 0);
d11d44fa	456	if (!!delete + !!rename + !!force_create > 1)
a8dfd5ea	457	usage_with_options(builtin_branch_usage, options);
c976d415	458
078f8380	459	head = resolve_ref("HEAD", head_sha1, 0, NULL);
c31820c2 LH	460	if (!head)
c31820c2 LH	461	die("Failed to resolve HEAD as a valid ref.");
078f8380	462	head = xstrdup(head);
0016a482 LH	463	if (!strcmp(head, "HEAD")) {
0016a482 LH	464	detached = 1;
a8dfd5ea	465	} else {
cc44c765	466	if (prefixcmp(head, "refs/heads/"))
0016a482 LH	467	die("HEAD not found below refs/heads!");
	468	head += 11;
	469	}
c31820c2 LH	470
c31820c2 LH	471	if (delete)
d11d44fa	472	return delete_branches(argc, argv, delete > 1, kinds);
a8dfd5ea	473	else if (argc == 0)
694a5775	474	print_ref_list(kinds, detached, verbose, abbrev, with_commit);
a8dfd5ea	475	else if (rename && (argc == 1))
d11d44fa	476	rename_branch(head, argv[0], rename > 1);
a8dfd5ea	477	else if (rename && (argc == 2))
d11d44fa	478	rename_branch(argv[0], argv[1], rename > 1);
a8dfd5ea	479	else if (argc <= 2)
e496c003	480	create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
45994a1e	481	force_create, reflog, track);
c31820c2	482	else
a8dfd5ea	483	usage_with_options(builtin_branch_usage, options);
c31820c2 LH	484
	485	return 0;
	486	}