From: Petr Baudis <pasky@suse.cz>
To: junkio@cox.net
Cc: git@vger.kernel.org
Subject: [PATCH 1/2] Trivial tidyups
Date: Fri, 29 Jul 2005 11:00:45 +0200 [thread overview]
Message-ID: <20050729090045.GM24895@pasky.ji.cz> (raw)
In-Reply-To: <20050729085819.GL24895@pasky.ji.cz>
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>
---
commit 83b1762040b111b4736d108cd91b8a9d75aad3a9
tree e07192546e9bd6a972e3945dd941fc7a29ec1a4b
parent d854f783af2a441827d66b4b70e9d0d9e3434b15
author Petr Baudis <pasky@suse.cz> Sat, 23 Jul 2005 00:21:48 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sat, 23 Jul 2005 00:21:48 +0200
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
--- a/Documentation/git-write-tree.txt
+++ b/Documentation/git-write-tree.txt
@@ -9,8 +9,7 @@ git-write-tree - Creates a tree from the
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
--- 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
--- 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)
next prev parent reply other threads:[~2005-07-29 9:01 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-07-29 8:58 [PATCH 0/2] Bits from git-pb Petr Baudis
2005-07-29 9:00 ` Petr Baudis [this message]
2005-07-29 9:01 ` [PATCH 2/2] Unify usage strings declaration Petr Baudis
2005-07-30 2:11 ` Junio C Hamano
2005-07-30 6:03 ` Matthias Urlichs
2005-07-29 12:53 ` [PATCH 3/2] git-merge-cache -q doesn't complain about failing merge program Petr Baudis
2005-07-30 2:11 ` Junio C Hamano
2005-07-29 15:48 ` [PATCH 4/2] Improve the compilation-time settings interface Petr Baudis
2005-07-29 18:23 ` Petr Baudis
2005-07-29 15:48 ` [PATCH 5/2] Remove the explicit Makefile dependencies description Petr Baudis
2005-07-29 15:50 ` [PATCH 6/2] Reorder Makefile rules Petr Baudis
2005-07-29 15:50 ` [PATCH 7/2] Support for NO_OPENSSL Petr Baudis
2005-07-30 3:39 ` Linus Torvalds
2005-07-30 4:17 ` Junio C Hamano
2005-07-30 5:02 ` [PATCH] Under NO_OPENSSL -lssl should not be used Junio C Hamano
2005-07-30 16:09 ` Linus Torvalds
2005-08-02 22:43 ` Jon Seymour
2005-07-29 17:21 ` [PATCH 8/2] Build commands through object files Petr Baudis
2005-07-30 10:31 ` [PATCH 0/2] Bits from git-pb Petr Baudis
2005-07-30 17:33 ` Junio C Hamano
2005-07-30 17:59 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050729090045.GM24895@pasky.ji.cz \
--to=pasky@suse.cz \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).