From: Drew Northup <drew.northup@maine.edu>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH] merge: default to @{upstream}
Date: Fri, 28 Jan 2011 11:44:59 -0500 [thread overview]
Message-ID: <1296233099.12855.14.camel@drew-northup.unet.maine.edu> (raw)
In-Reply-To: <1296231457-18780-1-git-send-email-felipe.contreras@gmail.com>
On Fri, 2011-01-28 at 18:17 +0200, Felipe Contreras wrote:
> So 'git merge' is 'git merge @{upstream}' instead of 'git merge -h';
> it's better to do something useful.
>
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---
> builtin/merge.c | 8 +++++---
> 1 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/merge.c b/builtin/merge.c
> index 42fff38..f23d669 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -983,9 +983,11 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
> if (!allow_fast_forward && fast_forward_only)
> die("You cannot combine --no-ff with --ff-only.");
>
> - if (!argc)
> - usage_with_options(builtin_merge_usage,
> - builtin_merge_options);
> + if (!argc) {
> + /* argv[argc] should be NULL, so we can hijack it */
> + argv[0] = "@{u}";
> + argc = 1;
> + }
>
> /*
> * This could be traditional "merge <msg> HEAD <commit>..." and
Honestly, I'd prefer that this NOT be merged in. When I mess up the
command line I am typing I don't want some sort of hidden magic to kick
in--I want it to tell me that I did something stupid by printing out the
help message. This is standard to a large number of commands that by
default expect a certain number of operands and I don't see any good
reason why git merge should be any different.
--
-Drew Northup
________________________________________________
"As opposed to vegetable or mineral error?"
-John Pescatore, SANS NewsBites Vol. 12 Num. 59
next prev parent reply other threads:[~2011-01-28 16:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-28 16:17 [PATCH] merge: default to @{upstream} Felipe Contreras
2011-01-28 16:44 ` Drew Northup [this message]
2011-01-28 17:53 ` Felipe Contreras
2011-01-28 17:56 ` Jonathan Nieder
2011-01-28 18:46 ` Felipe Contreras
2011-01-30 21:51 ` Jonathan Nieder
2011-01-28 19:53 ` Bert Wesarg
2011-01-28 21:41 ` Martin von Zweigbergk
2011-01-31 1:55 ` Miles Bader
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=1296233099.12855.14.camel@drew-northup.unet.maine.edu \
--to=drew.northup@maine.edu \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).