undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/replace-graft-with-replace-advice'

Browse Source 
The advice message to tell the user to migrate an existing graft
file to the replace system when a graft file was read was shown
even when "git replace --convert-graft-file" command, which is the
way the message suggests to use, was running, which made little
sense.

* ab/replace-graft-with-replace-advice:
  advice: don't pointlessly suggest --convert-graft-file
This commit is contained in:
Junio C Hamano 2018-12-01 21:41:42 +09:00
commit 671e629d6e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/replace.c
View File

@ -495,6 +495,7 @@ static int convert_graft_file(int force)
if (!fp) if (!fp)
return -1; return -1;
advice_graft_file_deprecated = 0;
while (strbuf_getline(&buf, fp) != EOF) { while (strbuf_getline(&buf, fp) != EOF) {
if (*buf.buf == '#') if (*buf.buf == '#')
continue; continue;

5
t/t6050-replace.sh
View File

@ -461,7 +461,10 @@ test_expect_success '--convert-graft-file' '
printf "%s\n%s %s\n\n# comment\n%s\n" \ printf "%s\n%s %s\n\n# comment\n%s\n" \
$(git rev-parse HEAD^^ HEAD^ HEAD^^ HEAD^2) \ $(git rev-parse HEAD^^ HEAD^ HEAD^^ HEAD^2) \
>.git/info/grafts && >.git/info/grafts &&
git replace --convert-graft-file && git status 2>stderr &&
test_i18ngrep "hint:.*grafts is deprecated" stderr &&
git replace --convert-graft-file 2>stderr &&
test_i18ngrep ! "hint:.*grafts is deprecated" stderr &&
test_path_is_missing .git/info/grafts && test_path_is_missing .git/info/grafts &&
: verify that the history is now "grafted" && : verify that the history is now "grafted" &&