[PATCH] Additional white space fixes
From: Marco Costalba <hidden>
Date: 2016-06-15 22:43:14
Subsystem:
the rest · Maintainer:
Linus Torvalds
Some white space breakage survived after "git-apply --whitespace=strip". Signed-off-by: Marco Costalba <redacted> --- builtin-pack-objects.c | 2 +- builtin-tar-tree.c | 2 +- diff.h | 2 +- git-clean.sh | 2 +- git-svn.perl | 2 +- git.c | 2 +- gitweb/gitweb.perl | 6 +++--- read-cache.c | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 3d396ca..5601ac3 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c@@ -28,7 +28,7 @@ struct object_entry { unsigned int hash; /* name hint hash */ unsigned int depth; /* delta depth */ - struct packed_git *in_pack; /* already in pack */ + struct packed_git *in_pack; /* already in pack */ off_t in_pack_offset; struct object_entry *delta; /* delta base object */ struct object_entry *delta_child; /* deltified objects who bases me */
diff --git a/builtin-tar-tree.c b/builtin-tar-tree.c
index b04719e..8861a29 100644
--- a/builtin-tar-tree.c
+++ b/builtin-tar-tree.c@@ -21,7 +21,7 @@ int cmd_tar_tree(int argc, const char ** * $0 tree-ish ==> * git-archive --format=tar tree-ish * $0 tree-ish basedir ==> - * git-archive --format-tar --prefix=basedir tree-ish + * git-archive --format-tar --prefix=basedir tree-ish */ int i; const char **nargv = xcalloc(sizeof(*nargv), argc + 2);
diff --git a/diff.h b/diff.h
index a7ee6d8..0e8b84f 100644
--- a/diff.h
+++ b/diff.h@@ -155,7 +155,7 @@ extern void diff_unmerge(struct diff unsigned mode, const unsigned char *sha1); -#define DIFF_SETUP_REVERSE 1 +#define DIFF_SETUP_REVERSE 1 #define DIFF_SETUP_USE_CACHE 2 #define DIFF_SETUP_USE_SIZE_CACHE 4
diff --git a/git-clean.sh b/git-clean.sh
index 299309d..538d2f6 100755
--- a/git-clean.sh
+++ b/git-clean.sh@@ -7,7 +7,7 @@ USAGE="[-d] [-f] [-n] [-q] [-x | -X] [--] LONG_USAGE='Clean untracked files from the working directory -d remove directories as well -f override clean.requireForce and clean anyway - -n don'\''t remove anything, just show what would be done + -n don'\''t remove anything, just show what would be done -q be quiet, only report errors -x remove ignored files as well -X remove only ignored files
diff --git a/git-svn.perl b/git-svn.perl
index e350061..29b762b 100755
--- a/git-svn.perl
+++ b/git-svn.perl@@ -4012,7 +4012,7 @@ diff-index line ($m hash) $l_map = { # repository root url 'https://svn.musicpd.org' => { - # repository path # GIT_SVN_ID + # repository path # GIT_SVN_ID 'mpd/trunk' => 'trunk', 'mpd/tags/0.11.5' => 'tags/0.11.5', },
diff --git a/git.c b/git.c
index 29b55a1..99be8c5 100644
--- a/git.c
+++ b/git.c@@ -214,7 +214,7 @@ const char git_version_string[] * require working tree to be present -- anything uses this needs * RUN_SETUP for reading from the configuration file. */ -#define NOT_BARE (1<<2) +#define NOT_BARE (1<<2) static void handle_internal_command(int argc, const char **argv, char **envp) {
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index e92596c..82af59d 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl@@ -105,9 +105,9 @@ our $fallback_encoding = 'latin1'; # $GITWEB_CONFIG as necessary. our %feature = ( # feature => { - # 'sub' => feature-sub (subroutine), - # 'override' => allow-override (boolean), - # 'default' => [ default options...] (array reference)} + # 'sub' => feature-sub (subroutine), + # 'override' => allow-override (boolean), + # 'default' => [ default options...] (array reference)} # # if feature is overridable (it means that allow-override has true value), # then feature-sub will be called with default options as parameters;
diff --git a/read-cache.c b/read-cache.c
index 4362b11..6009293 100644
--- a/read-cache.c
+++ b/read-cache.c@@ -208,9 +208,9 @@ int ie_match_stat(struct index_state *istate, /* * Within 1 second of this sequence: - * echo xyzzy >file && git-update-index --add file + * echo xyzzy >file && git-update-index --add file * running this command: - * echo frotz >file + * echo frotz >file * would give a falsely clean cache entry. The mtime and * length match the cache, and other stat fields do not change. *
--
1.5.2.GIT