What's in git/spearce.git (stable)

What's in git/spearce.git (stable)

[Shawn O. Pearce]

For those who may be new to the git/spearce.git concept I'm filling
in for Junio and have published a tree on repo.or.cz:

  git://repo.or.cz/git/spearce.git
  http://repo.or.cz/r/git/spearce.git

------

* The 'maint' branch has these fixes since the last announcement.

Alex Bennee (1):
  Ensure we add directories in the correct order

Andrew Clausen (1):
  helpful error message when send-pack finds no refs in common.

Brian Gernhardt (1):
  cvsserver: Use exit 1 instead of die when req_Root fails.

Gerrit Pape (1):
  git-config: print error message if the config file cannot be read

Jeff King (1):
  send-pack: respect '+' on wildcard refspecs

Joakim Tjernlund (1):
  Improve receive-pack error message about funny ref creation

Johannes Schindelin (3):
  Fix setup_git_directory_gently() with relative GIT_DIR &
      GIT_WORK_TREE
  fix filter-branch documentation
  filter-branch: update current branch when rewritten

Julian Phillips (1):
  fast-import: Fix argument order to die in file_change_m

Linus Torvalds (4):
  git-blame shouldn't crash if run in an unmerged tree
  Avoid scary errors about tagged trees/blobs during git-fetch
  Fix directory scanner to correctly ignore files without d_type
  Fix diffcore-break total breakage

Patrick Welche (1):
  Define NI_MAXSERV if not defined by operating system

Ralf Wildenhues (1):
  gitk.txt: Fix markup.

Robert Schiele (1):
  fixing output of non-fast-forward output of post-receive-email

Shawn O. Pearce (16):
  git-gui: Display message box when we cannot find git in $PATH
  git-gui: Handle starting on mapped shares under Cygwin
  git-gui: Ensure .git/info/exclude is honored in Cygwin workdirs
  git-gui: Allow gitk to be started on Cygwin with native Tcl/Tk
  git-gui: Don't crash when starting gitk from a browser session
  Correct typos in release notes for 1.5.3.5
  Avoid 'expr index' on Mac OS X as it isn't supported
  Document additional 1.5.3.5 fixes in release notes
  Yet more 1.5.3.5 fixes mentioned in release notes
  Avoid invoking diff drivers during git-stash
  Further 1.5.3.5 fixes described in release notes
  Paper bag fix diff invocation in 'git stash show'
  git-gui: Correctly report failures from git-write-tree
  git-gui: Handle progress bars from newer gits
  git-gui: Don't display CR within console windows
  Describe more 1.5.3.5 fixes in release notes

Simon Sasburg (1):
  git-gui: Avoid using bold text in entire gui for some fonts

Steffen Prohaska (2):
  git-gui: accept versions containing text annotations, like
      1.5.3.mingw.1
  attr: fix segfault in gitattributes parsing code


* The 'master' branch has these since the last announcement
  in addition to the above.

Benoit Sigoure (5):
  git-svn: add a generic tree traversal to fetch SVN properties
  git-svn: implement git svn create-ignore
  git-svn: add git svn propget
  git-svn: add git svn proplist
  git-svn: simplify the handling of fatal errors

Chris Pettitt (1):
  git-p4 support for perforce renames.

Eygene Ryabinkin (1):
  git-svn: use "no warnings 'once'" to disable false-positives

Jeff King (3):
  git-gc: improve wording of --auto notification
  Documentation/git-gc: explain --auto in description
  Documentation/git-gc: improve description of --auto

Johannes Schindelin (1):
  Deduce exec_path also from calls to git with a relative path

Johannes Sixt (1):
  gitk: Do not pick up file names of "copy from" lines

Jonathan del Strother (1):
  gitk: Add support for OS X mouse wheel

Junio C Hamano (2):
  git-am: make the output quieter.
  git-am: fix typo in the previous one.

Linus Torvalds (1):
  optimize diffcore-delta by sorting hash entries.

Luke Lu (1):
  gitweb: speed up project listing on large work trees by limiting
      find depth

Marius Storm-Olsen (1):
  Teach core.autocrlf to 'git blame'

Michael Witten (1):
  git-cvsexportcommit.perl: git-apply no longer needs --binary

Paul Mackerras (3):
  gitk: Check that we are running on at least Tcl/Tk 8.4
  gitk: Avoid an error when cherry-picking if HEAD has moved on
  gitk: Fix "can't unset prevlines(...)" Tcl error

Ralf Wildenhues (1):
  git-cherry-pick: improve description of -x.

René Scharfe (1):
  Correct some sizeof(size_t) != sizeof(unsigned long) typing errors

Sam Vilain (1):
  gitk: disable colours when calling git log

Shawn O. Pearce (2):
  Improved const correctness for strings
  Use PRIuMAX instead of 'unsigned long long' in show-index

Simon Hausmann (1):
  git-p4: When skipping a patch as part of "git-p4 submit" make sure
      we correctly revert to the previous state of the files using
      "p4 revert".

koreth@midwinter.com (1):
  Add a message explaining that automatic GC is about to start

What's in git.git (stable)

[Junio C Hamano]

* The 'maint' branch has just produced the 1.5.3.5 release.

* The 'master' branch has these since the last announcement
  in addition to what's in 1.5.3.5.

  - git-bisect enhancements to support "git bisect skip".
  - git-fetch rewritten in C for performance and portability.
  - git-svnimport is no more --- use git-svn.
  - git-send-pack does not update the tracking ref on the local
    side for failed push (needs cherry-picking to 'maint').
  - git-rebase does not choke when $GIT_DIR has whitespace in it
    (needs cherry-picking to 'maint').
  - optimize rename detection.
  - comes with updated gitk.

  The above list makes me realize that it probably is a good
  time to start freezing things for 1.5.4.  Tonight's "What's
  cooking" will talk about what other topics should graduate to
  'master' before that happens.

Alex Riesen (1):
  Fix a crash in ls-remote when refspec expands into nothing

Alexandre Julliard (4):
  git.el: Fix typo in "Reverted file" message.
  git.el: Fix typo in git-update-saved-file error handling.
  git.el: Refresh only the changed file marks when marking/unmarking
      all.
  git.el: Run git-gc --auto after commits.

Benoit Sigoure (1):
  core-tutorial: Catch up with current Git

Christian Couder (12):
  Test suite: reset TERM to its previous value after testing.
  rev-list: implement --bisect-all
  rev-list documentation: add "--bisect-all".
  Bisect: fix some white spaces and empty lines breakages.
  Bisect: implement "bisect skip" to mark untestable revisions.
  Bisect: refactor "bisect_write_*" functions.
  Bisect: refactor some logging into "bisect_write".
  Bisect: refactor "bisect_{bad,good,skip}" into "bisect_state".
  Bisect: add "bisect skip" to the documentation.
  Bisect: add a "bisect replay" test case.
  Bisect run: "skip" current commit if script exit code is 125.
  Bisect: add "skip" to the short usage string.

Dan McGee (1):
  Remove outdated references to cogito in documentation

Daniel Barkalow (15):
  Refactor http.h USE_CURL_MULTI fill_active_slots().
  Make function to refill http queue a callback
  Remove obsolete commit-walkers
  Modularize commit-walker
  Add uploadpack configuration info to remote.
  Report information on branches from remote.h
  Make fetch-pack a builtin with an internal API
  Push code for transport library
  Add matching and parsing for fetch-side refspec rules
  Add fetch methods to transport library.
  Make fetch a builtin
  Allow abbreviations in the first refspec to be merged
  Restore default verbosity for http fetches.
  Remove duplicate ref matches in fetch
  Correct handling of upload-pack in builtin-fetch-pack

David Symonds (3):
  gitweb: Provide title attributes for abbreviated author names.
  gitweb: Refactor abbreviation-with-title-attribute code.
  gitweb: Use chop_and_escape_str in more places.

Gerrit Pape (1):
  No longer install git-svnimport, move to contrib/examples

Jakub Narebski (1):
  gitweb: Fix and simplify "split patch" detection

Jari Aalto (1):
  On error, do not list all commands, but point to --help option

Jeff King (2):
  send-pack: don't update tracking refs on error
  t5516: test update of local refs on push

Jim Meyering (1):
  hooks-pre-commit: use \t, rather than a literal TAB in regexp

Johannes Schindelin (6):
  Move bundle specific stuff into bundle.[ch]
  Add bundle transport
  Introduce remove_dir_recursively()
  fetch/push: readd rsync support
  Fix compilation when NO_CURL is defined
  fetch: if not fetching from default remote, ignore default merge

Jonathan del Strother (1):
  Fixing path quoting in git-rebase

Junio C Hamano (5):
  bundle transport: fix an alloc_ref() call
  k.org git toppage: Add link to 1.5.3 release notes.
  help: remove extra blank line after "See 'git --help'" message
  git-fetch: do not fail when remote branch disappears
  RelNotes-1.5.4: describe recent updates

Lars Hjemli (1):
  Teach git-pull about --[no-]ff, --no-squash and --commit

Lars Knoll (1):
  Speedup scanning for excluded files.

Linus Torvalds (8):
  Add 'diffcore.h' to LIB_H
  Split out "exact content match" phase of rename detection
  Ref-count the filespecs used by diffcore
  copy vs rename detection: avoid unnecessary O(n*m) loops
  Do linear-time/space rename logic for exact renames
  Do exact rename detection regardless of rename limits
  Fix ugly magic special case in exact rename detection
  Do the fuzzy rename detection limits with the exact renames removed

Miklos Vajna (1):
  git-send-email: add a new sendemail.to configuration variable

Nguyễn Thái Ngọc Duy (1):
  git-sh-setup.sh: use "git rev-parse --show-cdup" to check for
      SUBDIRECTORY_OK

Paul Mackerras (34):
  gitk: Establish and use global left-to-right ordering for commits
  gitk: Improve the drawing of links to parent lines
  gitk: Eliminate diagonal arrows
  gitk: Get rid of idrowranges and rowrangelist
  gitk: Get rid of idinlist array
  gitk: Fix some problems with the display of ids as links
  gitk: Get rid of the rowchk array
  gitk: Do only the parts of the layout that are needed
  gitk: Fix bug causing incorrect ref list contents when switching
      view
  gitk: Fix bug causing undefined variable error when cherry-picking
  gitk: Add a cache for the topology info
  gitk: Make it possible to lay out all the rows we have received so
      far
  gitk: Fix bugs in setting rowfinal
  gitk: Get rid of lookingforhead, use commitinterest instead
  gitk: Fix bug in generating patches
  gitk: Simplify highlighting interface and combine with Find
      function
  gitk: Fix a couple of bugs
  gitk: Add progress bars for reading in stuff and for finding
  gitk: Fix the tab setting in the diff display window
  gitk: Fix bug causing Tcl error when changing find match type
  gitk: Use named fonts instead of the font specification
  gitk: Keep track of font attributes ourselves instead of using font
      actual
  gitk: Add a font chooser
  gitk: Fix bug where the last few commits would sometimes not be
      visible
  gitk: Get rid of the diffopts variable
  gitk: Fix Tcl error: can't unset findcurline
  gitk: Limit diff display to listed paths by default
  gitk: Ensure tabstop setting gets restored by Cancel button
  gitk: Integrate the reset progress bar in the main frame
  gitk: Use the status window for other functions
  gitk: Fix some bugs with path limiting in the diff display
  gitk: Fix a couple more bugs in the path limiting
  gitk: Simplify the code for finding commits
  gitk: Use the UI font for the diff/old version/new version radio
      buttons

Pierre Habouzit (3):
  Add some fancy colors in the test library when terminal supports
      it.
  Support a --quiet option in the test-suite.
  fast-import.c: fix regression due to strbuf conversion

Shawn O. Pearce (37):
  Correct builtin-fetch to handle + in refspecs
  Fix off by one bug in reflog messages written by builtin-fetch
  Remove unnecessary debugging from builtin-fetch
  Remove unused unpacklimit variable from builtin-fetch
  Replace custom memory growth allocator with ALLOC_GROW
  Simplify fetch transport API to just one function
  Refactor index-pack "keep $sha1" handling for reuse
  Remove pack.keep after ref updates in git-fetch
  Always ensure the pack.keep file is removed by git-fetch
  Fix builtin-fetch memory corruption by not overstepping array
  Backup the array passed to fetch_pack so we can free items
  Properly cleanup in http_cleanup so builtin-fetch does not segfault
  Don't bother passing ref log details to walker in builtin-fetch
  Cleanup duplicate initialization code in transport_get
  Add transport.h to LIB_H as transport.o is in LIB_OBJS
  Remove unnecessary 'fetch' argument from transport_get API
  Allow builtin-fetch to work on a detached HEAD
  Don't configure remote "." to fetch everything to itself
  Remove more debugging from builtin-fetch
  builtin-fetch: Don't segfault on "fetch +foo"
  Don't attempt to merge non-existant remotes in t5515
  Correct handling of branch.$name.merge in builtin-fetch
  Avoid printing unnecessary warnings during fetch and push
  Use 'unsigned:1' when we mean boolean options
  Rename remote.uri to remote.url within remote handling internals
  Refactor struct transport_ops inlined into struct transport
  Always obtain fetch-pack arguments from struct fetch_pack_args
  Ensure builtin-fetch honors {fetch,transfer}.unpackLimit
  Fix memory leaks when disconnecting transport instances
  Cleanup style nit of 'x == NULL' in remote.c
  Cleanup unnecessary break in remote.c
  Prevent send-pack from segfaulting when a branch doesn't match
  Fix 'push --all branch...' error handling
  Support 'push --dry-run' for rsync transport
  Support 'push --dry-run' for http transport
  Avoid scary errors about tagged trees/blobs during git-fetch
  Define compat version of mkdtemp for systems lacking it

Väinö Järvelä (1):
  Added a test for fetching remote tags when there is not tags.

What's in git.git (stable)

[Junio C Hamano]

* The 'maint' branch has these fixes since the last announcement.

Brad King (1):
  cvsexportcommit: fix for commits that do not have parents

Jakub Narebski (1):
  gitweb: Update config file example for snapshot feature in
      gitweb/INSTALL

Jonas Fonseca (1):
  Remove escaping of '|' in manpage option sections

Jonathan del Strother (1):
  Fixing path quoting in git-rebase

Kristian Høgsberg (1):
  Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test
      suites.

Ralf Wildenhues (1):
  git-clone.txt: Improve --depth description.

Sergei Organov (3):
  git-filter-branch.txt: fix a typo.
  git-format-patch.txt: fix explanation of an example.
  Documentation: quote commit messages consistently.

----------------------------------------------------------------

* The 'master' branch has these since the last announcement
  in addition to the above.  Notable topics are:

  - fork-exec removal from MinGW work.
  - the first batch of parse-options.
  - terse progress display.

Short log follows.

Alex Riesen (2):
  Rework make_usage to print the usage message immediately
  Do no colorify test output if stdout is not a terminal

Blake Ramsdell (1):
  transport.c: squelch a gcc 4.0.1 complaint about an uninitialized
      variable

Emil Medve (1):
  Fixed a command line option type for builtin-fsck.c

Gerrit Pape (1):
  git-diff.txt: add section "output format" describing the diff
      formats

James Bowes (1):
  gc: use parse_options

Johannes Schindelin (2):
  Add tests for parse-options.c
  parse-options: Allow abbreviated options when unambiguous

Johannes Sixt (14):
  Change git_connect() to return a struct child_process instead of a
      pid_t.
  Use start_command() in git_connect() instead of explicit fork/exec.
  Use start_command() to run content filters instead of explicit
      fork/exec.
  Use run_command() to spawn external diff programs instead of
      fork/exec.
  Use start_comand() in builtin-fetch-pack.c instead of explicit
      fork/exec.
  Have start_command() create a pipe to read the stderr of the child.
  upload-pack: Use start_command() to run pack-objects in
      create_pack_file().
  Add infrastructure to run a function asynchronously.
  Use the asyncronous function infrastructure in
      builtin-fetch-pack.c.
  upload-pack: Move the revision walker into a separate function.
  upload-pack: Run rev-list in an asynchronous function.
  t0021-conversion.sh: Test that the clean filter really cleans
      content.
  Avoid a dup2(2) in apply_filter() - start_command() can do it for
      us.
  Use the asyncronous function infrastructure to run the content
      filter.

Jonas Fonseca (1):
  Update manpages to reflect new short and long option aliases

Kristian Høgsberg (5):
  Enable wt-status output to a given FILE pointer.
  Enable wt-status to run against non-standard index file.
  Introduce entry point add_interactive and add_files_to_cache
  Export rerere() and launch_editor().
  Port builtin-add.c to use the new option parser.

Nicolas Pitre (16):
  more compact progress display
  cope with multiple line breaks within sideband progress messages
  pack-objects: no delta possible with only one object in the list
  pack-objects.c: fix some global variable abuse and memory leaks
  fix const issues with some functions
  fix for more minor memory leaks
  prune-packed: don't call display_progress() for every file
  make struct progress an opaque type
  relax usage of the progress API
  add throughput to progress display
  add throughput display to index-pack
  add some copyright notice to the progress display code
  add throughput display to git-push
  return the prune-packed progress display to the inner loop
  make sure throughput display gets updated even if progress doesn't
      move
  Show total transferred as part of throughput progress

Pierre Habouzit (17):
  Add a simple option parser.
  parse-options: be able to generate usages automatically
  parse-options: make some arguments optional, add callbacks.
  Add shortcuts for very often used options.
  parse-options: allow callbacks to take no arguments at all.
  Make builtin-rm.c use parse_options.
  Make builtin-mv.c use parse-options
  Make builtin-branch.c use parse_options.
  Make builtin-describe.c use parse_options
  Make builtin-revert.c use parse_options.
  Make builtin-update-ref.c use parse_options
  Make builtin-symbolic-ref.c use parse_options.
  Make builtin-for-each-ref.c use parse-opts.
  Make builtin-fsck.c use parse_options.
  Make builtin-count-objects.c use parse_options.
  Make builtin-name-rev.c use parse_options.
  Make builtin-pack-refs.c use parse_options.

Scott R Parish (7):
  "git" returns 1; "git help" and "git help -a" return 0
  remove unused/unneeded "pattern" argument of list_commands
  "current_exec_path" is a misleading name, use "argv_exec_path"
  list_commands(): simplify code by using chdir()
  use only the $PATH for exec'ing git commands
  include $PATH in generating list of commands for "help -a"
  shell should call the new setup_path() to setup $PATH

Shawn O. Pearce (3):
  Change 'Deltifying objects' to 'Compressing objects'
  Teach prune-packed to use the standard progress meter
  Stop displaying "Pack pack-$ID created." during git-gc

Steffen Prohaska (3):
  mergetool: use path to mergetool in config var
      mergetool.<tool>.path
  mergetool: add support for ECMerge
  mergetool: avoid misleading message "Resetting to default..."

What's in git.git (stable)

[Junio C Hamano]

On 'master' front:

 - git-p4 in contrib/ has updates.  As I cannot test it myself
   and did not hear any success/failure stories from the list,
   the only way to make sure is to push it out and see if
   anybody screams.

 - "git lost-found" is going to be deprecated (not removed) in
   the next feature release.

 - Unspecified clean.requireForce defaults to true; this would
   make "git clean" require "-f" by default.

 - "git send-email --suppress-from" does not CC yourself even
   when your name is on S-o-b: or Cc: lines in the body of the
   message.

----------------------------------------------------------------

* The 'maint' branch has these fixes since the last announcement.

Ask Bjørn Hansen (1):
  When exec() fails include the failing command in the error message

David D Kilzer (2):
  RelNotes-1.5.3.5: fix typo
  RelNotes-1.5.3.5: fix another typo

Eric Wong (2):
  git-svn: fix dcommit clobbering when committing a series of diffs
  git-svn: t9114: verify merge commit message in test

Gerrit Pape (3):
  git-diff.txt: add section "output format" describing the diff
      formats
  git-cvsimport: really convert underscores in branch names to dots
      with -u
  git-daemon: fix remote port number in log entry

Johannes Schindelin (1):
  Add Documentation/CodingGuidelines

Junio C Hamano (1):
  grep with unmerged index

Marco Costalba (1):
  Remove a couple of duplicated include

Mike Hommey (1):
  Delay pager setup in git blame


* The 'master' branch has these since the last announcement
  in addition to the above.

Benoit Sigoure (1):
  git-svn: sort the options in the --help message.

Brian Gernhardt (1):
  t3502: Disambiguate between file and rev by adding --

Chris Pettitt (2):
  git-p4: Add a helper function to parse the full git diff-tree
      output.
  git-p4: Detect changes to executable bit and include them in p4
      submit.

Daniel Barkalow (1):
  Use parseopts in builtin-push

David Symonds (1):
  Improve accuracy of check for presence of deflateBound.

Gerrit Pape (4):
  git-reset: add -q option to operate quietly
  contrib/hooks/post-receive-email: fix typo
  contrib/hooks/post-receive-email: reformat to wrap comments at 76
      chars
  contrib/hooks/post-receive-email: make subject prefix configurable

Heikki Orsila (1):
  git-clone: honor "--" to end argument parsing

J. Bruce Fields (1):
  errors: "strict subset" -> "ancestor"

Jakub Narebski (9):
  gitweb: Always set 'from_file' and 'to_file' in
      parse_difftree_raw_line
  gitweb: Add 'status_str' to parse_difftree_raw_line output
  gitweb: Remove CGI::Carp::set_programname() call from t9500 gitweb
      test
  gitweb: Easier adding/changing parameters to current URL
  gitweb: Use href(-replay=>1, page=>...) to generate pagination
      links
  gitweb: Use href(-replay=>1, action=>...) to generate alternate
      views
  gitweb: Add tests for overriding gitweb config with repo config
  gitweb: Read repo config using 'git config -z -l'
  gitweb: Use config file for repository description and URLs

Johannes Schindelin (3):
  git-reset: do not be confused if there is nothing to reset
  Split off the pretty print stuff into its own file
  Deprecate git-lost-found

Johannes Sixt (1):
  Fix an infinite loop in sq_quote_buf().

Junio C Hamano (6):
  revert/cherry-pick: work on merge commits as well
  format-patch -s: add MIME encoding header if signer's name requires
      so
  cherry-pick/revert -m: add tests
  test format-patch -s: make sure MIME content type is shown as
      needed
  clean: require -f to do damage by default
  gc: --prune prunes unreferenced objects.

Mike Hommey (5):
  Refactor working tree setup
  Use setup_work_tree() in builtin-ls-files.c
  Don't always require working tree for git-rm
  Make git-blame fail when working tree is needed and we're not in
      one
  Small code readability improvement in show_reference() in
      builtin-tag.c

Nicolas Pitre (4):
  make the pack index version configurable
  pack-objects: get rid of an ugly cast
  git-fetch: more terse fetch output
  restore fetching with thin-pack capability

Pierre Habouzit (1):
  Some better parse-options documentation.

Ralf Wildenhues (1):
  Fix minor nits in configure.ac

Shawn Bohrer (1):
  Add more tests for git-clean

Simon Sasburg (1):
  Make mailsplit and mailinfo strip whitespace from the start of the
      input

Steffen Prohaska (1):
  Fix comment in strbuf.h to use correct name strbuf_avail()

Steven Grimm (1):
  builtin-fetch: Add "-q" as a synonym for "--quiet"

Uwe Kleine-König (1):
  send-email: apply --suppress-from to S-o-b and cc-cmd

Re: What's in git.git (stable)

[Pierre Habouzit]

[-- Attachment #1: Type: text/plain, Size: 1193 bytes --]

On Thu, Nov 08, 2007 at 08:06:14AM +0000, Junio C Hamano wrote:
> On 'master' front:
> 
>  - git-p4 in contrib/ has updates.  As I cannot test it myself
>    and did not hear any success/failure stories from the list,
>    the only way to make sure is to push it out and see if
>    anybody screams.
> 
>  - "git lost-found" is going to be deprecated (not removed) in
>    the next feature release.
> 
>  - Unspecified clean.requireForce defaults to true; this would
>    make "git clean" require "-f" by default.
> 
>  - "git send-email --suppress-from" does not CC yourself even
>    when your name is on S-o-b: or Cc: lines in the body of the
>    message.
> 
> ----------------------------------------------------------------
> 
> * The 'maint' branch has these fixes since the last announcement.
[...]
> Pierre Habouzit (1):
>   Some better parse-options documentation.

  Eeeer isn't there some kind of problem ? This is not in maint, I
believe you swapped 'master' and 'maint' :)

-- 
·O·  Pierre Habouzit
··O                                                madcoder@debian.org
OOO                                                http://www.madism.org

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

What's in git.git (stable)

[Junio C Hamano]

* The 'maint' branch has these fixes since the last announcement.

Alex Riesen (1):
  stop t1400 hiding errors in tests

Benoit Sigoure (1):
  git-send-email: Change the prompt for the subject of the initial
      message.

Gerrit Pape (1):
  git-mailsplit: with maildirs not only process cur/, but also new/

Jonas Fonseca (1):
  instaweb: Minor cleanups and fixes for potential problems

Junio C Hamano (3):
  refresh_index_quietly(): express "optional" nature of index writing
      better
  Makefile: add missing dependency on wt-status.h
  Start preparing for 1.5.3.6

Nicolas Pitre (3):
  print warning/error/fatal messages in one shot
  git-hash-object should honor config variables
  fix index-pack with packs >4GB containing deltas on 32-bit machines

Ralf Wildenhues (2):
  Avoid a few unportable, needlessly nested "...`...".
  Fix sed string regex escaping in module_name.

Sergei Organov (1):
  SubmittingPatches: improve the 'Patch:' section of the checklist

Vincent Zanotti (1):
  gitweb: correct month in date display for atom feeds


* The 'master' branch has these since the last announcement
  in addition to the above.

Gerrit Pape (3):
  hooks--update: fix test for properly set up project description
      file
  hooks--update: decline deleting tags or branches by default, add
      config options
  contrib/hooks/post-receive-email: remove cruft, $committer is not
      used

Johannes Schindelin (4):
  parse-options: abbreviation engine fix.
  builtin-reset: do not call "ls-files --unmerged"
  builtin-reset: avoid forking "update-index --refresh"
  builtin-blame: set up the work_tree before the first file access

Johannes Sixt (1):
  upload-pack: Use finish_{command,async}() instead of waitpid().

Junio C Hamano (6):
  Style: place opening brace of a function definition at column 1
  Update draft release notes for 1.5.4
  Documentation: lost-found is now deprecated.
  Make check-docs target detect removed commands
  Documentation: remove documentation for removed tools.
  git-commit: a bit more tests

Lars Hjemli (1):
  for-each-ref: fix setup of option-parsing for --sort

Michele Ballabio (1):
  test-lib.sh: move error line after error() declaration

Nicolas Pitre (1):
  add a howto document about corrupted blob recovery

Ralf Wildenhues (1):
  git-bisect.sh: Fix sed script to work with AIX and BSD sed.

Sergei Organov (1):
  core-tutorial.txt: Fix git-show-branch example and its description

Steffen Prohaska (2):
  push: mention --verbose option in documentation
  push: teach push to pass --verbose option to transport layer

What's in git.git (stable)

[Junio C Hamano]

* The 'maint' branch has these fixes since the last announcement.

Benoit Sigoure (1):
  git-svn: prevent dcommitting if the index is dirty.

Christian Couder (1):
  for-each-ref: fix off by one read.

Jeff King (1):
  git-branch: remove mention of non-existent '-b' option

Jing Xue (1):
  replace reference to git-rm with git-reset in git-commit doc

Jonas Fonseca (1):
  Documentation: Fix man page breakage with DocBook XSL v1.72

Junio C Hamano (3):
  t/t3404: fix test for a bogus todo file.
  revert/cherry-pick: allow starting from dirty work tree.
  git-clean: honor core.excludesfile

Sergei Organov (2):
  core-tutorial.txt: Fix argument mistake in an example.
  git-remote.txt: fix typo

Shawn O. Pearce (2):
  Fix memory leak in traverse_commit_list
  Don't allow fast-import tree delta chains to exceed maximum depth

Wincent Colaiuta (1):
  Grammar fixes for gitattributes documentation


* The 'master' branch has these since the last announcement
  in addition to the above.

Alex Riesen (1):
  Fix dependencies of parse-options test program

Andreas Ericsson (1):
  Simplify strchrnul() compat code

Björn Steinbrink (3):
  git-commit.sh: Fix usage checks regarding paths given when they do
      not make sense
  t7005-editor.sh: Don't invoke real vi when it is in GIT_EXEC_PATH
  git-commit: Add tests for invalid usage of -a/--interactive with
      paths

Brian Gernhardt (2):
  format-patch: Add configuration and off switch for --numbered
  format-patch: Test --[no-]numbered and format.numbered

David Symonds (1):
  Rearrange git-format-patch synopsis to improve clarity.

Emil Medve (1):
  git-stash: Fix listing stashes

Eric Wong (1):
  git-svn: support for funky branch and project names over HTTP(S)

Gordon Hopper (1):
  git-cvsimport: fix handling of user name when it is not set in
      CVSROOT

Johannes Schindelin (2):
  rebase: operate on a detached HEAD
  rebase: fix "rebase --continue" breakage

Johannes Sixt (2):
  git-clean: Fix error message if clean.requireForce is not set.
  Fix preprocessor logic that determines the availablity of
      strchrnul().

Jonas Fonseca (1):
  Documentation: Fix references to deprecated commands

Junio C Hamano (9):
  stash: implement "stash create"
  rebase: allow starting from a dirty tree.
  Revert "rebase: allow starting from a dirty tree."
  git-merge: no reason to use cpio anymore
  ce_match_stat, run_diff_files: use symbolic constants for
      readability
  git-add: make the entry stat-clean after re-adding the same
      contents
  t2200: test more cases of "add -u"
  Resurrect git-revert.sh example and add comment to builtin-revert.c
  core.excludesfile clean-up

Mike Hommey (2):
  Reuse previous annotation when overwriting a tag
  Add tests for git tag

Nicolas Pitre (6):
  fix display overlap between remote and local progress
  sideband.c: ESC is spelled '\033' not '\e' for portability.
  make display of total transferred more accurate
  remove dead code from the csum-file interface
  make display of total transferred fully accurate
  nicer display of thin pack completion

Pierre Habouzit (1):
  git-fetch: be even quieter.

René Scharfe (5):
  Add strchrnul()
  --pretty=format: on-demand format expansion
  --pretty=format: parse commit message only once
  add strbuf_adddup()
  --format=pretty: avoid calculating expensive expansions twice

Robin Rosenberg (1):
  cvsexportcommit: Add switch to specify CVS workdir

Rémi Vanicat (1):
  Make GIT_INDEX_FILE apply to git-commit

Sergei Organov (2):
  user-manual.txt: fix a few mistakes
  user-manual: minor rewording for clarity.

Shawn O. Pearce (5):
  git-fetch: Always fetch tags if the object they reference exists
  run-command: Support sending stderr to /dev/null
  rev-list: Introduce --quiet to avoid /dev/null redirects
  git-fetch: avoid local fetching from alternate (again)
  Handle broken vsnprintf implementations in strbuf

What's in git.git (stable)

[Junio C Hamano]

* The 'maint' branch has these fixes since the last announcement.

There are a few candidate fixes for back-porting from the
development series (see "What's cooking" message).  I will
include them in 1.5.3.6, probably on or around 20th of this
month.

David Symonds (1):
  Improve accuracy of check for presence of deflateBound.

Jeff King (1):
  git-send-email: add charset header if we add encoded 'From'

Junio C Hamano (3):
  core.excludesfile clean-up
  Fix per-directory exclude handing for "git add"
  Update draft release notes for 1.5.3.6

Wincent Colaiuta (1):
  Fix t9101 test failure caused by Subversion "auto-props"


* The 'master' branch has these since the last announcement
  in addition to the above.

Guido Ostkamp (1):
  Remove unreachable statements

Jeff King (1):
  git-ls-files: add --exclude-standard

Johannes Sixt (1):
  refs.c: Remove unused get_ref_sha1()

Junio C Hamano (2):
  Fix per-directory exclude handing for "git add"
  Update draft release notes for 1.5.4

Mike Hommey (1):
  Fix and improve t7004 (git-tag tests)

Sergei Organov (3):
  Documentation: customize diff-options depending on particular
      command
  user-manual.txt: minor clarification.
  Documentation: fix git-clone manpage not to refer to itself

What's in git.git (stable)

[Junio C Hamano]

There are quite a few backported fixes on 'maint' and it might make
sense to cut 1.5.3.7 soon.

On 'master' front, many topics that have been cooking in 'next' have
graduated.  Notably:

 - git-bisect learns "skip";

 - git-rebase --skip does not need "reset --hard" beforehand;

 - git-clean is now in C;

 - git-push is much more careful reporting errors and updateing tracking
   refs.

 - git-push learns --mirror option.

Also contains the 0.9.0 series of git-gui with i18n.

----------------------------------------------------------------
* The 'maint' branch has these fixes since the last announcement.

Björn Steinbrink (3):
  git-commit.sh: Fix usage checks regarding paths given when they do
      not make sense
  t7005-editor.sh: Don't invoke real vi when it is in GIT_EXEC_PATH
  git-commit: Add tests for invalid usage of -a/--interactive with paths

Brian Downing (2):
  config: correct core.loosecompression documentation
  config: clarify compression defaults

J. Bruce Fields (3):
  git-remote.txt: fix example url
  user-manual: mention "..." in "Generating diffs", etc.
  Documentation: Fix references to deprecated commands

Jeff King (1):
  send-email: add transfer encoding header with content-type

Johannes Schindelin (1):
  bundle create: keep symbolic refs' names instead of resolving them

Junio C Hamano (10):
  format-patch -s: add MIME encoding header if signer's name requires so
  test format-patch -s: make sure MIME content type is shown as needed
  ce_match_stat, run_diff_files: use symbolic constants for readability
  git-add: make the entry stat-clean after re-adding the same contents
  t2200: test more cases of "add -u"
  grep -An -Bm: fix invocation of external grep command
  GIT 1.5.3.6
  Make test scripts executable.
  Fix sample pre-commit hook
  git-checkout: describe detached head correctly

Linus Torvalds (1):
  Fix rev-list when showing objects involving submodules

Matthieu Moy (1):
  Doc fix for git-reflog: mention @{...} syntax, and <ref> in synopsys.

Rémi Vanicat (1):
  Make GIT_INDEX_FILE apply to git-commit

Steffen Prohaska (1):
  user-manual: Add section "Why bisecting merge commits can be harder ..."


----------------------------------------------------------------
* The 'master' branch has these since the last announcement
  in addition to the above.

Alex Riesen (4):
  More updates and corrections to the russian translation of git-gui
  Updated russian translation of git-gui
  Add a test checking if send-pack updated local tracking branches
      correctly
  Update the tracking references only if they were succesfully
      updated on remote

Andy Whitcroft (5):
  Teach send-pack a mirror mode
  git-push: plumb in --mirror mode
  Add tests for git push'es mirror mode
  git-push: add documentation for the newly added --mirror mode
  git-quiltimport.sh fix --patches handling

Anton Gyllenberg (1):
  gitview: import only one of gtksourceview and gtksourceview2

Ask Bjørn Hansen (1):
  send-email: Don't add To: recipients to the Cc: header

Christian Couder (4):
  Bisect reset: remove bisect refs that may have been packed.
  Bisect visualize: use "for-each-ref" to list all good refs.
  Bisect: use "$GIT_DIR/BISECT_NAMES" to check if we are bisecting.
  Bisect reset: do nothing when not bisecting.

Christian Stimming (12):
  Mark strings for translation.
  Makefile rules for translation catalog generation and installation.
  Add glossary that can be converted into a po file for each
      language.
  Add glossary translation template into git.
  German translation for git-gui
  German glossary for translation
  git-gui: Add more words to translation glossary
  git-gui: Update German glossary according to mailing list
      discussion
  git-gui: Incorporate glossary changes into existing German
      translation
  git-gui: Update German translation, including latest glossary
      changes
  git-gui: Add more terms to glossary.
  git-gui: Update German translation

Daniel Barkalow (5):
  Miscellaneous const changes and utilities
  Build-in peek-remote, using transport infrastructure.
  Use built-in send-pack.
  Build-in send-pack, with an API for other programs to call.
  Build in ls-remote

David D Kilzer (3):
  git-svn log: fix ascending revision ranges
  git-svn log: include commit log for the smallest revision in a
      range
  git-svn log: handle unreachable revisions like "svn log"

David D. Kilzer (4):
  git-send-email: show all headers when sending mail
  git-svn: extract reusable code into utility functions
  git-svn info: implement info command
  git-svn: info --url [path]

David Reiss (1):
  git-svn: Fix a typo and add a comma in an error message in git-svn

David Symonds (2):
  git-checkout: Support relative paths containing "..".
  git-checkout: Test for relative path use.

Eric Wong (3):
  git-svn: add tests for command-line usage of init and clone
      commands
  t9106: fix a race condition that caused svn to miss modifications
  git-svn: allow `info' command to work offline

Guido Ostkamp (1):
  Use compat mkdtemp() on Solaris boxes

Harri Ilari Tapio Liusvaara (1):
  git-gui: Disambiguate "commit"

Irina Riesen (1):
  git-gui: initial version of russian translation

Jakub Narebski (3):
  gitweb: Style all tables using CSS
  gitweb: Put project README in div.readme, fix its padding
  autoconf: Add tests for memmem, strtoumax and mkdtemp functions

Jeff King (11):
  more terse push output
  receive-pack: don't mention successful updates
  send-pack: require --verbose to show update of tracking refs
  send-pack: track errors for each ref
  send-pack: check ref->status before updating tracking refs
  send-pack: assign remote errors to each ref
  make "find_ref_by_name" a public function
  send-pack: tighten remote error reporting
  send-pack: fix "everything up-to-date" message
  avoid "defined but not used" warning for fetch_objs_via_walker
  send-pack: cluster ref status reporting

Johannes Schindelin (9):
  Add po/git-gui.pot
  Ignore po/*.msg
  git-gui: Deiconify startup wizard so it raises to the top
  git-gui: add a simple msgfmt replacement
  po2msg: ignore entries marked with "fuzzy"
  po2msg: ignore untranslated messages
  po2msg: actually output statistics
  Close files opened by lock_file() before unlinking.
  rebase -i: move help to end of todo file

Johannes Sixt (14):
  git-gui: Change main window layout to support wider screens
  Give git-am back the ability to add Signed-off-by lines.
  t5300-pack-object.sh: Split the big verify-pack test into smaller
      parts.
  t7501-commit.sh: Not all seds understand option -i
  t5302-pack-index: Skip tests of 64-bit offsets if necessary.
  Skip t3902-quoted.sh if the file system does not support funny
      names.
  Use is_absolute_path() in sha1_file.c.
  Move #include <sys/select.h> and <sys/ioctl.h> to
      git-compat-util.h.
  builtin run_command: do not exit with -1.
  Allow a relative builtin template directory.
  Introduce git_etc_gitconfig() that encapsulates access of
      ETC_GITCONFIG.
  Allow ETC_GITCONFIG to be a relative path.
  fetch-pack: Prepare for a side-band demultiplexer in a thread.
  Flush progress message buffer in display().

Junio C Hamano (20):
  git-gui po/README: Guide to translators
  git-gui: Update Japanese strings (part 2)
  scripts: Add placeholders for OPTIONS_SPEC
  git-rev-parse --parseopt
  git-sh-setup: fix parseopt `eval` string underquoting
  send-pack: segfault fix on forced push
  git-am: -i does not take a string parameter.
  git-bisect: war on "sed"
  git-bisect: use update-ref to mark good/bad commits
  git-bisect: modernize branch shuffling hack
  Draft release notes: fix clean.requireForce description
  Update draft release notes for 1.5.4
  git-clean: Fix error message if clean.requireForce is not set.
  git-compat-util.h: auto-adjust to compiler support of FLEX_ARRAY a
      bit better
  Fix "quote" misconversion for rewrite diff output.
  Make test scripts executable.
  Addendum to "MaintNotes"
  t4119: correct overeager war-on-whitespace
  Deprecate peek-remote
  Update draft release notes for 1.5.4

Kirill (1):
  Updated Russian translation.

Konstantin V. Arkhipov (1):
  git-svn's dcommit must use subversion's config

Linus Torvalds (6):
  Simplify topo-sort logic
  Add "--early-output" log flag for interactive GUI use
  Enhance --early-output format
  revision walker: mini clean-up
  Fix rev-list when showing objects involving submodules
  Fix parent rewriting in --early-output

Michele Ballabio (4):
  git-gui: remove dots in some UI strings
  git-gui: add some strings to translation
  git-gui: fix typo in lib/blame.tcl
  git-gui: update Italian translation

Mike Hommey (1):
  Do git reset --hard HEAD when using git rebase --skip

Miklos Vajna (1):
  Hungarian translation of git-gui

Nanako Shiraishi (2):
  Japanese translation of git-gui
  git-gui: Update Japanese strings

Nicolas Pitre (1):
  rehabilitate some t5302 tests on 32-bit off_t machines

Paolo Ciarrocchi (1):
  Italian translation of git-gui

Pierre Habouzit (17):
  Add a parseopt mode to git-rev-parse to bring parse-options to
      shell scripts.
  Update git-sh-setup(1) to allow transparent use of git-rev-parse
      --parseopt
  Migrate git-clean.sh to use git-rev-parse --parseopt.
  Migrate git-clone to use git-rev-parse --parseopt
  Migrate git-am.sh to use git-rev-parse --parseopt
  Migrate git-merge.sh to use git-rev-parse --parseopt
  Migrate git-instaweb.sh to use git-rev-parse --parseopt
  Migrate git-checkout.sh to use git-rev-parse --parseopt
      --keep-dashdash
  Migrate git-quiltimport.sh to use git-rev-parse --parseopt
  Migrate git-repack.sh to use git-rev-parse --parseopt
  sh-setup: don't let eval output to be shell-expanded.
  parse-options new features.
  Use OPT_SET_INT and OPT_BIT in builtin-branch
  Use OPT_BIT in builtin-for-each-ref
  Use OPT_BIT in builtin-pack-refs
  Make the diff_options bitfields be an unsigned with explicit masks.
  Reorder diff_opt_parse options more logically per topics.

Shawn Bohrer (2):
  Make git-clean a builtin
  Teach git clean to use setup_standard_excludes()

Shawn O. Pearce (57):
  git-gui: Locate the library directory early during startup
  git-gui: Initialize Tcl's msgcat library for internationalization
  git-gui: Update po/README as symlink process is not necessary
  git-gui: Correct stock message for 'Invalid font specified in %s'
  git-gui: Quiet the msgfmt part of the make process
  git-gui: Ensure msgfmt failure stops GNU make
  git-gui: Mark revision chooser tooltip for translation
  git-gui: Localize commit/author dates when displaying them
  git-gui: Support context-sensitive i18n
  git-gui: Document the new i18n context support
  git-gui: Make the tree browser also use lightgray selection
  git-gui: Paper bag fix missing translated strings
  git-gui: Fix missing i18n markup in push/fetch windows
  git-gui: Support native Win32 Tcl/Tk under Cygwin
  git-gui: Refactor some UI init to occur earlier
  git-gui: Allow users to choose/create/clone a repository
  git-gui: Avoid console scrollbars unless they are necessary
  git-gui: Don't bother showing OS error message about hardlinks
  git-gui: Keep the UI responsive while counting objects in clone
  git-gui: Copy objects/info/alternates during standard clone
  git-gui: Don't delete console window namespaces too early
  git-gui: Don't delete scrollbars in console windows
  git-gui: Switch the git-gui logo to Henrik Nyh's logo
  git-gui: Make the status bar easier to read in the setup wizard
  git-gui: Use Henrik Nyh's git logo icon on Windows systems
  git-gui: Support a native Mac OS X application bundle
  git-gui: Refer to ourselves as "Git Gui" and not "git-gui"
  git-gui: Allow forced push into remote repository
  git-gui: Refactor Henrik Nyh's logo into its own procedure
  git-gui: Refactor about dialog code into its own module
  git-gui: Include our Git logo in the about dialog
  git-gui: Use progress meter in the status bar during index updates
  git-gui: Consolidate the Fetch and Push menus into a Remote menu
  git-gui: Bind Cmd-, to Preferences on Mac OS X
  git-gui: Shorten the staged/unstaged changes title bar text
  git-gui: Updated po strings based on current sources
  git-gui: Move load_config procedure below git-version selection
  git-gui: Refactor git-config --list parsing
  git-gui: Support LFs embedded in config file values
  git-gui: Change repository browser radio buttons to hyperlinks
  git-gui: Offer repository management features in menu bar
  git-gui: Fix bind errors when switching repository chooser panels
  git-gui: Disable the text widget in the repository chooser
  git-gui: Bind n/c/o accelerators in repository chooser
  git-gui: Ensure copyright message is correctly read as UTF-8
  git-gui: Use proper Windows shortcuts instead of bat files
  git-gui: Support cloning Cygwin based work-dirs
  git-gui: Collapse $env(HOME) to ~/ in recent repositories on
      Windows
  git-gui: Honor a config.mak in git-gui's top level
  git-gui: Paper bag fix the global config parsing
  git-gui: Make sure we get errors from git-update-index
  git-gui: Protect against bad translation strings
  git-gui: Allow users to set font weights to bold
  Reteach builtin-ls-remote to understand remotes
  git-gui: Bind Meta-T for "Stage To Commit" menu action
  Fix warning about bitfield in struct ref
  git-gui 0.9.0

Shun Kei Leung (1):
  git-p4: Fix typo in --detect-labels

Simon Hausmann (1):
  git-p4: Fix direct import from perforce after fetching changes
      through git from origin

Steffen Prohaska (4):
  git-gui: add directory git-gui is located in to PATH (on Windows)
  git-gui: set NO_MSGFMT to force using pure tcl replacement in
      msysgit
  git-gui: add mingw specific startup wrapper
  git-gui: offer a list of recent repositories on startup

Thomas Harning (1):
  git-merge-ours: make it a builtin.

Wincent Colaiuta (3):
  Further clarify clean.requireForce changes
  Authenticate only once in git-send-email
  Refactor patch_update_cmd

Xudong Guan (2):
  Initial Chinese translation for git-gui
  git-gui: Added initial version of po/glossary/zh_cn.po

What's in git.git (stable)

[Junio C Hamano]

* The 'maint' branch has these fixes since the last announcement.

J. Bruce Fields (4):
  user-manual: define "branch" and "working tree" at start
  user-manual: failed push to public repository
  user-manual: clarify language about "modifying" old commits
  user-manual: recovering from corruption

Jan Hudec (1):
  Improve description of git-branch -d and -D in man page.

Jeff King (4):
  Add basic cvsimport tests
  cvsimport: use rev-parse to support packed refs
  cvsimport: miscellaneous packed-ref fixes
  cvsimport: fix usage of cvsimport.module

Johannes Schindelin (1):
  Replace the word 'update-cache' by 'update-index' everywhere

Johannes Sixt (1):
  t7003-filter-branch: Fix test of a failing --msg-filter.

Junio C Hamano (1):
  scripts: do not get confused with HEAD in work tree


* The 'master' branch has these since the last announcement
  in addition to the above.

André Goddard Rosa (2):
  Print the real filename that we failed to open.
  Error out when user doesn't have access permission to the repository

Jakub Narebski (1):
  Add config_int() method to the Git perl module

Jeff King (1):
  Revert "t5516: test update of local refs on push"

Johannes Schindelin (4):
  filter-branch: fix dirty way to provide the helpers to commit filters
  git checkout's reflog: even when detaching the HEAD, say from where
  bash completion: add diff options
  receive-pack: allow deletion of corrupt refs

Junio C Hamano (3):
  revert/cherry-pick: do not mention the original ref
  dir.c: minor clean-up
  per-directory-exclude: lazily read .gitignore files

Linus Torvalds (2):
  Fix a pathological case in git detecting proper renames
  Fix a pathological case in git detecting proper renames

Pascal Obry (1):
  git-stash: do not get fooled with "color.diff = true"

Steffen Prohaska (2):
  Use is_absolute_path() in diff-lib.c, lockfile.c, setup.c, trace.c
  sha1_file.c: Fix size_t related printf format warnings

Wincent Colaiuta (1):
  Fix typo in draft 1.5.4 release notes

What's in git.git (stable)

[Junio C Hamano]

Nothing exciting on 'maint' since 1.5.3.7.

On the 'master' front, we will soon be in feature freeze for 1.5.4.
Many topics that have been cooking in 'next' has been pushed out.  This
round it is a rather large batch but hopefully it will not destabilize
it too much.  Knock wood.

 * "git pull --rebase" is a different way to integrate what you fetched
   into your current branch.

 * "git fast-export" produces datastream that can be fed to fast-import
   to reproduce the history recorded in a git repository.

 * gitk is now merged as a subdirectory of git.git project, in
   preparation for its i18n.

 * Value "true" for color.diff and color.status configuration used to
   mean "always" (even when the output is not going to a terminal).
   This has been corrected to mean the same thing as "auto".

 * "git commit --allow-empty" allows you to create a single-parent
   commit that records the same tree as its parent, overriding the usual
   safety valve.

 * "git stash random-text" does not create a new stash anymore.  It was
   a UI mistake.  Use "git stash save random-text", or "git stash"
   (without extra args) for that.

 * HTTP proxy can be specified per remote repository using
   remote.*.proxy configuration, or global http.proxy configuration
   variable.

 * "git rebase -i" also triggers rerere to help you repeated merges.

 * "git prune --expire <time>" can exempt young loose objects from
   getting pruned.

 * "git branch --contains <commit>" can list branches that are
   descendants of a given commit.

----------------------------------------------------------------

* The 'maint' branch has these fixes since the last announcement.

Jeff King (1):
  t9600: test cvsimport from CVS working tree

Junio C Hamano (2):
  Fix typo in t4008 test title
  GIT 1.5.3.7


* The 'master' branch has these since the last announcement
  in addition to the above.

Andy Whitcroft (1):
  git-svn: add support for pulling author from From: and Signed-off-by:

Carlos Rica (1):
  Make builtin-tag.c use parse_options.

Christian Couder (2):
  Documentation: add a new man page for "git-help"
  Trace and quote with argv: get rid of unneeded count argument.

David D. Kilzer (1):
  git-svn: Remove unnecessary Git::SVN::Util package

David Symonds (1):
  Mention that git-rm can be an appropriate resolution as well as git-add.

Denis Cheng (1):
  gitweb: the commitdiff is very commonly used, it's needed on search page,
    too

Gustaf Hendeby (1):
  git-svn now reads settings even if called in subdirectory

Jakub Narebski (1):
  gitweb: Update and improve gitweb/README file

Jeff King (2):
  git-tag: test that -s implies an annotated tag
  Enable rewrite as well as rename detection in git-status

Johannes Schindelin (7):
  Replace instances of export VAR=VAL with VAR=VAL; export VAR
  Teach 'git pull' about --rebase
  rebase -i: give rerere a chance
  Add "--expire <time>" option to 'git prune'
  Add 'git fast-export', the sister of 'git fast-import'
  fast-export: rename the signed tag mode 'ignore' to 'verbatim'
  Allow ':/<oneline-prefix>' syntax to work with save_commit_buffer == 0

Johannes Sixt (1):
  git-commit: Allow to amend a merge commit that does not change the tree

Junio C Hamano (17):
  Move gitk to its own subdirectory
  git-branch --contains=commit
  git-branch --contains: doc and test
  builtin-tag: accept and process multiple -m just like git-commit
  "git-tag -s" should create a signed annotated tag
  "color.diff = true" is not "always" anymore.
  git-config --get-color: get configured color
  Update draft release notes for 1.5.4
  Resurrect peek-remote
  Consolidate command list to one.
  Update draft release notes for 1.5.4
  rename: Break filepairs with different types.
  git-am: catch missing author date early.
  git-commit --allow-empty
  git-commit documentation: fix unfinished sentence.
  Add git-fast-export to list of commands.
  Update draft release notes for 1.5.4

Kevin Leung (1):
  git-stash: Display help message if git-stash is run with wrong
    sub-commands

Pierre Habouzit (1):
  parse-options: Allow to hide options from the default usage.

Robert Schiele (1):
  install-sh from automake does not like -m without delimiting space

Sam Vilain (2):
  Allow HTTP proxy to be overridden in config
  Add remote.<name>.proxy

Steven Grimm (1):
  git-svn: Don't create a "master" branch every time rebase is run

Theodore Ts'o (2):
  Make the list of common commands more exclusive
  Remove hint to use "git help -a"

Vineet Kumar (1):
  git-svn: add a show-externals command.

Wincent Colaiuta (1):
  revert/cherry-pick: Allow overriding the help text by the calling
    Porcelain

What's in git.git (stable)

[Junio C Hamano]

I haven't tagged the tip of 'master' as -rc0 yet, this has more than 80%
of it.  Graduated to 'master' tonight are:

 * Wincent's "git add -p"
 * "git commit in C" by Kristian and others
 * Steffen Prohaska's clean-up of push/fetch refspec handling.

----------------------------------------------------------------

* The 'master' branch has these since the last announcement
  in addition to the above.

Alex Riesen (2):
  Do not generate full commit log message if it is not going to be used
  Simplify crud() in ident.c

H.Merijn Brand (1):
  Do not rely on the exit status of "unset" for unset variables

Jakub Narebski (1):
  contrib: Make remotes2config.sh script more robust

Jeff King (3):
  git-commit: clean up die messages
  quote_path: fix collapsing of relative paths
  t9600: require cvsps 2.1 to perform tests

Johannes Schindelin (8):
  launch_editor(): read the file, even when EDITOR=:
  builtin-commit: fix reflog message generation
  git status: show relative paths when run in a subdirectory
  builtin-commit: fix --signoff
  builtin-commit --s: add a newline if the last line was not a S-o-b
  builtin-commit: resurrect behavior for multiple -m options
  builtin-commit: Add newline when showing which commit was created
  Replace "runstatus" with "status" in the tests

Junio C Hamano (15):
  file_exists(): dangling symlinks do exist
  builtin-commit: do not color status output shown in the message template
  builtin-commit: run commit-msg hook with correct message file
  Export three helper functions from ls-files
  Fix add_files_to_cache() to take pathspec, not user specified list of
    files
  builtin-commit: fix partial-commit support
  git-add -i: allow multiple selection in patch subcommand
  Add a few more tests for git-commit
  builtin-add: fix command line building to call interactive
  add -i: Fix running from a subdirectory
  Fix --signoff in builtin-commit differently.
  git-commit: Allow to amend a merge commit that does not change the tree
  git-commit --allow-empty
  Documentation/git.txt: typofix
  t5510: add a bit more tests for fetch

Kristian Høgsberg (10):
  Add testcase for amending and fixing author in git commit.
  Export launch_editor() and make it accept ':' as a no-op editor.
  Port git commit to C.
  builtin-commit: Refresh cache after adding files.
  Call refresh_cache() when updating the user index for --only commits.
  builtin-commit: Clean up an unused variable and a debug fprintf().
  t7501-commit: Add test for git commit <file> with dirty index.
  builtin-commit: Include the diff in the commit message when verbose.
  Fix off-by-one error when truncating the diff out of the commit message.
  Use a strbuf for copying the command line for the reflog.

Pascal Obry (1):
  Set OLD_ICONV on Cygwin.

Pierre Habouzit (1):
  builtin-commit.c: export GIT_INDEX_FILE for launch_editor as well.

Ralf Wildenhues (1):
  Document all help keys in "git add -i" patch mode.

Shawn Bohrer (1):
  Make git status usage say git status instead of git commit

Shawn O. Pearce (1):
  Remove git-status from list of scripts as it is builtin

Steffen Prohaska (4):
  push: support pushing HEAD to real branch name
  add refname_match()
  push: use same rules as git-rev-parse to resolve refspecs
  refactor fetch's ref matching to use refname_match()

Wincent Colaiuta (6):
  Teach builtin-add to pass multiple paths to git-add--interactive
  Add path-limiting to git-add--interactive
  Add "--patch" option to git-add--interactive
  Highlight keyboard shortcuts in git-add--interactive
  add -i: allow prefix highlighting for "Add untracked" as well.
  git-add -i: add help text for list-and-choose UI

İsmail Dönmez (1):
  gitweb: use Perl built-in utf8 function for UTF-8 decoding.

What's in git.git (stable)

[Junio C Hamano]

Heavy merges to 'master' continues.  We are almost there for -rc0.
Merged to 'master' are:

 * Colorized "add -i" (Dan Zwell)
 * Talk more about diff options in "git log" documentation (Miklos)
 * git-gui 0.9.1 preview
 * Make cvsserver act more like receive-pack (Michael Witten)
 * "git-clean <paths>" limits the damage to named paths
 * Use right Perl in Documentation/Makefile

Also people's favorite topic "squelching compilation warnings for iconv"
is included.

----------------------------------------------------------------

* The 'maint' branch has these fixes since the last announcement.

David Symonds (1):
  Change from using email.com to example.com as example domain, as per RFC
    2606.

Junio C Hamano (2):
  git grep shows the same hit repeatedly for unmerged paths
  git-am -i: report rewritten title

Nguyễn Thái Ngọc Duy (3):
  Add missing inside_work_tree setting in setup_git_directory_gently
  Do check_repository_format() early
  Do check_repository_format() early (re-fix)

----------------------------------------------------------------

* The 'master' branch has these since the last announcement
  in addition to the above.

Björn Steinbrink (1):
  git config: Don't rely on regexec() returning 1 on non-match

Brian M. Carlson (1):
  git-gui: Reorder msgfmt command-line arguments

Christian Stimming (2):
  Update git-gui.pot with latest (few) string additions and changes.
  Update German translation. 100% completed.

Jakub Narebski (1):
  autoconf: Add test for OLD_ICONV (squelching compiler warning)

Jeff King (1):
  t7300: add test for clean with wildcard pathspec

Johannes Sixt (2):
  git-gui: Improve the application icon on Windows.
  for-each-ref: Fix quoting style constants.

Junio C Hamano (12):
  Run the specified perl in Documentation/
  git-cvsserver runs hooks/post-update
  Revert "git-am: catch missing author date early."
  Documentation: color.* = true means "auto"
  git config --get-colorbool
  Color support for "git-add -i"
  git-clean: Honor pathspec.
  config --get-colorbool: diff.color is a deprecated synonym to color.diff
  hg-to-git: handle an empty dir in hg.
  do not discard status in fetch_refs_via_pack()
  git-status documentation: mention subdirectory behaviour
  Update draft release notes to 1.5.4

Kristian Høgsberg (1):
  Rewrite builtin-fetch option parsing to use parse_options().

Matthias Kestenholz (1):
  Documentation: add --patch option to synopsis of git-add

Michael Witten (1):
  git-cvsserver runs hooks/post-receive

Michele Ballabio (2):
  git-gui: fix a typo in lib/commit.tcl
  git-gui: update it.po and glossary/it.po

Miklos Vajna (2):
  Include diff options in the git-log manpage
  Update Hungarian translation. 100% completed.

Nanako Shiraishi (1):
  Update ja.po for git-gui

Robert Schiele (1):
  git-gui: install-sh from automake does not like -m755

Wincent Colaiuta (1):
  Silence iconv warnings on Leopard

What's in git.git (stable)

[Junio C Hamano]

One more topic remains in 'next' before 1.5.4-rc0 where "bugfix only"
freeze period begins.  We have a handful regression fixes on 'master'
from the fallout from massive C-rewrite during this cycle.

People still following 'next' are requested to switch to 'master', and
spare a bit more time on finding and fixing regressions there instead of
coming up with new topics from now on.

----------------------------------------------------------------

* The 'maint' branch has these fixes since the last announcement.

Jim Meyering (1):
  config.c:store_write_pair(): don't read the byte before a malloc'd
    buffer.

----------------------------------------------------------------

* The 'master' branch has these since the last announcement
  in addition to the above.

Jeff King (3):
  wt-status.c:quote_path(): convert empty path to "./"
  add status.relativePaths config variable
  git-status: documentation improvements

Junio C Hamano (13):
  War on whitespace: first, a bit of retreat.
  git-diff: complain about >=8 consecutive spaces in initial indent
  core.whitespace: add test for diff whitespace error highlighting
  builtin-apply: rename "whitespace" variables and fix styles
  builtin-apply: teach whitespace_rules
  core.whitespace: documentation updates.
  Use gitattributes to define per-path whitespace rule
  git-bisect visualize: work in non-windowed environments better
  mailmap: fix bogus for() loop that happened to be safe by accident
  shortlog: code restructuring and clean-up
  ls-remote: resurrect pattern limit support
  Fix commit-msg hook to allow editing
  Re-fix "builtin-commit: fix --signoff"

Nicolas Pitre (3):
  pack-objects: fix delta cache size accounting
  pack-objects: reverse the delta search sort list
  pack-objects: fix threaded load balancing

Pini Reznik (1):
  Open external merge tool with original file extensions for all three
    files

Sergei Organov (1):
  Let git-help prefer man-pages installed with this version of git

Wincent Colaiuta (4):
  Teach "git add -i" to colorize whitespace errors
  Allow --no-verify to bypass commit-msg hook
  Documentation: fix --no-verify documentation for "git commit"
  Add tests for pre-commit and commit-msg hooks

v1.5.4 plans

[Junio C Hamano]

People might have noticed that I've been ignoring most of the new
topics/enhancements for the past few days.  Here is what I want to see
happen until we declare v1.5.4.

First, stabilize 'master' enough and tag v1.5.4-rc0 soon.

 * Among what's already in 'next', Christian's "git help -w" enhancement
   is the only candidate to be in v1.5.4.  Johannes's "git remote" could
   also be, but I've seen it fail tests when run in my k.org private
   repository and haven't had chance to find time to diagnose it, so I'd
   rather leave it after v1.5.4.

 * Eric's sanely-compact mapping from SVN rev-ids to git commits saw a
   positive feedback.  I haven't carefully read that patch but it seemed
   sane and I'd like to have it in v1.5.4.

 * Please, everybody, no more new features until v1.5.4 final ships, and
   please spend a bit more time on finding and fixing regressions than
   you would spend time cooking your favorite new features.  I do not
   have infinite amount of time to comment on new feature patches while
   concentrating on fixes at the same time.

There are outstanding issues that need to be resolved:

 * I'd like to see the pack-object's memory performance issue resolved
   before the release; two very capable people are looking into it and I
   am fairly optimistic.

 * We need to do something about "gc --aggressive".  The documentation
   removal patch from Linus, if it ever materializes, would be better
   than nothing, but I have this nagging suspicion that the explosion is
   merely a bad interation between -A and -f option to the repack, which
   are not meant to be used together.

 * We have a handful deprecation notices in the draft release notes, but
   if I recall correctly, Nico wanted to add a few more.  We need to
   come up with a wording that is easy to understand for the end users
   to decide which ancient versions will be affected.

  "git help -w" will want to have the HTML pages installed, which means
   we would need to add a new package to hold it in git.spec.in.  I am
   willing to work on the initial draft, but help in testing is very
   much appreciated --- I do not work on RPM systems myself.  The same
   goes for "git help -i" which will want the INFO pages installed.

 * I've seen t9119-git-svn-info.sh fail in my k.org private repository
   and have been skipping the test, but this needs to be diagnosed and
   fixed [*1*].  It could be just that the code is fine and the test is
   not rejecting SVN that is too-old. I dunno.

 * There have been quite a few HTTP paches from Mike Hommey.  I'd like
   to limit the changes only to fixes and trivially-correct clean-ups,
   which means these will need to be looked at:

    [PATCH 1/4] Cleanup variables in http.[ch]
    [PATCH 2/4] Use strbuf in http code
    [PATCH 1/5] Remove the default_headers variable from http-push.c
    [PATCH 2/5] Remove a CURLOPT_HTTPHEADER (un)setting
    [PATCH 3/5] Avoid redundant declaration of missing_target()
    [PATCH 4/5] Correctly initialize buffer in start_put() in http-push.c
    [PATCH 5/5] Fix various memory leaks in http-push.c and http-walker.c

   Help in reviewing these from people who were involved in the http
   part of the current codebase is very much appreciated.

If we can freeze by the end of the year, we may be able to release mid
January 2008.


[Footnote]
----------------------------------------------------------------

*1* t9119 first fails at the 6th test.  Perhaps the test needs to check
svn version first and stop testing this feature.  This test does not
fail on my personal box that has svn 1.4.2.

* expecting success:
        (cd svnwc; svn info file) > expected.info-file &&
        (cd gitwc; git-svn info file) > actual.info-file &&
        git-diff expected.info-file actual.info-file

diff --git a/expected.info-file b/actual.info-file
index b1d57f4..997c927 100644
--- a/expected.info-file
+++ b/actual.info-file
@@ -10,6 +10,5 @@ Last Changed Author: junio
 Last Changed Rev: 1
 Last Changed Date: 2007-12-10 22:18:12 +0000 (Mon, 10 Dec 2007)
 Text Last Updated: 2007-12-10 22:18:13 +0000 (Mon, 10 Dec 2007)
-Properties Last Updated: 2007-12-10 22:18:13 +0000 (Mon, 10 Dec 2007)
 Checksum: 5bbf5a52328e7439ae6e719dfe712200

* FAIL 6: info file

                (cd svnwc; svn info file) > expected.info-file &&
                (cd gitwc; git-svn info file) > actual.info-file &&
                git-diff expected.info-file actual.info-file

: hera t/master; svn --version
svn, version 1.3.2 (r19776)
   compiled Jun  1 2006, 10:05:51

Copyright (C) 2000-2006 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
This product includes software developed by CollabNet (http://www.Collab.Net/).

The following repository access (RA) modules are available:

* ra_dav : Module for accessing a repository via WebDAV (DeltaV) protocol.
  - handles 'http' scheme
  - handles 'https' scheme
* ra_svn : Module for accessing a repository using the svn network protocol.
  - handles 'svn' scheme
* ra_local : Module for accessing a repository on local disk.
  - handles 'file' scheme

----------------------------------------------------------------

Re: v1.5.4 plans

[Jeff King]

On Mon, Dec 10, 2007 at 02:37:09PM -0800, Junio C Hamano wrote:

>  * Please, everybody, no more new features until v1.5.4 final ships, and
>    please spend a bit more time on finding and fixing regressions than
>    you would spend time cooking your favorite new features.  I do not
>    have infinite amount of time to comment on new feature patches while
>    concentrating on fixes at the same time.
> 
> There are outstanding issues that need to be resolved:

A few regressions that you did not mention, but I think should be
addressed before 1.5.4:

 - extra newline in builtin-commit output. You found a case that
   needs it, but fixing it is non-trivial, and I wanted to get your
   input before preparing a patch. See

     http://mid.gmane.org/20071203075357.GB3614@sigill.intra.peff.net

 - git-clean's handling of directory wildcards. I didn't get a response
   to

     http://mid.gmane.org/20071206043247.GC5499@coredump.intra.peff.net

   I suspect there are still some bugs lurking in there, but it's hard
   to say because I don't know what the behavior _should_ be (there are
   some test cases in that email).

And perhaps not a regression, but I think we should bring git-svn's
handling of color.* in line with the changes to the rest of the code
before 1.5.4. I posted a "last resort" patch, but I think with your
changes to "git config --colorbool" it might be possible to use that.
I'll try to work up a new patch.

-Peff

Re: v1.5.4 plans

[Junio C Hamano]

Jeff King <peff@peff.net> writes:

> A few regressions that you did not mention, but I think should be
> addressed before 1.5.4:
>
>  - extra newline in builtin-commit output. You found a case that
>    needs it, but fixing it is non-trivial, and I wanted to get your
>    input before preparing a patch. See
>
>      http://mid.gmane.org/20071203075357.GB3614@sigill.intra.peff.net

I am actually becoming somewhat fond of the newline that makes the end
of a session that led to a commit stand out ;-). IOW, I was wondering if
we can have another for a merge commit case.

But I suspect that it amounts to the change in the same area and of
similar complexity.

>  - git-clean's handling of directory wildcards. I didn't get a response
>    to
>
>      http://mid.gmane.org/20071206043247.GC5499@coredump.intra.peff.net
>
>    I suspect there are still some bugs lurking in there, but it's hard
>    to say because I don't know what the behavior _should_ be (there are
>    some test cases in that email).

The last time I looked at the "directory" side of builtin-clean.c, I had
to quickly reach for my barf bag.  I never use "git clean" without "-n"
and I never ever use "git clean" with "-d"; I do not have any idea what
behaviour when given "-d" would be useful.  AFAIU, the scripted version
did not have clear semantics either.

Another thing that irritates me is it talks about not removing a
directory when run "git clean -n" (without -d).  I did not ask it to
remove directories, so I did not expect it to talk about it not doing
what I did not ask it to.

> And perhaps not a regression, but I think we should bring git-svn's
> handling of color.* in line with the changes to the rest of the code
> before 1.5.4. I posted a "last resort" patch, but I think with your
> changes to "git config --colorbool" it might be possible to use that.
> I'll try to work up a new patch.

Thanks for a reminder.  Anything else?

Re: v1.5.4 plans

[Junio C Hamano]

Junio C Hamano <gitster@pobox.com> writes:

> Jeff King <peff@peff.net> writes:
>
>> A few regressions that you did not mention, but I think should be
>> addressed before 1.5.4:
>>
>>  - extra newline in builtin-commit output. You found a case that
>>    needs it, but fixing it is non-trivial, and I wanted to get your
>>    input before preparing a patch. See
>>
>>      http://mid.gmane.org/20071203075357.GB3614@sigill.intra.peff.net
>
> I am actually becoming somewhat fond of the newline that makes the end
> of a session that led to a commit stand out ;-). IOW, I was wondering if
> we can have another for a merge commit case.
>
> But I suspect that it amounts to the change in the same area and of
> similar complexity.

-- >8 --
[PATCH] commit: do not add extra LF at the end of the summary.

The scripted version relied on the nice "auto-strip the terminating LF"
behaviour shell gives to "var=$(cmd)" construct, but we have to roll
that ourselves.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin-commit.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/builtin-commit.c b/builtin-commit.c
index b6b81d5..e5a972c 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -660,12 +660,17 @@ static void print_summary(const char *prefix, const unsigned char *sha1)
 	rev.verbose_header = 1;
 	rev.show_root_diff = 1;
 	rev.commit_format = get_commit_format("format:%h: %s");
-	rev.always_show_header = 1;
+	rev.always_show_header = 0;
 
 	printf("Created %scommit ", initial_commit ? "initial " : "");
 
-	log_tree_commit(&rev, commit);
-	printf("\n");
+	if (!log_tree_commit(&rev, commit)) {
+		struct strbuf buf = STRBUF_INIT;
+		pretty_print_commit(rev.commit_format, commit, &buf,
+				    0, NULL, NULL, 0, 0);
+		printf("%s\n", buf.buf);
+		strbuf_release(&buf);
+	}
 }
 
 int git_commit_config(const char *k, const char *v)
-- 
1.5.3.7-1149-g591a

Re: v1.5.4 plans

[Jeff King]

On Mon, Dec 10, 2007 at 09:02:26PM -0800, Junio C Hamano wrote:

> [PATCH] commit: do not add extra LF at the end of the summary.
> 
> The scripted version relied on the nice "auto-strip the terminating LF"
> behaviour shell gives to "var=$(cmd)" construct, but we have to roll
> that ourselves.

This looks reasonable and generates the correct output as far as I can
tell, but...

> -	log_tree_commit(&rev, commit);
> -	printf("\n");
> +	if (!log_tree_commit(&rev, commit)) {
> +		struct strbuf buf = STRBUF_INIT;
> +		pretty_print_commit(rev.commit_format, commit, &buf,
> +				    0, NULL, NULL, 0, 0);
> +		printf("%s\n", buf.buf);
> +		strbuf_release(&buf);
> +	}

We are duplicating the "!shown && ..." conditional branch from
log_tree_commit, which calls show_log. Why are we not calling show_log
instead of pretty_print_commit (I understand that show_log should end up
calling pretty_print_commit, but it is not immediately obvious that all
of the extra code in show_log is going to be ignored).

-Peff

Re: v1.5.4 plans

[Junio C Hamano]

Jeff King <peff@peff.net> writes:

> We are duplicating the "!shown && ..." conditional branch from
> log_tree_commit, which calls show_log. Why are we not calling show_log
> instead of pretty_print_commit (I understand that show_log should end up
> calling pretty_print_commit, but it is not immediately obvious that all
> of the extra code in show_log is going to be ignored).

Exactly.  I think show_log() has become too complex, and when we want a
oneline userformat, pretty-print-commit is more appropriate to use.
Actually, when I re-review the code, I think the part should use
format_commit_message() which is more to the point without any of the
other "more generic" parameter pretty-print-commit takes.

Re: v1.5.4 plans

[Jeff King]

On Mon, Dec 10, 2007 at 10:47:18PM -0800, Junio C Hamano wrote:

> > We are duplicating the "!shown && ..." conditional branch from
> > log_tree_commit, which calls show_log. Why are we not calling show_log
> > instead of pretty_print_commit (I understand that show_log should end up
> > calling pretty_print_commit, but it is not immediately obvious that all
> > of the extra code in show_log is going to be ignored).
> 
> Exactly.  I think show_log() has become too complex, and when we want a
> oneline userformat, pretty-print-commit is more appropriate to use.
> Actually, when I re-review the code, I think the part should use
> format_commit_message() which is more to the point without any of the
> other "more generic" parameter pretty-print-commit takes.

Perhaps it would be even more readable to simply split the printing of
the commit message and the diff. Tracking this bug was a bit confusing.
Ideally, print_summary would just say:

  print_commit_message(commit);
  print_diff(commit, "^commit");

where obviously each of those takes a few lines to say properly. But the
use of a combination "show the log and maybe the diff" function seems
like a shell holdover, trying to avoid spawning too many processes.

-Peff

Re: v1.5.4 plans

[Junio C Hamano]

Jeff King <peff@peff.net> writes:

> Perhaps it would be even more readable to simply split the printing of
> the commit message and the diff. Tracking this bug was a bit confusing.
> Ideally, print_summary would just say:
>
>   print_commit_message(commit);
>   print_diff(commit, "^commit");
>
> where obviously each of those takes a few lines to say properly. But the
> use of a combination "show the log and maybe the diff" function seems
> like a shell holdover, trying to avoid spawning too many processes.

Perhaps, but that's post 1.5.4.  There is no short-hand to call the
single commit diff-tree and not give any commit header afair.

Anyway, format-commit-message() makes it much more readable ;-)

diff --git a/builtin-commit.c b/builtin-commit.c
index b6b81d5..9cb7589 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -660,12 +660,16 @@ static void print_summary(const char *prefix, const unsigned char *sha1)
 	rev.verbose_header = 1;
 	rev.show_root_diff = 1;
 	rev.commit_format = get_commit_format("format:%h: %s");
-	rev.always_show_header = 1;
+	rev.always_show_header = 0;
 
 	printf("Created %scommit ", initial_commit ? "initial " : "");
 
-	log_tree_commit(&rev, commit);
-	printf("\n");
+	if (!log_tree_commit(&rev, commit)) {
+		struct strbuf buf = STRBUF_INIT;
+		format_commit_message(commit, "%h: %s", &buf);
+		printf("%s\n", buf.buf);
+		strbuf_release(&buf);
+	}
 }
 
 int git_commit_config(const char *k, const char *v)

Re: v1.5.4 plans

[Jeff King]

On Mon, Dec 10, 2007 at 11:00:55PM -0800, Junio C Hamano wrote:

> Perhaps, but that's post 1.5.4.  There is no short-hand to call the
> single commit diff-tree and not give any commit header afair.

OK. I was going to add a "something like this..." patch to my last
email, but realized I had no idea how one would invoke the diff
machinery in such a way.

> Anyway, format-commit-message() makes it much more readable ;-)

The repetition of the format string is a little ugly. But otherwise,

Acked-by: Jeff King <peff@peff.net>

-Peff

Re: v1.5.4 plans

[Jeff King]

On Mon, Dec 10, 2007 at 05:27:17PM -0800, Junio C Hamano wrote:

> > And perhaps not a regression, but I think we should bring git-svn's
> > handling of color.* in line with the changes to the rest of the code
> > before 1.5.4. I posted a "last resort" patch, but I think with your
> > changes to "git config --colorbool" it might be possible to use that.
> > I'll try to work up a new patch.
> 
> Thanks for a reminder.  Anything else?

2-patch series will follow momentarily. 1/2 gives --get-colorbool the
necessary information for implementing color.pager, and 2/2 fixes
git-svn.

Very light testing by me, since I'm not actually a git-svn user, but it
does pass the test scripts. Acks from svn-using people would be nice.

-Peff

Re: v1.5.4 plans

[Jeff King]

Subject: [PATCH 1/2] Support GIT_PAGER_IN_USE environment variable

When deciding whether or not to turn on automatic color
support, git_config_colorbool checks whether stdout is a
tty. However, because we run a pager, if stdout is not a
tty, we must check whether it is because we started the
pager. This used to be done by checking the pager_in_use
variable.

This variable was set only when the git program being run
started the pager; there was no way for an external program
running git indicate that it had already started a pager.
This patch allows a program to set GIT_PAGER_IN_USE to a
true value to indicate that even though stdout is not a tty,
it is because a pager is being used.

Signed-off-by: Jeff King <peff@peff.net>
---

A few notes:

We could also just put the color.pager logic in git-svn, or in Git.pm,
and have it impact the stdout_is_tty argument; but the whole point of
--get-colorbool is to consolidate that logic.

We convert pager_in_use to a function; we could also just set the
variable early on, but I think this lazy evaluation is more robust.

This might have uses besides --get-colorbool (e.g., wrapper scripts
which start their own pager can still have git sub-commands understand
whether to turn on color).

 cache.h       |    2 +-
 color.c       |    2 +-
 environment.c |    1 -
 pager.c       |   15 ++++++++++++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/cache.h b/cache.h
index 1bcb3df..27d90fe 100644
--- a/cache.h
+++ b/cache.h
@@ -608,7 +608,7 @@ extern int write_or_whine_pipe(int fd, const void *buf, size_t count, const char
 /* pager.c */
 extern void setup_pager(void);
 extern char *pager_program;
-extern int pager_in_use;
+extern int pager_in_use(void);
 extern int pager_use_color;
 
 extern char *editor_program;
diff --git a/color.c b/color.c
index 7bd424a..7f66c29 100644
--- a/color.c
+++ b/color.c
@@ -135,7 +135,7 @@ int git_config_colorbool(const char *var, const char *value, int stdout_is_tty)
  auto_color:
 	if (stdout_is_tty < 0)
 		stdout_is_tty = isatty(1);
-	if (stdout_is_tty || (pager_in_use && pager_use_color)) {
+	if (stdout_is_tty || (pager_in_use() && pager_use_color)) {
 		char *term = getenv("TERM");
 		if (term && strcmp(term, "dumb"))
 			return 1;
diff --git a/environment.c b/environment.c
index f3e3d41..18a1c4e 100644
--- a/environment.c
+++ b/environment.c
@@ -31,7 +31,6 @@ size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE;
 size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT;
 size_t delta_base_cache_limit = 16 * 1024 * 1024;
 char *pager_program;
-int pager_in_use;
 int pager_use_color = 1;
 char *editor_program;
 char *excludes_file;
diff --git a/pager.c b/pager.c
index fb7a1a6..0376953 100644
--- a/pager.c
+++ b/pager.c
@@ -5,6 +5,8 @@
  * something different on Windows, for example.
  */
 
+static int spawned_pager;
+
 static void run_pager(const char *pager)
 {
 	/*
@@ -41,7 +43,7 @@ void setup_pager(void)
 	else if (!*pager || !strcmp(pager, "cat"))
 		return;
 
-	pager_in_use = 1; /* means we are emitting to terminal */
+	spawned_pager = 1; /* means we are emitting to terminal */
 
 	if (pipe(fd) < 0)
 		return;
@@ -70,3 +72,14 @@ void setup_pager(void)
 	die("unable to execute pager '%s'", pager);
 	exit(255);
 }
+
+int pager_in_use(void)
+{
+	const char *env;
+
+	if (spawned_pager)
+		return 1;
+
+	env = getenv("GIT_PAGER_IN_USE");
+	return env ? git_config_bool("GIT_PAGER_IN_USE", env) : 0;
+}
-- 
1.5.3.7.2230.g796d07-dirty

[PATCH 2/2] git-svn: get color config from --get-colorbool

[Jeff King]

git-config recently learned a --get-colorbool option. By
using it, we will get the same color=auto behavior that
other git commands have.

Specifically, this fixes the case where "color.diff = true"
meant "always" in git-svn, but "auto" in other programs.

Signed-off-by: Jeff King <peff@peff.net>
---
 git-svn.perl |   35 ++---------------------------------
 1 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index 9f884eb..1c42c55 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3969,39 +3969,7 @@ sub cmt_showable {
 }
 
 sub log_use_color {
-	return 1 if $color;
-	my ($dc, $dcvar);
-	$dcvar = 'color.diff';
-	$dc = `git-config --get $dcvar`;
-	if ($dc eq '') {
-		# nothing at all; fallback to "diff.color"
-		$dcvar = 'diff.color';
-		$dc = `git-config --get $dcvar`;
-	}
-	chomp($dc);
-	if ($dc eq 'auto') {
-		my $pc;
-		$pc = `git-config --get color.pager`;
-		if ($pc eq '') {
-			# does not have it -- fallback to pager.color
-			$pc = `git-config --bool --get pager.color`;
-		}
-		else {
-			$pc = `git-config --bool --get color.pager`;
-			if ($?) {
-				$pc = 'false';
-			}
-		}
-		chomp($pc);
-		if (-t *STDOUT || (defined $pager && $pc eq 'true')) {
-			return ($ENV{TERM} && $ENV{TERM} ne 'dumb');
-		}
-		return 0;
-	}
-	return 0 if $dc eq 'never';
-	return 1 if $dc eq 'always';
-	chomp($dc = `git-config --bool --get $dcvar`);
-	return ($dc eq 'true');
+	return $color || Git->repository->get_colorbool('color.diff');
 }
 
 sub git_svn_log_cmd {
@@ -4060,6 +4028,7 @@ sub config_pager {
 	} elsif (length $pager == 0 || $pager eq 'cat') {
 		$pager = undef;
 	}
+	$ENV{GIT_PAGER_IN_USE} = defined($pager);
 }
 
 sub run_pager {
-- 
1.5.3.7.2230.g796d07-dirty

Re: [PATCH 2/2] git-svn: get color config from --get-colorbool

[Eric Wong]

Jeff King <peff@peff.net> wrote:
> git-config recently learned a --get-colorbool option. By
> using it, we will get the same color=auto behavior that
> other git commands have.
> 
> Specifically, this fixes the case where "color.diff = true"
> meant "always" in git-svn, but "auto" in other programs.
> 
> Signed-off-by: Jeff King <peff@peff.net>

Acked-by: Eric Wong <normalperson@yhbt.net>

> ---
>  git-svn.perl |   35 ++---------------------------------
>  1 files changed, 2 insertions(+), 33 deletions(-)
> 
> diff --git a/git-svn.perl b/git-svn.perl
> index 9f884eb..1c42c55 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -3969,39 +3969,7 @@ sub cmt_showable {
>  }
>  
>  sub log_use_color {
> -	return 1 if $color;
> -	my ($dc, $dcvar);
> -	$dcvar = 'color.diff';
> -	$dc = `git-config --get $dcvar`;
> -	if ($dc eq '') {
> -		# nothing at all; fallback to "diff.color"
> -		$dcvar = 'diff.color';
> -		$dc = `git-config --get $dcvar`;
> -	}
> -	chomp($dc);
> -	if ($dc eq 'auto') {
> -		my $pc;
> -		$pc = `git-config --get color.pager`;
> -		if ($pc eq '') {
> -			# does not have it -- fallback to pager.color
> -			$pc = `git-config --bool --get pager.color`;
> -		}
> -		else {
> -			$pc = `git-config --bool --get color.pager`;
> -			if ($?) {
> -				$pc = 'false';
> -			}
> -		}
> -		chomp($pc);
> -		if (-t *STDOUT || (defined $pager && $pc eq 'true')) {
> -			return ($ENV{TERM} && $ENV{TERM} ne 'dumb');
> -		}
> -		return 0;
> -	}
> -	return 0 if $dc eq 'never';
> -	return 1 if $dc eq 'always';
> -	chomp($dc = `git-config --bool --get $dcvar`);
> -	return ($dc eq 'true');
> +	return $color || Git->repository->get_colorbool('color.diff');
>  }
>  
>  sub git_svn_log_cmd {
> @@ -4060,6 +4028,7 @@ sub config_pager {
>  	} elsif (length $pager == 0 || $pager eq 'cat') {
>  		$pager = undef;
>  	}
> +	$ENV{GIT_PAGER_IN_USE} = defined($pager);
>  }
>  
>  sub run_pager {
> -- 
> 1.5.3.7.2230.g796d07-dirty
> 

-- 
Eric Wong

Re: v1.5.4 plans

[Jeff King]

On Mon, Dec 10, 2007 at 05:27:17PM -0800, Junio C Hamano wrote:

> >    I suspect there are still some bugs lurking in there, but it's hard
> >    to say because I don't know what the behavior _should_ be (there are
> >    some test cases in that email).
> 
> The last time I looked at the "directory" side of builtin-clean.c, I had
> to quickly reach for my barf bag.  I never use "git clean" without "-n"
> and I never ever use "git clean" with "-d"; I do not have any idea what
> behaviour when given "-d" would be useful.  AFAIU, the scripted version
> did not have clear semantics either.

I had the same feeling. I am tempted to leave it, then. The
non-intuitive behavior I managed to trigger was:

  - _only_ when using git pathspec matching like "git clean -n '*.ext'"
  - confusing in a safe way (trying to remove 'dir.ext' with '*.ext'
    will accidentally not happen, rather than accidentally happening)

So unless somebody complains, it is probably not a big problem,
and I think fixing it will require mucking with pathspec and dir
matching internals, which would be nice not to do right before v1.5.4.

OTOH, leaving something that is broken and just hoping nobody will
complain feels kind of wrong. :)

-Peff

Re: v1.5.4 plans

[Andreas Ericsson]

Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
> 
>>  - git-clean's handling of directory wildcards. I didn't get a response
>>    to
>>
>>      http://mid.gmane.org/20071206043247.GC5499@coredump.intra.peff.net
>>
>>    I suspect there are still some bugs lurking in there, but it's hard
>>    to say because I don't know what the behavior _should_ be (there are
>>    some test cases in that email).
> 
> The last time I looked at the "directory" side of builtin-clean.c, I had
> to quickly reach for my barf bag.  I never use "git clean" without "-n"
> and I never ever use "git clean" with "-d"; I do not have any idea what
> behaviour when given "-d" would be useful.


When you have a trash directory without any tracked files, clean will not
by default descend into that directory and thus won't remove neither files
nor directory. I frequently use one for automated testing, much like git's
trash repository, but the only time I do "git clean -d" is when building
things on a release-server with the repository checked out. It's faster
than "make distclean", and not all of our projects have a Makefile to begin
with. Tacking "git clean -d" at the end of test-scripts makes it simple to
remove all excess cruft in one go.

So in short, git clean -d can be useful. I have no idea when "git clean dir"
would be though.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231

Re: v1.5.4 plans

[Jeff King]

On Mon, Dec 10, 2007 at 05:27:17PM -0800, Junio C Hamano wrote:

> Thanks for a reminder.  Anything else?

This bugfix has been sitting in my repo for a few weeks.  When it last
appeared, you asked if the other code paths needed a similar fix, and I
verified that they did not, so I think it is complete as-is.

-- >8 --
git-clone: print an error message when trying to clone empty repo

Previously, cloning an empty repository looked like this:

$ (mkdir parent && cd parent && git --bare init)
$ git-clone parent child
Initialized empty Git repository in /home/peff/clone/child/.git/
$ cd child
-bash: cd: child: No such file or directory
$ echo 'wtf?' | mail git@vger.kernel.org

Now we at least report that the clone was not successful.

Signed-off-by: Jeff King <peff@peff.net>
---
 git-clone.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/git-clone.sh b/git-clone.sh
index ecf9d89..96a356d 100755
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -297,7 +297,8 @@ yes)
 				      find objects -type f -print | sed -e 1q)
 			# objects directory should not be empty because
 			# we are cloning!
-			test -f "$repo/$sample_file" || exit
+			test -f "$repo/$sample_file" ||
+				die "fatal: cannot clone empty repository"
 			if ln "$repo/$sample_file" "$GIT_DIR/objects/sample" 2>/dev/null
 			then
 				rm -f "$GIT_DIR/objects/sample"
-- 
1.5.3.7.2224.ge4a5

Re: v1.5.4 plans

[Nicolas Pitre]

On Mon, 10 Dec 2007, Junio C Hamano wrote:

> There are outstanding issues that need to be resolved:
> 
>  * We need to do something about "gc --aggressive".  The documentation
>    removal patch from Linus, if it ever materializes, would be better
>    than nothing, but I have this nagging suspicion that the explosion is
>    merely a bad interation between -A and -f option to the repack, which
>    are not meant to be used together.

Well, with the gcc repo, simply using 'git repack -a -f' with current 
default window size does produce a 2.1GB pack, while changing the window 
size to 100 (keeping default delta depth) produces a 400MB pack for me.

So this is really a matter of not having a sufficiently large window for 
some data sets.

>  * We have a handful deprecation notices in the draft release notes, but
>    if I recall correctly, Nico wanted to add a few more.  We need to
>    come up with a wording that is easy to understand for the end users
>    to decide which ancient versions will be affected.

This is still on my todo list.


Nicolas

Re: v1.5.4 plans

[Johannes Schindelin]

Hi,

On Mon, 10 Dec 2007, Nicolas Pitre wrote:

> On Mon, 10 Dec 2007, Junio C Hamano wrote:
> 
> > There are outstanding issues that need to be resolved:
> > 
> >  * We need to do something about "gc --aggressive".  The documentation
> >    removal patch from Linus, if it ever materializes, would be better
> >    than nothing, but I have this nagging suspicion that the explosion is
> >    merely a bad interation between -A and -f option to the repack, which
> >    are not meant to be used together.
> 
> Well, with the gcc repo, simply using 'git repack -a -f' with current 
> default window size does produce a 2.1GB pack, while changing the window 
> size to 100 (keeping default delta depth) produces a 400MB pack for me.
> 
> So this is really a matter of not having a sufficiently large window for 
> some data sets.

So my dumb patch to simply default to window and depth 250 with 
aggressive was not _that_ dumb after all?

Ciao,
Dscho

Re: v1.5.4 plans

[Nicolas Pitre]

On Fri, 30 Mar 2029, Johannes Schindelin wrote:

> Hi,
> 
> On Mon, 10 Dec 2007, Nicolas Pitre wrote:
> 
> > On Mon, 10 Dec 2007, Junio C Hamano wrote:
> > 
> > > There are outstanding issues that need to be resolved:
> > > 
> > >  * We need to do something about "gc --aggressive".  The documentation
> > >    removal patch from Linus, if it ever materializes, would be better
> > >    than nothing, but I have this nagging suspicion that the explosion is
> > >    merely a bad interation between -A and -f option to the repack, which
> > >    are not meant to be used together.
> > 
> > Well, with the gcc repo, simply using 'git repack -a -f' with current 
> > default window size does produce a 2.1GB pack, while changing the window 
> > size to 100 (keeping default delta depth) produces a 400MB pack for me.
> > 
> > So this is really a matter of not having a sufficiently large window for 
> > some data sets.
> 
> So my dumb patch to simply default to window and depth 250 with 
> aggressive was not _that_ dumb after all?

Probably not, although this might be rather wasteful on some 
repositories.  But that's what expectations are for --aggressive.

I wish we could find a way to set some good window default dynamically 
though.  Or perhaps the filename hashing needs improvements.


Nicolas

Re: v1.5.4 plans

[Kristian Høgsberg]

On Mon, 2007-12-10 at 14:37 -0800, Junio C Hamano wrote:
>  * We have a handful deprecation notices in the draft release notes, but
>    if I recall correctly, Nico wanted to add a few more.  We need to
>    come up with a wording that is easy to understand for the end users
>    to decide which ancient versions will be affected.

Can we deprecate .git/branches?

Kristian

Re: v1.5.4 plans

[Junio C Hamano]

Kristian Høgsberg <krh@redhat.com> writes:

> On Mon, 2007-12-10 at 14:37 -0800, Junio C Hamano wrote:
>>  * We have a handful deprecation notices in the draft release notes, but
>>    if I recall correctly, Nico wanted to add a few more.  We need to
>>    come up with a wording that is easy to understand for the end users
>>    to decide which ancient versions will be affected.
>
> Can we deprecate .git/branches?

We deprecated it from the very beginning, in the sense that we never
wrote into it ourselves, but merely tried to pay attention to what
others wrote there.  So I am open to a bullet point that officially
declares the deprecation.

But we need to come up with a removal schedule.  Say, the first feature
release after June 2008?

Re: v1.5.4 plans

[Eric Wong]

Junio C Hamano <gitster@pobox.com> wrote:
> People might have noticed that I've been ignoring most of the new
> topics/enhancements for the past few days.  Here is what I want to see
> happen until we declare v1.5.4.
> 
> First, stabilize 'master' enough and tag v1.5.4-rc0 soon.

>  * Eric's sanely-compact mapping from SVN rev-ids to git commits saw a
>    positive feedback.  I haven't carefully read that patch but it seemed
>    sane and I'd like to have it in v1.5.4.

It's looking good for most users, I think it's safe enough for 1.5.4

>  * I've seen t9119-git-svn-info.sh fail in my k.org private repository
>    and have been skipping the test, but this needs to be diagnosed and
>    fixed [*1*].  It could be just that the code is fine and the test is
>    not rejecting SVN that is too-old. I dunno.

I wouldn't mind dropping this test for now.

100% output compatibility with SVN is too difficult to achieve
and IMHO not worth it for commands like `info' and `log'.

David:

I also noticed some race-conditions on this test when running this on my
Centrino laptop (my fastest box, but I rarely use it for git
development) and having git on my USB thumb drive.  I'm pretty sure
these were caused by inconsistencies in handling timestamps on symlinks
vs timestamps on the files they link to.

> *1* t9119 first fails at the 6th test.  Perhaps the test needs to check
> svn version first and stop testing this feature.  This test does not
> fail on my personal box that has svn 1.4.2.
> 
> * expecting success:
>         (cd svnwc; svn info file) > expected.info-file &&
>         (cd gitwc; git-svn info file) > actual.info-file &&
>         git-diff expected.info-file actual.info-file
> 
> diff --git a/expected.info-file b/actual.info-file
> index b1d57f4..997c927 100644
> --- a/expected.info-file
> +++ b/actual.info-file
> @@ -10,6 +10,5 @@ Last Changed Author: junio
>  Last Changed Rev: 1
>  Last Changed Date: 2007-12-10 22:18:12 +0000 (Mon, 10 Dec 2007)
>  Text Last Updated: 2007-12-10 22:18:13 +0000 (Mon, 10 Dec 2007)
> -Properties Last Updated: 2007-12-10 22:18:13 +0000 (Mon, 10 Dec 2007)
>  Checksum: 5bbf5a52328e7439ae6e719dfe712200
> 
> * FAIL 6: info file
> 
>                 (cd svnwc; svn info file) > expected.info-file &&
>                 (cd gitwc; git-svn info file) > actual.info-file &&
>                 git-diff expected.info-file actual.info-file
> 
> : hera t/master; svn --version
> svn, version 1.3.2 (r19776)

-- 
Eric Wong

Re: v1.5.4 plans

[Junio C Hamano]

Eric Wong <normalperson@yhbt.net> writes:

> David:
>
> I also noticed some race-conditions on this test when running this on my
> Centrino laptop (my fastest box, but I rarely use it for git
> development) and having git on my USB thumb drive.  I'm pretty sure
> these were caused by inconsistencies in handling timestamps on symlinks
> vs timestamps on the files they link to.

I actually saw that for the first time on my primary box during the
nightly rebuild last night.  I'll disable the test for now --- if we can
spot and fix the race by the release, that's good, otherwise, shipping
the test disabled is also fine, too.

Re: v1.5.4 plans

[David D. Kilzer]

Junio C Hamano <gitster@pobox.com> wrote:

> Eric Wong <normalperson@yhbt.net> writes:
> 
> > I also noticed some race-conditions on this test when running this on my
> > Centrino laptop (my fastest box, but I rarely use it for git
> > development) and having git on my USB thumb drive.  I'm pretty sure
> > these were caused by inconsistencies in handling timestamps on symlinks
> > vs timestamps on the files they link to.
> 
> I actually saw that for the first time on my primary box during the
> nightly rebuild last night.  I'll disable the test for now --- if we can
> spot and fix the race by the release, that's good, otherwise, shipping
> the test disabled is also fine, too.

I'll see if I can reproduce it and figure out where the race is happening.

Dave

Re: v1.5.4 plans

[David D. Kilzer]

Eric Wong <normalperson@yhbt.net> wrote:
> Junio C Hamano <gitster@pobox.com> wrote:
> >  * I've seen t9119-git-svn-info.sh fail in my k.org private repository
> >    and have been skipping the test, but this needs to be diagnosed and
> >    fixed [*1*].  It could be just that the code is fine and the test is
> >    not rejecting SVN that is too-old. I dunno.
> 
> I wouldn't mind dropping this test for now.
> 
> 100% output compatibility with SVN is too difficult to achieve
> and IMHO not worth it for commands like `info' and `log'.
> 
> David:
> 
> I also noticed some race-conditions on this test when running this on my
> Centrino laptop (my fastest box, but I rarely use it for git
> development) and having git on my USB thumb drive.  I'm pretty sure
> these were caused by inconsistencies in handling timestamps on symlinks
> vs timestamps on the files they link to.

The problem is that 'svn info' is reading the mtime from its hidden backup file
(in the .svn directory) instead of the file in the working directory, so
setting the mtime (and atime) of the git working copy file using the svn
working copy doesn't always work.

I'm working on a solution now.

Dave

[PATCH] Fix race condition in t9119-git-svn-info.sh

[David D. Kilzer]

Changed the ptouch bash function to use the "Text Last Updated"
date reported by 'svn info' when changing the modified time
(mtime) of the file/symlink/directory in the git working
directory.  Previously it used the mtime of the item in the
svn working directory, which caused the race condition.

Signed-off-by: David D. Kilzer <ddkilzer@kilzer.net>
---

Ran a "burn-in" test by applying the "make test" patch in
<http://marc.info/?l=git&m=119452148511531&w=2> for over an hour
with no test failures:

$ set -e
$ while /usr/bin/true; do (make t/t9119-git-svn-info.sh); done

Also ran "make -C t full-svn-test" to verify the fix.

 t/t9119-git-svn-info.sh |   35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/t/t9119-git-svn-info.sh b/t/t9119-git-svn-info.sh
index cc61911..6d9bec9 100755
--- a/t/t9119-git-svn-info.sh
+++ b/t/t9119-git-svn-info.sh
@@ -5,17 +5,22 @@
 test_description='git-svn info'
 
 . ./lib-git-svn.sh
-say 'skipping svn-info test (has a race undiagnosed yet)'
-test_done
 
 ptouch() {
 	perl -w -e '
 		use strict;
+		use POSIX qw(mktime);
 		die "ptouch requires exactly 2 arguments" if @ARGV != 2;
-		die "$ARGV[0] does not exist" if ! -e $ARGV[0];
-		my @s = stat $ARGV[0];
-		utime $s[8], $s[9], $ARGV[1];
-	' "$1" "$2"
+		my $text_last_updated = shift @ARGV;
+		my $git_file = shift @ARGV;
+		die "\"$git_file\" does not exist" if ! -e $git_file;
+		if ($text_last_updated
+		    =~ /(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})/) {
+			my $mtime = mktime($6, $5, $4, $3, $2 - 1, $1 - 1900);
+			my $atime = $mtime;
+			utime $atime, $mtime, $git_file;
+		}
+	' "`svn info $1 | grep '^Text Last Updated:'`" "$2"
 }
 
 test_expect_success 'setup repository and import' "
@@ -111,7 +116,7 @@ test_expect_success 'info added-file' "
 		git add added-file &&
 	cd .. &&
 	cp gitwc/added-file svnwc/added-file &&
-	ptouch gitwc/added-file svnwc/added-file &&
+	ptouch svnwc/added-file gitwc/added-file &&
 	cd svnwc &&
 		svn add added-file > /dev/null &&
 	cd .. &&
@@ -127,7 +132,7 @@ test_expect_success 'info --url added-file' '
 
 test_expect_success 'info added-directory' "
 	mkdir gitwc/added-directory svnwc/added-directory &&
-	ptouch gitwc/added-directory svnwc/added-directory &&
+	ptouch svnwc/added-directory gitwc/added-directory &&
 	touch gitwc/added-directory/.placeholder &&
 	cd svnwc &&
 		svn add added-directory > /dev/null &&
@@ -156,7 +161,7 @@ test_expect_success 'info added-symlink-file' "
 		ln -s added-file added-symlink-file &&
 		svn add added-symlink-file > /dev/null &&
 	cd .. &&
-	ptouch gitwc/added-symlink-file svnwc/added-symlink-file &&
+	ptouch svnwc/added-symlink-file gitwc/added-symlink-file &&
 	(cd svnwc; svn info added-symlink-file) \
 		> expected.info-added-symlink-file &&
 	(cd gitwc; git-svn info added-symlink-file) \
@@ -179,7 +184,7 @@ test_expect_success 'info added-symlink-directory' "
 		ln -s added-directory added-symlink-directory &&
 		svn add added-symlink-directory > /dev/null &&
 	cd .. &&
-	ptouch gitwc/added-symlink-directory svnwc/added-symlink-directory &&
+	ptouch svnwc/added-symlink-directory gitwc/added-symlink-directory &&
 	(cd svnwc; svn info added-symlink-directory) \
 		> expected.info-added-symlink-directory &&
 	(cd gitwc; git-svn info added-symlink-directory) \
@@ -290,7 +295,7 @@ test_expect_success 'info --url symlink-directory (deleted)' '
 test_expect_success 'info unknown-file' "
 	echo two > gitwc/unknown-file &&
 	cp gitwc/unknown-file svnwc/unknown-file &&
-	ptouch gitwc/unknown-file svnwc/unknown-file &&
+	ptouch svnwc/unknown-file gitwc/unknown-file &&
 	(cd svnwc; svn info unknown-file) 2> expected.info-unknown-file &&
 	(cd gitwc; git-svn info unknown-file) 2> actual.info-unknown-file &&
 	git-diff expected.info-unknown-file actual.info-unknown-file
@@ -304,7 +309,7 @@ test_expect_success 'info --url unknown-file' '
 
 test_expect_success 'info unknown-directory' "
 	mkdir gitwc/unknown-directory svnwc/unknown-directory &&
-	ptouch gitwc/unknown-directory svnwc/unknown-directory &&
+	ptouch svnwc/unknown-directory gitwc/unknown-directory &&
 	touch gitwc/unknown-directory/.placeholder &&
 	(cd svnwc; svn info unknown-directory) \
 		2> expected.info-unknown-directory &&
@@ -327,7 +332,7 @@ test_expect_success 'info unknown-symlink-file' "
 	cd svnwc &&
 		ln -s unknown-file unknown-symlink-file &&
 	cd .. &&
-	ptouch gitwc/unknown-symlink-file svnwc/unknown-symlink-file &&
+	ptouch svnwc/unknown-symlink-file gitwc/unknown-symlink-file &&
 	(cd svnwc; svn info unknown-symlink-file) \
 		2> expected.info-unknown-symlink-file &&
 	(cd gitwc; git-svn info unknown-symlink-file) \
@@ -350,8 +355,8 @@ test_expect_success 'info unknown-symlink-directory' "
 	cd svnwc &&
 		ln -s unknown-directory unknown-symlink-directory &&
 	cd .. &&
-	ptouch gitwc/unknown-symlink-directory \
-	       svnwc/unknown-symlink-directory &&
+	ptouch svnwc/unknown-symlink-directory \
+	       gitwc/unknown-symlink-directory &&
 	(cd svnwc; svn info unknown-symlink-directory) \
 		2> expected.info-unknown-symlink-directory &&
 	(cd gitwc; git-svn info unknown-symlink-directory) \
-- 
1.5.3.7

Re: [PATCH] Fix race condition in t9119-git-svn-info.sh

[Junio C Hamano]

"David D. Kilzer" <ddkilzer@kilzer.net> writes:

> Changed the ptouch bash function to use the "Text Last Updated"
> date reported by 'svn info' when changing the modified time
> (mtime) of the file/symlink/directory in the git working
> directory.  Previously it used the mtime of the item in the
> svn working directory, which caused the race condition.
>
> Signed-off-by: David D. Kilzer <ddkilzer@kilzer.net>

> @@ -350,8 +355,8 @@ test_expect_success 'info unknown-symlink-directory' "
>  	cd svnwc &&
>  		ln -s unknown-directory unknown-symlink-directory &&
>  	cd .. &&
> -	ptouch gitwc/unknown-symlink-directory \
> -	       svnwc/unknown-symlink-directory &&
> +	ptouch svnwc/unknown-symlink-directory \
> +	       gitwc/unknown-symlink-directory &&

Hmph.  Am I the only one who finds this repetition somewhat
disturbing?

[PATCH] Remove duplication in t9119-git-svn-info.sh

[David D. Kilzer]

Simplify arguments to ptouch bash function.
---
 t/t9119-git-svn-info.sh |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/t/t9119-git-svn-info.sh b/t/t9119-git-svn-info.sh
index 6d9bec9..907058e 100755
--- a/t/t9119-git-svn-info.sh
+++ b/t/t9119-git-svn-info.sh
@@ -20,7 +20,7 @@ ptouch() {
 			my $atime = $mtime;
 			utime $atime, $mtime, $git_file;
 		}
-	' "`svn info $1 | grep '^Text Last Updated:'`" "$2"
+	' "`svn info svnwc/$1 | grep '^Text Last Updated:'`" "gitwc/$1"
 }
 
 test_expect_success 'setup repository and import' "
@@ -40,10 +40,10 @@ test_expect_success 'setup repository and import' "
 		git-svn fetch &&
 	cd .. &&
 	svn co $svnrepo svnwc &&
-	ptouch svnwc/file gitwc/file &&
-	ptouch svnwc/directory gitwc/directory &&
-	ptouch svnwc/symlink-file gitwc/symlink-file &&
-	ptouch svnwc/symlink-directory gitwc/symlink-directory
+	ptouch file &&
+	ptouch directory &&
+	ptouch symlink-file &&
+	ptouch symlink-directory
 	"
 
 test_expect_success 'info' "
@@ -116,7 +116,7 @@ test_expect_success 'info added-file' "
 		git add added-file &&
 	cd .. &&
 	cp gitwc/added-file svnwc/added-file &&
-	ptouch svnwc/added-file gitwc/added-file &&
+	ptouch added-file &&
 	cd svnwc &&
 		svn add added-file > /dev/null &&
 	cd .. &&
@@ -132,7 +132,7 @@ test_expect_success 'info --url added-file' '
 
 test_expect_success 'info added-directory' "
 	mkdir gitwc/added-directory svnwc/added-directory &&
-	ptouch svnwc/added-directory gitwc/added-directory &&
+	ptouch added-directory &&
 	touch gitwc/added-directory/.placeholder &&
 	cd svnwc &&
 		svn add added-directory > /dev/null &&
@@ -161,7 +161,7 @@ test_expect_success 'info added-symlink-file' "
 		ln -s added-file added-symlink-file &&
 		svn add added-symlink-file > /dev/null &&
 	cd .. &&
-	ptouch svnwc/added-symlink-file gitwc/added-symlink-file &&
+	ptouch added-symlink-file &&
 	(cd svnwc; svn info added-symlink-file) \
 		> expected.info-added-symlink-file &&
 	(cd gitwc; git-svn info added-symlink-file) \
@@ -184,7 +184,7 @@ test_expect_success 'info added-symlink-directory' "
 		ln -s added-directory added-symlink-directory &&
 		svn add added-symlink-directory > /dev/null &&
 	cd .. &&
-	ptouch svnwc/added-symlink-directory gitwc/added-symlink-directory &&
+	ptouch added-symlink-directory &&
 	(cd svnwc; svn info added-symlink-directory) \
 		> expected.info-added-symlink-directory &&
 	(cd gitwc; git-svn info added-symlink-directory) \
@@ -295,7 +295,7 @@ test_expect_success 'info --url symlink-directory (deleted)' '
 test_expect_success 'info unknown-file' "
 	echo two > gitwc/unknown-file &&
 	cp gitwc/unknown-file svnwc/unknown-file &&
-	ptouch svnwc/unknown-file gitwc/unknown-file &&
+	ptouch unknown-file &&
 	(cd svnwc; svn info unknown-file) 2> expected.info-unknown-file &&
 	(cd gitwc; git-svn info unknown-file) 2> actual.info-unknown-file &&
 	git-diff expected.info-unknown-file actual.info-unknown-file
@@ -309,7 +309,7 @@ test_expect_success 'info --url unknown-file' '
 
 test_expect_success 'info unknown-directory' "
 	mkdir gitwc/unknown-directory svnwc/unknown-directory &&
-	ptouch svnwc/unknown-directory gitwc/unknown-directory &&
+	ptouch unknown-directory &&
 	touch gitwc/unknown-directory/.placeholder &&
 	(cd svnwc; svn info unknown-directory) \
 		2> expected.info-unknown-directory &&
@@ -332,7 +332,7 @@ test_expect_success 'info unknown-symlink-file' "
 	cd svnwc &&
 		ln -s unknown-file unknown-symlink-file &&
 	cd .. &&
-	ptouch svnwc/unknown-symlink-file gitwc/unknown-symlink-file &&
+	ptouch unknown-symlink-file &&
 	(cd svnwc; svn info unknown-symlink-file) \
 		2> expected.info-unknown-symlink-file &&
 	(cd gitwc; git-svn info unknown-symlink-file) \
@@ -355,8 +355,7 @@ test_expect_success 'info unknown-symlink-directory' "
 	cd svnwc &&
 		ln -s unknown-directory unknown-symlink-directory &&
 	cd .. &&
-	ptouch svnwc/unknown-symlink-directory \
-	       gitwc/unknown-symlink-directory &&
+	ptouch unknown-symlink-directory &&
 	(cd svnwc; svn info unknown-symlink-directory) \
 		2> expected.info-unknown-symlink-directory &&
 	(cd gitwc; git-svn info unknown-symlink-directory) \
-- 
1.5.3.7

Re: [PATCH] Remove duplication in t9119-git-svn-info.sh

[Eric Wong]

Junio C Hamano <gitster@pobox.com> wrote:
> "David D. Kilzer" <ddkilzer@kilzer.net> writes:
> 
> > @@ -350,8 +355,8 @@ test_expect_success 'info unknown-symlink-directory' "
> >  	cd svnwc &&
> >  		ln -s unknown-directory unknown-symlink-directory &&
> >  	cd .. &&
> > -	ptouch gitwc/unknown-symlink-directory \
> > -	       svnwc/unknown-symlink-directory &&
> > +	ptouch svnwc/unknown-symlink-directory \
> > +	       gitwc/unknown-symlink-directory &&
> 
> Hmph.  Am I the only one who finds this repetition somewhat
> disturbing?

"David D. Kilzer" <ddkilzer@kilzer.net> wrote:
> Simplify arguments to ptouch bash function.

Not reading Junio's mind, I think he meant that you were swapping the
"gitwc/" and "svnwc/" args everywhere in your changeset.

Nevertheless, does your change make things work with older
versions of SVN?  I'm running 1.4.x everywhere these days, but
I seem to recall the version of SVN on kernel.org was giving
Junio trouble with the tests.

-- 
Eric Wong

Re: [PATCH] Remove duplication in t9119-git-svn-info.sh

[David D. Kilzer]

Eric Wong <normalperson@yhbt.net> wrote:

> Not reading Junio's mind, I think he meant that you were swapping the
> "gitwc/" and "svnwc/" args everywhere in your changeset.

I did not switch them everywhere.  The original patch to fix the race condition
required switching the arguments because I had to treat the svnwc path
differently than the gitwc path.

> Nevertheless, does your change make things work with older
> versions of SVN?  I'm running 1.4.x everywhere these days, but
> I seem to recall the version of SVN on kernel.org was giving
> Junio trouble with the tests.

Was it the "race condition" he was seeing, where the tests were failing because
of a difference in one second between the svn output and the git output?  If
so, that was fixed with the first patch.  I was able to reproduce the race
condition locally with svn-1.4.5 on my PowerBook G4.

I don't have an easy way to test with svn-1.3.

Dave

Re: [PATCH] Remove duplication in t9119-git-svn-info.sh

[Junio C Hamano]

Eric Wong <normalperson@yhbt.net> writes:

> Junio C Hamano <gitster@pobox.com> wrote:
>> "David D. Kilzer" <ddkilzer@kilzer.net> writes:
>> 
>> > @@ -350,8 +355,8 @@ test_expect_success 'info unknown-symlink-directory' "
>> >  	cd svnwc &&
>> >  		ln -s unknown-directory unknown-symlink-directory &&
>> >  	cd .. &&
>> > -	ptouch gitwc/unknown-symlink-directory \
>> > -	       svnwc/unknown-symlink-directory &&
>> > +	ptouch svnwc/unknown-symlink-directory \
>> > +	       gitwc/unknown-symlink-directory &&
>> 
>> Hmph.  Am I the only one who finds this repetition somewhat
>> disturbing?
>
> "David D. Kilzer" <ddkilzer@kilzer.net> wrote:
>> Simplify arguments to ptouch bash function.
>
> Not reading Junio's mind, I think he meant that you were swapping the
> "gitwc/" and "svnwc/" args everywhere in your changeset.

Yeah, that was what I meant.  ptouch routine's implementation
could have swapped the order of arguments internally.

The follow-up patch by David makes ptouch routine unusable if
the test suite becomes more elaborate and starts using more than
one git and svn work trees, but I do not think that is something
we have to worry about too much.

Re: [PATCH] Remove duplication in t9119-git-svn-info.sh

[Junio C Hamano]

Eric Wong <normalperson@yhbt.net> writes:

> Nevertheless, does your change make things work with older
> versions of SVN?  I'm running 1.4.x everywhere these days, but
> I seem to recall the version of SVN on kernel.org was giving
> Junio trouble with the tests.

Ahh, you are right.  Here is what I am getting.

$ sh t9119-git-svn-info.sh -i -v
* expecting success: 
	mkdir info &&
	cd info &&
		echo FIRST > A &&
		echo one > file &&
		ln -s file symlink-file &&
		mkdir directory &&
		touch directory/.placeholder &&
		ln -s directory symlink-directory &&
		svn import -m 'initial' . file:///home/junio/git/t/trash/svnrepo &&
	cd .. &&
	mkdir gitwc &&
	cd gitwc &&
		git-svn init file:///home/junio/git/t/trash/svnrepo &&
		git-svn fetch &&
	cd .. &&
	svn co file:///home/junio/git/t/trash/svnrepo svnwc &&
	ptouch file &&
	ptouch directory &&
	ptouch symlink-file &&
	ptouch symlink-directory
	
Adding         file
Adding         A
Adding         symlink-file
Adding         directory
Adding         directory/.placeholder
Adding         symlink-directory

Committed revision 1.
Initialized empty Git repository in .git/
	A	file
	A	A
	A	symlink-file
	A	directory/.placeholder
	A	symlink-directory
r1 = 153bc4aeb5ed1375deb17b3611c1d2177ff2e5a4 (git-svn)
Checked out HEAD:
  file:///home/junio/git/t/trash/svnrepo r1
A    svnwc/file
A    svnwc/A
A    svnwc/symlink-file
A    svnwc/directory
A    svnwc/directory/.placeholder
A    svnwc/symlink-directory
Checked out revision 1.
*   ok 1: setup repository and import

* expecting success: 
	(cd svnwc; svn info) > expected.info &&
	(cd gitwc; git-svn info) > actual.info &&
	git-diff expected.info actual.info
	
*   ok 2: info

* expecting success: 
	test $(cd gitwc; git-svn info --url) = $svnrepo
	
*   ok 3: info --url

* expecting success: 
	(cd svnwc; svn info .) > expected.info-dot &&
	(cd gitwc; git-svn info .) > actual.info-dot &&
	git-diff expected.info-dot actual.info-dot
	
*   ok 4: info .

* expecting success: 
	test $(cd gitwc; git-svn info --url .) = $svnrepo
	
*   ok 5: info --url .

* expecting success: 
	(cd svnwc; svn info file) > expected.info-file &&
	(cd gitwc; git-svn info file) > actual.info-file &&
	git-diff expected.info-file actual.info-file
	
diff --git a/expected.info-file b/actual.info-file
index 23b45e2..e7f3924 100644
--- a/expected.info-file
+++ b/actual.info-file
@@ -10,6 +10,5 @@ Last Changed Author: junio
 Last Changed Rev: 1
 Last Changed Date: 2008-01-02 10:25:19 +0000 (Wed, 02 Jan 2008)
 Text Last Updated: 2008-01-02 10:25:20 +0000 (Wed, 02 Jan 2008)
-Properties Last Updated: 2008-01-02 10:25:20 +0000 (Wed, 02 Jan 2008)
 Checksum: 5bbf5a52328e7439ae6e719dfe712200
 
* FAIL 6: info file
	
		(cd svnwc; svn info file) > expected.info-file &&
		(cd gitwc; git-svn info file) > actual.info-file &&
		git-diff expected.info-file actual.info-file
		

What's in git.git (stable frozen)

[Junio C Hamano]

The tip of 'master' is now tagged as 1.5.4-rc0.  Tarballs are found in
the usual places:

  http://www.kernel.org/pub/software/scm/git/

  git-1.5.4.rc0.tar.{gz,bz2}			(tarball)
  git-htmldocs-1.5.4.rc0.tar.{gz,bz2}		(preformatted docs)
  git-manpages-1.5.4.rc0.tar.{gz,bz2}		(preformatted docs)

I've also built a set of preview RPM packages.  They are found in:

  http://www.kernel.org/pub/software/scm/git/testing/

I am not an RPM person.  It would be really appreciated if experts help
out finding and fixing any bug in the packaging.  I do not want to
repeat the firefighting we needed with 1.5.3.1.

----------------------------------------------------------------
* The 'master' branch has these since the last announcement.

Alex Riesen (1):
  Fix git-fast-export for zero-sized blobs

Alexandre Julliard (1):
  git.el: Added a menu for git-status-mode.

Charles Bailey (1):
  Fix clone not to ignore depth when performing a local clone

Christian Couder (5):
  git-help: add -i|--info option to display info page.
  Documentation: describe -i/--info option to "git-help"
  git-help: add -w|--web option to display html man page in a browser.
  Use {web,instaweb,help}.browser config options.
  Documentation: describe -w/--web option to "git-help".

Daniel Barkalow (1):
  Add more checkout tests

Eric Wong (2):
  git-svn: replace .rev_db with a more space-efficient .rev_map format
  git-svn: reinstate old rev_db optimization in new rev_map

Eyvind Bernhardsen (1):
  Fix mis-markup of the -p, --patch option in git-add(1)

Gerrit Pape (1):
  Don't cache DESTDIR in perl/perl.mak.

Jakub Narebski (1):
  autoconf: Check asciidoc version to automatically set ASCIIDOC8

Jeff King (6):
  don't mention index refreshing side effect in git-status docs
  Add git-browse-help to .gitignore
  Support GIT_PAGER_IN_USE environment variable
  git-svn: get color config from --get-colorbool
  shortlog: document -e option
  git-clone: print an error message when trying to clone empty repo

Johannes Sixt (1):
  Fix a typo in checkout.sh and cleanup one-line help messages

Junio C Hamano (18):
  git-shortlog -e: show e-mail address as well
  Re-fix ls-remote
  Update draft Release Notes for 1.5.4
  Documentation: add gitman.info target
  git-help -i: invoke info with document and node name
  git-help -i: show info documentation from matching version of git
  send-email: do not muck with initial-reply-to when unset.
  commit: do not add extra LF at the end of the summary.
  Support a merge with conflicting gitlink change
  blame: drop blob data after passing blame to the parent
  shortlog: default to HEAD when the standard input is a tty
  git-diff --numstat -z: make it machine readable
  disable t9119 for now.
  Documentation: rename git.texi to user-manual.texi
  git.spec.in: remove python_path
  git-help -w: do not require to be in git repository
  RPM spec: Adjust htmldir
  GIT 1.5.4-rc0

Linus Torvalds (1):
  "git tag -u keyname" broken

Mike Hommey (4):
  git-send-email.perl: Really add angle brackets to In-Reply-To if
    necessary
  Cleanup variables in http.[ch]
  Fix small memory leaks induced by diff_tree_setup_paths
  Fix XML parser leaks in http-push

Nguyễn Thái Ngọc Duy (1):
  Remove repo version check from setup_git_directory

Nicolas Pitre (1):
  pack-objects: more threaded load balancing fix with often changed paths

Pierre Habouzit (1):
  Invert numbers and names in the git-shortlog summary mode.

Wincent Colaiuta (5):
  Interactive editor tests for commit-msg hook
  Style fixes for pre-commit hook tests
  Use "whitespace" consistently
  Documentation: minor grammar fix for "git apply"
  Fix "diff --check" whitespace detection

[PATCH] git-commit: squelch needless message during an empty merge

[Junio C Hamano]

When recording a merge that conflicted and ends up in no changes after
manual resolution, commit callchain looked like this:

	cmd_commit() ->
            prepare_log_message() ->
                run_status() ->
		    wt_status_print()

This invocation of run_status() is asked to find out if there is a
committable change, but it unconditionally gave instructions such as
"use git-add" at the same time.  When in merge, we do allow an empty
change to be recorded, so after showing this message the code still went
ahead and made a commit.

This introduces "nowarn" parameter to run_status() to avoid these
useless messages.  If we are not allowed to create an empty commit, we
already call run_status() again in the original codepath, and the
message will be shown from that call anyway.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin-commit.c |    9 +++++----
 wt-status.c      |    2 ++
 wt-status.h      |    1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/builtin-commit.c b/builtin-commit.c
index 9cb7589..ad9f921 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -280,7 +280,7 @@ static char *prepare_index(int argc, const char **argv, const char *prefix)
 	return false_lock.filename;
 }
 
-static int run_status(FILE *fp, const char *index_file, const char *prefix)
+static int run_status(FILE *fp, const char *index_file, const char *prefix, int nowarn)
 {
 	struct wt_status s;
 
@@ -296,6 +296,7 @@ static int run_status(FILE *fp, const char *index_file, const char *prefix)
 	s.untracked = untracked_files;
 	s.index_file = index_file;
 	s.fp = fp;
+	s.nowarn = nowarn;
 
 	wt_status_print(&s);
 
@@ -412,7 +413,7 @@ static int prepare_log_message(const char *index_file, const char *prefix)
 
 	saved_color_setting = wt_status_use_color;
 	wt_status_use_color = 0;
-	commitable = run_status(fp, index_file, prefix);
+	commitable = run_status(fp, index_file, prefix, 1);
 	wt_status_use_color = saved_color_setting;
 
 	fclose(fp);
@@ -606,7 +607,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
 
 	index_file = prepare_index(argc, argv, prefix);
 
-	commitable = run_status(stdout, index_file, prefix);
+	commitable = run_status(stdout, index_file, prefix, 0);
 
 	rollback_index_files();
 
@@ -717,7 +718,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 
 	if (!prepare_log_message(index_file, prefix) && !in_merge &&
 	    !allow_empty && !(amend && is_a_merge(head_sha1))) {
-		run_status(stdout, index_file, prefix);
+		run_status(stdout, index_file, prefix, 0);
 		rollback_index_files();
 		unlink(commit_editmsg);
 		return 1;
diff --git a/wt-status.c b/wt-status.c
index 51c1879..c0c2472 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -381,6 +381,8 @@ void wt_status_print(struct wt_status *s)
 	if (!s->commitable) {
 		if (s->amend)
 			fprintf(s->fp, "# No changes\n");
+		else if (s->nowarn)
+			; /* nothing */
 		else if (s->workdir_dirty)
 			printf("no changes added to commit (use \"git add\" and/or \"git commit -a\")\n");
 		else if (s->workdir_untracked)
diff --git a/wt-status.h b/wt-status.h
index 63d50f2..02afaa6 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -17,6 +17,7 @@ struct wt_status {
 	int verbose;
 	int amend;
 	int untracked;
+	int nowarn;
 	/* These are computed during processing of the individual sections */
 	int commitable;
 	int workdir_dirty;

Re: [PATCH] git-commit: squelch needless message during an empty merge

[Jeff King]

On Wed, Dec 12, 2007 at 07:09:16PM -0800, Junio C Hamano wrote:

> This introduces "nowarn" parameter to run_status() to avoid these
> useless messages.  If we are not allowed to create an empty commit, we
> already call run_status() again in the original codepath, and the
> message will be shown from that call anyway.

Looks good to me.

Acked-by: Jeff King <peff@peff.net>

-Peff

Re: [PATCH] git-commit: squelch needless message during an empty merge

[Johannes Sixt]

Junio C Hamano schrieb:
> This introduces "nowarn" parameter to run_status() to avoid these
> useless messages.

Hmpf. We don't need no double negations, no?

-- Hannes

What's in git.git (stable frozen)

[Junio C Hamano]

Sorry for the "\No newline at the end" brown paper bag bug, which
happened soon after -rc0 but now fixed.  Thanks Jeff.

"git diff --check" was inconsistent with the highlighting of whitespace
problems and was harder to use from scripts (which makes it a usability
bug).  Both have been fixed.  Thanks Wincent.

A handful "gitweb" fixes I forgot to apply earlier are now in.  Thanks
Jakub.

A "git commit" regression has been noticed --- the post-commit summary
was inconsistent with what is shown by git-status before making the
commit.  Thanks Daniel.

A workaround for massive commit that exceeds command line limit when
issuing "cvs status list-of-files" has been added.  Thanks Jeff.

Hopefully the final round of clean-up until 1.5.4 in whitespace area has
been applied.  Thanks Wincent and Bruce.

I am reasonably happy that we are finding and fixing bugs.  Please keep
the fixes, including documentation updates, flowing in.

 * "git -p ls-tree HEAD" in a bare repository is still not fixed.

   http://thread.gmane.org/gmane.comp.version-control.git/68209?focus=68221
   http://thread.gmane.org/gmane.comp.version-control.git/68209?focus=68338

 * Hannes says "thread pack-objects" improvements needs a follow-up
   patch; it hasn't been applied here yet.

 * option parser regression fix really needs to be in by -rc1, but I
   just applied the initial round of Pierre's patches today.  See
   "What's cooking" for the list.

I need to coordinate with subsystem people and pull in changes for
gitk, git-gui, user manual and git-svn.

----------------------------------------------------------------
* The 'master' branch has these since the last announcement
  in addition to the above.

Andy Whitcroft (1):
  git-svn: expand handling of From: and Signed-off-by:

Christian Couder (1):
  git-help: add "help.format" config variable.

David S. Miller (1):
  fast-import: fix unalinged allocation and access

Eric Wong (2):
  git-svn: unlink internal index files after operations
  git-svn: handle our top-level path being deleted and later re-added

J. Bruce Fields (8):
  whitespace: fix off-by-one error in non-space-in-indent checking
  whitespace: reorganize initial-indent check
  whitespace: minor cleanup
  whitespace: fix initial-indent checking
  whitespace: more accurate initial-indent highlighting
  whitespace: fix config.txt description of indent-with-non-tab
  builtin-apply: minor cleanup of whitespace detection
  builtin-apply: stronger indent-with-on-tab fixing

Jakub Narebski (2):
  gitweb: disambiguate heads and tags withs the same name
  gitweb: Teach "a=blob" action to be more lenient about blob/file mime
    type

Jeff King (4):
  cvsexportcommit: fix massive commits
  trim_common_tail: brown paper bag fix.
  teach bash completion to treat commands with "--" as a helper
  rename git-browse--help to git-help--browse

Johannes Sixt (1):
  threaded pack-objects: Use condition variables for thread communication.

Junio C Hamano (15):
  git-commit: squelch needless message during an empty merge
  xdl_diff: identify call sites.
  xdi_diff: trim common trailing lines
  diff --check: minor fixups
  xdiff tail trimming: use correct type.
  commit: allow --amend to reuse message from another commit
  remote: Fix bogus make_branch() call in configuration reader.
  Rename git-browse-help helper to git-browse--help
  Retire git-runstatus for real.
  Start preparing the API documents.
  Update draft release notes for 1.5.4
  Re-re-re-fix common tail optimization
  builtin-commit: fix summary output.
  builtin-commit: make summary output consistent with status
  Documentation/git-submodule: refer to gitmodules(5)

Kristian Høgsberg (1):
  Use a strbuf for building up section header and key/value pair strings.

Li Hong (1):
  Fix a memory leak

Mike Hommey (8):
  Fix some more memory leaks in http-push.c
  Fix random sha1 in error message in http-fetch and http-push
  Remove the default_headers variable from http-push.c
  Remove a CURLOPT_HTTPHEADER (un)setting
  Avoid redundant declaration of missing_target()
  Use strbuf in http code
  Fix various memory leaks in http-push.c and http-walker.c
  Move fetch_ref from http-push.c and http-walker.c to http.c

Nicolas Pitre (1):
  provide advance warning of some future pack default changes

Petr Baudis (1):
  gitweb: Make config_to_multi return [] instead of [undef]

Shawn Bohrer (1):
  Fix spelling mistakes in user manual

Wincent Colaiuta (6):
  "diff --check" should affect exit status
  Unify whitespace checking
  Make "diff --check" output match "git apply"
  Add tests for "git diff --check" with core.whitespace options
  Use shorter error messages for whitespace problems
  Test interaction between diff --check and --exit-code

anonymous (1):
  Documentation: describe pack idx v2

What's in git.git (stable frozen)

[Junio C Hamano]

Stabilization cycle towards -rc2 continues.

The main point of -rc cycle is regression fixes and general
bugfixes, although a few new features managed to slip in.

 - diff.external configuration variable serves the same purpose
   as GIT_EXTERNAL_DIFF environment;

 - "git diff --src-prefix=l/ --dst-prefix=k/" can be used to
   change the usual prefix (i.e. a/foo vs. b/foo).

----------------------------------------------------------------

* The 'maint' branch has these fixes since the last announcement.

Jeff King (2):
  clone: correctly report http_fetch errors
  git-send-email: avoid duplicate message-ids


* The 'master' branch has these since the last announcement
  in addition to the above.

Charles Bailey (2):
  Fix git-instaweb breakage on MacOS X due to the limited sed functionality
  Remove old generated files from .gitignore.

Eric Wong (3):
  git-svn: avoid leaving leftover committer/author info in rebase
  git-svn: workaround a for broken symlinks in SVN
  git-svn: avoid warning when run without arguments

Finn Arne Gangstad (1):
  Improved submodule merge support

Gustaf Hendeby (1):
  Make git send-email accept $EDITOR with arguments

H.Merijn Brand (1):
  the use of 'tr' in the test suite isn't really portable

Jakub Narebski (1):
  gitweb: fix whitespace in config_to_multi (indent with tab)

Jeff King (2):
  test "git clone -o"
  clean up 1.5.4 release notes

Jim Meyering (2):
  git-filter-branch.sh: more portable tr usage: use \012, not \n.
  Don't dereference NULL upon lookup failure.

Johannes Schindelin (6):
  Support config variable diff.external
  Document diff.external and mergetool.<tool>.path
  rebase -p -i: handle "no changes" gracefully
  git show <tag>: show the tagger
  Teach diff machinery to display other prefixes than "a/" and "b/"
  Mention git-shell's "cvs" substitution in the RelNotes

Johannes Sixt (3):
  Plug a resource leak in threaded pack-objects code.
  Clean up documentation that references deprecated 'git peek-remote'.
  filter-branch: Remove broken and unnecessary summary of rewritten refs.

Junio C Hamano (8):
  builtin-blame.c: remove unneeded memclr()
  GIT 1.5.4-rc1
  t4024: fix test script to use simpler sed pattern
  fix git commit --amend -m "new message"
  shell-scripts usage(): consistently exit with non-zero
  Documentation: ls-files -v is about "assume unchanged".
  Fix $EDITOR regression introduced by rewrite in C.
  Documentation: describe 'union' low-level merge driver

Linus Torvalds (2):
  unpack-trees: FLEX_ARRAY fix
  Re(-re)*fix trim_common_tail()

Marco Roeland (1):
  clone: fix options '-o' and '--origin' to be recognised again

Miklos Vajna (1):
  everyday: replace 'prune' and 'repack' with 'gc'

Nicolas Pitre (2):
  fix style of a few comments in diff-delta.c
  make 'git describe --all --contains' work

Pierre Habouzit (4):
  Fix segfault in diff-delta.c when FLEX_ARRAY is 1
  git-tag: fix -l switch handling regression.
  Force the sticked form for options with optional arguments.
  parse-options: Add a gitcli(5) man page.

Ralf Wildenhues (1):
  Fix some documentation typos.

Sam Vilain (1):
  Clarify error response from 'git fetch' for bad responses

Sean Estabrooks (1):
  Fix interactive rebase to preserve author email address

Shawn O. Pearce (3):
  Avoid update hook during git-rebase --interactive
  Catch and handle git-commit failures in git-rebase --interactive
  Reallow git-rebase --interactive --continue if commit is unnecessary

Stefan Sperling (1):
  Small comment fix for git-cvsimport.

Wincent Colaiuta (1):
  Emit helpful status for accidental "git stash" save

What's in git.git (stable frozen)

[Junio C Hamano]

We are not at -rc3 yet, but we will be soon.  What we have
accumulated in 'master' are mostly fixes, and the official
git-gui 0.9.1 is also included tonight.

I have to apologize that tonight I got a bit carried away
enjoying arguing for the sake of arguing.  Some patches that
might be worthy even though they are late in the cycle are not
in tonight's 'master', mostly because I have to sleep on them,
and partly because I am running out of time tonight.

 * Tsugikazu Shibata's git-diff hunk header change.

   I have a counterproposal that I think is more in line with
   the other parts of the system.  As the kernel project has
   ja_JP, ko_KR and zh_CN directories under Documentation these
   days, the issue this patch addresses is already real, and we
   would want to have a solution in 1.5.4, even though the topic
   was raised too late in the cycle.  I think my first two
   patches could be a good starting point for that.  I'd exclude
   the last patch in the series that acts on gitattributes for
   now.

 * Marco's git-stash changes to output to stdout.

   I'd probably apply this, with a slightly toned down commit
   log message.  Marco says some practice is standard, I
   disagreed, but that is not a reason to say "this practice is
   nonstandard and bad".  Simply saying "some do this and it is
   better to be helpful to them because there is no strong
   reason not to" would be good enough.

 * Jeff's git-add--interactive change to always honor color.diff
   regardless of color.interactive.

   I'd probably apply this, along with the patch to redefine
   what color.interactive means.  "git am -i" could also learn
   to use colors in the future.

   Incidentally I noticed that many of the color.diff.* palette
   options are read by "git-add -i" but never used by the
   script.  We might want to fix this while we are at it.

 * Dan McGee's workaround to breakage caused by changes in
   AsciiDoc 8.2.3.

   I have to do my usual "before-and-after comparison" with
   copies of AsciiDoc versions that should not be affected by
   the breakage, which I did not have time to do so far.  But
   this is probably a must-have before the release.

 * My patch to error out "git stash clear foobar".

   This should be applied; it is a good safety measure
   regardless of where that "git stash drop" thing would go.

An issue worth addressing before the release is still in limbo.

 * Dmitry's git-filter-branch fix to disambiguate the refs being
   rewritten.

   Addition of "git-rev-parse --symbolic-full" may solve this
   more cleanly than the patches in the discussion, but we
   haven't reached the conclusion of this thread yet.

Anything I missed?

----------------------------------------------------------------

* The 'master' branch has these since the last announcement.

Alex Riesen (1):
  Allow selection of different cleanup modes for commit messages

Arjen Laarhoven (1):
  Fix "git log --diff-filter" bug

Bernt Hansen (1):
  git-gui: Make commit log messages end with a newline

Eric Wong (2):
  git-svn: allow dcommit --no-rebase to commit multiple, dependent changes
  git-svn: unlink index files that were globbed, too

Grégoire Barbier (1):
  Fix double-free() in http-push.c:remote_exists()

Gustaf Hendeby (2):
  shortlog manpage documentation: work around asciidoc markup issues
  Documentation/user-manual.txt: fix typo

J. Bruce Fields (1):
  Documentation: fix remote.<name>.skipDefaultUpdate description

Jeff King (6):
  cvsimport: die on cvsps errors
  config: handle lack of newline at end of file better
  git-reset: refuse to do hard reset in a bare repository
  add a "basic" diff config callback
  diff: load funcname patterns in "basic" config
  diff: remove lazy config loading

Jim Meyering (2):
  Fix grammar nits in documentation and in code comments.
  Don't access line[-1] for a zero-length "line" from fgets.

Johannes Schindelin (1):
  Optimize prefixcmp()

Johannes Sixt (1):
  git-gui: Move frequently used commands to the top of the context menu.

Junio C Hamano (20):
  t7005: do not exit inside test.
  builtin-commit: fix amending of the initial commit
  builtin-commit: avoid double-negation in the code.
  Fix documentation of --first-parent in git-log and copy it to
    git-rev-list
  combine-diff: Fix path quoting
  Fix rewrite_diff() name quoting.
  contrib: resurrect scripted git-revert.
  GIT 1.5.4-rc2
  Documentation/git-submodule.txt: typofix
  "git pull --tags": error out with a better message.
  git-rebase -i behaves better on commits with incomplete messages
  git-rebase -i: clean-up error check codepath.
  lock_any_ref_for_update(): reject wildcard return from check_ref_format
  Update callers of check_ref_format()
  Uninline prefixcmp()
  git-clean: make "Would remove ..." path relative to cwd again
  t/t7600: avoid GNUism in grep
  t/t{3600,3800,5401}: do not use egrep when grep would do
  t/t3800: do not use a temporary file to hold expected result.
  Update draft release notes for 1.5.4

Marco Costalba (1):
  Document git-reset defaults to HEAD if no commit is given

Mark Levedahl (1):
  git-gui: Unconditionally use absolute paths with Cygwin

Martin Koegler (2):
  receive-pack: check object type of sha1 before using them as commits
  receive-pack: reject invalid refnames

Michael Stefaniuc (1):
  git-am: Run git gc only once and not for every patch.

Miklos Vajna (2):
  git-sh-setup: document git_editor() and get_author_ident_from_commit()
  t/t7001: avoid unnecessary ERE when using grep

Peter Karlsson (1):
  Added Swedish translation.

René Scharfe (1):
  Make "--pretty=format" parser a bit more careful.

Shawn O. Pearce (2):
  git-gui: Handle file mode changes (644->755) in diff viewer
  Improve error messages when int/long cannot be parsed from config

Re: What's in git.git (stable frozen)

[Dan McGee]

[-- Attachment #1: Type: text/plain, Size: 943 bytes --]

On Jan 5, 2008 4:46 AM, Junio C Hamano <gitster@pobox.com> wrote:
> We are not at -rc3 yet, but we will be soon.  What we have
> accumulated in 'master' are mostly fixes, and the official
> git-gui 0.9.1 is also included tonight.
>  * Dan McGee's workaround to breakage caused by changes in
>    AsciiDoc 8.2.3.
>
>    I have to do my usual "before-and-after comparison" with
>    copies of AsciiDoc versions that should not be affected by
>    the breakage, which I did not have time to do so far.  But
>    this is probably a must-have before the release.

I've updated the patch a bit as I noticed I completely missed the
user-manual.txt and a handful of other files that weren't named
git-*.txt. The new version is attached (gzipped). I also included
instructions on how to regenerate it in the commit message, which may
be a wise idea to ensure no Documentation changes add a gitlink: call
between now and when you apply the patch.

-Dan

[-- Attachment #2: 0001-Documentation-rename-gitlink-macro-to-linkgit.patch.gz --]
[-- Type: application/x-gzip, Size: 50243 bytes --]

Re: What's in git.git (stable frozen)

[Junio C Hamano]

"Dan McGee" <dpmcgee@gmail.com> writes:

> On Jan 5, 2008 4:46 AM, Junio C Hamano <gitster@pobox.com> wrote:
>> We are not at -rc3 yet, but we will be soon.  What we have
>> accumulated in 'master' are mostly fixes, and the official
>> git-gui 0.9.1 is also included tonight.
>>  * Dan McGee's workaround to breakage caused by changes in
>>    AsciiDoc 8.2.3.
>>
>>    I have to do my usual "before-and-after comparison" with
>>    copies of AsciiDoc versions that should not be affected by
>>    the breakage, which I did not have time to do so far.  But
>>    this is probably a must-have before the release.
>
> I've updated the patch a bit as I noticed I completely missed the
> user-manual.txt and a handful of other files that weren't named
> git-*.txt. The new version is attached (gzipped).

The asciidoc.conf change I resurrected from the earlier one but
it appears this breaks build with asciidoc 7.1.2 for some reason
(I haven't looked into that myself yet, and I won't be for the
next 12 hours or so).

Re: What's in git.git (stable frozen)

[Junio C Hamano]

Junio C Hamano <gitster@pobox.com> writes:

>> I've updated the patch a bit as I noticed I completely missed the
>> user-manual.txt and a handful of other files that weren't named
>> git-*.txt. The new version is attached (gzipped).
>
> The asciidoc.conf change I resurrected from the earlier one but
> it appears this breaks build with asciidoc 7.1.2 for some reason
> (I haven't looked into that myself yet, and I won't be for the
> next 12 hours or so).

Ah, I spoke too fast.  I think I need to first do a clean-up
patch to fix "gitlink::foobar[1]" that should have been spelled
as "gitlink:foobar[1]" in a few places, and your change is good.

Re: What's in git.git (stable frozen)

[Dan McGee]

On Jan 5, 2008 9:06 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
> >> I've updated the patch a bit as I noticed I completely missed the
> >> user-manual.txt and a handful of other files that weren't named
> >> git-*.txt. The new version is attached (gzipped).
> >
> > The asciidoc.conf change I resurrected from the earlier one but
> > it appears this breaks build with asciidoc 7.1.2 for some reason
> > (I haven't looked into that myself yet, and I won't be for the
> > next 12 hours or so).
>
> Ah, I spoke too fast.  I think I need to first do a clean-up
> patch to fix "gitlink::foobar[1]" that should have been spelled
> as "gitlink:foobar[1]" in a few places, and your change is good.

It looks like I still blew it and forgot the changes in asciidoc.conf
in the second patch, sorry about that. Let me know if you need
anything more, although this patch is pretty straightforward (once I
spent 3 hours trying to figure out why it was broken in the first
place and attempting to find a more sane way around it).

-Dan

Re: What's in git.git (stable frozen)

[Junio C Hamano]

"Dan McGee" <dpmcgee@gmail.com> writes:

>> Ah, I spoke too fast.  I think I need to first do a clean-up
>> patch to fix "gitlink::foobar[1]" that should have been spelled
>> as "gitlink:foobar[1]" in a few places, and your change is good.
>
> It looks like I still blew it and forgot the changes in asciidoc.conf
> in the second patch, sorry about that. Let me know if you need
> anything more,...

I think I got all of what you wanted to do now, although my tree
still is not in a shape I can push it out yet (I have to whip
other parts that does not have anything to do with this
documentation fix into shape first).

Thanks.

Re: What's in git.git (stable frozen)

[Junio C Hamano]

"Marco Costalba" <mcostalba@gmail.com> writes:

> I understand the patch series is too intrusive now, but if you want I
> can send a simplified one that just fixes the off by one bug for now.

How about the one that fixes first and see how bad the remainder
looks again?  I recall that Réne were not entirely unhappy with
his last round.  And I do not think that change does not have to
be "a series" but can be a single change.  At least it did not
look so complicated, but I may be misremembering it.

Re: What's in git.git (stable frozen)

[Jeff King]

On Sat, Jan 05, 2008 at 02:46:07AM -0800, Junio C Hamano wrote:

>  * Jeff's git-add--interactive change to always honor color.diff
>    regardless of color.interactive.
> 
>    I'd probably apply this, along with the patch to redefine
>    what color.interactive means.  "git am -i" could also learn
>    to use colors in the future.
> 
>    Incidentally I noticed that many of the color.diff.* palette
>    options are read by "git-add -i" but never used by the
>    script.  We might want to fix this while we are at it.

Here is the palette cleanup patch, on top of my others (it should still
be done even if the other patches aren't taken, but backporting it
should be fairly obvious).

-- >8 --
add--interactive: remove unused diff colors

When color support was added, we colored the diffs
ourselves. However, 4af756f3 changed this to simply run
"git diff-files" twice, keeping the colored output
separately.

This makes the internal diff color variables obsolete with
one exception: when splitting hunks, we have to manually
recreate the fragment for each part of the split. Thus we
keep $fraginfo_color around to do that correctly.

Signed-off-by: Jeff King <peff@peff.net>
---
 git-add--interactive.perl |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index aaa9b24..5bdcca8 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -6,7 +6,7 @@ use Git;
 # Prompt colors:
 my ($prompt_color, $header_color, $help_color, $normal_color);
 # Diff colors:
-my ($new_color, $old_color, $fraginfo_color, $metainfo_color, $whitespace_color);
+my ($fraginfo_color);
 
 my ($use_color, $diff_use_color);
 my $repo = Git->repository();
@@ -27,11 +27,7 @@ if ($use_color) {
 # Do we also set diff colors?
 $diff_use_color = $repo->get_colorbool('color.diff');
 if ($diff_use_color) {
-	$new_color = $repo->get_color("color.diff.new", "green");
-	$old_color = $repo->get_color("color.diff.old", "red");
 	$fraginfo_color = $repo->get_color("color.diff.frag", "cyan");
-	$metainfo_color = $repo->get_color("color.diff.meta", "bold");
-	$whitespace_color = $repo->get_color("color.diff.whitespace", "normal red");
 }
 
 sub colored {
-- 
1.5.4.rc2.1147.gaecdf-dirty

Re: What's in git.git (stable frozen)

[Jeff King]

On Sat, Jan 05, 2008 at 11:24:09PM -0500, Jeff King wrote:

> >  * Jeff's git-add--interactive change to always honor color.diff
> >    regardless of color.interactive.
> > 
> >    I'd probably apply this, along with the patch to redefine
> >    what color.interactive means.  "git am -i" could also learn
> >    to use colors in the future.
> 
> Here is the palette cleanup patch, on top of my others (it should still

And while tracking down the $fraginfo usage, I noticed that my original
patches introduce a bug. Fix is below (it is on top of palette cleanup).

I can also resubmit these in a more sensible order (palette cleanup,
then the other three squashed together) if you prefer.

-- >8 --
add--interactive: colorize split hunk fragment headers

The only diff element which we still color in perl is the
"fraginfo" for the split hunks. When honoring color.diff
without color.interactive, we were failing to actually color
this because the "colored" function checks for interactive
color. Instead, let's just color it by hand (the simple
approach is OK because we know we have a single line
string).

Signed-off-by: Jeff King <peff@peff.net>
---
This is a little uglier than it could be because the "colored" function
does two things: correctly colorize a string, and check the global
$use_color. We could do something like:

  local $use_color = 1;
  $display_head = colored($fraginfo_color, $head);

which is arguably less ugly. Or we could refactor "colored", which is a
larger change.

 git-add--interactive.perl |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 5bdcca8..76dc4e6 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -21,8 +21,8 @@ if ($use_color) {
 	$prompt_color = $repo->get_color("color.interactive.prompt", "bold blue");
 	$header_color = $repo->get_color("color.interactive.header", "bold");
 	$help_color = $repo->get_color("color.interactive.help", "red bold");
-	$normal_color = $repo->get_color("", "reset");
 }
+$normal_color = $repo->get_color("", "reset");
 
 # Do we also set diff colors?
 $diff_use_color = $repo->get_colorbool('color.diff');
@@ -648,7 +648,8 @@ sub split_hunk {
 		my $display_head = $head;
 		unshift @{$hunk->{TEXT}}, $head;
 		if ($diff_use_color) {
-			$display_head = colored($fraginfo_color, $head);
+			$display_head = join('', $fraginfo_color, $head,
+				$normal_color, "\n");
 		}
 		unshift @{$hunk->{DISPLAY}}, $display_head;
 	}
-- 
1.5.4.rc2.1147.gaecdf-dirty

Re: What's in git.git (stable frozen)

[Junio C Hamano]

Jeff King <peff@peff.net> writes:

> This is a little uglier than it could be because the "colored" function
> does two things: correctly colorize a string, and check the global
> $use_color.

That fallout is a logical consequence of the semantics change of
color.interactive, which used to color the whole user experience
but now only covers about menus and stuff.  $use_color is still
tied to the former semantics.

It may make more sense to:

 * unset $prompt_color and friends when color.interactive says
   "not to color the menus";

 * unset $fraginfo_color and diff related ones when color.diff
   says "diff is monochrome";

upfront, and then change "sub colored" to just check if $color
is unset, instead of checking $use_color.

Re: What's in git.git (stable frozen)

[Jeff King]

On Sun, Jan 06, 2008 at 02:51:24AM -0800, Junio C Hamano wrote:

> It may make more sense to:
> 
>  * unset $prompt_color and friends when color.interactive says
>    "not to color the menus";
> 
>  * unset $fraginfo_color and diff related ones when color.diff
>    says "diff is monochrome";
> 
> upfront, and then change "sub colored" to just check if $color
> is unset, instead of checking $use_color.

Something like this (instead of my last patch):

-- >8 --
add--interactive: fix "colored" function semantics

Since color.interactive is just for the menus, the "colored"
function can't use it to determine whether to show colors
(this was visible as a bug in which the headers of split
hunks were not colored if color.diff was set but
color.interactive was not).

The new semantics are:

  - colors which are unused are set to undef; the "colored"
    function knows not to do anything with them

  - menu colors are set only when color.interactive is true

  - diff colors are set only when color.diff is true

Signed-off-by: Jeff King <peff@peff.net>
---
 git-add--interactive.perl |   39 +++++++++++++++------------------------
 1 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 5bdcca8..17ca5b8 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -3,38 +3,29 @@
 use strict;
 use Git;
 
-# Prompt colors:
-my ($prompt_color, $header_color, $help_color, $normal_color);
-# Diff colors:
-my ($fraginfo_color);
-
-my ($use_color, $diff_use_color);
 my $repo = Git->repository();
 
-$use_color = $repo->get_colorbool('color.interactive');
-
-if ($use_color) {
-	# Set interactive colors:
+my $menu_use_color = $repo->get_colorbool('color.interactive');
+my ($prompt_color, $header_color, $help_color) =
+	$menu_use_color ? (
+		$repo->get_color('color.interactive.prompt', 'bold blue'),
+		$repo->get_color('color.interactive.header', 'bold'),
+		$repo->get_color('color.interactive.help', 'red bold'),
+	) : ();
 
-	# Grab the 3 main colors in git color string format, with sane
-	# (visible) defaults:
-	$prompt_color = $repo->get_color("color.interactive.prompt", "bold blue");
-	$header_color = $repo->get_color("color.interactive.header", "bold");
-	$help_color = $repo->get_color("color.interactive.help", "red bold");
-	$normal_color = $repo->get_color("", "reset");
-}
+my $diff_use_color = $repo->get_colorbool('color.diff');
+my ($fraginfo_color) =
+	$diff_use_color ? (
+		$repo->get_color('color.diff.frag', 'cyan'),
+	) : ();
 
-# Do we also set diff colors?
-$diff_use_color = $repo->get_colorbool('color.diff');
-if ($diff_use_color) {
-	$fraginfo_color = $repo->get_color("color.diff.frag", "cyan");
-}
+my $normal_color = $repo->get_color("", "reset");
 
 sub colored {
 	my $color = shift;
 	my $string = join("", @_);
 
-	if ($use_color) {
+	if (defined $color) {
 		# Put a color code at the beginning of each line, a reset at the end
 		# color after newlines that are not at the end of the string
 		$string =~ s/(\n+)(.)/$1$color$2/g;
@@ -300,7 +291,7 @@ sub highlight_prefix {
 		return "$prefix$remainder";
 	}
 
-	if (!$use_color) {
+	if (!$menu_use_color) {
 		return "[$prefix]$remainder";
 	}
 
-- 
1.5.4.rc2.1148.gf9fe3-dirty

Re: What's in git.git (stable frozen)

[Junio C Hamano]

Jeff King <peff@peff.net> writes:

> Something like this (instead of my last patch):

Yeah, I like that much better, especially the renaming of
$use_color to more descriptive (but is it really about "menu", I
wonder?).

I might consider rewriting this part

> +my $menu_use_color = $repo->get_colorbool('color.interactive');
> +my ($prompt_color, $header_color, $help_color) =
> +	$menu_use_color ? (
> +		$repo->get_color('color.interactive.prompt', 'bold blue'),
> +		$repo->get_color('color.interactive.header', 'bold'),
> +		$repo->get_color('color.interactive.help', 'red bold'),
> +	) : ();

like this:

	my ($prompt_color, $header_color, $help_color, $fraginfo_color);
        if ($colored_prompt) {
        	$prompt_color = ...;
                $header_color = ...;
        }
	if ($colored_diff) {
        	$fraginfo_color = ...;
	}

or even like this:

	my (%palette);
        if ($colored_prompt) {
		my %default = (
                	prompt => 'bold blue',
                        header => 'bold',
                        ...
		);
                while (my ($k,$v) = each %default) {
                    $palette{$k} = $repo->get_color("color.interactive.$k",$v);
		}
	}

But I realize that's going overboard.  Certainly the last one is
doing unnecessary generalization for generalization's sake.

Re: What's in git.git (stable frozen)

[Jeff King]

On Sun, Jan 06, 2008 at 04:32:15AM -0800, Junio C Hamano wrote:

> Yeah, I like that much better, especially the renaming of
> $use_color to more descriptive (but is it really about "menu", I
> wonder?).

I thought that, too, but I didn't know what better word to use
(something like "display" doesn't make it clear that it doesn't involve
the diff).

> I might consider rewriting this part
> 
> > +my $menu_use_color = $repo->get_colorbool('color.interactive');
> > +my ($prompt_color, $header_color, $help_color) =
> > +	$menu_use_color ? (
> > +		$repo->get_color('color.interactive.prompt', 'bold blue'),
> > +		$repo->get_color('color.interactive.header', 'bold'),
> > +		$repo->get_color('color.interactive.help', 'red bold'),
> > +	) : ();
> 
> like this:
> 
> 	my ($prompt_color, $header_color, $help_color, $fraginfo_color);
>         if ($colored_prompt) {
>         	$prompt_color = ...;
>                 $header_color = ...;
>         }
> 	if ($colored_diff) {
>         	$fraginfo_color = ...;
> 	}

Actually, that's more or less how it's written before my patch (in fact,
you could eliminate that part of my patch and just move $normal_color
outside of the conditional). However I didn't like having the
declaration and the assignment so far apart (and duplicated). But I will
admit my version is a little nested. Please feel free to switch it when
you apply.

> or even like this:
> 
> 	my (%palette);
>         if ($colored_prompt) {
> 		my %default = (
>                 	prompt => 'bold blue',
>                         header => 'bold',
>                         ...
> 		);
>                 while (my ($k,$v) = each %default) {
>                     $palette{$k} = $repo->get_color("color.interactive.$k",$v);
> 		}
> 	}
> 
> But I realize that's going overboard.  Certainly the last one is
> doing unnecessary generalization for generalization's sake.

Yes, I considered making a %palette, as well, but it just seemed a
little gratuitous (and the nice thing about using variables is that they
catch typos better).

-Peff

Re: What's in git.git (stable frozen)

[Junio C Hamano]

Jeff King <peff@peff.net> writes:

> Yes, I considered making a %palette, as well, but it just seemed a
> little gratuitous (and the nice thing about using variables is that they
> catch typos better).

Yes, to a certain extent with Perl (I think if you make the same
typo twice you won't get much help, and that is quite easy to
trigger with variable name autocompletion and cut-and-paste).

I suspect "if (!$menu_use_color)" might need to be refined in
sub "highlight_prefix".  It should be tied with $prompt_color
somehow (i.e. either it is undef or the "plain" color),
shouldn't it?

But other than that the result looks quite nice.  I shuffled the
patches around and the resulting series consists of three patches:

 - "remove unused diff colors";

 - "color.diff" colors diff, "color.interactive" colors
   interaction (squashed the original with change to the "sub
   colored" to use palette setting instead of $use_color as the
   cue);

 - documentation update to redefine the color.interactive
   semantics;

Re: What's in git.git (stable frozen)

[Jeff King]

On Sun, Jan 06, 2008 at 01:22:57PM -0800, Junio C Hamano wrote:

> Yes, to a certain extent with Perl (I think if you make the same
> typo twice you won't get much help, and that is quite easy to
> trigger with variable name autocompletion and cut-and-paste).

Yes, and a static checking language would be a little less error-prone.
But who can live without "eval <STDIN>"? :)

> I suspect "if (!$menu_use_color)" might need to be refined in
> sub "highlight_prefix".  It should be tied with $prompt_color
> somehow (i.e. either it is undef or the "plain" color),
> shouldn't it?

I'm not sure. It avoids printing the brackets in "[p]atch". If you say
"use color, but make the color plain" does that mean you want brackets
or not (right now it will not show brackets)?

> But other than that the result looks quite nice.  I shuffled the
> patches around and the resulting series consists of three patches:

Great. That is the order I would have chosen as well (and hopefully I
gave you enough material in the commit messages to cut and paste
something sensible).

-Peff

Re: What's in git.git (stable frozen)

[Junio C Hamano]

I've applied all the leftover bits I mentioned in yesterday's
message and 'master' tonight is pretty much where I want it to
be in 1.5.4-rc3 (and in 1.5.4 final).

Subsystem people (except Shawn, whose git-gui 0.9.1 is already
in) are requested to tell me to pull from them, if they have
accumulated changes that should be in the final release.  I am
hoping that I can tag -rc3 in a few days (say by the end of my
Wednesday).

Re: What's in git.git (stable frozen)

[Paul Mackerras]

Junio C Hamano writes:

> Subsystem people (except Shawn, whose git-gui 0.9.1 is already
> in) are requested to tell me to pull from them, if they have
> accumulated changes that should be in the final release.  I am
> hoping that I can tag -rc3 in a few days (say by the end of my
> Wednesday).

I'd like you to do a pull from the gitk.git master branch, but it
looks to me like there will be a conflict on the Makefile.
Unfortunately the Makefile that Christian Stimming gave me along with
the i18n changes is quite different from the one you currently have in
the gitk-git subdirectory.  I'm not quite sure what to suggest since
it isn't clear to me exactly what Christian's Makefile (which doesn't
actually work) is trying to do.  I guess the best thing would be to
copy your Makefile over and then add the i18n stuff.

Apart from the i18n changes, there is one more commit (b039f0a6) that
improves the appearance slightly when running under Tk8.5.

Paul.

Re: What's in git.git (stable frozen)

[Christian Stimming]

Am Montag, 7. Januar 2008 22:58 schrieb Paul Mackerras:
> I'd like you to do a pull from the gitk.git master branch, but it
> looks to me like there will be a conflict on the Makefile.
> Unfortunately the Makefile that Christian Stimming gave me along with
> the i18n changes is quite different from the one you currently have in
> the gitk-git subdirectory.  I'm not quite sure what to suggest since
> it isn't clear to me exactly what Christian's Makefile (which doesn't
> actually work) is trying to do.  

The Makefile from me was merely a placeholder where the i18n programs should 
work, but it was clear that the installation rules need to be defined 
differently anyway.

> I guess the best thing would be to 
> copy your Makefile over and then add the i18n stuff.

Yes. I've just sent you a patch that does exactly this - that was what I 
thought, too.

> Apart from the i18n changes, there is one more commit (b039f0a6) that
> improves the appearance slightly when running under Tk8.5.

Are you going to release a i18n-enabled gitk sometime soon? If yes, you should 
consider notifying the translator(s) a few days in advance so that they can 
finalize their translations, in case they want to avoid a half-translated 
program to be shipped. Thanks a lot.

Christian

Re: What's in git.git (stable frozen)

[Junio C Hamano]

Christian Stimming <stimming@tuhh.de> writes:

> Am Montag, 7. Januar 2008 22:58 schrieb Paul Mackerras:
>> I'd like you to do a pull from the gitk.git master branch, but it
>> looks to me like there will be a conflict on the Makefile.
>> Unfortunately the Makefile that Christian Stimming gave me along with
>> the i18n changes is quite different from the one you currently have in
>> the gitk-git subdirectory.  I'm not quite sure what to suggest since
>> it isn't clear to me exactly what Christian's Makefile (which doesn't
>> actually work) is trying to do.  
>
> The Makefile from me was merely a placeholder where the i18n programs should 
> work, but it was clear that the installation rules need to be defined 
> differently anyway.
>
>> I guess the best thing would be to 
>> copy your Makefile over and then add the i18n stuff.
>
> Yes. I've just sent you a patch that does exactly this - that was what I 
> thought, too.

Thanks both of you.

>> Apart from the i18n changes, there is one more commit (b039f0a6) that
>> improves the appearance slightly when running under Tk8.5.
>
> Are you going to release a i18n-enabled gitk sometime soon? If yes, you should 
> consider notifying the translator(s) a few days in advance so that they can 
> finalize their translations, in case they want to avoid a half-translated 
> program to be shipped. Thanks a lot.

If I understand correctly, what Paul told me to pull contains
the i18n stuff, so assuming your adjustment to gitk Makefile
makes things cleanly merge and build inside git.git repository,
upcoming 1.5.4-rc3 will ship with the infrastructure and
existing translations, and updates to po/ files can be made
between -rc3 and the final (I do not mean there won't be -rc4.
That is also "between -rc3 and final").

Re: What's in git.git (stable frozen)

[Steffen Prohaska]

On Dec 13, 2007, at 3:47 AM, Junio C Hamano wrote:

> The tip of 'master' is now tagged as 1.5.4-rc0.  Tarballs are found in
> the usual places:

A fresh msysgit self-contained Windows setup is available from

http://msysgit.googlecode.com/files/Git-1.5.4-rc0-preview20071217.exe

	Steffen