Remove additional whitespace breakage
PATCH 6/6 Remove additional whitespace breakage
This time using nice clean.sh script from H. Peter Anvin
Signed-off-by Marco Costalba <[email protected]>
--- 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(-)
builtin-pack-objects.c +1 -1
@@ -28,7 +28,7 @@ struct object_entry {unsigned long size;/* uncompressed size */ 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 */
builtin-tar-tree.c +1 -1
@@ -21,7 +21,7 @@ int cmd_tar_tree(int argc, const char **argv, const char *prefix)* $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.h +1 -1
@@ -157,7 +157,7 @@ extern void diff_unmerge(struct diff_options *,extern int diff_scoreopt_parse (const char *opt); -#define DIFF_SETUP_REVERSE 1 +#define DIFF_SETUP_REVERSE 1#define DIFF_SETUP_USE_CACHE 2#define DIFF_SETUP_USE_SIZE_CACHE 4
git-clean.sh +1 -1
@@ -7,7 +7,7 @@ USAGE="[-d] [-f] [-n] [-q] [-x | -X] [--] <paths>..." 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
git-svn.perl +1 -1
@@ -4008,7 +4008,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', },
git.c +1 -1
@@ -214,7 +214,7 @@ const char git_version_string[] = GIT_VERSION;* 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) {
gitweb/gitweb.perl +3 -3
@@ -98,9 +98,9 @@ our $mimetypes_file = undef; # $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;
read-cache.c +2 -2
@@ -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. *
Signature · 1 line
1.5.2.rc3.90.gf33e-dirty