* Re: [PATCH] git-branch: deleting remote branches in new layout
2006-12-18 7:49 ` Junio C Hamano
@ 2006-12-18 10:02 ` Quy Tonthat
2006-12-18 13:39 ` [PATCH] (Take 2) " Quy Tonthat
2006-12-18 22:42 ` [PATCH] (Take 3) " Quy Tonthat
2 siblings, 0 replies; 6+ messages in thread
From: Quy Tonthat @ 2006-12-18 10:02 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Junio C Hamano wrote:
> How about this instead?
>
> Because -r already means "remote" when listing, you can say:
>
> $ git branch -d -r origin/todo origin/html origin/man
>
> I just twisted it not to do fast-forward check with the current
> branch, because remote tracking branches are more like tags than
> branches, and when you are removing them, most likely that is
> not because you are "done with" them (for a local branch, it
> usually means "you merged it up") but because you are not even
> interested in them.
It sure is much more unambiguous that way.
Users won't be able to mix "local" and "remote" on one command
line as they were with the old layout. But that's OK for such an
infrequently used command.
> if (!resolve_ref(name, sha1, 1, NULL))
> - die("Branch '%s' not found.", argv[i]);
> + die("%sbranch '%s' not found.", remote, argv[i]);
This should not be a fatal error. We should only give warning
and move on to the next item. The way "rm" does.
Quy
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] (Take 2) git-branch: deleting remote branches in new layout
2006-12-18 7:49 ` Junio C Hamano
2006-12-18 10:02 ` Quy Tonthat
@ 2006-12-18 13:39 ` Quy Tonthat
2006-12-18 22:42 ` [PATCH] (Take 3) " Quy Tonthat
2 siblings, 0 replies; 6+ messages in thread
From: Quy Tonthat @ 2006-12-18 13:39 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
This patch is based on Junio's patch (all errors are my fault, of
course) to provide the following features to 'git-branch -d|-D'
o Option -r can be used with -d or -D to delete "remote" (tracking)
branch(es), for examples,
git branch -d -r origin/man origin/html
this command will delete the named branches in $GIT_DIR/refs/remotes,
according to the new layout.
(No, you can no longer mix "local" and "remote" branches in one
deletion command.)
o If there are more than one branches to be deleted, failure on one will
no longer stop git-branch to process the next ones.
o 'git-branch -d|-D' now returns error code 1 if at least one of
branches deleting is failed. (0 returned for fully success as before)
Signed-off-by: Quy Tonthat <qtonthat@gmail.com>
---
This patch is to replace my previous patch.
builtin-branch.c | 57 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 18 deletions(-)
diff --git a/builtin-branch.c b/builtin-branch.c
index 7fb93e7..52b6b5a 100644
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -93,13 +93,14 @@ static int in_merge_bases(const unsigned char *sha1,
return ret;
}
-static void delete_branches(int argc, const char **argv, int force, int kinds)
+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;
+ char *name = NULL;
const char *fmt, *remote;
int i;
+ int ret = 0;
switch (kinds) {
case REF_REMOTE_BRANCH:
@@ -121,16 +122,30 @@ static void delete_branches(int argc, const char **argv, int force, int kinds)
die("Couldn't look up commit object for HEAD");
}
for (i = 0; i < argc; i++) {
- if (kinds == REF_LOCAL_BRANCH && !strcmp(head, argv[i]))
- die("Cannot delete the branch you are currently on.");
+ 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))
- die("%sbranch '%s' not found.", remote, 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)
- die("Couldn't look up commit object for '%s'", name);
+ 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
@@ -139,21 +154,26 @@ static void delete_branches(int argc, const char **argv, int force, int kinds)
if (!force &&
!in_merge_bases(sha1, rev, head_rev)) {
- fprintf(stderr,
- "The branch '%s' is not a strict subset of your current HEAD.\n"
- "If you are sure you want to delete it, run 'git branch -D %s'.\n",
+ error("The branch '%s' is not a strict subset of your current HEAD."
+ "If you are sure you want to delete it, run 'git branch -D %s'.",
argv[i], argv[i]);
- exit(1);
+ ret = 1;
+ continue;
}
- if (delete_ref(name, sha1))
- printf("Error deleting %sbranch '%s'\n", remote,
+ if (delete_ref(name, sha1)) {
+ error("Error deleting %sbranch '%s'", remote,
argv[i]);
- else
+ ret = 1;
+ } else
printf("Deleted %sbranch %s.\n", remote, argv[i]);
- free(name);
}
+
+ if (name)
+ free(name);
+
+ return(ret);
}
struct ref_item {
@@ -372,6 +392,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
int reflog = 0;
int kinds = REF_LOCAL_BRANCH;
int i;
+ int status = 0;
setup_ident();
git_config(git_branch_config);
@@ -450,7 +471,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
head += 11;
if (delete)
- delete_branches(argc - i, argv + i, force_delete, kinds);
+ status = delete_branches(argc - i, argv + i, force_delete, kinds);
else if (i == argc)
print_ref_list(kinds, verbose, abbrev);
else if (rename && (i == argc - 1))
@@ -464,5 +485,5 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
else
usage(builtin_branch_usage);
- return 0;
+ return (status);
}
--
1.4.4.1.GIT
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] (Take 3) git-branch: deleting remote branches in new layout
2006-12-18 7:49 ` Junio C Hamano
2006-12-18 10:02 ` Quy Tonthat
2006-12-18 13:39 ` [PATCH] (Take 2) " Quy Tonthat
@ 2006-12-18 22:42 ` Quy Tonthat
2 siblings, 0 replies; 6+ messages in thread
From: Quy Tonthat @ 2006-12-18 22:42 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
This patch is based on Junio's patch (all errors are my fault, of
course) to provide the following features to 'git-branch -d|-D'
o Option -r can be used with -d or -D to delete "remote" (tracking)
branch(es), for examples,
git branch -d -r origin/man origin/html
this command will delete the named branches in $GIT_DIR/refs/remotes,
according to the new layout.
(No, you can no longer mix "local" and "remote" branches in one
deletion command.)
o If there are more than one branches to be deleted, failure on one will
no longer stop git-branch to process the next ones.
o 'git-branch -d|-D' now returns error code 1 if at least one of
branches deleting is failed. (0 returned for fully success as before)
Signed-off-by: Quy Tonthat <qtonthat@gmail.com>
---
This patch is to replace all my previous patches on this thread.
builtin-branch.c | 88 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 62 insertions(+), 26 deletions(-)
diff --git a/builtin-branch.c b/builtin-branch.c
index 560309c..52b6b5a 100644
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -12,8 +12,12 @@
#include "builtin.h"
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 unsigned char head_sha1[20];
@@ -89,12 +93,28 @@ static int in_merge_bases(const unsigned char *sha1,
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;
unsigned char sha1[20];
- char *name;
+ char *name = NULL;
+ const char *fmt, *remote;
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);
@@ -102,16 +122,30 @@ static void delete_branches(int argc, const char **argv, int force)
die("Couldn't look up commit object for HEAD");
}
for (i = 0; i < argc; i++) {
- if (!strcmp(head, argv[i]))
- die("Cannot delete the branch you are currently on.");
+ 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("refs/heads/%s", argv[i]));
- if (!resolve_ref(name, sha1, 1, NULL))
- 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);
- if (!rev)
- die("Couldn't look up commit object for '%s'", name);
+ 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
@@ -120,26 +154,27 @@ static void delete_branches(int argc, const char **argv, int force)
if (!force &&
!in_merge_bases(sha1, rev, head_rev)) {
- fprintf(stderr,
- "The branch '%s' is not a strict subset of your current HEAD.\n"
- "If you are sure you want to delete it, run 'git branch -D %s'.\n",
+ error("The branch '%s' is not a strict subset of your current HEAD."
+ "If you are sure you want to delete it, run 'git branch -D %s'.",
argv[i], argv[i]);
- exit(1);
+ ret = 1;
+ continue;
}
- if (delete_ref(name, sha1))
- printf("Error deleting branch '%s'\n", argv[i]);
- else
- printf("Deleted branch %s.\n", argv[i]);
+ if (delete_ref(name, sha1)) {
+ error("Error deleting %sbranch '%s'", remote,
+ argv[i]);
+ ret = 1;
+ } else
+ printf("Deleted %sbranch %s.\n", remote, argv[i]);
- free(name);
}
-}
-#define REF_UNKNOWN_TYPE 0x00
-#define REF_LOCAL_BRANCH 0x01
-#define REF_REMOTE_BRANCH 0x02
-#define REF_TAG 0x04
+ if (name)
+ free(name);
+
+ return(ret);
+}
struct ref_item {
char *name;
@@ -357,6 +392,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
int reflog = 0;
int kinds = REF_LOCAL_BRANCH;
int i;
+ int status = 0;
setup_ident();
git_config(git_branch_config);
@@ -435,7 +471,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
head += 11;
if (delete)
- delete_branches(argc - i, argv + i, force_delete);
+ status = delete_branches(argc - i, argv + i, force_delete, kinds);
else if (i == argc)
print_ref_list(kinds, verbose, abbrev);
else if (rename && (i == argc - 1))
@@ -449,5 +485,5 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
else
usage(builtin_branch_usage);
- return 0;
+ return (status);
^ permalink raw reply related [flat|nested] 6+ messages in thread