git/builtin, branch v2.4.6

Merge branch 'mh/fsck-reflog-entries' into maint

2015-07-15T18:41:19Z

"git fsck" used to ignore missing or invalid objects recorded in reflog. * mh/fsck-reflog-entries: fsck: report errors if reflog entries point at invalid objects fsck_handle_reflog_sha1(): new function

Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maint

2015-07-15T18:41:16Z

"git format-patch --ignore-if-upstream A..B" did not like to be fed tags as boundary commits. * jc/do-not-feed-tags-to-clear-commit-marks: format-patch: do not feed tags to clear_commit_marks()

Merge branch 'jk/clone-dissociate' into maint

2015-06-16T21:33:52Z

Code clean-up. * jk/clone-dissociate: clone: reorder --dissociate and --reference options clone: use OPT_STRING_LIST for --reference

Merge branch 'ah/usage-strings' into maint

2015-06-16T21:33:50Z

A few usage string updates. * ah/usage-strings: blame, log: format usage strings similarly to those in documentation

Merge branch 'rs/janitorial' into maint

2015-06-16T21:33:47Z

Code clean-up. * rs/janitorial: dir: remove unused variable sb clean: remove unused variable buf use file_exists() to check if a file exists in the worktree

Merge branch 'dt/clean-pathspec-filter-then-lstat' into maint

2015-06-16T21:33:46Z

"git clean pathspec..." tried to lstat(2) and complain even for paths outside the given pathspec. * dt/clean-pathspec-filter-then-lstat: clean: only lstat files in pathspec

fsck: report errors if reflog entries point at invalid objects

2015-06-08T19:40:36Z

Previously, if a reflog entry's old or new SHA-1 was not resolvable to an object, that SHA-1 was silently ignored. Instead, report such cases as errors. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

fsck_handle_reflog_sha1(): new function

2015-06-08T19:37:32Z

New function, extracted from fsck_handle_reflog_ent(). The extra is_null_sha1() test for the new reference is currently unnecessary, as reflogs are deleted when the reference itself is deleted. But it doesn't hurt, either. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

Merge branch 'dl/branch-error-message' into maint

2015-06-05T19:00:29Z

Error messages from "git branch" called remote-tracking branches as "remote branches". * dl/branch-error-message: branch: do not call a "remote-tracking branch" a "remote branch"

Merge branch 'ps/bundle-verify-arg' into maint

2015-06-05T19:00:18Z

"git bundle verify" did not diagnose extra parameters on the command line. * ps/bundle-verify-arg: bundle: verify arguments more strictly