Commit 0b124bb4 authored by Petr Baudis's avatar Petr Baudis Committed by Junio C Hamano

[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's avatarPetr Baudis <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent e35f9824
......@@ -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
-----------
......
......@@ -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=$?
......
......@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment