From: Artur Skawina <art.08.09@gmail.com>
To: git@vger.kernel.org
Subject: Re: Find out on which branch a commit was originally made) (was ANNOUNCE git-what-branch)
Date: Fri, 24 Sep 2010 03:33:20 +0200 [thread overview]
Message-ID: <4C9BFFE0.5040406@gmail.com> (raw)
In-Reply-To: <4C9BC757.3050803@gmail.com>
> There's still a bug in there somewhere;
JIC someone actually wants to use that script -- you'll need this:
--- git-show-merge-path 2010-09-23 20:13:59.000000000 +0000
+++ git-show-merge-path 2010-09-24 01:09:10.000000000 +0000
@@ -90,21 +89,21 @@
desc[id] = 1;
if (sizeof(commits[id]["parent"])>1)
if (!desc[commits[id]["parent"][0]]) {
- mapping reached = ([]);
- if (commits[id]["Branch"])
- reached = commits[id]["Branch"]&branchnames;
int comtime = (int)commits[id]["committer"][-2];
write("%.12s %-56.56s %.12s\n", id,
squeeze_subject(commits[id][""][1]),
cal->Second(comtime)->format_time_xshort() );
- if (sizeof(reached)>0) {
- branchnames -= reached;
- write("# Merged into %s\n",
- String.implode_nicely(indices(reached)) );
- if (sizeof(branchnames)==0)
- exit(0);
- }
}
+ if (mapping reached = commits[id]["Branch"]) {
+ reached = reached&branchnames;
+ if (sizeof(reached)>0) {
+ branchnames -= reached;
+ write("# Merged into %s\n",
+ String.implode_nicely(indices(reached)) );
+ if (sizeof(branchnames)==0)
+ exit(0);
+ }
+ }
}
m_delete(commits, id);
}
next prev parent reply other threads:[~2010-09-24 1:33 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-18 9:19 Find out on which branch a commit was originally made Stefan Haller
2010-09-18 9:58 ` Ævar Arnfjörð Bjarmason
2010-09-18 10:02 ` Ævar Arnfjörð Bjarmason
2010-09-18 11:28 ` Tor Arntsen
2010-09-18 15:26 ` Stefan Haller
2010-09-18 16:41 ` Artur Skawina
2010-09-19 9:45 ` Stefan Haller
2010-09-19 12:54 ` Clemens Buchacher
2010-09-19 14:03 ` Artur Skawina
2010-09-19 14:08 ` Stefan Haller
2010-09-19 16:38 ` Artur Skawina
2010-09-19 18:30 ` Robin Rosenberg
2010-09-19 22:03 ` Seth Robertson
2010-09-19 23:12 ` Artur Skawina
2010-09-19 23:54 ` Seth Robertson
2010-09-20 1:31 ` Artur Skawina
2010-09-20 5:47 ` Seth Robertson
2010-09-20 8:12 ` Stefan Haller
2010-09-20 10:58 ` Artur Skawina
2010-09-20 15:49 ` Artur Skawina
2010-09-21 0:15 ` Seth Robertson
2010-09-21 2:12 ` Artur Skawina
2010-09-22 16:35 ` ANNOUNCE git-what-branch (was Re: Find out on which branch a commit was originally made) Seth Robertson
2010-09-22 20:27 ` Artur Skawina
2010-09-22 23:26 ` Find out on which branch a commit was originally made) (was ANNOUNCE git-what-branch) Seth Robertson
2010-09-23 13:14 ` Stephen Bash
2010-09-23 13:26 ` Ævar Arnfjörð Bjarmason
2010-09-23 21:32 ` Artur Skawina
2010-09-24 1:33 ` Artur Skawina [this message]
2010-09-24 20:57 ` Seth Robertson
2010-09-23 14:27 ` Seth Robertson
2010-09-20 18:20 ` Find out on which branch a commit was originally made Stefan Haller
2010-09-24 18:26 ` Bryan Drewery
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C9BFFE0.5040406@gmail.com \
--to=art.08.09@gmail.com \
--cc=git@vger.kernel.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.
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 NNTP newsgroup(s).