From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 0/4] git replace --edit --raw
Date: Tue, 24 Jun 2014 05:42:25 -0400 [thread overview]
Message-ID: <20140624094217.GA14216@sigill.intra.peff.net> (raw)
I tried to use "git replace --edit" today to repair a corrupted tree
that had an empty filename:
$ git replace --edit HEAD^{tree}
fatal: empty filename in tree entry
fatal: cat-file reported failure
Oops. One of the major purposes of the command is to repair broken
objects. This series introduces a "--raw" option to let you easily edit
the binary if need be.
The first two patches are unrelated cleanups I noticed in the area. The
third is refactoring, and the final one is the interesting bit.
There's a minor textual conflict in the documentation with
cc/replace-graft, but it's pretty straightforward to resolve.
[1/4]: replace: replace spaces with tabs in indentation
[2/4]: avoid double close of descriptors handed to run_command
[3/4]: replace: use argv_array in export_object
[4/4]: replace: add a --raw mode for --edit
-Peff
next reply other threads:[~2014-06-24 9:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-24 9:42 Jeff King [this message]
2014-06-24 9:43 ` [PATCH 1/4] replace: replace spaces with tabs in indentation Jeff King
2014-06-24 9:45 ` [PATCH 2/4] avoid double close of descriptors handed to run_command Jeff King
2014-06-24 9:46 ` [PATCH 3/4] replace: use argv_array in export_object Jeff King
2014-06-24 9:46 ` [PATCH 4/4] replace: add a --raw mode for --edit Jeff King
2014-06-25 1:40 ` Eric Sunshine
2014-06-25 10:24 ` Jeff King
2014-06-25 22:33 ` Junio C Hamano
2014-06-26 15:55 ` Jeff King
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=20140624094217.GA14216@sigill.intra.peff.net \
--to=peff@peff.net \
--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).