Browse Source

[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>
maint
Petr Baudis 20 years ago committed by Junio C Hamano
parent
commit
0b124bb4bf
  1. 3
      Documentation/git-write-tree.txt
  2. 7
      git-merge-one-file-script
  3. 4
      write-tree.c

3
Documentation/git-write-tree.txt

@ -9,8 +9,7 @@ git-write-tree - Creates a tree from the current cache @@ -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
-----------

7
git-merge-one-file-script

@ -22,11 +22,10 @@ case "${1:-.}${2:-.}${3:-.}" in @@ -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 @@ -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=$?

4
write-tree.c

@ -89,14 +89,14 @@ int main(int argc, char **argv) @@ -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)

Loading…
Cancel
Save