kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

[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 2005-07-29 11:00:45 +02:00 committed by Junio C Hamano
parent e35f982415
commit 0b124bb4bf
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-write-tree.txt
View File

@ -9,8 +9,7 @@ git-write-tree - Creates a tree from the current cache


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


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

7
git-merge-one-file-script
View File

@ -22,11 +22,10 @@ case "${1:-.}${2:-.}${3:-.}" in
# #
"$1.." | "$1.$1" | "$1$1.") "$1.." | "$1.$1" | "$1$1.")
echo "Removing $4" echo "Removing $4"
if test -f "$4" if test -f "$4"; then
then
rm -f -- "$4" rm -f -- "$4"
fi && 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 # We reset the index to the first branch, making
# git-diff-file useful # 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" && git-checkout-cache -u -f -- "$4" &&
merge "$4" "$orig" "$src2" merge "$4" "$orig" "$src2"
ret=$? ret=$?

4
write-tree.c
View File

@ -89,14 +89,14 @@ int main(int argc, char **argv)
int entries = read_cache(); int entries = read_cache();
unsigned char sha1[20]; unsigned char sha1[20];
if (argc==2) { if (argc == 2) {
if (!strcmp(argv[1], "--missing-ok")) if (!strcmp(argv[1], "--missing-ok"))
missing_ok = 1; missing_ok = 1;
else else
die("unknown option %s", argv[1]); die("unknown option %s", argv[1]);
} }
if (argc>2) if (argc > 2)
die("too many options"); die("too many options");


if (entries < 0) if (entries < 0)