Merge pull request #303 from dscho/fix-whitespace-vfs-2.30.0

Appease the new PR workflow "check-whitespace"

BRANCHES.md

@@ -1,53 +1,53 @@
-Branches used in this repo
-==========================
-
-The document explains the branching structure that we are using in the VFSForGit repository as well as the forking strategy that we have adopted for contributing.
-
-Repo Branches
--------------
-
-1. master
-
-    This will track the Git for Windows repository master branch
-
-2. vfs
-
-    Would like to use this branch as an ever-green branch that continually rebases the VFSForGit changes onto a windows ever-green branch that is on the core/master, so that we can detect when the patches for VFSForGit have issues or if we have a new version patches sent upstream git we can regenerate this branch.
-
-3. vs/master
-
-    This tracks with the Git for Windows repository vs/master branch and are the generated files for using a Visual Studio solution.
-
-4. vfs-#
-
-    These branches are used to track the specific version that match Git for Windows with the VFSForGit specific patches on top.  When a new version of Git for Windows is released, the VFSForGit patches will be rebased on that windows version and a new gvfs-# branch created to create pull requests against.
-
-    #### Examples
-
-    ```
-    vfs-2.20.0
-    vfs-2.20.1
-    ```
-
-    The versions of git for VFSForGit are based on the Git for Windows versions.  v2.20.0.vfs.1 will correspond with the v2.20.0.windows.1 with the VFSForGit specific patches applied to the windows version.
-
-Tags
-----
-
-We are using annotated tags to build the version number for git.  The build will look back through the commit history to find the first tag matching `v[0-9]*vfs*` and build the git version number using that tag.
-
-Forking
--------
-
-A personal fork of this repository and a branch in that repository should be used for development.
-
-These branches should be based on the latest vfs-# branch.  If there are work in progress pull requests that you have based on a previous version branch when a new version branch is created, you will need to move your patches to the new branch to get them in that latest version.
-
-#### Example
-
-```
-git clone <personal fork repo URL>
-git remote add ms https://github.com/Microsoft/git.git
-git checkout -b my-changes ms/vfs-2.20.0 --no-track
-git push -fu origin HEAD
-```
+Branches used in this repo
+==========================
+
+The document explains the branching structure that we are using in the VFSForGit repository as well as the forking strategy that we have adopted for contributing.
+
+Repo Branches
+-------------
+
+1. master
+
+    This will track the Git for Windows repository master branch
+
+2. vfs
+
+    Would like to use this branch as an ever-green branch that continually rebases the VFSForGit changes onto a windows ever-green branch that is on the core/master, so that we can detect when the patches for VFSForGit have issues or if we have a new version patches sent upstream git we can regenerate this branch.
+
+3. vs/master
+
+    This tracks with the Git for Windows repository vs/master branch and are the generated files for using a Visual Studio solution.
+
+4. vfs-#
+
+    These branches are used to track the specific version that match Git for Windows with the VFSForGit specific patches on top.  When a new version of Git for Windows is released, the VFSForGit patches will be rebased on that windows version and a new gvfs-# branch created to create pull requests against.
+
+    #### Examples
+
+    ```
+    vfs-2.20.0
+    vfs-2.20.1
+    ```
+
+    The versions of git for VFSForGit are based on the Git for Windows versions.  v2.20.0.vfs.1 will correspond with the v2.20.0.windows.1 with the VFSForGit specific patches applied to the windows version.
+
+Tags
+----
+
+We are using annotated tags to build the version number for git.  The build will look back through the commit history to find the first tag matching `v[0-9]*vfs*` and build the git version number using that tag.
+
+Forking
+-------
+
+A personal fork of this repository and a branch in that repository should be used for development.
+
+These branches should be based on the latest vfs-# branch.  If there are work in progress pull requests that you have based on a previous version branch when a new version branch is created, you will need to move your patches to the new branch to get them in that latest version.
+
+#### Example
+
+```
+git clone <personal fork repo URL>
+git remote add ms https://github.com/Microsoft/git.git
+git checkout -b my-changes ms/vfs-2.20.0 --no-track
+git push -fu origin HEAD
+```

builtin/update-index.c

@@ -1136,7 +1136,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 	getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
 	if (mark_skip_worktree_only && gvfs_config_is_set(GVFS_BLOCK_COMMANDS))
 		die(_("modifying the skip worktree bit is not supported on a GVFS repo"));
-	
+
 	if (preferred_index_format) {
 		if (preferred_index_format != 4 && gvfs_config_is_set(GVFS_BLOCK_COMMANDS))
 			die(_("changing the index version is not supported on a GVFS repo"));

config.c

@@ -2438,7 +2438,7 @@ int git_config_get_virtualfilesystem(void)
 			/* virtual file system relies on the sparse checkout logic so force it on */
 			core_apply_sparse_checkout = 1;
 			return 1;
-		} 
+		}
 		core_virtualfilesystem = NULL;
 	}
 

t/helper/test-gvfs-protocol.c

@@ -50,7 +50,7 @@ static void logreport(const char *label, const char *err, va_list params)
 	strbuf_addf(&msg, "[%"PRIuMAX"] %s: ", (uintmax_t)getpid(), label);
 	strbuf_vaddf(&msg, err, params);
 	strbuf_addch(&msg, '\n');
-	
+
 	fwrite(msg.buf, sizeof(char), msg.len, stderr);
 	fflush(stderr);
 
@@ -671,7 +671,7 @@ static enum worker_result send_loose_object(const struct object_id *oid,
 }
 
 /*
- * Per the GVFS Protocol, a single OID should be in the slash-arg: 
+ * Per the GVFS Protocol, a single OID should be in the slash-arg:
  *
  *     GET /gvfs/objects/fc3fff3a25559d2d30d1719c4f4a6d9fe7e05170 HTTP/1.1
  *
@@ -1325,7 +1325,7 @@ static enum worker_result req__read(struct req *req, int fd)
 	 *
 	 *    <method> SP <uri-target> SP <HTTP-version> CRLF
 	 *
-	 */    
+	 */
 	if (strbuf_getwholeline_fd(&req->start_line, fd, '\n') == EOF)
 		return WR_OK | WR_HANGUP;
 
@@ -1374,7 +1374,7 @@ static enum worker_result req__read(struct req *req, int fd)
 	 *     "GET /gvfs/config HTTP/1.1"
 	 *     "GET /gvfs/objects/aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd HTTP/1.1"
 	 *     "GET /gvfs/prefetch?lastPackTimestamp=123456789 HTTP/1.1"
-	 * 
+	 *
 	 *     "GET /<uri-base>/gvfs/config HTTP/1.1"
 	 *     "GET /<uri-base>/gvfs/objects/aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd HTTP/1.1"
 	 *     "GET /<uri-base>/gvfs/prefetch?lastPackTimestamp=123456789 HTTP/1.1"

t/t0402-block-command-on-gvfs.sh

@@ -5,17 +5,17 @@ test_description='block commands in GVFS repo'
 . ./test-lib.sh
 
 not_with_gvfs () {
-    command=$1 &&
-    shift &&
-    test_expect_success "test $command $*" "
-        test_config alias.g4rbled $command &&
-        test_config core.gvfs true &&
-        test_must_fail git $command $* &&
-        test_must_fail git g4rbled $* &&
-        test_unconfig core.gvfs &&
-        test_must_fail git -c core.gvfs=true $command $* &&
-        test_must_fail git -c core.gvfs=true g4rbled $*
-    "
+	command=$1 &&
+	shift &&
+	test_expect_success "test $command $*" "
+		test_config alias.g4rbled $command &&
+		test_config core.gvfs true &&
+		test_must_fail git $command $* &&
+		test_must_fail git g4rbled $* &&
+		test_unconfig core.gvfs &&
+		test_must_fail git -c core.gvfs=true $command $* &&
+		test_must_fail git -c core.gvfs=true g4rbled $*
+	"
 }
 
 not_with_gvfs fsck

t/t7523-status-complete-untracked.sh

@@ -31,7 +31,7 @@ test_expect_success 'verify untracked-files=complete' '
 	! ignored.ign
 	! ignored_dir/
 	EOF
-	
+
 	git status --porcelain=v2 --untracked-files=complete --ignored >output &&
 	test_i18ncmp expect output
 '

t/t7524-serialized-status.sh

@@ -73,7 +73,7 @@ test_expect_success 'verify untracked-files=complete with no conversion' '
 	! ignored.ign
 	! ignored_dir/
 	EOF
-	
+
 	git status --untracked-files=complete --ignored=matching --serialize >serialized_status.dat &&
 	touch new_change.txt &&
 
@@ -89,7 +89,7 @@ test_expect_success 'verify untracked-files=complete to untracked-files=normal c
 	? untracked/
 	? untracked_1.txt
 	EOF
-	
+
 	git status --untracked-files=complete --ignored=matching --serialize >serialized_status.dat &&
 	touch new_change.txt &&
 
@@ -108,7 +108,7 @@ test_expect_success 'verify untracked-files=complete to untracked-files=all conv
 	! ignored.ign
 	! ignored_dir/
 	EOF
-	
+
 	git status --untracked-files=complete --ignored=matching --serialize >serialized_status.dat &&
 	touch new_change.txt &&
 
@@ -128,7 +128,7 @@ test_expect_success 'verify serialized status with non-convertible ignore mode d
 	! ignored.ign
 	! ignored_dir/
 	EOF
-	
+
 	git status --untracked-files=complete --ignored=matching --serialize >serialized_status.dat &&
 	touch new_change.txt &&
 
@@ -141,7 +141,7 @@ test_expect_success 'verify serialized status handles path scopes' '
 	cat >expect <<-\EOF &&
 	? untracked/
 	EOF
-	
+
 	git status --untracked-files=complete --ignored=matching --serialize >serialized_status.dat &&
 	touch new_change.txt &&
 

wt-status-deserialize.c

@@ -327,7 +327,7 @@ static int wt_deserialize_v1_changed_items(const struct wt_status *cmd_s,
 		if (*p)
 			d->rename_source = xstrdup(p);
 		item->util = d;
-		
+
 		trace_printf_key(
 			&trace_deserialize,
 			"change: %d %d %d %d %d %o %o %o %d %d %s %s '%s' '%s'",