diff options
| author | Petr Baudis <pasky@suse.cz> | 2005-07-29 11:00:45 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-07-29 17:21:49 -0700 |
| commit | 0b124bb4bf8eafae8a4eae9c1fc44bf63da2e62e (patch) | |
| tree | ed6d339f657c4d98fb06244941acd4faa90b0d60 | |
| parent | e35f9824159bba94eecdf22d198799701ed60940 (diff) | |
| download | git-0b124bb4bf8eafae8a4eae9c1fc44bf63da2e62e.tar.gz git-0b124bb4bf8eafae8a4eae9c1fc44bf63da2e62e.tar.xz | |
[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>
| -rw-r--r-- | Documentation/git-write-tree.txt | 3 | ||||
| -rwxr-xr-x | git-merge-one-file-script | 7 | ||||
| -rw-r--r-- | 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 7f076b419..3b6a66fef 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 9802f6703..be64c0728 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 561a101fa..2b2c6b77a 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) |