The new 7.x-3.17 tag should be merged into 7.x-3.x. To do this, run:

git checkout 7.x-3.x && git merge --no-edit 7.x-3.17

Comments

Liam Morland created an issue. See original summary.

lnicks’s picture

lnicks commented

This would be handy, because since the commit id associated with the tag is not associated with a branch head, a standard git fetch is not allowing us to use this as a submodule, we have to fetch the tags for each submodule first and checkout by tag rather than commit id.

grossmann’s picture

grossmann commented

This seems to be reason why I can not upgrade with drush as the tag 7.x-3.17 is missing.
error: pathspec '7.x-3.17' did not match any file(s) known to git.

mustanggb’s picture

mustanggb commented

What is going on here?

liam morland’s picture

liam morland
Primary language English
Location Ontario, CA 🇨🇦
commented

Tag 7.x-3.17 is not on branch 7.x-3.x. Until this merge is done, you need to run git fetch --tags before checking it out.

damienmckenna’s picture

damienmckenna
Location TN, USA
commented
Assigned: Unassigned » dawehner
Priority: Normal » Critical

Assigning to dawehner to take care of, this is urgent as it's effectively blocking us from committing other changes.

damienmckenna’s picture

damienmckenna
Location TN, USA
commented
Parent issue: » #2866162: Plan for Views 7.x-3.18 release
damienmckenna’s picture

damienmckenna
Location TN, USA
commented

Ok, so it's a little weird. I'm not sure if the tag can be "moved", given it exists on a different branch that no longer exists, though the individual commits are now in the 7.x-3.x branch. Sorry.

I guess in the meantime we just need to get better about doing regular updates.

liam morland’s picture

liam morland
Primary language English
Location Ontario, CA 🇨🇦
commented

The merge can still happen even though the commit is already on 7.x-3.x. Doing the merge has no effect on the contents of a working copy, but it does make the history make more sense.

It is good that the security issue was released on its own. People can update more confident that it won't break their site since the only change is the security issue.

damienmckenna’s picture

damienmckenna
Location TN, USA
commented
Assigned: dawehner » Unassigned
Status: Active » Fixed

Oh, ok.

$ git merge --no-edit 7.x-3.17
Merge made by the 'recursive' strategy.

$ git push
Counting objects: 1, done.
Writing objects: 100% (1/1), 229 bytes | 0 bytes/s, done.
Total 1 (delta 0), reused 0 (delta 0)
To git.drupal.org:project/views.git
   3439ab35..62477fd7  7.x-3.x -> 7.x-3.x

$ git log
commit 62477fd7afc0931c61080fe51af1f192446b9112 (HEAD -> 7.x-3.x, origin/HEAD, origin/7.x-3.x)
Merge: 3439ab35 59c2d413
Author: Damien McKenna <damien@mc-kenna.com>
Date:   Thu Aug 17 15:18:44 2017 -0400

    Merge tag '7.x-3.17' into 7.x-3.x

Thanks Liam, I learned something new today :)

grossmann’s picture

grossmann commented

Thanks for the fast help.
drush up views worked as expected.

dawehner’s picture

dawehner
Primary language German
commented

Thank you again!

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.