Skip to content

Commit 42d1ea9

Browse files
committed
strip trailing whitespace
1 parent e7c1c01 commit 42d1ea9

10 files changed

+19
-19
lines changed

git-addremove

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22

33
git add -A
4-
git ls-files --deleted -z | xargs -0 git rm
4+
git ls-files --deleted -z | xargs -0 git rm

git-apply-url

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
# Copyright (c) 2008 Andrew Raines
4-
#
4+
#
55
# Permission is hereby granted, free of charge, to any person
66
# obtaining a copy of this software and associated documentation
77
# files (the "Software"), to deal in the Software without
@@ -10,10 +10,10 @@
1010
# copies of the Software, and to permit persons to whom the
1111
# Software is furnished to do so, subject to the following
1212
# conditions:
13-
#
13+
#
1414
# The above copyright notice and this permission notice shall be
1515
# included in all copies or substantial portions of the Software.
16-
#
16+
#
1717
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
1818
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
1919
# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

git-find

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ end
193193

194194
if $search_reflogs
195195
puts "Processing reflogs ..."
196-
$refs.each do |ref|
196+
$refs.each do |ref|
197197
unless ref == "refs/stash"
198198
# Handle each reflog entry
199199
`git reflog show --abbrev=40 #{ref}`.split("\n").each do |line|

git-find-blob

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ filename=$1
55
want=$(git-hash-object "$filename")
66

77
git-rev-list --since="6 months ago" HEAD | while read commit ; do
8-
git-ls-tree -r $commit | while read perm type hash filename; do
8+
git-ls-tree -r $commit | while read perm type hash filename; do
99
if test "$want" = "$hash"; then
1010
echo matched $filename in commit $commit
1111
fi

git-flatten.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ def git_dir
5454
end
5555

5656
def git_editor
57-
$git_editor ||= execute("git config core.editor", :one => true) ||
57+
$git_editor ||= execute("git config core.editor", :one => true) ||
5858
ENV['VISUAL'] || ENV['EDITOR'] || 'vi'
5959
end
6060

6161
def git_branch
62-
$git_branch ||= execute("git branch",
63-
:select => lambda{|l| l =~ /^\*/},
62+
$git_branch ||= execute("git branch",
63+
:select => lambda{|l| l =~ /^\*/},
6464
:filter => lambda{|l| l.sub(/\* /, '')},
6565
:one => true)
6666
end
@@ -71,7 +71,7 @@ def ref_to_hash ref
7171

7272
def hash_to_str hash
7373
token = '--token--'
74-
execute("git log -1 --pretty=format:'%h#{token}%s' #{hash}",
74+
execute("git log -1 --pretty=format:'%h#{token}%s' #{hash}",
7575
:one => true).split(/#{token}/)
7676
end
7777

@@ -242,8 +242,8 @@ def flatten ref, refs, opts={}
242242
die "A flatten is in progress, try --continue, --skip or --abort." if stored_last
243243
squash = opts[:squash] || []
244244
orig = parse_flatten ref, :read => true
245-
target = rev_list ref,
246-
"^#{git_branch}", "^#{orig}",
245+
target = rev_list ref,
246+
"^#{git_branch}", "^#{orig}",
247247
*[refs, squash.map{|s| "^#{s}"}].flatten
248248
end
249249
last = stored_last

git-merge-from-svn

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require 'fileutils'
44

5-
$name = "git merge-from-svn"
5+
$name = "git merge-from-svn"
66

77
def usage retcode=0
88
puts <<USAGE

git-merge-repo

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# Check arguments
66
if [ $# -ne 2 ]; then
7-
echo 1>&2 Usage:
7+
echo 1>&2 Usage:
88
echo 1>&2 " cd bigrepo"
99
echo 1>&2 " $0 repo /path/to/repo"
1010
exit 127

git-rank-contributors

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
## Probably not without some editing, because people often commit from more
99
## than one address.
1010
##
11-
## git-rank-contributors Copyright 2008 William Morgan <[email protected]>.
11+
## git-rank-contributors Copyright 2008 William Morgan <[email protected]>.
1212
## This program is free software: you can redistribute it and/or modify
1313
## it under the terms of the GNU General Public License as published by
1414
## the Free Software Foundation, either version 3 of the License, or (at

git-record

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Hunk:
3939
self.lines = lines
4040
self.keep = False
4141
self.binary = binary
42-
42+
4343
def format(self):
4444
output = self.diff.header.modified + "\n"
4545
if self.diff.header.deleted:
@@ -77,7 +77,7 @@ class Diff:
7777
for hunk in self.hunks:
7878
hunk.diff = self
7979
self.keep = False
80-
80+
8181
def filter(self):
8282
output = '\n'.join(self.header.lines) + "\n"
8383
for hunk in self.hunks:
@@ -94,7 +94,7 @@ class Diff:
9494
continue
9595
output += diff.filter()
9696
return output
97-
97+
9898
@classmethod
9999
def parse(kls, lines):
100100
in_header = True

git-save-home

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# music, video, and random downloads are not. In order to accommodate
77
# this scenario, you can ignore everything like so:
88
#
9-
# $ more ~/.gitignore
9+
# $ more ~/.gitignore
1010
# *
1111
#
1212
# Then, force git-add to track files you care about. Unfortunately

0 commit comments

Comments
 (0)