Package: git-core
Version: 1:1.5.3.6-1.1
Severity: normal
[EMAIL PROTECTED]:~>git-pull
Already up-to-date.
[EMAIL PROTECTED]:~>git-pull -t
You asked me to pull without telling me which branch you
want to merge with, and 'branch.master.merge' in
your configuration file does not tell me either. Please
name which branch you want to merge on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details on the refspec.
If you often merge with the same branch, you may want to
configure the following variables in your configuration
file:
branch.master.remote = <nickname>
branch.master.merge = <remote-ref>
remote.<nickname>.url = <url>
remote.<nickname>.fetch = <refspec>
See git-config(1) for details.
zsh: exit 1 git-pull -t
So my config for branch.master.merge doesn't tell it what to merge, eh?
[EMAIL PROTECTED]:~>git-config --get branch.master.merge
refs/heads/master
[EMAIL PROTECTED]:~>git-pull -t origin refs/heads/master
Already up-to-date.
If I can pull these values out of git-config, why can't git-pull?
And why does it imply that it tried to use these values, and they
weren't set? (And why is git-pull -t different than git-pull w/o -t?)
When I looked at the code, I was suprised to find that it really
doesn't look at branch.${curr_branch}.merge at all, despite saying it
did in the error message.
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.22-3-686 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages git-core depends on:
ii cpio 2.9-6 GNU cpio -- a program to manage ar
ii libc6 2.7-3 GNU C Library: Shared libraries
ii libcurl3-gnutls 7.17.1-1 Multi-protocol file transfer libra
ii libdigest-sha1-perl 2.11-2 NIST SHA-1 message digest algorith
ii liberror-perl 0.15-8 Perl module for error/exception ha
ii libexpat1 1.95.8-4 XML parsing C library - runtime li
ii perl-modules 5.8.8-12 Core Perl modules
ii zlib1g 1:1.2.3.3.dfsg-7 compression library - runtime
Versions of packages git-core recommends:
ii curl 7.17.1-1 Get a file from an HTTP, HTTPS or
ii git-doc 1:1.5.3.6-1.1 fast, scalable, distributed revisi
ii less 409-1 Pager program similar to more
ii openssh-client [ssh-client 1:4.6p1-6 secure shell client, an rlogin/rsh
ii patch 2.5.9-4 Apply a diff file to an original
ii rsync 2.6.9-5 fast remote file copy program (lik
-- no debconf information
--
see shy jo
signature.asc
Description: Digital signature
