git/builtin/replace.c, branch v2.1.2

Merge branch 'cc/replace-graft'

2014-07-27T22:14:18Z

"git replace" learned a "--graft" option to rewrite parents of a commit. * cc/replace-graft: replace: add test for --graft with a mergetag replace: check mergetags when using --graft replace: add test for --graft with signed commit replace: remove signature when using --graft contrib: add convert-grafts-to-replace-refs.sh Documentation: replace: add --graft option replace: add test for --graft replace: add --graft option replace: cleanup redirection style in tests

replace: check mergetags when using --graft

2014-07-21T19:06:49Z

When using --graft, with a mergetag in the original commit, we should check that the commit pointed to by the mergetag is still a parent of then new commit we create, otherwise the mergetag could be misleading. If the commit pointed to by the mergetag is no more a parent of the new commit, we could remove the mergetag, but in this case there is a good chance that the title or other elements of the commit might also be misleading. So let's just error out and suggest to use --edit instead on the commit. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

replace: remove signature when using --graft

2014-07-21T19:05:58Z

It could be misleading to keep a signature in a replacement commit, so let's remove it. Note that there should probably be a way to sign the replacement commit created when using --graft, but this can be dealt with in another commit or patch series. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

replace: add --graft option

2014-07-21T19:04:23Z

The usage string for this option is: git replace [-f] --graft [...] First we create a new commit that is the same as except that its parents are [...] Then we create a replace ref that replace with the commit we just created. With this new option, it should be straightforward to convert grafts to replace refs. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

replace: add a --raw mode for --edit

2014-06-25T22:28:28Z

One of the purposes of "git replace --edit" is to help a user repair objects which are malformed or corrupted. Usually we pretty-print trees with "ls-tree", which is much easier to work with than the raw binary data. However, some forms of corruption break the tree-walker, in which case our pretty-printing fails, rendering "--edit" useless for the user. This patch introduces a "--raw" option, which lets you edit the binary data in these instances. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

replace: use argv_array in export_object

2014-06-25T22:28:01Z

This is a little more verbose, but will make it easier to make parts of our command-line conditional (without resorting to magic numbers or lots of NULLs to get an appropriately sized argv array). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

avoid double close of descriptors handed to run_command

2014-06-25T22:27:24Z

When a file descriptor is given to run_command via the "in", "out", or "err" parameters, run_command takes ownership. The descriptor will be closed in the parent process whether the process is spawned successfully or not, and closing it again is wrong. In practice this has not caused problems, because we usually close() right after start_command returns, meaning no other code has opened a descriptor in the meantime. So we just get EBADF and ignore it (rather than accidentally closing somebody else's descriptor!). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

replace: replace spaces with tabs in indentation

2014-06-25T22:26:46Z

This matches our usual style and the surrounding code. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

replace: add --edit to usage string

2014-05-19T20:39:54Z

Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

replace: die early if replace ref already exists

2014-05-19T20:39:53Z

If a replace ref already exists for an object, it is much better for the user if we error out before we let the user edit the object, rather than after. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano