[PATCH] git checkout: add -t alias for --track

[PATCH] git checkout: add -t alias for --track

[Miklos Vajna]

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---

Just like 'git checkout -q' is an alias for 'git checkout --quiet', I
often type 'git checkout -t -b newname master', then realize I need
'--track', but in fact '-t' is not used for anything else, so it can be
just a short name for --track.

 Documentation/git-checkout.txt |    2 +-
 builtin-checkout.c             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index e11cddb..a644173 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -47,7 +47,7 @@ OPTIONS
 	by linkgit:git-check-ref-format[1].  Some of these checks
 	may restrict the characters allowed in a branch name.
 
---track::
+-t, --track::
 	When creating a new branch, set up configuration so that git-pull
 	will automatically retrieve data from the start point, which must be
 	a branch. Use this if you always pull from the same upstream branch
diff --git a/builtin-checkout.c b/builtin-checkout.c
index 7deb504..1a93d13 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -504,7 +504,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
 		OPT__QUIET(&opts.quiet),
 		OPT_STRING('b', NULL, &opts.new_branch, "new branch", "branch"),
 		OPT_BOOLEAN('l', NULL, &opts.new_branch_log, "log for new branch"),
-		OPT_SET_INT( 0 , "track",  &opts.track, "track",
+		OPT_SET_INT('t', "track",  &opts.track, "track",
 			BRANCH_TRACK_EXPLICIT),
 		OPT_BOOLEAN('f', NULL, &opts.force, "force"),
 		OPT_BOOLEAN('m', NULL, &opts.merge, "merge"),
-- 
1.5.5

Re: [PATCH] git checkout: add -t alias for --track

[Junio C Hamano]

I do not have anything against this, but I do not see how this is useful
in practice, given that branch.autosetupmerge is true by default these
days.

List?

Re: [PATCH] git checkout: add -t alias for --track

[Junio C Hamano]

Junio C Hamano <gitster@pobox.com> writes:

> I do not have anything against this, but I do not see how this is useful
> in practice,...

Oops, wrong wording from a drunken panda who is not used to alcoholic
beverage.  Sorry.

What I meant to say was that this may be useful to _some_ degree but
probably _not very much_.

I should go to bed now.

Re: [PATCH] git checkout: add -t alias for --track

[Miklos Vajna]

[-- Attachment #1: Type: text/plain, Size: 407 bytes --]

On Sat, Apr 26, 2008 at 11:25:09PM -0700, Junio C Hamano <gitster@pobox.com> wrote:
> What I meant to say was that this may be useful to _some_ degree but
> probably _not very much_.

Yes, it's just about my "having short option aliases are good" idea.
Should I improve the commit message by mentioning that this is useful
"in case you don't want to have branch.autosetupmerge set to true for
some reason"?

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: [PATCH] git checkout: add -t alias for --track

[Johannes Schindelin]

Hi,

On Sun, 27 Apr 2008, Miklos Vajna wrote:

> On Sat, Apr 26, 2008 at 11:25:09PM -0700, Junio C Hamano <gitster@pobox.com> wrote:
> > What I meant to say was that this may be useful to _some_ degree but 
> > probably _not very much_.
> 
> Yes, it's just about my "having short option aliases are good" idea. 
> Should I improve the commit message by mentioning that this is useful 
> "in case you don't want to have branch.autosetupmerge set to true for 
> some reason"?

AFAIR you still need to specify --track if you want to setup tracking 
information for local branches, and have branch.autosetupmerge different 
than "always", but as always, I might be mistaken.

Ciao,
Dscho

Re: [PATCH] git checkout: add -t alias for --track

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> On Sun, 27 Apr 2008, Miklos Vajna wrote:
>
>> On Sat, Apr 26, 2008 at 11:25:09PM -0700, Junio C Hamano <gitster@pobox.com> wrote:
>> > What I meant to say was that this may be useful to _some_ degree but 
>> > probably _not very much_.
>> 
>> Yes, it's just about my "having short option aliases are good" idea. 
>> Should I improve the commit message by mentioning that this is useful 
>> "in case you don't want to have branch.autosetupmerge set to true for 
>> some reason"?
>
> AFAIR you still need to specify --track if you want to setup tracking 
> information for local branches, and have branch.autosetupmerge different 
> than "always", but as always, I might be mistaken.

Ah, you are right.  The change is fine as-is regardless of the
"autosetupmerge" thing.