Skip to content

Test coverage for branch-only submodule#1051

Merged
nulltoken merged 8 commits intovNextfrom
gh604
Jun 19, 2015
Merged

Test coverage for branch-only submodule#1051
nulltoken merged 8 commits intovNextfrom
gh604

Conversation

@dahlbyk
Copy link
Member

@dahlbyk dahlbyk commented May 16, 2015

Proves that #604 is fixed.

Also:

  • Added diff to Resources/.gitattributes for commonly-modified text files - respected locally even if GitHub seems to ignore .gitattributes.
  • Made remote.origin.url relative in all submodule_wd/.git/modules.
  • Added ignore rule for files we don't really need in the Resources repos (e.g. ref logs and info/exclude) - fewer files to copy = faster tests.

@dahlbyk
Copy link
Member Author

dahlbyk commented May 16, 2015

Remove extra test resource files

Oops, need reflog for standard repo tests.

@nulltoken
Copy link
Member

@dahlbyk 🆒 ‼️ Any chance you could simplify the history a bit?

@dahlbyk
Copy link
Member Author

dahlbyk commented May 16, 2015

Sure, what do you have in mind?

@nulltoken
Copy link
Member

Maybe squash the last two commits together as the first one doesn't build by itself?

@nulltoken
Copy link
Member

@dahlbyk ping?

@dahlbyk
Copy link
Member Author

dahlbyk commented Jun 17, 2015

Better?

@nulltoken
Copy link
Member

@jamill @whoisj You're more into submodules than me. Could you please take a look at this PR?

@whoisj
Copy link

whoisj commented Jun 18, 2015

@nulltoken @dahlbyk I will look at this, but today I'm heads down on something else. Can we wait until tomorrow?

@nulltoken
Copy link
Member

@dahlbyk ❤️

@whoisj Thanks!

Can we wait until tomorrow?

I think so. Some of those commits are one year old.

@whoisj
Copy link

whoisj commented Jun 19, 2015

LGTM

@dahlbyk 🙇 thanks!

@nulltoken nulltoken added this to the v0.22 milestone Jun 19, 2015
nulltoken added a commit that referenced this pull request Jun 19, 2015
Test coverage for branch-only submodule
@nulltoken nulltoken merged commit 9d3fe4d into vNext Jun 19, 2015
@nulltoken nulltoken deleted the gh604 branch June 19, 2015 21:55
@nulltoken
Copy link
Member

🚢'd

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants