What's cooking in git.git (Jun 2010, #03; Fri, 18)

What's cooking in git.git (Jun 2010, #03; Fri, 18)

[Junio C Hamano]

Here are the topics that have been cooking.  Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'.  The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.

--------------------------------------------------
[Graduated to "master"]

* ab/maint-perl-use-instlibdir (2010-05-30) 1 commit
  (merged to 'next' on 2010-06-07 at 83cf3b8)
 + Makefile: remove redundant munging of @@INSTLIBDIR@@

* by/diff-graph (2010-05-29) 6 commits
  (merged to 'next' on 2010-06-07 at 8771aae)
 + Make --color-words work well with --graph
 + graph.c: register a callback for graph output
 + Emit a whole line in one go
 + diff.c: Output the text graph padding before each diff line
 + Output the graph columns at the end of the commit message
 + Add a prefix output callback to diff output

* cb/ls-files-cdup (2010-06-03) 2 commits
  (merged to 'next' on 2010-06-07 at 89277b8)
 + ls-files: allow relative pathspec
 + quote.c: separate quoting and relative path generation

* cc/maint-diff-CC-binary (2010-05-26) 1 commit
  (merged to 'next' on 2010-06-07 at 1a8bbbb)
 + diff: fix "git show -C -C" output when renaming a binary file

* ec/diff-noprefix-config (2010-05-02) 1 commit
  (merged to 'next' on 2010-06-03 at 75fefba)
 + diff: add configuration option for disabling diff prefixes.

* hg/id-munging (2010-04-06) 2 commits
  (merged to 'next' on 2010-06-03 at b045725)
 + convert: Keep foreign $Id$ on checkout.
 + convert: Safer handling of $Id$ contraction.

* jc/t9129-any-utf8 (2010-06-02) 1 commit
  (merged to 'next' on 2010-06-07 at 6f53da4)
 + t9129: fix UTF-8 locale detection
 (this branch is used by ab/tap.)

* jh/diff-index-line-abbrev (2010-05-30) 1 commit
  (merged to 'next' on 2010-06-07 at 194e9a9)
 + diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s

* jk/am-skip-hint (2010-05-30) 1 commit
  (merged to 'next' on 2010-06-07 at f49577f)
 + git-am: suggest what to do with superfluous patches

* jk/url-decode (2010-05-23) 2 commits
  (merged to 'next' on 2010-06-03 at 0d8a51e)
 + decode file:// and ssh:// URLs
 + make url-related functions reusable

* jn/gitweb-plackup (2010-05-28) 3 commits
  (merged to 'next' on 2010-06-03 at c54f1bf)
 + git-instaweb: Add support for running gitweb via 'plackup'
 + git-instaweb: Wait for server to start before running web browser
 + git-instaweb: Remove pidfile after stopping web server
 (this branch uses ps/gitweb-soc.)

* jn/rebase-cmdline-fix (2010-05-31) 1 commit
  (merged to 'next' on 2010-06-07 at 5e6cffe)
 + rebase: improve error message when upstream argument is missing

* jn/remote-set-branches (2010-05-19) 1 commit
  (merged to 'next' on 2010-06-03 at 54a1755)
 + Add git remote set-branches

* mg/status-b (2010-05-25) 2 commits
  (merged to 'next' on 2010-06-07 at d1e3f9e)
 + Documentation+t5708: document and test status -s -b
 + Show branch information in short output of git status

* ph/clone-message-reword (2010-05-09) 1 commit
  (merged to 'next' on 2010-05-21 at 1785bd0)
 + clone: reword messages to match the end-user perception

* ps/gitweb--browse-chrome (2010-05-30) 1 commit
  (merged to 'next' on 2010-06-07 at a0fef35)
 + git-web--browse: Add support for google chrome and chromium

* rc/ls-remote-default (2010-05-12) 1 commit
  (merged to 'next' on 2010-06-03 at 8d505fb)
 + ls-remote: print URL when no repo is specified

* rr/am-help (2010-06-02) 3 commits
  (merged to 'next' on 2010-06-07 at 12383bc)
 + git am: Remove stray error message from sed
 + git am: Display some help text when patch is empty
 + git am: Set cmdline globally

* tc/merge-m-log (2010-05-11) 8 commits
  (merged to 'next' on 2010-05-21 at e889876)
 + merge: --log appends shortlog to message if specified
 + fmt-merge-msg: add function to append shortlog only
 + fmt-merge-msg: refactor merge title formatting
 + fmt-merge-msg: minor refactor of fmt_merge_msg()
 + merge: rename variable
 + merge: update comment
 + t7604-merge-custom-message: show that --log doesn't append to -m
 + t7604-merge-custom-message: shift expected output creation

--------------------------------------------------
[New Topics]

* as/maint-completion-set-u-fix (2010-06-17) 1 commit
 - bash-completion: Fix __git_ps1 to work with "set -u"

--------------------------------------------------
[Stalled -- would discard unless there are some movements soon]

* js/rebase-origin-x (2010-02-05) 1 commit
 - [RFC w/o test and incomplete] rebase: add -x option to record original commit name

I retract my objection against the idea of -x; needs polishing before
moving forward.

--------------------------------------------------
[Cooking]

* ab/i18n (2010-06-15) 3 commits
 . Add initial C, Shell and Perl gettext translations
 . fixup! Add infrastructure
 . Add infrastructure for translating Git with gettext

I haven't got around to fix conflicts merging this with various other
topics yet.

* zl/mailinfo-recode-patch (2010-06-14) 2 commits
 - add --recode-patch option to git-am
 - add --recode-patch option to git-mailinfo

Discussion?

* rr/svn-export (2010-06-10) 7 commits
 - Add LICENSE
 - Add SVN dump parser
 - Add infrastructure to write revisions in fast-export format
 - Add stream helper library
 - Add library for string-specific memory pool
 - Add cpp macro implementation of treaps
 - Add memory pool library

I recall there was another round of re-roll planned for this one.

* tr/rev-list-count (2010-06-17) 2 commits
 - bash completion: Support "divergence from upstream" messages in __git_ps1
 - rev-list: introduce --count option

* tr/send-email-8bit (2010-06-17) 1 commit
 - send-email: ask about and declare 8bit mails

* jl/maint-diff-ignore-submodules (2010-06-08) 2 commits
 - Add optional parameters to the diff option "--ignore-submodules"
 - git diff: rename test that had a conflicting name

Is everybody happy with the naming of --ignore-submodules=<when> and the
semantics?  Need to ping the list.

* cp/textconv-cat-file (2010-06-09) 4 commits
 - [DONTMERGE] git gui: use textconv filter for diff and blame
 - t/t8007: test textconv support for cat-file
 - textconv: support for cat_file
 - sha1_name: add get_sha1_with_context()
 (this branch uses ab/blame-textconv.)

* ab/blame-textconv (2010-06-07) 3 commits
 - t/t8006: test textconv support for blame
 - textconv: support for blame
 - textconv: make the API public
 (this branch is used by cp/textconv-cat-file.)

* ab/tap (2010-06-09) 4 commits
 - We use TAP so the Perl test can run without scaffolding
 - Skip tests in a way that makes sense under TAP
 - Merge branch 'jc/t9129-any-utf8' into ab/tap
 - Make test-lib.sh emit valid TAP format

I was not sure why TAP is worth the trouble, and I still am not sure.

* bd/maint-unpack-trees-parawalk-fix (2010-06-10) 1 commit
  (merged to 'next' on 2010-06-18 at 183c13e)
 + unpack-trees: Make index lookahead less pessimal

* ic/maint-rebase-i-abort (2010-06-08) 1 commit
  (merged to 'next' on 2010-06-17 at 7f5f430)
 + rebase -i: Abort cleanly if new base cannot be checked out

* jk/maint-advice-empty-amend (2010-06-06) 1 commit
  (merged to 'next' on 2010-06-17 at 12ff4cd)
 + commit: give advice on empty amend

* jn/document-rebase-i-p-limitation (2010-05-31) 1 commit
  (merged to 'next' on 2010-06-17 at a653a72)
 + rebase -i -p: document shortcomings

* jn/grep-open (2010-06-12) 4 commits
  (merged to 'next' on 2010-06-18 at cf96ea8)
 + grep -O: allow optional argument specifying the pager (or editor)
 + grep: Add the option '--open-files-in-pager'
 + Unify code paths of threaded greps
 + grep: refactor grep_objects loop into its own function

* rr/parse-date-refactor (2010-06-03) 1 commit
  (merged to 'next' on 2010-06-17 at c55f72b)
 + Refactor parse_date for approxidate functions

* sm/branch-broken-ref (2010-06-04) 2 commits
  (merged to 'next' on 2010-06-17 at cb81c35)
 + branch: don't fail listing branches if one of the commits wasn't found
 + branch: exit status now reflects if branch listing finds an error

* tr/receive-pack-aliased-update-fix (2010-06-10) 1 commit
  (merged to 'next' on 2010-06-14 at d3a3097)
 + check_aliased_update: strcpy() instead of strcat() to copy
 (this branch is used by js/maint-receive-pack-symref-alias.)

* cc/maint-commit-reflog-msg (2010-06-12) 1 commit
  (merged to 'next' on 2010-06-17 at 863be4d)
 + commit: use value of GIT_REFLOG_ACTION env variable as reflog message

* jn/gitweb-return-or-exit-cleanup (2010-06-13) 1 commit
  (merged to 'next' on 2010-06-18 at 44299d4)
 + gitweb: Return or exit after done serving request

* pb/maint-perl-errmsg-no-dir (2010-06-18) 1 commit
 - Git.pm: better error message

* eb/double-convert-before-merge (2010-06-16) 1 commit
 - ll-merge: Normalize files before merging

* jc/maint-simpler-common-prefix (2010-06-16) 1 commit
  (merged to 'next' on 2010-06-18 at 24fa283)
 + common_prefix: simplify and fix scanning for prefixes

* js/maint-am-rebase-invalid-author (2010-06-16) 1 commit
 - am: use get_author_ident_from_commit instead of mailinfo when rebasing

* js/maint-receive-pack-symref-alias (2010-06-16) 1 commit
  (merged to 'next' on 2010-06-17 at ecb7fa5)
 + Merge branch 'tr/receive-pack-aliased-update-fix' into js/maint-receive-pack-symref-alias
 (this branch uses tr/receive-pack-aliased-update-fix.)

* lt/extended-sha1-match-commit-with-regexp (2010-04-23) 1 commit
  (merged to 'next' on 2010-06-17 at 9ba2ec9)
 + Make :/ accept a regex rather than a fixed pattern

* mg/pretty-magic-space (2010-06-14) 1 commit
  (merged to 'next' on 2010-06-18 at dd5a896)
 + pretty: Introduce ' ' modifier to add space if non-empty

* sb/format-patch-signature (2010-06-15) 2 commits
  (merged to 'next' on 2010-06-18 at 4aee846)
 + completion: Add --signature and format.signature
 + format-patch: Add a signature option (--signature)

* jc/rev-list-ancestry-path (2010-06-04) 5 commits
  (merged to 'next' on 2010-06-17 at b35488a)
 + revision: Turn off history simplification in --ancestry-path mode
 + revision: Fix typo in --ancestry-path error message
 + Documentation/rev-list-options.txt: Explain --ancestry-path
 + Documentation/rev-list-options.txt: Fix missing line in example history graph
 + revision: --ancestry-path

* ps/gitweb-soc (2010-06-02) 2 commits
  (merged to 'next' on 2010-06-13 at 92245ae)
 + git-instaweb: Add option to reuse previous config file
 + Makefile: Use $(sharedir)/gitweb for target 'install-gitweb'

* tc/commit-abbrev-fix (2010-06-12) 3 commits
  (merged to 'next' on 2010-06-16 at b2df7f8)
 + commit::print_summary(): don't use format_commit_message()
 + t7502-commit: add summary output tests for empty and merge commits
 + t7502-commit: add tests for summary output

* cc/cherry-pick-stdin (2010-06-14) 3 commits
 - revert: do not rebuild argv on heap
 - revert: accept arbitrary rev-list options
 - t3508 (cherry-pick): futureproof against unmerged files
 (this branch uses cc/cherry-pick-series.)

* cc/cherry-pick-series (2010-06-02) 8 commits
  (merged to 'next' on 2010-06-18 at 26c504f)
 + Documentation/revert: describe passing more than one commit
 + Documentation/cherry-pick: describe passing more than one commit
 + revert: add tests to check cherry-picking many commits
 + revert: allow cherry-picking more than one commit
 + revert: change help_msg() to take no argument
 + revert: refactor code into a do_pick_commit() function
 + revert: use run_command_v_opt() instead of execv_git_cmd()
 + revert: cleanup code for -x option
 (this branch is used by cc/cherry-pick-stdin.)

* gs/usage-to-stdout (2010-06-12) 2 commits
  (merged to 'next' on 2010-06-13 at e83c00f)
 + parseopt: wrap rev-parse --parseopt usage for eval consumption
  (merged to 'next' on 2010-06-03 at c81c783)
 + print the usage string on stdout instead of stderr

* gv/portable (2010-06-11) 20 commits
  (merged to 'next' on 2010-06-13 at 1add99c)
 + test-lib: use DIFF definition from GIT-BUILD-OPTIONS
  (merged to 'next' on 2010-06-07 at 1796035)
 + build: propagate $DIFF to scripts
  (merged to 'next' on 2010-06-03 at 41ae9cb)
 + Makefile: Tru64 portability fix
 + Makefile: HP-UX 10.20 portability fixes
 + Makefile: HPUX11 portability fixes
 + Makefile: SunOS 5.6 portability fix
 + inline declaration does not work on AIX
 + Allow disabling "inline"
 + Some platforms lack socklen_t type
 + Make NO_{INET_NTOP,INET_PTON} configured independently
 + Makefile: some platforms do not have hstrerror anywhere
 + git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition
 + test_cmp: do not use "diff -u" on platforms that lack one
 + fixup: do not unconditionally disable "diff -u"
 + tests: use "test_cmp", not "diff", when verifying the result
 + Do not use "diff" found on PATH while building and installing
 + enums: omit trailing comma for portability
 + Makefile: -lpthread may still be necessary when libc has only pthread stubs
 + Rewrite dynamic structure initializations to runtime assignment
 + Makefile: pass CPPFLAGS through to fllow customization

* jn/checkout-doc (2010-06-01) 2 commits
  (merged to 'next' on 2010-06-13 at d01c620)
 + Documentation/checkout: clarify description
  (merged to 'next' on 2010-06-07 at 93cc6a9)
 + Documentation/checkout: clarify description

* bc/portable (2010-06-09) 7 commits
  (merged to 'next' on 2010-06-13 at a423055)
 + Remove python 2.5'isms
 + Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONS
  (merged to 'next' on 2010-06-07 at 27a57c9)
 + t/aggregate-results: accomodate systems with small max argument list length
 + t/t7006: ignore return status of shell's unset builtin
 + t/t5150: remove space from sed script
 + git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh
 + t/t5800: skip if python version is older than 2.5

* jn/show-num-walks (2010-06-01) 1 commit
 - DWIM 'git show -5' to 'git show --do-walk -5'

* em/checkout-orphan (2010-06-10) 6 commits
  (merged to 'next' on 2010-06-12 at 2f531d5)
 + log_ref_setup: don't return stack-allocated array
  (merged to 'next' on 2010-06-07 at 23b4607)
 + bash completion: add --orphan to 'git checkout'
 + t3200: test -l with core.logAllRefUpdates options
 + checkout --orphan: respect -l option always
 + refs: split log_ref_write logic into log_ref_setup
 + Documentation: alter checkout --orphan description

In <4BFE2461.5080501@drmicha.warpmail.net>, Michael J Gruber raised a
valid request for a better explanation of superfluous files left behind
and then are cleaned.  Other than that I think this is a sane thing to
do.

* mg/rev-parse-lrbranches-locals (2010-05-14) 1 commit
 - revlist: Introduce --lrbranches and --locals revision specifiers
 (this branch uses mg/rev-parse-option-sifter-deprecation.)

* mg/rev-parse-option-sifter-deprecation (2010-05-14) 3 commits
 - t6018: make sure all tested symbolic names are different revs
 - t6018: add tests for rev-list's --branches and --tags
 - rev-parse: deprecate use as an option sifter
 (this branch is used by mg/rev-parse-lrbranches-locals.)

* eb/core-eol (2010-06-04) 4 commits
  (merged to 'next' on 2010-06-17 at 66b0c9f)
 + Add "core.eol" config variable
 + Rename the "crlf" attribute "text"
 + Add per-repository eol normalization
 + Add tests for per-repository eol normalization
 (this branch uses fg/autocrlf.)

* fg/autocrlf (2010-05-12) 1 commit
  (merged to 'next' on 2010-05-21 at 5f43b66)
 + autocrlf: Make it work also for un-normalized repositories
 (this branch is used by eb/core-eol.)

Will merge to 'master' when 'eb/core-eol' proves stable.

* jn/gitweb-fastcgi (2010-06-05) 3 commits
  (merged to 'next' on 2010-06-13 at 6d1fdd6)
 + gitweb: Run in FastCGI mode if gitweb script has .fcgi extension
  (merged to 'next' on 2010-05-21 at cb1724f)
 + gitweb: Add support for FastCGI, using CGI::Fast
 + gitweb: Put all per-connection code in run() subroutine

* js/async-thread (2010-06-11) 8 commits
  (merged to 'next' on 2010-06-13 at bf7457c)
 + fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)
  (merged to 'next' on 2010-05-21 at 9d31940)
 + Enable threaded async procedures whenever pthreads is available
  (merged to 'next' on 2010-05-04 at 2644e74)
 + Dying in an async procedure should only exit the thread, not the process.
 + Reimplement async procedures using pthreads
 + Windows: more pthreads functions
 + Fix signature of fcntl() compatibility dummy
 + Make report() from usage.c public as vreportf() and use it.
 + Modernize t5530-upload-pack-error.

Re: What's cooking in git.git (Jun 2010, #03; Fri, 18)

[Brian Gernhardt]

On Jun 18, 2010, at 8:34 PM, Junio C Hamano wrote:

> * ab/tap (2010-06-09) 4 commits
> - We use TAP so the Perl test can run without scaffolding
> - Skip tests in a way that makes sense under TAP
> - Merge branch 'jc/t9129-any-utf8' into ab/tap
> - Make test-lib.sh emit valid TAP format
> 
> I was not sure why TAP is worth the trouble, and I still am not sure.

Having looked it over, using prove (a TAP harness) would allow me to do things like save which tests fail to use either while trying to fix a bug or performing a bisection.

cd t/
prove --state=save t*.*
cd ..
git bisect start HEAD good
git bisect run 'make && (cd t && prove --state=failed t*.*)'

Also, the fact that it makes the perl tests be more "normal" is definitely in its favor.

~~ Brian

Re: What's cooking in git.git (Jun 2010, #03; Fri, 18)

[Pavan Kumar Sunkara]

>
> * ps/gitweb-soc (2010-06-02) 2 commits
>  (merged to 'next' on 2010-06-13 at 92245ae)
>  + git-instaweb: Add option to reuse previous config file
>  + Makefile: Use $(sharedir)/gitweb for target 'install-gitweb'
>

Junio, I would like to remember you a patch which I think u missed.

http://kerneltrap.org/mailarchive/git/2010/6/3/31711

Thanks,
-Pavan

Re: What's cooking in git.git (Jun 2010, #03; Fri, 18)

[Ramkumar Ramachandra]

Hi Junio,

Junio C Hamano wrote:
> * rr/svn-export (2010-06-10) 7 commits
>  - Add LICENSE
>  - Add SVN dump parser
>  - Add infrastructure to write revisions in fast-export format
>  - Add stream helper library
>  - Add library for string-specific memory pool
>  - Add cpp macro implementation of treaps
>  - Add memory pool library
>
> I recall there was another round of re-roll planned for this one.

Right. I'm currently busy working on svnclient_ra with Daniel while
David is currently working on simplifying the underlying data
structures. The series for a standalone svn-fe in contrib/ is still
pending; it was suggested by Jonathan, but I haven't seen him around
this week, so I'll also try to finish that off within the next few
days. When we get that series merged into `pu`, people will actually
be able to test this series.

-- Ram

Re: What's cooking in git.git (Jun 2010, #03; Fri, 18)

[Junio C Hamano]

Pavan Kumar Sunkara <pavan.sss1991@gmail.com> writes:

> Junio, I would like to remember you a patch which I think u missed.
>
> http://kerneltrap.org/mailarchive/git/2010/6/3/31711

What's the message-id?  There doesn't seem to be an easy way to get it out
of that web interface, so the above URL is no use for me, and I cannot see
the message in the context without its message-id.

Pointing at the site to casually refer to an old discussion is fine, but
please never refer to that site to refer to an old patch if you want me to
apply one.

Re: What's cooking in git.git (Jun 2010, #03; Fri, 18)

[Pavan Kumar Sunkara]

On Sun, Jun 20, 2010 at 11:00 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Pavan Kumar Sunkara <pavan.sss1991@gmail.com> writes:
>
>> Junio, I would like to remember you a patch which I think u missed.
>>
>> http://kerneltrap.org/mailarchive/git/2010/6/3/31711
>
> What's the message-id?  There doesn't seem to be an easy way to get it out
> of that web interface, so the above URL is no use for me, and I cannot see
> the message in the context without its message-id.
>
> Pointing at the site to casually refer to an old discussion is fine, but
> please never refer to that site to refer to an old patch if you want me to
> apply one.
>

Ok.
I didn't know about this.

So, here is the message ID
1275399845-13311-1-git-send-email-pavan.sss1991@gmail.com

Thanks,
Pavan.

Re: What's cooking in git.git (Jun 2010, #03; Fri, 18)

[Matthieu Moy]

Pavan Kumar Sunkara <pavan.sss1991@gmail.com> writes:

> So, here is the message ID
> 1275399845-13311-1-git-send-email-pavan.sss1991@gmail.com

Once you have the message id, you can turn it back into a URL to
combine the best of both worlds ;-).

http://mid.gmane.org/1275399845-13311-1-git-send-email-pavan.sss1991@gmail.com

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

Re: What's cooking in git.git (Jun 2010, #03; Fri, 18)

[Junio C Hamano]

Pavan Kumar Sunkara <pavan.sss1991@gmail.com> writes:

> So, here is the message ID
> 1275399845-13311-1-git-send-email-pavan.sss1991@gmail.com

Do you really mean that one?  Jakub had quite long review comments; so did
Pasky.  I had an impression that the following was the last/latest version.

    Subject: [PATCHv2] git-instaweb: Add option to reuse previous config file
    Date: Wed,  2 Jun 2010 03:29:49 +0530
    Message-ID: <1275429589-30634-1-git-send-email-pavan.sss1991@gmail.com>

(FYI, you can visit "http://mid.gmane.org/$that_message_id", click on its
subject string to see the thread in context).

I see Jakub's Ack to it.  Please confirm that one is what you meant and
I'll apply.

Thanks.

Re: What's cooking in git.git (Jun 2010, #03; Fri, 18)

[Junio C Hamano]

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

> Pavan Kumar Sunkara <pavan.sss1991@gmail.com> writes:
>
>> So, here is the message ID
>> 1275399845-13311-1-git-send-email-pavan.sss1991@gmail.com
>
> Do you really mean that one?  Jakub had quite long review comments; so did
> Pasky.  I had an impression that the following was the last/latest version.
>
>     Subject: [PATCHv2] git-instaweb: Add option to reuse previous config file
>     Date: Wed,  2 Jun 2010 03:29:49 +0530
>     Message-ID: <1275429589-30634-1-git-send-email-pavan.sss1991@gmail.com>
>
> (FYI, you can visit "http://mid.gmane.org/$that_message_id", click on its
> subject string to see the thread in context).
>
> I see Jakub's Ack to it.  Please confirm that one is what you meant and
> I'll apply.
>
> Thanks.

Wait a minute.

That one was applied about ten days ago as 8b94125 (git-instaweb: Add
option to reuse previous config file, 2010-06-02) and has been cooking in
'next' since June 13th.

So what did I miss???

Re: What's cooking in git.git (Jun 2010, #03; Fri, 18)

[Pavan Kumar Sunkara]

On Tue, Jun 22, 2010 at 12:01 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Pavan Kumar Sunkara <pavan.sss1991@gmail.com> writes:
>
>> So, here is the message ID
>> 1275399845-13311-1-git-send-email-pavan.sss1991@gmail.com
>
> Do you really mean that one?  Jakub had quite long review comments; so did
> Pasky.  I had an impression that the following was the last/latest version.
>
>    Subject: [PATCHv2] git-instaweb: Add option to reuse previous config file
>    Date: Wed,  2 Jun 2010 03:29:49 +0530
>    Message-ID: <1275429589-30634-1-git-send-email-pavan.sss1991@gmail.com>
>
> (FYI, you can visit "http://mid.gmane.org/$that_message_id", click on its
> subject string to see the thread in context).
>
> I see Jakub's Ack to it.  Please confirm that one is what you meant and
> I'll apply.
>
> Thanks.
>

Sorry, it is the wrong one

The right one is given below.
http://mid.gmane.org/1275573356-21466-3-git-send-email-pavan.sss1991@gmail.com

It's not acked but it's not commented. So I am guessing nobody has
problem with it.
And everybody is ok with in in my gsoc update.
So, I am guessing you could apply that patch.

Thanks,
Pavan.

Re: What's cooking in git.git (Jun 2010, #03; Fri, 18)

[Junio C Hamano]

Pavan Kumar Sunkara <pavan.sss1991@gmail.com> writes:

> The right one is given below.
> http://mid.gmane.org/1275573356-21466-3-git-send-email-pavan.sss1991@gmail.com

Oh, I do have three issues with that one.

#1. Command line should be able to override configuration

You currently have:

 . By default without command line override nor configuration, old
   behaviour of "refresh the gitweb.conf every time" stands;

 . You can tell it to keep the configuration with a command line option;

 . If you are tired of having to give the command line option every time,
   you can set a configuration variable instead.

The first bullet is fine; it is called "backward compatibility."  The
second one is also good.  "We allow a non-default behaviour in a rare case
with a command line option" is a good change.

But the third one makes the story quite different.

Adding a configuration needs to be done a lot more carefully.  If somebody
has configured instaweb.overwrite to false, you must give him a way to
override that from the command line.

IOW, you must at least support "git instaweb --no-reuse-config" in [PATCH
2/3].

If you anticipate that some people may get tired of having to give that
option all the time, it is possible that the choice of the original
default behaviour was wrong, at least for some people.  We might even want
to make "instaweb.overwrite" default to "false" in later versions.

Having command line override of configured default becomes even more
important for that transition to happen smoothly.  If a user has to use
older and newer versions of git across that default flip, it would give
him a reliable behaviour to say --[no-]reuse-config explicitly from the
command line.

#2. The subject of the patch should spell the name of the new variable on
   it.  But this is an artifact of a larger design issue; see below.

#3. Naming.

If you are going to make an configuration variable, its name should be
consistent with the command line option (I think Pasky said something
similar).  Your command line is '--reuse-config' but your configuration is
'(instaweb.)overwrite'.  Do you think these click with each other for
people other than you?  Wouldn't it be much more consistent if the above
were:

 . By default without command line override nor configuration, old
   behaviour of "refresh the gitweb.conf every time" stands;

 . You can tell it to keep the configuration by --no-overwrite-config
   option; to regenerate the config, say --overwrite-config (which is the
   current default but we _might_ change the default in the future if "no
   overwrite" is found to be more sensible by larger audience).

 . If you are tired of having to give --no-overwrite-config every time,
   you can say "[instaweb] overwriteConfig = false".

I know "overwrite-config" is a bit too long, and you would need to come up
with a shorter name (perhaps "reconfig"???) but the point is that we
should make it easy to guess the corresponding configuration variable name
given the command line option and vice-versa.

> It's not acked but it's not commented. So I am guessing nobody has
> problem with it.

That is not the right way to interpret lack of responses.  "Nobody is
interested in that patch" is the default interpretation.