git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Ramkumar Ramachandra <artagnon@gmail.com>,
	Jonathan Nieder <jrnieder@gmail.com>,
	Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>,
	Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v5 06/36] Move sequencer to builtin
Date: Sun,  9 Jun 2013 14:24:20 -0500	[thread overview]
Message-ID: <1370805890-3453-7-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1370805890-3453-1-git-send-email-felipe.contreras@gmail.com>

This code is only useful for cherry-pick and revert built-ins, nothing
else, so let's make it a builtin object.

The first source file that doesn't generate a git-foo builtin, but does
go into the builtin library. Hopefully the first of many to clean
libgit.a.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 Makefile                           | 10 ++++++----
 sequencer.c => builtin/sequencer.c |  0
 sequencer.h => builtin/sequencer.h |  0
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename sequencer.c => builtin/sequencer.c (100%)
 rename sequencer.h => builtin/sequencer.h (100%)

diff --git a/Makefile b/Makefile
index d2af207..4c7bb88 100644
--- a/Makefile
+++ b/Makefile
@@ -716,7 +716,6 @@ LIB_H += resolve-undo.h
 LIB_H += revision.h
 LIB_H += run-command.h
 LIB_H += send-pack.h
-LIB_H += sequencer.h
 LIB_H += sha1-array.h
 LIB_H += sha1-lookup.h
 LIB_H += shortlog.h
@@ -858,7 +857,6 @@ LIB_OBJS += resolve-undo.o
 LIB_OBJS += revision.o
 LIB_OBJS += run-command.o
 LIB_OBJS += send-pack.o
-LIB_OBJS += sequencer.o
 LIB_OBJS += server-info.o
 LIB_OBJS += setup.o
 LIB_OBJS += sha1-array.o
@@ -992,6 +990,9 @@ BUILTIN_OBJS += builtin/verify-pack.o
 BUILTIN_OBJS += builtin/verify-tag.o
 BUILTIN_OBJS += builtin/write-tree.o
 
+BUILTIN_LIB_OBJS += builtin/sequencer.o
+BUILTIN_LIB_OBJS += $(BUILTIN_OBJS)
+
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 EXTLIBS =
 
@@ -1894,7 +1895,8 @@ VCSSVN_OBJS += vcs-svn/svndiff.o
 VCSSVN_OBJS += vcs-svn/svndump.o
 
 TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
-OBJECTS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \
+OBJECTS := $(LIB_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \
+	$(BUILTIN_LIB_OBJS) \
 	$(XDIFF_OBJS) \
 	$(VCSSVN_OBJS) \
 	git.o
@@ -2071,7 +2073,7 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS
 $(LIB_FILE): $(LIB_OBJS)
 	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
 
-$(BUILTIN_LIB): $(BUILTIN_OBJS)
+$(BUILTIN_LIB): $(BUILTIN_LIB_OBJS)
 	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
 
 $(XDIFF_LIB): $(XDIFF_OBJS)
diff --git a/sequencer.c b/builtin/sequencer.c
similarity index 100%
rename from sequencer.c
rename to builtin/sequencer.c
diff --git a/sequencer.h b/builtin/sequencer.h
similarity index 100%
rename from sequencer.h
rename to builtin/sequencer.h
-- 
1.8.3.698.g079b096

  parent reply	other threads:[~2013-06-09 19:27 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-09 19:24 [PATCH v5 00/36] Massive improvents to rebase and cherry-pick Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 01/36] build: generate and clean test scripts Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 02/36] build: do not install git-remote-testgit Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 03/36] build: trivial cleanup Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 04/36] build: add builtin lib Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 05/36] log-tree: remove dependency from sequencer Felipe Contreras
2013-06-09 19:24 ` Felipe Contreras [this message]
2013-06-09 19:24 ` [PATCH v5 07/36] unpack-trees: plug a memory leak Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 08/36] read-cache: plug a few leaks Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 09/36] sequencer: remove useless indentation Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 10/36] sequencer: trivial fix Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 11/36] cherry-pick: don't barf when there's nothing to do Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 12/36] cherry-pick: add --skip-empty option Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 13/36] revert/cherry-pick: add --quiet option Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 14/36] revert/cherry-pick: add --skip option Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 15/36] builtin: add rewrite helper Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 16/36] cherry-pick: store rewritten commits Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 17/36] cherry-pick: don't store skipped commit Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 18/36] builtin: move run_rewrite_hook() to rewrite.c Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 19/36] builtin: add copy_rewrite_notes() Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 20/36] cherry-pick: copy notes and run hooks Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 21/36] cherry-pick: add --action-name option Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 22/36] cherry-pick: remember rerere-autoupdate Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 23/36] rebase: split the cherry-pick stuff Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 24/36] rebase: cherry-pick: fix mode storage Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 25/36] rebase: cherry-pick: fix sequence continuation Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 26/36] rebase: cherry-pick: fix abort of cherry mode Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 27/36] rebase: cherry-pick: fix command invocations Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 28/36] rebase: cherry-pick: fix status messages Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 29/36] rebase: cherry-pick: automatically commit stage Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 30/36] rebase: cherry-pick: set correct action-name Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 31/36] rebase: trivial cleanup Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 32/36] rebase: use 'cherrypick' mode instead of 'am' Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 33/36] rebase: cherry-pick: fix for shell prompt Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 34/36] rebase: cherry-pick: add merge options Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 35/36] rebase: remove merge mode Felipe Contreras
2013-06-09 19:24 ` [PATCH v5 36/36] rebase: cherry-pick: add copyright Felipe Contreras
2013-06-09 19:37 ` [PATCH v5 00/36] Massive improvents to rebase and cherry-pick Felipe Contreras
2013-06-10 22:55   ` Phil Hord
2013-06-10 23:43     ` Felipe Contreras
2013-06-11  1:09       ` Phil Hord
2013-06-11  3:52         ` 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1370805890-3453-7-git-send-email-felipe.contreras@gmail.com \
    --to=felipe.contreras@gmail.com \
    --cc=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=martin.von.zweigbergk@gmail.com \
    /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).