Permalink
Commits on Oct 22, 2010
  1. Git 1.7.3.2

    gitster committed Oct 22, 2010
Commits on Oct 21, 2010
  1. Merge branch 'sn/doc-opt-notation' into maint

    * sn/doc-opt-notation:
      Fix {update,checkout}-index usage strings
      Put a space between `<' and argument in pack-objects usage string
      Remove stray quotes in --pretty and --format documentation
      Use parentheses and `...' where appropriate
      Fix odd markup in --diff-filter documentation
      Use angles for placeholders consistently
    gitster committed Oct 21, 2010
  2. Merge branch 'mg/fix-build-remote-helpers' into maint

    * mg/fix-build-remote-helpers:
      remote-helpers: build in platform independent directory
    gitster committed Oct 21, 2010
Commits on Oct 19, 2010
  1. t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'

    Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ao2 committed with gitster Oct 19, 2010
  2. Clarify and extend the "git diff" format documentation

    Move the similarity and dissimilarity index header description closer to
    where those extended headers are described.
    
    Describe and/or clarify the format used for file modes, pathnames, and
    the index header.
    
    Document that all "old" files refer to the state before applying the
    *entire* output, and all "new" files refer to the state thereafter.
    
    Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Andreas Gruenbacher committed with gitster Oct 14, 2010
  3. git-show-ref.txt: clarify the pattern matching

    git-show-ref really does not do what one would expect under the name
    pattern matching, so describe it.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Oct 18, 2010
  4. documentation: git-config minor cleanups

    Change push.default's description to add hyphens between values and
    descriptions to make the manpage easier to read.  The html version is
    readable either way.
    
    Change status.showUntrackedFiles to make item descriptions be
    sentences and to use the same asciidoc format as push.default.  The
    only visual change is the additions of "."
    
    Signed-off-by: Cliff Frey <cliff@meraki.com>
    Acked-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Cliff Frey committed with gitster Oct 18, 2010
  5. Update test script annotate-tests.sh to handle missing/extra authors

    The current script used by annotate-tests.sh (used by t8001 and t8002) fails
    to emit a warning if any of the expected authors never show up in the output
    or if authors that show up in the output were never specified as expected.
    Update the script to fail in both of these scenarios.
    
    Helped-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Kevin Ballard <kevin@sb.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    kballard committed with gitster Oct 16, 2010
Commits on Oct 14, 2010
  1. Better advice on using topic branches for kernel development

    Linus Torvalds wrote:
    > The real problem is that maintainers often pick random - and not at
    > all stable - points for their development to begin with. They just
    > pick some random "this is where Linus -git tree is today", and do
    > their development on top of that. THAT is the problem - they are
    > unaware that there's some nasty bug in that version.
    
    Maybe they do this because they read it in the Git user-manual.
    
    Fix the manual to give them better guidance.
    
    Signed-off-by: Tony Luck <tony.luck@intel.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Luck, Tony committed with gitster Oct 1, 2010
  2. Documentation: update implicit "--no-index" behavior in "git diff"

    Originally "--no-index" mode triggered for untracked files within the
    tracked tree, but with v1.5.6-rc1~41 (Merge branch 'jc/diff-no-no-index,
    2008-05-26) the command was fixed to only implicitly trigger when paths
    outside the tracked tree are mentioned.
    
    Reported-by: Yann Dirson <dirson@bertin.fr>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Oct 11, 2010
  3. Documentation: expand 'git diff' SEE ALSO section

    Point in many directions in the hope of helping the reader find what
    is needed more quickly.
    
    This commit also removes the summary attached to the SEE ALSO entry
    for difftool, to avoid making the SEE ALSO list too verbose.  If the
    reader wants a summary of the commands referred to, she can always
    look to the top of the named pages or to the table of contents on the
    main git(1) page.
    
    Suggested-by: Goswin von Brederlow <goswin-v-b@web.de>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Oct 11, 2010
  4. Documentation: diff can compare blobs

    Meanwhile, there is no plumbing command to compare two blobs.
    Strange.
    
    Reported-by: Yann Dirson <dirson@bertin.fr>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Oct 11, 2010
  5. Documentation: gitrevisions is in section 7

    Fix references to gitrevisions(1) in the manual pages and HTML
    documentation.
    
    In practice, this will not matter much unless someone tries to use a
    hard copy of the git reference manual.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Oct 11, 2010
Commits on Oct 13, 2010
  1. shell portability: no "export VAR=VAL"

    It is more portable to say "VAR=VAL && export VAR" instead.
    
    Noticed by Ævar.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 13, 2010
  2. CodingGuidelines: reword parameter expansion section

    Group entries related to parameter substitutions together and avoid
    using the word "regexp" to refer to the ${parameter/pattern/string}
    substitution (banned), as the pattern there is a shell glob and not
    a regular expression.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 13, 2010
  3. Documentation: update-index: -z applies also to --index-info

    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bertwesarg committed with gitster Oct 8, 2010
Commits on Oct 8, 2010
  1. Documentation: No argument of ALLOC_GROW should have side-effects

    The explanatory comment before the definition of ALLOC_GROW carefully
    lists arguments that will be used more than once and thus cannot have
    side-effects; a lazy reader might conclude that the arguments not
    listed are used only once and side effects safe.
    
    Correct it to list all three arguments, avoiding this confusion.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Oct 8, 2010
  2. Fix {update,checkout}-index usage strings

    The `<file>' argument is optional in both cases (the man pages are
    already correct).
    
    Signed-off-by: Štěpán Němec <stepnem@gmail.com>
    Acked-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Štěpán Němec committed with gitster Oct 8, 2010
  3. Put a space between `<' and argument in pack-objects usage string

    This makes it cosistent with other places (including the
    git-pack-objects(1) manpage itself) and avoids possible confusion (I,
    for one, mistook `<object-list' for a `<object-list>' typo at first when
    preparing this series).
    
    Signed-off-by: Štěpán Němec <stepnem@gmail.com>
    Acked-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Štěpán Němec committed with gitster Oct 8, 2010
  4. Remove stray quotes in --pretty and --format documentation

    Quotes (for emphasis) are used in option explanations, not the
    headings.
    
    Signed-off-by: Štěpán Němec <stepnem@gmail.com>
    Acked-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Štěpán Němec committed with gitster Oct 8, 2010
  5. Use parentheses and `...' where appropriate

    Remove some stray usage of other bracket types and asterisks for the
    same purpose.
    
    Signed-off-by: Štěpán Němec <stepnem@gmail.com>
    Acked-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Štěpán Němec committed with gitster Oct 8, 2010
  6. Fix odd markup in --diff-filter documentation

    Instead of using the regex-like bracket expression, use grouping to make
    it more consistent with other similar places. The brackets now have the
    same meaning as in other documentation (i.e., the argument is optional).
    
    Signed-off-by: Štěpán Němec <stepnem@gmail.com>
    Mentored-and-Acked-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Štěpán Němec committed with gitster Oct 8, 2010
  7. Use angles for placeholders consistently

    Signed-off-by: Štěpán Němec <stepnem@gmail.com>
    Acked-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Štěpán Němec committed with gitster Oct 8, 2010
Commits on Oct 6, 2010
  1. t/t3415: use && where applicable.

    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ydirson committed with gitster Oct 1, 2010
  2. SubmittingPatches: Document some extra tags used in commit messages

    Document the meanings of the tags "Reported-by:", "Acked-by:",
    "Reviewed-by:" and "Tested-by:" clearly. Also mention that the user is
    free to use any custom tags.
    
    Helped-by: Jonathan Nieder <jrnieder@gmail.com>
    Liked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Oct 2, 2010
  3. Documentation/git-clone: describe --mirror more verbosely

    Some people in #linux-rt noticed that describing what "--mirror" option does
    with "it mirrors" is way insufficient.
    
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Cc: Darren 'Some People' Hart <darren@dvhart.com>
    Cc: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Uwe Kleine-König committed with gitster Oct 4, 2010
  4. do not depend on signed integer overflow

    Signed integer overflow is not defined in C, so do not depend on it.
    
    This fixes a problem with GCC 4.4.0 and -O3 where the optimizer would
    consider "consumed_bytes > consumed_bytes + bytes" as a constant
    expression, and never execute the die()-call.
    
    Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
    Acked-by: Nicolas Pitre <nico@fluxnic.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    kusma committed with gitster Oct 5, 2010
  5. work around buggy S_ISxxx(m) implementations

    There are buggy implementations of S_ISxxx(m) macros on some platforms
    (e.g. NetBSD).  The issue is that NetBSD doesn't take care to wrap its
    macro arguments in parentheses, so on Linux and sane systems we have
    S_ISREG(m) defined as something like:
    
        (((m) & S_IFMT) == S_IFREG)
    
    But on NetBSD:
    
        ((m & _S_IFMT) == _S_IFREG)
    
    Since a caller in builtin/diff.c called our macro as `S_IFREG | 0644'
    this bug introduced a logic error on NetBSD, since the precedence of
    bit-wise & is higher than | in C.
    
    [jc: took change description from Ævar Arnfjörð Bjarmason's patch]
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    René Scharfe committed with gitster Oct 4, 2010
  6. xdiff: cast arguments for ctype functions to unsigned char

    The ctype functions isspace(), isalnum(), et al take an integer
    argument representing an unsigned character, or -1 for EOF.  On
    platforms with a signed char, it is unsafe to pass a char to them
    without casting it to unsigned char first.
    
    Most of git is already shielded against this by the ctype
    implementation in git-compat-util.h, but xdiff, which uses libc
    ctype.h, ought to be fixed.
    
    Noticed-by: der Mouse <mouse@Rodents-Montreal.ORG>
    Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Oct 4, 2010
  7. init: plug tiny one-time memory leak

    The buffer used to construct paths like ".git/objects/info" and
    ".git/objects/pack" is allocated on the heap and never freed.
    
    So free it.  While at it, factor out the relevant code into its own
    function and rename the sha1_dir variable to object_directory (to
    match the change in everyday usage after the renaming of
    SHA1_FILE_DIRECTORY in v0.99~603^2~7, 2005).
    
    Noticed by valgrind while setting up tests (in test-lib).
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Oct 4, 2010
Commits on Oct 5, 2010
  1. diffcore-pickaxe.c: remove unnecessary curly braces

    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    drafnel committed with gitster Oct 4, 2010
  2. Merge early part of git-svn into maint

    * commit 'git-svn/master~1':
      git-svn: fix processing of decorated commit hashes
      git-svn: check_cherry_pick should exclude commits already in our history
      Documentation/git-svn: discourage "noMetadata"
    gitster committed Oct 5, 2010
Commits on Oct 4, 2010
  1. t3020 (ls-files-error-unmatch): remove stray '1' from end of file

    Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Elijah Newren <newren@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    newren committed with gitster Oct 3, 2010
Commits on Oct 3, 2010
  1. setup: make sure git dir path is in a permanent buffer

    If setup_git_env() is run before the usual repository discovery
    sequence and .git is a file with the text
    
    	gitdir: <path>
    
    (with <path> any string) then the in-core git_dir variable is set to
    the result of converting <path> to an absolute path using
    make_absolute_path().
    
    Unfortunately make_absolute_path() returns its result in a static
    buffer that is overwritten by later calls.  Such a call could cause
    later accesses to git_dir (from git_pathdup(), for example) to read
    the wrong path, leaving git very confused.
    
    It is not obvious whether any existing code in git will trigger the
    problem, but in any case, it is worth a few dozen bytes to copy the
    return value from make_absolute_path() for some added peace of mind.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Oct 2, 2010
  2. environment.c: remove unused variable

    After v1.6.0-rc0~230^2^ (environment.c: remove unused function,
    2008-06-19), git_refs_dir is not used any more.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Oct 2, 2010