Signed-off-by: NThynson <lanxingcan@gmail.com>
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

Signed-off-by: NThynson <lanxingcan@gmail.com>
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

Signed-off-by: NThynson <lanxingcan@gmail.com>

Signed-off-by: Nws3389 <willsmith3389@gmail.com>
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

l10n: translation for Simplified Chinese.
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

Update file 'po/git.pot' to v1.7.9.2-315-g25a78 (Merge branch 'maint'),
with 12 new string additions.
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

* maint:
  Update draft release notes to 1.7.9.3
  CodingGuidelines: do not use 'which' in shell scripts
  CodingGuidelines: Add a note about spaces after redirection
  post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctly
  post-receive-email: remove unused variable

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* pj/remote-set-branches-usage-fix:
  remote: fix set-branches usage and documentation

Conflicts:
	builtin/remote.c

* jn/gitweb-unborn-head:
  gitweb: Fix "heads" view when there is no current branch

* jn/ancient-meld-support:
  mergetools/meld: Use --help output to detect --output support

* tr/merge-edit-guidance:
  merge: add instructions to the commit message when editing

During the code review of a recent patch, it was noted that shell scripts
must not use 'which $cmd' to check the availability of the command $cmd.
The output of the command is not machine parseable and its exit code is
not reliable across platforms.

It is better to use 'type' to accomplish this task.
Signed-off-by: NTim Henigan <tim.henigan@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

During code review of some patches, it was noted that redirection operators
should have space before, but no space after them.
Signed-off-by: NTim Henigan <tim.henigan@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Without the magic line, prove shows lots and lots of errors:
% prove ./t9804-git-p4-label.sh
./t9804-git-p4-label.sh .. syntax error at ./t9804-git-p4-label.sh line 3, near ". ."
...

When #!/bin/sh is added, tests are skipped (I have no p4d).
Signed-off-by: NZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Earlier, fba4f1 (grep -P: Fix matching ^ and $) fixed an ancient bug.  Add
some tests to protect the change from future breakages; a slightly broken
version of this was a part of the originally submitted patch.
Signed-off-by: NMichał Kiedrowicz <michal.kiedrowicz@gmail.com>
Signed-off-by: NZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NMichael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

prep_for_email neither is passed a fourth argument nor uses it.
Signed-off-by: NMichael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

The option was already shown in -h output, so it should be documented
in the man page.
Signed-off-by: NZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Suggested-by: NDavid A. Greene <greened@obbligato.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NYichao Yu <yyc1992@gmail.com>
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

Signed-off-by: NRiku <lu.riku@gmail.com>
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* jn/gitweb-search-optim:
  gitweb: Faster project search
  gitweb: Option for filling only specified info in fill_project_list_info
  gitweb: Refactor checking if part of project info need filling

* tr/maint-bundle-long-subject:
  t5704: match tests to modern style
  strbuf: improve strbuf_get*line documentation
  bundle: use a strbuf to scan the log for boundary commits
  bundle: put strbuf_readline_fd in strbuf.c with adjustments

* sp/smart-http-failure-to-push:
  : Mask SIGPIPE on the command channel going to a transport helper
  disconnect from remote helpers more gently

Conflicts:
	transport-helper.c

* fc/push-prune:
  push: add '--prune' option
  remote: refactor code into alloc_delete_ref()
  remote: reorganize check_pattern_match()
  remote: use a local variable in match_push_refs()

Conflicts:
	builtin/push.c

* jc/doc-merge-options:
  Documentation/merge-options.txt: group "ff" related options together

* jk/maint-avoid-streaming-filtered-contents:
  do not stream large files to pack when filters are in use
  teach dry-run convert_to_git not to require a src buffer
  teach convert_to_git a "dry run" mode

* jb/filter-ignore-sigpipe:
  Ignore SIGPIPE when running a filter driver

It looks like commit 99fb6e04 (pack-objects: convert to use
parse_options(), 2012-02-01) moved the #ifdef NO_PTHREDS around but
hasn't noticed that the 'arg' variable no longer is available.
Signed-off-by: NMichał Kiedrowicz <michal.kiedrowicz@gmail.com>
Acked-by: NNguyen Thai Ngoc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* maint:
  Document accumulated fixes since 1.7.9.2
  Git 1.7.8.5
  grep -P: Fix matching ^ and $
  am: don't infloop for an empty input file
  rebase -m: only call "notes copy" when rewritten exists and is non-empty
  git-p4: remove bash-ism in t9800
  git-p4: remove bash-ism in t9809
  git-p4: fix submit regression with clientSpec and subdir clone
  git-p4: set useClientSpec variable on initial clone
  Makefile: add thread-utils.h to LIB_H

Conflicts:
	RelNotes
	t/t9809-git-p4-client-view.sh

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* jc/add-refresh-unmerged:
  refresh_index: do not show unmerged path that is outside pathspec

* js/configure-libintl:
  configure: don't use -lintl when there is no gettext support

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

When "git grep" is run with -P/--perl-regexp, it doesn't match ^ and $ at
the beginning/end of the line.  This is because PCRE normally matches ^
and $ at the beginning/end of the whole text, not for each line, and "git
grep" passes a large chunk of text (possibly containing many lines) to
pcre_exec() and then splits the text into lines.

This makes "git grep -P" behave differently from "git grep -E" and also
from "grep -P" and "pcregrep":

	$ cat file
	a
	 b
	$ git grep --no-index -P '^ ' file
	$ git grep --no-index -E '^ ' file
	file: b
	$ grep -c -P '^ ' file
	 b
	$ pcregrep -c '^ ' file
	 b
Reported-by: NZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: NMichał Kiedrowicz <michal.kiedrowicz@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

git-am.sh's check_patch_format function would attempt to preview
the patch to guess its format, but would go into an infinite loop
when the patch file happened to be empty.  The solution: exit the
loop when "read" fails, not when the line var, "$l1" becomes empty.
Signed-off-by: NJim Meyering <meyering@redhat.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>