summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Collapse)AuthorAgeFilesLines
* read-tree: replace bracket set with parentheses to clarify usageah/read-tree-usage-stringAlex Henrie2015-08-281-1/+1
| | | | | | | | | -u and -i can only be given if -m, --reset, or --prefix is given. Without parentheses, it looks like -u and -i can be used no matter what, and the second pair of brackets is confusing. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: read-tree: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-19/+19
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: push: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-17/+17
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: prune: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-5/+5
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: prune-packed: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-3/+3
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: pack-refs: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-3/+3
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: pack-objects: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-32/+32
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: notes: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-60/+60
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: name-rev: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-11/+11
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: mv: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-5/+5
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: mktree: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-4/+4
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: merge: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-24/+24
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: merge-file: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-10/+10
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: merge-base: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-6/+6
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: ls-tree: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-11/+11
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: ls-files: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-27/+27
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: log: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-5/+5
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: init-db: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-9/+9
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: help: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-5/+5
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: hash-object: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-8/+8
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: grep: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-45/+45
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: gc: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-6/+6
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: fsck: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-12/+12
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: format-patch: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-33/+33
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: for-each-ref: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-9/+9
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: fmt-merge-msg: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-8/+8
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: fetch: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-24/+24
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: fast-export: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-14/+14
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: describe: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-14/+14
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: config: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-28/+28
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: count-objects: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-2/+2
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: commit: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-39/+39
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: column: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-8/+8
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: clone: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-28/+28
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: clean: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-9/+9
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: cherry: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-2/+2
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: checkout: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-20/+20
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: checkout-index: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-12/+12
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: check-attr: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-6/+6
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: cat-file: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-10/+10
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: branch: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-28/+28
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: blame: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-23/+23
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: add: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-13/+13
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: bisect--helper: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-3/+3
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* i18n: archive: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-6/+6
| | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'jk/maint-checkout-orphan-check-fix'Junio C Hamano2012-07-271-1/+1
|\ | | | | | | | | | | | | | | | | "git checkout <branchname>" to come back from a detached HEAD state incorrectly computed reachability of the detached HEAD, resulting in unnecessary warnings. * jk/maint-checkout-orphan-check-fix: checkout: don't confuse ref and object flags
| * checkout: don't confuse ref and object flagsJeff King2012-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we are leaving a detached HEAD, we do a revision traversal to check whether we are orphaning any commits, marking the commit we're leaving as the start of the traversal, and all existing refs as uninteresting. Prior to commit 468224e5, we did so by calling for_each_ref, and feeding each resulting refname to setup_revisions. Commit 468224e5 refactored this to simply mark the pending objects, saving an extra lookup. However, it confused the "flags" parameter to the each_ref_fn clalback, which is about the flags we found while looking up the ref with the object flag. Because REF_ISSYMREF ("this ref is a symbolic ref, e.g. refs/remotes/origin/HEAD") happens to be the same bit pattern as SEEN ("we have picked this object up from the pending list and moved it to revs.commits list"), we incorrectly reported that a commit previously at the detached HEAD will become unreachable if the only ref that can reach the commit happens to be pointed at by a symbolic ref. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'jk/maint-commit-check-committer-early'Junio C Hamano2012-07-241-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | "git commit --amend" let the user edit the log message and then died when the human-readable committer name was given insufficiently by getpwent(3). * jk/maint-commit-check-committer-early: commit: check committer identity more strictly
| * | commit: check committer identity more strictlyJeff King2012-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The identity of the committer will ultimately be pulled from the ident code by commit_tree(). However, we make an attempt to check the author and committer identity early, before the user has done any manual work like inputting a commit message. That lets us abort without them having to worry about salvaging the work from .git/COMMIT_EDITMSG. The early check for committer ident does not use the IDENT_STRICT flag, meaning that it would not find an empty name field. The motivation was presumably because we did not want to be too restrictive, as later calls might be more lax (for example, when we create the reflog entry, we do not care too much about a real name). However, because commit_tree will always get a strict identity to put in the commit object itself, there is no point in being lax only to die later (and in fact it is harmful, because the user will have wasted time typing their commit message). Incidentally, this bug was masked prior to 060d4bb, as the initial loose call would taint the later strict call. So the commit would succeed (albeit with a bogus committer line in the commit object), and nobody noticed that our early check did not match the later one. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'kk/maint-commit-tree'Junio C Hamano2012-07-231-3/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | * kk/maint-commit-tree: Revert "git-commit-tree(1): update synopsis" commit-tree: resurrect command line parsing updates
View Lorry Controller Status