From: Junio C Hamano <gitster@pobox.com>
To: Johan Herland <johan@herland.net>
Cc: git@vger.kernel.org, jrnieder@gmail.com, pclouds@gmail.com,
artagnon@gmail.com, john@keeping.me.uk, vfr@lyx.org,
peff@peff.net, felipe.contreras@gmail.com,
torvalds@linux-foundation.org
Subject: Re: [PATCH 0/3] Refactor useful notes functions into notes-utils.[ch]
Date: Wed, 12 Jun 2013 13:02:36 -0700 [thread overview]
Message-ID: <7vzjuv14ir.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: 1370995981-1553-1-git-send-email-johan@herland.net
Johan Herland <johan@herland.net> writes:
>> There is only one right solution. If a useful function is buried in
>> builtin/*.o as a historical accident (i.e. it started its life as a
>> helper for that particular command, and nobody else used it from
>> outside so far) and that makes it impossible to use the function
>> from outside builtin/*.o, refactor the function and its callers and
>> move it to libgit.a.
>
> Here goes...
>
> ...Johan
With these three patches, if you apply the following skeleton patch
(lifted from $gmane/226851 and adjusted minimally to the change
these patches introduce), we can see that the link breakage Felipe
observed in the message:
Felipe Contreras <felipe.contreras@gmail.com> writes in $gmane/226851:
> What happens?
>
> libgit.a(sequencer.o): In function `copy_notes':
> /home/felipec/dev/git/sequencer.c:110: undefined reference to
> `init_copy_notes_for_rewrite'
> /home/felipec/dev/git/sequencer.c:114: undefined reference to
> `finish_copy_notes_for_rewrite'
is gone.
> It is not the first time, nor the last that top-level code needs
> builtin code, and the solution is easy; organize the code.
And as I already said, the above is correct. The problem and the
general approach to solve it correctly were identified in the
message.
But what followed was a nonsense, which ended up wastign everybody's
time:
> ... Alas, this
> simple solution reject on the basis that we shouldn't organize the
> code, because the code is not meant to be organized.
The proposed patch was rejected on the basis that it was organized
the code in a wrong way. And your patch shows how it should be
done.
Thanks for doing it right.
-- skeleton patch --
sequencer.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/sequencer.c b/sequencer.c
index ab6f8a7..4281466 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -14,6 +14,7 @@
#include "merge-recursive.h"
#include "refs.h"
#include "argv-array.h"
+#include "notes-utils.h"
#define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
@@ -979,6 +980,17 @@ static void save_opts(struct replay_opts *opts)
}
}
+static void copy_notes(const char *name, const char *msg)
+{
+ struct notes_rewrite_cfg *cfg;
+
+ cfg = init_copy_notes_for_rewrite(name);
+ if (!cfg)
+ return;
+
+ finish_copy_notes_for_rewrite(cfg, msg);
+}
+
static int pick_commits(struct commit_list *todo_list, struct replay_opts *opts)
{
struct commit_list *cur;
@@ -997,6 +1009,8 @@ static int pick_commits(struct commit_list *todo_list, struct replay_opts *opts)
return res;
}
+ copy_notes("cherry-pick", "notes copied by cherry-pick");
+
/*
* Sequence of picks finished successfully; cleanup by
* removing the .git/sequencer directory
next prev parent reply other threads:[~2013-06-12 20:02 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-08 17:29 [PATCH] build: get rid of the notion of a git library Felipe Contreras
2013-06-08 18:02 ` Ramkumar Ramachandra
2013-06-08 18:22 ` Felipe Contreras
2013-06-09 14:56 ` Ramkumar Ramachandra
2013-06-09 15:12 ` John Keeping
2013-06-09 15:40 ` Felipe Contreras
2013-06-09 16:02 ` John Keeping
2013-06-09 16:22 ` Felipe Contreras
2013-06-09 16:42 ` John Keeping
2013-06-09 17:03 ` Ramkumar Ramachandra
2013-06-09 17:12 ` Ramkumar Ramachandra
2013-06-09 17:13 ` Felipe Contreras
2013-06-09 17:32 ` John Keeping
2013-06-09 17:45 ` Felipe Contreras
2013-06-09 16:36 ` Ramkumar Ramachandra
2013-06-09 17:30 ` Vincent van Ravesteijn
2013-06-09 17:35 ` Felipe Contreras
2013-06-10 21:45 ` Jeff King
2013-06-10 21:52 ` Felipe Contreras
2013-06-10 22:06 ` Jeff King
2013-06-10 22:22 ` Felipe Contreras
2013-06-10 23:05 ` Junio C Hamano
2013-06-10 23:41 ` Junio C Hamano
2013-06-10 23:51 ` Felipe Contreras
2013-06-11 0:04 ` Junio C Hamano
2013-06-11 1:53 ` Junio C Hamano
2013-06-11 4:15 ` Felipe Contreras
2013-06-11 17:33 ` Junio C Hamano
2013-06-11 17:41 ` Felipe Contreras
2013-06-11 17:58 ` Junio C Hamano
2013-06-11 18:06 ` Felipe Contreras
2013-06-11 18:14 ` Linus Torvalds
2013-06-11 19:15 ` Felipe Contreras
2013-06-11 19:59 ` Junio C Hamano
2013-06-11 20:12 ` Felipe Contreras
2013-06-12 0:12 ` [PATCH 0/3] Refactor useful notes functions into notes-utils.[ch] Johan Herland
2013-06-12 0:12 ` [PATCH 1/3] finish_copy_notes_for_rewrite(): Let caller provide commit message Johan Herland
2013-06-12 17:27 ` Junio C Hamano
2013-06-12 0:13 ` [PATCH 2/3] Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c Johan Herland
2013-06-12 0:32 ` Felipe Contreras
2013-06-12 7:10 ` Johan Herland
2013-06-12 18:28 ` Felipe Contreras
2013-06-12 19:14 ` Johan Herland
2013-06-12 19:18 ` Felipe Contreras
2013-06-13 6:45 ` Andreas Krey
2013-06-13 13:13 ` Felipe Contreras
2013-06-12 20:02 ` Junio C Hamano
2013-06-12 0:13 ` [PATCH 3/3] Move create_notes_commit() from notes-merge.c into notes-utils.c Johan Herland
2013-06-12 20:02 ` Junio C Hamano [this message]
2013-06-12 20:11 ` [PATCH 0/3] Refactor useful notes functions into notes-utils.[ch] Felipe Contreras
2013-06-13 17:24 ` Junio C Hamano
2013-06-13 18:16 ` Felipe Contreras
2013-06-13 18:50 ` Felipe Contreras
2013-06-11 18:17 ` [PATCH] build: get rid of the notion of a git library Junio C Hamano
2013-06-11 19:01 ` Felipe Contreras
2013-06-11 19:24 ` Junio C Hamano
2013-06-11 19:49 ` Felipe Contreras
2013-06-11 4:04 ` Felipe Contreras
2013-06-09 15:41 ` Felipe Contreras
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=7vzjuv14ir.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=artagnon@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=johan@herland.net \
--cc=john@keeping.me.uk \
--cc=jrnieder@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=torvalds@linux-foundation.org \
--cc=vfr@lyx.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).