[debian-edu-commits] [Debian Wiki] Update of "DebianEdu/HowTo/Git" by WolfgangSchweer

[Debian Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification.

The "DebianEdu/HowTo/Git" page has been changed by WolfgangSchweer:
https://wiki.debian.org/DebianEdu/HowTo/Git?action=diff&rev1=18&rev2=19

Comment:
Updated to reflect the move to salsa.

  = Debian Edu Git =
  
- Beginning with Debian Edu wheezy (7.0) Debian Edu development has moved from using SVN to moving Git. The Debian Edu Git repositories are hosted on http://git.debian.org.
+ Beginning with Debian Edu wheezy (7.0) Debian Edu development has moved from using SVN to using Git (both on Alioth); since 2018-05-30, the Debian Edu Git repositories are hosted on https://salsa.debian.org, Alioth has been shut down 2018-06-01.
+ 
+ == SVN-2-Git Migration Status ==
+ 
+ The migration status of the Debian Edu project files from SVN to Git to Salsa is documented [[DebianEdu/HowTo/Git/SVN2GitMigrationStatus|here]]. Please note the different locations ''debian-edu'', ''debian-edu/upstream'' and ''debian-edu-pkg-team'' on Salsa. 
  
  == SVN vs. Git ==
  
@@ -13, +17 @@

    * With Git we have loads of little repositories (one per Debian package), with SVN we just had a huge directory tree.
    * With Git tags and branches are much nicer and completely different from the handling in SVN.
    * Git does not know about folders. Git only know files. If you intend to place a(n empty) folder somewhere inside a Git repos you have to create an empty {{{.placeholder}}} file in that folder.
- 
- == SVN-2-Git Migration Status ==
- 
- During the migration of the Debian Edu project files from SVN to Git the current status of the migration can be viewed (and documented) [[DebianEdu/HowTo/Git/SVN2GitMigrationStatus|here]].
  
  == Setting up a Debian Edu related Git project ==
  
@@ -36, +36 @@

  $ git commit [<file1> <file2> ... <fileN>|-a] -m "<commit-message>"
  }}}
  
- Continue with your work (add/edit files, commit working steps, etc.) until you think that your package needs to be pushed to the Debian Edu namespace on http://git.debian.org.
+ Continue with your work (add/edit files, commit working steps, etc.) until you think that your package needs to be pushed to the Debian Edu namespace on https://salsa.debian.org.
  
  For a Git based Debian packaging workflow, please refer to this page: http://wiki.debian.org/PackagingWithGit
  
  === Second: initialize central repository in the Debian Edu namespace ===
  
+ See the Salsa related instructions available here: https://wiki.debian.org/Salsa 
- 
- Secondly, for initializing a new Git repository in the Debian Edu namespace on http://git.debian.org the Debian Edu project has provided a [[http://anonscm.debian.org/gitweb/?p=debian-edu/d-e-gitscripts.git;a=summary|set of scripts (the Debian Edu GitScripts)]].
- 
- Clone the d-e-gitscripts.git repository locally and symlink the {{{d-e-gitcreate}}} script to {{{~/bin}}}.{{{
- $ git clone git://git.debian.org/debian-edu/d-e-gitscripts.git ~/d-e-gitscripts
- $ ln -s ~/d-e-gitscripts/bin/d-e-gitcreate ~/bin
- }}}
- NOTE: the pathes only work if you execute the first command directly in $HOME
- 
- ==== Initialize a Debian packaging Git project ====
- 
- For Debian packaging projects use the following commands (from inside your git project folder):{{{
- $ cd ~/<my-edu-project>
- $ d-e-gitcreate <my-edu-project>
- }}}
- ==== Initialize an upstream Git project ====
- 
- Debian Edu development does also brings forth some little upstream projects. These are also hosted on http://git.debian.org
- 
- For upstream projects use the following commands (from inside your git project folder):{{{
- $ cd ~/<my-edu-project>
- $ d-e-git-create upstream/<my-edu-project>
- }}}
- 
- 
- 
- The {{{d-e-gitcreate}}} script will create server-side Git projects that are conform to some standards agreed upon within the Debian Edu developer team:
- 
-   * commit and tag messages are mailed to commits at skolelinux.org
-   * commit and tag messages are also displayed on #debian-edu channel on {{{irc.debian.org}}}
-   * [[http://anonscm.debian.org/gitweb/?p=debian-edu/_hooks_/.git;a=tree|hook scripts]] are added to the server-side Git projects that do some sanity checks on files and allow ACLs on Git projects
  
  === Third: contributing to an already existing Git project ===
  
  Clone the repository that you want to contribute to and get acquainted to the Git workflow used for that package. Recommended workflow for packaging is taking advantage of tools like {{{git-buildpackage}}}, {{{pristine-tar}}}, {{{git-import-orig}}}, {{{git-import-dsc}}} and others.
  
+ If you used Git ssh access already on Alioth for a repository, you'd want to
+  * upload your public ssh key to Salsa (via ''Settings'' after logged in on https://salsa.debian.org)
+  * request membership for the project
+  * replace {{{url = git+ssh://git.debian.org/git/}}} with {{{url = git at salsa.debian.org:}}} in the project related local .git/config file
+  * continue to work just like before
+ 
  Again: refer to this location: http://wiki.debian.org/PackagingWithGit
+ 
  ----
  CategoryGit