From: Tero Roponen <teanropo@cc.jyu.fi>
To: git@vger.kernel.org
Subject: [PATCH] cg-update quotes too much
Date: Mon, 19 Dec 2005 14:19:12 +0200 (EET) [thread overview]
Message-ID: <Pine.GSO.4.58.0512191417180.3752@kanto> (raw)
Hi,
It seems that cogito commit e5ca051c1d3900f7fbc1592d018ab3aab6a9573a
broke cg-update, as expected ("Such a large patch is bound to introduce
some (probably mostly trivial) bugs").
Quoting $force and $squash gives cg-fetch and cg-merge an empty argument
if they are not set. If they are not quoted they will be omitted if they
are empty, which is the right thing.
Signed-off-by: Tero Roponen <teanropo@cc.jyu.fi>
---
diff --git a/cg-update b/cg-update
index d586631..1d6e0a0 100755
--- a/cg-update
+++ b/cg-update
@@ -55,10 +55,10 @@ name="${ARGS[0]}"
[ -s "$_git/refs/heads/$name" ] && export _cg_orig_head="$(cat "$_git/refs/heads/$name")"
if [ -s "$_git/branches/$name" ]; then
- cg-fetch "$force" "$name" || exit 1
+ cg-fetch $force "$name" || exit 1
else
echo "Updating from a local branch."
fi
echo
echo "Applying changes..."
-cg-merge "$squash" "$name"
+cg-merge $squash "$name"
reply other threads:[~2005-12-19 12:19 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.GSO.4.58.0512191417180.3752@kanto \
--to=teanropo@cc.jyu.fi \
--cc=git@vger.kernel.org \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox