delta/git.git, branch nd/git-dir-pointing-at-gitfile

Make setup_git_env() resolve .git file when $GIT_DIR is not specified

2013-09-03T18:14:58+00:00

This makes reinitializing on a .git file repository work.

This is probably the only case that setup_git_env() (via
set_git_dir()) is called on a .git file. Other cases in
setup_git_dir_gently() and enter_repo() both cover .git file case
explicitly because they need to verify the target repo is valid.

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

parse-options: fix clang opterror() -Wunused-value warning

2013-08-09T16:27:44+00:00

a469a1019352b8ef (silence some -Wuninitialized false positives;
2012-12-15) triggered "unused value" warnings when the return value of
opterror() and several other error-related functions was not used.
5ded807f7c0be10e (fix clang -Wunused-value warnings for error functions;
2013-01-16) applied a fix by adding #if !defined(__clang__) in cache.h
and git-compat-util.h, but misspelled it as #if !defined(clang) in
parse-options.h. Fix this.

This mistake went unnoticed because existing callers of opterror()
utilize its return value.  1158826394e162c5 (parse-options: add
OPT_CMDMODE(); 2013-07-30), however, adds a new invocation of opterror()
which ignores the return value, thus triggering the "unused value"
warning.

Signed-off-by: Eric Sunshine 
Signed-off-by: Junio C Hamano

fix typo in documentation of git-svn

2013-08-05T16:39:01+00:00

Signed-off-by: Felix Gruber 
Signed-off-by: Junio C Hamano

Documentation/rev-list-options: add missing word in --*-parents

2013-08-05T15:47:06+00:00

A commit has "parent commits" or "parents", not "commits".

Signed-off-by: Torstein Hegge 
Signed-off-by: Junio C Hamano

log doc: the argument to --encoding is not optional

2013-08-05T15:19:47+00:00

 $ git log --encoding
 fatal: Option '--encoding' requires a value
 $ git rev-list --encoding
 fatal: Option '--encoding' requires a value

The argument to --encoding has always been mandatory.  Unfortunately
manpages like git-rev-list(1), git-log(1), and git-show(1) have
described the option's syntax as "--encoding[=]" since it
was first documented.  Clarify by removing the extra brackets.

Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

Git 1.8.3.4

2013-07-22T18:21:34+00:00

Signed-off-by: Junio C Hamano

update URL to the marc.info mail archive

2013-07-22T17:11:18+00:00

The name marc.theaimsgroup.com is no longer active, and has
migrated to marc.info.

Signed-off-by: Ondřej Bílka 
Signed-off-by: Junio C Hamano

Update draft release notes to 1.8.3.4

2013-07-22T06:03:19+00:00

Signed-off-by: Junio C Hamano

Merge branch 'rr/maint-fetch-tag-doc-asterisks' into maint

2013-07-22T05:51:45+00:00

* rr/maint-fetch-tag-doc-asterisks:
  fetch-options.txt: prevent a wildcard refspec from getting misformatted

Merge branch 'dk/maint-t5150-dirname' into maint

2013-07-22T05:51:43+00:00

* dk/maint-t5150-dirname:
  tests: allow sha1's as part of the path