From: Stephen Robin <stephen.robin@gmail.com>
To: pyokagan@gmail.com
Cc: git@vger.kernel.org
Subject: [PATCH 0/6] Make pull a builtin
Date: Wed, 6 May 2015 01:00:47 +0100 [thread overview]
Message-ID: <1430870453-5408-1-git-send-email-stephen.robin@gmail.com> (raw)
In-Reply-To: <CACRoPnQ5_r-26J4gBHc27KZt3X9KAU7eFkA3vz_GE6_dP-Uyug@mail.gmail.com>
Hi Paul,
Congratulations on getting your project accepted for GSOC. Here's my
attempt at implementing pull as a builtin, maybe it will be of some use
as you look to progress your version.
It's fairly complete in the sense that all the features of git-pull.sh
should be implemented, the test suite passes, and I've been using it
myself without issue. At the same time it's some way from finished as
I've never had time to test it fully and there are parts of the code I'm
not happy with.
Apologies for not sharing this with you earlier. I have been too busy
with paid work to look at any open source projects for some months.
Good luck with your project!
Regards
Stephen
Stephen Robin (6):
merge: tidy up options
merge: move error message given when a merge needs committing to
advice.c
merge-base: split handle_fork_point to make reuse easier
pull: reimplement as a builtin in C
pull: allow interactive rebase
parse-remote: dismantle git-parse-remote.sh
.gitignore | 2 -
Documentation/config.txt | 1 +
Documentation/git-parse-remote.txt | 23 -
Documentation/git-pull.txt | 4 +-
Makefile | 3 +-
advice.c | 9 +
advice.h | 1 +
builtin.h | 3 +
builtin/merge-base.c | 64 ++-
builtin/merge.c | 16 +-
builtin/pull.c | 1006 ++++++++++++++++++++++++++++++++++
builtin/remote.c | 8 +-
command-list.txt | 1 -
contrib/examples/git-parse-remote.sh | 89 +++
contrib/examples/git-pull.sh | 340 ++++++++++++
git-parse-remote.sh | 89 ---
git-pull.sh | 340 ------------
git-rebase.sh | 36 +-
git-submodule.sh | 8 +-
git.c | 1 +
20 files changed, 1547 insertions(+), 497 deletions(-)
delete mode 100644 Documentation/git-parse-remote.txt
create mode 100644 builtin/pull.c
create mode 100644 contrib/examples/git-parse-remote.sh
create mode 100755 contrib/examples/git-pull.sh
delete mode 100644 git-parse-remote.sh
delete mode 100755 git-pull.sh
--
2.4.0.7.gf20f26f
next prev parent reply other threads:[~2015-05-06 0:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-27 19:50 GSoC 2015: 2 accepted proposals Matthieu Moy
2015-04-28 8:58 ` Paul Tan
2015-04-29 15:27 ` Johannes Schindelin
2015-05-06 0:00 ` Stephen Robin [this message]
2015-05-06 0:00 ` [PATCH 1/6] merge: tidy up options Stephen Robin
2015-05-06 0:00 ` [PATCH 2/6] merge: move error message given when a merge needs committing to advice.c Stephen Robin
2015-05-06 0:00 ` [PATCH 3/6] merge-base: split handle_fork_point to make reuse easier Stephen Robin
2015-05-06 0:00 ` [PATCH 4/6] pull: reimplement as a builtin in C Stephen Robin
2015-05-06 0:00 ` [PATCH 5/6] pull: allow interactive rebase Stephen Robin
2015-05-06 5:43 ` Johannes Schindelin
2015-05-06 0:00 ` [PATCH 6/6] parse-remote: dismantle git-parse-remote.sh Stephen Robin
2015-05-06 4:27 ` [PATCH 0/6] Make pull a builtin Paul Tan
2015-04-28 12:17 ` GSoC 2015: 2 accepted proposals karthik nayak
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=1430870453-5408-1-git-send-email-stephen.robin@gmail.com \
--to=stephen.robin@gmail.com \
--cc=git@vger.kernel.org \
--cc=pyokagan@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).