Permalink
Commits on Sep 10, 2010
  1. Git 1.7.3 rc1

    gitster committed Sep 10, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'np/relnotes-in-subdir'

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

    gitster committed Sep 10, 2010
  4. Merge branch 'maint'

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

    MarkLodato committed with gitster Sep 10, 2010
    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>
  6. t/t4018: avoid two unnecessary sub-shell invocations

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

    gitster committed Sep 10, 2010
    * maint:
      xdiff-interface.c: always trim trailing space from xfuncname matches
      diff.c: call regfree to free memory allocated by regcomp when necessary
  8. t/t4018: test whether the word_regex patterns compile

    drafnel committed with gitster Sep 9, 2010
    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>
  9. xdiff-interface.c: always trim trailing space from xfuncname matches

    drafnel committed with gitster Sep 9, 2010
    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>
  10. diff.c: call regfree to free memory allocated by regcomp when necessary

    drafnel committed with gitster Sep 9, 2010
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. t/t5510-fetch.sh: improve testing with explicit URL and merge spec

    drafnel committed with gitster Sep 9, 2010
    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>
  12. builtin/fetch.c: comment that branch->remote_name is usable when has_…

    drafnel committed with gitster Sep 9, 2010
    …merge
    
    Save future readers the trouble of tracing code to determine that the two
    uses of branch->remote_name are safe when has_merge is set, by adding a
    comment explaining that it is so.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. Makefile: use compat regex on IRIX 6.5

    drafnel committed with gitster Sep 9, 2010
    The IRIX 6.5 regex.h header file defines REG_STARTEND, but the feature does
    not appear to work.  Since REG_STARTEND is required for proper functioning
    of git-grep, set NO_REGEX and use the alternative regex libraries in compat/
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  14. t/t7008: workaround broken handling of \000 by printf on IRIX

    drafnel committed with gitster Sep 9, 2010
    On IRIX 6.5, the printf utility in /usr/bin does not appear to handle the
    \ddd notation according to POSIX.  This printf appears to halt processing
    of the string argument and ignore any additional characters in the string.
    Work around this flaw by replacing the \000's with 'Q' and using the
    q_to_nul helper function provided by test-lib.sh
    
    This problem with printf is not apparent when using the Bash shell since
    Bash implements a POSIX compatible printf function internally.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 9, 2010
  1. install-webdoc: keep installed RelNotes-*.txt

    gitster committed Sep 9, 2010
    Otherwise URLs in the wild that point at older release notes will become
    dangling.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 8, 2010
  1. Merge branch 'tf/cleanup-builtin-help-headers'

    gitster committed Sep 8, 2010
    * tf/cleanup-builtin-help-headers:
      builtin.h: Move two functions definitions to help.h.
  2. Merge branch 'jk/test-must-fail-missing'

    gitster committed Sep 8, 2010
    * jk/test-must-fail-missing:
      tests: make test_might_fail fail on missing commands
      tests: make test_might_fail more verbose
      tests: make test_must_fail fail on missing commands
      tests: make test_must_fail more verbose
  3. Merge branch 'jh/error-removing-missing-note'

    gitster committed Sep 8, 2010
    * jh/error-removing-missing-note:
      notes: Don't create (empty) commit when removing non-existing notes
  4. Merge branch 'kf/askpass-config'

    gitster committed Sep 8, 2010
    * kf/askpass-config:
      Extend documentation of core.askpass and GIT_ASKPASS.
      Allow core.askpass to override SSH_ASKPASS.
      Add a new option 'core.askpass'.
  5. Merge branch 'bc/maint-fetch-url-only'

    gitster committed Sep 8, 2010
    * bc/maint-fetch-url-only:
      builtin/fetch.c: ignore merge config when not fetching from branch's remote
      t/t5510: demonstrate failure to fetch when current branch has merge ref
  6. Merge branch 'jk/maint-pass-c-config-in-env'

    gitster committed Sep 8, 2010
    * jk/maint-pass-c-config-in-env:
      do not pass "git -c foo=bar" params to transport helpers
      pass "git -c foo=bar" params through environment
  7. Merge branch 'en/d-f-conflict-fix'

    gitster committed Sep 8, 2010
    * en/d-f-conflict-fix:
      fast-export: ensure that a renamed file is printed after all references
  8. fast-export: ensure that a renamed file is printed after all references

    j6t committed with gitster Sep 7, 2010
    t9350 sets up a commit where a file is both copied and renamed. The output
    of fast-export for this commit should look like this:
    
      author ...
      committer ...
      from :19
      C "file2" "file4"
      R "file2" "file5"
    
    The order of the two modification lines is derived from the result that
    the diff machinery produces.
    
    060df62 (fast-export: Fix output order of D/F changes) inserted a qsort
    call that modifies the order of the diff result. Unfortunately, qsort need
    not be stable. Therefore, it is possible that the 'R' line appears before
    the 'C' line and the resulting fast-import stream is incorrect.
    
    Fix it by forcing that the rename entry is printed after all other
    modification lines with the same file name.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 7, 2010
  1. Documentation: move RelNotes into a directory of their own

    npitre committed with gitster Sep 7, 2010
    There are 108 of them already.  That's a bit more than one third of
    all the files in the Documentation directory already, and still growing.
    
    Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'maint'

    gitster committed Sep 7, 2010
    * maint:
      revert: Fix trivial comment style issue
      cache_tree_free: Fix small memory leak
    
    Conflicts:
    	builtin/revert.c
  3. revert: Fix trivial comment style issue

    newren committed with gitster Sep 6, 2010
    Signed-off-by: Elijah Newren <newren@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. cache_tree_free: Fix small memory leak

    newren committed with gitster Sep 6, 2010
    Signed-off-by: Elijah Newren <newren@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 6, 2010
  1. Merge branch 'jh/clean-exclude'

    gitster committed Sep 6, 2010
    * jh/clean-exclude:
      builtin/clean.c: Use STRING_LIST_INIT_NODUP.
  2. builtin/clean.c: Use STRING_LIST_INIT_NODUP.

    Thiago Farina committed with gitster Sep 6, 2010
    Signed-off-by: Thiago Farina <tfransosi@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. t3404 & t7508: cd inside subshell instead of around

    jlehmann committed with gitster Sep 6, 2010
    Fixed all places where it was a straightforward change from cd'ing into a
    directory and back via "cd .." to a cd inside a subshell.
    
    Found these places with "git grep -w "cd \.\.".
    
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Merge branch 'maint'

    gitster committed Sep 6, 2010
    * maint:
      tag.c: whitespace breakages fix
      Fix whitespace issue in object.c
      t5505: add missing &&
  5. Merge branch 'xx/trivial' into maint

    gitster committed Sep 6, 2010
    * xx/trivial:
      tag.c: whitespace breakages fix
      Fix whitespace issue in object.c
      t5505: add missing &&
  6. tag.c: whitespace breakages fix

    gitster committed Sep 6, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. Fix whitespace issue in object.c

    jhance committed with gitster Sep 5, 2010
    Change some expanded tabs (spaces) to tabs in object.c.
    
    Signed-off-by: Jared Hance <jaredhance@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. t5505: add missing &&

    jlehmann committed with gitster Sep 5, 2010
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>