* [PATCH 6/6] Remove additional whitespace breakage
@ 2007-05-20 10:30 Marco Costalba
0 siblings, 0 replies; only message in thread
From: Marco Costalba @ 2007-05-20 10:30 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git Mailing List
This time using nice clean.sh script from H. Peter Anvin
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
---
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 3ba1f09..dda7d2e 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -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 */
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 **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 --git a/diff.h b/diff.h
index 63738c1..f7e6377 100644
--- a/diff.h
+++ b/diff.h
@@ -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
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] [--] <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
diff --git a/git-svn.perl b/git-svn.perl
index eda9969..8ac39b2 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -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',
},
diff --git a/git.c b/git.c
index f200907..664a638 100644
--- a/git.c
+++ b/git.c
@@ -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)
{
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 5c7011a..8226b48 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -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;
diff --git a/read-cache.c b/read-cache.c
index 0f0c827..922046f 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.rc3.90.gf33e-dirty
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2007-05-20 10:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-20 10:30 [PATCH 6/6] Remove additional whitespace breakage Marco Costalba
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.