New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

create_release error #13613

Closed
ibennetch opened this Issue Aug 24, 2017 · 11 comments

Comments

Projects
None yet
2 participants
@ibennetch
Member

ibennetch commented Aug 24, 2017

When running ./scripts/create_release 4.7.4 QA_4_7 --tag --stable I get this error:

   Dont forget to push tags using: git push --tags
fatal: pathspec 'composer.lock' did not match any files

This probably comes from the command git rm --force composer.lock

@nijel

This comment has been minimized.

Show comment
Hide comment
@nijel

nijel Aug 25, 2017

Member

Did it work fine for 4.7.3? Did you upgrade git meanwhile?

Looking at the QA_4_7 branch, the file has been added for tag, but the removal later fails, what sounds a bit strange....

Member

nijel commented Aug 25, 2017

Did it work fine for 4.7.3? Did you upgrade git meanwhile?

Looking at the QA_4_7 branch, the file has been added for tag, but the removal later fails, what sounds a bit strange....

@nijel nijel self-assigned this Aug 25, 2017

@ibennetch

This comment has been minimized.

Show comment
Hide comment
@ibennetch

ibennetch Aug 25, 2017

Member

I believe it's been happening since we integrated Composer in to the release process.

Member

ibennetch commented Aug 25, 2017

I believe it's been happening since we integrated Composer in to the release process.

@nijel

This comment has been minimized.

Show comment
Hide comment
@nijel

nijel Aug 28, 2017

Member

What git version do you use? Maybe there is some change in handling ignored files...

Member

nijel commented Aug 28, 2017

What git version do you use? Maybe there is some change in handling ignored files...

@ibennetch

This comment has been minimized.

Show comment
Hide comment
@ibennetch

ibennetch Aug 29, 2017

Member

git version 2.7.0.GIT

This doesn't make much sense; I've done some tests in a new and empty repository.

echo "foo" > .gitignore
touch foo
git add --force foo
git commit "Add"
git rm --force foo
git commit -sm "Remove"

works as expected and without error.

I'll have to add some debugging code to see what's going on here.

Member

ibennetch commented Aug 29, 2017

git version 2.7.0.GIT

This doesn't make much sense; I've done some tests in a new and empty repository.

echo "foo" > .gitignore
touch foo
git add --force foo
git commit "Add"
git rm --force foo
git commit -sm "Remove"

works as expected and without error.

I'll have to add some debugging code to see what's going on here.

@nijel

This comment has been minimized.

Show comment
Hide comment
@nijel

nijel Dec 6, 2017

Member

Did the error happen now? Or it worked just fine?

Member

nijel commented Dec 6, 2017

Did the error happen now? Or it worked just fine?

@ibennetch

This comment has been minimized.

Show comment
Hide comment
@ibennetch

ibennetch Dec 11, 2017

Member

It happened again.

I'm using a more updated Git now, too (though I don't recall the version off hand).

Member

ibennetch commented Dec 11, 2017

It happened again.

I'm using a more updated Git now, too (though I don't recall the version off hand).

@nijel

This comment has been minimized.

Show comment
Hide comment
@nijel

nijel Dec 15, 2017

Member

Ah, now I see it - we're operating on wrong branch here...

Member

nijel commented Dec 15, 2017

Ah, now I see it - we're operating on wrong branch here...

@nijel

This comment has been minimized.

Show comment
Hide comment
@nijel

nijel Dec 15, 2017

Member

BTW: It seems you forgot to push the RELEASE_4_7_6 tag...

Member

nijel commented Dec 15, 2017

BTW: It seems you forgot to push the RELEASE_4_7_6 tag...

@nijel nijel closed this in dc0e9a5 Dec 15, 2017

@nijel nijel added this to the 4.7.7 milestone Dec 15, 2017

@ibennetch

This comment has been minimized.

Show comment
Hide comment
@ibennetch

ibennetch Dec 15, 2017

Member

Thanks for finding and fixing this.

It looks to me like the tag was pushed correctly, including at https://github.com/phpmyadmin/phpmyadmin/tags and with git ls-remote --tags origin. Might you see it now?

Member

ibennetch commented Dec 15, 2017

Thanks for finding and fixing this.

It looks to me like the tag was pushed correctly, including at https://github.com/phpmyadmin/phpmyadmin/tags and with git ls-remote --tags origin. Might you see it now?

@nijel

This comment has been minimized.

Show comment
Hide comment
@nijel

nijel Dec 16, 2017

Member

Hmm, apparently something is broken in my working copy - I can indeed see it in git ls-remote --tags origin, but the tag is not fetched. Anyway the repository looks okay, it's problem on my side, sorry for noise.

Member

nijel commented Dec 16, 2017

Hmm, apparently something is broken in my working copy - I can indeed see it in git ls-remote --tags origin, but the tag is not fetched. Anyway the repository looks okay, it's problem on my side, sorry for noise.

@nijel

This comment has been minimized.

Show comment
Hide comment
@nijel

nijel Dec 16, 2017

Member

Hmm, it looks strange - the tag is not on the QA_4_7 branch, but on seraparate one split from QA_4_7 just before release (last common commit is c6f3c40).

See the two histories:

Anyway git fetch --tags did get me the missing tags and I've merged the split history in 79a95b6.

Member

nijel commented Dec 16, 2017

Hmm, it looks strange - the tag is not on the QA_4_7 branch, but on seraparate one split from QA_4_7 just before release (last common commit is c6f3c40).

See the two histories:

Anyway git fetch --tags did get me the missing tags and I've merged the split history in 79a95b6.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment