debian/0000755000000000000000000000000012256700635007174 5ustar debian/changelog0000644000000000000000000000212512256700610011037 0ustar git-extras (1.9.0-1) unstable; urgency=low * New upstream release, git-bug has a manpage now (closes: #683145). * Drop git-rename-tag-add-shebang patch applied upstream. * Drop fix-git-ignore-manpage patch as no longer relevant. * New maintainer. -- Laszlo Boszormenyi (GCS) Mon, 11 Nov 2013 08:48:06 +0000 git-extras (1.7.0-1.2) unstable; urgency=medium * Non-maintainer upload. * git-changelog, git-effort: Correct unsafe temporary file usage (Closes: #698490) -- Jonathan Wiltshire Sun, 20 Jan 2013 18:07:43 +0000 git-extras (1.7.0-1.1) unstable; urgency=low * Non-maintainer upload to fix Release Critical bug. * Remove the git-gh-pages command, due to it being unsafe and undocumented. Closes: #686833. * Fix git-ignore manpage that had some errors. Added: debian/patches/fix-git-ignore-manpage -- Margarita Manterola Sat, 08 Sep 2012 13:35:20 +0100 git-extras (1.7.0-1) unstable; urgency=low * Initial release (Closes: #632113) -- Jesús Espino Fri, 22 Jun 2012 20:01:27 +0200 debian/compat0000644000000000000000000000000211771132311010361 0ustar 9 debian/control0000644000000000000000000000102412256677224010603 0ustar Source: git-extras Section: vcs Priority: extra Maintainer: Laszlo Boszormenyi (GCS) Build-Depends: debhelper (>= 9), ruby-ronn (>= 0.7.3) Standards-Version: 3.9.5 Homepage: http://github.com/visionmedia/git-extras Package: git-extras Architecture: all Depends: git (>= 1.7.0), ${misc:Depends} Description: Extra commands for git This package provides extra git commands to easily solve typical tasks such as managing remote branches, managing feature/refactor/bug workflows and generate some repository stats. debian/copyright0000644000000000000000000000270412256677307011143 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: git-extras Upstream-Contact: TJ Holowaychuk Source: http://github.com/visionmedia/git-extras Files: * Copyright: 2010-2011 TJ Holowaychuk License: MIT Files: debian/* Copyright: 2013- Laszlo Boszormenyi (GCS) , 2012-2013 Jesús Espino License: MIT License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. debian/docs0000644000000000000000000000003511771132311010034 0ustar Readme.md History.md AUTHORS debian/patches/0000755000000000000000000000000012256700023010612 5ustar debian/patches/change-sh-shebang-to-bash-shebang0000644000000000000000000001123111771132333016741 0ustar Description: Changed sh shebang to bash shebang Change in all files the shebang to bash because the scripts have a lot of bashisms and probably will not work on dash Author: Jesús Espino Forwarded: no --- git-extras-1.7.0.orig/bin/git-delete-submodule +++ git-extras-1.7.0/bin/git-delete-submodule @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash submodule=$1 --- git-extras-1.7.0.orig/bin/git-count +++ git-extras-1.7.0/bin/git-count @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash if test "$1" = "--all"; then git shortlog -n $@ | grep "):" | sed 's|:||' --- git-extras-1.7.0.orig/bin/git-ignore +++ git-extras-1.7.0/bin/git-ignore @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash if test $# -eq 0; then test -f .gitignore && cat .gitignore --- git-extras-1.7.0.orig/bin/git-setup +++ git-extras-1.7.0/bin/git-setup @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash dir=$(test -z "$*" && echo "." || echo "$*") mkdir -p "$dir" \ --- git-extras-1.7.0.orig/bin/git-undo +++ git-extras-1.7.0/bin/git-undo @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash if test $# -eq 0; then git reset --hard HEAD~1 --- git-extras-1.7.0.orig/bin/git-summary +++ git-extras-1.7.0/bin/git-summary @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash commit="" test $# -ne 0 && commit=$@ --- git-extras-1.7.0.orig/bin/git-feature +++ git-extras-1.7.0/bin/git-feature @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash if test "$1" = "finish"; then test -z $2 && echo "feature required." 1>&2 && exit 1 --- git-extras-1.7.0.orig/bin/git-graft +++ git-extras-1.7.0/bin/git-graft @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash src=$1 dst=$2 --- git-extras-1.7.0.orig/bin/git-delete-tag +++ git-extras-1.7.0/bin/git-delete-tag @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash tagname=$1 test -z $tagname && echo "tag required." 1>&2 && exit 1 --- git-extras-1.7.0.orig/bin/git-changelog +++ git-extras-1.7.0/bin/git-changelog @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash DATE=`date +'%Y-%m-%d'` HEAD="\nn.n.n / $DATE \n==================\n\n" --- git-extras-1.7.0.orig/bin/git-refactor +++ git-extras-1.7.0/bin/git-refactor @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash if test "$1" = "finish"; then test -z $2 && echo "refactor required." 1>&2 && exit 1 --- git-extras-1.7.0.orig/bin/git-create-branch +++ git-extras-1.7.0/bin/git-create-branch @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash branch=$1 test -z $branch && echo "branch required." 1>&2 && exit 1 --- git-extras-1.7.0.orig/bin/git-delete-branch +++ git-extras-1.7.0/bin/git-delete-branch @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash branch=$1 test -z $branch && echo "branch required." 1>&2 && exit 1 --- git-extras-1.7.0.orig/bin/git-alias +++ git-extras-1.7.0/bin/git-alias @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash case $# in 0) git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /' | sort ;; --- git-extras-1.7.0.orig/bin/git-contrib +++ git-extras-1.7.0/bin/git-contrib @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash user="$*" --- git-extras-1.7.0.orig/bin/git-effort +++ git-extras-1.7.0/bin/git-effort @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash tmp=/tmp/.git-effort above='0' --- git-extras-1.7.0.orig/bin/git-squash +++ git-extras-1.7.0/bin/git-squash @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash src=$1 msg=$2 --- git-extras-1.7.0.orig/bin/git-bug +++ git-extras-1.7.0/bin/git-bug @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash if test "$1" = "finish"; then test -z $2 && echo "bug required." 1>&2 && exit 1 --- git-extras-1.7.0.orig/bin/git-extras +++ git-extras-1.7.0/bin/git-extras @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash VERSION="1.7.0" --- git-extras-1.7.0.orig/bin/git-commits-since +++ git-extras-1.7.0/bin/git-commits-since @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash SINCE="last week" test $# -ne 0 && SINCE=$@ --- git-extras-1.7.0.orig/bin/git-touch +++ git-extras-1.7.0/bin/git-touch @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash filename="$*" --- git-extras-1.7.0.orig/bin/git-gh-pages +++ git-extras-1.7.0/bin/git-gh-pages @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash echo 'setting up gh-pages' git symbolic-ref HEAD refs/heads/gh-pages \ --- git-extras-1.7.0.orig/bin/git-local-commits +++ git-extras-1.7.0/bin/git-local-commits @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ref=$(git symbolic-ref HEAD) branch=${ref#refs/heads/} --- git-extras-1.7.0.orig/bin/git-rename-tag +++ git-extras-1.7.0/bin/git-rename-tag @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash old=$1 new=$2 --- git-extras-1.7.0.orig/bin/git-fresh-branch +++ git-extras-1.7.0/bin/git-fresh-branch @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash branch=$1 --- git-extras-1.7.0.orig/bin/git-back +++ git-extras-1.7.0/bin/git-back @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash if test $# -eq 0; then git reset --soft HEAD~1 debian/patches/escape_line_dot_start.patch0000644000000000000000000001045212256677160016206 0ustar Description: escape man lines starting with a dot nroff would think these lines as macros and produce and error that it's not a known one. Author: Laszlo Boszormenyi (GCS) --- --- git-extras-1.9.0.orig/man/git-bug.md +++ git-extras-1.9.0/man/git-bug.md @@ -22,9 +22,9 @@ git-bug(1) -- Create bug branch ## EXAMPLES $ git bug bug-123456 - ... + `...` $ git commit -m "Some changes" - ... + `...` $ git checkout master $ git bug finish bug-123456 --- git-extras-1.9.0.orig/man/git-commits-since.md +++ git-extras-1.9.0/man/git-commits-since.md @@ -20,7 +20,7 @@ git-commits-since(1) -- Show commit logs It is really flexible and these are only 3 of the options, go ahead give it a try: $ git commits-since yesterday - ... commits since yesterday + `... commits since yesterday` nickl- - Merge branch upstream master. nickl- - Rebase bolshakov with master TJ Holowaychuk - Merge pull request #128 from nickl-/git-extras-html-hyperlinks @@ -28,11 +28,11 @@ git-commits-since(1) -- Show commit logs nickl- - Fix #127 git-ignore won't add duplicates. $ git commits-since 3 o clock pm - ... commits since 3 o clock pm + `... commits since 3 o clock pm` nickl- - Merge branch upstream master. $ git commits-since 2 hour ago - ... commits since 2 hour ago + `... commits since 2 hour ago` nickl- - Merge branch upstream master. TJ Holowaychuk - Merge pull request #128 from nickl-/git-extras-html-hyperlinks TJ Holowaychuk - Merge pull request #129 from nickl-/develop --- git-extras-1.9.0.orig/man/git-contrib.md +++ git-extras-1.9.0/man/git-contrib.md @@ -24,7 +24,7 @@ git-contrib(1) -- Show user's contributi Moved help msg to node-repl Added multiple arg support for sys.puts(), print(), etc. Fix stack output on socket error - ... + `...` ## AUTHOR --- git-extras-1.9.0.orig/man/git-feature.md +++ git-extras-1.9.0/man/git-feature.md @@ -22,9 +22,9 @@ git-feature(1) -- Create feature branch ## EXAMPLES $ git feature dependencies - ... + `...` $ git commit -m "Some changes" - ... + `...` $ git checkout master $ git feature finish dependencies --- git-extras-1.9.0.orig/man/git-ignore.md +++ git-extras-1.9.0/man/git-ignore.md @@ -62,47 +62,47 @@ Pattern format as described in the git m *.sass-cache # OS or Editor folders - .DS_Store - .Trashes - ._* + `.DS_Store` + `.Trashes` + `._*` Thumbs.db --------------------------------- Local gitignore: .gitignore - .cache - .project - .settings - .tmproj + `.cache` + `.project` + `.settings` + `.tmproj` nbproject If you only want to see the global context use the --global argument (for local use --local): $ git ignore Global gitignore: /home/alice/.gitignore - .DS_Store - .Trashes - ._* + `.DS_Store` + `.Trashes` + `._*` Thumbs.db To quickly append a new pattern to the default/local context simply: $ git ignore *.log Adding pattern(s) to: .gitignore - ... adding '*.log' + `... adding '*.log'` You can now configure any patterns without ever using an editor, with a context and pattern arguments: The resulting configuration is also returned for your convenience. $ git ignore --local "" "# Temporary files" *.tmp "*.log" tmp/* "" "# Files I'd like to keep" '!work' "" Adding pattern(s) to: .gitignore - ... adding '' - ... adding '# Temporary files' - ... adding 'index.tmp' - ... adding '*.log' - ... adding 'tmp/*' - ... adding '' - ... adding '# Files I'd like to keep' - ... adding '!work' - ... adding '' + `... adding ''` + `... adding '# Temporary files'` + `... adding 'index.tmp'` + `... adding '*.log'` + `... adding 'tmp/*'` + `... adding ''` + `... adding '# Files I'd like to keep'` + `... adding '!work'` + `... adding ''` Local gitignore: .gitignore --- git-extras-1.9.0.orig/man/git-refactor.md +++ git-extras-1.9.0/man/git-refactor.md @@ -22,9 +22,9 @@ git-refactor(1) -- Create refactor branc ## EXAMPLES $ git refactor mainlib_refactor - ... + `...` $ git commit -m "Some changes" - ... + `...` $ git checkout master $ git refactor finish mainlib_refactor debian/patches/make_git-obliterate_shell_script.patch0000644000000000000000000000064212256700023020320 0ustar Description: git-obliterate is a shell script, make it so Author: Laszlo Boszormenyi (GCS) --- --- git-extras-1.9.0.orig/bin/git-obliterate +++ git-extras-1.9.0/bin/git-obliterate @@ -1,3 +1,5 @@ +#!/bin/sh + file=$1 test -z $file && echo "file required." 1>&2 && exit 1 git filter-branch -f --index-filter "git rm -r --cached $file --ignore-unmatch" --prune-empty --tag-name-filter cat -- --all debian/patches/remove_utf-8_from_manpages.patch0000644000000000000000000000453012240120010017034 0ustar Description: TODO: Put a short summary on the line above and replace this paragraph with a longer explanation of this change. Complete the meta-information with other relevant fields (see below for details). To make it easier, the Author: Laszlo Boszormenyi (GCS) Last-Update: 2013-11-11 --- --- git-extras-1.9.0.orig/man/git-bug.md +++ git-extras-1.9.0/man/git-bug.md @@ -30,7 +30,7 @@ git-bug(1) -- Create bug branch ## AUTHOR -Written by Jesús Espino <> +Written by Jesus Espino <> ## REPORTING BUGS --- git-extras-1.9.0.orig/man/git-delete-merged-branches.md +++ git-extras-1.9.0/man/git-delete-merged-branches.md @@ -22,7 +22,7 @@ git-delete-merged-branches(1) -- Delete ## AUTHOR -Written by Jesús Espino <> +Written by Jesus Espino <> ## REPORTING BUGS --- git-extras-1.9.0.orig/man/git-feature.md +++ git-extras-1.9.0/man/git-feature.md @@ -30,7 +30,7 @@ git-feature(1) -- Create feature branch ## AUTHOR -Written by Jesús Espino <> +Written by Jesus Espino <> ## REPORTING BUGS --- git-extras-1.9.0.orig/man/git-gh-pages.md +++ git-extras-1.9.0/man/git-gh-pages.md @@ -29,7 +29,7 @@ git-gh-pages(1) -- Create the GitHub Pag ## AUTHOR -Written by Jesús Espino <> +Written by Jesus Espino <> ## REPORTING BUGS --- git-extras-1.9.0.orig/man/git-refactor.md +++ git-extras-1.9.0/man/git-refactor.md @@ -30,7 +30,7 @@ git-refactor(1) -- Create refactor branc ## AUTHOR -Written by Jesús Espino <> +Written by Jesus Espino <> ## REPORTING BUGS --- git-extras-1.9.0.orig/man/git-rename-tag.md +++ git-extras-1.9.0/man/git-rename-tag.md @@ -41,7 +41,7 @@ git-rename-tag(1) -- Rename a tag ## AUTHOR -Written by Jesús Espino <> +Written by Jesus Espino <> ## REPORTING BUGS --- git-extras-1.9.0.orig/man/git-squash.md +++ git-extras-1.9.0/man/git-squash.md @@ -32,7 +32,7 @@ git-squash(1) -- Import changes form a b ## AUTHOR -Written by Jesús Espino <> +Written by Jesus Espino <> ## REPORTING BUGS debian/patches/series0000644000000000000000000000022212256677703012045 0ustar #change-sh-shebang-to-bash-shebang unsafe-tmp remove_utf-8_from_manpages.patch escape_line_dot_start.patch make_git-obliterate_shell_script.patch debian/patches/tmp.patch0000644000000000000000000000051712240121054012430 0ustar --- git-extras-1.9.0.orig/bin/git-changelog +++ git-extras-1.9.0/bin/git-changelog @@ -40,7 +40,8 @@ if test "$CHANGELOG" = ""; then CHANGELOG='History.md'; fi fi -tmp="/tmp/changelog" +tmp="$(mktemp --suffix=git-changelog)" +trap "rm -rf '$tmp'" EXIT printf "$HEAD" > $tmp git-changelog --list >> $tmp printf '\n' >> $tmp debian/patches/unsafe-tmp0000644000000000000000000000213112240121136012604 0ustar Description: correct unsafe usage of temporary files (git-changelog, git-effort) Author: Jonathan Wiltshire Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698490 Forwarded: no Last-Update: 2013-01-20 Index: git-extras-1.9.0/bin/git-changelog =================================================================== --- git-extras-1.9.0/bin/git-changelog +++ git-extras-1.9.0/bin/git-changelog @@ -40,7 +40,8 @@ if test "$CHANGELOG" = ""; then CHANGELOG='History.md'; fi fi -tmp="/tmp/changelog" +tmp="$(mktemp --suffix=git-changelog)" +trap "rm -rf '$tmp'" EXIT printf "$HEAD" > $tmp git-changelog --list >> $tmp printf '\n' >> $tmp Index: git-extras-1.7.0/bin/git-effort =================================================================== --- git-extras-1.7.0.orig/bin/git-effort 2013-01-20 18:15:00.000000000 +0000 +++ git-extras-1.7.0/bin/git-effort 2013-01-20 18:05:35.402409644 +0000 @@ -1,9 +1,11 @@ #!/bin/bash -tmp=/tmp/.git-effort +tmp="$(mktemp --suffix=-git-effort)" above='0' color= +trap "rm -rf '$tmp'" EXIT + # # get date for the given # debian/rules0000755000000000000000000000050112240115041010230 0ustar #!/usr/bin/make -f # -*- makefile -*- # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 %: dh $@ override_dh_auto_build: dh_auto_build -- docs override_dh_auto_install: dh_auto_install -- PREFIX=/usr rm debian/git-extras/usr/bin/git-gh-pages .PHONY: override_dh_auto_build override_dh_auto_install debian/source/0000755000000000000000000000000011771131154010467 5ustar debian/source/format0000644000000000000000000000001411771131154011675 0ustar 3.0 (quilt) debian/watch0000644000000000000000000000012311771131154010214 0ustar version=3 http://githubredir.debian.net/github/visionmedia/git-extras/ (.+).tar.gz