Skip to content
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

Offer the SDK by simply cloning it (closes #1357) #171

Merged
merged 7 commits into from
Mar 14, 2018

Conversation

bbolli
Copy link
Collaborator

@bbolli bbolli commented Feb 11, 2018

No description provided.

@bbolli bbolli changed the title [DON'Gh 1357 [DO-NOT-MERGE] WIP fix for #1357 for reviewing Feb 11, 2018
@bbolli
Copy link
Collaborator Author

bbolli commented Feb 11, 2018

Alright, I'll try to come up with a new series.

@dscho
Copy link
Member

dscho commented Feb 11, 2018

Thanks!

Please just force-push your branch once ready, this will update the PR as well.

@dscho
Copy link
Member

dscho commented Feb 19, 2018

@bbolli do you need anything from my side, or are you simply pressed for time (as we all are)?

@bbolli
Copy link
Collaborator Author

bbolli commented Feb 24, 2018

@dscho Actually I was on vacation, but I'll put in a few hours this weekend. Stay tuned...

@dscho
Copy link
Member

dscho commented Feb 26, 2018

Stay tuned...

Thanks!

@dscho
Copy link
Member

dscho commented Feb 27, 2018

Maybe we can introduce a shell function to facilitate all kinds of SDK things, including generating the desktop shortcut?

@bbolli what do you think of this sdk shell function idea?

@bbolli
Copy link
Collaborator Author

bbolli commented Feb 27, 2018

I'm in the process of implementing it. What other features should it have besides those in your sample?

@dscho
Copy link
Member

dscho commented Feb 27, 2018

I'm in the process of implementing it.

Great!

What other features should it have besides those in your sample?

I think we will find more and more things we will want to do, on the go.

I could imagine for example that it would be nice if there was an easy way to build a custom installer pulling in a git-extra from PR #171 and Git from PR git-for-windows/git#1492 ;-)

But I think that it would be good to just have something for starters, and not block this here PR for possible crazy feature requests ;-)

sdk () {
case "$1" in
help|--help|-h)
echo "The '$0' shell function helps you to get up and running

This comment was marked as off-topic.

This comment was marked as off-topic.

@@ -20,3 +20,52 @@ case "$rootdir" in
fi
;;
esac


sdk () {

This comment was marked as off-topic.

Let our developers-to-be get started in a less intimidating way.
See the built-in help (`sdk help`) for its subcommands.

This addresses git-for-windows/git#1357.

Signed-off-by: Beat Bolli <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
mkdir -p "$dest" &&
git init "$dest" &&
git -C "$dest" remote add origin https://github.com/git-for-windows/$2
fi &&

This comment was marked as off-topic.

@dscho
Copy link
Member

dscho commented Mar 12, 2018

@bbolli I added a few commits and force-pushed to your branch; I hope you do not mind...

Could you have a look and tell me what you think?

;;
*)
sdk die "Unhandled repository: $2" >&2
;;
esac
;;
init)
init_lazy "$2" &&

This comment was marked as off-topic.

This comment was marked as off-topic.

dscho added 6 commits March 14, 2018 17:42
The git/, build-extra/, MINGW-packages/ and MSYS2-packages/ worktrees
are pretty important in the Git for Windows SDKs. Let's initialize them
by default so that they are there (but do not fetch them just yet, just
set up core.autoCRLF=false and the `origin` remote).

This is in line with the way the SDK installer worked so far: the idea
of this commit & friends is to replace the SDK installer by a simple

	git clone https://github.com/git-for-windows/git-sdk-64 &&
	git-sdk-64/git-bash.exe

For historical reasons, we do *not* initalize those worktrees in the SDK
installer if the environment variable `JENKINS_URL` is set.

Signed-off-by: Johannes Schindelin <[email protected]>
This is another step toward replacing the SDK installer by a simple
clone of https://github.com/git-for-windows/git-sdk-64.

Signed-off-by: Johannes Schindelin <[email protected]>
It makes sense to tell the user a few things or two...

Signed-off-by: Johannes Schindelin <[email protected]>
One of the most important things users will want to do is to build a
custom installer. Let's offer an easy way to do that, too.

Signed-off-by: Johannes Schindelin <[email protected]>
When the user did not specify anything to build, or something we do not
know about, let's just print a list of supported build targets and error
out.

Signed-off-by: Johannes Schindelin <[email protected]>
Many feature requests involve improvements to the installer. Let's make
that easy by letting the user build it with

	sdk build installer

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho
Copy link
Member

dscho commented Mar 14, 2018

@bbolli I would like to merge this as soon as possible, no idea what your availability is these days? I guess I'll just wait a couple minutes and then merge, build a new git-extra package, upload it to the Pacman repositories, and update the Git mirrors of the SDK so that we finally have something usable.

@dscho
Copy link
Member

dscho commented Mar 14, 2018

@bbolli I hope you don't mind that I merge this already ;-)

@dscho dscho merged commit 5c13ef5 into git-for-windows:master Mar 14, 2018
@dscho
Copy link
Member

dscho commented Mar 14, 2018

To clarify: I think it was most important to get this into the SDK, and we can easily develop it further from here. Thank you @bbolli for getting the ball rolling!

@dscho dscho changed the title [DO-NOT-MERGE] WIP fix for #1357 for reviewing Offer the SDK by simply cloning it (closes #1357) Mar 14, 2018
@bbolli bbolli deleted the gh-1357 branch March 14, 2018 18:18
@bbolli
Copy link
Collaborator Author

bbolli commented Mar 14, 2018

Sure, no problem!

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.

2 participants