From: Junio C Hamano <junkio@cox.net>
To: Shawn Pearce <spearce@spearce.org>
Cc: git@vger.kernel.org
Subject: [PATCH 1/2] Move in_merge_bases() to commit.c
Date: Tue, 19 Dec 2006 00:25:02 -0800 [thread overview]
Message-ID: <7vbqm0thr5.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: 7vy7p4u1au.fsf@assigned-by-dhcp.cox.net
This reasonably useful function was hidden inside builtin-branch.c
---
* This is used by the next one, which is why this is part of
the 'reflog entry and pruning' series.
builtin-branch.c | 21 +--------------------
commit.c | 17 +++++++++++++++++
commit.h | 1 +
3 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/builtin-branch.c b/builtin-branch.c
index 560309c..12eebc0 100644
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -70,25 +70,6 @@ const char *branch_get_color(enum color_branch ix)
return "";
}
-static int in_merge_bases(const unsigned char *sha1,
- struct commit *rev1,
- struct commit *rev2)
-{
- struct commit_list *bases, *b;
- int ret = 0;
-
- bases = get_merge_bases(rev1, rev2, 1);
- for (b = bases; b; b = b->next) {
- if (!hashcmp(sha1, b->item->object.sha1)) {
- ret = 1;
- break;
- }
- }
-
- free_commit_list(bases);
- return ret;
-}
-
static void delete_branches(int argc, const char **argv, int force)
{
struct commit *rev, *head_rev = head_rev;
@@ -119,7 +100,7 @@ static void delete_branches(int argc, const char **argv, int force)
*/
if (!force &&
- !in_merge_bases(sha1, rev, head_rev)) {
+ !in_merge_bases(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",
diff --git a/commit.c b/commit.c
index a6d543e..4bddcbe 100644
--- a/commit.c
+++ b/commit.c
@@ -1009,3 +1009,20 @@ struct commit_list *get_merge_bases(struct commit *one,
free(rslt);
return result;
}
+
+int in_merge_bases(struct commit *rev1, struct commit *rev2)
+{
+ struct commit_list *bases, *b;
+ int ret = 0;
+
+ bases = get_merge_bases(rev1, rev2, 1);
+ for (b = bases; b; b = b->next) {
+ if (!hashcmp(rev1->object.sha1, b->item->object.sha1)) {
+ ret = 1;
+ break;
+ }
+ }
+
+ free_commit_list(bases);
+ return ret;
+}
diff --git a/commit.h b/commit.h
index fc13de9..10eea9f 100644
--- a/commit.h
+++ b/commit.h
@@ -107,4 +107,5 @@ int read_graft_file(const char *graft_file);
extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
+int in_merge_bases(struct commit *rev1, struct commit *rev2);
#endif /* COMMIT_H */
--
1.4.4.2.g688739
next prev parent reply other threads:[~2006-12-19 8:25 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-16 23:10 What's cooking in git.git (topics) Junio C Hamano
2006-12-16 23:29 ` Jakub Narebski
2006-12-17 0:19 ` Junio C Hamano
2006-12-17 17:35 ` Yann Dirson
2006-12-17 23:38 ` Josef Weidendorfer
2006-12-17 4:35 ` Brian Gernhardt
2006-12-17 4:42 ` Shawn Pearce
2006-12-17 6:46 ` [PATCH] revision: introduce ref@{N..M} syntax Junio C Hamano
2006-12-17 18:14 ` Linus Torvalds
2006-12-17 19:38 ` Junio C Hamano
2006-12-17 23:41 ` What's cooking in git.git (topics) Andy Parkins
2006-12-18 8:09 ` Junio C Hamano
2006-12-18 9:17 ` Andy Parkins
2006-12-18 9:33 ` Shawn Pearce
2006-12-18 9:40 ` [PATCH 1/2] add for_each_reflog_ent() iterator Junio C Hamano
2006-12-18 9:42 ` [PATCH 2/2] Protect commits recorded in reflog from pruning Junio C Hamano
2006-12-18 14:08 ` Shawn Pearce
2006-12-19 1:22 ` Junio C Hamano
2006-12-19 8:25 ` Junio C Hamano [this message]
2006-12-19 8:25 ` [PATCH 2/2] git reflog expire Junio C Hamano
2006-12-19 9:08 ` Shawn Pearce
2006-12-19 10:15 ` Junio C Hamano
2006-12-19 10:27 ` Shawn Pearce
2006-12-19 23:29 ` Linus Torvalds
2006-12-20 0:34 ` Junio C Hamano
2006-12-20 0:58 ` Linus Torvalds
2006-12-19 10:40 ` Shawn Pearce
2006-12-19 11:08 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vbqm0thr5.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).