From 0b124bb4bf8eafae8a4eae9c1fc44bf63da2e62e Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 29 Jul 2005 11:00:45 +0200 Subject: [PATCH] [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 Signed-off-by: Junio C Hamano --- Documentation/git-write-tree.txt | 3 +-- git-merge-one-file-script | 7 +++---- write-tree.c | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Documentation/git-write-tree.txt b/Documentation/git-write-tree.txt index 7f076b41..3b6a66fe 100644 --- 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 -------- -'git-write-tree' - [--missing-ok] +'git-write-tree' [--missing-ok] DESCRIPTION ----------- diff --git a/git-merge-one-file-script b/git-merge-one-file-script index 9802f670..be64c072 100755 --- 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" - if test -f "$4" - then + if test -f "$4"; then 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 - 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=$? diff --git a/write-tree.c b/write-tree.c index 561a101f..2b2c6b77 100644 --- 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]; - if (argc==2) { + if (argc == 2) { 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) -- 2.11.0