[PATCH] Trivial tidyups

Simple whitespace-related tidyups ensuring style consistency.

This is carried over from my old git-pb branch.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-write-tree.txt b/Documentation/git-write-tree.txt
index 7f076b4198237d7ee22189716b052d78ffe8b6ee..3b6a66fef648eeeb2bf75c39af1670495eaffe88 100644 (file)
--- a/Documentation/git-write-tree.txt
+++ b/Documentation/git-write-tree.txt
@@ -9,8 +9,7 @@ git-write-tree - Creates a tree from the current cache
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-write-tree'
-               [--missing-ok]
+'git-write-tree' [--missing-ok]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------

diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index 9802f67032bde6bbd9edacb89f3a4acdf876deb9..be64c072862b5c5985fbe1495864b0c8d09391c0 100755 (executable)
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -22,11 +22,10 @@ case "${1:-.}${2:-.}${3:-.}" in
 #
 "$1.." | "$1.$1" | "$1$1.")
        echo "Removing $4"
 #
 "$1.." | "$1.$1" | "$1$1.")
        echo "Removing $4"

-       if test -f "$4"
-       then
+       if test -f "$4"; then

                rm -f -- "$4"
        fi &&
                rm -f -- "$4"
        fi &&

-       exec git-update-cache --remove -- "$4"
+               exec git-update-cache --remove -- "$4"

        ;;
 
 #
        ;;
 
 #


@@ -62,7 +61,7 @@ case "${1:-.}${2:-.}${3:-.}" in
 
        # We reset the index to the first branch, making
        # git-diff-file useful
 
        # We reset the index to the first branch, making
        # git-diff-file useful

-       git-update-cache --add --cacheinfo "$6" "$2" "$4" 
+       git-update-cache --add --cacheinfo "$6" "$2" "$4"

                git-checkout-cache -u -f -- "$4" &&
                merge "$4" "$orig" "$src2"
        ret=$?
                git-checkout-cache -u -f -- "$4" &&
                merge "$4" "$orig" "$src2"
        ret=$?

diff --git a/write-tree.c b/write-tree.c
index 561a101fa97c4fbf044093bdfe2cae56b94ce8bf..2b2c6b77afd53870423d4bad9191ed669bc55660 100644 (file)
--- a/write-tree.c
+++ b/write-tree.c
@@ -89,14 +89,14 @@ int main(int argc, char **argv)
        int entries = read_cache();
        unsigned char sha1[20];
        
        int entries = read_cache();
        unsigned char sha1[20];
        

-       if (argc==2) {
+       if (argc == 2) {

                if (!strcmp(argv[1], "--missing-ok"))
                        missing_ok = 1;
                else
                        die("unknown option %s", argv[1]);
        }
        
                if (!strcmp(argv[1], "--missing-ok"))
                        missing_ok = 1;
                else
                        die("unknown option %s", argv[1]);
        }
        

-       if (argc>2)
+       if (argc > 2)

                die("too many options");
 
        if (entries < 0)
                die("too many options");
 
        if (entries < 0)