From 01a8a64a95a3ea6f330919348f3f15ffa53496c8 Mon Sep 17 00:00:00 2001
From: "Shawn O. Pearce" <sop@google.com>
Date: Mon, 29 Sep 2008 11:45:20 -0700
Subject: [PATCH] What's cooking 2008-09 #04

---
 whats/cooking/2008/09/05.txt | 341 +++++++++++++++++++++++++++++++++++
 whats/in/2008/09/04.txt      | 178 ++++++++++++++++++
 2 files changed, 519 insertions(+)
 create mode 100644 whats/cooking/2008/09/05.txt
 create mode 100644 whats/in/2008/09/04.txt

diff --git a/whats/cooking/2008/09/05.txt b/whats/cooking/2008/09/05.txt
new file mode 100644
index 0000000000..67fd2eb4bd
--- /dev/null
+++ b/whats/cooking/2008/09/05.txt
@@ -0,0 +1,341 @@
+Subject: What's cooking in git.git (Sep 2008, #05; Mon, 29)
+X-master-at: 9800c0df412869c7949935b61581b9361fc49bd1
+X-next-at: 37dbc802cfed9d39ff15dfd333bdd2e74ca9f458
+
+What's cooking in git.git (Sep 2008, #05; Mon, 29)
+--------------------------------------------------
+
+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.
+
+If I have dropped anything recently its not because I don't want
+to apply it, it just slipped through the cracks.  Please feel free
+to give me a gentle prod (and a patch resend or a pointer to the
+series on gmane).  Thanks.
+
+----------------------------------------------------------------
+[New Topics]
+
+* gb/gitweb-pathinfo (Mon Sep 29 17:26:57 2008 +0200) 4 commits
+ - gitweb: generate parent..current URLs
+ - gitweb: parse parent..current syntax from pathinfo
+ - gitweb: generate project/action/hash URLs
+ - gitweb: parse project/action/hash_base:filename PATH_INFO
+
+This series just came in today.  I haven't had a chance to look at
+it beyond stashing in `pu`.
+
+* mw/sendemail (Mon Sep 29 12:41:06 2008 -0500) 8 commits
+ - send-email: signedoffcc -> signedoffbycc, but handle both
+ - Docs: send-email: Create logical groupings for man text
+ - Docs: send-email: Remove unnecessary config variable description
+ - Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to
+ - send-email: change --no-validate to boolean --[no-]validate
+ - Docs: send-email: Man page option ordering
+ - Docs: send-email usage text much sexier
+ - Docs: send-email's usage text and man page mention same options
+
+This series has already gone through 3 iterations before I could
+start to carry it in-tree.  I haven't had a chance to read it yet
+myself, so its sitting around in `pu` for futher review.
+
+* pb/gitweb (Thu Sep 25 18:48:48 2008 +0200) 2 commits
+ - gitweb: Sort the list of forks on the summary page by age
+ - gitweb: Clean-up sorting of project list
+
+I forgot to look at this series today.  I meant to review and try
+to merge it to `next` before publishing.  Will do that tomorrow.
+
+* ae/preservemerge (Tue Sep 23 22:58:20 2008 +0200) 3 commits
+ - git pull: Support --preserve-merges as a flag to rebase
+ - git rebase: Support non-interactive merge-preserving rebase
+ - Prepare for non-interactive merge-preserving rebase
+
+Andreas says there's some issues in here.  I'm waiting for a respin
+on the series before I look at it futher.
+
+* mg/verboseprune (Mon Sep 29 18:49:52 2008 +0200) 1 commit
+ - make prune report removed objects on -v
+
+Just came in today.  Looks sane.  I'll drop it onto `next` tomorrow.
+
+----------------------------------------------------------------
+[Graduated to "master"]
+
+* 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
+
+(Tip at 4271666)
+
+* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit
+ + diff --dirstat-by-file: count changed files, not lines
+
+(Tip at fd33777)
+
+* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit
+ + safe_create_leading_directories(): make it about "leading"
+   directories
+
+(Tip at 5f0bdf5)
+
+* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit
+ + git-apply:--include=pathspec
+
+(Tip at 6ecb1ee)
+
+* 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
+
+(Tip at 7a172b0)
+
+* pb/autocorrect-wrapper (Wed Sep 10 17:54:28 2008 +0200) 1 commit
+ + git wrapper: also use aliases to correct mistyped commands
+
+(Tip at 746c221)
+
+* 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
+
+(Tip at 3407a7a)
+
+* 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
+
+(Tip at d79796b)
+
+* bc/master-diff-hunk-header-fix (Sat Sep 20 18:36:22 2008 -0700) 10 commits
+ + Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
+   hunk-header-fix
+ + diff hunk pattern: fix misconverted "\{" tex macro introducers
+ + diff: fix "multiple regexp" semantics to find hunk header comment
+ + diff: use extended regexp to find hunk headers
+ + Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
+   hunk-header-fix
+ + diff: use extended regexp to find hunk headers
+ + Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
+   hunk-header-fix
+ + diff.*.xfuncname which uses "extended" regex's for hunk header
+   selection
+ + diff.c: associate a flag with each pattern and use it for
+   compiling regex
+ + diff.c: return pattern entry pointer rather than just the hunk
+   header pattern
+
+(Tip at 92bb978)
+
+* 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
+
+(Tip at 4d6e4c4)
+
+* mg/maint-remote-fix (Mon Sep 22 10:57:51 2008 +0200) 1 commit
+ + make "git remote" report multiple URLs
+
+(Tip at 7d20e21)
+
+* bc/maint-diff-hunk-header-fix (Sat Sep 20 15:30:12 2008 -0700) 5 commits
+ + diff hunk pattern: fix misconverted "\{" tex macro introducers
+ + diff: use extended regexp to find hunk headers
+ + diff.*.xfuncname which uses "extended" regex's for hunk header
+   selection
+ + diff.c: associate a flag with each pattern and use it for
+   compiling regex
+ + diff.c: return pattern entry pointer rather than just the hunk
+   header pattern
+
+(Tip at 96d1a8e)
+
+----------------------------------------------------------------
+[Old New Topics]
+
+* nd/narrow (Sun Sep 14 20:07:59 2008 +0700) 9 commits
+ - grep: skip files that have not been checked out
+ - checkout_entry(): CE_NO_CHECKOUT on checked out entries.
+ - Prevent diff machinery from examining worktree outside narrow
+   checkout
+ - Add tests for updating no-checkout entries in index
+ - ls-files: add --narrow-checkout option to "will checkout" entries
+ - update-index: add --checkout/--no-checkout to update
+   CE_NO_CHECKOUT bit
+ - update-index: refactor mark_valid() in preparation for new options
+ - Introduce CE_NO_CHECKOUT bit
+ - Extend index to save more flags
+
+[jc: This is an early half of the earlier series (I haven't had
+ chance to look at the updated series yet), and should be replaced
+ with the updated one posted recently.]
+
+I haven't touched this branch since I inherited it from Junio.
+I'd appreciate a resend or a pointer to the updated series so I
+can at least replace it.
+
+----------------------------------------------------------------
+[Stalled -- Needs Action to Proceed (or to be dropped)]
+
+* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit
+ - t7400: Add short "git submodule add" testsuite
+
+[jc: Waiting for a reroll.]
+
+* 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
+
+[jc: 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
+
+[jc: I think this is still buggy and drops the option when am stops
+ with conflicts.]
+
+All three of these are stalled.  I'm not going to drop them just
+yet, but Junio's comments still hold.  If there's no action on
+these next week we may seem them drop off.
+
+----------------------------------------------------------------
+[Will be merged to 'master/maint' soon]
+
+* 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.
+[jc: I rerolled this without the fake empty blob object.]
+
+I'm inclined to merge this next week.
+
+(Tip at 3942581)
+
+----------------------------------------------------------------
+[Actively Cooking]
+
+* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
+ + Documentation: Refer to git-rebase(1) to warn against rewriting
+ + Documentation: new upstream rebase recovery section in git-rebase
+
+[jc: My impression from the last round of discusson on the third
+ patch in this series (not queued here) was that as long as we
+ do not present it as "One True Workflow", the description was
+ a good starting point, possibly others to add other recommended
+ flows later.]
+
+I haven't looked at this series yet.  Based on Junios remarks above
+I'm looking for more input on this series before it goes anywhere.
+
+* 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: Tentatively kicked back to "still cooking" status after
+ Jeff voiced his annoyance.  I personally do not like making this
+ multi-line as Jeff suggested as an alternative (the message already
+ is too verbose to my taste).]
+
+Agree with Junio.  Hence its still here.
+
+* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
+ + date/time: do not get confused by fractional seconds
+
+I need to look at this in more detail.  I suspect we can merge
+this to master soon, but its been kicking around since Aug 16th.
+I need to look at it to see if there's any obvious reason why Junio
+has no notes on this branch and why it hasn't merged yet.
+
+----------------------------------------------------------------
+[On Hold]
+
+* 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
+
+[jc: I started making this incremental but the progress is not so great.]
+
+* 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
+
+[jc: 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
+
+This has a merge conflict with `next` and isn't even in pu right now.
+
+* 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
+
+I should look at this in more detail.  We may be able to merge it
+to next soon-ish.
+
+* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
+ + merge: remove deprecated summary and diffstat options and config
+   variables
+
+[jc: 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
+
+[jc: 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.]
diff --git a/whats/in/2008/09/04.txt b/whats/in/2008/09/04.txt
new file mode 100644
index 0000000000..c3b90316d5
--- /dev/null
+++ b/whats/in/2008/09/04.txt
@@ -0,0 +1,178 @@
+Subject: What's in git.git (Sep 2008, #04; Mon, 29)
+X-maint-at: edb7e82f72106add9f2fbaf9d99d9532a72e3f91
+X-master-at: 9800c0df412869c7949935b61581b9361fc49bd1
+X-maint-was: db87e3960c5a770db13c9ba9602b5e88848e2d1a
+X-master-was: c4275591fbb7d582c397b228e38dbb8419c89330
+
+What's in git.git (Sep 2008, #04; Mon, 29)
+
+  maint edb7e82 (Merge branch 'bc/maint-diff-hunk-header-fix' into maint)
+ master 9800c0d (Merge branch 'bc/master-diff-hunk-header-fix')
+------------------------------------------------------------------------
+
+With Junio offline for another week we won't see a 1.6.0.3 until
+probably mid-October.  With that in mind I've merged a number of
+topics and trivial patches to maint so we can shake these out
+before the 1.6.0.3 release.
+
+* The 'maint' branch has these fixes since the last announcement.
+
+Alex Riesen (3):
+  Remove empty directories in recursive merge
+  Add remove_path: a function to remove as much as possible of a path
+  Use remove_path from dir.c instead of own implementation
+
+Brandon Casey (5):
+  diff.c: return pattern entry pointer rather than just the hunk header
+    pattern
+  diff.c: associate a flag with each pattern and use it for compiling regex
+  diff.*.xfuncname which uses "extended" regex's for hunk header selection
+  t4018-diff-funcname: test syntax of builtin xfuncname patterns
+  git-stash.sh: don't default to refs/stash if invalid ref supplied
+
+Chris Frey (1):
+  Documentation: clarify the details of overriding LESS via core.pager
+
+Deskin Miller (1):
+  maint: check return of split_cmdline to avoid bad config strings
+
+Johan Herland (2):
+  for-each-ref: Fix --format=%(subject) for log message without newlines
+  Use strchrnul() instead of strchr() plus manual workaround
+
+Jonas Fonseca (1):
+  checkout: Do not show local changes when in quiet mode
+
+Junio C Hamano (2):
+  diff: use extended regexp to find hunk headers
+  diff hunk pattern: fix misconverted "\{" tex macro introducers
+
+Michael J Gruber (1):
+  make "git remote" report multiple URLs
+
+Ping Yin (1):
+  git-submodule: Fix "Unable to checkout" for the initial 'update'
+
+Rafael Garcia-Suarez (1):
+  Clarify commit error message for unmerged files
+
+Shawn O. Pearce (1):
+  Update release notes for 1.6.0.3
+
+Stephen Haberman (1):
+  Clarify how the user can satisfy stash's 'dirty state' check.
+
+
+* The 'master' branch has these since the last announcement
+  in addition to the above.
+
+Alex Riesen (1):
+  Cleanup remove_path
+
+Alexander Gavrilov (9):
+  git-gui: Fix Blame Parent & Context for working copy lines.
+  git-gui: Restore ability to Stage Working Copy for conflicts.
+  git-gui: Add more integration options to citool.
+  git-gui: Cleanup handling of the default encoding.
+  git-gui: Add a menu of available encodings.
+  git-gui: Allow forcing display encoding for diffs using a submenu.
+  git-gui: Optimize encoding name resolution using a lookup table.
+  git-gui: Support the encoding menu in gui blame.
+  git-gui: Reenable staging unmerged files by clicking the icon.
+
+Anders Melchiorsen (2):
+  wt-status: Split header generation into three functions
+  wt-status: Teach how to discard changes in the working directory
+
+Brandon Casey (1):
+  t4018-diff-funcname: test syntax of builtin xfuncname patterns
+
+Christian Stimming (2):
+  git-gui: I18n fix sentence parts into full sentences for translation
+    again.
+  git-gui: Updated German translation.
+
+Dmitry Potapov (1):
+  mingw: remove use of _getdrive() from lstat/fstat
+
+Garry Dolley (1):
+  Fixed some grammatical errors in git-rebase.txt documentation.
+
+Giuseppe Bilotta (1):
+  gitweb: shortlog now also obeys $hash_parent
+
+Heikki Orsila (1):
+  diff --dirstat-by-file: count changed files, not lines
+
+Johan Herland (2):
+  Fix AsciiDoc errors in merge documentation
+  Fix submodule sync with relative submodule URLs
+
+Johannes Sixt (1):
+  compat/mingw: Support a timeout in the poll emulation if no fds are given
+
+Joshua Williams (1):
+  git-gui: Add support for calling out to the prepare-commit-msg hook
+
+Junio C Hamano (21):
+  checkout -f: allow ignoring unmerged paths when checking out of the index
+  checkout --ours/--theirs: allow checking out one side of a conflicting
+    merge
+  xdl_fill_merge_buffer(): separate out a too deeply nested function
+  xdiff-merge: optionally show conflicts in "diff3 -m" style
+  xmerge.c: minimum readability fixups
+  xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less
+  rerere.c: use symbolic constants to keep track of parsing states
+  rerere: understand "diff3 -m" style conflicts with the original
+  merge.conflictstyle: choose between "merge" and "diff3 -m" styles
+  git-merge-recursive: learn to honor merge.conflictstyle
+  checkout -m: recreate merge when checking out of unmerged index
+  checkout --conflict=<style>: recreate merge in a non-default style
+  git-merge documentation: describe how conflict is presented
+  safe_create_leading_directories(): make it about "leading" directories
+  git-apply:--include=pathspec
+  is_directory(): a generic helper function
+  receive-pack: make it a builtin
+  push: prepare sender to receive extended ref information from the
+    receiver
+  push: receiver end advertises refs from alternate repositories
+  diff: use extended regexp to find hunk headers
+  diff: fix "multiple regexp" semantics to find hunk header comment
+
+Miklos Vajna (13):
+  Split out merge_recursive() to merge-recursive.c
+  merge-recursive: introduce merge_options
+  builtin-merge: avoid run_command_v_opt() for recursive and subtree
+  cherry-pick/revert: make direct internal call to merge_tree()
+  merge-recursive: move call_depth to struct merge_options
+  merge-recursive: get rid of the index_only global variable
+  merge-recursive: move the global obuf to struct merge_options
+  merge-recursive: move current_{file,directory}_set to struct
+    merge_options
+  merge-recursive: get rid of virtual_id
+  builtin-merge: release the lockfile in try_merge_strategy()
+  commit_tree(): add a new author parameter
+  builtin-commit: use commit_tree()
+  t7603: add new testcases to ensure builtin-commit uses reduce_heads()
+
+Nanako Shiraishi (4):
+  remote.c: make free_ref(), parse_push_refspec() and free_refspecs()
+    static.
+  graph.c: make many functions static
+  usage.c: remove unused functions
+  Add contrib/rerere-train script
+
+Petr Baudis (1):
+  git-web--browse: Support for using /bin/start on MinGW
+
+Pieter de Bie (1):
+  git wrapper: also use aliases to correct mistyped commands
+
+Shawn O. Pearce (3):
+  git-gui: Hide commit related UI during citool --nocommit
+  git-gui: Use gitattribute "encoding" for file content display
+  git-gui: Assume `blame --incremental` output is in UTF-8
+
+Stephan Beyer (1):
+  merge-recursive.c: Add more generic merge_recursive_generic()
+