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

Make prefix for user repositories directory configurable #116

Merged
merged 4 commits into from Sep 17, 2013

Conversation

flaix
Copy link
Member

@flaix flaix commented Aug 22, 2013

Make the currently fixed prefix for the user repositories directory ('~') configurable. Refactor code to gather all uses of the prefix into a new class (for lack of a better name called 'ModelUtils').
An empty prefix is not allowed. The prefix can also be a path relative to the repositories folder. An absolute path is made relative by removing the first '/'. Currently requires reload. I'm not sure if it makes sense to make this dynamically updatable. It should be possible, though.

@flaix
Copy link
Member Author

flaix commented Aug 25, 2013

Beginner question: what would be the impact if I were to rebase this branch onto v1.3.2? I know the "don't rebase pushed commits" mantra. I am wondering though if it really applies that unconditionally. As long as you haven't merged this branch, or have added commits, would it still cause trouble if I would rebase and push again?

@gitblit
Copy link
Collaborator

gitblit commented Aug 26, 2013

I don't think Github can handle rebasing a pull request. Would be nice if it could. I think you'd have to create a new pull request. This is where Gerrit's workflow becomes attractive.

@flaix
Copy link
Member Author

flaix commented Aug 26, 2013

Hmm, if you don't mind, i.e. you haven't done anything with the branch yet, I'll try it and see how this is handled.

Gather logic for building the path/name of a personal user repository into one class.
Set the user repository name space from settings when starting Gitblit.
@gitblit
Copy link
Collaborator

gitblit commented Aug 26, 2013

Go for it. I want to know too.

@flaix
Copy link
Member Author

flaix commented Aug 26, 2013

I believe Github handles a rebase pretty nicely. Still four commits, but the rebased ones. Apparently it only looks at the branch and uses whatever is the current content of it. Well, of course only as long as it hasn't been merged.
So, as long as the receiving end of a Github pull request hasn't merged it yet, or otherwise integrated it into the origin, or someone else has pulled the branch and based work off it, I would say rebasing is a viable way to update a pull request to a more current state of the origin. Maybe with a bit of communication.

@gitblit
Copy link
Collaborator

gitblit commented Aug 26, 2013

Did you just re-push to your feature branch? Or did you also have to
manually intervene (somehow) through Github's web UI ?

@flaix
Copy link
Member Author

flaix commented Aug 27, 2013

I simply rebased locally and force pushed to Github.

@gitblit gitblit merged commit df75fa3 into gitblit-org:master Sep 17, 2013
@flaix flaix deleted the userrepoprefix branch May 25, 2014 10:17
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.

None yet

2 participants