delta/git.git, branch rs/sha1-array-test

sha1-lookup: handle duplicates in sha1_pos()

2014-10-01T20:32:19+00:00

If the first 18 bytes of the SHA1's of all entries are the same then
sha1_pos() dies and reports that the lower and upper limits of the
binary search were the same that this wasn't supposed to happen.  This
is wrong because the remaining two bytes could still differ.

Furthermore: It wouldn't be a problem if they actually were the same,
i.e. if all entries have the same SHA1.  The code already handles
duplicates just fine.  Simply remove the erroneous check.

Signed-off-by: Rene Scharfe 
Acked-by: Jeff King 
Signed-off-by: Junio C Hamano

sha1-array: add test-sha1-array and basic tests

2014-10-01T20:32:10+00:00

Helped-by: Jeff King 
Helped-by: Eric Sunshine 
Signed-off-by: Rene Scharfe 
Acked-by: Jeff King 
Signed-off-by: Junio C Hamano

Merge branch 'maint-1.8.5' into maint-1.9

2014-07-22T17:16:50+00:00

* maint-1.8.5:
  Documentation: fix missing text for rev-parse --verify

Documentation: fix missing text for rev-parse --verify

2014-07-22T17:10:57+00:00

The caret (^) is used as a markup symbol in AsciiDoc.  Due to the
inability of AsciiDoc to parse a line containing an unmatched caret, it
omitted the line from the output, resulting in the man page missing the
end of a sentence.  Escape this caret so that the man page ends up with
the complete text.

Signed-off-by: brian m. carlson 
Signed-off-by: Junio C Hamano

Merge branch 'maint-1.8.5' into maint-1.9

2014-07-16T18:10:30+00:00

* maint-1.8.5:
  annotate: use argv_array
  t7300: repair filesystem permissions with test_when_finished
  enums: remove trailing ',' after last item in enum

annotate: use argv_array

2014-07-16T18:10:11+00:00

Simplify the code and get rid of some magic constants by using
argv_array to build the argument list for cmd_blame.  Be lazy and let
the OS release our allocated memory, as before.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

t7300: repair filesystem permissions with test_when_finished

2014-07-02T19:51:38+00:00

We create a directory that cannot be removed, confirm that
it cannot be removed, and then fix it like:

  chmod 0 foo &&
  test_must_fail git clean -d -f &&
  chmod 755 foo

If the middle step fails but leaves the directory (e.g., the
bug is that clean does not notice the failure), this
pollutes the test repo with an unremovable directory. Not
only does this cause further tests to fail, but it means
that "rm -rf" fails on the whole trash directory, and the
user has to intervene manually to even re-run the test script.

We can bump the "chmod 755" recovery to a test_when_finished
block to be sure that it always runs.

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

enums: remove trailing ',' after last item in enum

2014-07-02T19:37:05+00:00

Signed-off-by: Ronnie Sahlberg 
Signed-off-by: Junio C Hamano

Git 1.9.4

2014-05-30T17:13:41+00:00

This is expected to be the final maintenance release for 1.9 series,
merging the remaining fixes that are relevant and are already in 2.0.

Signed-off-by: Junio C Hamano

Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint

2014-05-28T22:46:36+00:00

* rh/prompt-pcmode-avoid-eval-on-refname:
  git-prompt.sh: don't assume the shell expands the value of PS1