sergiomb pushed to git-extras (f21). "Update to 2.2.0 . (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Jun 15 16:24:13 UTC 2015
From 41dd9fecc296cd43cfc5574f746a8adbcd3e8b61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio at serjux.com>
Date: Mon, 15 Jun 2015 03:37:39 +0100
Subject: Update to 2.2.0 .
- Drop git-extras-1.9.0_fixes.patch .
diff --git a/git-extras-1.9.0_fixes.patch b/git-extras-1.9.0_fixes.patch
deleted file mode 100644
index b9bc605..0000000
--- a/git-extras-1.9.0_fixes.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-diff --git a/bin/git-back b/bin/git-back
-index e4f73ca..76fa922 100755
---- a/bin/git-back
-+++ b/bin/git-back
-@@ -3,7 +3,7 @@
- if test $# -eq 0; then
- git reset --soft HEAD~1
- else
-- if `echo $1 | grep -q [^[:digit:]]`; then
-+ if `echo $1 | grep -qv [[:digit:]]`; then
- echo "$1 is not a number" 1>&2
- else
- git reset --soft HEAD~$1
-diff --git a/bin/git-bug b/bin/git-bug
-index 4ce5437..767333f 100755
---- a/bin/git-bug
-+++ b/bin/git-bug
-@@ -7,5 +7,5 @@ if test "$1" = "finish"; then
- else
- test -z $1 && echo "bug <name> required." && exit 1
- branch=bug/$1
-- git checkout -b $branch &> /dev/null
-+ git checkout -b $branch > /dev/null 2>&1
- fi
-diff --git a/bin/git-delete-merged-branches b/bin/git-delete-merged-branches
-index 332b9d7..2b4d89b 100755
---- a/bin/git-delete-merged-branches
-+++ b/bin/git-delete-merged-branches
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- delete_all="no"
- current_branch=`git rev-parse --symbolic-full-name --abbrev-ref HEAD`
-diff --git a/bin/git-extras b/bin/git-extras
-index 9f46f3e..e70c67b 100755
---- a/bin/git-extras
-+++ b/bin/git-extras
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- VERSION="1.9.0"
-
-diff --git a/bin/git-feature b/bin/git-feature
-index 29aacd0..5a52f44 100755
---- a/bin/git-feature
-+++ b/bin/git-feature
-@@ -7,5 +7,5 @@ if test "$1" = "finish"; then
- else
- test -z $1 && echo "feature <name> required." 1>&2 && exit 1
- branch=feature/$1
-- git checkout -b $branch &> /dev/null
-+ git checkout -b $branch > /dev/null 2>&1
- fi
-diff --git a/bin/git-info b/bin/git-info
-index f831399..c6a0da0 100755
---- a/bin/git-info
-+++ b/bin/git-info
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- get_config() {
- git config --list
-@@ -23,20 +23,20 @@ remote_urls() {
- # Show info similar to svn
-
- echo
--echo "## Remote URLs:\n"
--echo "$(remote_urls)\n"
-+echo -e "## Remote URLs:\n"
-+echo -e "$(remote_urls)\n"
-
--echo "## Remote Branches:\n"
--echo "$(remote_branches)\n"
-+echo -e "## Remote Branches:\n"
-+echo -e "$(remote_branches)\n"
-
--echo "## Local Branches:\n"
--echo "$(local_branches)\n"
-+echo -e "## Local Branches:\n"
-+echo -e "$(local_branches)\n"
-
--echo "## Most Recent Commit:\n"
--echo "$(most_recent_commit)\n"
--echo "Type 'git log' for more commits, or 'git show <commit id>' for full commit details.\n"
-+echo -e "## Most Recent Commit:\n"
-+echo -e "$(most_recent_commit)\n"
-+echo -e "Type 'git log' for more commits, or 'git show <commit id>' for full commit details.\n"
-
- if test "$1" != "--no-config"; then
-- echo "## Configuration (.git/config):\n"
-- echo "$(get_config)\n"
--fi
-\ No newline at end of file
-+ echo -e "## Configuration (.git/config):\n"
-+ echo -e "$(get_config)\n"
-+fi
-diff --git a/bin/git-obliterate b/bin/git-obliterate
-index 0b7a220..99e7cf9 100755
---- a/bin/git-obliterate
-+++ b/bin/git-obliterate
-@@ -1,3 +1,4 @@
-+#!/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
-diff --git a/bin/git-pull-request b/bin/git-pull-request
-index 494bc40..b05fb25 100755
---- a/bin/git-pull-request
-+++ b/bin/git-pull-request
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/bin/bash
-
- #
- # Echo <msg> and exit
-diff --git a/bin/git-refactor b/bin/git-refactor
-index e87143a..13f68f6 100755
---- a/bin/git-refactor
-+++ b/bin/git-refactor
-@@ -7,5 +7,5 @@ if test "$1" = "finish"; then
- else
- test -z $1 && echo "refactor <name> required." 1>&2 && exit 1
- branch=refactor/$1
-- git checkout -b $branch &> /dev/null
-+ git checkout -b $branch > /dev/null 2>&1
- fi
-diff --git a/bin/git-release b/bin/git-release
-index a5ff60b..071c0c6 100755
---- a/bin/git-release
-+++ b/bin/git-release
-@@ -1,4 +1,4 @@
--#!/usr/bin/env sh
-+#!/bin/bash
-
- hook() {
- local hook=.git/hooks/$1.sh
-diff --git a/man/manning-up.sh b/man/manning-up.sh
-index a76eddf..ca4f340 100755
---- a/man/manning-up.sh
-+++ b/man/manning-up.sh
-@@ -9,13 +9,14 @@ for file in $(ls git*.md); do
- extra=${file/.md/}
- spaced=" "
- echo "$extra(1)${spaced:${#extra}}$extra" >> index.txt.tmp;
-- title=$(grep -m=1 $extra"(1) -- " $file)
-+ title=$(grep -m1 $extra"(1) -- " $file)
- test "$extra" != "git-extras" && echo " - **"${title/" --"/"**"} >> git-extras.md.tmp
- done
- ln=$(awk '/## AUTHOR/{print NR};' ./git-extras.md)
- awk "NR >= $ln-1" git-extras.md >> git-extras.md.tmp && mv -f index.txt.tmp index.txt && mv -f git-extras.md.tmp git-extras.md
-
- for file in $(ls git*.md); do
-+ echo -e "\nprocessing: $file"
- extra=${file/.md/}
- ronn $file && mv -f $extra.1.html $extra.html
- done
diff --git a/git-extras.spec b/git-extras.spec
index e93403e..f351690 100644
--- a/git-extras.spec
+++ b/git-extras.spec
@@ -1,17 +1,12 @@
Name: git-extras
-Version: 1.9.0
-Release: 3%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
Summary: Little git extras
Group: Development/Tools
License: MIT
URL: https://github.com/visionmedia/%{name}
-Source0: https://github.com/visionmedia/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-
-# fix several issues
-# all patches committed to upstream, see:
-# https://github.com/visionmedia/git-extras/pull/175
-Patch0: %{name}-%{version}_fixes.patch
+Source0: https://github.com/visionmedia/%{name}/archive/%{version}.tar.gz
BuildArch: noarch
BuildRequires: rubygem-ronn
@@ -32,7 +27,6 @@ README.md, HTML, mark-down or man-pages.
%prep
%setup -q
-%patch0 -p1
# remove `/usr/bin/env` from hashbang
# some scripts contain bashisms
# prefer bash over sh
@@ -74,6 +68,10 @@ install -pm 0644 man/*.md md
%changelog
+* Mon Jun 15 2015 Sérgio Basto <sergio at serjux.com> - 2.2.0-1
+- Update to 2.2.0 .
+- Drop git-extras-1.9.0_fixes.patch .
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 51a959a..703addc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ac28233dad49bfc646cffc406d977f6 git-extras-1.9.0.tar.gz
+5a27f9245eeec74f95a3fbb0f8c8ad3b 2.2.0.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/git-extras.git/commit/?h=f21&id=41dd9fecc296cd43cfc5574f746a8adbcd3e8b61
More information about the scm-commits
mailing list