--- /dev/null
+Subject: What's cooking in git.git (Sep 2008, #02; Wed, 10)
+X-master-at: ede4caf6e3204f9d63758d6410d0f124b0caab32
+X-next-at: c8d31b67b3f0e13f6b8ad782dadc6e8a8bc06bbb
+
+What's cooking in git.git (Sep 2008, #02; Wed, 10)
+--------------------------------------------------
+
+Here are the topics that have been cooking. Commits prefixed
+with '-' are only in 'pu' while commits prefixed with '+' are
+in 'next'.
+
+The topics list the commits in reverse chronological order. The topics
+meant to be merged to the maintenance series have "maint-" in their names.
+
+----------------------------------------------------------------
+[New Topics]
+
+Many 'maint' material to go through the usual 'next' to 'master' to
+'maint' cycle..
+
+* mh/maint-honor-no-ssl-verify (Thu Feb 21 15:10:37 2008 -0800) 1 commit
+ + Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set
+
+* dp/maint-rebase-fix (Tue Sep 9 16:05:26 2008 +0400) 2 commits
+ + git-rebase--interactive: auto amend only edited commit
+ + git-rebase-interactive: do not squash commits on abort
+
+* jc/maint-checkout-keep-remove (Sun Sep 7 19:49:25 2008 -0700) 1 commit
+ + checkout: do not lose staged removal
+
+* jc/maint-template-permbits (Thu Aug 21 19:31:50 2008 -0500) 1 commit
+ + Fix permission bits on sources checked out with an overtight umask
+
+* am/status (Mon Sep 8 00:05:03 2008 +0200) 2 commits
+ - wt-status: Teach how to discard changes in the working directory
+ - wt-status: Split header generation into three functions
+
+This is what I commented as "making status output even chattier", but
+parked here to see what people think.
+
+* mv/commit-tree (Wed Sep 10 22:10:33 2008 +0200) 3 commits
+ - t7603: add new testcases to ensure builtin-commit uses
+ reduce_heads()
+ - builtin-commit: use commit_tree()
+ - commit_tree(): add a new author parameter
+
+* pb/autocorrect-wrapper (Wed Sep 10 14:44:20 2008 -0700) 2 commits
+ - Fixup -- waiting for response
+ - git wrapper: also uses aliases to suggest mistyped commands
+
+* jc/alternate-push (Tue Sep 9 01:27:10 2008 -0700) 4 commits
+ - push: receiver end advertises refs from alternate repositories
+ - push: prepare sender to receive extended ref information from the
+ receiver
+ - receive-pack: make it a builtin
+ - is_directory(): a generic helper function
+
+----------------------------------------------------------------
+[Graduated to "master"]
+
+* jc/hide-cr-in-diff-from-less (Wed Aug 27 19:48:01 2008 -0700) 1 commit
+ + diff: Help "less" hide ^M from the output
+
+* jc/maint-checkout-fix (Fri Aug 29 13:40:36 2008 -0700) 1 commit
+ + checkout: do not check out unmerged higher stages randomly
+
+This is the same one as the bottom of "better conflict resolution" series.
+
+* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
+ + configure: auto detect dynamic library path switches
+ + Makefile: Allow CC_LD_DYNPATH to be overriden
+
+I decided to push this forward; it might break minority configurations,
+but it appears nobody pays attention until it actually hurts, so let's see
+what happens when this hits 'master'.
+
+* ar/autospell (Sun Aug 31 15:54:58 2008 +0200) 2 commits
+ + Add help.autocorrect to enable/disable autocorrecting
+ + git wrapper: DWIM mistyped commands
+
+----------------------------------------------------------------
+[Stalled -- Needs Action to Proceed (or to be dropped)]
+
+* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
+ - Use xdiff caching to improve git blame performance
+ - Allow xdiff machinery to cache hash results for a file
+ - Always initialize xpparam_t to 0
+ - Bypass textual patch generation and parsing in git blame
+ - Allow alternate "low-level" emit function from xdl_diff
+
+Réne had good comments on how the callback should be structured.
+
+* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
+ - git-am: Pass the --directory option through to git-apply
+
+I think this is still buggy and drops the option when am stops with
+conflicts.
+
+* dk/emacs (Tue Aug 26 22:24:40 2008 -0500) 2 commits
+ - Teach git.el to mark/unmark files by regexp
+ - git.el: Diff only file at point by default
+
+These are still queued but Alexandre had improvement requests so these
+will likely be dropped.
+
+----------------------------------------------------------------
+[Will be merged to "master" soon]
+
+* np/pack (Tue Sep 2 10:22:22 2008 -0400) 4 commits
+ + t5300: improve SHA1 collision test
+ + pack-objects: don't include missing preferred base objects
+ + sha1write: don't copy full sized buffers
+ + Merge branch 'np/maint-safer-pack' into np/pack
+
+* bw/shortref (Fri Sep 5 23:16:23 2008 +0200) 1 commit
+ + for-each-ref: `:short` format for `refname`
+
+* rs/decorate (Thu Sep 4 23:40:03 2008 +0200) 3 commits
+ + add '%d' pretty format specifier to show decoration
+ + move load_ref_decorations() to log-tree.c and export it
+ + log: add load_ref_decorations()
+
+* tr/rev-list-reverse (Mon Sep 1 00:31:37 2008 +0200) 2 commits
+ + t6013: replace use of 'tac' with equivalent Perl
+ + rev-list: fix --reverse interaction with --parents
+
+* cc/bisect (Sat Sep 6 07:27:03 2008 +0200) 3 commits
+ + bisect: remove "checkout_done" variable used when checking merge
+ bases
+ + bisect: only check merge bases when needed
+ + bisect: test merge base if good rev is not an ancestor of bad rev
+
+* jc/setlinebuf-setvbuf (Wed Sep 3 20:33:29 2008 -0700) 1 commit
+ + daemon.c: avoid setlinebuf()
+
+* jc/maint-diff-quiet (Mon Sep 1 23:20:26 2008 -0700) 2 commits
+ + diff --quiet: make it synonym to --exit-code >/dev/null
+ + diff Porcelain: do not disable auto index refreshing on -C -C
+
+----------------------------------------------------------------
+[Actively Cooking]
+
+* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit
+ + diff --dirstat-by-file: count changed files, not lines
+
+* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit
+ + safe_create_leading_directories(): make it about "leading"
+ directories
+
+* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit
+ - git-apply:--include=pathspec
+
+* pb/commit-where (Mon Sep 8 01:05:41 2008 +0200) 1 commit
+ + builtin-commit.c: show on which branch a commit was added
+
+* jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 15 commits
+ + Fix AsciiDoc errors in merge documentation
+ + git-merge documentation: describe how conflict is presented
+ + checkout --conflict=<style>: recreate merge in a non-default style
+ + checkout -m: recreate merge when checking out of unmerged index
+ + Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-
+ resolution'
+ + git-merge-recursive: learn to honor merge.conflictstyle
+ + merge.conflictstyle: choose between "merge" and "diff3 -m" styles
+ + rerere: understand "diff3 -m" style conflicts with the original
+ + rerere.c: use symbolic constants to keep track of parsing states
+ + xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or
+ less
+ + xmerge.c: minimum readability fixups
+ + xdiff-merge: optionally show conflicts in "diff3 -m" style
+ + xdl_fill_merge_buffer(): separate out a too deeply nested function
+ + checkout --ours/--theirs: allow checking out one side of a
+ conflicting merge
+ + checkout -f: allow ignoring unmerged paths when checking out of
+ the index
+
+* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
+ + date/time: do not get confused by fractional seconds
+
+* jc/maint-name-hash-clear (Sat Aug 23 13:05:10 2008 -0700) 1 commit
+ + discard_cache: reset lazy name_hash bit
+
+I spotted this by accident while working on something unrelated.
+
+When a program calls discard_cache() to read the index again, we do not
+properly re-initialize the name_hash structure that is used by the case
+insensitivitly logic. This _might_ improve issues people may be having on
+case insensitive filesystems. I dunno.
+
+* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit
+ + git-add --intent-to-add (-N)
+
+Teaches "git add" to record only the intent to add a path later.
+I rerolled this without the fake empty blob object.
+
+* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits
+ + builtin-merge: release the lockfile in try_merge_strategy()
+ + merge-recursive: get rid of virtual_id
+ + merge-recursive: move current_{file,directory}_set to struct
+ merge_options
+ + merge-recursive: move the global obuf to struct merge_options
+ + merge-recursive: get rid of the index_only global variable
+ + merge-recursive: move call_depth to struct merge_options
+ + cherry-pick/revert: make direct internal call to merge_tree()
+ + builtin-merge: avoid run_command_v_opt() for recursive and subtree
+ + merge-recursive: introduce merge_options
+ + merge-recursive.c: Add more generic merge_recursive_generic()
+ + Split out merge_recursive() to merge-recursive.c
+
+* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
+ + diff: vary default prefix depending on what are compared
+
+As some people may have noticed, I've been running with this one when
+sending out "How about this" patches to the discussion threads.
+
+* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
+ - revision --simplify-merges: incremental simplification
+ - revision --simplify-merges: prepare for incremental simplification
+
+I started making this incremental but the progress is not so great.
+
+----------------------------------------------------------------
+[On Hold]
+
+* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
+ - git-am --forge: add Signed-off-by: line for the author
+ - git-am: clean-up Signed-off-by: lines
+ - stripspace: add --log-clean option to clean up signed-off-by:
+ lines
+ - stripspace: use parse_options()
+ - Add "git am -s" test
+ - git-am: refactor code to add signed-off-by line for the committer
+
+The one at second from the tip needs reworking.
+
+* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
+ - "git push": tellme-more protocol extension
+
+* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
+ - WIP: start teaching the --whitespace=fix to merge machinery
+
+* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
+ - blame: show "previous" information in --porcelain/--incremental
+ format
+ - git-blame: refactor code to emit "porcelain format" output
+
+* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
+ + merge: remove deprecated summary and diffstat options and config
+ variables
+
+This was previously in "will be in master soon" category, but it turns out
+that the synonyms to the ones this one deletes are fairly new invention
+that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
+in 1.7.0, but with the loud whining about moving git-foo out of $PATH we
+have been hearing, it might not be a bad idea to drop this.
+
+* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
+ - diff: enable "too large a rename" warning when -M/-C is explicitly
+ asked for
+
+This would be the right thing to do for command line use, but gitk will be
+hit due to tcl/tk's limitation, so I am holding this back for now.
--- /dev/null
+Subject: What's in git.git (Sep 2008, #02; Wed, 10)
+X-maint-at: 873358dd2ac3bf2cea9a370d8586378a27a092f2
+X-master-at: ede4caf6e3204f9d63758d6410d0f124b0caab32
+X-maint-was: aaefbfa66c348a461b3081873ef42819c8b38dac
+X-master-was: ec3a4ba519c0012d58584d23f407c302e7b80eb6
+
+What's in git.git (Sep 2008, #02; Wed, 10)
+
+ maint 873358d (Update draft release notes for 1.6.0.2)
+ master ede4caf (Install git-cvsserver in $(bindir))
+------------------------------------------------------------------------
+
+BLURB HERE
+
+* The 'maint' branch has these fixes since the last announcement.
+
+Arjen Laarhoven (1):
+ Use compatibility regex library for OSX/Darwin
+
+Junio C Hamano (4):
+ checkout: do not check out unmerged higher stages randomly
+ diff: Help "less" hide ^M from the output
+ log --author/--committer: really match only with name part
+ Update draft release notes for 1.6.0.2
+
+Marcus Griep (2):
+ Git.pm: Use File::Temp->tempfile instead of ->new
+ git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl
+
+Miklos Vajna (1):
+ t7501: always use test_cmp instead of diff
+
+Nicolas Pitre (5):
+ pack-objects: improve returned information from write_one()
+ improve reliability of fixup_pack_header_footer()
+ pack-objects: use fixup_pack_header_footer()'s validation mode
+ index-pack: use fixup_pack_header_footer()'s validation mode
+ fixup_pack_header_footer(): use nicely aligned buffer sizes
+
+
+* The 'master' branch has these since the last announcement
+ in addition to the above.
+
+Alex Riesen (1):
+ Add help.autocorrect to enable/disable autocorrecting
+
+Andreas Ericsson (1):
+ Teach "git diff -p" to locate PHP class methods
+
+Arjen Laarhoven (1):
+ t6023-merge-file: Work around non-portable sed usage
+
+Christian Couder (1):
+ refs: improve comments about "reading" argument of "resolve_ref"
+
+Dotan Barak (1):
+ Use xmalloc() and friends to catch allocation failures
+
+Eric Wong (1):
+ git-svn: fix handling of even funkier branch names
+
+Giovanni Funchal (1):
+ configure: auto detect dynamic library path switches
+
+Heikki Orsila (1):
+ Start conforming code to "git subcmd" style part 2
+
+Johannes Schindelin (1):
+ git wrapper: DWIM mistyped commands
+
+Johannes Sixt (1):
+ Windows: git-shell can be compiled again
+
+Junio C Hamano (2):
+ Makefile: Allow CC_LD_DYNPATH to be overriden
+ Fix git-diff-tree --stdin
+
+Michael J Gruber (2):
+ allow installation of man and html doc from the man and html branches
+ separate build targets for man and html documentation
+
+Mikael Magnusson (1):
+ Correct output of git-count-objects.
+
+Nanako Shiraishi (8):
+ t/t91XX-svn: start removing use of "git-" from these tests
+ t/t91XX git-svn tests: run "git svn" not "git-svn"
+ t9200: use "git cvsexportcommit" without dash
+ t9300, t9301: use "git fast-import/fast-export" without dash
+ t9700: use "git config" without dash
+ tests: use "git foo" without dash in strings
+ t9101: use "git hash-object" without dash
+ Install git-cvsserver in $(bindir)
+
projects / thirdparty / git.git / commitdiff
