From: Christian Couder <chriscool@tuxfamily.org>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: [PATCH v1 0/4] replace: add option to edit a Git object
Date: Sat, 26 Apr 2014 22:00:53 +0200 [thread overview]
Message-ID: <20140426194404.21546.82305.chriscool@tuxfamily.org> (raw)
This patch series comes from what Peff sent in the following thread:
http://thread.gmane.org/gmane.comp.version-control.git/243361/focus=243528
I added the following fixes:
- add "strbuf_release(&result);" in import_object(); this was suggested
by Eric Sunshine
- use MODE_LIST instead of MODE_DELETE if no arguments are passed; this
makes the test suite pass
- add "--no-replace-objects" when calling "git cat-file" in export_object();
so that we edit the original object if an object is already replaced
I am not happy with the fact that if the user doesn't modify the object when
editing it, then a replace ref can still be created that points to the
original object. I think something should be done to avoid that.
Once that is fixed, I plan to add some tests and documentation, but I wanted
first to let you know that I am looking at this.
Jeff King (4):
replace: refactor command-mode determination
replace: use OPT_CMDMODE to handle modes
replace: factor object resolution out of replace_object
replace: add --edit option
builtin/replace.c | 189 ++++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 154 insertions(+), 35 deletions(-)
--
1.9.1.636.g20d5f34
next reply other threads:[~2014-04-26 20:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-26 20:00 Christian Couder [this message]
2014-04-26 20:00 ` [PATCH v1 1/4] replace: refactor command-mode determination Christian Couder
2014-04-26 20:00 ` [PATCH v1 2/4] replace: use OPT_CMDMODE to handle modes Christian Couder
2014-04-26 20:00 ` [PATCH v1 3/4] replace: factor object resolution out of replace_object Christian Couder
2014-04-26 20:00 ` [PATCH v1 4/4] replace: add --edit option Christian Couder
2014-04-29 2:36 ` [PATCH v1 0/4] replace: add option to edit a Git object Jeff King
2014-04-29 21:43 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140426194404.21546.82305.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).