delta/git.git, branch jc/am-3-nonstandard-popt

test: "am -3" can accept non-standard -p

2012-02-27T07:02:59+00:00

This adds a test for the previous one to make sure that "am -3 -p0" can
read patches created with the --no-prefix option.

Signed-off-by: Junio C Hamano

am -3: allow nonstandard -p option

2012-02-23T05:55:06+00:00

When falling back to 3-way merge, we run "git apply" to synthesize the
fake ancestor tree by parsing the incoming patch, and another "git apply"
to apply the patch to the fake ancestor tree.  Both invocation need to
be aware of the custom -p setting to parse patches that were prepared
with non-standard src/dst prefix.

Signed-off-by: Junio C Hamano

Sync with 1.7.6.6

2012-02-06T07:52:53+00:00

* maint-1.7.7:
  Git 1.7.6.6
  imap-send: remove dead code

Sync with 1.7.6.6

2012-02-06T07:52:25+00:00

Signed-off-by: Junio C Hamano

Git 1.7.6.6

2012-02-06T07:50:52+00:00

Signed-off-by: Junio C Hamano

imap-send: remove dead code

2012-02-06T07:44:56+00:00

The imap-send code was adapted from another project, and
still contains many unused bits of code. One of these bits
contains a type "struct string_list" which bears no
resemblence to the "struct string_list" we use elsewhere in
git. This causes the compiler to complain if git's
string_list ever becomes part of cache.h.

Let's just drop the dead code.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

Git 1.7.8.4

2012-01-18T23:51:00+00:00

Signed-off-by: Junio C Hamano

Merge branch 'maint-1.7.7' into maint

2012-01-18T23:48:46+00:00

* maint-1.7.7:
  Git 1.7.7.6
  diff-index: enable recursive pathspec matching in unpack_trees

Conflicts:
	GIT-VERSION-GEN

Git 1.7.7.6

2012-01-18T23:46:31+00:00

Signed-off-by: Junio C Hamano

diff-index: enable recursive pathspec matching in unpack_trees

2012-01-18T23:44:02+00:00

The pathspec structure has a few bits of data to drive various operation
modes after we unified the pathspec matching logic in various codepaths.
For example, max_depth field is there so that "git grep" can limit the
output for files found in limited depth of tree traversal. Also in order
to show just the surface level differences in "git diff-tree", recursive
field stops us from descending into deeper level of the tree structure
when it is set to false, and this also affects pathspec matching when
we have wildcards in the pathspec.

The diff-index has always wanted the recursive behaviour, and wanted to
match pathspecs without any depth limit. But we forgot to do so when we
updated tree_entry_interesting() logic to unify the pathspec matching
logic.

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano