Commits on Sep 18, 2010
  1. @gitster

    Git 1.7.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 18, 2010
  2. @gitster

    Merge branch 'js/ls-files-x-doc'

    * js/ls-files-x-doc:
      ls-files documentation: reword for consistency
      git-ls-files.txt: clarify -x/--exclude option
    
    Conflicts:
    	Documentation/git-ls-files.txt
    gitster committed Sep 18, 2010
Commits on Sep 17, 2010
  1. @ChrisJohnsen @gitster

    git-rebase--interactive.sh: replace cut with ${v%% *}

    Some versions of cut do not cope well with lines that do not end in
    an LF. In this case, we can completely avoid cut by using the
    ${var%% *} parameter expansion (suggested by Brandon Casey).
    
    I found this problem when t3404's "avoid unnecessary reset" failed
    due to the "rebase -i" not avoiding updating the tested timestamp.
    
    On a Mac OS X 10.4.11 system:
    
        % printf '%s' 'foo bar' | /usr/bin/cut -d ' ' -f 1
        cut: stdin: Illegal byte sequence
    
    Signed-off-by: Chris Johnsen <chris_johnsen@pobox.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ChrisJohnsen committed with gitster Sep 17, 2010
  2. @drafnel @gitster

    t/t7300: workaround ancient touch by rearranging arguments

    The ancient touch on Solaris 7 thinks that a decimal number supplied as
    the first argument specifies a date_time to give to the files specified by
    the remaining arguments.  In this case, it fails to parse '1' as a proper
    date_time and exits with a failure status.  Workaround this flaw by
    rearranging the arguments supplied to touch so that a non-digit appears
    first and touch will not be confused.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    drafnel committed with gitster Sep 15, 2010
Commits on Sep 16, 2010
  1. @gitster

    Merge branch 'bg/fix-t7003'

    * bg/fix-t7003:
      t7003: Use test_commit instead of custom function
    gitster committed Sep 16, 2010
  2. @gitster

    ls-files documentation: reword for consistency

    Similar to descriptions of other options, state what -x does in imperative
    mood.  Start sentences for -X and --exclude-per-directory options in
    capital letters.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 15, 2010
  3. @jaysoffian @gitster

    git-ls-files.txt: clarify -x/--exclude option

    Since b5227d8, -x/--exclude does not apply to cached files.
    This is easy to miss unless you read the discussion in the
    EXCLUDE PATTERNS section. Clarify that the option applies
    to untracked files and direct the reader to EXCLUDE PATTERNS.
    
    Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jaysoffian committed with gitster Sep 15, 2010
Commits on Sep 15, 2010
  1. @gitster

    Git 1.7.3 rc2

    gitster committed Sep 15, 2010
  2. @gitster

    Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'

    * dr/maint-ls-tree-prefix-recursion-fix:
      ls-tree $di $dir: do not mistakenly recurse into directories
    gitster committed Sep 15, 2010
  3. @gitster

    Merge branch 'os/fix-rebase-diff-no-prefix'

    * os/fix-rebase-diff-no-prefix:
      Add --src/dst-prefix to git-formt-patch in git-rebase.sh
    gitster committed Sep 15, 2010
  4. @gitster

    Merge branch 'jl/fix-test'

    * jl/fix-test:
      t1020: Get rid of 'cd "$HERE"' at the start of each test
      t2016 (checkout -p): add missing &&
      t1302 (core.repositoryversion): style tweaks
      t2105 (gitfile): add missing &&
      t1450 (fsck): remove dangling objects
      tests: subshell indentation stylefix
      Several tests: cd inside subshell instead of around
    gitster committed Sep 15, 2010
  5. @gitster

    Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'

    * ch/filter-branch-deprecate-remap-to-ancestor:
      filter-branch: retire --remap-to-ancestor
    gitster committed Sep 15, 2010
  6. @gitster

    Merge branch 'ch/maint-cannot-create-bundle-error'

    * ch/maint-cannot-create-bundle-error:
      bundle: detect if bundle file cannot be created
    gitster committed Sep 15, 2010
  7. @gitster

    Merge branch 'ks/recursive-rename-add-identical'

    * ks/recursive-rename-add-identical:
      RE: [PATCH] Avoid rename/add conflict when contents are identical
    gitster committed Sep 15, 2010
  8. @gitster

    Merge git://repo.or.cz/git-gui

    * 'master' of git://repo.or.cz/git-gui:
      git-gui 0.13
      git-gui: avoid mis-encoding the copyright message on Windows.
      git-gui: Update Swedish translation (521t).
      git-gui: ensure correct application termination in git-gui--askpass
      git-gui: handle textconv filter on Windows and in development
      git-gui: use shell to launch textconv filter in "blame"
      git-gui: display error launching blame as a message box.
      git-gui: Make usage statement visible on Windows.
    gitster committed Sep 15, 2010
Commits on Sep 14, 2010
  1. @patthoyts

    git-gui 0.13

    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    patthoyts committed Sep 14, 2010
Commits on Sep 13, 2010
  1. @patthoyts

    git-gui: avoid mis-encoding the copyright message on Windows.

    On Windows the tcl script file will use the system encoding and attempting
    to convert the copyright mis-encodes the string. Instead, keep the message
    as ASCII and substitute in the correct unicode character when running.
    
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    patthoyts committed Sep 13, 2010
  2. @nafmo @patthoyts

    git-gui: Update Swedish translation (521t).

    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    nafmo committed with patthoyts Sep 12, 2010
  3. @Benabik @gitster

    t7003: Use test_commit instead of custom function

    t7003-filter-branch.sh had a make_commit() function that was identical
    to test_commit() in test-lib.sh except that it used tr to create a
    lowercase file name from the uppercase branch name instead of
    appending ".t".
    
    Not only is this unneeded code duplication, it also was something
    simply waiting to fail on case-insensitive file systems.  So replace
    all uses of make_commit with test_commit.
    
    While we're editing the setup, chain it together with && so that
    failures early in the sequence don't get lost and add a commit graph.
    
    Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Benabik committed with gitster Sep 10, 2010
Commits on Sep 12, 2010
  1. @gitster

    Merge branch 'maint'

    * maint:
      t3101: modernise style
      compat/nedmalloc: don't force NDEBUG on the rest of git
    
    Conflicts:
    	Makefile
    gitster committed Sep 12, 2010
  2. @gitster

    ls-tree $di $dir: do not mistakenly recurse into directories

    When applying two pathspecs, one of which is named as a prefix to the
    other, we mistakenly recursed into the shorter one.
    
    Noticed and fixed by David Reis.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 11, 2010
  3. @gitster

    t3101: modernise style

    Also add a few " &&" cascade that were missing.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 11, 2010
  4. @gitster

    vcs-svn: Fix some printf format compiler warnings

    In particular, on systems that define uint32_t as an unsigned long,
    gcc complains as follows:
    
          CC vcs-svn/fast_export.o
      vcs-svn/fast_export.c: In function `fast_export_modify':
      vcs-svn/fast_export.c:28: warning: unsigned int format, uint32_t arg (arg 2)
      vcs-svn/fast_export.c:28: warning: int format, uint32_t arg (arg 3)
      vcs-svn/fast_export.c: In function `fast_export_commit':
      vcs-svn/fast_export.c:42: warning: int format, uint32_t arg (arg 5)
      vcs-svn/fast_export.c:62: warning: int format, uint32_t arg (arg 2)
      vcs-svn/fast_export.c: In function `fast_export_blob':
      vcs-svn/fast_export.c:72: warning: int format, uint32_t arg (arg 2)
      vcs-svn/fast_export.c:72: warning: int format, uint32_t arg (arg 3)
          CC vcs-svn/svndump.o
      vcs-svn/svndump.c: In function `svndump_read':
      vcs-svn/svndump.c:260: warning: int format, uint32_t arg (arg 3)
    
    In order to suppress the warnings we use the C99 format specifier
    macros PRIo32 and PRIu32 from <inttypes.h>.
    
    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Acked-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Ramsay Jones committed with gitster Sep 9, 2010
Commits on Sep 11, 2010
  1. @gitster

    compat/nedmalloc: don't force NDEBUG on the rest of git

    Define the nedmalloc feature configuration macros for nedmalloc.o, only.
    This keeps assert(3) working for the rest of the git source; it was
    turned off for nedmalloc users before by defining NDEBUG globally.
    
    Also remove -DUSE_NED_ALLOCATOR as this macro isn't used anywhere.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    René Scharfe committed with gitster Sep 11, 2010
Commits on Sep 10, 2010
  1. @gitster

    Git 1.7.3 rc1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 10, 2010
  2. @gitster

    Merge branch 'np/relnotes-in-subdir'

    * np/relnotes-in-subdir:
      install-webdoc: keep installed RelNotes-*.txt
      Documentation: move RelNotes into a directory of their own
    gitster committed Sep 10, 2010
  3. @gitster

    Prepare for 1.7.3 rc1

    gitster committed Sep 10, 2010
  4. @gitster

    Merge branch 'maint'

    * maint:
      config.txt: fix placement of diff.noprefix
    gitster committed Sep 10, 2010
  5. @MarkLodato @gitster

    config.txt: fix placement of diff.noprefix

    In git-config(1), diff.noprefix was placed in between
    diff.mnemonicprefix and the list of mnemonic prefixes, which is
    obviously incorrect and very confusing to readers.  Now, it is located
    after the end of the explanation of mnemonicprefix, which makes much
    more sense.
    
    Signed-off-by: Mark Lodato <lodatom@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    MarkLodato committed with gitster Sep 9, 2010
  6. @drafnel @gitster

    t/t4018: avoid two unnecessary sub-shell invocations

    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    drafnel committed with gitster Sep 10, 2010
  7. @gitster

    Merge branch 'maint'

    * maint:
      xdiff-interface.c: always trim trailing space from xfuncname matches
      diff.c: call regfree to free memory allocated by regcomp when necessary
    gitster committed Sep 9, 2010
  8. @drafnel @gitster

    t/t4018: test whether the word_regex patterns compile

    Previously (e3bf5e4), a test was added to test whether the builtin
    xfuncname regular expressions could be compiled without error by regcomp.
    Let's do the same for the word_regex patterns.  This should help catch any
    cross-platform incompatibilities that exist between the pattern creator's
    system and the various platforms that the test suite is commonly run on.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    drafnel committed with gitster Sep 9, 2010
  9. @drafnel @gitster

    xdiff-interface.c: always trim trailing space from xfuncname matches

    Generally, trailing space is removed from the string matched by the
    xfuncname patterns.  The exception is when the matched string exceeds the
    length of the fixed-size buffer that it will be copied in to.  But, a
    string that exceeds the buffer can still contain trailing space in the
    portion of the string that will be copied into the buffer.  So, simplify
    this code slightly, and just perform the trailing space removal always.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    drafnel committed with gitster Sep 9, 2010
  10. @drafnel @gitster

    diff.c: call regfree to free memory allocated by regcomp when necessary

    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    drafnel committed with gitster Sep 9, 2010
  11. @drafnel @gitster

    t/t5510-fetch.sh: improve testing with explicit URL and merge spec

    Commit 6106ce4 introduced a test to demonstrate fetch's failure to
    retrieve any objects or update FETCH_HEAD when it was supplied a repository
    URL and the current branch had a configured merge spec.  This commit
    expands the original test based on comments from Junio Hamano.  In addition
    to actually verifying that the fetch updates FETCH_HEAD correctly, and does
    not update the current branch, two more tests are added to ensure that the
    merge configuration is ignored even when the supplied URL matches the URL
    of the remote configured for the branch.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    drafnel committed with gitster Sep 9, 2010