Summary: | kdesrc-build appends origin-$branch | ||
---|---|---|---|
Product: | [Developer tools] kdesrc-build | Reporter: | Giorgos Tsiapaliokas <giorgos.tsiapaliokas> |
Component: | general | Assignee: | Michael Pyne <mpyne> |
Status: | RESOLVED FIXED | ||
Severity: | normal | ||
Priority: | NOR | ||
Version: | unspecified | ||
Target Milestone: | --- | ||
Platform: | Gentoo Packages | ||
OS: | Linux | ||
Latest Commit: | http://commits.kde.org/kdesrc-build/767942ff729e29cd9515e859ed080017c20e5321 | Version Fixed In: | 1.15 |
Description
Giorgos Tsiapaliokas
2012-02-18 10:51:19 UTC
The current behavior is to try and avoid stamping on existing branch names. With that in mind I don't mind changing to have the local branch name match the remote branch name if there isn't a local branch already, but I would have to look into how best to check for that. ;) (In reply to comment #1) > The current behavior is to try and avoid stamping on existing branch names. > With that in mind I don't mind changing to have the local branch name match > the remote branch name if there isn't a local branch already, but I would > have to look into how best to check for that. ;) I see your point. Maybe you could add an option for both. Git commit 767942ff729e29cd9515e859ed080017c20e5321 by Michael Pyne. Committed on 30/04/2012 at 04:17. Pushed by mpyne into branch 'master'. Use remote branch name for local branch if possible. When setting up a local remote-tracking branch (either on clone or when the user chooses a different branch in the rc file), kdesrc-build has preferred a '$remoteName-$branchName' naming convention to try to avoid stepping on user's existing branches. In reality most users do not use local branches, and those that do would (according to feedback I've received) prefer the local and remote branch names to be the same as per git practice basically everywhere. Since it's easy enough to check that the local branch doesn't already exist before creating it, just do that and drop the remote name from the created branch name. FIXED-IN:1.15 M +17 -11 kdesrc-build http://commits.kde.org/kdesrc-build/767942ff729e29cd9515e859ed080017c20e5321 |