Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into next

* master:
  Update draft release notes to 1.7.10
  merge: do not trust fstat(2) too much when checking interactiveness
  README: point to Documentation/SubmittingPatches
  Document merge.branchdesc configuration variable
  • Loading branch information...
commit 7487774894c880dcaf5e762ac82667abd973caaa 2 parents 8044055 + ba998d3
@gitster gitster authored
25 Documentation/RelNotes/1.7.10.txt
@@ -8,9 +8,20 @@ UI, Workflows & Features
* Improved handling of views, labels and branches in git-p4 (in contrib).
+ * "git-p4" (in contrib) suffered from unnecessary merge conflicts when
+ p4 expanded the embedded $RCS$-like keywords; it can be now told to
+ unexpand them.
+ * Some "git-svn" updates.
* "vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and
support incremental imports.
+ * The configuration mechanism learned an "include" facility; an
+ assignment to the include.path pseudo-variable causes the named
+ file to be included in-place when Git looks up configuration
+ variables.
* "git am" learned to pass "-b" option to underlying "git mailinfo", so
that bracketed string other than "PATCH" at the beginning can be kept.
@@ -60,6 +71,9 @@ Internal Implementation (please report possible regressions)
* The test suite supports the new "test_pause" helper function.
+ * Parallel to the test suite, there is a beginning of performance
+ benchmarking framework.
* t/Makefile is adjusted to prevent newer versions of GNU make from
running tests in seemingly random order.
@@ -73,13 +87,22 @@ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
releases are contained in this release (see release notes to them for
+ * The config.mak.autogen generated by optional autoconf support tried
+ to link the binary with -lintl even when libintl.h is missing from
+ the system.
+ (merge a8356d4 js/configure-libintl later to maint).
+ * "git add --refresh <pathspec>" used to warn about unmerged paths
+ outside the given pathspec.
+ (merge 3d1f148 jc/add-refresh-unmerged later to maint).
* "gitweb" used to drop warnings in the log file when "heads" view is
accessed in a repository whose HEAD does not point at a valid
exec >/var/tmp/1
echo O=$(git describe)
git log --first-parent --oneline ^maint $O..
5 Documentation/git-fmt-merge-msg.txt
@@ -53,6 +53,11 @@ OPTIONS
+ In addition to branch names, populate the log message with
+ the branch description text associated with them. Defaults
+ to false.
In addition to branch names, populate the log message with at
most the specified number of one-line descriptions from the
@@ -42,10 +42,12 @@ including full documentation and Git related tools.
The user discussion and development of Git take place on the Git
mailing list -- everyone is welcome to post bug reports, feature
-requests, comments and patches to To subscribe
-to the list, send an email with just "subscribe git" in the body to The mailing list archives are available at
- and other archival sites.
+requests, comments and patches to (read
+Documentation/SubmittingPatches for instructions on patch submission).
+To subscribe to the list, send an email with just "subscribe git" in
+the body to The mailing list archives are
+available at and other archival
The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and
2  builtin/merge.c
@@ -1129,7 +1129,7 @@ static int default_edit_option(void)
/* Use editor if stdin and stdout are the same and is a tty */
return (!fstat(0, &st_stdin) &&
!fstat(1, &st_stdout) &&
- isatty(0) &&
+ isatty(0) && isatty(1) &&
st_stdin.st_dev == st_stdout.st_dev &&
st_stdin.st_ino == st_stdout.st_ino &&
st_stdin.st_mode == st_stdout.st_mode);
Please sign in to comment.
Something went wrong with that request. Please try again.