Permalink
Commits on May 25, 2008
  1. Merge branch 'js/config-cb'

    gitster committed May 25, 2008
    * js/config-cb:
      Provide git_config with a callback-data parameter
    
    Conflicts:
    
    	builtin-add.c
    	builtin-cat-file.c
  2. Merge branch 'as/graph'

    gitster committed May 25, 2008
    * as/graph:
      get_revision(): honor the topo_order flag for boundary commits
      Fix output of "git log --graph --boundary"
      log --graph --left-right: show left/right information in place of '*'
      graph API: don't print branch lines for uninteresting merge parents
      graph API: fix graph mis-alignment after uninteresting commits
  3. Merge branch 'js/mailinfo'

    gitster committed May 25, 2008
    * js/mailinfo:
      mailsplit: minor clean-up in read_line_with_nul()
      mailinfo: apply the same fix not to lose NULs in BASE64 and QP codepaths
      mailsplit and mailinfo: gracefully handle NUL characters
  4. Merge branch 'jc/add-n-u'

    gitster committed May 25, 2008
    * jc/add-n-u:
      Make git add -n and git -u -n output consistent
      "git-add -n -u" should not add but just report
    
    Conflicts:
    
    	builtin-add.c
    	builtin-mv.c
    	cache.h
    	read-cache.c
  5. Merge branch 'ar/t6031'

    gitster committed May 25, 2008
    * ar/t6031:
      Fix t6031 on filesystems without working exec bit
  6. Merge branch 'db/clone-in-c'

    gitster committed May 25, 2008
    * db/clone-in-c:
      Add test for cloning with "--reference" repo being a subset of source repo
      Add a test for another combination of --reference
      Test that --reference actually suppresses fetching referenced objects
      clone: fall back to copying if hardlinking fails
      builtin-clone.c: Need to closedir() in copy_or_link_directory()
      builtin-clone: fix initial checkout
      Build in clone
      Provide API access to init_db()
      Add a function to set a non-default work tree
      Allow for having for_each_ref() list extra refs
      Have a constant extern refspec for "--tags"
      Add a library function to add an alternate to the alternates file
      Add a lockfile function to append to a file
      Mark the list of refs to fetch as const
    
    Conflicts:
    
    	cache.h
    	t/t5700-clone-reference.sh
  7. Merge branch 'jc/apply-whitespace'

    gitster committed May 25, 2008
    * jc/apply-whitespace:
      builtin-apply: do not declare patch is creation when we do not know it
      builtin-apply: accept patch to an empty file
      builtin-apply: typofix
  8. Merge branch 'jc/unpack-trees-reword'

    gitster committed May 25, 2008
    * jc/unpack-trees-reword:
      unpack-trees: allow Porcelain to give different error messages
  9. Merge branch 'ar/batch-cat'

    gitster committed May 25, 2008
    * ar/batch-cat:
      change quoting in test t1006-cat-file.sh
      builtin-cat-file.c: use parse_options()
      git-svn: Speed up fetch
      Git.pm: Add hash_and_insert_object and cat_blob
      Git.pm: Add command_bidi_pipe and command_close_bidi_pipe
      git-hash-object: Add --stdin-paths option
      Add more tests for git hash-object
      Move git-hash-object tests from t5303 to t1007
      git-cat-file: Add --batch option
      git-cat-file: Add --batch-check option
      git-cat-file: Make option parsing a little more flexible
      git-cat-file: Small refactor of cmd_cat_file
      Add tests for git cat-file
  10. Merge branch 'cc/bisect'

    gitster committed May 25, 2008
    * cc/bisect:
      bisect: use a detached HEAD to bisect
      bisect: trap critical errors in "bisect_start"
      bisect: fix left over "BISECT_START" file when starting with junk rev
      bisect: add test cases to check that "git bisect start" is atomic
  11. Merge branch 'ap/svn'

    gitster committed May 25, 2008
    * ap/svn:
      git-svn: add test for --add-author-from and --use-log-author
      git-svn: add documentation for --add-author-from option.
      git-svn: Add --add-author-from option.
      git-svn: add documentation for --use-log-author option.
  12. Merge branch 'js/cvsexportcommit'

    gitster committed May 25, 2008
    * js/cvsexportcommit:
      cvsexportcommit: introduce -W for shared working trees (between Git and CVS)
      cvsexportcommit: chomp only removes trailing whitespace
    
    Conflicts:
    
    	git-cvsexportcommit.perl
  13. Merge branch 'js/ignore-submodule'

    gitster committed May 25, 2008
    * js/ignore-submodule:
      Ignore dirty submodule states during rebase and stash
      Teach update-index about --ignore-submodules
      diff options: Introduce --ignore-submodules
  14. Merge branch 'mo/cvsserver'

    gitster committed May 25, 2008
    * mo/cvsserver:
      Documentation: Fix skipped section level
      git-cvsserver: add ability to guess -kb from contents
      implement gitcvs.usecrlfattr
      git-cvsserver: add mechanism for managing working tree and current directory
  15. mailsplit: minor clean-up in read_line_with_nul()

    gitster committed May 25, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  16. mailinfo: apply the same fix not to lose NULs in BASE64 and QP codepaths

    gitster committed May 25, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  17. mailsplit and mailinfo: gracefully handle NUL characters

    dscho committed with gitster May 16, 2008
    The function fgets() has a big problem with NUL characters: it reads
    them, but nobody will know if the NUL comes from the file stream, or
    was appended at the end of the line.
    
    So implement a custom read_line_with_nul() function.
    
    Noticed by Tommy Thorn.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  18. http-push: remove remote locks on exit signals

    Clemens Buchacher committed with gitster May 25, 2008
    If locks are not cleaned up the repository is inaccessible for 10 minutes.
    
    Signed-off-by: Clemens Buchacher <drizzd@aon.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  19. Reset the signal being handled

    Clemens Buchacher committed with gitster May 25, 2008
    This did not cause any problems, because remove_lock_file_on_signal is
    only registered for SIGINT.
    
    Signed-off-by: Clemens Buchacher <drizzd@aon.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  20. Make git-cvsimport remove ['s from tags, as bad_ref_char doesn't allo…

    puzza007 committed with gitster May 23, 2008
    …w them.
    
    Signed-off-by: Paul Oliver <puzza007@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  21. get_revision(): honor the topo_order flag for boundary commits

    simpkins committed with gitster May 24, 2008
    Now get_revision() sorts the boundary commits when topo_order is set.
    Since sort_in_topological_order() takes a struct commit_list, it first
    places the boundary commits into revs->commits.
    
    Signed-off-by: Adam Simpkins <adam@adamsimpkins.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  22. Fix output of "git log --graph --boundary"

    simpkins committed with gitster May 24, 2008
    Previously the graphing API wasn't aware of the revs->boundary flag, and
    it always assumed that commits marked UNINTERESTING would not be
    displayed.  As a result, the boundary commits were printed at the end of
    the log output, but they didn't have any branch lines connecting them to
    their children in the graph.
    
    There was also another bug in the get_revision() code that caused
    graph_update() to be called twice on the first boundary commit.  This
    caused the graph API to think that a commit had been skipped, and print
    a "..." line in the output.
    
    Signed-off-by: Adam Simpkins <adam@adamsimpkins.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  23. log --graph --left-right: show left/right information in place of '*'

    simpkins committed with gitster May 25, 2008
    With the --graph option, the graph already outputs 'o' instead of '*'
    for boundary commits.  Make it emit '<' or '>' when --left-right is
    specified.
    
    (This change also disables the '^' prefix for UNINTERESTING commits.
    The graph code currently doesn't print anything special for these
    commits, since it assumes no UNINTERESTING, non-BOUNDARY commits are
    displayed.  This is potentially a bug if UNINTERESTING non-BOUNDARY
    commits can actually be displayed via some code path.)
    
    [jc: squashed the left-right change from Dscho and Adam's fixup into one]
    
    Signed-off-by: Adam Simpkins <adam@adamsimpkins.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  24. graph API: don't print branch lines for uninteresting merge parents

    simpkins committed with gitster May 24, 2008
    Previously, the graphing code printed lines coming out of a merge commit
    for all of its parents, even if some of them were uninteresting.  Now it
    only prints lines for interesting commits.
    
    For example, for a merge commit where only the first parent is
    interesting, the code now prints:
    
      *  merge commit
      *  interesting child
    
    instead of:
    
      M  merge commit
      |\
      *  interesting child
    
    Signed-off-by: Adam Simpkins <adam@adamsimpkins.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  25. graph API: fix graph mis-alignment after uninteresting commits

    simpkins committed with gitster May 24, 2008
    The graphing code had a bug that caused it to output branch lines
    incorrectly after ignoring an uninteresting commit.  When computing how
    to match up the branch lines from the current commit to the next one, it
    forgot to take into account that it needed to initially start with 2
    empty spaces where the missing commit would have gone.
    
    So, instead of drawing this,
    
      | * | <- Commit with uninteresting parent
      |  /
      * |
    
    It used to incorrectly draw this:
    
      | * | <- Commit with uninteresting parent
      * |
    
    Signed-off-by: Adam Simpkins <adam@adamsimpkins.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  26. Documentation: convert tutorials to man pages

    chriscool committed with gitster May 24, 2008
    This patch renames the following documents and at the same time converts
    them to the man page format:
    
    cvs-migration.txt -> gitcvs-migration.txt
    tutorial.txt      -> gittutorial.txt
    tutorial-2.txt    -> gittutorial-2.txt
    
    These new man pages are put in section 7, and other documents that reference
    the above ones are change accordingly.
    
    [jc: with help from Nanako to clean things up]
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  27. CodingGuidelines: Add a note to avoid assignments inside if()

    Miklos Vajna committed with gitster May 22, 2008
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  28. Remove redundant code, eliminate one static variable

    heikkiorsila committed with gitster May 23, 2008
    Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 24, 2008
  1. Merge git://git.kernel.org/pub/scm/gitk/gitk

    gitster committed May 24, 2008
    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload"
      gitk: Fix bug where current row number display stops working
      gitk: Move es.po where it belongs
      gitk: Fix "wrong # coordinates" error on reload
Commits on May 23, 2008
  1. Merge branch 'pb/push'

    gitster committed May 23, 2008
    * pb/push:
      add special "matching refs" refspec
  2. Merge branch 'bc/repack'

    gitster committed May 23, 2008
    * bc/repack:
      Documentation/git-repack.txt: document new -A behaviour
      let pack-objects do the writing of unreachable objects as loose objects
      add a force_object_loose() function
      builtin-gc.c: deprecate --prune, it now really has no effect
      git-gc: always use -A when manually repacking
      repack: modify behavior of -A option to leave unreferenced objects unpacked
    
    Conflicts:
    
    	builtin-pack-objects.c
  3. Merge branch 'sp/ignorecase'

    gitster committed May 23, 2008
    * sp/ignorecase:
      t0050: Fix merge test on case sensitive file systems
      t0050: Add test for case insensitive add
      t0050: Set core.ignorecase case to activate case insensitivity
      t0050: Test autodetect core.ignorecase
      git-init: autodetect core.ignorecase
  4. Merge branch 'maint'

    gitster committed May 23, 2008
    * maint:
      rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
      Add missing "short" alternative to --date in rev-list-options.txt
      git-show.txt: Not very stubby these days.
      Clarify repack -n documentation
  5. Add log.date config variable

    heikkiorsila committed with gitster May 22, 2008
    log.date config variable sets the default date-time mode for the log
    command. Setting log.date value is similar to using git log's --date
    option.
    
    Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Merge branch 'maint-1.5.4' into maint

    gitster committed May 23, 2008
    * maint-1.5.4:
      rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref