undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/branch-remove-remote'

Browse Source 
* jc/branch-remove-remote:
  git-branch -d: do not stop at the first failure.
  Teach git-branch to delete tracking branches with -r -d
This commit is contained in:
Junio C Hamano 2006-12-20 13:57:59 -08:00
commit 55e268e7ed
1 changed files with 62 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
builtin-branch.c
View File

@ -12,8 +12,12 @@
#include "builtin.h" #include "builtin.h"
static const char builtin_branch_usage[] = static const char builtin_branch_usage[] =
"git-branch (-d | -D) <branchname> | [-l] [-f] <branchname> [<start-point>] | (-m | -M) [<oldbranch>] <newbranch> | [-r | -a] [-v [--abbrev=<length>]]"; "git-branch [-r] (-d | -D) <branchname> | [-l] [-f] <branchname> [<start-point>] | (-m | -M) [<oldbranch>] <newbranch> | [-r | -a] [-v [--abbrev=<length>]]";
#define REF_UNKNOWN_TYPE 0x00
#define REF_LOCAL_BRANCH 0x01
#define REF_REMOTE_BRANCH 0x02
#define REF_TAG 0x04
static const char *head; static const char *head;
static unsigned char head_sha1[20]; static unsigned char head_sha1[20];
@ -89,12 +93,28 @@ static int in_merge_bases(const unsigned char *sha1,
return ret; return ret;
} }
static void delete_branches(int argc, const char **argv, int force) static int delete_branches(int argc, const char **argv, int force, int kinds)
{ {
struct commit *rev, *head_rev = head_rev; struct commit *rev, *head_rev = head_rev;
unsigned char sha1[20]; unsigned char sha1[20];
char *name; char *name = NULL;
const char *fmt, *remote;
int i; 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) { if (!force) {
head_rev = lookup_commit_reference(head_sha1); head_rev = lookup_commit_reference(head_sha1);
@ -102,16 +122,30 @@ static void delete_branches(int argc, const char **argv, int force)
die("Couldn't look up commit object for HEAD"); die("Couldn't look up commit object for HEAD");
} }
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
if (!strcmp(head, argv[i])) if (kinds == REF_LOCAL_BRANCH && !strcmp(head, argv[i])) {
die("Cannot delete the branch you are currently on."); error("Cannot delete the branch '%s' "
"which you are currently on.", argv[i]);
ret = 1;
continue;
}
name = xstrdup(mkpath("refs/heads/%s", argv[i])); if (name)
if (!resolve_ref(name, sha1, 1, NULL)) free(name);
die("Branch '%s' not found.", argv[i]);
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); rev = lookup_commit_reference(sha1);
if (!rev) if (!rev) {
die("Couldn't look up commit object for '%s'", name); error("Couldn't look up commit object for '%s'", name);
ret = 1;
continue;
}
/* This checks whether the merge bases of branch and /* This checks whether the merge bases of branch and
* HEAD contains branch -- which means that the HEAD * HEAD contains branch -- which means that the HEAD
@ -120,26 +154,28 @@ static void delete_branches(int argc, const char **argv, int force)
if (!force && if (!force &&
!in_merge_bases(sha1, rev, head_rev)) { !in_merge_bases(sha1, rev, head_rev)) {
fprintf(stderr, error("The branch '%s' is not a strict subset of "
"The branch '%s' is not a strict subset of your current HEAD.\n" "your current HEAD.\n"
"If you are sure you want to delete it, run 'git branch -D %s'.\n", "If you are sure you want to delete it, "
argv[i], argv[i]); "run 'git branch -D %s'.", argv[i], argv[i]);
exit(1); ret = 1;
continue;
} }
if (delete_ref(name, sha1)) if (delete_ref(name, sha1)) {
printf("Error deleting branch '%s'\n", argv[i]); error("Error deleting %sbranch '%s'", remote,
else argv[i]);
printf("Deleted branch %s.\n", argv[i]); ret = 1;
} else
printf("Deleted %sbranch %s.\n", remote, argv[i]);
}
if (name)
free(name); free(name);
}
}
#define REF_UNKNOWN_TYPE 0x00 return(ret);
#define REF_LOCAL_BRANCH 0x01 }
#define REF_REMOTE_BRANCH 0x02
#define REF_TAG 0x04
struct ref_item { struct ref_item {
char *name; char *name;
@ -435,7 +471,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
head += 11; head += 11;
if (delete) if (delete)
delete_branches(argc - i, argv + i, force_delete); return delete_branches(argc - i, argv + i, force_delete, kinds);
else if (i == argc) else if (i == argc)
print_ref_list(kinds, verbose, abbrev); print_ref_list(kinds, verbose, abbrev);
else if (rename && (i == argc - 1)) else if (rename && (i == argc - 1))