Re: What's cooking in git.git (Jul 2016, #02; Wed, 6)

[Charles Bailey]

On Thu, Jul 07, 2016 at 02:21:28PM -0700, Junio C Hamano wrote:
> Charles Bailey  writes:
> 
> > I just wanted to clarify what was actually fixed. The actual bug that
> > was reported and fixed was the fact that 'git grep' (without --cached)
> > wasn't searching the contents of files in the working tree if the index
> > entry had the "intent to add" bit set.
> 
> Ouch, you are absolutely right.
> 
>  Git does not know what the contents in the index should be for a
>  path added with "git add -N" yet, so "git grep --cached" should not
>  show hits (or show lack of hits, with -L) in such a path, but that
>  logic does not apply to "git grep", i.e. searching in the working
>  tree files.  But we did so by mistake, which has been corrected.
> 
> perhaps?

Yes, that reads like an accurate summary to me.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: What's cooking in git.git (Jul 2016, #02; Wed, 6)

[Junio C Hamano]

Charles Bailey  writes:

> I just wanted to clarify what was actually fixed. The actual bug that
> was reported and fixed was the fact that 'git grep' (without --cached)
> wasn't searching the contents of files in the working tree if the index
> entry had the "intent to add" bit set.

Ouch, you are absolutely right.

 Git does not know what the contents in the index should be for a
 path added with "git add -N" yet, so "git grep --cached" should not
 show hits (or show lack of hits, with -L) in such a path, but that
 logic does not apply to "git grep", i.e. searching in the working
 tree files.  But we did so by mistake, which has been corrected.

perhaps?

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: What's cooking in git.git (Jul 2016, #02; Wed, 6)

[Charles Bailey]

On Wed, Jul 06, 2016 at 02:39:26PM -0700, Junio C Hamano wrote:
> * nd/ita-cleanup (2016-07-01) 3 commits
>   (merged to 'next' on 2016-07-06 at f15aeba)
>  + grep: fix grepping for "intent to add" files
>  + t7810-grep.sh: fix a whitespace inconsistency
>  + t7810-grep.sh: fix duplicated test name
> 
>  Git does not know what the contents in the index should be for a
>  path added with "git add -N" yet, so "git grep --cached" should not
>  show hits (or show lack of hits, with -L) in such a path.  But we
>  did by mistake, which has been corrected.
> 
>  Will merge to 'master'.

I just wanted to clarify what was actually fixed. The actual bug that
was reported and fixed was the fact that 'git grep' (without --cached)
wasn't searching the contents of files in the working tree if the index
entry had the "intent to add" bit set.

My original proposed fix (reversion of the commit that introduced this
change) caused the re-introduction of behaviour where "i-to-a" files
would be reported with -L --cached which wasn't desired. I think because
we spent most of our energy and discussion on fixing this in a better
way we've lost the intent of the original patch.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

What's cooking in git.git (Jul 2016, #02; Wed, 6)

[Junio C Hamano]

Here are the topics that have been cooking.  Commits prefixed with
'-' are only in 'pu' (proposed updates) 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.

The first few batches for this cycle has been merged to 'master',
and new topics are trickling into 'next'.

You can find the changes described here in the integration branches
of the repositories listed at

http://git-blame.blogspot.com/p/git-public-repositories.html

--
[Graduated to "master"]

* ak/t7800-wo-readlink (2016-06-21) 1 commit
  (merged to 'next' on 2016-06-28 at 403)
 + t7800: readlink may not be available

 One among four invocations of readlink(1) in our test suite has
 been rewritten so that the test can run on systems without the
 command (others are in valgrind test framework and t9802).


* ao/p4-has-branch-prefix-fix (2016-06-22) 1 commit
  (merged to 'next' on 2016-06-28 at 333f90d)
 + git-p4: correct hasBranchPrefix verbose output

 A bug, which caused "git p4" while running under verbose mode to
 report paths that are omitted due to branch prefix incorrectly, has
 been fixed; the command said "Ignoring file outside of prefix" for
 paths that are _inside_.


* cb/t7810-test-label-fix (2016-06-21) 1 commit
  (merged to 'next' on 2016-06-28 at 4d85a00)
 + t7810: fix duplicated test title

 Test clean-up.


* ep/http-curl-trace (2016-05-24) 2 commits
  (merged to 'next' on 2016-06-27 at c290515)
 + imap-send.c: introduce the GIT_TRACE_CURL enviroment variable
 + http.c: implement the GIT_TRACE_CURL environment variable

 HTTP transport gained an option to produce more detailed debugging
 trace.


* ew/mboxrd-format-am (2016-06-06) 3 commits
  (merged to 'next' on 2016-06-28 at ee0a088)
 + am: support --patch-format=mboxrd
 + mailsplit: support unescaping mboxrd messages
 + pretty: support "mboxrd" output format

 Teach format-patch and mailsplit (hence "am") how a line that
 happens to begin with "From " in the e-mail message is quoted with
 ">", so that these lines can be restored to their original shape.


* jc/t2300-setup (2016-06-22) 1 commit
  (merged to 'next' on 2016-06-28 at 62b902a)
 + t2300: "git --exec-path" is not usable in $PATH on Windows as-is

 Portability fix for Windows.


* jk/add-i-diff-compact-heuristics (2016-06-16) 1 commit
  (merged to 'next' on 2016-06-27 at 568f892)
 + add--interactive: respect diff.compactionHeuristic

 "git add -i/-p" learned to honor diff.compactionHeuristic
 experimental knob, so that the user can work on the same hunk split
 as "git diff" output.


* jk/bisect-show-tree (2016-06-16) 1 commit
  (merged to 'next' on 2016-06-27 at 6970f87e)
 + bisect: always call setup_revisions after init_revisions

 "git bisect" makes an internal call to "git diff-tree" when
 bisection finds the culprit, but this call did not initialize the
 data structure to pass to the diff-tree API correctly.


* jk/gpg-interface-cleanup (2016-06-17) 7 commits
  (merged to 'next' on 2016-06-28 at eed3498)
 + gpg-interface: check gpg signature creation status
 + sign_buffer: use pipe_command
 + verify_signed_buffer: use pipe_command
 + run-command: add pipe_command helper
 + verify_signed_buffer: use tempfile object
 + verify_signed_buffer: drop pbuf variable
 + gpg-interface: use child_process.args

 A new run-command API function pipe_command() is introduced to
 sanely feed data to the standard input while capturing data from
 the standard output and the standard error of an external process,
 which is cumbersome to hand-roll correctly without deadlocking.

 The codepath to sign data in a prepared buffer with GPG has been
 updated to use this API to read from the status-fd to check for
 errors (instead of relying on GPG's exit status).


* jk/parseopt-string-list (2016-06-13) 3 commits
  (merged to 'next' on 2016-06-27 at 27462e6)
 + blame,shortlog: don't make local option variables static
 + interpret-trailers: don't duplicate option strings
 + parse_opt_string_list: stop allocating new strings
 (this branch is used by jk/string-list-static-init.)

 The command line argument parsing that uses OPT_STRING_LIST() often
 made a copy of the argv[] element, which was unnecessary.


* jk/repack-keep-unreachable (2016-06-14) 3 commits
  (merged to 'next' on 2016-06-28 at 802b849)
 + repack: extend --keep-unreachable to loose objects
 + repack: add --keep-unreachable option
 + repack: document --unpack-unreachable option

 "git repack" learned the "--keep-unreachable" option, which sends
 loose unreachable objects to a pack instead of leaving them loose.
 This helps heuristics based on the number of loose objects
 (e.g. "gc --auto").


* jk/send-pack-stdio (2016-06-10) 2 commits
  (merged to 'next' on 2016-06-27 at 2cfb0ff)
 + write_or_die: remove the unused write_or_whine() function
 + send-pack: use buffered I/O to talk to pack-objects

 Code clean-up.


*