Web lists-archives.com

[PATCH v2 0/4] fix `git replace --graft` tag related issues




This is version 2 of a small patch series to fix tag related issues in
`git replace --graft` that Andreas Schwab reported in:

https://public-inbox.org/git/mvmd0mcsjkf.fsf@xxxxxxx/

The first version of this patch series was:

https://public-inbox.org/git/20190328171722.9753-1-chriscool@xxxxxxxxxxxxx/

Changes compared to the previous version are the following:

  - patch 4/4 has been added to fix issues when a tag is passed first

  - in patch 2/4 the error message is redirected to a file instead of
    /dev/null as suggested by Ævar after a comment by Eric

  - title of patch 3/4 has been extended with "as parent" to make it
    different from title of patch 4/4

I saw that t6050 has existing 4-space-instead-of-tabs issues, but it
can perhaps be dealt with if some bigger changes are made to this test
script.

Thanks Taylor for the review, and Eric and Ævar for the
comments/suggestions!

Christian Couder (4):
  t6050: use test_line_count instead of wc -l
  t6050: redirect expected error output to a file
  replace: fix --graft when passing a tag as parent
  replace: fix --graft when passing a tag first

 builtin/replace.c  | 20 +++++++++++++-------
 t/t6050-replace.sh | 31 ++++++++++++++++++++++++++++---
 2 files changed, 41 insertions(+), 10 deletions(-)

-- 
2.21.0.69.g2d86a08d09