Permalink
Commits on Dec 17, 2008
  1. GIT 1.5.4.7

    gitster committed Dec 17, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. gitweb: do not run "git diff" that is Porcelain

    gitster committed Dec 17, 2008
    Jakub says that legacy-style URI to view two blob differences are never
    generated since 1.4.3.  This codepath runs "git diff" Porcelain from the
    gitweb, which is a no-no.  It can trigger diff.external command that is
    specified in the configuration file of the repository being viewed.
    
    This patch applies to v1.5.4 and later.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 27, 2008
  1. GIT 1.5.4.6

    gitster committed Jun 27, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 26, 2008
  1. git-shell: accept "git foo" form

    gitster committed Dec 2, 2007
    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. builtin-fast-export: Only output a single parent per line

    pieter authored and gitster committed May 24, 2008
    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. rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref

    Johannes Sixt authored and gitster committed May 23, 2008
    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. git-am: fix typo in usage message

    peff authored and gitster committed May 19, 2008
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. doc/git-daemon: s/uploadarchive/uploadarch/

    peff authored and gitster committed May 19, 2008
    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. Documentation/git-describe.txt: make description more readable

    ihilt authored and gitster committed May 14, 2008
    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. wt-status.h: declare global variables as extern

    Johannes Sixt authored and gitster committed May 9, 2008
    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. builtin-commit.c: add -u as short name for --untracked-files

    sitaramc authored and gitster committed May 9, 2008
    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. git-repack: re-enable parsing of -n command line option

    gitzilla authored and gitster committed May 10, 2008
    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. Documentation/config.txt: Mention branch.<name>.rebase applies to "gi…

    dustin authored and gitster committed May 8, 2008
    …t pull"
    
    Signed-off-by: Dustin Sallings <dustin@spy.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. doc: clarify definition of "update" for git-add -u

    peff authored and gitster committed May 8, 2008
    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. filter-branch: Documentation fix.

    rafl authored and gitster committed Apr 30, 2008
    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. cvsimport: always pass user data to "system" as a list

    peff authored and gitster committed Apr 30, 2008
    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. fix reflog approxidate parsing bug

    peff authored and gitster committed Apr 30, 2008
    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. Remove 'header' from --signoff option description

    toofishes authored and gitster committed Apr 27, 2008
    Signed-off-by: Dan McGee <dpmcgee@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 23, 2008
  1. t5516: remove ambiguity test (1)

    peff authored and gitster committed Apr 23, 2008
    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. Linked glossary from cvs-migration page

    mdg authored and gitster committed Apr 23, 2008
    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. write-tree: properly detect failure to write tree objects

    gitster committed Apr 23, 2008
    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. svn-git: Use binmode for reading/writing binary rev maps

    michaelw authored and gitster committed Apr 18, 2008
    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. diff options documentation: refer to --diff-filter in --name-status

    Miklos Vajna authored and gitster committed Apr 22, 2008
    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. git-svn bug with blank commits and author file

    dermoth authored and gitster committed Apr 22, 2008
    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. archive.c: format_subst - fixed bogus argument to memchr

    Ariel Badichi authored and gitster committed Apr 23, 2008
    Also removed a superfluous test.
    
    Signed-off-by: Ariel Badichi <abadichi@bezeqint.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. copy.c: copy_fd - correctly report write errors

    Ariel Badichi authored and gitster committed Apr 23, 2008
    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. gitattributes: Fix subdirectory attributes specified from root directory

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

    gitster committed Apr 18, 2008
    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. git-am: minor cleanup

    gitster committed Apr 16, 2008
    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. Clarify and fix English in "git-rm" documentation

    Jon Loeliger authored and gitster committed Apr 16, 2008
    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. git-bisect: make "start", "good" and "skip" succeed or fail atomically

    chriscool authored and gitster committed Apr 14, 2008
    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. git-am: cope better with an empty Subject: line

    torvalds authored and gitster committed Apr 15, 2008
    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. Ignore leading empty lines while summarizing merges

    torvalds authored and gitster committed Apr 15, 2008
    "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. bisect: squelch "fatal: ref HEAD not a symref" misleading message

    chriscool authored and gitster committed Apr 16, 2008
    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. builtin-apply: Show a more descriptive error on failure when opening …

    albertito authored and gitster committed Apr 14, 2008
    …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>