Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jun 27, 2008
  1. @gitster

    GIT 1.5.4.6

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 26, 2008
  1. @gitster

    git-shell: accept "git foo" form

    gitster authored
    This is a backport of 0a47dc1
    to 'maint' to be included in 1.5.6.2 so that older server side
    can accept dashless form of request when clients are updated.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 26, 2008
  1. @pieter @gitster

    builtin-fast-export: Only output a single parent per line

    pieter authored gitster committed
    According to the git-fast-import man-page, you can only put a single
    committish per merge: line, like this:
    
      merge :10
      merge :11
    
    However, git-fast-export puts all parents on a single line, like this:
    
      merge :10 :11
    
    This changes fast-export to output a single parent per line.  Otherwise
    neither git-fast-import nor bzr-fast-import can read its output.
    
    [jc: fix-up to remove excess LF in the output that makes fast-import barf]
    
    Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 23, 2008
  1. @gitster

    rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref

    Johannes Sixt authored gitster committed
    The intention of --symbolic-full-name is to not print anything if a
    revision is not an exact ref. But this command:
    
        $ git-rev-parse --symbolic-full-name --not master~1
    
    still emitted a sole '^' to stdout (provided that there's no other ref at
    master~1). This fixes it.
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 20, 2008
  1. @peff @gitster

    git-am: fix typo in usage message

    peff authored gitster committed
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @peff @gitster

    doc/git-daemon: s/uploadarchive/uploadarch/

    peff authored gitster committed
    The git-daemon upload-archive feature has always used the
    config directive 'daemon.uploadarch'; the documentation
    which came later seems to have just mistakenly used the
    wrong name.
    
    Noticed by lionel@over-blog.com.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 14, 2008
  1. @ihilt @gitster

    Documentation/git-describe.txt: make description more readable

    ihilt authored gitster committed
    Signed-off-by: Ian Hilt <ian.hilt@gmail.com>
    Credit-to: Kevin Ballard <kevin@sb.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 11, 2008
  1. @gitster

    wt-status.h: declare global variables as extern

    Johannes Sixt authored gitster committed
    There are linkers out there that complain if a global non-static variable
    is defined multiple times.
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @sitaramc @gitster

    builtin-commit.c: add -u as short name for --untracked-files

    sitaramc authored gitster committed
    This makes the C code consistent with the documentation and the old shell
    code.
    
    Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitzilla @gitster

    git-repack: re-enable parsing of -n command line option

    gitzilla authored gitster committed
    In commit 5715d0b (Migrate git-repack.sh to use git-rev-parse --parseopt,
    2007-11-04), parsing of the '-n' command line option was accidentally lost
    when git-repack.sh was migrated to use git-rev-parse --parseopt. This adds
    it back.
    
    Signed-off-by: A Large Angry SCM <gitzilla@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 8, 2008
  1. @dustin @gitster

    Documentation/config.txt: Mention branch.<name>.rebase applies to "gi…

    dustin authored gitster committed
    …t pull"
    
    Signed-off-by: Dustin Sallings <dustin@spy.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @peff @gitster

    doc: clarify definition of "update" for git-add -u

    peff authored gitster committed
    The "-u" option is described only in terms of "updating"
    files, which in turn is described only as "similar to what
    git commit -a does". Let's be a little more specific about
    what updating entails.
    
    Suggested by Geoffrey Irving.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 3, 2008
  1. @rafl @gitster

    filter-branch: Documentation fix.

    rafl authored gitster committed
    It's --msg-filter, not --message-filter.
    
    Signed-off-by: Florian Ragwitz <rafl@debian.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 30, 2008
  1. @peff @gitster

    cvsimport: always pass user data to "system" as a list

    peff authored gitster committed
    This avoids invoking the shell. Not only is it faster, but
    it prevents the possibility of interpreting our arguments in
    the shell.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @peff @gitster

    fix reflog approxidate parsing bug

    peff authored gitster committed
    In get_sha1_basic, we parse a string like
    
      HEAD@{10 seconds ago}:path/to/file
    
    into its constituent ref, reflog date, and path components.
    We never actually munge the string itself, but instead keep
    offsets into the string with their associated lengths.
    
    When we call approxidate on the contents inside braces,
    however, we pass just a string without a length. This means
    that approxidate could sometimes look past the closing brace
    and (erroneously) interpret the rest of the string as part
    of the date.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 28, 2008
  1. @toofishes @gitster

    Remove 'header' from --signoff option description

    toofishes authored gitster committed
    Signed-off-by: Dan McGee <dpmcgee@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 23, 2008
  1. @peff @gitster

    t5516: remove ambiguity test (1)

    peff authored gitster committed
    This test tried to push into a remote with ambiguous refs in
    remotes/$x/master and remotes/$y/master. However, the remote
    never actually tells us about the refs/remotes hierarchy, so
    we don't even see this ambiguity.
    
    The test happened to pass because we were simply looking for
    failure, and the test fails for another reason: the dst
    refspec does not exist and does not begin with refs/, making
    it invalid.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @mdg @gitster

    Linked glossary from cvs-migration page

    mdg authored gitster committed
    Coming from CVS, I found the git glossary vital to learning git and learning
    how terms in git correlate to the cvs terminology with which I am familiar.
    
    This patch links the glossary from the cvs-migration page so cvs users will
    be able to fine the glossary as soon as they start looking at git documents.
    
    Signed-off-by: Matt Graham <mdg149@gmail.com>
    Acked-by: J. Bruce Fields <bfields@fieldses.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    write-tree: properly detect failure to write tree objects

    gitster authored
    Tomasz Fortuna reported that "git commit" does not error out properly when
    it cannot write tree objects out.  "git write-tree" shares the same issue,
    as the failure to notice the error is deep in the logic to write tree
    objects out recursively.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @michaelw @gitster

    svn-git: Use binmode for reading/writing binary rev maps

    michaelw authored gitster committed
    Otherwise, there is a possible interaction with UTF-8 locales in
    combination with PERL_UNICODE, resulting in "inconsistent size: 40" or
    "read:"-type errors.
    
    See also:
        perldoc -f binmode
        <http://perldoc.perl.org/perl581delta.html#UTF-8-no-longer-default-under-UTF-8-locales>
    
    Signed-off-by: Michael Weber <michaelw@foldr.org>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

    diff options documentation: refer to --diff-filter in --name-status

    Miklos Vajna authored gitster committed
    git diff --name-status outputs letters, but the meaning of those letters
    is documented elsewhere. Add a note to make the manpage more intuitive.
    
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @dermoth @gitster

    git-svn bug with blank commits and author file

    dermoth authored gitster committed
    When trying to import from svn using an author file, git-svn bails out
    if it encounters a blank author. The attached patch changes this
    behavior and allow using the author file with blanks authors.
    
    I came across this bug while importing from a cvs2svn repo where the
    initial revision (1) has a blank author. This doesn't break the behavior
    of bailing out when an unknown author is encountered.
    
    Acked-by: Eric Wong <normalperson@yhbt.net>
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @gitster

    archive.c: format_subst - fixed bogus argument to memchr

    Ariel Badichi authored gitster committed
    Also removed a superfluous test.
    
    Signed-off-by: Ariel Badichi <abadichi@bezeqint.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. @gitster

    copy.c: copy_fd - correctly report write errors

    Ariel Badichi authored gitster committed
    Previously, the errno could have been lost due to an intervening
    close() call.
    
    This patch also contains minor cosmetic changes.
    
    Signed-off-by: Ariel Badichi <abadichi@bezeqint.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. @gitster

    gitattributes: Fix subdirectory attributes specified from root directory

    Matthew Ogilvie authored gitster committed
    Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 18, 2008
  1. @gitster

    am: POSIX portability fix

    gitster authored
    POSIX allows echo without flag to interpret specials such as \n, and we
    tried to make things portable by using printf instead where it matters.
    Recently added code to "git am" had unprotected "echo", which was caught
    by t4014 and Rémi Vanicat.
    
    This should fix it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 16, 2008
  1. @gitster

    git-am: minor cleanup

    gitster authored
    This moves the assignment to FIRSTLINE down so that we do not have
    to have multiple copies.
    
    Suggested by Linus.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Clarify and fix English in "git-rm" documentation

    Jon Loeliger authored gitster committed
    Do some verb-noun agreement changes.
    Clarify some file globbing cases.
    Fixed a wrong statement in an example.
    
    Signed-off-by: Jon Loeliger <jdl@jdl.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @chriscool @gitster

    git-bisect: make "start", "good" and "skip" succeed or fail atomically

    chriscool authored gitster committed
    Before this patch, when "git bisect start", "git bisect good" or
    "git bisect skip" were called with many revisions, they could fail
    after having already marked some revisions as "good", "bad" or
    "skip".
    
    This could be especilally bad for "git bisect start" because as
    the file ".git/BISECT_NAMES" would not have been written, there
    would have been no attempt to clear the marked revisions on a
    "git bisect reset". That's because if there is no
    ".git/BISECT_NAMES" file, nothing is done to clean things up, as
    the bisect session is not supposed to have started.
    
    While at it, let's also create the ".git/BISECT_START" file, only
    after ".git/BISECT_NAMES" as been created.
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @torvalds @gitster

    git-am: cope better with an empty Subject: line

    torvalds authored gitster committed
    When the Subject: line is empty for whatever reason, git-am was fooled by
    it and left an empty line at the beginning of the resulting commit log
    message.
    
    This moves the logic around so that we do not keep $SUBJECT in a separate
    variable.  Instead, $dotest/msg-clean, which used to be the log message
    body extracted from the message and then trailing whitespaces cleansed
    out, now contains the subject line followed by a blank line at the
    beginning for normal messages, and we use the first line from the file as
    the summary line throughout the program.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @torvalds @gitster

    Ignore leading empty lines while summarizing merges

    torvalds authored gitster committed
    "git log" and friends normally skip the initial empty lines when showing
    one-line summary of a commit, but merge summary didn't.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    ----
     builtin-fmt-merge-msg.c |   10 +++++++++-
     1 files changed, 9 insertions(+), 1 deletions(-)
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @chriscool @gitster

    bisect: squelch "fatal: ref HEAD not a symref" misleading message

    chriscool authored gitster committed
    To get the current HEAD when we start bisecting using for example
    "git bisect start", we first try "git symbolic-ref HEAD" to get a
    nice name, and if it fails, we fall back to "git rev-parse
    --verify HEAD".
    
    The problem is that when "git symbolic-ref HEAD" fails, it
    displays "fatal: ref HEAD not a symref", so it looks like "git
    bisect start" failed and does not accept detached HEAD, even if
    in fact it worked fine.
    
    This patch adds "-q" option to the "git symbolic-ref" call to
    get rid of the misleading error message.
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @albertito @gitster

    builtin-apply: Show a more descriptive error on failure when opening …

    albertito authored gitster committed
    …a patch
    
    When a patch can't be opened (it doesn't exist, there are permission
    problems, etc.) we get the usage text, which is not a proper indication of
    failure.
    
    Signed-off-by: Alberto Bertogli <albertito@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. @scc @gitster

    Clarify documentation of git-cvsserver, particularly in relation to g…

    scc authored gitster committed
    …it-shell
    
    For SSH clients restricted to git-shell, CVS_SERVER does not have to be
    specified, because git-shell understands the default value of 'cvs' to
    mean git-cvsserver'. This makes it totally transparent to CVS users, but
    the instruction to set up CVS access for people with real shell access
    does not apply.
    
    Previous wording mentioning GIT_AUTHOR, GIT_COMMITTER variables was
    unclear that we really meant GIT_AUTHOR_(NAME|EMAIL), etc.
    
    Note that the .ssh/environment file is a good place to set these, and that
    the .bashrc is shell-specific. Add a bit of text to differentiate cvs -d
    (setting CVSROOT) from cvs co -d (setting the name of the newly checked
    out directory).  Removed an extra 'Example:' string.
    
    Signed-off-by: Scott Collins <scc@ScottCollins.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 12, 2008
  1. @piyo @gitster

    Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)

    piyo authored gitster committed
    gitk creates and uses ~/.gitk
    
    Signed-off-by: Clifford Caoile <piyo@users.sourceforge.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.