delta/git.git, branch js/diff-highlight-avoid-sigpipe

diff-highlight: exit when a pipe is broken

2014-11-04T21:18:35+00:00

While using diff-highlight with other tools, I have discovered that Python
ignores SIGPIPE by default.  Unfortunately, this also means that tools
attempting to launch a pager under Python--and don't realize this is
happening--means that the subprocess inherits this setting.  In this case, it
means diff-highlight will be launched with SIGPIPE being ignored.  Let's work
with those broken scripts by restoring the default SIGPIPE handler.

Signed-off-by: John Szakmeister 
Acked-by: Jeff King 
Signed-off-by: Junio C Hamano

git-tag.txt: Add a missing hyphen to `-s`

2014-10-07T18:08:06+00:00

Signed-off-by: Wieland Hoffmann 
Signed-off-by: Junio C Hamano

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

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.8.5.5

2014-02-13T21:41:53+00:00

Signed-off-by: Junio C Hamano

Merge branch 'bm/merge-base-octopus-dedup' into maint

2014-02-13T21:38:59+00:00

"git merge-base --octopus" used to leave cleaning up suboptimal
result to the caller, but now it does the clean-up itself.

* bm/merge-base-octopus-dedup:
  merge-base --octopus: reduce the result from get_octopus_merge_bases()
  merge-base: separate "--independent" codepath into its own helper

Merge branch 'jc/revision-range-unpeel' into maint

2014-02-13T21:38:47+00:00

"git log --left-right A...B" lost the "leftness" of commits
reachable from A when A is a tag as a side effect of a recent
bugfix.  This is a regression in 1.8.4.x series.

* jc/revision-range-unpeel:
  revision: propagate flag bits from tags to pointees
  revision: mark contents of an uninteresting tree uninteresting

Merge branch 'jk/allow-fetch-onelevel-refname' into maint

2014-02-13T21:38:34+00:00

"git clone" would fail to clone from a repository that has a ref
directly under "refs/", e.g. "refs/stash", because different
validation paths do different things on such a refname.  Loosen the
client side's validation to allow such a ref.

* jk/allow-fetch-onelevel-refname:
  fetch-pack: do not filter out one-level refs