Re: [PATCH v1 0/3] Add --graft option to git replace

2014-05-27 Thread Christian Couder
From: Junio C Hamano gits...@pobox.com
Subject: Re: [PATCH v1 0/3] Add --graft option to git replace
Date: Fri, 23 May 2014 09:59:05 -0700

 Christian Couder chrisc...@tuxfamily.org writes:
 
 Here is a small patch series to implement:

  git replace [-f] --graft commit [parent...]

 The changes since the RFC/PATCH are the following:

 - in patch 1/3, parse_commit_buffer() is now used to
   make sure commit is not corrupt
 - patch 2/3 add some tests
 - patch 3/3 add some documentation

 About the documentation, maybe we should add that --graft
 can now be used instead of grafts in .git/info/grafts,
 and maybe we could add an example that shows how it can
 be done.
 
 Or a procedure that reads .git/info/grafts, converts it to a set of
 replacements and drops .git/info/grafts.  A sample script could be
 thrown in to contrib/ somewhere as convert-graft-to-replace.sh.

Ok, I just sent a patch that adds such a sample script.

Thanks,
Christian.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH v1 0/3] Add --graft option to git replace

2014-05-23 Thread Junio C Hamano
Christian Couder chrisc...@tuxfamily.org writes:

 Here is a small patch series to implement:

   git replace [-f] --graft commit [parent...]

 The changes since the RFC/PATCH are the following:

 - in patch 1/3, parse_commit_buffer() is now used to
   make sure commit is not corrupt
 - patch 2/3 add some tests
 - patch 3/3 add some documentation

 About the documentation, maybe we should add that --graft
 can now be used instead of grafts in .git/info/grafts,
 and maybe we could add an example that shows how it can
 be done.

Or a procedure that reads .git/info/grafts, converts it to a set of
replacements and drops .git/info/grafts.  A sample script could be
thrown in to contrib/ somewhere as convert-graft-to-replace.sh.

 Christian Couder (3):
   replace: add --graft option
   replace: add test for --graft
   Documentation: replace: add --graft option

  Documentation/git-replace.txt |  8 +
  builtin/replace.c | 84 
 ++-
  t/t6050-replace.sh| 12 +++
  3 files changed, 103 insertions(+), 1 deletion(-)
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH v1 0/3] Add --graft option to git replace

2014-05-22 Thread Christian Couder
Here is a small patch series to implement:

git replace [-f] --graft commit [parent...]

The changes since the RFC/PATCH are the following:

- in patch 1/3, parse_commit_buffer() is now used to
  make sure commit is not corrupt
- patch 2/3 add some tests
- patch 3/3 add some documentation

About the documentation, maybe we should add that --graft
can now be used instead of grafts in .git/info/grafts,
and maybe we could add an example that shows how it can
be done.

Christian Couder (3):
  replace: add --graft option
  replace: add test for --graft
  Documentation: replace: add --graft option

 Documentation/git-replace.txt |  8 +
 builtin/replace.c | 84 ++-
 t/t6050-replace.sh| 12 +++
 3 files changed, 103 insertions(+), 1 deletion(-)

-- 
1.9.rc0.17.g651113e

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html