summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap2
-rw-r--r--.travis.yml7
-rw-r--r--Documentation/RelNotes/2.10.0.txt675
-rw-r--r--Documentation/RelNotes/2.10.1.txt131
-rw-r--r--Documentation/RelNotes/2.10.2.txt111
-rw-r--r--Documentation/RelNotes/2.10.3.txt48
-rw-r--r--Documentation/RelNotes/2.3.10.txt2
-rw-r--r--Documentation/RelNotes/2.4.10.txt2
-rw-r--r--Documentation/RelNotes/2.5.4.txt2
-rw-r--r--Documentation/RelNotes/2.6.1.txt2
-rw-r--r--Documentation/config.txt146
-rw-r--r--Documentation/git-add.txt7
-rw-r--r--Documentation/git-am.txt3
-rw-r--r--Documentation/git-check-ref-format.txt4
-rw-r--r--Documentation/git-checkout.txt12
-rw-r--r--Documentation/git-commit.txt6
-rw-r--r--Documentation/git-cvsimport.txt2
-rw-r--r--Documentation/git-fast-import.txt2
-rw-r--r--Documentation/git-fetch.txt51
-rw-r--r--Documentation/git-fmt-merge-msg.txt4
-rw-r--r--Documentation/git-fsck.txt9
-rw-r--r--Documentation/git-log.txt4
-rw-r--r--Documentation/git-ls-files.txt3
-rw-r--r--Documentation/git-mailsplit.txt7
-rw-r--r--Documentation/git-merge-base.txt26
-rw-r--r--Documentation/git-push.txt8
-rw-r--r--Documentation/git-remote-fd.txt2
-rw-r--r--Documentation/git-repack.txt13
-rw-r--r--Documentation/git-submodule.txt15
-rw-r--r--Documentation/git-svn.txt3
-rw-r--r--Documentation/git-tag.txt5
-rw-r--r--Documentation/git-upload-pack.txt16
-rw-r--r--Documentation/git-worktree.txt49
-rw-r--r--Documentation/git.txt14
-rw-r--r--Documentation/gitattributes.txt62
-rw-r--r--Documentation/gitcvs-migration.txt6
-rw-r--r--Documentation/githooks.txt18
-rw-r--r--Documentation/gitk.txt2
-rw-r--r--Documentation/gitmodules.txt12
-rw-r--r--Documentation/gitrepository-layout.txt2
-rw-r--r--Documentation/gitrevisions.txt6
-rw-r--r--Documentation/howto/revert-a-faulty-merge.txt16
-rw-r--r--Documentation/pretty-formats.txt5
-rw-r--r--Documentation/rev-list-options.txt13
-rw-r--r--Documentation/revisions.txt125
-rw-r--r--Documentation/technical/pack-protocol.txt10
-rw-r--r--Documentation/technical/protocol-capabilities.txt9
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile76
l---------RelNotes2
-rw-r--r--advice.c23
-rw-r--r--archive-tar.c77
-rw-r--r--archive.c12
-rw-r--r--bisect.c63
-rw-r--r--branch.c3
-rw-r--r--branch.h22
-rw-r--r--builtin/add.c47
-rw-r--r--builtin/am.c206
-rw-r--r--builtin/apply.c1438
-rw-r--r--builtin/blame.c33
-rw-r--r--builtin/branch.c34
-rw-r--r--builtin/cat-file.c2
-rw-r--r--builtin/checkout.c27
-rw-r--r--builtin/clone.c23
-rw-r--r--builtin/commit.c16
-rw-r--r--builtin/config.c3
-rw-r--r--builtin/fast-export.c10
-rw-r--r--builtin/fetch.c216
-rw-r--r--builtin/fmt-merge-msg.c2
-rw-r--r--builtin/fsck.c80
-rw-r--r--builtin/gc.c2
-rw-r--r--builtin/index-pack.c10
-rw-r--r--builtin/init-db.c17
-rw-r--r--builtin/interpret-trailers.c2
-rw-r--r--builtin/log.c116
-rw-r--r--builtin/ls-files.c3
-rw-r--r--builtin/mailsplit.c18
-rw-r--r--builtin/merge-base.c3
-rw-r--r--builtin/merge-recursive.c20
-rw-r--r--builtin/merge.c76
-rw-r--r--builtin/mv.c2
-rw-r--r--builtin/notes.c29
-rw-r--r--builtin/pack-objects.c102
-rw-r--r--builtin/pull.c5
-rw-r--r--builtin/push.c21
-rw-r--r--builtin/receive-pack.c192
-rw-r--r--builtin/remote.c29
-rw-r--r--builtin/repack.c12
-rw-r--r--builtin/reset.c8
-rw-r--r--builtin/rev-list.c17
-rw-r--r--builtin/shortlog.c21
-rw-r--r--builtin/submodule--helper.c139
-rw-r--r--builtin/symbolic-ref.c2
-rw-r--r--builtin/unpack-objects.c4
-rw-r--r--builtin/update-index.c22
-rw-r--r--builtin/worktree.c87
-rw-r--r--cache.h77
-rw-r--r--color.c37
-rw-r--r--color.h15
-rw-r--r--combine-diff.c16
-rw-r--r--commit-slab.h8
-rw-r--r--commit.c12
-rw-r--r--commit.h10
-rw-r--r--common-main.c2
-rw-r--r--compat/nedmalloc/nedmalloc.c16
-rw-r--r--compat/strdup.c11
-rw-r--r--config.c231
-rw-r--r--config.mak.uname3
-rw-r--r--configure.ac34
-rw-r--r--connect.c15
-rw-r--r--connected.c71
-rw-r--r--connected.h37
-rw-r--r--contrib/coccinelle/.gitignore1
-rw-r--r--contrib/coccinelle/README2
-rw-r--r--contrib/coccinelle/array.cocci26
-rw-r--r--contrib/coccinelle/free.cocci5
-rw-r--r--contrib/coccinelle/object_id.cocci110
-rw-r--r--contrib/coccinelle/strbuf.cocci40
-rw-r--r--contrib/coccinelle/xstrdup_or_null.cocci7
-rw-r--r--contrib/completion/git-completion.bash157
-rw-r--r--contrib/diff-highlight/Makefile5
-rwxr-xr-xcontrib/diff-highlight/diff-highlight19
-rw-r--r--contrib/diff-highlight/t/.gitignore2
-rw-r--r--contrib/diff-highlight/t/Makefile22
-rwxr-xr-xcontrib/diff-highlight/t/t9400-diff-highlight.sh296
-rw-r--r--contrib/git-jump/README6
-rwxr-xr-xcontrib/git-jump/git-jump8
-rw-r--r--contrib/hooks/multimail/CHANGES59
-rw-r--r--contrib/hooks/multimail/CONTRIBUTING.rst9
-rw-r--r--contrib/hooks/multimail/README89
-rw-r--r--contrib/hooks/multimail/README.Git4
-rw-r--r--contrib/hooks/multimail/doc/troubleshooting.rst34
-rwxr-xr-xcontrib/hooks/multimail/git_multimail.py810
-rw-r--r--contrib/mw-to-git/.perlcriticrc2
-rwxr-xr-xcontrib/mw-to-git/git-remote-mediawiki.perl2
-rwxr-xr-xcontrib/subtree/git-subtree.sh677
-rwxr-xr-xcontrib/subtree/t/t7900-subtree.sh2
-rw-r--r--convert.c97
-rw-r--r--daemon.c25
-rw-r--r--diff.c176
-rw-r--r--diff.h2
-rw-r--r--diffcore-break.c5
-rw-r--r--diffcore-delta.c1
-rw-r--r--diffcore-pickaxe.c18
-rw-r--r--diffcore-rename.c22
-rw-r--r--diffcore.h5
-rw-r--r--dir-iterator.c202
-rw-r--r--dir-iterator.h87
-rw-r--r--dir.h23
-rw-r--r--exec_cmd.c10
-rw-r--r--exec_cmd.h2
-rw-r--r--fast-import.c61
-rw-r--r--fetch-pack.c30
-rw-r--r--fsck.c113
-rw-r--r--fsck.h7
-rwxr-xr-xgit-bisect.sh8
-rw-r--r--git-compat-util.h68
-rw-r--r--git-gui/lib/commit.tcl3
-rw-r--r--git-gui/lib/merge.tcl7
-rw-r--r--git-gui/po/ja.po2747
-rwxr-xr-xgit-merge-octopus.sh25
-rwxr-xr-xgit-p4.py4
-rw-r--r--git-rebase--interactive.sh258
-rwxr-xr-xgit-rebase.sh5
-rwxr-xr-xgit-send-email.perl40
-rw-r--r--git-sh-i18n.sh18
-rw-r--r--git-sh-setup.sh71
-rwxr-xr-xgit-stash.sh5
-rwxr-xr-xgit-submodule.sh67
-rwxr-xr-xgit-svn.perl9
-rw-r--r--git.c8
-rw-r--r--gpg-interface.c94
-rw-r--r--graph.c46
-rw-r--r--grep.c22
-rw-r--r--hex.c20
-rw-r--r--http-backend.c220
-rw-r--r--http-walker.c55
-rw-r--r--http.c173
-rw-r--r--http.h2
-rw-r--r--ident.c2
-rw-r--r--imap-send.c10
-rw-r--r--iterator.h81
-rw-r--r--line-log.c46
-rw-r--r--list.h166
-rw-r--r--log-tree.c75
-rw-r--r--mailinfo.c82
-rw-r--r--mailmap.c6
-rw-r--r--merge-recursive.c766
-rw-r--r--merge-recursive.h8
-rw-r--r--mru.c50
-rw-r--r--mru.h45
-rw-r--r--notes-merge.c46
-rw-r--r--notes.c2
-rw-r--r--pack-check.c7
-rw-r--r--pack-revindex.c2
-rw-r--r--pack-write.c1
-rw-r--r--pager.c32
-rw-r--r--parse-options-cb.c5
-rw-r--r--patch-ids.c125
-rw-r--r--patch-ids.h11
-rw-r--r--path.c5
-rw-r--r--pathspec.c5
-rw-r--r--pathspec.h6
-rw-r--r--perl/Git.pm15
-rw-r--r--perl/Git/SVN.pm33
-rw-r--r--pkt-line.c23
-rw-r--r--po/TEAMS5
-rw-r--r--po/ca.po6013
-rw-r--r--po/de.po5178
-rw-r--r--po/fr.po4868
-rw-r--r--po/git.pot4325
-rw-r--r--po/is.po46
-rw-r--r--po/ko.po4665
-rw-r--r--po/pt_PT.po4924
-rw-r--r--po/ru.po52
-rw-r--r--po/sv.po4834
-rw-r--r--po/vi.po4828
-rw-r--r--po/zh_CN.po4511
-rw-r--r--pretty.c60
-rw-r--r--read-cache.c43
-rw-r--r--ref-filter.c42
-rw-r--r--refs.c97
-rw-r--r--refs.h141
-rw-r--r--refs/files-backend.c1587
-rw-r--r--refs/iterator.c384
-rw-r--r--refs/refs-internal.h321
-rw-r--r--remote.c8
-rw-r--r--revision.c22
-rw-r--r--run-command.c157
-rw-r--r--run-command.h31
-rw-r--r--send-pack.c30
-rw-r--r--send-pack.h3
-rw-r--r--sequencer.c20
-rw-r--r--setup.c34
-rw-r--r--sha1_file.c103
-rw-r--r--shallow.c2
-rw-r--r--shortlog.h1
-rw-r--r--split-index.c6
-rw-r--r--strbuf.c2
-rw-r--r--streaming.c12
-rw-r--r--submodule-config.c22
-rw-r--r--submodule-config.h2
-rw-r--r--submodule.c16
-rw-r--r--t/README8
-rw-r--r--t/helper/test-config.c36
-rw-r--r--t/helper/test-parse-options.c2
-rw-r--r--t/helper/test-submodule-config.c2
-rw-r--r--t/lib-git-svn.sh91
-rw-r--r--t/lib-httpd.sh9
-rw-r--r--t/lib-httpd/apache.conf4
-rw-r--r--t/lib-rebase.sh1
-rw-r--r--t/perf/README12
-rwxr-xr-xt/perf/p3400-rebase.sh36
-rwxr-xr-xt/perf/p4211-line-log.sh6
-rwxr-xr-xt/perf/p5303-many-packs.sh87
-rwxr-xr-xt/perf/p5550-fetch-tags.sh99
-rw-r--r--t/perf/perf-lib.sh5
-rwxr-xr-xt/perf/run8
-rwxr-xr-xt/t0008-ignores.sh4
-rwxr-xr-xt/t0027-auto-crlf.sh6
-rwxr-xr-xt/t0040-parse-options.sh183
-rwxr-xr-xt/t1006-cat-file.sh2
-rwxr-xr-xt/t1011-read-tree-sparse-checkout.sh2
-rwxr-xr-xt/t1300-repo-config.sh8
-rwxr-xr-xt/t1307-config-blob.sh5
-rwxr-xr-xt/t1308-config-set.sh39
-rwxr-xr-xt/t1350-config-hooks-path.sh6
-rwxr-xr-xt/t1400-update-ref.sh43
-rwxr-xr-xt/t1401-symbolic-ref.sh21
-rwxr-xr-xt/t1404-update-ref-df-conflicts.sh107
-rwxr-xr-xt/t1404-update-ref-errors.sh407
-rwxr-xr-xt/t1430-bad-ref-name.sh2
-rwxr-xr-xt/t1450-fsck.sh22
-rwxr-xr-xt/t1503-rev-parse-verify.sh5
-rwxr-xr-xt/t1506-rev-parse-diagnosis.sh2
-rwxr-xr-xt/t2010-checkout-ambiguous.sh11
-rwxr-xr-xt/t2018-checkout-branch.sh2
-rwxr-xr-xt/t2024-checkout-dwim.sh12
-rwxr-xr-xt/t2025-worktree-add.sh24
-rwxr-xr-xt/t2028-worktree-move.sh62
-rwxr-xr-xt/t2107-update-index-basic.sh13
-rwxr-xr-xt/t3101-ls-tree-dirname.sh2
-rwxr-xr-xt/t3200-branch.sh15
-rwxr-xr-xt/t3201-branch-contains.sh2
-rwxr-xr-xt/t3310-notes-merge-manual-resolve.sh8
-rwxr-xr-xt/t3320-notes-merge-worktrees.sh4
-rwxr-xr-xt/t3400-rebase.sh4
-rwxr-xr-xt/t3404-rebase-interactive.sh32
-rwxr-xr-xt/t3415-rebase-autosquash.sh33
-rwxr-xr-xt/t3420-rebase-autostash.sh4
-rwxr-xr-xt/t3700-add.sh114
-rwxr-xr-xt/t4014-format-patch.sh114
-rwxr-xr-xt/t4018-diff-funcname.sh1
-rw-r--r--t/t4018/css-brace-in-col-15
-rw-r--r--t/t4018/css-colon-eol4
-rw-r--r--t/t4018/css-colon-selector5
-rw-r--r--t/t4018/css-common4
-rw-r--r--t/t4018/css-long-selector-list6
-rw-r--r--t/t4018/css-prop-sans-indent5
-rw-r--r--t/t4018/css-short-selector-list4
-rw-r--r--t/t4018/css-trailing-space5
-rwxr-xr-xt/t4026-color.sh9
-rwxr-xr-xt/t4034-diff-words.sh1
-rw-r--r--t/t4034/css/expect16
-rw-r--r--t/t4034/css/post10
-rw-r--r--t/t4034/css/pre10
-rwxr-xr-xt/t4051-diff-function-context.sh25
-rwxr-xr-xt/t4062-diff-pickaxe.sh22
-rwxr-xr-xt/t4150-am.sh20
-rwxr-xr-xt/t4153-am-resume-override-opts.sh2
-rwxr-xr-xt/t4201-shortlog.sh6
-rwxr-xr-xt/t4202-log.sh32
-rwxr-xr-xt/t4207-log-decoration-colors.sh2
-rwxr-xr-xt/t4208-log-magic-pathspec.sh4
-rwxr-xr-xt/t4211-line-log.sh7
-rwxr-xr-xt/t5000-tar-tree.sh74
-rw-r--r--t/t5000/19f9c8273ec45a8938e6999cb59b3ff66739902abin0 -> 2048 bytes
-rw-r--r--t/t5000/huge-and-future.tarbin0 -> 2048 bytes
-rwxr-xr-xt/t5100-mailinfo.sh109
-rw-r--r--t/t5100/0001mboxrd4
-rw-r--r--t/t5100/0002mboxrd5
-rw-r--r--t/t5100/comment.expect5
-rw-r--r--t/t5100/comment.in9
-rw-r--r--t/t5100/quoted-string.expect5
-rw-r--r--t/t5100/quoted-string.in9
-rw-r--r--t/t5100/sample.mboxrd19
-rwxr-xr-xt/t5305-include-tag.sh94
-rwxr-xr-xt/t5505-remote.sh2
-rwxr-xr-xt/t5510-fetch.sh32
-rwxr-xr-xt/t5520-pull.sh50
-rwxr-xr-xt/t5523-push-upstream.sh12
-rwxr-xr-xt/t5526-fetch-submodules.sh35
-rwxr-xr-xt/t5536-fetch-conflicts.sh4
-rwxr-xr-xt/t5541-http-push-smart.sh14
-rwxr-xr-xt/t5544-pack-objects-hook.sh62
-rwxr-xr-xt/t5545-push-options.sh103
-rwxr-xr-xt/t5550-http-fetch-dumb.sh18
-rwxr-xr-xt/t5551-http-fetch-smart.sh15
-rwxr-xr-xt/t5614-clone-submodules.sh52
-rwxr-xr-xt/t6007-rev-list-cherry-pick-file.sh21
-rwxr-xr-xt/t6010-merge-base.sh6
-rwxr-xr-xt/t6018-rev-list-glob.sh2
-rwxr-xr-xt/t6026-merge-attr.sh18
-rwxr-xr-xt/t6030-bisect-porcelain.sh28
-rwxr-xr-xt/t6301-for-each-ref-errors.sh10
-rwxr-xr-xt/t7001-mv.sh8
-rwxr-xr-xt/t7004-tag.sh9
-rwxr-xr-xt/t7006-pager.sh13
-rwxr-xr-xt/t7063-status-untracked-cache.sh2
-rwxr-xr-xt/t7102-reset.sh4
-rwxr-xr-xt/t7201-co.sh2
-rwxr-xr-xt/t7400-submodule-basic.sh2
-rwxr-xr-xt/t7403-submodule-sync.sh4
-rwxr-xr-xt/t7406-submodule-update.sh80
-rwxr-xr-xt/t7411-submodule-config.sh2
-rwxr-xr-xt/t7508-status.sh4
-rwxr-xr-xt/t7510-signed-commit.sh7
-rwxr-xr-xt/t7517-per-repo-email.sh47
-rwxr-xr-xt/t7607-merge-overwrite.sh2
-rwxr-xr-xt/t7701-repack-unpack-unreachable.sh28
-rwxr-xr-xt/t7810-grep.sh2
-rwxr-xr-xt/t8002-blame.sh5
-rwxr-xr-xt/t9000/test.pl8
-rwxr-xr-xt/t9001-send-email.sh29
-rwxr-xr-xt/t9003-help-autocorrect.sh4
-rwxr-xr-xt/t9100-git-svn-basic.sh23
-rwxr-xr-xt/t9115-git-svn-dcommit-funky-renames.sh7
-rwxr-xr-xt/t9118-git-svn-funky-branch-names.sh2
-rwxr-xr-xt/t9120-git-svn-clone-with-percent-escapes.sh2
-rwxr-xr-xt/t9142-git-svn-shallow-clone.sh2
-rwxr-xr-xt/t9158-git-svn-mergeinfo.sh2
-rwxr-xr-xt/t9160-git-svn-preserve-empty-dirs.sh1
-rwxr-xr-xt/t9300-fast-import.sh25
-rwxr-xr-xt/t9302-fast-import-unpack-limit.sh105
-rwxr-xr-xt/t9401-git-cvsserver-crlf.sh2
-rwxr-xr-xt/t9801-git-p4-branch.sh4
-rwxr-xr-xt/t9903-bash-prompt.sh2
-rw-r--r--t/test-lib-functions.sh14
-rw-r--r--t/test-lib.sh48
-rwxr-xr-xt/valgrind/valgrind.sh12
-rwxr-xr-xtemplates/hooks--pre-receive.sample24
-rw-r--r--trace.c55
-rw-r--r--trailer.c11
-rw-r--r--transport-helper.c10
-rw-r--r--transport.c25
-rw-r--r--transport.h7
-rw-r--r--tree-diff.c4
-rw-r--r--unpack-trees.c13
-rw-r--r--upload-pack.c66
-rw-r--r--url.c21
-rw-r--r--usage.c1
-rw-r--r--userdiff.c12
-rw-r--r--vcs-svn/fast_export.c4
-rw-r--r--walker.c10
-rw-r--r--walker.h3
-rw-r--r--worktree.c97
-rw-r--r--worktree.h21
-rw-r--r--wrapper.c52
-rw-r--r--write_or_die.c12
-rw-r--r--wt-status.c26
-rw-r--r--xdiff-interface.c13
-rw-r--r--xdiff/xemit.c11
402 files changed, 42247 insertions, 23467 deletions
diff --git a/.mailmap b/.mailmap
index a714e69..9cc33e9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -33,6 +33,7 @@ Cheng Renquan <crquan@gmail.com>
Chris Shoemaker <c.shoemaker@cox.net>
Chris Wright <chrisw@sous-sol.org> <chrisw@osdl.org>
Cord Seele <cowose@gmail.com> <cowose@googlemail.com>
+Christian Couder <chriscool@tuxfamily.org> <christian.couder@gmail.com>
Christian Stimming <stimming@tuhh.de> <chs@ckiste.goetheallee>
Csaba Henk <csaba@gluster.com> <csaba@lowlife.hu>
Dan Johnson <computerdruid@gmail.com>
@@ -47,6 +48,7 @@ David KÃ¥gedal <davidk@lysator.liu.se>
David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
David S. Miller <davem@davemloft.net>
David Turner <novalis@novalis.org> <dturner@twopensource.com>
+David Turner <novalis@novalis.org> <dturner@twosigma.com>
Deskin Miller <deskinm@umich.edu>
Dirk Süsserott <newsletter@dirk.my1.cc>
Eric Blake <eblake@redhat.com> <ebb9@byu.net>
diff --git a/.travis.yml b/.travis.yml
index 477c3d2..0b2ea5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,8 +31,7 @@ env:
- LINUX_GIT_LFS_VERSION="1.2.0"
- DEFAULT_TEST_TARGET=prove
- GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
- - GIT_TEST_OPTS="--verbose --tee"
- - GIT_TEST_HTTPD=true
+ - GIT_TEST_OPTS="--verbose-log"
- GIT_TEST_CLONE_2GB=YesPlease
# t9810 occasionally fails on Travis CI OS X
# t9816 occasionally fails with "TAP out of sequence errors" on Travis CI OS X
@@ -57,6 +56,8 @@ before_install:
- >
case "${TRAVIS_OS_NAME:-linux}" in
linux)
+ export GIT_TEST_HTTPD=YesPlease
+
mkdir --parents custom/p4
pushd custom/p4
wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4d
@@ -78,7 +79,7 @@ before_install:
FORMULA=$1
SHA=$(brew fetch --force $FORMULA 2>&1 | grep ^SHA256: | cut -d ' ' -f 2)
sed -E -i.bak "s/sha256 \"[0-9a-f]{64}\"/sha256 \"$SHA\"/g" \
- /usr/local/Library/Taps/homebrew/homebrew-binary/$FORMULA.rb
+ "$(brew --repository homebrew/homebrew-binary)/$FORMULA.rb"
}
brew update --quiet
brew tap homebrew/binary --quiet
diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt
new file mode 100644
index 0000000..f4da28a
--- /dev/null
+++ b/Documentation/RelNotes/2.10.0.txt
@@ -0,0 +1,675 @@
+Git 2.10 Release Notes
+======================
+
+Backward compatibility notes
+----------------------------
+
+Updates since v2.9
+------------------
+
+UI, Workflows & Features
+
+ * "git pull --rebase --verify-signature" learned to warn the user
+ that "--verify-signature" is a no-op when rebasing.
+
+ * An upstream project can make a recommendation to shallowly clone
+ some submodules in the .gitmodules file it ships.
+
+ * "git worktree add" learned that '-' can be used as a short-hand for
+ "@{-1}", the previous branch.
+
+ * Update the funcname definition to support css files.
+
+ * The completion script (in contrib/) learned to complete "git
+ status" options.
+
+ * Messages that are generated by auto gc during "git push" on the
+ receiving end are now passed back to the sending end in such a way
+ that they are shown with "remote: " prefix to avoid confusing the
+ users.
+
+ * "git add -i/-p" learned to honor diff.compactionHeuristic
+ experimental knob, so that the user can work on the same hunk split
+ as "git diff" output.
+
+ * "upload-pack" allows a custom "git pack-objects" replacement when
+ responding to "fetch/clone" via the uploadpack.packObjectsHook.
+ (merge b738396 jk/upload-pack-hook later to maint).
+
+ * Teach format-patch and mailsplit (hence "am") how a line that
+ happens to begin with "From " in the e-mail message is quoted with
+ ">", so that these lines can be restored to their original shape.
+ (merge d9925d1 ew/mboxrd-format-am later to maint).
+
+ * "git repack" learned the "--keep-unreachable" option, which sends
+ loose unreachable objects to a pack instead of leaving them loose.
+ This helps heuristics based on the number of loose objects
+ (e.g. "gc --auto").
+ (merge e26a8c4 jk/repack-keep-unreachable later to maint).
+
+ * "log --graph --format=" learned that "%>|(N)" specifies the width
+ relative to the terminal's left edge, not relative to the area to
+ draw text that is to the right of the ancestry-graph section. It
+ also now accepts negative N that means the column limit is relative
+ to the right border.
+
+ * A careless invocation of "git send-email directory/" after editing
+ 0001-change.patch with an editor often ends up sending both
+ 0001-change.patch and its backup file, 0001-change.patch~, causing
+ embarrassment and a minor confusion. Detect such an input and
+ offer to skip the backup files when sending the patches out.
+ (merge 531220b jc/send-email-skip-backup later to maint).
+
+ * "git submodule update" that drives many "git clone" could
+ eventually hit flaky servers/network conditions on one of the
+ submodules; the command learned to retry the attempt.
+
+ * The output coloring scheme learned two new attributes, italic and
+ strike, in addition to existing bold, reverse, etc.
+
+ * "git log" learns log.showSignature configuration variable, and a
+ command line option "--no-show-signature" to countermand it.
+ (merge fce04c3 mj/log-show-signature-conf later to maint).
+
+ * More markings of messages for i18n, with updates to various tests
+ to pass GETTEXT_POISON tests.
+
+ * "git archive" learned to handle files that are larger than 8GB and
+ commits far in the future than expressible by the traditional US-TAR
+ format.
+ (merge 560b0e8 jk/big-and-future-archive-tar later to maint).
+
+
+ * A new configuration variable core.sshCommand has been added to
+ specify what value for GIT_SSH_COMMAND to use per repository.
+
+ * "git worktree prune" protected worktrees that are marked as
+ "locked" by creating a file in a known location. "git worktree"
+ command learned a dedicated command pair to create and remove such
+ a file, so that the users do not have to do this with editor.
+
+ * A handful of "git svn" updates.
+
+ * "git push" learned to accept and pass extra options to the
+ receiving end so that hooks can read and react to them.
+
+ * "git status" learned to suggest "merge --abort" during a conflicted
+ merge, just like it already suggests "rebase --abort" during a
+ conflicted rebase.
+
+ * "git jump" script (in contrib/) has been updated a bit.
+ (merge a91e692 jk/git-jump later to maint).
+
+ * "git push" and "git clone" learned to give better progress meters
+ to the end user who is waiting on the terminal.
+
+ * An entry "git log --decorate" for the tip of the current branch is
+ shown as "HEAD -> name" (where "name" is the name of the branch);
+ the arrow is now painted in the same color as "HEAD", not in the
+ color for commits.
+
+ * "git format-patch" learned format.from configuration variable to
+ specify the default settings for its "--from" option.
+
+ * "git am -3" calls "git merge-recursive" when it needs to fall back
+ to a three-way merge; this call has been turned into an internal
+ subroutine call instead of spawning a separate subprocess.
+
+ * The command line completion scripts (in contrib/) now knows about
+ "git branch --delete/--move [--remote]".
+ (merge 2703c22 vs/completion-branch-fully-spelled-d-m-r later to maint).
+
+ * "git rev-parse --git-path hooks/<hook>" learned to take
+ core.hooksPath configuration variable (introduced during 2.9 cycle)
+ into account.
+ (merge 9445b49 ab/hooks later to maint).
+
+ * "git log --show-signature" and other commands that display the
+ verification status of PGP signature now shows the longer key-id,
+ as 32-bit key-id is so last century.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * "git fast-import" learned the same performance trick to avoid
+ creating too small a packfile as "git fetch" and "git push" have,
+ using *.unpackLimit configuration.
+
+ * When "git daemon" is run without --[init-]timeout specified, a
+ connection from a client that silently goes offline can hang around
+ for a long time, wasting resources. The socket-level KEEPALIVE has
+ been enabled to allow the OS to notice such failed connections.
+
+ * "git upload-pack" command has been updated to use the parse-options
+ API.
+
+ * The "git apply" standalone program is being libified; the first
+ step to move many state variables into a structure that can be
+ explicitly (re)initialized to make the machinery callable more
+ than once has been merged.
+
+ * HTTP transport gained an option to produce more detailed debugging
+ trace.
+ (merge 73e57aa ep/http-curl-trace later to maint).
+
+ * Instead of taking advantage of the fact that a struct string_list
+ that is allocated with all NULs happens to be the INIT_NODUP kind,
+ the users of string_list structures are taught to initialize them
+ explicitly as such, to document their behaviour better.
+ (merge 2721ce2 jk/string-list-static-init later to maint).
+
+ * HTTPd tests learned to show the server error log to help diagnosing
+ a failing tests.
+ (merge 44f243d nd/test-lib-httpd-show-error-log-in-verbose later to maint).
+
+ * The ownership rule for the piece of memory that hold references to
+ be fetched in "git fetch" was screwy, which has been cleaned up.
+
+ * "git bisect" makes an internal call to "git diff-tree" when
+ bisection finds the culprit, but this call did not initialize the
+ data structure to pass to the diff-tree API correctly.
+
+ * Further preparatory clean-up for "worktree" feature continues.
+ (merge 0409e0b nd/worktree-cleanup-post-head-protection later to maint).
+
+ * Formats of the various data (and how to validate them) where we use
+ GPG signature have been documented.
+
+ * A new run-command API function pipe_command() is introduced to
+ sanely feed data to the standard input while capturing data from
+ the standard output and the standard error of an external process,
+ which is cumbersome to hand-roll correctly without deadlocking.
+
+ * The codepath to sign data in a prepared buffer with GPG has been
+ updated to use this API to read from the status-fd to check for
+ errors (instead of relying on GPG's exit status).
+ (merge efee955 jk/gpg-interface-cleanup later to maint).
+
+ * Allow t/perf framework to use the features from the most recent
+ version of Git even when testing an older installed version.
+
+ * The commands in the "log/diff" family have had an FILE* pointer in the
+ data structure they pass around for a long time, but some codepaths
+ used to always write to the standard output. As a preparatory step
+ to make "git format-patch" available to the internal callers, these
+ codepaths have been updated to consistently write into that FILE*
+ instead.
+
+ * Conversion from unsigned char sha1[20] to struct object_id
+ continues.
+
+ * Improve the look of the way "git fetch" reports what happened to
+ each ref that was fetched.
+
+ * The .c/.h sources are marked as such in our .gitattributes file so
+ that "git diff -W" and friends would work better.
+
+ * Code clean-up to avoid using a variable string that compilers may
+ feel untrustable as printf-style format given to write_file()
+ helper function.
+
+ * "git p4" used a location outside $GIT_DIR/refs/ to place its
+ temporary branches, which has been moved to refs/git-p4-tmp/.
+
+ * Existing autoconf generated test for the need to link with pthread
+ library did not check all the functions from pthread libraries;
+ recent FreeBSD has some functions in libc but not others, and we
+ mistakenly thought linking with libc is enough when it is not.
+
+ * When "git fsck" reports a broken link (e.g. a tree object contains
+ a blob that does not exist), both containing object and the object
+ that is referred to were reported with their 40-hex object names.
+ The command learned the "--name-objects" option to show the path to
+ the containing object from existing refs (e.g. "HEAD~24^2:file.txt").
+
+ * Allow http daemon tests in Travis CI tests.
+
+ * Makefile assumed that -lrt is always available on platforms that
+ want to use clock_gettime() and CLOCK_MONOTONIC, which is not a
+ case for recent Mac OS X. The necessary symbols are often found in
+ libc on many modern systems and having -lrt on the command line, as
+ long as the library exists, had no effect, but when the platform
+ removes librt.a that is a different matter--having -lrt will break
+ the linkage.
+
+ This change could be seen as a regression for those who do need to
+ specify -lrt, as they now specifically ask for NEEDS_LIBRT when
+ building. Hopefully they are in the minority these days.
+
+ * Further preparatory work on the refs API before the pluggable
+ backend series can land.
+
+ * Error handling in the codepaths that updates refs has been
+ improved.
+
+ * The API to iterate over all the refs (i.e. for_each_ref(), etc.)
+ has been revamped.
+
+ * The handling of the "text=auto" attribute has been corrected.
+ $ echo "* text=auto eol=crlf" >.gitattributes
+ used to have the same effect as
+ $ echo "* text eol=crlf" >.gitattributes
+ i.e. declaring all files are text (ignoring "auto"). The
+ combination has been fixed to be equivalent to doing
+ $ git config core.autocrlf true
+
+ * Documentation has been updated to show better example usage
+ of the updated "text=auto" attribute.
+
+ * A few tests that specifically target "git rebase -i" have been
+ added.
+
+ * Dumb http transport on the client side has been optimized.
+ (merge ecba195 ew/http-walker later to maint).
+
+ * Users of the parse_options_concat() API function need to allocate
+ extra slots in advance and fill them with OPT_END() when they want
+ to decide the set of supported options dynamically, which makes the
+ code error-prone and hard to read. This has been corrected by tweaking
+ the API to allocate and return a new copy of "struct option" array.
+
+ * "git fetch" exchanges batched have/ack messages between the sender
+ and the receiver, initially doubling every time and then falling
+ back to enlarge the window size linearly. The "smart http"
+ transport, being an half-duplex protocol, outgrows the preset limit
+ too quickly and becomes inefficient when interacting with a large
+ repository. The internal mechanism learned to grow the window size
+ more aggressively when working with the "smart http" transport.
+
+ * Tests for "git svn" have been taught to reuse the lib-httpd test
+ infrastructure when testing the subversion integration that
+ interacts with subversion repositories served over the http://
+ protocol.
+ (merge a8a5d25 ew/git-svn-http-tests later to maint).
+
+ * "git pack-objects" has a few options that tell it not to pack
+ objects found in certain packfiles, which require it to scan .idx
+ files of all available packs. The codepaths involved in these
+ operations have been optimized for a common case of not having any
+ non-local pack and/or any .kept pack.
+
+ * The t3700 test about "add --chmod=-x" have been made a bit more
+ robust and generally cleaned up.
+ (merge 766cdc4 ib/t3700-add-chmod-x-updates later to maint).
+
+ * The build procedure learned PAGER_ENV knob that lists what default
+ environment variable settings to export for popular pagers. This
+ mechanism is used to tweak the default settings to MORE on FreeBSD.
+ (merge 995bc22 ew/build-time-pager-tweaks later to maint).
+
+ * The http-backend (the server-side component of smart-http
+ transport) used to trickle the HTTP header one at a time. Now
+ these write(2)s are batched.
+ (merge b36045c ew/http-backend-batch-headers later to maint).
+
+ * When "git rebase" tries to compare set of changes on the updated
+ upstream and our own branch, it computes patch-id for all of these
+ changes and attempts to find matches. This has been optimized by
+ lazily computing the full patch-id (which is expensive) to be
+ compared only for changes that touch the same set of paths.
+ (merge ba67504 kw/patch-ids-optim later to maint).
+
+ * A handful of tests that were broken under gettext-poison build have
+ been fixed.
+
+ * The recent i18n patch we added during this cycle did a bit too much
+ refactoring of the messages to avoid word-legos; the repetition has
+ been reduced to help translators.
+
+
+Also contains various documentation updates and code clean-ups.
+
+
+Fixes since v2.9
+----------------
+
+Unless otherwise noted, all the fixes since v2.8 in the maintenance
+track are contained in this release (see the maintenance releases'
+notes for details).
+
+ * The commands in `git log` family take %C(auto) in a custom format
+ string. This unconditionally turned the color on, ignoring
+ --no-color or with --color=auto when the output is not connected to
+ a tty; this was corrected to make the format truly behave as
+ "auto".
+
+ * "git rev-list --count" whose walk-length is limited with "-n"
+ option did not work well with the counting optimized to look at the
+ bitmap index.
+
+ * "git show -W" (extend hunks to cover the entire function, delimited
+ by lines that match the "funcname" pattern) used to show the entire
+ file when a change added an entire function at the end of the file,
+ which has been fixed.
+
+ * The documentation set has been updated so that literal commands,
+ configuration variables and environment variables are consistently
+ typeset in fixed-width font and bold in manpages.
+
+ * "git svn propset" subcommand that was added in 2.3 days is
+ documented now.
+
+ * The documentation tries to consistently spell "GPG"; when
+ referring to the specific program name, "gpg" is used.
+
+ * "git reflog" stopped upon seeing an entry that denotes a branch
+ creation event (aka "unborn"), which made it appear as if the
+ reflog was truncated.
+
+ * The git-prompt scriptlet (in contrib/) was not friendly with those
+ who uses "set -u", which has been fixed.
+
+ * compat/regex code did not cleanly compile.
+
+ * A codepath that used alloca(3) to place an unbounded amount of data
+ on the stack has been updated to avoid doing so.
+
+ * "git update-index --add --chmod=+x file" may be usable as an escape
+ hatch, but not a friendly thing to force for people who do need to
+ use it regularly. "git add --chmod=+x file" can be used instead.
+
+ * Build improvements for gnome-keyring (in contrib/)
+
+ * "git status" used to say "working directory" when it meant "working
+ tree".
+
+ * Comments about misbehaving FreeBSD shells have been clarified with
+ the version number (9.x and before are broken, newer ones are OK).
+
+ * "git cherry-pick A" worked on an unborn branch, but "git
+ cherry-pick A..B" didn't.
+
+ * Fix an unintended regression in v2.9 that breaks "clone --depth"
+ that recurses down to submodules by forcing the submodules to also
+ be cloned shallowly, which many server instances that host upstream
+ of the submodules are not prepared for.
+
+ * Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}'
+ to set the default value, without enclosing it in double quotes.
+
+ * Some platform-specific code had non-ANSI strict declarations of C
+ functions that do not take any parameters, which has been
+ corrected.
+
+ * The internal code used to show local timezone offset is not
+ prepared to handle timestamps beyond year 2100, and gave a
+ bogus offset value to the caller. Use a more benign looking
+ +0000 instead and let "git log" going in such a case, instead
+ of aborting.
+
+ * One among four invocations of readlink(1) in our test suite has
+ been rewritten so that the test can run on systems without the
+ command (others are in valgrind test framework and t9802).
+
+ * t/perf needs /usr/bin/time with GNU extension; the invocation of it
+ is updated to "gtime" on Darwin.
+
+ * A bug, which caused "git p4" while running under verbose mode to
+ report paths that are omitted due to branch prefix incorrectly, has
+ been fixed; the command said "Ignoring file outside of prefix" for
+ paths that are _inside_.
+
+ * The top level documentation "git help git" still pointed at the
+ documentation set hosted at now-defunct google-code repository.
+ Update it to point to https://git.github.io/htmldocs/git.html
+ instead.
+
+ * A helper function that takes the contents of a commit object and
+ finds its subject line did not ignore leading blank lines, as is
+ commonly done by other codepaths. Make it ignore leading blank
+ lines to match.
+
+ * For a long time, we carried an in-code comment that said our
+ colored output would work only when we use fprintf/fputs on
+ Windows, which no longer is the case for the past few years.
+
+ * "gc.autoPackLimit" when set to 1 should not trigger a repacking
+ when there is only one pack, but the code counted poorly and did
+ so.
+
+ * Add a test to specify the desired behaviour that currently is not
+ available in "git rebase -Xsubtree=...".
+
+ * More mark-up updates to typeset strings that are expected to
+ literally typed by the end user in fixed-width font.
+
+ * "git commit --amend --allow-empty-message -S" for a commit without
+ any message body could have misidentified where the header of the
+ commit object ends.
+
+ * "git rebase -i --autostash" did not restore the auto-stashed change
+ when the operation was aborted.
+
+ * Git does not know what the contents in the index should be for a
+ path added with "git add -N" yet, so "git grep --cached" should not
+ show hits (or show lack of hits, with -L) in such a path, but that
+ logic does not apply to "git grep", i.e. searching in the working
+ tree files. But we did so by mistake, which has been corrected.
+
+ * "git blame -M" missed a single line that was moved within the file.
+
+ * Fix recently introduced codepaths that are involved in parallel
+ submodule operations, which gave up on reading too early, and
+ could have wasted CPU while attempting to write under a corner
+ case condition.
+
+ * "git grep -i" has been taught to fold case in non-ascii locales
+ correctly.
+
+ * A test that unconditionally used "mktemp" learned that the command
+ is not necessarily available everywhere.
+
+ * There are certain house-keeping tasks that need to be performed at
+ the very beginning of any Git program, and programs that are not
+ built-in commands had to do them exactly the same way as "git"
+ potty does. It was easy to make mistakes in one-off standalone
+ programs (like test helpers). A common "main()" function that
+ calls cmd_main() of individual program has been introduced to
+ make it harder to make mistakes.
+ (merge de61ceb jk/common-main later to maint).
+
+ * The test framework learned a new helper test_match_signal to
+ check an exit code from getting killed by an expected signal.
+
+ * General code clean-up around a helper function to write a
+ single-liner to a file.
+ (merge 7eb6e10 jk/write-file later to maint).
+
+ * One part of "git am" had an oddball helper function that called
+ stuff from outside "his" as opposed to calling what we have "ours",
+ which was not gender-neutral and also inconsistent with the rest of
+ the system where outside stuff is usuall called "theirs" in
+ contrast to "ours".
+
+ * "git blame file" allowed the lineage of lines in the uncommitted,
+ unadded contents of "file" to be inspected, but it refused when
+ "file" did not appear in the current commit. When "file" was
+ created by renaming an existing file (but the change has not been
+ committed), this restriction was unnecessarily tight.
+
+ * "git add -N dir/file && git write-tree" produced an incorrect tree
+ when there are other paths in the same directory that sorts after
+ "file".
+
+ * "git fetch http://user:pass@host/repo..." scrubbed the userinfo
+ part, but "git push" didn't.
+
+ * "git merge" with renormalization did not work well with
+ merge-recursive, due to "safer crlf" conversion kicking in when it
+ shouldn't.
+ (merge 1335d76 jc/renormalize-merge-kill-safer-crlf later to maint).
+
+ * The use of strbuf in "git rm" to build filename to remove was a bit
+ suboptimal, which has been fixed.
+
+ * An age old bug that caused "git diff --ignore-space-at-eol"
+ misbehave has been fixed.
+
+ * "git notes merge" had a code to see if a path exists (and fails if
+ it does) and then open the path for writing (when it doesn't).
+ Replace it with open with O_EXCL.
+
+ * "git pack-objects" and "git index-pack" mostly operate with off_t
+ when talking about the offset of objects in a packfile, but there
+ were a handful of places that used "unsigned long" to hold that
+ value, leading to an unintended truncation.
+
+ * Recent update to "git daemon" tries to enable the socket-level
+ KEEPALIVE, but when it is spawned via inetd, the standard input
+ file descriptor may not necessarily be connected to a socket.
+ Suppress an ENOTSOCK error from setsockopt().
+
+ * Recent FreeBSD stopped making perl available at /usr/bin/perl;
+ switch the default the built-in path to /usr/local/bin/perl on not
+ too ancient FreeBSD releases.
+
+ * "git commit --help" said "--no-verify" is only about skipping the
+ pre-commit hook, and failed to say that it also skipped the
+ commit-msg hook.
+
+ * "git merge" in Git v2.9 was taught to forbid merging an unrelated
+ lines of history by default, but that is exactly the kind of thing
+ the "--rejoin" mode of "git subtree" (in contrib/) wants to do.
+ "git subtree" has been taught to use the "--allow-unrelated-histories"
+ option to override the default.
+
+ * The build procedure for "git persistent-https" helper (in contrib/)
+ has been updated so that it can be built with more recent versions
+ of Go.
+
+ * There is an optimization used in "git diff $treeA $treeB" to borrow
+ an already checked-out copy in the working tree when it is known to
+ be the same as the blob being compared, expecting that open/mmap of
+ such a file is faster than reading it from the object store, which
+ involves inflating and applying delta. This however kicked in even
+ when the checked-out copy needs to go through the convert-to-git
+ conversion (including the clean filter), which defeats the whole
+ point of the optimization. The optimization has been disabled when
+ the conversion is necessary.
+
+ * "git -c grep.patternType=extended log --basic-regexp" misbehaved
+ because the internal API to access the grep machinery was not
+ designed well.
+
+ * Windows port was failing some tests in t4130, due to the lack of
+ inum in the returned values by its lstat(2) emulation.
+
+ * The reflog output format is documented better, and a new format
+ --date=unix to report the seconds-since-epoch (without timezone)
+ has been added.
+ (merge 442f6fd jk/reflog-date later to maint).
+
+ * "git difftool <paths>..." started in a subdirectory failed to
+ interpret the paths relative to that directory, which has been
+ fixed.
+
+ * The characters in the label shown for tags/refs for commits in
+ "gitweb" output are now properly escaped for proper HTML output.
+
+ * FreeBSD can lie when asked mtime of a directory, which made the
+ untracked cache code to fall back to a slow-path, which in turn
+ caused tests in t7063 to fail because it wanted to verify the
+ behaviour of the fast-path.
+
+ * Squelch compiler warnings for nedmalloc (in compat/) library.
+
+ * A small memory leak in the command line parsing of "git blame"
+ has been plugged.
+
+ * The API documentation for hashmap was unclear if hashmap_entry
+ can be safely discarded without any other consideration. State
+ that it is safe to do so.
+
+ * Not-so-recent rewrite of "git am" that started making internal
+ calls into the commit machinery had an unintended regression, in
+ that no matter how many seconds it took to apply many patches, the
+ resulting committer timestamp for the resulting commits were all
+ the same.
+
+ * "git push --force-with-lease" already had enough logic to allow
+ ensuring that such a push results in creation of a ref (i.e. the
+ receiving end did not have another push from sideways that would be
+ discarded by our force-pushing), but didn't expose this possibility
+ to the users. It does so now.
+ (merge 9eed4f3 jk/push-force-with-lease-creation later to maint).
+
+ * The mechanism to limit the pack window memory size, when packing is
+ done using multiple threads (which is the default), is per-thread,
+ but this was not documented clearly.
+ (merge 954176c ms/document-pack-window-memory-is-per-thread later to maint).
+
+ * "import-tars" fast-import script (in contrib/) used to ignore a
+ hardlink target and replaced it with an empty file, which has been
+ corrected to record the same blob as the other file the hardlink is
+ shared with.
+ (merge 04e0869 js/import-tars-hardlinks later to maint).
+
+ * "git mv dir non-existing-dir/" did not work in some environments
+ the same way as existing mainstream platforms. The code now moves
+ "dir" to "non-existing-dir", without relying on rename("A", "B/")
+ that strips the trailing slash of '/'.
+ (merge 189d035 js/mv-dir-to-new-directory later to maint).
+
+ * The "t/" hierarchy is prone to get an unusual pathname; "make test"
+ has been taught to make sure they do not contain paths that cannot
+ be checked out on Windows (and the mechanism can be reusable to
+ catch pathnames that are not portable to other platforms as need
+ arises).
+ (merge c2cafd3 js/test-lint-pathname later to maint).
+
+ * When "git merge-recursive" works on history with many criss-cross
+ merges in "verbose" mode, the names the command assigns to the
+ virtual merge bases could have overwritten each other by unintended
+ reuse of the same piece of memory.
+ (merge 5447a76 rs/pull-signed-tag later to maint).
+
+ * "git checkout --detach <branch>" used to give the same advice
+ message as that is issued when "git checkout <tag>" (or anything
+ that is not a branch name) is given, but asking with "--detach" is
+ an explicit enough sign that the user knows what is going on. The
+ advice message has been squelched in this case.
+ (merge 779b88a sb/checkout-explit-detach-no-advice later to maint).
+
+ * "git difftool" by default ignores the error exit from the backend
+ commands it spawns, because often they signal that they found
+ differences by exiting with a non-zero status code just like "diff"
+ does; the exit status codes 126 and above however are special in
+ that they are used to signal that the command is not executable,
+ does not exist, or killed by a signal. "git difftool" has been
+ taught to notice these exit status codes.
+ (merge 45a4f5d jk/difftool-command-not-found later to maint).
+
+ * On Windows, help.browser configuration variable used to be ignored,
+ which has been corrected.
+ (merge 6db5967 js/no-html-bypass-on-windows later to maint).
+
+ * The "git -c var[=val] cmd" facility to append a configuration
+ variable definition at the end of the search order was described in
+ git(1) manual page, but not in git-config(1), which was more likely
+ place for people to look for when they ask "can I make a one-shot
+ override, and if so how?"
+ (merge ae1f709 dg/document-git-c-in-git-config-doc later to maint).
+
+ * The tempfile (hence its user lockfile) API lets the caller to open
+ a file descriptor to a temporary file, write into it and then
+ finalize it by first closing the filehandle and then either
+ removing or renaming the temporary file. When the process spawns a
+ subprocess after obtaining the file descriptor, and if the
+ subprocess has not exited when the attempt to remove or rename is
+ made, the last step fails on Windows, because the subprocess has
+ the file descriptor still open. Open tempfile with O_CLOEXEC flag
+ to avoid this (on Windows, this is mapped to O_NOINHERIT).
+ (merge 05d1ed6 bw/mingw-avoid-inheriting-fd-to-lockfile later to maint).
+
+ * Correct an age-old calco (is that a typo-like word for calc)
+ in the documentation.
+ (merge 7841c48 ls/packet-line-protocol-doc-fix later to maint).
+
+ * Other minor clean-ups and documentation updates
+ (merge 02a8cfa rs/merge-add-strategies-simplification later to maint).
+ (merge af4941d rs/merge-recursive-string-list-init later to maint).
+ (merge 1eb47f1 rs/use-strbuf-add-unique-abbrev later to maint).
+ (merge ddd0bfa jk/tighten-alloc later to maint).
+ (merge ecf30b2 rs/mailinfo-lib later to maint).
+ (merge 0eb75ce sg/reflog-past-root later to maint).
+ (merge 4369523 hv/doc-commit-reference-style later to maint).
diff --git a/Documentation/RelNotes/2.10.1.txt b/Documentation/RelNotes/2.10.1.txt
new file mode 100644
index 0000000..70462f7
--- /dev/null
+++ b/Documentation/RelNotes/2.10.1.txt
@@ -0,0 +1,131 @@
+Git v2.10.1 Release Notes
+=========================
+
+Fixes since v2.10
+-----------------
+
+ * Clarify various ways to specify the "revision ranges" in the
+ documentation.
+
+ * "diff-highlight" script (in contrib/) learned to work better with
+ "git log -p --graph" output.
+
+ * The test framework left the number of tests and success/failure
+ count in the t/test-results directory, keyed by the name of the
+ test script plus the process ID. The latter however turned out not
+ to serve any useful purpose. The process ID part of the filename
+ has been removed.
+
+ * Having a submodule whose ".git" repository is somehow corrupt
+ caused a few commands that recurse into submodules loop forever.
+
+ * "git symbolic-ref -d HEAD" happily removes the symbolic ref, but
+ the resulting repository becomes an invalid one. Teach the command
+ to forbid removal of HEAD.
+
+ * A test spawned a short-lived background process, which sometimes
+ prevented the test directory from getting removed at the end of the
+ script on some platforms.
+
+ * Update a few tests that used to use GIT_CURL_VERBOSE to use the
+ newer GIT_TRACE_CURL.
+
+ * Update Japanese translation for "git-gui".
+
+ * "git fetch http::/site/path" did not die correctly and segfaulted
+ instead.
+
+ * "git commit-tree" stopped reading commit.gpgsign configuration
+ variable that was meant for Porcelain "git commit" in Git 2.9; we
+ forgot to update "git gui" to look at the configuration to match
+ this change.
+
+ * "git log --cherry-pick" used to include merge commits as candidates
+ to be matched up with other commits, resulting a lot of wasted time.
+ The patch-id generation logic has been updated to ignore merges to
+ avoid the wastage.
+
+ * The http transport (with curl-multi option, which is the default
+ these days) failed to remove curl-easy handle from a curlm session,
+ which led to unnecessary API failures.
+
+ * "git diff -W" output needs to extend the context backward to
+ include the header line of the current function and also forward to
+ include the body of the entire current function up to the header
+ line of the next one. This process may have to merge to adjacent
+ hunks, but the code forgot to do so in some cases.
+
+ * Performance tests done via "t/perf" did not use the same set of
+ build configuration if the user relied on autoconf generated
+ configuration.
+
+ * "git format-patch --base=..." feature that was recently added
+ showed the base commit information after "-- " e-mail signature
+ line, which turned out to be inconvenient. The base information
+ has been moved above the signature line.
+
+ * Even when "git pull --rebase=preserve" (and the underlying "git
+ rebase --preserve") can complete without creating any new commit
+ (i.e. fast-forwards), it still insisted on having a usable ident
+ information (read: user.email is set correctly), which was less
+ than nice. As the underlying commands used inside "git rebase"
+ would fail with a more meaningful error message and advice text
+ when the bogus ident matters, this extra check was removed.
+
+ * "git gc --aggressive" used to limit the delta-chain length to 250,
+ which is way too deep for gaining additional space savings and is
+ detrimental for runtime performance. The limit has been reduced to
+ 50.
+
+ * Documentation for individual configuration variables to control use
+ of color (like `color.grep`) said that their default value is
+ 'false', instead of saying their default is taken from `color.ui`.
+ When we updated the default value for color.ui from 'false' to
+ 'auto' quite a while ago, all of them broke. This has been
+ corrected.
+
+ * A shell script example in check-ref-format documentation has been
+ fixed.
+
+ * "git checkout <word>" does not follow the usual disambiguation
+ rules when the <word> can be both a rev and a path, to allow
+ checking out a branch 'foo' in a project that happens to have a
+ file 'foo' in the working tree without having to disambiguate.
+ This was poorly documented and the check was incorrect when the
+ command was run from a subdirectory.
+
+ * Some codepaths in "git diff" used regexec(3) on a buffer that was
+ mmap(2)ed, which may not have a terminating NUL, leading to a read
+ beyond the end of the mapped region. This was fixed by introducing
+ a regexec_buf() helper that takes a <ptr,len> pair with REG_STARTEND
+ extension.
+
+ * The procedure to build Git on Mac OS X for Travis CI hardcoded the
+ internal directory structure we assumed HomeBrew uses, which was a
+ no-no. The procedure has been updated to ask HomeBrew things we
+ need to know to fix this.
+
+ * When "git rebase -i" is given a broken instruction, it told the
+ user to fix it with "--edit-todo", but didn't say what the step
+ after that was (i.e. "--continue").
+
+ * "git add --chmod=+x" added recently lacked documentation, which has
+ been corrected.
+
+ * "git add --chmod=+x <pathspec>" added recently only toggled the
+ executable bit for paths that are either new or modified. This has
+ been corrected to flip the executable bit for all paths that match
+ the given pathspec.
+
+ * "git pack-objects --include-tag" was taught that when we know that
+ we are sending an object C, we want a tag B that directly points at
+ C but also a tag A that points at the tag B. We used to miss the
+ intermediate tag B in some cases.
+
+ * Documentation around tools to import from CVS was fairly outdated.
+
+ * In the codepath that comes up with the hostname to be used in an
+ e-mail when the user didn't tell us, we looked at ai_canonname
+ field in struct addrinfo without making sure it is not NULL first.
+
+Also contains minor documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.10.2.txt b/Documentation/RelNotes/2.10.2.txt
new file mode 100644
index 0000000..c4d4397
--- /dev/null
+++ b/Documentation/RelNotes/2.10.2.txt
@@ -0,0 +1,111 @@
+Git v2.10.2 Release Notes
+=========================
+
+Fixes since v2.10.1
+-------------------
+
+ * The code that parses the format parameter of for-each-ref command
+ has seen a micro-optimization.
+
+ * The "graph" API used in "git log --graph" miscounted the number of
+ output columns consumed so far when drawing a padding line, which
+ has been fixed; this did not affect any existing code as nobody
+ tried to write anything after the padding on such a line, though.
+
+ * Almost everybody uses DEFAULT_ABBREV to refer to the default
+ setting for the abbreviation, but "git blame" peeked into
+ underlying variable bypassing the macro for no good reason.
+
+ * Doc update to clarify what "log -3 --reverse" does.
+
+ * An author name, that spelled a backslash-quoted double quote in the
+ human readable part "My \"double quoted\" name", was not unquoted
+ correctly while applying a patch from a piece of e-mail.
+
+ * The original command line syntax for "git merge", which was "git
+ merge <msg> HEAD <parent>...", has been deprecated for quite some
+ time, and "git gui" was the last in-tree user of the syntax. This
+ is finally fixed, so that we can move forward with the deprecation.
+
+ * Codepaths that read from an on-disk loose object were too loose in
+ validating what they are reading is a proper object file and
+ sometimes read past the data they read from the disk, which has
+ been corrected. H/t to Gustavo Grieco for reporting.
+
+ * "git worktree", even though it used the default_abbrev setting that
+ ought to be affected by core.abbrev configuration variable, ignored
+ the variable setting. The command has been taught to read the
+ default set of configuration variables to correct this.
+
+ * A low-level function verify_packfile() was meant to show errors
+ that were detected without dying itself, but under some conditions
+ it didn't and died instead, which has been fixed.
+
+ * When "git fetch" tries to find where the history of the repository
+ it runs in has diverged from what the other side has, it has a
+ mechanism to avoid digging too deep into irrelevant side branches.
+ This however did not work well over the "smart-http" transport due
+ to a design bug, which has been fixed.
+
+ * When we started cURL to talk to imap server when a new enough
+ version of cURL library is available, we forgot to explicitly add
+ imap(s):// before the destination. To some folks, that didn't work
+ and the library tried to make HTTP(s) requests instead.
+
+ * The ./configure script generated from configure.ac was taught how
+ to detect support of SSL by libcurl better.
+
+ * http.emptyauth configuration is a way to allow an empty username to
+ pass when attempting to authenticate using mechanisms like
+ Kerberos. We took an unspecified (NULL) username and sent ":"
+ (i.e. no username, no password) to CURLOPT_USERPWD, but did not do
+ the same when the username is explicitly set to an empty string.
+
+ * "git clone" of a local repository can be done at the filesystem
+ level, but the codepath did not check errors while copying and
+ adjusting the file that lists alternate object stores.
+
+ * Documentation for "git commit" was updated to clarify that "commit
+ -p <paths>" adds to the current contents of the index to come up
+ with what to commit.
+
+ * A stray symbolic link in $GIT_DIR/refs/ directory could make name
+ resolution loop forever, which has been corrected.
+
+ * The "submodule.<name>.path" stored in .gitmodules is never copied
+ to .git/config and such a key in .git/config has no meaning, but
+ the documentation described it and submodule.<name>.url next to
+ each other as if both belong to .git/config. This has been fixed.
+
+ * Recent git allows submodule.<name>.branch to use a special token
+ "." instead of the branch name; the documentation has been updated
+ to describe it.
+
+ * In a worktree connected to a repository elsewhere, created via "git
+ worktree", "git checkout" attempts to protect users from confusion
+ by refusing to check out a branch that is already checked out in
+ another worktree. However, this also prevented checking out a
+ branch, which is designated as the primary branch of a bare
+ reopsitory, in a worktree that is connected to the bare
+ repository. The check has been corrected to allow it.
+
+ * "git rebase" immediately after "git clone" failed to find the fork
+ point from the upstream.
+
+ * When fetching from a remote that has many tags that are irrelevant
+ to branches we are following, we used to waste way too many cycles
+ when checking if the object pointed at by a tag (that we are not
+ going to fetch!) exists in our repository too carefully.
+
+ * The Travis CI configuration we ship ran the tests with --verbose
+ option but this risks non-TAP output that happens to be "ok" to be
+ misinterpreted as TAP signalling a test that passed. This resulted
+ in unnecessary failure. This has been corrected by introducing a
+ new mode to run our tests in the test harness to send the verbose
+ output separately to the log file.
+
+ * Some AsciiDoc formatter mishandles a displayed illustration with
+ tabs in it. Adjust a few of them in merge-base documentation to
+ work around them.
+
+Also contains minor documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.10.3.txt b/Documentation/RelNotes/2.10.3.txt
new file mode 100644
index 0000000..277a2a1
--- /dev/null
+++ b/Documentation/RelNotes/2.10.3.txt
@@ -0,0 +1,48 @@
+Git v2.10.3 Release Notes
+=========================
+
+Fixes since v2.10.2
+-------------------
+
+ * Extract a small helper out of the function that reads the authors
+ script file "git am" internally uses.
+ This by itself is not useful until a second caller appears in the
+ future for "rebase -i" helper.
+
+ * The command-line completion script (in contrib/) learned to
+ complete "git cmd ^mas<HT>" to complete the negative end of
+ reference to "git cmd ^master".
+
+ * "git send-email" attempts to pick up valid e-mails from the
+ trailers, but people in real world write non-addresses there, like
+ "Cc: Stable <add@re.ss> # 4.8+", which broke the output depending
+ on the availability and vintage of Mail::Address perl module.
+
+ * The code that we have used for the past 10+ years to cycle
+ 4-element ring buffers turns out to be not quite portable in
+ theoretical world.
+
+ * "git daemon" used fixed-length buffers to turn URL to the
+ repository the client asked for into the server side directory
+ path, using snprintf() to avoid overflowing these buffers, but
+ allowed possibly truncated paths to the directory. This has been
+ tightened to reject such a request that causes overlong path to be
+ required to serve.
+
+ * Recent update to git-sh-setup (a library of shell functions that
+ are used by our in-tree scripted Porcelain commands) included
+ another shell library git-sh-i18n without specifying where it is,
+ relying on the $PATH. This has been fixed to be more explicit by
+ prefixing $(git --exec-path) output in front.
+
+ * Fix for a racy false-positive test failure.
+
+ * Portability update and workaround for builds on recent Mac OS X.
+
+ * Update to the test framework made in 2.9 timeframe broke running
+ the tests under valgrind, which has been fixed.
+
+ * Improve the rule to convert "unsigned char [20]" into "struct
+ object_id *" in contrib/coccinelle/
+
+Also contains minor documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.3.10.txt b/Documentation/RelNotes/2.3.10.txt
index 9d425d8..20c2d2c 100644
--- a/Documentation/RelNotes/2.3.10.txt
+++ b/Documentation/RelNotes/2.3.10.txt
@@ -7,7 +7,7 @@ Fixes since v2.3.9
* xdiff code we use to generate diffs is not prepared to handle
extremely large files. It uses "int" in many places, which can
overflow if we have a very large number of lines or even bytes in
- our input files, for example. Cap the input size to soemwhere
+ our input files, for example. Cap the input size to somewhere
around 1GB for now.
* Some protocols (like git-remote-ext) can execute arbitrary code
diff --git a/Documentation/RelNotes/2.4.10.txt b/Documentation/RelNotes/2.4.10.txt
index 8621199..702d8d4 100644
--- a/Documentation/RelNotes/2.4.10.txt
+++ b/Documentation/RelNotes/2.4.10.txt
@@ -7,7 +7,7 @@ Fixes since v2.4.9
* xdiff code we use to generate diffs is not prepared to handle
extremely large files. It uses "int" in many places, which can
overflow if we have a very large number of lines or even bytes in
- our input files, for example. Cap the input size to soemwhere
+ our input files, for example. Cap the input size to somewhere
around 1GB for now.
* Some protocols (like git-remote-ext) can execute arbitrary code
diff --git a/Documentation/RelNotes/2.5.4.txt b/Documentation/RelNotes/2.5.4.txt
index a5e8477..b8a2f93 100644
--- a/Documentation/RelNotes/2.5.4.txt
+++ b/Documentation/RelNotes/2.5.4.txt
@@ -7,7 +7,7 @@ Fixes since v2.5.4
* xdiff code we use to generate diffs is not prepared to handle
extremely large files. It uses "int" in many places, which can
overflow if we have a very large number of lines or even bytes in
- our input files, for example. Cap the input size to soemwhere
+ our input files, for example. Cap the input size to somewhere
around 1GB for now.
* Some protocols (like git-remote-ext) can execute arbitrary code
diff --git a/Documentation/RelNotes/2.6.1.txt b/Documentation/RelNotes/2.6.1.txt
index 1e51363..f37ea89 100644
--- a/Documentation/RelNotes/2.6.1.txt
+++ b/Documentation/RelNotes/2.6.1.txt
@@ -7,7 +7,7 @@ Fixes since v2.6
* xdiff code we use to generate diffs is not prepared to handle
extremely large files. It uses "int" in many places, which can
overflow if we have a very large number of lines or even bytes in
- our input files, for example. Cap the input size to soemwhere
+ our input files, for example. Cap the input size to somewhere
around 1GB for now.
* Some protocols (like git-remote-ext) can execute arbitrary code
diff --git a/Documentation/config.txt b/Documentation/config.txt
index f4721a0..cbae7a6 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -150,27 +150,34 @@ integer::
1024", "by 1024x1024", etc.
color::
- The value for a variables that takes a color is a list of
- colors (at most two) and attributes (at most one), separated
- by spaces. The colors accepted are `normal`, `black`,
- `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and
- `white`; the attributes are `bold`, `dim`, `ul`, `blink` and
- `reverse`. The first color given is the foreground; the
- second is the background. The position of the attribute, if
- any, doesn't matter. Attributes may be turned off specifically
- by prefixing them with `no` (e.g., `noreverse`, `noul`, etc).
-+
-Colors (foreground and background) may also be given as numbers between
-0 and 255; these use ANSI 256-color mode (but note that not all
-terminals may support this). If your terminal supports it, you may also
-specify 24-bit RGB values as hex, like `#ff0ab3`.
-+
-The attributes are meant to be reset at the beginning of each item
-in the colored output, so setting color.decorate.branch to `black`
-will paint that branch name in a plain `black`, even if the previous
-thing on the same output line (e.g. opening parenthesis before the
-list of branch names in `log --decorate` output) is set to be
-painted with `bold` or some other attribute.
+ The value for a variable that takes a color is a list of
+ colors (at most two, one for foreground and one for background)
+ and attributes (as many as you want), separated by spaces.
++
+The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`,
+`blue`, `magenta`, `cyan` and `white`. The first color given is the
+foreground; the second is the background.
++
+Colors may also be given as numbers between 0 and 255; these use ANSI
+256-color mode (but note that not all terminals may support this). If
+your terminal supports it, you may also specify 24-bit RGB values as
+hex, like `#ff0ab3`.
++
+The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`,
+`italic`, and `strike` (for crossed-out or "strikethrough" letters).
+The position of any attributes with respect to the colors
+(before, after, or in between), doesn't matter. Specific attributes may
+be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`,
+`no-ul`, etc).
++
+For git's pre-defined color slots, the attributes are meant to be reset
+at the beginning of each item in the colored output. So setting
+`color.decorate.branch` to `black` will paint that branch name in a
+plain `black`, even if the previous thing on the same output line (e.g.
+opening parenthesis before the list of branch names in `log --decorate`
+output) is set to be painted with `bold` or some other attribute.
+However, custom log formats may do more complicated and layered
+coloring, and the negated forms may be useful there.
pathname::
A variable that takes a pathname value can be given a
@@ -441,6 +448,13 @@ specify that no proxy be used for a given domain pattern.
This is useful for excluding servers inside a firewall from
proxy use, while defaulting to a common proxy for external domains.
+core.sshCommand::
+ If this variable is set, `git fetch` and `git push` will
+ use the specified command instead of `ssh` when they need to
+ connect to a remote system. The command is in the same form as
+ the `GIT_SSH_COMMAND` environment variable and is overridden
+ when the environment variable is set.
+
core.ignoreStat::
If true, Git will avoid using lstat() calls to detect if files have
changed by setting the "assume-unchanged" bit for those tracked files
@@ -939,7 +953,8 @@ color.branch::
A boolean to enable/disable color in the output of
linkgit:git-branch[1]. May be set to `always`,
`false` (or `never`) or `auto` (or `true`), in which case colors are used
- only when the output is to a terminal. Defaults to false.
+ only when the output is to a terminal. If unset, then the
+ value of `color.ui` is used (`auto` by default).
color.branch.<slot>::
Use customized color for branch coloration. `<slot>` is one of
@@ -954,7 +969,8 @@ color.diff::
linkgit:git-log[1], and linkgit:git-show[1] will use color
for all patches. If it is set to `true` or `auto`, those
commands will only use color when output is to the terminal.
- Defaults to false.
+ If unset, then the value of `color.ui` is used (`auto` by
+ default).
+
This does not affect linkgit:git-format-patch[1] or the
'git-diff-{asterisk}' plumbing commands. Can be overridden on the
@@ -977,7 +993,8 @@ color.decorate.<slot>::
color.grep::
When set to `always`, always highlight matches. When `false` (or
`never`), never. When set to `true` or `auto`, use color only
- when the output is written to the terminal. Defaults to `false`.
+ when the output is written to the terminal. If unset, then the
+ value of `color.ui` is used (`auto` by default).
color.grep.<slot>::
Use customized color for grep colorization. `<slot>` specifies which
@@ -1010,7 +1027,8 @@ color.interactive::
and displays (such as those used by "git-add --interactive" and
"git-clean --interactive"). When false (or `never`), never.
When set to `true` or `auto`, use colors only when the output is
- to the terminal. Defaults to false.
+ to the terminal. If unset, then the value of `color.ui` is
+ used (`auto` by default).
color.interactive.<slot>::
Use customized color for 'git add --interactive' and 'git clean
@@ -1026,13 +1044,15 @@ color.showBranch::
A boolean to enable/disable color in the output of
linkgit:git-show-branch[1]. May be set to `always`,
`false` (or `never`) or `auto` (or `true`), in which case colors are used
- only when the output is to a terminal. Defaults to false.
+ only when the output is to a terminal. If unset, then the
+ value of `color.ui` is used (`auto` by default).
color.status::
A boolean to enable/disable color in the output of
linkgit:git-status[1]. May be set to `always`,
`false` (or `never`) or `auto` (or `true`), in which case colors are used
- only when the output is to a terminal. Defaults to false.
+ only when the output is to a terminal. If unset, then the
+ value of `color.ui` is used (`auto` by default).
color.status.<slot>::
Use customized color for status colorization. `<slot>` is
@@ -1187,6 +1207,15 @@ difftool.<tool>.cmd::
difftool.prompt::
Prompt before each invocation of the diff tool.
+fastimport.unpackLimit::
+ If the number of objects imported by linkgit:git-fast-import[1]
+ is below this limit, then the objects will be unpacked into
+ loose object files. However if the number of imported objects
+ equals or exceeds this limit then the pack will be stored as a
+ pack. Storing the pack from a fast-import can make the import
+ operation complete faster, especially on slow filesystems. If
+ not set, the value of `transfer.unpackLimit` is used instead.
+
fetch.recurseSubmodules::
This option can be either set to a boolean value or to 'on-demand'.
Setting it to a boolean changes the behavior of fetch and pull to
@@ -1218,6 +1247,11 @@ fetch.prune::
If true, fetch will automatically behave as if the `--prune`
option was given on the command line. See also `remote.<name>.prune`.
+fetch.output::
+ Control how ref update status is printed. Valid values are
+ `full` and `compact`. Default value is `full`. See section
+ OUTPUT in linkgit:git-fetch[1] for detail.
+
format.attach::
Enable multipart/mixed attachments as the default for
'format-patch'. The value can also be a double quoted string
@@ -1225,6 +1259,16 @@ format.attach::
value as the boundary. See the --attach option in
linkgit:git-format-patch[1].
+format.from::
+ Provides the default value for the `--from` option to format-patch.
+ Accepts a boolean value, or a name and email address. If false,
+ format-patch defaults to `--no-from`, using commit authors directly in
+ the "From:" field of patch mails. If true, format-patch defaults to
+ `--from`, using your committer identity in the "From:" field of patch
+ mails and including a "From:" field in the body of the patch mail if
+ different. If set to a non-boolean value, format-patch uses that
+ value instead of your committer identity. Defaults to false.
+
format.numbered::
A boolean which can enable or disable sequence numbers in patch
subjects. It defaults to "auto" which enables it only if there
@@ -1328,7 +1372,7 @@ fsck.skipList::
gc.aggressiveDepth::
The depth parameter used in the delta compression
algorithm used by 'git gc --aggressive'. This defaults
- to 250.
+ to 50.
gc.aggressiveWindow::
The window size parameter used in the delta compression
@@ -2392,15 +2436,20 @@ rebase.missingCommitsCheck::
command in the todo-list.
Defaults to "ignore".
-rebase.instructionFormat
+rebase.instructionFormat::
A format string, as specified in linkgit:git-log[1], to be used for
the instruction list during an interactive rebase. The format will automatically
have the long commit hash prepended to the format.
receive.advertiseAtomic::
By default, git-receive-pack will advertise the atomic push
- capability to its clients. If you don't want to this capability
- to be advertised, set this variable to false.
+ capability to its clients. If you don't want to advertise this
+ capability, set this variable to false.
+
+receive.advertisePushOptions::
+ By default, git-receive-pack will advertise the push options
+ capability to its clients. If you don't want to advertise this
+ capability, set this variable to false.
receive.autogc::
By default, git-receive-pack will run "git-gc --auto" after
@@ -2455,6 +2504,15 @@ receive.fsck.skipList::
can be safely ignored such as invalid committer email addresses.
Note: corrupt objects cannot be skipped with this setting.
+receive.keepAlive::
+ After receiving the pack from the client, `receive-pack` may
+ produce no output (if `--quiet` was specified) while processing
+ the pack, causing some networks to drop the TCP connection.
+ With this option set, if `receive-pack` does not transmit
+ any data in this phase for `receive.keepAlive` seconds, it will
+ send a short keepalive packet. The default is 5 seconds; set
+ to 0 to disable keepalives entirely.
+
receive.unpackLimit::
If the number of objects received in a push is below this
limit then the objects will be unpacked into loose object
@@ -2747,12 +2805,13 @@ stash.showStat::
option will show diffstat of the stash. Defaults to true.
See description of 'show' command in linkgit:git-stash[1].
-submodule.<name>.path::
submodule.<name>.url::
- The path within this project and URL for a submodule. These
- variables are initially populated by 'git submodule init'. See
- linkgit:git-submodule[1] and linkgit:gitmodules[5] for
- details.
+ The URL for a submodule. This variable is copied from the .gitmodules
+ file to the git config via 'git submodule init'. The user can change
+ the configured URL before obtaining the submodule via 'git submodule
+ update'. After obtaining the submodule, the presence of this variable
+ is used as a sign whether the submodule is of interest to git commands.
+ See linkgit:git-submodule[1] and linkgit:gitmodules[5] for details.
submodule.<name>.update::
The default update procedure for a submodule. This variable
@@ -2881,6 +2940,21 @@ uploadpack.keepAlive::
`uploadpack.keepAlive` seconds. Setting this option to 0
disables keepalive packets entirely. The default is 5 seconds.
+uploadpack.packObjectsHook::
+ If this option is set, when `upload-pack` would run
+ `git pack-objects` to create a packfile for a client, it will
+ run this shell command instead. The `pack-objects` command and
+ arguments it _would_ have run (including the `git pack-objects`
+ at the beginning) are appended to the shell command. The stdin
+ and stdout of the hook are treated as if `pack-objects` itself
+ was run. I.e., `upload-pack` will feed input intended for
+ `pack-objects` to the hook, and expects a completed packfile on
+ stdout.
++
+Note that this configuration variable is ignored if it is seen in the
+repository-level config (this is a safety measure against fetching from
+untrusted repositories).
+
url.<base>.insteadOf::
Any URL that starts with this value will be rewritten to
start, instead, with <base>. In cases where some site serves a
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 6a96a66..7ed63dc 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -11,7 +11,7 @@ SYNOPSIS
'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]
[--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]
[--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing]
- [--] [<pathspec>...]
+ [--chmod=(+|-)x] [--] [<pathspec>...]
DESCRIPTION
-----------
@@ -165,6 +165,11 @@ for "git add --no-all <pathspec>...", i.e. ignored removed files.
be ignored, no matter if they are already present in the work
tree or not.
+--chmod=(+|-)x::
+ Override the executable bit of the added files. The executable
+ bit is only changed in the index, the files on disk are left
+ unchanged.
+
\--::
This option can be used to separate command-line options from
the list of files, (useful when filenames might be mistaken
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 8dd9e4f..12879e4 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -116,7 +116,8 @@ default. You can use `--no-utf8` to override this.
By default the command will try to detect the patch format
automatically. This option allows the user to bypass the automatic
detection and specify the patch format that the patch(es) should be
- interpreted as. Valid formats are mbox, stgit, stgit-series and hg.
+ interpreted as. Valid formats are mbox, mboxrd,
+ stgit, stgit-series and hg.
-i::
--interactive::
diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt
index 91a3622..8611a99 100644
--- a/Documentation/git-check-ref-format.txt
+++ b/Documentation/git-check-ref-format.txt
@@ -118,8 +118,8 @@ $ git check-ref-format --branch @{-1}
* Determine the reference name to use for a new branch:
+
------------
-$ ref=$(git check-ref-format --normalize "refs/heads/$newbranch") ||
-die "we do not like '$newbranch' as a branch name."
+$ ref=$(git check-ref-format --normalize "refs/heads/$newbranch")||
+{ echo "we do not like '$newbranch' as a branch name." >&2 ; exit 1 ; }
------------
GIT
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 7a2201b..8e2c066 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -419,6 +419,18 @@ $ git reflog -2 HEAD # or
$ git log -g -2 HEAD
------------
+ARGUMENT DISAMBIGUATION
+-----------------------
+
+When there is only one argument given and it is not `--` (e.g. "git
+checkout abc"), and when the argument is both a valid `<tree-ish>`
+(e.g. a branch "abc" exists) and a valid `<pathspec>` (e.g. a file
+or a directory whose name is "abc" exists), Git would usually ask
+you to disambiguate. Because checking out a branch is so common an
+operation, however, "git checkout abc" takes "abc" as a `<tree-ish>`
+in such a situation. Use `git checkout -- <pathspec>` if you want
+to checkout these paths out of the index.
+
EXAMPLES
--------
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index b0a294d..f2ab0ee 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -29,7 +29,8 @@ The content to be added can be specified in several ways:
2. by using 'git rm' to remove files from the working tree
and the index, again before using the 'commit' command;
-3. by listing files as arguments to the 'commit' command, in which
+3. by listing files as arguments to the 'commit' command
+ (without --interactive or --patch switch), in which
case the commit will ignore changes staged in the index, and instead
record the current content of the listed files (which must already
be known to Git);
@@ -41,7 +42,8 @@ The content to be added can be specified in several ways:
actual commit;
5. by using the --interactive or --patch switches with the 'commit' command
- to decide one by one which files or hunks should be part of the commit,
+ to decide one by one which files or hunks should be part of the commit
+ in addition to contents in the index,
before finalizing the operation. See the ``Interactive Mode'' section of
linkgit:git-add[1] to learn how to operate these modes.
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 41207a2..de1ebed 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -22,7 +22,7 @@ DESCRIPTION
deprecated; it does not work with cvsps version 3 and later. If you are
performing a one-shot import of a CVS repository consider using
http://cvs2svn.tigris.org/cvs2git.html[cvs2git] or
-https://github.com/BartMassey/parsecvs[parsecvs].
+http://www.catb.org/esr/cvs-fast-export/[cvs-fast-export].
Imports a CVS repository into Git. It will either create a new
repository, or incrementally import into an existing one.
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index c105f21..2b76265 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -136,6 +136,8 @@ Performance and Compression Tuning
Maximum size of each output packfile.
The default is unlimited.
+fastimport.unpackLimit::
+ See linkgit:git-config[1]
Performance
-----------
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index efe56e0..9e42169 100644
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -99,6 +99,57 @@ The latter use of the `remote.<repository>.fetch` values can be
overridden by giving the `--refmap=<refspec>` parameter(s) on the
command line.
+OUTPUT
+------
+
+The output of "git fetch" depends on the transport method used; this
+section describes the output when fetching over the Git protocol
+(either locally or via ssh) and Smart HTTP protocol.
+
+The status of the fetch is output in tabular form, with each line
+representing the status of a single ref. Each line is of the form:
+
+-------------------------------
+ <flag> <summary> <from> -> <to> [<reason>]
+-------------------------------
+
+The status of up-to-date refs is shown only if the --verbose option is
+used.
+
+In compact output mode, specified with configuration variable
+fetch.output, if either entire `<from>` or `<to>` is found in the
+other string, it will be substituted with `*` in the other string. For
+example, `master -> origin/master` becomes `master -> origin/*`.
+
+flag::
+ A single character indicating the status of the ref:
+(space);; for a successfully fetched fast-forward;
+`+`;; for a successful forced update;
+`-`;; for a successfully pruned ref;
+`t`;; for a successful tag update;
+`*`;; for a successfully fetched new ref;
+`!`;; for a ref that was rejected or failed to update; and
+`=`;; for a ref that was up to date and did not need fetching.
+
+summary::
+ For a successfully fetched ref, the summary shows the old and new
+ values of the ref in a form suitable for using as an argument to
+ `git log` (this is `<old>..<new>` in most cases, and
+ `<old>...<new>` for forced non-fast-forward updates).
+
+from::
+ The name of the remote ref being fetched from, minus its
+ `refs/<type>/` prefix. In the case of deletion, the name of
+ the remote ref is "(none)".
+
+to::
+ The name of the local ref being updated, minus its
+ `refs/<type>/` prefix.
+
+reason::
+ A human-readable explanation. In the case of successfully fetched
+ refs, no explanation is needed. For a failed ref, the reason for
+ failure is described.
EXAMPLES
--------
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 6526b17..44892c4 100644
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -60,10 +60,10 @@ merge.summary::
EXAMPLE
-------
---
+---------
$ git fetch origin master
$ git fmt-merge-msg --log <$GIT_DIR/FETCH_HEAD
---
+---------
Print a log message describing a merge of the "master" branch from
the "origin" remote.
diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt
index 7fc68eb..b9f060e 100644
--- a/Documentation/git-fsck.txt
+++ b/Documentation/git-fsck.txt
@@ -11,7 +11,8 @@ SYNOPSIS
[verse]
'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
[--[no-]full] [--strict] [--verbose] [--lost-found]
- [--[no-]dangling] [--[no-]progress] [--connectivity-only] [<object>*]
+ [--[no-]dangling] [--[no-]progress] [--connectivity-only]
+ [--[no-]name-objects] [<object>*]
DESCRIPTION
-----------
@@ -82,6 +83,12 @@ index file, all SHA-1 references in `refs` namespace, and all reflogs
a blob, the contents are written into the file, rather than
its object name.
+--name-objects::
+ When displaying names of reachable objects, in addition to the
+ SHA-1 also display a name that describes *how* they are reachable,
+ compatible with linkgit:git-rev-parse[1], e.g.
+ `HEAD@{1234567890}~25^2:src/`.
+
--[no-]progress::
Progress status is reported on the standard error stream by
default when it is attached to a terminal, unless
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 4a6c47f..32246fd 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -198,6 +198,10 @@ log.showRoot::
`git log -p` output would be shown without a diff attached.
The default is `true`.
+log.showSignature::
+ If `true`, `git log` and related commands will act as if the
+ `--show-signature` option was passed to them.
+
mailmap.*::
See linkgit:git-shortlog[1].
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 078b556..0d933ac 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -159,8 +159,7 @@ not accessible in the working tree.
+
<eolattr> is the attribute that is used when checking out or committing,
it is either "", "-text", "text", "text=auto", "text eol=lf", "text eol=crlf".
-Note: Currently Git does not support "text=auto eol=lf" or "text=auto eol=crlf",
-that may change in the future.
+Since Git 2.10 "text=auto eol=lf" and "text=auto eol=crlf" are supported.
+
Both the <eolinfo> in the index ("i/<eolinfo>")
and in the working tree ("w/<eolinfo>") are shown for regular files,
diff --git a/Documentation/git-mailsplit.txt b/Documentation/git-mailsplit.txt
index 4d1b871..e3b2a88 100644
--- a/Documentation/git-mailsplit.txt
+++ b/Documentation/git-mailsplit.txt
@@ -8,7 +8,8 @@ git-mailsplit - Simple UNIX mbox splitter program
SYNOPSIS
--------
[verse]
-'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] -o<directory> [--] [(<mbox>|<Maildir>)...]
+'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] [--mboxrd]
+ -o<directory> [--] [(<mbox>|<Maildir>)...]
DESCRIPTION
-----------
@@ -47,6 +48,10 @@ OPTIONS
--keep-cr::
Do not remove `\r` from lines ending with `\r\n`.
+--mboxrd::
+ Input is of the "mboxrd" format and "^>+From " line escaping is
+ reversed.
+
GIT
---
Part of the linkgit:git[1] suite
diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt
index 808426f..b968b64 100644
--- a/Documentation/git-merge-base.txt
+++ b/Documentation/git-merge-base.txt
@@ -80,8 +80,8 @@ which is reachable from both 'A' and 'B' through the parent relationship.
For example, with this topology:
- o---o---o---B
- /
+ o---o---o---B
+ /
---o---1---o---o---o---A
the merge base between 'A' and 'B' is '1'.
@@ -116,11 +116,11 @@ the best common ancestor of all commits.
When the history involves criss-cross merges, there can be more than one
'best' common ancestor for two commits. For example, with this topology:
- ---1---o---A
- \ /
- X
- / \
- ---2---o---o---B
+ ---1---o---A
+ \ /
+ X
+ / \
+ ---2---o---o---B
both '1' and '2' are merge-bases of A and B. Neither one is better than
the other (both are 'best' merge bases). When the `--all` option is not given,
@@ -154,13 +154,13 @@ topic origin/master`, the history of remote-tracking branch
`origin/master` may have been rewound and rebuilt, leading to a
history of this shape:
- o---B1
- /
+ o---B1
+ /
---o---o---B2--o---o---o---B (origin/master)
- \
- B3
- \
- Derived (topic)
+ \
+ B3
+ \
+ Derived (topic)
where `origin/master` used to point at commits B3, B2, B1 and now it
points at B, and your `topic` branch was started on top of it back
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 927a034..47b77e6 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -11,7 +11,7 @@ SYNOPSIS
[verse]
'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]
[--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]
- [-u | --set-upstream]
+ [-u | --set-upstream] [--push-option=<string>]
[--[no-]signed|--sign=(true|false|if-asked)]
[--force-with-lease[=<refname>[:<expect>]]]
[--no-verify] [<repository> [<refspec>...]]
@@ -156,6 +156,12 @@ already exists on the remote side.
Either all refs are updated, or on error, no refs are updated.
If the server does not support atomic pushes the push will fail.
+-o::
+--push-option::
+ Transmit the given string to the server, which passes them to
+ the pre-receive as well as the post-receive hook. The given string
+ must not contain a NUL or LF character.
+
--receive-pack=<git-receive-pack>::
--exec=<git-receive-pack>::
Path to the 'git-receive-pack' program on the remote
diff --git a/Documentation/git-remote-fd.txt b/Documentation/git-remote-fd.txt
index e700baf..80afca8 100644
--- a/Documentation/git-remote-fd.txt
+++ b/Documentation/git-remote-fd.txt
@@ -17,7 +17,7 @@ fetch, push or archive.
If only <infd> is given, it is assumed to be a bidirectional socket connected
to remote Git server (git-upload-pack, git-receive-pack or
-git-upload-achive). If both <infd> and <outfd> are given, they are assumed
+git-upload-archive). If both <infd> and <outfd> are given, they are assumed
to be pipes connected to a remote Git server (<infd> being the inbound pipe
and <outfd> being the outbound pipe.
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index 9597777..26afe6e 100644
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -130,6 +130,19 @@ other objects in that pack they already have locally.
with `-b` or `repack.writeBitmaps`, as it ensures that the
bitmapped packfile has the necessary objects.
+--unpack-unreachable=<when>::
+ When loosening unreachable objects, do not bother loosening any
+ objects older than `<when>`. This can be used to optimize out
+ the write of any objects that would be immediately pruned by
+ a follow-up `git prune`.
+
+-k::
+--keep-unreachable::
+ When used with `-ad`, any unreachable objects from existing
+ packs will be appended to the end of the packfile instead of
+ being removed. In addition, any unreachable loose objects will
+ be packed (and their loose counterparts removed).
+
Configuration
-------------
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 9226c43..d841573 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -15,8 +15,9 @@ SYNOPSIS
'git submodule' [--quiet] init [--] [<path>...]
'git submodule' [--quiet] deinit [-f|--force] (--all|[--] <path>...)
'git submodule' [--quiet] update [--init] [--remote] [-N|--no-fetch]
- [-f|--force] [--rebase|--merge] [--reference <repository>]
- [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]
+ [--[no-]recommend-shallow] [-f|--force] [--rebase|--merge]
+ [--reference <repository>] [--depth <depth>] [--recursive]
+ [--jobs <n>] [--] [<path>...]
'git submodule' [--quiet] summary [--cached|--files] [(-n|--summary-limit) <n>]
[commit] [--] [<path>...]
'git submodule' [--quiet] foreach [--recursive] <command>
@@ -258,7 +259,9 @@ OPTIONS
--branch::
Branch of repository to add as submodule.
The name of the branch is recorded as `submodule.<name>.branch` in
- `.gitmodules` for `update --remote`.
+ `.gitmodules` for `update --remote`. A special value of `.` is used to
+ indicate that the name of the branch in the submodule should be the
+ same name as the current branch in the current repository.
-f::
--force::
@@ -384,6 +387,12 @@ for linkgit:git-clone[1]'s `--reference` and `--shared` options carefully.
clone with a history truncated to the specified number of revisions.
See linkgit:git-clone[1]
+--[no-]recommend-shallow::
+ This option is only valid for the update command.
+ The initial clone of a submodule will use the recommended
+ `submodule.<name>.shallow` as provided by the .gitmodules file
+ by default. To ignore the suggestions use `--no-recommend-shallow`.
+
-j <n>::
--jobs <n>::
This option is only valid for the update command.
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 7e17cad..5f9e65b 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -625,6 +625,9 @@ config key: svn.authorsfile
with the committer name as the first argument. The program is
expected to return a single line of the form "Name <email>",
which will be treated as if included in the authors file.
++
+[verse]
+config key: svn.authorsProg
-q::
--quiet::
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 7ecca8e..80019c5 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -253,9 +253,8 @@ On Automatic following
~~~~~~~~~~~~~~~~~~~~~~
If you are following somebody else's tree, you are most likely
-using remote-tracking branches (`refs/heads/origin` in traditional
-layout, or `refs/remotes/origin/master` in the separate-remote
-layout). You usually want the tags from the other end.
+using remote-tracking branches (eg. `refs/remotes/origin/master`).
+You usually want the tags from the other end.
On the other hand, if you are fetching because you would want a
one-shot merge from somebody else, you typically do not want to
diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt
index 0abc806..822ad59 100644
--- a/Documentation/git-upload-pack.txt
+++ b/Documentation/git-upload-pack.txt
@@ -9,8 +9,8 @@ git-upload-pack - Send objects packed back to git-fetch-pack
SYNOPSIS
--------
[verse]
-'git-upload-pack' [--strict] [--timeout=<n>] <directory>
-
+'git-upload-pack' [--[no-]strict] [--timeout=<n>] [--stateless-rpc]
+ [--advertise-refs] <directory>
DESCRIPTION
-----------
Invoked by 'git fetch-pack', learns what
@@ -25,12 +25,22 @@ repository. For push operations, see 'git send-pack'.
OPTIONS
-------
---strict::
+--[no-]strict::
Do not try <directory>/.git/ if <directory> is no Git directory.
--timeout=<n>::
Interrupt transfer after <n> seconds of inactivity.
+--stateless-rpc::
+ Perform only a single read-write cycle with stdin and stdout.
+ This fits with the HTTP POST request processing model where
+ a program may read the request, write a response, and must exit.
+
+--advertise-refs::
+ Only the initial ref advertisement is output, and the program exits
+ immediately. This fits with the HTTP GET request model, where
+ no request content is received but a response must be produced.
+
<directory>::
The repository to sync from.
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index c622345..e257c19 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -10,8 +10,10 @@ SYNOPSIS
--------
[verse]
'git worktree add' [-f] [--detach] [--checkout] [-b <new-branch>] <path> [<branch>]
-'git worktree prune' [-n] [-v] [--expire <expire>]
'git worktree list' [--porcelain]
+'git worktree lock' [--reason <string>] <worktree>
+'git worktree prune' [-n] [-v] [--expire <expire>]
+'git worktree unlock' <worktree>
DESCRIPTION
-----------
@@ -38,9 +40,8 @@ section "DETAILS" for more information.
If a linked working tree is stored on a portable device or network share
which is not always mounted, you can prevent its administrative files from
-being pruned by creating a file named 'locked' alongside the other
-administrative files, optionally containing a plain text reason that
-pruning should be suppressed. See section "DETAILS" for more information.
+being pruned by issuing the `git worktree lock` command, optionally
+specifying `--reason` to explain why the working tree is locked.
COMMANDS
--------
@@ -48,16 +49,13 @@ add <path> [<branch>]::
Create `<path>` and checkout `<branch>` into it. The new working directory
is linked to the current repository, sharing everything except working
-directory specific files such as HEAD, index, etc.
+directory specific files such as HEAD, index, etc. `-` may also be
+specified as `<branch>`; it is synonymous with `@{-1}`.
+
If `<branch>` is omitted and neither `-b` nor `-B` nor `--detached` used,
then, as a convenience, a new branch based at HEAD is created automatically,
as if `-b $(basename <path>)` was specified.
-prune::
-
-Prune working tree information in $GIT_DIR/worktrees.
-
list::
List details of each worktree. The main worktree is listed first, followed by
@@ -65,6 +63,22 @@ each of the linked worktrees. The output details include if the worktree is
bare, the revision currently checked out, and the branch currently checked out
(or 'detached HEAD' if none).
+lock::
+
+If a working tree is on a portable device or network share which
+is not always mounted, lock it to prevent its administrative
+files from being pruned automatically. This also prevents it from
+being moved or deleted. Optionally, specify a reason for the lock
+with `--reason`.
+
+prune::
+
+Prune working tree information in $GIT_DIR/worktrees.
+
+unlock::
+
+Unlock a working tree, allowing it to be pruned, moved or deleted.
+
OPTIONS
-------
@@ -110,6 +124,18 @@ OPTIONS
--expire <time>::
With `prune`, only expire unused working trees older than <time>.
+--reason <string>::
+ With `lock`, an explanation why the working tree is locked.
+
+<worktree>::
+ Working trees can be identified by path, either relative or
+ absolute.
++
+If the last path components in the working tree's path is unique among
+working trees, it can be used to identify worktrees. For example if
+you only have two working trees, at "/abc/def/ghi" and "/abc/def/ggg",
+then "ghi" or "def/ghi" is enough to point to the former working tree.
+
DETAILS
-------
Each linked working tree has a private sub-directory in the repository's
@@ -150,7 +176,8 @@ instead.
To prevent a $GIT_DIR/worktrees entry from being pruned (which
can be useful in some situations, such as when the
-entry's working tree is stored on a portable device), add a file named
+entry's working tree is stored on a portable device), use the
+`git worktree lock` command, which adds a file named
'locked' to the entry's directory. The file contains the reason in
plain text. For example, if a linked working tree's `.git` file points
to `/path/main/.git/worktrees/test-next` then a file named
@@ -226,8 +253,6 @@ performed manually, such as:
- `remove` to remove a linked working tree and its administrative files (and
warn if the working tree is dirty)
- `mv` to move or rename a working tree and update its administrative files
-- `lock` to prevent automatic pruning of administrative files (for instance,
- for a working tree on a portable device)
GIT
---
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 80da7b7..3cb55cd 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,6 +43,12 @@ unreleased) version of Git, that is available from the 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
+* link:v2.10.2/git.html[documentation for release 2.10.2]
+
+* release notes for
+ link:RelNotes/2.10.2.txt[2.10.2],
+ link:RelNotes/2.10.1.txt[2.10.1],
+ link:RelNotes/2.10.0.txt[2.10].
* link:v2.9.4/git.html[documentation for release 2.9.4]
@@ -1094,6 +1100,14 @@ of clones and fetches.
cloning of shallow repositories.
See `GIT_TRACE` for available trace output options.
+`GIT_TRACE_CURL`::
+ Enables a curl full trace dump of all incoming and outgoing data,
+ including descriptive information, of the git transport protocol.
+ This is similar to doing curl `--trace-ascii` on the command line.
+ This option overrides setting the `GIT_CURL_VERBOSE` environment
+ variable.
+ See `GIT_TRACE` for available trace output options.
+
`GIT_LITERAL_PATHSPECS`::
Setting this variable to `1` will cause Git to treat all
pathspecs literally, rather than as glob patterns. For example,
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 6d20400..7aff940 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -133,7 +133,7 @@ Set to string value "auto"::
When `text` is set to "auto", the path is marked for automatic
end-of-line conversion. If Git decides that the content is
text, its line endings are converted to LF on checkin.
- When the file has been commited with CRLF, no conversion is done.
+ When the file has been committed with CRLF, no conversion is done.
Unspecified::
@@ -182,23 +182,6 @@ While Git normally leaves file contents alone, it can be configured to
normalize line endings to LF in the repository and, optionally, to
convert them to CRLF when files are checked out.
-Here is an example that will make Git normalize .txt, .vcproj and .sh
-files, ensure that .vcproj files have CRLF and .sh files have LF in
-the working directory, and prevent .jpg files from being normalized
-regardless of their content.
-
-------------------------
-* text=auto
-*.txt text
-*.vcproj text eol=crlf
-*.sh text eol=lf
-*.jpg -text
-------------------------
-
-Other source code management systems normalize all text files in their
-repositories, and there are two ways to enable similar automatic
-normalization in Git.
-
If you simply want to have CRLF line endings in your working directory
regardless of the repository you are working with, you can set the
config variable "core.autocrlf" without using any attributes.
@@ -208,35 +191,42 @@ config variable "core.autocrlf" without using any attributes.
autocrlf = true
------------------------
-This does not force normalization of all text files, but does ensure
+This does not force normalization of text files, but does ensure
that text files that you introduce to the repository have their line
endings normalized to LF when they are added, and that files that are
already normalized in the repository stay normalized.
-If you want to interoperate with a source code management system that
-enforces end-of-line normalization, or you simply want all text files
-in your repository to be normalized, you should instead set the `text`
-attribute to "auto" for _all_ files.
+If you want to ensure that text files that any contributor introduces to
+the repository have their line endings normalized, you can set the
+`text` attribute to "auto" for _all_ files.
------------------------
* text=auto
------------------------
-This ensures that all files that Git considers to be text will have
-normalized (LF) line endings in the repository. The `core.eol`
-configuration variable controls which line endings Git will use for
-normalized files in your working directory; the default is to use the
-native line ending for your platform, or CRLF if `core.autocrlf` is
-set.
+The attributes allow a fine-grained control, how the line endings
+are converted.
+Here is an example that will make Git normalize .txt, .vcproj and .sh
+files, ensure that .vcproj files have CRLF and .sh files have LF in
+the working directory, and prevent .jpg files from being normalized
+regardless of their content.
+
+------------------------
+* text=auto
+*.txt text
+*.vcproj text eol=crlf
+*.sh text eol=lf
+*.jpg -text
+------------------------
+
+NOTE: When `text=auto` conversion is enabled in a cross-platform
+project using push and pull to a central repository the text files
+containing CRLFs should be normalized.
-NOTE: When `text=auto` normalization is enabled in an existing
-repository, any text files containing CRLFs should be normalized. If
-they are not they will be normalized the next time someone tries to
-change them, causing unfortunate misattribution. From a clean working
-directory:
+From a clean working directory:
-------------------------------------------------
-$ echo "* text=auto" >>.gitattributes
+$ echo "* text=auto" >.gitattributes
$ rm .git/index # Remove the index to force Git to
$ git reset # re-scan the working directory
$ git status # Show files that will be normalized
@@ -533,6 +523,8 @@ patterns are available:
- `csharp` suitable for source code in the C# language.
+- `css` suitable for cascading style sheets.
+
- `fortran` suitable for source code in the Fortran language.
- `fountain` suitable for Fountain documents.
diff --git a/Documentation/gitcvs-migration.txt b/Documentation/gitcvs-migration.txt
index b06e852..4c6143c 100644
--- a/Documentation/gitcvs-migration.txt
+++ b/Documentation/gitcvs-migration.txt
@@ -116,8 +116,12 @@ they create are writable and searchable by other group members.
Importing a CVS archive
-----------------------
+NOTE: These instructions use the `git-cvsimport` script which ships with
+git, but other importers may provide better results. See the note in
+linkgit:git-cvsimport[1] for other options.
+
First, install version 2.1 or higher of cvsps from
-http://www.cobite.com/cvsps/[http://www.cobite.com/cvsps/] and make
+https://github.com/andreyvit/cvsps[https://github.com/andreyvit/cvsps] and make
sure it is in your path. Then cd to a checked out CVS working directory
of the project you are interested in and run linkgit:git-cvsimport[1]:
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index d82e912..9565dc3 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -247,6 +247,15 @@ Both standard output and standard error output are forwarded to
'git send-pack' on the other end, so you can simply `echo` messages
for the user.
+The number of push options given on the command line of
+`git push --push-option=...` can be read from the environment
+variable `GIT_PUSH_OPTION_COUNT`, and the options themselves are
+found in `GIT_PUSH_OPTION_0`, `GIT_PUSH_OPTION_1`,...
+If it is negotiated to not use the push options phase, the
+environment variables will not be set. If the client selects
+to use push options, but doesn't transmit any, the count variable
+will be set to zero, `GIT_PUSH_OPTION_COUNT=0`.
+
[[update]]
update
~~~~~~
@@ -322,6 +331,15 @@ a sample script `post-receive-email` provided in the `contrib/hooks`
directory in Git distribution, which implements sending commit
emails.
+The number of push options given on the command line of
+`git push --push-option=...` can be read from the environment
+variable `GIT_PUSH_OPTION_COUNT`, and the options themselves are
+found in `GIT_PUSH_OPTION_0`, `GIT_PUSH_OPTION_1`,...
+If it is negotiated to not use the push options phase, the
+environment variables will not be set. If the client selects
+to use push options, but doesn't transmit any, the count variable
+will be set to zero, `GIT_PUSH_OPTION_COUNT=0`.
+
[[post-update]]
post-update
~~~~~~~~~~~
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index a68d860..e382dd9 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -70,7 +70,7 @@ linkgit:git-rev-list[1] for a complete list.
--left-right::
- Mark which side of a symmetric diff a commit is reachable
+ Mark which side of a symmetric difference a commit is reachable
from. Commits from the left side are prefixed with a `<`
symbol and those from the right with a `>` symbol.
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 07cdd73..8f7c50f 100644
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -50,8 +50,11 @@ submodule.<name>.update::
submodule.<name>.branch::
A remote branch name for tracking updates in the upstream submodule.
- If the option is not specified, it defaults to 'master'. See the
- `--remote` documentation in linkgit:git-submodule[1] for details.
+ If the option is not specified, it defaults to 'master'. A special
+ value of `.` is used to indicate that the name of the branch in the
+ submodule should be the same name as the current branch in the
+ current repository. See the `--remote` documentation in
+ linkgit:git-submodule[1] for details.
submodule.<name>.fetchRecurseSubmodules::
This option can be used to control recursive fetching of this
@@ -79,6 +82,11 @@ submodule.<name>.ignore::
"--ignore-submodule" option. The 'git submodule' commands are not
affected by this setting.
+submodule.<name>.shallow::
+ When set to true, a clone of this submodule will be performed as a
+ shallow clone unless the user explicitly asks for a non-shallow
+ clone.
+
EXAMPLES
--------
diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index 577ee84..a5f99cb 100644
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -177,7 +177,7 @@ sharedindex.<SHA-1>::
info::
Additional information about the repository is recorded
in this directory. This directory is ignored if $GIT_COMMON_DIR
- is set and "$GIT_COMMON_DIR/index" will be used instead.
+ is set and "$GIT_COMMON_DIR/info" will be used instead.
info/refs::
This file helps dumb transports discover what refs are
diff --git a/Documentation/gitrevisions.txt b/Documentation/gitrevisions.txt
index e903eb7..27dec5b 100644
--- a/Documentation/gitrevisions.txt
+++ b/Documentation/gitrevisions.txt
@@ -15,9 +15,9 @@ DESCRIPTION
Many Git commands take revision parameters as arguments. Depending on
the command, they denote a specific commit or, for commands which
-walk the revision graph (such as linkgit:git-log[1]), all commits which can
-be reached from that commit. In the latter case one can also specify a
-range of revisions explicitly.
+walk the revision graph (such as linkgit:git-log[1]), all commits which are
+reachable from that commit. For commands that walk the revision graph one can
+also specify a range of revisions explicitly.
In addition, some Git commands (such as linkgit:git-show[1]) also take
revision parameters which denote other objects than commits, e.g. blobs
diff --git a/Documentation/howto/revert-a-faulty-merge.txt b/Documentation/howto/revert-a-faulty-merge.txt
index 462255e..19f59cc 100644
--- a/Documentation/howto/revert-a-faulty-merge.txt
+++ b/Documentation/howto/revert-a-faulty-merge.txt
@@ -30,7 +30,7 @@ The history immediately after the "revert of the merge" would look like
this:
---o---o---o---M---x---x---W
- /
+ /
---A---B
where A and B are on the side development that was not so good, M is the
@@ -47,7 +47,7 @@ After the developers of the side branch fix their mistakes, the history
may look like this:
---o---o---o---M---x---x---W---x
- /
+ /
---A---B-------------------C---D
where C and D are to fix what was broken in A and B, and you may already
@@ -81,7 +81,7 @@ In such a situation, you would want to first revert the previous revert,
which would make the history look like this:
---o---o---o---M---x---x---W---x---Y
- /
+ /
---A---B-------------------C---D
where Y is the revert of W. Such a "revert of the revert" can be done
@@ -93,14 +93,14 @@ This history would (ignoring possible conflicts between what W and W..Y
changed) be equivalent to not having W or Y at all in the history:
---o---o---o---M---x---x-------x----
- /
+ /
---A---B-------------------C---D
and merging the side branch again will not have conflict arising from an
earlier revert and revert of the revert.
---o---o---o---M---x---x-------x-------*
- / /
+ / /
---A---B-------------------C---D
Of course the changes made in C and D still can conflict with what was
@@ -111,13 +111,13 @@ faulty A and B, and redone the changes on top of the updated mainline
after the revert, the history would have looked like this:
---o---o---o---M---x---x---W---x---x
- / \
+ / \
---A---B A'--B'--C'
If you reverted the revert in such a case as in the previous example:
---o---o---o---M---x---x---W---x---x---Y---*
- / \ /
+ / \ /
---A---B A'--B'--C'
where Y is the revert of W, A' and B' are rerolled A and B, and there may
@@ -129,7 +129,7 @@ lot of overlapping changes that result in conflicts. So do not do "revert
of revert" blindly without thinking..
---o---o---o---M---x---x---W---x---x
- / \
+ / \
---A---B A'--B'--C'
In the history with rebased side branch, W (and M) are behind the merge
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index b95d67e..69c289d 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -166,13 +166,14 @@ endif::git-rev-list[]
- '%Cgreen': switch color to green
- '%Cblue': switch color to blue
- '%Creset': reset color
-- '%C(...)': color specification, as described in color.branch.* config option;
+- '%C(...)': color specification, as described under Values in the
+ "CONFIGURATION FILE" section of linkgit:git-config[1];
adding `auto,` at the beginning will emit color only when colors are
enabled for log output (by `color.diff`, `color.ui`, or `--color`, and
respecting the `auto` settings of the former if we are going to a
terminal). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring
on the next placeholders until the color is switched again.
-- '%m': left, right or boundary mark
+- '%m': left (`<`), right (`>`) or boundary (`-`) mark
- '%n': newline
- '%%': a raw '%'
- '%x00': print a byte from a hex code
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index eac982c..5da7cf5 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -225,7 +225,7 @@ excluded from the output.
--left-only::
--right-only::
- List only commits on the respective side of a symmetric range,
+ List only commits on the respective side of a symmetric difference,
i.e. only those which would be marked `<` resp. `>` by
`--left-right`.
+
@@ -289,6 +289,10 @@ ifdef::git-rev-list[]
Try to speed up the traversal using the pack bitmap index (if
one is available). Note that when traversing with `--objects`,
trees and blobs will not have their associated path printed.
+
+--progress=<header>::
+ Show progress reports on stderr as objects are considered. The
+ `<header>` text will be printed with each progress update.
endif::git-rev-list[]
--
@@ -653,8 +657,9 @@ avoid showing the commits from two parallel development track mixed
together.
--reverse::
- Output the commits in reverse order.
- Cannot be combined with `--walk-reflogs`.
+ Output the commits chosen to be shown (see Commit Limiting
+ section above) in reverse order. Cannot be combined with
+ `--walk-reflogs`.
Object Traversal
~~~~~~~~~~~~~~~~
@@ -792,7 +797,7 @@ ifdef::git-rev-list[]
endif::git-rev-list[]
--left-right::
- Mark which side of a symmetric diff a commit is reachable from.
+ Mark which side of a symmetric difference a commit is reachable from.
Commits from the left side are prefixed with `<` and those from
the right with `>`. If combined with `--boundary`, those
commits are prefixed with `-`.
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index abae363..4bed5b1 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -237,48 +237,74 @@ SPECIFYING RANGES
-----------------
History traversing commands such as `git log` operate on a set
-of commits, not just a single commit. To these commands,
-specifying a single revision with the notation described in the
-previous section means the set of commits reachable from that
-commit, following the commit ancestry chain.
-
-To exclude commits reachable from a commit, a prefix '{caret}'
-notation is used. E.g. '{caret}r1 r2' means commits reachable
-from 'r2' but exclude the ones reachable from 'r1'.
-
-This set operation appears so often that there is a shorthand
-for it. When you have two commits 'r1' and 'r2' (named according
-to the syntax explained in SPECIFYING REVISIONS above), you can ask
-for commits that are reachable from r2 excluding those that are reachable
-from r1 by '{caret}r1 r2' and it can be written as 'r1..r2'.
-
-A similar notation 'r1\...r2' is called symmetric difference
-of 'r1' and 'r2' and is defined as
-'r1 r2 --not $(git merge-base --all r1 r2)'.
-It is the set of commits that are reachable from either one of
-'r1' or 'r2' but not from both.
-
-In these two shorthands, you can omit one end and let it default to HEAD.
+of commits, not just a single commit.
+
+For these commands,
+specifying a single revision, using the notation described in the
+previous section, means the set of commits `reachable` from the given
+commit.
+
+A commit's reachable set is the commit itself and the commits in
+its ancestry chain.
+
+
+Commit Exclusions
+~~~~~~~~~~~~~~~~~
+
+'{caret}<rev>' (caret) Notation::
+ To exclude commits reachable from a commit, a prefix '{caret}'
+ notation is used. E.g. '{caret}r1 r2' means commits reachable
+ from 'r2' but exclude the ones reachable from 'r1' (i.e. 'r1' and
+ its ancestors).
+
+Dotted Range Notations
+~~~~~~~~~~~~~~~~~~~~~~
+
+The '..' (two-dot) Range Notation::
+ The '{caret}r1 r2' set operation appears so often that there is a shorthand
+ for it. When you have two commits 'r1' and 'r2' (named according
+ to the syntax explained in SPECIFYING REVISIONS above), you can ask
+ for commits that are reachable from r2 excluding those that are reachable
+ from r1 by '{caret}r1 r2' and it can be written as 'r1..r2'.
+
+The '...' (three dot) Symmetric Difference Notation::
+ A similar notation 'r1\...r2' is called symmetric difference
+ of 'r1' and 'r2' and is defined as
+ 'r1 r2 --not $(git merge-base --all r1 r2)'.
+ It is the set of commits that are reachable from either one of
+ 'r1' (left side) or 'r2' (right side) but not from both.
+
+In these two shorthand notations, you can omit one end and let it default to HEAD.
For example, 'origin..' is a shorthand for 'origin..HEAD' and asks "What
did I do since I forked from the origin branch?" Similarly, '..origin'
is a shorthand for 'HEAD..origin' and asks "What did the origin do since
I forked from them?" Note that '..' would mean 'HEAD..HEAD' which is an
empty range that is both reachable and unreachable from HEAD.
-Two other shorthands for naming a set that is formed by a commit
-and its parent commits exist. The 'r1{caret}@' notation means all
-parents of 'r1'. 'r1{caret}!' includes commit 'r1' but excludes
-all of its parents.
+Other <rev>{caret} Parent Shorthand Notations
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Two other shorthands exist, particularly useful for merge commits,
+for naming a set that is formed by a commit and its parent commits.
+
+The 'r1{caret}@' notation means all parents of 'r1'.
+
+The 'r1{caret}!' notation includes commit 'r1' but excludes all of its parents.
+By itself, this notation denotes the single commit 'r1'.
+
+While '<rev>{caret}<n>' was about specifying a single commit parent, these
+two notations consider all its parents. For example you can say
+'HEAD{caret}2{caret}@', however you cannot say 'HEAD{caret}@{caret}2'.
-To summarize:
+Revision Range Summary
+----------------------
'<rev>'::
- Include commits that are reachable from (i.e. ancestors of)
- <rev>.
+ Include commits that are reachable from <rev> (i.e. <rev> and its
+ ancestors).
'{caret}<rev>'::
- Exclude commits that are reachable from (i.e. ancestors of)
- <rev>.
+ Exclude commits that are reachable from <rev> (i.e. <rev> and its
+ ancestors).
'<rev1>..<rev2>'::
Include commits that are reachable from <rev2> but exclude
@@ -300,16 +326,27 @@ To summarize:
as giving commit '<rev>' and then all its parents prefixed with
'{caret}' to exclude them (and their ancestors).
-Here are a handful of examples:
-
- D G H D
- D F G H I J D F
- ^G D H D
- ^D B E I J F B
- B..C C
- B...C G H D E B C
- ^D B C E I J F B C
- C I J F C
- C^@ I J F
- C^! C
- F^! D G H D F
+Here are a handful of examples using the Loeliger illustration above,
+with each step in the notation's expansion and selection carefully
+spelt out:
+
+ Args Expanded arguments Selected commits
+ D G H D
+ D F G H I J D F
+ ^G D H D
+ ^D B E I J F B
+ ^D B C E I J F B C
+ C I J F C
+ B..C = ^B C C
+ B...C = B ^F C G H D E B C
+ C^@ = C^1
+ = F I J F
+ B^@ = B^1 B^2 B^3
+ = D E F D G H E F I J
+ C^! = C ^C^@
+ = C ^C^1
+ = C ^F C
+ B^! = B ^B^@
+ = B ^B^1 ^B^2 ^B^3
+ = B ^D ^E ^F B
+ F^! D = F ^I ^J D G H D F
diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
index d40ab65..736f389 100644
--- a/Documentation/technical/pack-protocol.txt
+++ b/Documentation/technical/pack-protocol.txt
@@ -454,7 +454,8 @@ The reference discovery phase is done nearly the same way as it is in the
fetching protocol. Each reference obj-id and name on the server is sent
in packet-line format to the client, followed by a flush-pkt. The only
real difference is that the capability listing is different - the only
-possible values are 'report-status', 'delete-refs' and 'ofs-delta'.
+possible values are 'report-status', 'delete-refs', 'ofs-delta' and
+'push-options'.
Reference Update Request and Packfile Transfer
----------------------------------------------
@@ -465,9 +466,10 @@ that it wants to update, it sends a line listing the obj-id currently on
the server, the obj-id the client would like to update it to and the name
of the reference.
-This list is followed by a flush-pkt and then the packfile that should
-contain all the objects that the server will need to complete the new
-references.
+This list is followed by a flush-pkt. Then the push options are transmitted
+one per packet followed by another flush-pkt. After that the packfile that
+should contain all the objects that the server will need to complete the new
+references will be sent.
----
update-request = *shallow ( command-list | push-cert ) [packfile]
diff --git a/Documentation/technical/protocol-capabilities.txt b/Documentation/technical/protocol-capabilities.txt
index eaab6b4..4c28d3a 100644
--- a/Documentation/technical/protocol-capabilities.txt
+++ b/Documentation/technical/protocol-capabilities.txt
@@ -253,6 +253,15 @@ atomic pushes. If the pushing client requests this capability, the server
will update the refs in one atomic transaction. Either all refs are
updated or none.
+push-options
+------------
+
+If the server sends the 'push-options' capability it is able to accept
+push options after the update commands have been sent, but before the
+packfile is streamed. If the pushing client requests this capability,
+the server will pass the options to the pre- and post- receive hooks
+that process this push request.
+
allow-tip-sha1-in-want
----------------------
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index f0c6bb0..153c17c 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.9.4
+DEF_VER=v2.10.2
LF='
'
diff --git a/Makefile b/Makefile
index 13ed57f..46ad908 100644
--- a/Makefile
+++ b/Makefile
@@ -296,7 +296,13 @@ all::
# Define USE_NED_ALLOCATOR if you want to replace the platforms default
# memory allocators with the nedmalloc allocator written by Niall Douglas.
#
-# Define NO_REGEX if you have no or inferior regex support in your C library.
+# Define OVERRIDE_STRDUP to override the libc version of strdup(3).
+# This is necessary when using a custom allocator in order to avoid
+# crashes due to allocation and free working on different 'heaps'.
+# It's defined automatically if USE_NED_ALLOCATOR is set.
+#
+# Define NO_REGEX if your C library lacks regex support with REG_STARTEND
+# feature.
#
# Define HAVE_DEV_TTY if your system can open /dev/tty to interact with the
# user.
@@ -351,9 +357,12 @@ all::
# Define GMTIME_UNRELIABLE_ERRORS if your gmtime() function does not
# return NULL when it receives a bogus time_t.
#
-# Define HAVE_CLOCK_GETTIME if your platform has clock_gettime in librt.
+# Define HAVE_CLOCK_GETTIME if your platform has clock_gettime.
+#
+# Define HAVE_CLOCK_MONOTONIC if your platform has CLOCK_MONOTONIC.
#
-# Define HAVE_CLOCK_MONOTONIC if your platform has CLOCK_MONOTONIC in librt.
+# Define NEEDS_LIBRT if your platform requires linking with librt (glibc version
+# before 2.17) for clock_gettime and CLOCK_MONOTONIC.
#
# Define USE_PARENS_AROUND_GETTEXT_N to "yes" if your compiler happily
# compiles the following initialization:
@@ -367,6 +376,14 @@ all::
# Define HAVE_BSD_SYSCTL if your platform has a BSD-compatible sysctl function.
#
# Define HAVE_GETDELIM if your system has the getdelim() function.
+#
+# Define PAGER_ENV to a SP separated VAR=VAL pairs to define
+# default environment variables to be passed when a pager is spawned, e.g.
+#
+# PAGER_ENV = LESS=FRX LV=-c
+#
+# to say "export LESS=FRX (and LV=-c) if the environment variable
+# LESS (and LV) is not set, respectively".
GIT-VERSION-FILE: FORCE
@$(SHELL_PATH) ./GIT-VERSION-GEN
@@ -445,6 +462,7 @@ CURL_CONFIG = curl-config
PTHREAD_LIBS = -lpthread
PTHREAD_CFLAGS =
GCOV = gcov
+SPATCH = spatch
export TCL_PATH TCLTK_PATH
@@ -718,6 +736,7 @@ LIB_OBJS += diff-lib.o
LIB_OBJS += diff-no-index.o
LIB_OBJS += diff.o
LIB_OBJS += dir.o
+LIB_OBJS += dir-iterator.o
LIB_OBJS += editor.o
LIB_OBJS += entry.o
LIB_OBJS += environment.o
@@ -751,6 +770,7 @@ LIB_OBJS += merge.o
LIB_OBJS += merge-blobs.o
LIB_OBJS += merge-recursive.o
LIB_OBJS += mergesort.o
+LIB_OBJS += mru.o
LIB_OBJS += name-hash.o
LIB_OBJS += notes.o
LIB_OBJS += notes-cache.o
@@ -782,6 +802,7 @@ LIB_OBJS += read-cache.o
LIB_OBJS += reflog-walk.o
LIB_OBJS += refs.o
LIB_OBJS += refs/files-backend.o
+LIB_OBJS += refs/iterator.o
LIB_OBJS += ref-filter.o
LIB_OBJS += remote.o
LIB_OBJS += replace_object.o
@@ -1023,6 +1044,7 @@ ifeq ($(uname_S),Darwin)
endif
endif
ifndef NO_APPLE_COMMON_CRYPTO
+ NO_OPENSSL = YesPlease
APPLE_COMMON_CRYPTO = YesPlease
COMPAT_CFLAGS += -DAPPLE_COMMON_CRYPTO
endif
@@ -1442,8 +1464,14 @@ ifdef NATIVE_CRLF
endif
ifdef USE_NED_ALLOCATOR
- COMPAT_CFLAGS += -Icompat/nedmalloc
- COMPAT_OBJS += compat/nedmalloc/nedmalloc.o
+ COMPAT_CFLAGS += -Icompat/nedmalloc
+ COMPAT_OBJS += compat/nedmalloc/nedmalloc.o
+ OVERRIDE_STRDUP = YesPlease
+endif
+
+ifdef OVERRIDE_STRDUP
+ COMPAT_CFLAGS += -DOVERRIDE_STRDUP
+ COMPAT_OBJS += compat/strdup.o
endif
ifdef GIT_TEST_CMP_USE_COPIED_CONTEXT
@@ -1465,13 +1493,16 @@ endif
ifdef HAVE_CLOCK_GETTIME
BASIC_CFLAGS += -DHAVE_CLOCK_GETTIME
- EXTLIBS += -lrt
endif
ifdef HAVE_CLOCK_MONOTONIC
BASIC_CFLAGS += -DHAVE_CLOCK_MONOTONIC
endif
+ifdef NEEDS_LIBRT
+ EXTLIBS += -lrt
+endif
+
ifdef HAVE_BSD_SYSCTL
BASIC_CFLAGS += -DHAVE_BSD_SYSCTL
endif
@@ -1492,6 +1523,10 @@ ifeq ($(PYTHON_PATH),)
NO_PYTHON = NoThanks
endif
+ifndef PAGER_ENV
+PAGER_ENV = LESS=FRX LV=-c
+endif
+
QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
QUIET_SUBDIR1 =
@@ -1621,6 +1656,11 @@ ifdef DEFAULT_HELP_FORMAT
BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
endif
+PAGER_ENV_SQ = $(subst ','\'',$(PAGER_ENV))
+PAGER_ENV_CQ = "$(subst ",\",$(subst \,\\,$(PAGER_ENV)))"
+PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
+BASIC_CFLAGS += -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
+
ALL_CFLAGS += $(BASIC_CFLAGS)
ALL_LDFLAGS += $(BASIC_LDFLAGS)
@@ -1745,7 +1785,7 @@ common-cmds.h: $(wildcard Documentation/git-*.txt)
SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
$(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
- $(gitwebdir_SQ):$(PERL_PATH_SQ):$(SANE_TEXT_GREP)
+ $(gitwebdir_SQ):$(PERL_PATH_SQ):$(SANE_TEXT_GREP):$(PAGER_ENV)
define cmd_munge_script
$(RM) $@ $@+ && \
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
@@ -1758,6 +1798,7 @@ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's|@@GITWEBDIR@@|$(gitwebdir_SQ)|g' \
-e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
-e 's|@@SANE_TEXT_GREP@@|$(SANE_TEXT_GREP)|g' \
+ -e 's|@@PAGER_ENV@@|$(PAGER_ENV_SQ)|g' \
$@.sh >$@+
endef
@@ -2002,7 +2043,7 @@ endif
ifdef USE_NED_ALLOCATOR
compat/nedmalloc/nedmalloc.sp compat/nedmalloc/nedmalloc.o: EXTRA_CPPFLAGS = \
- -DNDEBUG -DOVERRIDE_STRDUP -DREPLACE_SYSTEM_ALLOCATOR
+ -DNDEBUG -DREPLACE_SYSTEM_ALLOCATOR
compat/nedmalloc/nedmalloc.sp: SPARSE_FLAGS += -Wno-non-pointer-null
endif
@@ -2072,7 +2113,10 @@ XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \
--keyword=gettextln --keyword=eval_gettextln
XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --keyword=__ --language=Perl
LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
-LOCALIZED_SH = $(SCRIPT_SH) git-parse-remote.sh
+LOCALIZED_SH = $(SCRIPT_SH)
+LOCALIZED_SH += git-parse-remote.sh
+LOCALIZED_SH += git-rebase--interactive.sh
+LOCALIZED_SH += git-sh-setup.sh
LOCALIZED_PERL = $(SCRIPT_PERL)
ifdef XGETTEXT_INCLUDE_TESTS
@@ -2162,6 +2206,7 @@ GIT-BUILD-OPTIONS: FORCE
@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@+
@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@+
@echo NO_UNIX_SOCKETS=\''$(subst ','\'',$(subst ','\'',$(NO_UNIX_SOCKETS)))'\' >>$@+
+ @echo PAGER_ENV=\''$(subst ','\'',$(subst ','\'',$(PAGER_ENV)))'\' >>$@+
ifdef TEST_OUTPUT_DIRECTORY
@echo TEST_OUTPUT_DIRECTORY=\''$(subst ','\'',$(subst ','\'',$(TEST_OUTPUT_DIRECTORY)))'\' >>$@+
endif
@@ -2265,6 +2310,18 @@ check: common-cmds.h
exit 1; \
fi
+C_SOURCES = $(patsubst %.o,%.c,$(C_OBJ))
+%.cocci.patch: %.cocci $(C_SOURCES)
+ @echo ' ' SPATCH $<; \
+ for f in $(C_SOURCES); do \
+ $(SPATCH) --sp-file $< $$f; \
+ done >$@ 2>$@.log; \
+ if test -s $@; \
+ then \
+ echo ' ' SPATCH result: $@; \
+ fi
+coccicheck: $(patsubst %.cocci,%.cocci.patch,$(wildcard contrib/coccinelle/*.cocci))
+
### Installation rules
ifneq ($(filter /%,$(firstword $(template_dir))),)
@@ -2456,6 +2513,7 @@ clean: profile-clean coverage-clean
$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
+ $(RM) contrib/coccinelle/*.cocci.patch*
$(MAKE) -C Documentation/ clean
ifndef NO_PERL
$(MAKE) -C gitweb clean
diff --git a/RelNotes b/RelNotes
index a5f3cbf..75030cb 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.9.4.txt \ No newline at end of file
+Documentation/RelNotes/2.10.3.txt \ No newline at end of file
diff --git a/advice.c b/advice.c
index 4dc5cf1..b84ae49 100644
--- a/advice.c
+++ b/advice.c
@@ -79,7 +79,20 @@ int git_default_advice_config(const char *var, const char *value)
int error_resolve_conflict(const char *me)
{
- error("%s is not possible because you have unmerged files.", me);
+ if (!strcmp(me, "cherry-pick"))
+ error(_("Cherry-picking is not possible because you have unmerged files."));
+ else if (!strcmp(me, "commit"))
+ error(_("Committing is not possible because you have unmerged files."));
+ else if (!strcmp(me, "merge"))
+ error(_("Merging is not possible because you have unmerged files."));
+ else if (!strcmp(me, "pull"))
+ error(_("Pulling is not possible because you have unmerged files."));
+ else if (!strcmp(me, "revert"))
+ error(_("Reverting is not possible because you have unmerged files."));
+ else
+ error(_("It is not possible to %s because you have unmerged files."),
+ me);
+
if (advice_resolve_conflict)
/*
* Message used both when 'git commit' fails and when
@@ -93,7 +106,7 @@ int error_resolve_conflict(const char *me)
void NORETURN die_resolve_conflict(const char *me)
{
error_resolve_conflict(me);
- die("Exiting because of an unresolved conflict.");
+ die(_("Exiting because of an unresolved conflict."));
}
void NORETURN die_conclude_merge(void)
@@ -106,14 +119,14 @@ void NORETURN die_conclude_merge(void)
void detach_advice(const char *new_name)
{
- const char fmt[] =
- "Note: checking out '%s'.\n\n"
+ const char *fmt =
+ _("Note: checking out '%s'.\n\n"
"You are in 'detached HEAD' state. You can look around, make experimental\n"
"changes and commit them, and you can discard any commits you make in this\n"
"state without impacting any branches by performing another checkout.\n\n"
"If you want to create a new branch to retain commits you create, you may\n"
"do so (now or later) by using -b with the checkout command again. Example:\n\n"
- " git checkout -b <new-branch-name>\n\n";
+ " git checkout -b <new-branch-name>\n\n");
fprintf(stderr, fmt, new_name);
}
diff --git a/archive-tar.c b/archive-tar.c
index cb99df2..380e3ae 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -18,6 +18,21 @@ static int tar_umask = 002;
static int write_tar_filter_archive(const struct archiver *ar,
struct archiver_args *args);
+/*
+ * This is the max value that a ustar size header can specify, as it is fixed
+ * at 11 octal digits. POSIX specifies that we switch to extended headers at
+ * this size.
+ *
+ * Likewise for the mtime (which happens to use a buffer of the same size).
+ */
+#if ULONG_MAX == 0xFFFFFFFF
+#define USTAR_MAX_SIZE ULONG_MAX
+#define USTAR_MAX_MTIME ULONG_MAX
+#else
+#define USTAR_MAX_SIZE 077777777777UL
+#define USTAR_MAX_MTIME 077777777777UL
+#endif
+
/* writes out the whole block, but only if it is full */
static void write_if_needed(void)
{
@@ -137,6 +152,20 @@ static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword,
strbuf_addch(sb, '\n');
}
+/*
+ * Like strbuf_append_ext_header, but for numeric values.
+ */
+static void strbuf_append_ext_header_uint(struct strbuf *sb,
+ const char *keyword,
+ uintmax_t value)
+{
+ char buf[40]; /* big enough for 2^128 in decimal, plus NUL */
+ int len;
+
+ len = xsnprintf(buf, sizeof(buf), "%"PRIuMAX, value);
+ strbuf_append_ext_header(sb, keyword, buf, len);
+}
+
static unsigned int ustar_header_chksum(const struct ustar_header *header)
{
const unsigned char *p = (const unsigned char *)header;
@@ -184,9 +213,9 @@ static void prepare_header(struct archiver_args *args,
xsnprintf(header->chksum, sizeof(header->chksum), "%07o", ustar_header_chksum(header));
}
-static int write_extended_header(struct archiver_args *args,
- const unsigned char *sha1,
- const void *buffer, unsigned long size)
+static void write_extended_header(struct archiver_args *args,
+ const unsigned char *sha1,
+ const void *buffer, unsigned long size)
{
struct ustar_header header;
unsigned int mode;
@@ -197,7 +226,6 @@ static int write_extended_header(struct archiver_args *args,
prepare_header(args, &header, mode, size);
write_blocked(&header, sizeof(header));
write_blocked(buffer, size);
- return 0;
}
static int write_tar_entry(struct archiver_args *args,
@@ -208,7 +236,7 @@ static int write_tar_entry(struct archiver_args *args,
struct ustar_header header;
struct strbuf ext_header = STRBUF_INIT;
unsigned int old_mode = mode;
- unsigned long size;
+ unsigned long size, size_in_header;
void *buffer;
int err = 0;
@@ -267,15 +295,17 @@ static int write_tar_entry(struct archiver_args *args,
memcpy(header.linkname, buffer, size);
}
- prepare_header(args, &header, mode, size);
+ size_in_header = size;
+ if (S_ISREG(mode) && size > USTAR_MAX_SIZE) {
+ size_in_header = 0;
+ strbuf_append_ext_header_uint(&ext_header, "size", size);
+ }
+
+ prepare_header(args, &header, mode, size_in_header);
if (ext_header.len > 0) {
- err = write_extended_header(args, sha1, ext_header.buf,
- ext_header.len);
- if (err) {
- free(buffer);
- return err;
- }
+ write_extended_header(args, sha1, ext_header.buf,
+ ext_header.len);
}
strbuf_release(&ext_header);
write_blocked(&header, sizeof(header));
@@ -289,15 +319,25 @@ static int write_tar_entry(struct archiver_args *args,
return err;
}
-static int write_global_extended_header(struct archiver_args *args)
+static void write_global_extended_header(struct archiver_args *args)
{
const unsigned char *sha1 = args->commit_sha1;
struct strbuf ext_header = STRBUF_INIT;
struct ustar_header header;
unsigned int mode;
- int err = 0;
- strbuf_append_ext_header(&ext_header, "comment", sha1_to_hex(sha1), 40);
+ if (sha1)
+ strbuf_append_ext_header(&ext_header, "comment",
+ sha1_to_hex(sha1), 40);
+ if (args->time > USTAR_MAX_MTIME) {
+ strbuf_append_ext_header_uint(&ext_header, "mtime",
+ args->time);
+ args->time = USTAR_MAX_MTIME;
+ }
+
+ if (!ext_header.len)
+ return;
+
memset(&header, 0, sizeof(header));
*header.typeflag = TYPEFLAG_GLOBAL_HEADER;
mode = 0100666;
@@ -306,7 +346,6 @@ static int write_global_extended_header(struct archiver_args *args)
write_blocked(&header, sizeof(header));
write_blocked(ext_header.buf, ext_header.len);
strbuf_release(&ext_header);
- return err;
}
static struct archiver **tar_filters;
@@ -382,10 +421,8 @@ static int write_tar_archive(const struct archiver *ar,
{
int err = 0;
- if (args->commit_sha1)
- err = write_global_extended_header(args);
- if (!err)
- err = write_archive_entries(args, write_tar_entry);
+ write_global_extended_header(args);
+ err = write_archive_entries(args, write_tar_entry);
if (!err)
write_trailer();
return err;
diff --git a/archive.c b/archive.c
index 5d735ae..dde1ab4 100644
--- a/archive.c
+++ b/archive.c
@@ -322,7 +322,7 @@ static int path_exists(struct tree *tree, const char *path)
pathspec.recursive = 1;
ret = read_tree_recursive(tree, "", 0, 0, &pathspec,
reject_entry, &pathspec);
- free_pathspec(&pathspec);
+ clear_pathspec(&pathspec);
return ret != 0;
}
@@ -458,11 +458,11 @@ static int parse_archive_args(int argc, const char **argv,
argc = parse_options(argc, argv, NULL, opts, archive_usage, 0);
if (remote)
- die("Unexpected option --remote");
+ die(_("Unexpected option --remote"));
if (exec)
- die("Option --exec can only be used together with --remote");
+ die(_("Option --exec can only be used together with --remote"));
if (output)
- die("Unexpected option --output");
+ die(_("Unexpected option --output"));
if (!base)
base = "";
@@ -484,14 +484,14 @@ static int parse_archive_args(int argc, const char **argv,
usage_with_options(archive_usage, opts);
*ar = lookup_archiver(format);
if (!*ar || (is_remote && !((*ar)->flags & ARCHIVER_REMOTE)))
- die("Unknown archive format '%s'", format);
+ die(_("Unknown archive format '%s'"), format);
args->compression_level = Z_DEFAULT_COMPRESSION;
if (compression_level != -1) {
if ((*ar)->flags & ARCHIVER_WANT_COMPRESSION_LEVELS)
args->compression_level = compression_level;
else {
- die("Argument not supported for format '%s': -%d",
+ die(_("Argument not supported for format '%s': -%d"),
format, compression_level);
}
}
diff --git a/bisect.c b/bisect.c
index dc13319..6f512c2 100644
--- a/bisect.c
+++ b/bisect.c
@@ -438,12 +438,12 @@ static void read_bisect_paths(struct argv_array *array)
FILE *fp = fopen(filename, "r");
if (!fp)
- die_errno("Could not open file '%s'", filename);
+ die_errno(_("Could not open file '%s'"), filename);
while (strbuf_getline_lf(&str, fp) != EOF) {
strbuf_trim(&str);
if (sq_dequote_to_argv_array(str.buf, array))
- die("Badly quoted content in file '%s': %s",
+ die(_("Badly quoted content in file '%s': %s"),
filename, str.buf);
}
@@ -646,10 +646,13 @@ static void exit_if_skipped_commits(struct commit_list *tried,
printf("There are only 'skip'ped commits left to test.\n"
"The first %s commit could be any of:\n", term_bad);
- print_commit_list(tried, "%s\n", "%s\n");
+
+ for ( ; tried; tried = tried->next)
+ printf("%s\n", oid_to_hex(&tried->item->object.oid));
+
if (bad)
printf("%s\n", oid_to_hex(bad));
- printf("We cannot bisect more!\n");
+ printf(_("We cannot bisect more!\n"));
exit(2);
}
@@ -702,7 +705,7 @@ static struct commit *get_commit_reference(const unsigned char *sha1)
{
struct commit *r = lookup_commit_reference(sha1);
if (!r)
- die("Not a valid commit name %s", sha1_to_hex(sha1));
+ die(_("Not a valid commit name %s"), sha1_to_hex(sha1));
return r;
}
@@ -726,27 +729,27 @@ static void handle_bad_merge_base(void)
char *bad_hex = oid_to_hex(current_bad_oid);
char *good_hex = join_sha1_array_hex(&good_revs, ' ');
if (!strcmp(term_bad, "bad") && !strcmp(term_good, "good")) {
- fprintf(stderr, "The merge base %s is bad.\n"
+ fprintf(stderr, _("The merge base %s is bad.\n"
"This means the bug has been fixed "
- "between %s and [%s].\n",
+ "between %s and [%s].\n"),
bad_hex, bad_hex, good_hex);
} else if (!strcmp(term_bad, "new") && !strcmp(term_good, "old")) {
- fprintf(stderr, "The merge base %s is new.\n"
+ fprintf(stderr, _("The merge base %s is new.\n"
"The property has changed "
- "between %s and [%s].\n",
+ "between %s and [%s].\n"),
bad_hex, bad_hex, good_hex);
} else {
- fprintf(stderr, "The merge base %s is %s.\n"
+ fprintf(stderr, _("The merge base %s is %s.\n"
"This means the first '%s' commit is "
- "between %s and [%s].\n",
+ "between %s and [%s].\n"),
bad_hex, term_bad, term_good, bad_hex, good_hex);
}
exit(3);
}
- fprintf(stderr, "Some %s revs are not ancestor of the %s rev.\n"
+ fprintf(stderr, _("Some %s revs are not ancestor of the %s rev.\n"
"git bisect cannot work properly in this case.\n"
- "Maybe you mistook %s and %s revs?\n",
+ "Maybe you mistook %s and %s revs?\n"),
term_good, term_bad, term_good, term_bad);
exit(1);
}
@@ -754,14 +757,14 @@ static void handle_bad_merge_base(void)
static void handle_skipped_merge_base(const unsigned char *mb)
{
char *mb_hex = sha1_to_hex(mb);
- char *bad_hex = sha1_to_hex(current_bad_oid->hash);
+ char *bad_hex = oid_to_hex(current_bad_oid);
char *good_hex = join_sha1_array_hex(&good_revs, ' ');
- warning("the merge base between %s and [%s] "
+ warning(_("the merge base between %s and [%s] "
"must be skipped.\n"
"So we cannot be sure the first %s commit is "
"between %s and %s.\n"
- "We continue anyway.",
+ "We continue anyway."),
bad_hex, good_hex, term_bad, mb_hex, bad_hex);
free(good_hex);
}
@@ -792,7 +795,7 @@ static void check_merge_bases(int no_checkout)
} else if (0 <= sha1_array_lookup(&skipped_revs, mb)) {
handle_skipped_merge_base(mb);
} else {
- printf("Bisecting: a merge base must be tested\n");
+ printf(_("Bisecting: a merge base must be tested\n"));
exit(bisect_checkout(mb, no_checkout));
}
}
@@ -843,7 +846,7 @@ static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout)
int fd;
if (!current_bad_oid)
- die("a %s revision is needed", term_bad);
+ die(_("a %s revision is needed"), term_bad);
/* Check if file BISECT_ANCESTORS_OK exists. */
if (!stat(filename, &st) && S_ISREG(st.st_mode))
@@ -860,7 +863,7 @@ static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout)
/* Create file BISECT_ANCESTORS_OK. */
fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
if (fd < 0)
- warning_errno("could not create file '%s'",
+ warning_errno(_("could not create file '%s'"),
filename);
else
close(fd);
@@ -911,7 +914,7 @@ void read_bisect_terms(const char **read_bad, const char **read_good)
*read_good = "good";
return;
} else {
- die_errno("could not read file '%s'", filename);
+ die_errno(_("could not read file '%s'"), filename);
}
} else {
strbuf_getline_lf(&str, fp);
@@ -937,10 +940,11 @@ int bisect_next_all(const char *prefix, int no_checkout)
struct commit_list *tried;
int reaches = 0, all = 0, nr, steps;
const unsigned char *bisect_rev;
+ char steps_msg[32];
read_bisect_terms(&term_bad, &term_good);
if (read_bisect_refs())
- die("reading bisect refs failed");
+ die(_("reading bisect refs failed"));
check_good_are_ancestors_of_bad(prefix, no_checkout);
@@ -960,7 +964,7 @@ int bisect_next_all(const char *prefix, int no_checkout)
*/
exit_if_skipped_commits(tried, NULL);
- printf("%s was both %s and %s\n",
+ printf(_("%s was both %s and %s\n"),
oid_to_hex(current_bad_oid),
term_good,
term_bad);
@@ -968,8 +972,8 @@ int bisect_next_all(const char *prefix, int no_checkout)
}
if (!all) {
- fprintf(stderr, "No testable commit found.\n"
- "Maybe you started with bad path parameters?\n");
+ fprintf(stderr, _("No testable commit found.\n"
+ "Maybe you started with bad path parameters?\n"));
exit(4);
}
@@ -986,9 +990,14 @@ int bisect_next_all(const char *prefix, int no_checkout)
nr = all - reaches - 1;
steps = estimate_bisect_steps(all);
- printf("Bisecting: %d revision%s left to test after this "
- "(roughly %d step%s)\n", nr, (nr == 1 ? "" : "s"),
- steps, (steps == 1 ? "" : "s"));
+ xsnprintf(steps_msg, sizeof(steps_msg),
+ Q_("(roughly %d step)", "(roughly %d steps)", steps),
+ steps);
+ /* TRANSLATORS: the last %s will be replaced with
+ "(roughly %d steps)" translation */
+ printf(Q_("Bisecting: %d revision left to test after this %s\n",
+ "Bisecting: %d revisions left to test after this %s\n",
+ nr), nr, steps_msg);
return bisect_checkout(bisect_rev, no_checkout);
}
diff --git a/branch.c b/branch.c
index a5a8dcb..0d459b3 100644
--- a/branch.c
+++ b/branch.c
@@ -228,8 +228,7 @@ N_("\n"
"will track its remote counterpart, you may want to use\n"
"\"git push -u\" to set the upstream config as you push.");
-void create_branch(const char *head,
- const char *name, const char *start_name,
+void create_branch(const char *name, const char *start_name,
int force, int reflog, int clobber_head,
int quiet, enum branch_track track)
{
diff --git a/branch.h b/branch.h
index b2f9649..3103eb9 100644
--- a/branch.h
+++ b/branch.h
@@ -4,15 +4,21 @@
/* Functions for acting on the information about branches. */
/*
- * Creates a new branch, where head is the branch currently checked
- * out, name is the new branch name, start_name is the name of the
- * existing branch that the new branch should start from, force
- * enables overwriting an existing (non-head) branch, reflog creates a
- * reflog for the branch, and track causes the new branch to be
- * configured to merge the remote branch that start_name is a tracking
- * branch for (if any).
+ * Creates a new branch, where:
+ *
+ * - name is the new branch name
+ *
+ * - start_name is the name of the existing branch that the new branch should
+ * start from
+ *
+ * - force enables overwriting an existing (non-head) branch
+ *
+ * - reflog creates a reflog for the branch
+ *
+ * - track causes the new branch to be configured to merge the remote branch
+ * that start_name is a tracking branch for (if any).
*/
-void create_branch(const char *head, const char *name, const char *start_name,
+void create_branch(const char *name, const char *start_name,
int force, int reflog,
int clobber_head, int quiet, enum branch_track track);
diff --git a/builtin/add.c b/builtin/add.c
index b1dddb4..e8fb80b 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -26,10 +26,25 @@ static int patch_interactive, add_interactive, edit_interactive;
static int take_worktree_changes;
struct update_callback_data {
- int flags, force_mode;
+ int flags;
int add_errors;
};
+static void chmod_pathspec(struct pathspec *pathspec, int force_mode)
+{
+ int i;
+
+ for (i = 0; i < active_nr; i++) {
+ struct cache_entry *ce = active_cache[i];
+
+ if (pathspec && !ce_path_match(ce, pathspec, NULL))
+ continue;
+
+ if (chmod_cache_entry(ce, force_mode) < 0)
+ fprintf(stderr, "cannot chmod '%s'", ce->name);
+ }
+}
+
static int fix_unmerged_status(struct diff_filepair *p,
struct update_callback_data *data)
{
@@ -65,8 +80,7 @@ static void update_callback(struct diff_queue_struct *q,
die(_("unexpected diff status %c"), p->status);
case DIFF_STATUS_MODIFIED:
case DIFF_STATUS_TYPE_CHANGED:
- if (add_file_to_index(&the_index, path,
- data->flags, data->force_mode)) {
+ if (add_file_to_index(&the_index, path, data->flags)) {
if (!(data->flags & ADD_CACHE_IGNORE_ERRORS))
die(_("updating files failed"));
data->add_errors++;
@@ -84,15 +98,14 @@ static void update_callback(struct diff_queue_struct *q,
}
}
-int add_files_to_cache(const char *prefix, const struct pathspec *pathspec,
- int flags, int force_mode)
+int add_files_to_cache(const char *prefix,
+ const struct pathspec *pathspec, int flags)
{
struct update_callback_data data;
struct rev_info rev;
memset(&data, 0, sizeof(data));
data.flags = flags;
- data.force_mode = force_mode;
init_revisions(&rev, prefix);
setup_revisions(0, NULL, &rev, NULL);
@@ -281,7 +294,7 @@ static int add_config(const char *var, const char *value, void *cb)
return git_default_config(var, value, cb);
}
-static int add_files(struct dir_struct *dir, int flags, int force_mode)
+static int add_files(struct dir_struct *dir, int flags)
{
int i, exit_status = 0;
@@ -294,8 +307,7 @@ static int add_files(struct dir_struct *dir, int flags, int force_mode)
}
for (i = 0; i < dir->nr; i++)
- if (add_file_to_index(&the_index, dir->entries[i]->name,
- flags, force_mode)) {
+ if (add_file_to_index(&the_index, dir->entries[i]->name, flags)) {
if (!ignore_add_errors)
die(_("adding files failed"));
exit_status = 1;
@@ -308,7 +320,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
int exit_status = 0;
struct pathspec pathspec;
struct dir_struct dir;
- int flags, force_mode;
+ int flags;
int add_new_files;
int require_pathspec;
char *seen = NULL;
@@ -342,13 +354,8 @@ int cmd_add(int argc, const char **argv, const char *prefix)
if (!show_only && ignore_missing)
die(_("Option --ignore-missing can only be used together with --dry-run"));
- if (!chmod_arg)
- force_mode = 0;
- else if (!strcmp(chmod_arg, "-x"))
- force_mode = 0666;
- else if (!strcmp(chmod_arg, "+x"))
- force_mode = 0777;
- else
+ if (chmod_arg && ((chmod_arg[0] != '-' && chmod_arg[0] != '+') ||
+ chmod_arg[1] != 'x' || chmod_arg[2]))
die(_("--chmod param '%s' must be either -x or +x"), chmod_arg);
add_new_files = !take_worktree_changes && !refresh_only;
@@ -441,11 +448,13 @@ int cmd_add(int argc, const char **argv, const char *prefix)
plug_bulk_checkin();
- exit_status |= add_files_to_cache(prefix, &pathspec, flags, force_mode);
+ exit_status |= add_files_to_cache(prefix, &pathspec, flags);
if (add_new_files)
- exit_status |= add_files(&dir, flags, force_mode);
+ exit_status |= add_files(&dir, flags);
+ if (chmod_arg && pathspec.nr)
+ chmod_pathspec(&pathspec, chmod_arg[0]);
unplug_bulk_checkin();
finish:
diff --git a/builtin/am.c b/builtin/am.c
index 00e4a09..9daeb27 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -28,6 +28,7 @@
#include "rerere.h"
#include "prompt.h"
#include "mailinfo.h"
+#include "string-list.h"
/**
* Returns 1 if the file is empty or does not exist, 0 otherwise.
@@ -70,7 +71,8 @@ enum patch_format {
PATCH_FORMAT_MBOX,
PATCH_FORMAT_STGIT,
PATCH_FORMAT_STGIT_SERIES,
- PATCH_FORMAT_HG
+ PATCH_FORMAT_HG,
+ PATCH_FORMAT_MBOXRD
};
enum keep_type {
@@ -183,22 +185,22 @@ static inline const char *am_path(const struct am_state *state, const char *path
/**
* For convenience to call write_file()
*/
-static int write_state_text(const struct am_state *state,
- const char *name, const char *string)
+static void write_state_text(const struct am_state *state,
+ const char *name, const char *string)
{
- return write_file(am_path(state, name), "%s", string);
+ write_file(am_path(state, name), "%s", string);
}
-static int write_state_count(const struct am_state *state,
- const char *name, int value)
+static void write_state_count(const struct am_state *state,
+ const char *name, int value)
{
- return write_file(am_path(state, name), "%d", value);
+ write_file(am_path(state, name), "%d", value);
}
-static int write_state_bool(const struct am_state *state,
- const char *name, int value)
+static void write_state_bool(const struct am_state *state,
+ const char *name, int value)
{
- return write_state_text(state, name, value ? "t" : "f");
+ write_state_text(state, name, value ? "t" : "f");
}
/**
@@ -257,38 +259,29 @@ static int read_state_file(struct strbuf *sb, const struct am_state *state,
}
/**
- * Reads a KEY=VALUE shell variable assignment from `fp`, returning the VALUE
- * as a newly-allocated string. VALUE must be a quoted string, and the KEY must
- * match `key`. Returns NULL on failure.
- *
- * This is used by read_author_script() to read the GIT_AUTHOR_* variables from
- * the author-script.
+ * Take a series of KEY='VALUE' lines where VALUE part is
+ * sq-quoted, and append <KEY, VALUE> at the end of the string list
*/
-static char *read_shell_var(FILE *fp, const char *key)
+static int parse_key_value_squoted(char *buf, struct string_list *list)
{
- struct strbuf sb = STRBUF_INIT;
- const char *str;
-
- if (strbuf_getline_lf(&sb, fp))
- goto fail;
-
- if (!skip_prefix(sb.buf, key, &str))
- goto fail;
-
- if (!skip_prefix(str, "=", &str))
- goto fail;
-
- strbuf_remove(&sb, 0, str - sb.buf);
-
- str = sq_dequote(sb.buf);
- if (!str)
- goto fail;
-
- return strbuf_detach(&sb, NULL);
-
-fail:
- strbuf_release(&sb);
- return NULL;
+ while (*buf) {
+ struct string_list_item *item;
+ char *np;
+ char *cp = strchr(buf, '=');
+ if (!cp)
+ return -1;
+ np = strchrnul(cp, '\n');
+ *cp++ = '\0';
+ item = string_list_append(list, buf);
+
+ buf = np + (*np == '\n');
+ *np = '\0';
+ cp = sq_dequote(cp);
+ if (!cp)
+ return -1;
+ item->util = xstrdup(cp);
+ }
+ return 0;
}
/**
@@ -310,44 +303,39 @@ fail:
static int read_author_script(struct am_state *state)
{
const char *filename = am_path(state, "author-script");
- FILE *fp;
+ struct strbuf buf = STRBUF_INIT;
+ struct string_list kv = STRING_LIST_INIT_DUP;
+ int retval = -1; /* assume failure */
+ int fd;
assert(!state->author_name);
assert(!state->author_email);
assert(!state->author_date);
- fp = fopen(filename, "r");
- if (!fp) {
+ fd = open(filename, O_RDONLY);
+ if (fd < 0) {
if (errno == ENOENT)
return 0;
die_errno(_("could not open '%s' for reading"), filename);
}
+ strbuf_read(&buf, fd, 0);
+ close(fd);
+ if (parse_key_value_squoted(buf.buf, &kv))
+ goto finish;
- state->author_name = read_shell_var(fp, "GIT_AUTHOR_NAME");
- if (!state->author_name) {
- fclose(fp);
- return -1;
- }
-
- state->author_email = read_shell_var(fp, "GIT_AUTHOR_EMAIL");
- if (!state->author_email) {
- fclose(fp);
- return -1;
- }
-
- state->author_date = read_shell_var(fp, "GIT_AUTHOR_DATE");
- if (!state->author_date) {
- fclose(fp);
- return -1;
- }
-
- if (fgetc(fp) != EOF) {
- fclose(fp);
- return -1;
- }
-
- fclose(fp);
- return 0;
+ if (kv.nr != 3 ||
+ strcmp(kv.items[0].string, "GIT_AUTHOR_NAME") ||
+ strcmp(kv.items[1].string, "GIT_AUTHOR_EMAIL") ||
+ strcmp(kv.items[2].string, "GIT_AUTHOR_DATE"))
+ goto finish;
+ state->author_name = kv.items[0].util;
+ state->author_email = kv.items[1].util;
+ state->author_date = kv.items[2].util;
+ retval = 0;
+finish:
+ string_list_clear(&kv, !!retval);
+ strbuf_release(&buf);
+ return retval;
}
/**
@@ -402,13 +390,8 @@ static int read_commit_msg(struct am_state *state)
*/
static void write_commit_msg(const struct am_state *state)
{
- int fd;
const char *filename = am_path(state, "final-commit");
-
- fd = xopen(filename, O_WRONLY | O_CREAT, 0666);
- if (write_in_full(fd, state->msg, state->msg_len) < 0)
- die_errno(_("could not write to %s"), filename);
- close(fd);
+ write_file_buf(filename, state->msg, state->msg_len);
}
/**
@@ -712,7 +695,8 @@ done:
* Splits out individual email patches from `paths`, where each path is either
* a mbox file or a Maildir. Returns 0 on success, -1 on failure.
*/
-static int split_mail_mbox(struct am_state *state, const char **paths, int keep_cr)
+static int split_mail_mbox(struct am_state *state, const char **paths,
+ int keep_cr, int mboxrd)
{
struct child_process cp = CHILD_PROCESS_INIT;
struct strbuf last = STRBUF_INIT;
@@ -724,6 +708,8 @@ static int split_mail_mbox(struct am_state *state, const char **paths, int keep_
argv_array_push(&cp.args, "-b");
if (keep_cr)
argv_array_push(&cp.args, "--keep-cr");
+ if (mboxrd)
+ argv_array_push(&cp.args, "--mboxrd");
argv_array_push(&cp.args, "--");
argv_array_pushv(&cp.args, paths);
@@ -965,13 +951,15 @@ static int split_mail(struct am_state *state, enum patch_format patch_format,
switch (patch_format) {
case PATCH_FORMAT_MBOX:
- return split_mail_mbox(state, paths, keep_cr);
+ return split_mail_mbox(state, paths, keep_cr, 0);
case PATCH_FORMAT_STGIT:
return split_mail_conv(stgit_patch_to_mail, state, paths, keep_cr);
case PATCH_FORMAT_STGIT_SERIES:
return split_mail_stgit_series(state, paths, keep_cr);
case PATCH_FORMAT_HG:
return split_mail_conv(hg_patch_to_mail, state, paths, keep_cr);
+ case PATCH_FORMAT_MBOXRD:
+ return split_mail_mbox(state, paths, keep_cr, 1);
default:
die("BUG: invalid patch_format");
}
@@ -1578,47 +1566,18 @@ static int build_fake_ancestor(const struct am_state *state, const char *index_f
}
/**
- * Do the three-way merge using fake ancestor, their tree constructed
- * from the fake ancestor and the postimage of the patch, and our
- * state.
- */
-static int run_fallback_merge_recursive(const struct am_state *state,
- unsigned char *orig_tree,
- unsigned char *our_tree,
- unsigned char *their_tree)
-{
- struct child_process cp = CHILD_PROCESS_INIT;
- int status;
-
- cp.git_cmd = 1;
-
- argv_array_pushf(&cp.env_array, "GITHEAD_%s=%.*s",
- sha1_to_hex(their_tree), linelen(state->msg), state->msg);
- if (state->quiet)
- argv_array_push(&cp.env_array, "GIT_MERGE_VERBOSITY=0");
-
- argv_array_push(&cp.args, "merge-recursive");
- argv_array_push(&cp.args, sha1_to_hex(orig_tree));
- argv_array_push(&cp.args, "--");
- argv_array_push(&cp.args, sha1_to_hex(our_tree));
- argv_array_push(&cp.args, sha1_to_hex(their_tree));
-
- status = run_command(&cp) ? (-1) : 0;
- discard_cache();
- read_cache();
- return status;
-}
-
-/**
* Attempt a threeway merge, using index_path as the temporary index.
*/
static int fall_back_threeway(const struct am_state *state, const char *index_path)
{
- unsigned char orig_tree[GIT_SHA1_RAWSZ], their_tree[GIT_SHA1_RAWSZ],
- our_tree[GIT_SHA1_RAWSZ];
+ struct object_id orig_tree, their_tree, our_tree;
+ const struct object_id *bases[1] = { &orig_tree };
+ struct merge_options o;
+ struct commit *result;
+ char *their_tree_name;
- if (get_sha1("HEAD", our_tree) < 0)
- hashcpy(our_tree, EMPTY_TREE_SHA1_BIN);
+ if (get_oid("HEAD", &our_tree) < 0)
+ hashcpy(our_tree.hash, EMPTY_TREE_SHA1_BIN);
if (build_fake_ancestor(state, index_path))
return error("could not build fake ancestor");
@@ -1626,7 +1585,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
discard_cache();
read_cache_from(index_path);
- if (write_index_as_tree(orig_tree, &the_index, index_path, 0, NULL))
+ if (write_index_as_tree(orig_tree.hash, &the_index, index_path, 0, NULL))
return error(_("Repository lacks necessary blobs to fall back on 3-way merge."));
say(state, stdout, _("Using index info to reconstruct a base tree..."));
@@ -1642,7 +1601,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
init_revisions(&rev_info, NULL);
rev_info.diffopt.output_format = DIFF_FORMAT_NAME_STATUS;
diff_opt_parse(&rev_info.diffopt, &diff_filter_str, 1, rev_info.prefix);
- add_pending_sha1(&rev_info, "HEAD", our_tree, 0);
+ add_pending_sha1(&rev_info, "HEAD", our_tree.hash, 0);
diff_setup_done(&rev_info.diffopt);
run_diff_index(&rev_info, 1);
}
@@ -1651,7 +1610,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
return error(_("Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."));
- if (write_index_as_tree(their_tree, &the_index, index_path, 0, NULL))
+ if (write_index_as_tree(their_tree.hash, &the_index, index_path, 0, NULL))
return error("could not write tree");
say(state, stdout, _("Falling back to patching base and 3-way merge..."));
@@ -1667,11 +1626,22 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
* changes.
*/
- if (run_fallback_merge_recursive(state, orig_tree, our_tree, their_tree)) {
+ init_merge_options(&o);
+
+ o.branch1 = "HEAD";
+ their_tree_name = xstrfmt("%.*s", linelen(state->msg), state->msg);
+ o.branch2 = their_tree_name;
+
+ if (state->quiet)
+ o.verbosity = 0;
+
+ if (merge_recursive_generic(&o, &our_tree, &their_tree, 1, bases, &result)) {
rerere(state->allow_rerere_autoupdate);
+ free(their_tree_name);
return error(_("Failed to merge in the changes."));
}
+ free(their_tree_name);
return 0;
}
@@ -2203,6 +2173,8 @@ static int parse_opt_patchformat(const struct option *opt, const char *arg, int
*opt_value = PATCH_FORMAT_STGIT_SERIES;
else if (!strcmp(arg, "hg"))
*opt_value = PATCH_FORMAT_HG;
+ else if (!strcmp(arg, "mboxrd"))
+ *opt_value = PATCH_FORMAT_MBOXRD;
else
return error(_("Invalid value for --patch-format: %s"), arg);
return 0;
@@ -2237,7 +2209,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
int in_progress;
const char * const usage[] = {
- N_("git am [<options>] [(<mbox>|<Maildir>)...]"),
+ N_("git am [<options>] [(<mbox> | <Maildir>)...]"),
N_("git am [<options>] (--continue | --skip | --abort)"),
NULL
};
diff --git a/builtin/apply.c b/builtin/apply.c
index c770d7d..1a488f9 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -21,132 +21,161 @@
#include "ll-merge.h"
#include "rerere.h"
-/*
- * --check turns on checking that the working tree matches the
- * files that are being modified, but doesn't apply the patch
- * --stat does just a diffstat, and doesn't actually apply
- * --numstat does numeric diffstat, and doesn't actually apply
- * --index-info shows the old and new index info for paths if available.
- * --index updates the cache as well.
- * --cached updates only the cache without ever touching the working tree.
- */
-static const char *prefix;
-static int prefix_length = -1;
-static int newfd = -1;
-
-static int unidiff_zero;
-static int p_value = 1;
-static int p_value_known;
-static int check_index;
-static int update_index;
-static int cached;
-static int diffstat;
-static int numstat;
-static int summary;
-static int check;
-static int apply = 1;
-static int apply_in_reverse;
-static int apply_with_reject;
-static int apply_verbosely;
-static int allow_overlap;
-static int no_add;
-static int threeway;
-static int unsafe_paths;
-static const char *fake_ancestor;
-static int line_termination = '\n';
-static unsigned int p_context = UINT_MAX;
-static const char * const apply_usage[] = {
- N_("git apply [<options>] [<patch>...]"),
- NULL
-};
-
-static enum ws_error_action {
+enum ws_error_action {
nowarn_ws_error,
warn_on_ws_error,
die_on_ws_error,
correct_ws_error
-} ws_error_action = warn_on_ws_error;
-static int whitespace_error;
-static int squelch_whitespace_errors = 5;
-static int applied_after_fixing_ws;
+};
+
-static enum ws_ignore {
+enum ws_ignore {
ignore_ws_none,
ignore_ws_change
-} ws_ignore_action = ignore_ws_none;
+};
+
+/*
+ * We need to keep track of how symlinks in the preimage are
+ * manipulated by the patches. A patch to add a/b/c where a/b
+ * is a symlink should not be allowed to affect the directory
+ * the symlink points at, but if the same patch removes a/b,
+ * it is perfectly fine, as the patch removes a/b to make room
+ * to create a directory a/b so that a/b/c can be created.
+ *
+ * See also "struct string_list symlink_changes" in "struct
+ * apply_state".
+ */
+#define SYMLINK_GOES_AWAY 01
+#define SYMLINK_IN_RESULT 02
+struct apply_state {
+ const char *prefix;
+ int prefix_length;
+
+ /* These are lock_file related */
+ struct lock_file *lock_file;
+ int newfd;
+
+ /* These control what gets looked at and modified */
+ int apply; /* this is not a dry-run */
+ int cached; /* apply to the index only */
+ int check; /* preimage must match working tree, don't actually apply */
+ int check_index; /* preimage must match the indexed version */
+ int update_index; /* check_index && apply */
+
+ /* These control cosmetic aspect of the output */
+ int diffstat; /* just show a diffstat, and don't actually apply */
+ int numstat; /* just show a numeric diffstat, and don't actually apply */
+ int summary; /* just report creation, deletion, etc, and don't actually apply */
+
+ /* These boolean parameters control how the apply is done */
+ int allow_overlap;
+ int apply_in_reverse;
+ int apply_with_reject;
+ int apply_verbosely;
+ int no_add;
+ int threeway;
+ int unidiff_zero;
+ int unsafe_paths;
+
+ /* Other non boolean parameters */
+ const char *fake_ancestor;
+ const char *patch_input_file;
+ int line_termination;
+ struct strbuf root;
+ int p_value;
+ int p_value_known;
+ unsigned int p_context;
+
+ /* Exclude and include path parameters */
+ struct string_list limit_by_name;
+ int has_include;
+
+ /* Various "current state" */
+ int linenr; /* current line number */
+ struct string_list symlink_changes; /* we have to track symlinks */
-static const char *patch_input_file;
-static struct strbuf root = STRBUF_INIT;
-static int read_stdin = 1;
-static int options;
+ /*
+ * For "diff-stat" like behaviour, we keep track of the biggest change
+ * we've seen, and the longest filename. That allows us to do simple
+ * scaling.
+ */
+ int max_change;
+ int max_len;
-static void parse_whitespace_option(const char *option)
+ /*
+ * Records filenames that have been touched, in order to handle
+ * the case where more than one patches touch the same file.
+ */
+ struct string_list fn_table;
+
+ /* These control whitespace errors */
+ enum ws_error_action ws_error_action;
+ enum ws_ignore ws_ignore_action;
+ const char *whitespace_option;
+ int whitespace_error;
+ int squelch_whitespace_errors;
+ int applied_after_fixing_ws;
+};
+
+static const char * const apply_usage[] = {
+ N_("git apply [<options>] [<patch>...]"),
+ NULL
+};
+
+static void parse_whitespace_option(struct apply_state *state, const char *option)
{
if (!option) {
- ws_error_action = warn_on_ws_error;
+ state->ws_error_action = warn_on_ws_error;
return;
}
if (!strcmp(option, "warn")) {
- ws_error_action = warn_on_ws_error;
+ state->ws_error_action = warn_on_ws_error;
return;
}
if (!strcmp(option, "nowarn")) {
- ws_error_action = nowarn_ws_error;
+ state->ws_error_action = nowarn_ws_error;
return;
}
if (!strcmp(option, "error")) {
- ws_error_action = die_on_ws_error;
+ state->ws_error_action = die_on_ws_error;
return;
}
if (!strcmp(option, "error-all")) {
- ws_error_action = die_on_ws_error;
- squelch_whitespace_errors = 0;
+ state->ws_error_action = die_on_ws_error;
+ state->squelch_whitespace_errors = 0;
return;
}
if (!strcmp(option, "strip") || !strcmp(option, "fix")) {
- ws_error_action = correct_ws_error;
+ state->ws_error_action = correct_ws_error;
return;
}
die(_("unrecognized whitespace option '%s'"), option);
}
-static void parse_ignorewhitespace_option(const char *option)
+static void parse_ignorewhitespace_option(struct apply_state *state,
+ const char *option)
{
if (!option || !strcmp(option, "no") ||
!strcmp(option, "false") || !strcmp(option, "never") ||
!strcmp(option, "none")) {
- ws_ignore_action = ignore_ws_none;
+ state->ws_ignore_action = ignore_ws_none;
return;
}
if (!strcmp(option, "change")) {
- ws_ignore_action = ignore_ws_change;
+ state->ws_ignore_action = ignore_ws_change;
return;
}
die(_("unrecognized whitespace ignore option '%s'"), option);
}
-static void set_default_whitespace_mode(const char *whitespace_option)
+static void set_default_whitespace_mode(struct apply_state *state)
{
- if (!whitespace_option && !apply_default_whitespace)
- ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error);
+ if (!state->whitespace_option && !apply_default_whitespace)
+ state->ws_error_action = (state->apply ? warn_on_ws_error : nowarn_ws_error);
}
/*
- * For "diff-stat" like behaviour, we keep track of the biggest change
- * we've seen, and the longest filename. That allows us to do simple
- * scaling.
- */
-static int max_change, max_len;
-
-/*
- * Various "current state", notably line numbers and what
- * file (and how) we're patching right now.. The "is_xxxx"
- * things are flags, where -1 means "don't know yet".
- */
-static int linenr = 1;
-
-/*
* This represents one "hunk" from a patch, starting with
* "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
* patch text is pointed at by patch, and its byte length
@@ -265,13 +294,6 @@ struct image {
struct line *line;
};
-/*
- * Records filenames that have been touched, in order to handle
- * the case where more than one patches touch the same file.
- */
-
-static struct string_list fn_table;
-
static uint32_t hash_line(const char *cp, size_t len)
{
size_t i;
@@ -469,7 +491,10 @@ static char *squash_slash(char *name)
return name;
}
-static char *find_name_gnu(const char *line, const char *def, int p_value)
+static char *find_name_gnu(struct apply_state *state,
+ const char *line,
+ const char *def,
+ int p_value)
{
struct strbuf name = STRBUF_INIT;
char *cp;
@@ -493,8 +518,8 @@ static char *find_name_gnu(const char *line, const char *def, int p_value)
}
strbuf_remove(&name, 0, cp - name.buf);
- if (root.len)
- strbuf_insert(&name, 0, root.buf, root.len);
+ if (state->root.len)
+ strbuf_insert(&name, 0, state->root.buf, state->root.len);
return squash_slash(strbuf_detach(&name, NULL));
}
@@ -657,8 +682,12 @@ static size_t diff_timestamp_len(const char *line, size_t len)
return line + len - end;
}
-static char *find_name_common(const char *line, const char *def,
- int p_value, const char *end, int terminate)
+static char *find_name_common(struct apply_state *state,
+ const char *line,
+ const char *def,
+ int p_value,
+ const char *end,
+ int terminate)
{
int len;
const char *start = NULL;
@@ -696,32 +725,39 @@ static char *find_name_common(const char *line, const char *def,
return squash_slash(xstrdup(def));
}
- if (root.len) {
- char *ret = xstrfmt("%s%.*s", root.buf, len, start);
+ if (state->root.len) {
+ char *ret = xstrfmt("%s%.*s", state->root.buf, len, start);
return squash_slash(ret);
}
return squash_slash(xmemdupz(start, len));
}
-static char *find_name(const char *line, char *def, int p_value, int terminate)
+static char *find_name(struct apply_state *state,
+ const char *line,
+ char *def,
+ int p_value,
+ int terminate)
{
if (*line == '"') {
- char *name = find_name_gnu(line, def, p_value);
+ char *name = find_name_gnu(state, line, def, p_value);
if (name)
return name;
}
- return find_name_common(line, def, p_value, NULL, terminate);
+ return find_name_common(state, line, def, p_value, NULL, terminate);
}
-static char *find_name_traditional(const char *line, char *def, int p_value)
+static char *find_name_traditional(struct apply_state *state,
+ const char *line,
+ char *def,
+ int p_value)
{
size_t len;
size_t date_len;
if (*line == '"') {
- char *name = find_name_gnu(line, def, p_value);
+ char *name = find_name_gnu(state, line, def, p_value);
if (name)
return name;
}
@@ -729,10 +765,10 @@ static char *find_name_traditional(const char *line, char *def, int p_value)
len = strchrnul(line, '\n') - line;
date_len = diff_timestamp_len(line, len);
if (!date_len)
- return find_name_common(line, def, p_value, NULL, TERM_TAB);
+ return find_name_common(state, line, def, p_value, NULL, TERM_TAB);
len -= date_len;
- return find_name_common(line, def, p_value, line + len, 0);
+ return find_name_common(state, line, def, p_value, line + len, 0);
}
static int count_slashes(const char *cp)
@@ -750,30 +786,30 @@ static int count_slashes(const char *cp)
* Given the string after "--- " or "+++ ", guess the appropriate
* p_value for the given patch.
*/
-static int guess_p_value(const char *nameline)
+static int guess_p_value(struct apply_state *state, const char *nameline)
{
char *name, *cp;
int val = -1;
if (is_dev_null(nameline))
return -1;
- name = find_name_traditional(nameline, NULL, 0);
+ name = find_name_traditional(state, nameline, NULL, 0);
if (!name)
return -1;
cp = strchr(name, '/');
if (!cp)
val = 0;
- else if (prefix) {
+ else if (state->prefix) {
/*
* Does it begin with "a/$our-prefix" and such? Then this is
* very likely to apply to our directory.
*/
- if (!strncmp(name, prefix, prefix_length))
- val = count_slashes(prefix);
+ if (!strncmp(name, state->prefix, state->prefix_length))
+ val = count_slashes(state->prefix);
else {
cp++;
- if (!strncmp(cp, prefix, prefix_length))
- val = count_slashes(prefix) + 1;
+ if (!strncmp(cp, state->prefix, state->prefix_length))
+ val = count_slashes(state->prefix) + 1;
}
}
free(name);
@@ -860,36 +896,39 @@ static int has_epoch_timestamp(const char *nameline)
* files, we can happily check the index for a match, but for creating a
* new file we should try to match whatever "patch" does. I have no idea.
*/
-static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
+static void parse_traditional_patch(struct apply_state *state,
+ const char *first,
+ const char *second,
+ struct patch *patch)
{
char *name;
first += 4; /* skip "--- " */
second += 4; /* skip "+++ " */
- if (!p_value_known) {
+ if (!state->p_value_known) {
int p, q;
- p = guess_p_value(first);
- q = guess_p_value(second);
+ p = guess_p_value(state, first);
+ q = guess_p_value(state, second);
if (p < 0) p = q;
if (0 <= p && p == q) {
- p_value = p;
- p_value_known = 1;
+ state->p_value = p;
+ state->p_value_known = 1;
}
}
if (is_dev_null(first)) {
patch->is_new = 1;
patch->is_delete = 0;
- name = find_name_traditional(second, NULL, p_value);
+ name = find_name_traditional(state, second, NULL, state->p_value);
patch->new_name = name;
} else if (is_dev_null(second)) {
patch->is_new = 0;
patch->is_delete = 1;
- name = find_name_traditional(first, NULL, p_value);
+ name = find_name_traditional(state, first, NULL, state->p_value);
patch->old_name = name;
} else {
char *first_name;
- first_name = find_name_traditional(first, NULL, p_value);
- name = find_name_traditional(second, first_name, p_value);
+ first_name = find_name_traditional(state, first, NULL, state->p_value);
+ name = find_name_traditional(state, second, first_name, state->p_value);
free(first_name);
if (has_epoch_timestamp(first)) {
patch->is_new = 1;
@@ -905,10 +944,12 @@ static void parse_traditional_patch(const char *first, const char *second, struc
}
}
if (!name)
- die(_("unable to find filename in patch at line %d"), linenr);
+ die(_("unable to find filename in patch at line %d"), state->linenr);
}
-static int gitdiff_hdrend(const char *line, struct patch *patch)
+static int gitdiff_hdrend(struct apply_state *state,
+ const char *line,
+ struct patch *patch)
{
return -1;
}
@@ -925,107 +966,135 @@ static int gitdiff_hdrend(const char *line, struct patch *patch)
#define DIFF_OLD_NAME 0
#define DIFF_NEW_NAME 1
-static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, int side)
+static void gitdiff_verify_name(struct apply_state *state,
+ const char *line,
+ int isnull,
+ char **name,
+ int side)
{
- if (!orig_name && !isnull)
- return find_name(line, NULL, p_value, TERM_TAB);
+ if (!*name && !isnull) {
+ *name = find_name(state, line, NULL, state->p_value, TERM_TAB);
+ return;
+ }
- if (orig_name) {
- int len = strlen(orig_name);
+ if (*name) {
+ int len = strlen(*name);
char *another;
if (isnull)
die(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"),
- orig_name, linenr);
- another = find_name(line, NULL, p_value, TERM_TAB);
- if (!another || memcmp(another, orig_name, len + 1))
+ *name, state->linenr);
+ another = find_name(state, line, NULL, state->p_value, TERM_TAB);
+ if (!another || memcmp(another, *name, len + 1))
die((side == DIFF_NEW_NAME) ?
_("git apply: bad git-diff - inconsistent new filename on line %d") :
- _("git apply: bad git-diff - inconsistent old filename on line %d"), linenr);
+ _("git apply: bad git-diff - inconsistent old filename on line %d"), state->linenr);
free(another);
- return orig_name;
} else {
/* expect "/dev/null" */
if (memcmp("/dev/null", line, 9) || line[9] != '\n')
- die(_("git apply: bad git-diff - expected /dev/null on line %d"), linenr);
- return NULL;
+ die(_("git apply: bad git-diff - expected /dev/null on line %d"), state->linenr);
}
}
-static int gitdiff_oldname(const char *line, struct patch *patch)
+static int gitdiff_oldname(struct apply_state *state,
+ const char *line,
+ struct patch *patch)
{
- patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name,
- DIFF_OLD_NAME);
+ gitdiff_verify_name(state, line,
+ patch->is_new, &patch->old_name,
+ DIFF_OLD_NAME);
return 0;
}
-static int gitdiff_newname(const char *line, struct patch *patch)
+static int gitdiff_newname(struct apply_state *state,
+ const char *line,
+ struct patch *patch)
{
- patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name,
- DIFF_NEW_NAME);
+ gitdiff_verify_name(state, line,
+ patch->is_delete, &patch->new_name,
+ DIFF_NEW_NAME);
return 0;
}
-static int gitdiff_oldmode(const char *line, struct patch *patch)
+static int gitdiff_oldmode(struct apply_state *state,
+ const char *line,
+ struct patch *patch)
{
patch->old_mode = strtoul(line, NULL, 8);
return 0;
}
-static int gitdiff_newmode(const char *line, struct patch *patch)
+static int gitdiff_newmode(struct apply_state *state,
+ const char *line,
+ struct patch *patch)
{
patch->new_mode = strtoul(line, NULL, 8);
return 0;
}
-static int gitdiff_delete(const char *line, struct patch *patch)
+static int gitdiff_delete(struct apply_state *state,
+ const char *line,
+ struct patch *patch)
{
patch->is_delete = 1;
free(patch->old_name);
patch->old_name = xstrdup_or_null(patch->def_name);
- return gitdiff_oldmode(line, patch);
+ return gitdiff_oldmode(state, line, patch);
}
-static int gitdiff_newfile(const char *line, struct patch *patch)
+static int gitdiff_newfile(struct apply_state *state,
+ const char *line,
+ struct patch *patch)
{
patch->is_new = 1;
free(patch->new_name);
patch->new_name = xstrdup_or_null(patch->def_name);
- return gitdiff_newmode(line, patch);
+ return gitdiff_newmode(state, line, patch);
}
-static int gitdiff_copysrc(const char *line, struct patch *patch)
+static int gitdiff_copysrc(struct apply_state *state,
+ const char *line,
+ struct patch *patch)
{
patch->is_copy = 1;
free(patch->old_name);
- patch->old_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);
+ patch->old_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
return 0;
}
-static int gitdiff_copydst(const char *line, struct patch *patch)
+static int gitdiff_copydst(struct apply_state *state,
+ const char *line,
+ struct patch *patch)
{
patch->is_copy = 1;
free(patch->new_name);
- patch->new_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);
+ patch->new_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
return 0;
}
-static int gitdiff_renamesrc(const char *line, struct patch *patch)
+static int gitdiff_renamesrc(struct apply_state *state,
+ const char *line,
+ struct patch *patch)
{
patch->is_rename = 1;
free(patch->old_name);
- patch->old_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);
+ patch->old_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
return 0;
}
-static int gitdiff_renamedst(const char *line, struct patch *patch)
+static int gitdiff_renamedst(struct apply_state *state,
+ const char *line,
+ struct patch *patch)
{
patch->is_rename = 1;
free(patch->new_name);
- patch->new_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);
+ patch->new_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
return 0;
}
-static int gitdiff_similarity(const char *line, struct patch *patch)
+static int gitdiff_similarity(struct apply_state *state,
+ const char *line,
+ struct patch *patch)
{
unsigned long val = strtoul(line, NULL, 10);
if (val <= 100)
@@ -1033,7 +1102,9 @@ static int gitdiff_similarity(const char *line, struct patch *patch)
return 0;
}
-static int gitdiff_dissimilarity(const char *line, struct patch *patch)
+static int gitdiff_dissimilarity(struct apply_state *state,
+ const char *line,
+ struct patch *patch)
{
unsigned long val = strtoul(line, NULL, 10);
if (val <= 100)
@@ -1041,7 +1112,9 @@ static int gitdiff_dissimilarity(const char *line, struct patch *patch)
return 0;
}
-static int gitdiff_index(const char *line, struct patch *patch)
+static int gitdiff_index(struct apply_state *state,
+ const char *line,
+ struct patch *patch)
{
/*
* index line is N hexadecimal, "..", N hexadecimal,
@@ -1078,7 +1151,9 @@ static int gitdiff_index(const char *line, struct patch *patch)
* This is normal for a diff that doesn't change anything: we'll fall through
* into the next diff. Tell the parser to break out.
*/
-static int gitdiff_unrecognized(const char *line, struct patch *patch)
+static int gitdiff_unrecognized(struct apply_state *state,
+ const char *line,
+ struct patch *patch)
{
return -1;
}
@@ -1087,15 +1162,17 @@ static int gitdiff_unrecognized(const char *line, struct patch *patch)
* Skip p_value leading components from "line"; as we do not accept
* absolute paths, return NULL in that case.
*/
-static const char *skip_tree_prefix(const char *line, int llen)
+static const char *skip_tree_prefix(struct apply_state *state,
+ const char *line,
+ int llen)
{
int nslash;
int i;
- if (!p_value)
+ if (!state->p_value)
return (llen && line[0] == '/') ? NULL : line;
- nslash = p_value;
+ nslash = state->p_value;
for (i = 0; i < llen; i++) {
int ch = line[i];
if (ch == '/' && --nslash <= 0)
@@ -1112,7 +1189,9 @@ static const char *skip_tree_prefix(const char *line, int llen)
* creation or deletion of an empty file. In any of these cases,
* both sides are the same name under a/ and b/ respectively.
*/
-static char *git_header_name(const char *line, int llen)
+static char *git_header_name(struct apply_state *state,
+ const char *line,
+ int llen)
{
const char *name;
const char *second = NULL;
@@ -1130,7 +1209,7 @@ static char *git_header_name(const char *line, int llen)
goto free_and_fail1;
/* strip the a/b prefix including trailing slash */
- cp = skip_tree_prefix(first.buf, first.len);
+ cp = skip_tree_prefix(state, first.buf, first.len);
if (!cp)
goto free_and_fail1;
strbuf_remove(&first, 0, cp - first.buf);
@@ -1147,7 +1226,7 @@ static char *git_header_name(const char *line, int llen)
if (*second == '"') {
if (unquote_c_style(&sp, second, NULL))
goto free_and_fail1;
- cp = skip_tree_prefix(sp.buf, sp.len);
+ cp = skip_tree_prefix(state, sp.buf, sp.len);
if (!cp)
goto free_and_fail1;
/* They must match, otherwise ignore */
@@ -1158,7 +1237,7 @@ static char *git_header_name(const char *line, int llen)
}
/* unquoted second */
- cp = skip_tree_prefix(second, line + llen - second);
+ cp = skip_tree_prefix(state, second, line + llen - second);
if (!cp)
goto free_and_fail1;
if (line + llen - cp != first.len ||
@@ -1173,7 +1252,7 @@ static char *git_header_name(const char *line, int llen)
}
/* unquoted first name */
- name = skip_tree_prefix(line, llen);
+ name = skip_tree_prefix(state, line, llen);
if (!name)
return NULL;
@@ -1189,7 +1268,7 @@ static char *git_header_name(const char *line, int llen)
if (unquote_c_style(&sp, second, NULL))
goto free_and_fail2;
- np = skip_tree_prefix(sp.buf, sp.len);
+ np = skip_tree_prefix(state, sp.buf, sp.len);
if (!np)
goto free_and_fail2;
@@ -1233,7 +1312,7 @@ static char *git_header_name(const char *line, int llen)
*/
if (!name[len + 1])
return NULL; /* no postimage name */
- second = skip_tree_prefix(name + len + 1,
+ second = skip_tree_prefix(state, name + len + 1,
line_len - (len + 1));
if (!second)
return NULL;
@@ -1249,7 +1328,11 @@ static char *git_header_name(const char *line, int llen)
}
/* Verify that we recognize the lines following a git header */
-static int parse_git_header(const char *line, int len, unsigned int size, struct patch *patch)
+static int parse_git_header(struct apply_state *state,
+ const char *line,
+ int len,
+ unsigned int size,
+ struct patch *patch)
{
unsigned long offset;
@@ -1263,20 +1346,20 @@ static int parse_git_header(const char *line, int len, unsigned int size, struct
* or removing or adding empty files), so we get
* the default name from the header.
*/
- patch->def_name = git_header_name(line, len);
- if (patch->def_name && root.len) {
- char *s = xstrfmt("%s%s", root.buf, patch->def_name);
+ patch->def_name = git_header_name(state, line, len);
+ if (patch->def_name && state->root.len) {
+ char *s = xstrfmt("%s%s", state->root.buf, patch->def_name);
free(patch->def_name);
patch->def_name = s;
}
line += len;
size -= len;
- linenr++;
- for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
+ state->linenr++;
+ for (offset = len ; size > 0 ; offset += len, size -= len, line += len, state->linenr++) {
static const struct opentry {
const char *str;
- int (*fn)(const char *, struct patch *);
+ int (*fn)(struct apply_state *, const char *, struct patch *);
} optable[] = {
{ "@@ -", gitdiff_hdrend },
{ "--- ", gitdiff_oldname },
@@ -1306,7 +1389,7 @@ static int parse_git_header(const char *line, int len, unsigned int size, struct
int oplen = strlen(p->str);
if (len < oplen || memcmp(p->str, line, oplen))
continue;
- if (p->fn(line + oplen, patch) < 0)
+ if (p->fn(state, line + oplen, patch) < 0)
return offset;
break;
}
@@ -1431,7 +1514,11 @@ static int parse_fragment_header(const char *line, int len, struct fragment *fra
return offset;
}
-static int find_header(const char *line, unsigned long size, int *hdrsize, struct patch *patch)
+static int find_header(struct apply_state *state,
+ const char *line,
+ unsigned long size,
+ int *hdrsize,
+ struct patch *patch)
{
unsigned long offset, len;
@@ -1440,7 +1527,7 @@ static int find_header(const char *line, unsigned long size, int *hdrsize, struc
patch->is_new = patch->is_delete = -1;
patch->old_mode = patch->new_mode = 0;
patch->old_name = patch->new_name = NULL;
- for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
+ for (offset = 0; size > 0; offset += len, size -= len, line += len, state->linenr++) {
unsigned long nextlen;
len = linelen(line, size);
@@ -1461,7 +1548,7 @@ static int find_header(const char *line, unsigned long size, int *hdrsize, struc
if (parse_fragment_header(line, len, &dummy) < 0)
continue;
die(_("patch fragment without header at line %d: %.*s"),
- linenr, (int)len-1, line);
+ state->linenr, (int)len-1, line);
}
if (size < len + 6)
@@ -1472,7 +1559,7 @@ static int find_header(const char *line, unsigned long size, int *hdrsize, struc
* or mode change, so we handle that specially
*/
if (!memcmp("diff --git ", line, 11)) {
- int git_hdr_len = parse_git_header(line, len, size, patch);
+ int git_hdr_len = parse_git_header(state, line, len, size, patch);
if (git_hdr_len <= len)
continue;
if (!patch->old_name && !patch->new_name) {
@@ -1481,14 +1568,14 @@ static int find_header(const char *line, unsigned long size, int *hdrsize, struc
"%d leading pathname component (line %d)",
"git diff header lacks filename information when removing "
"%d leading pathname components (line %d)",
- p_value),
- p_value, linenr);
+ state->p_value),
+ state->p_value, state->linenr);
patch->old_name = xstrdup(patch->def_name);
patch->new_name = xstrdup(patch->def_name);
}
if (!patch->is_delete && !patch->new_name)
die("git diff header lacks filename information "
- "(line %d)", linenr);
+ "(line %d)", state->linenr);
patch->is_toplevel_relative = 1;
*hdrsize = git_hdr_len;
return offset;
@@ -1508,37 +1595,44 @@ static int find_header(const char *line, unsigned long size, int *hdrsize, struc
continue;
/* Ok, we'll consider it a patch */
- parse_traditional_patch(line, line+len, patch);
+ parse_traditional_patch(state, line, line+len, patch);
*hdrsize = len + nextlen;
- linenr += 2;
+ state->linenr += 2;
return offset;
}
return -1;
}
-static void record_ws_error(unsigned result, const char *line, int len, int linenr)
+static void record_ws_error(struct apply_state *state,
+ unsigned result,
+ const char *line,
+ int len,
+ int linenr)
{
char *err;
if (!result)
return;
- whitespace_error++;
- if (squelch_whitespace_errors &&
- squelch_whitespace_errors < whitespace_error)
+ state->whitespace_error++;
+ if (state->squelch_whitespace_errors &&
+ state->squelch_whitespace_errors < state->whitespace_error)
return;
err = whitespace_error_string(result);
fprintf(stderr, "%s:%d: %s.\n%.*s\n",
- patch_input_file, linenr, err, len, line);
+ state->patch_input_file, linenr, err, len, line);
free(err);
}
-static void check_whitespace(const char *line, int len, unsigned ws_rule)
+static void check_whitespace(struct apply_state *state,
+ const char *line,
+ int len,
+ unsigned ws_rule)
{
unsigned result = ws_check(line + 1, len - 1, ws_rule);
- record_ws_error(result, line + 1, len - 2, linenr);
+ record_ws_error(state, result, line + 1, len - 2, state->linenr);
}
/*
@@ -1547,8 +1641,11 @@ static void check_whitespace(const char *line, int len, unsigned ws_rule)
* between a "---" that is part of a patch, and a "---" that starts
* the next patch is to look at the line counts..
*/
-static int parse_fragment(const char *line, unsigned long size,
- struct patch *patch, struct fragment *fragment)
+static int parse_fragment(struct apply_state *state,
+ const char *line,
+ unsigned long size,
+ struct patch *patch,
+ struct fragment *fragment)
{
int added, deleted;
int len = linelen(line, size), offset;
@@ -1568,11 +1665,11 @@ static int parse_fragment(const char *line, unsigned long size,
/* Parse the thing.. */
line += len;
size -= len;
- linenr++;
+ state->linenr++;
added = deleted = 0;
for (offset = len;
0 < size;
- offset += len, size -= len, line += len, linenr++) {
+ offset += len, size -= len, line += len, state->linenr++) {
if (!oldlines && !newlines)
break;
len = linelen(line, size);
@@ -1588,22 +1685,22 @@ static int parse_fragment(const char *line, unsigned long size,
if (!deleted && !added)
leading++;
trailing++;
- if (!apply_in_reverse &&
- ws_error_action == correct_ws_error)
- check_whitespace(line, len, patch->ws_rule);
+ if (!state->apply_in_reverse &&
+ state->ws_error_action == correct_ws_error)
+ check_whitespace(state, line, len, patch->ws_rule);
break;
case '-':
- if (apply_in_reverse &&
- ws_error_action != nowarn_ws_error)
- check_whitespace(line, len, patch->ws_rule);
+ if (state->apply_in_reverse &&
+ state->ws_error_action != nowarn_ws_error)
+ check_whitespace(state, line, len, patch->ws_rule);
deleted++;
oldlines--;
trailing = 0;
break;
case '+':
- if (!apply_in_reverse &&
- ws_error_action != nowarn_ws_error)
- check_whitespace(line, len, patch->ws_rule);
+ if (!state->apply_in_reverse &&
+ state->ws_error_action != nowarn_ws_error)
+ check_whitespace(state, line, len, patch->ws_rule);
added++;
newlines--;
trailing = 0;
@@ -1657,7 +1754,10 @@ static int parse_fragment(const char *line, unsigned long size,
* The (fragment->patch, fragment->size) pair points into the memory given
* by the caller, not a copy, when we return.
*/
-static int parse_single_patch(const char *line, unsigned long size, struct patch *patch)
+static int parse_single_patch(struct apply_state *state,
+ const char *line,
+ unsigned long size,
+ struct patch *patch)
{
unsigned long offset = 0;
unsigned long oldlines = 0, newlines = 0, context = 0;
@@ -1668,10 +1768,10 @@ static int parse_single_patch(const char *line, unsigned long size, struct patch
int len;
fragment = xcalloc(1, sizeof(*fragment));
- fragment->linenr = linenr;
- len = parse_fragment(line, size, patch, fragment);
+ fragment->linenr = state->linenr;
+ len = parse_fragment(state, line, size, patch, fragment);
if (len <= 0)
- die(_("corrupt patch at line %d"), linenr);
+ die(_("corrupt patch at line %d"), state->linenr);
fragment->patch = line;
fragment->size = len;
oldlines += fragment->oldlines;
@@ -1757,7 +1857,8 @@ static char *inflate_it(const void *data, unsigned long size,
* points at an allocated memory that the caller must free, so
* it is marked as "->free_patch = 1".
*/
-static struct fragment *parse_binary_hunk(char **buf_p,
+static struct fragment *parse_binary_hunk(struct apply_state *state,
+ char **buf_p,
unsigned long *sz_p,
int *status_p,
int *used_p)
@@ -1799,13 +1900,13 @@ static struct fragment *parse_binary_hunk(char **buf_p,
else
return NULL;
- linenr++;
+ state->linenr++;
buffer += llen;
while (1) {
int byte_length, max_byte_length, newsize;
llen = linelen(buffer, size);
used += llen;
- linenr++;
+ state->linenr++;
if (llen == 1) {
/* consume the blank line */
buffer++;
@@ -1859,7 +1960,7 @@ static struct fragment *parse_binary_hunk(char **buf_p,
free(data);
*status_p = -1;
error(_("corrupt binary patch at line %d: %.*s"),
- linenr-1, llen-1, buffer);
+ state->linenr-1, llen-1, buffer);
return NULL;
}
@@ -1868,7 +1969,10 @@ static struct fragment *parse_binary_hunk(char **buf_p,
* -1 in case of error,
* the length of the parsed binary patch otherwise
*/
-static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
+static int parse_binary(struct apply_state *state,
+ char *buffer,
+ unsigned long size,
+ struct patch *patch)
{
/*
* We have read "GIT binary patch\n"; what follows is a line
@@ -1889,15 +1993,15 @@ static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
int status;
int used, used_1;
- forward = parse_binary_hunk(&buffer, &size, &status, &used);
+ forward = parse_binary_hunk(state, &buffer, &size, &status, &used);
if (!forward && !status)
/* there has to be one hunk (forward hunk) */
- return error(_("unrecognized binary patch at line %d"), linenr-1);
+ return error(_("unrecognized binary patch at line %d"), state->linenr-1);
if (status)
/* otherwise we already gave an error message */
return status;
- reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);
+ reverse = parse_binary_hunk(state, &buffer, &size, &status, &used_1);
if (reverse)
used += used_1;
else if (status) {
@@ -1915,53 +2019,53 @@ static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
return used;
}
-static void prefix_one(char **name)
+static void prefix_one(struct apply_state *state, char **name)
{
char *old_name = *name;
if (!old_name)
return;
- *name = xstrdup(prefix_filename(prefix, prefix_length, *name));
+ *name = xstrdup(prefix_filename(state->prefix, state->prefix_length, *name));
free(old_name);
}
-static void prefix_patch(struct patch *p)
+static void prefix_patch(struct apply_state *state, struct patch *p)
{
- if (!prefix || p->is_toplevel_relative)
+ if (!state->prefix || p->is_toplevel_relative)
return;
- prefix_one(&p->new_name);
- prefix_one(&p->old_name);
+ prefix_one(state, &p->new_name);
+ prefix_one(state, &p->old_name);
}
/*
* include/exclude
*/
-static struct string_list limit_by_name;
-static int has_include;
-static void add_name_limit(const char *name, int exclude)
+static void add_name_limit(struct apply_state *state,
+ const char *name,
+ int exclude)
{
struct string_list_item *it;
- it = string_list_append(&limit_by_name, name);
+ it = string_list_append(&state->limit_by_name, name);
it->util = exclude ? NULL : (void *) 1;
}
-static int use_patch(struct patch *p)
+static int use_patch(struct apply_state *state, struct patch *p)
{
const char *pathname = p->new_name ? p->new_name : p->old_name;
int i;
/* Paths outside are not touched regardless of "--include" */
- if (0 < prefix_length) {
+ if (0 < state->prefix_length) {
int pathlen = strlen(pathname);
- if (pathlen <= prefix_length ||
- memcmp(prefix, pathname, prefix_length))
+ if (pathlen <= state->prefix_length ||
+ memcmp(state->prefix, pathname, state->prefix_length))
return 0;
}
/* See if it matches any of exclude/include rule */
- for (i = 0; i < limit_by_name.nr; i++) {
- struct string_list_item *it = &limit_by_name.items[i];
+ for (i = 0; i < state->limit_by_name.nr; i++) {
+ struct string_list_item *it = &state->limit_by_name.items[i];
if (!wildmatch(it->string, pathname, 0, NULL))
return (it->util != NULL);
}
@@ -1971,7 +2075,7 @@ static int use_patch(struct patch *p)
* not used. Otherwise, we saw bunch of exclude rules (or none)
* and such a path is used.
*/
- return !has_include;
+ return !state->has_include;
}
@@ -1982,25 +2086,27 @@ static int use_patch(struct patch *p)
* Return the number of bytes consumed, so that the caller can call us
* again for the next patch.
*/
-static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
+static int parse_chunk(struct apply_state *state, char *buffer, unsigned long size, struct patch *patch)
{
int hdrsize, patchsize;
- int offset = find_header(buffer, size, &hdrsize, patch);
+ int offset = find_header(state, buffer, size, &hdrsize, patch);
if (offset < 0)
return offset;
- prefix_patch(patch);
+ prefix_patch(state, patch);
- if (!use_patch(patch))
+ if (!use_patch(state, patch))
patch->ws_rule = 0;
else
patch->ws_rule = whitespace_rule(patch->new_name
? patch->new_name
: patch->old_name);
- patchsize = parse_single_patch(buffer + offset + hdrsize,
- size - offset - hdrsize, patch);
+ patchsize = parse_single_patch(state,
+ buffer + offset + hdrsize,
+ size - offset - hdrsize,
+ patch);
if (!patchsize) {
static const char git_binary[] = "GIT binary patch\n";
@@ -2010,8 +2116,8 @@ static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
if (llen == sizeof(git_binary) - 1 &&
!memcmp(git_binary, buffer + hd, llen)) {
int used;
- linenr++;
- used = parse_binary(buffer + hd + llen,
+ state->linenr++;
+ used = parse_binary(state, buffer + hd + llen,
size - hd - llen, patch);
if (used < 0)
return -1;
@@ -2031,7 +2137,7 @@ static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
int len = strlen(binhdr[i]);
if (len < size - hd &&
!memcmp(binhdr[i], buffer + hd, len)) {
- linenr++;
+ state->linenr++;
patch->is_binary = 1;
patchsize = llen;
break;
@@ -2043,9 +2149,9 @@ static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
* without metadata change. A binary patch appears
* empty to us here.
*/
- if ((apply || check) &&
+ if ((state->apply || state->check) &&
(!patch->is_binary && !metadata_changes(patch)))
- die(_("patch with only garbage at line %d"), linenr);
+ die(_("patch with only garbage at line %d"), state->linenr);
}
return offset + hdrsize + patchsize;
@@ -2083,7 +2189,7 @@ static const char pluses[] =
static const char minuses[]=
"----------------------------------------------------------------------";
-static void show_stats(struct patch *patch)
+static void show_stats(struct apply_state *state, struct patch *patch)
{
struct strbuf qname = STRBUF_INIT;
char *cp = patch->new_name ? patch->new_name : patch->old_name;
@@ -2094,7 +2200,7 @@ static void show_stats(struct patch *patch)
/*
* "scale" the filename
*/
- max = max_len;
+ max = state->max_len;
if (max > 50)
max = 50;
@@ -2117,13 +2223,13 @@ static void show_stats(struct patch *patch)
/*
* scale the add/delete
*/
- max = max + max_change > 70 ? 70 - max : max_change;
+ max = max + state->max_change > 70 ? 70 - max : state->max_change;
add = patch->lines_added;
del = patch->lines_deleted;
- if (max_change > 0) {
- int total = ((add + del) * max + max_change / 2) / max_change;
- add = (add * max + max_change / 2) / max_change;
+ if (state->max_change > 0) {
+ int total = ((add + del) * max + state->max_change / 2) / state->max_change;
+ add = (add * max + state->max_change / 2) / state->max_change;
del = total - add;
}
printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,
@@ -2194,17 +2300,17 @@ static void update_pre_post_images(struct image *preimage,
fixed = preimage->buf;
for (i = reduced = ctx = 0; i < postimage->nr; i++) {
- size_t len = postimage->line[i].len;
+ size_t l_len = postimage->line[i].len;
if (!(postimage->line[i].flag & LINE_COMMON)) {
/* an added line -- no counterparts in preimage */
- memmove(new, old, len);
- old += len;
- new += len;
+ memmove(new, old, l_len);
+ old += l_len;
+ new += l_len;
continue;
}
/* a common context -- skip it in the original postimage */
- old += len;
+ old += l_len;
/* and find the corresponding one in the fixed preimage */
while (ctx < preimage->nr &&
@@ -2223,11 +2329,11 @@ static void update_pre_post_images(struct image *preimage,
}
/* and copy it in, while fixing the line length */
- len = preimage->line[ctx].len;
- memcpy(new, fixed, len);
- new += len;
- fixed += len;
- postimage->line[i].len = len;
+ l_len = preimage->line[ctx].len;
+ memcpy(new, fixed, l_len);
+ new += l_len;
+ fixed += l_len;
+ postimage->line[i].len = l_len;
ctx++;
}
@@ -2242,7 +2348,76 @@ static void update_pre_post_images(struct image *preimage,
postimage->nr -= reduced;
}
-static int match_fragment(struct image *img,
+static int line_by_line_fuzzy_match(struct image *img,
+ struct image *preimage,
+ struct image *postimage,
+ unsigned long try,
+ int try_lno,
+ int preimage_limit)
+{
+ int i;
+ size_t imgoff = 0;
+ size_t preoff = 0;
+ size_t postlen = postimage->len;
+ size_t extra_chars;
+ char *buf;
+ char *preimage_eof;
+ char *preimage_end;
+ struct strbuf fixed;
+ char *fixed_buf;
+ size_t fixed_len;
+
+ for (i = 0; i < preimage_limit; i++) {
+ size_t prelen = preimage->line[i].len;
+ size_t imglen = img->line[try_lno+i].len;
+
+ if (!fuzzy_matchlines(img->buf + try + imgoff, imglen,
+ preimage->buf + preoff, prelen))
+ return 0;
+ if (preimage->line[i].flag & LINE_COMMON)
+ postlen += imglen - prelen;
+ imgoff += imglen;
+ preoff += prelen;
+ }
+
+ /*
+ * Ok, the preimage matches with whitespace fuzz.
+ *
+ * imgoff now holds the true length of the target that
+ * matches the preimage before the end of the file.
+ *
+ * Count the number of characters in the preimage that fall
+ * beyond the end of the file and make sure that all of them
+ * are whitespace characters. (This can only happen if
+ * we are removing blank lines at the end of the file.)
+ */
+ buf = preimage_eof = preimage->buf + preoff;
+ for ( ; i < preimage->nr; i++)
+ preoff += preimage->line[i].len;
+ preimage_end = preimage->buf + preoff;
+ for ( ; buf < preimage_end; buf++)
+ if (!isspace(*buf))
+ return 0;
+
+ /*
+ * Update the preimage and the common postimage context
+ * lines to use the same whitespace as the target.
+ * If whitespace is missing in the target (i.e.
+ * if the preimage extends beyond the end of the file),
+ * use the whitespace from the preimage.
+ */
+ extra_chars = preimage_end - preimage_eof;
+ strbuf_init(&fixed, imgoff + extra_chars);
+ strbuf_add(&fixed, img->buf + try, imgoff);
+ strbuf_add(&fixed, preimage_eof, extra_chars);
+ fixed_buf = strbuf_detach(&fixed, &fixed_len);
+ update_pre_post_images(preimage, postimage,
+ fixed_buf, fixed_len, postlen);
+ return 1;
+}
+
+static int match_fragment(struct apply_state *state,
+ struct image *img,
struct image *preimage,
struct image *postimage,
unsigned long try,
@@ -2263,7 +2438,7 @@ static int match_fragment(struct image *img,
preimage_limit = preimage->nr;
if (match_end && (preimage->nr + try_lno != img->nr))
return 0;
- } else if (ws_error_action == correct_ws_error &&
+ } else if (state->ws_error_action == correct_ws_error &&
(ws_rule & WS_BLANK_AT_EOF)) {
/*
* This hunk extends beyond the end of img, and we are
@@ -2331,63 +2506,11 @@ static int match_fragment(struct image *img,
* fuzzy matching. We collect all the line length information because
* we need it to adjust whitespace if we match.
*/
- if (ws_ignore_action == ignore_ws_change) {
- size_t imgoff = 0;
- size_t preoff = 0;
- size_t postlen = postimage->len;
- size_t extra_chars;
- char *preimage_eof;
- char *preimage_end;
- for (i = 0; i < preimage_limit; i++) {
- size_t prelen = preimage->line[i].len;
- size_t imglen = img->line[try_lno+i].len;
-
- if (!fuzzy_matchlines(img->buf + try + imgoff, imglen,
- preimage->buf + preoff, prelen))
- return 0;
- if (preimage->line[i].flag & LINE_COMMON)
- postlen += imglen - prelen;
- imgoff += imglen;
- preoff += prelen;
- }
+ if (state->ws_ignore_action == ignore_ws_change)
+ return line_by_line_fuzzy_match(img, preimage, postimage,
+ try, try_lno, preimage_limit);
- /*
- * Ok, the preimage matches with whitespace fuzz.
- *
- * imgoff now holds the true length of the target that
- * matches the preimage before the end of the file.
- *
- * Count the number of characters in the preimage that fall
- * beyond the end of the file and make sure that all of them
- * are whitespace characters. (This can only happen if
- * we are removing blank lines at the end of the file.)
- */
- buf = preimage_eof = preimage->buf + preoff;
- for ( ; i < preimage->nr; i++)
- preoff += preimage->line[i].len;
- preimage_end = preimage->buf + preoff;
- for ( ; buf < preimage_end; buf++)
- if (!isspace(*buf))
- return 0;
-
- /*
- * Update the preimage and the common postimage context
- * lines to use the same whitespace as the target.
- * If whitespace is missing in the target (i.e.
- * if the preimage extends beyond the end of the file),
- * use the whitespace from the preimage.
- */
- extra_chars = preimage_end - preimage_eof;
- strbuf_init(&fixed, imgoff + extra_chars);
- strbuf_add(&fixed, img->buf + try, imgoff);
- strbuf_add(&fixed, preimage_eof, extra_chars);
- fixed_buf = strbuf_detach(&fixed, &fixed_len);
- update_pre_post_images(preimage, postimage,
- fixed_buf, fixed_len, postlen);
- return 1;
- }
-
- if (ws_error_action != correct_ws_error)
+ if (state->ws_error_action != correct_ws_error)
return 0;
/*
@@ -2499,7 +2622,8 @@ static int match_fragment(struct image *img,
return 0;
}
-static int find_pos(struct image *img,
+static int find_pos(struct apply_state *state,
+ struct image *img,
struct image *preimage,
struct image *postimage,
int line,
@@ -2543,7 +2667,7 @@ static int find_pos(struct image *img,
try_lno = line;
for (i = 0; ; i++) {
- if (match_fragment(img, preimage, postimage,
+ if (match_fragment(state, img, preimage, postimage,
try, try_lno, ws_rule,
match_beginning, match_end))
return try_lno;
@@ -2594,7 +2718,8 @@ static void remove_last_line(struct image *img)
* apply at applied_pos (counts in line numbers) in "img".
* Update "img" to remove "preimage" and replace it with "postimage".
*/
-static void update_image(struct image *img,
+static void update_image(struct apply_state *state,
+ struct image *img,
int applied_pos,
struct image *preimage,
struct image *postimage)
@@ -2659,7 +2784,7 @@ static void update_image(struct image *img,
memcpy(img->line + applied_pos,
postimage->line,
postimage->nr * sizeof(*img->line));
- if (!allow_overlap)
+ if (!state->allow_overlap)
for (i = 0; i < postimage->nr; i++)
img->line[applied_pos + i].flag |= LINE_PATCHED;
img->nr = nr;
@@ -2670,7 +2795,8 @@ static void update_image(struct image *img,
* postimage) for the hunk. Find lines that match "preimage" in "img" and
* replace the part of "img" with "postimage" text.
*/
-static int apply_one_fragment(struct image *img, struct fragment *frag,
+static int apply_one_fragment(struct apply_state *state,
+ struct image *img, struct fragment *frag,
int inaccurate_eof, unsigned ws_rule,
int nth_fragment)
{
@@ -2715,7 +2841,7 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
if (len < size && patch[len] == '\\')
plen--;
first = *patch;
- if (apply_in_reverse) {
+ if (state->apply_in_reverse) {
if (first == '-')
first = '+';
else if (first == '+')
@@ -2748,17 +2874,17 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
/* Fall-through for ' ' */
case '+':
/* --no-add does not add new lines */
- if (first == '+' && no_add)
+ if (first == '+' && state->no_add)
break;
start = newlines.len;
if (first != '+' ||
- !whitespace_error ||
- ws_error_action != correct_ws_error) {
+ !state->whitespace_error ||
+ state->ws_error_action != correct_ws_error) {
strbuf_add(&newlines, patch + 1, plen);
}
else {
- ws_fix_copy(&newlines, patch + 1, plen, ws_rule, &applied_after_fixing_ws);
+ ws_fix_copy(&newlines, patch + 1, plen, ws_rule, &state->applied_after_fixing_ws);
}
add_line_info(&postimage, newlines.buf + start, newlines.len - start,
(first == '+' ? 0 : LINE_COMMON));
@@ -2771,7 +2897,7 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
/* Ignore it, we already handled it */
break;
default:
- if (apply_verbosely)
+ if (state->apply_verbosely)
error(_("invalid start of line: '%c'"), first);
applied_pos = -1;
goto out;
@@ -2812,7 +2938,7 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
* without leading context must match at the beginning.
*/
match_beginning = (!frag->oldpos ||
- (frag->oldpos == 1 && !unidiff_zero));
+ (frag->oldpos == 1 && !state->unidiff_zero));
/*
* A hunk without trailing lines must match at the end.
@@ -2820,7 +2946,7 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
* from the lack of trailing lines if the patch was generated
* with unidiff without any context.
*/
- match_end = !unidiff_zero && !trailing;
+ match_end = !state->unidiff_zero && !trailing;
pos = frag->newpos ? (frag->newpos - 1) : 0;
preimage.buf = oldlines;
@@ -2832,14 +2958,14 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
for (;;) {
- applied_pos = find_pos(img, &preimage, &postimage, pos,
+ applied_pos = find_pos(state, img, &preimage, &postimage, pos,
ws_rule, match_beginning, match_end);
if (applied_pos >= 0)
break;
/* Am I at my context limits? */
- if ((leading <= p_context) && (trailing <= p_context))
+ if ((leading <= state->p_context) && (trailing <= state->p_context))
break;
if (match_beginning || match_end) {
match_beginning = match_end = 0;
@@ -2868,10 +2994,10 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
if (new_blank_lines_at_end &&
preimage.nr + applied_pos >= img->nr &&
(ws_rule & WS_BLANK_AT_EOF) &&
- ws_error_action != nowarn_ws_error) {
- record_ws_error(WS_BLANK_AT_EOF, "+", 1,
+ state->ws_error_action != nowarn_ws_error) {
+ record_ws_error(state, WS_BLANK_AT_EOF, "+", 1,
found_new_blank_lines_at_end);
- if (ws_error_action == correct_ws_error) {
+ if (state->ws_error_action == correct_ws_error) {
while (new_blank_lines_at_end--)
remove_last_line(&postimage);
}
@@ -2882,13 +3008,13 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
* apply_patch->check_patch_list->check_patch->
* apply_data->apply_fragments->apply_one_fragment
*/
- if (ws_error_action == die_on_ws_error)
- apply = 0;
+ if (state->ws_error_action == die_on_ws_error)
+ state->apply = 0;
}
- if (apply_verbosely && applied_pos != pos) {
+ if (state->apply_verbosely && applied_pos != pos) {
int offset = applied_pos - pos;
- if (apply_in_reverse)
+ if (state->apply_in_reverse)
offset = 0 - offset;
fprintf_ln(stderr,
Q_("Hunk #%d succeeded at %d (offset %d line).",
@@ -2906,9 +3032,9 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
fprintf_ln(stderr, _("Context reduced to (%ld/%ld)"
" to apply fragment at %d"),
leading, trailing, applied_pos+1);
- update_image(img, applied_pos, &preimage, &postimage);
+ update_image(state, img, applied_pos, &preimage, &postimage);
} else {
- if (apply_verbosely)
+ if (state->apply_verbosely)
error(_("while searching for:\n%.*s"),
(int)(old - oldlines), oldlines);
}
@@ -2922,7 +3048,9 @@ out:
return (applied_pos < 0);
}
-static int apply_binary_fragment(struct image *img, struct patch *patch)
+static int apply_binary_fragment(struct apply_state *state,
+ struct image *img,
+ struct patch *patch)
{
struct fragment *fragment = patch->fragments;
unsigned long len;
@@ -2935,7 +3063,7 @@ static int apply_binary_fragment(struct image *img, struct patch *patch)
patch->old_name);
/* Binary patch is irreversible without the optional second hunk */
- if (apply_in_reverse) {
+ if (state->apply_in_reverse) {
if (!fragment->next)
return error("cannot reverse-apply a binary patch "
"without the reverse hunk to '%s'",
@@ -2968,7 +3096,9 @@ static int apply_binary_fragment(struct image *img, struct patch *patch)
* but the preimage prepared by the caller in "img" is freed here
* or in the helper function apply_binary_fragment() this calls.
*/
-static int apply_binary(struct image *img, struct patch *patch)
+static int apply_binary(struct apply_state *state,
+ struct image *img,
+ struct patch *patch)
{
const char *name = patch->old_name ? patch->old_name : patch->new_name;
unsigned char sha1[20];
@@ -3029,7 +3159,7 @@ static int apply_binary(struct image *img, struct patch *patch)
* apply the patch data to it, which is stored
* in the patch->fragments->{patch,size}.
*/
- if (apply_binary_fragment(img, patch))
+ if (apply_binary_fragment(state, img, patch))
return error(_("binary patch does not apply to '%s'"),
name);
@@ -3043,7 +3173,7 @@ static int apply_binary(struct image *img, struct patch *patch)
return 0;
}
-static int apply_fragments(struct image *img, struct patch *patch)
+static int apply_fragments(struct apply_state *state, struct image *img, struct patch *patch)
{
struct fragment *frag = patch->fragments;
const char *name = patch->old_name ? patch->old_name : patch->new_name;
@@ -3052,13 +3182,13 @@ static int apply_fragments(struct image *img, struct patch *patch)
int nth = 0;
if (patch->is_binary)
- return apply_binary(img, patch);
+ return apply_binary(state, img, patch);
while (frag) {
nth++;
- if (apply_one_fragment(img, frag, inaccurate_eof, ws_rule, nth)) {
+ if (apply_one_fragment(state, img, frag, inaccurate_eof, ws_rule, nth)) {
error(_("patch failed: %s:%ld"), name, frag->oldpos);
- if (!apply_with_reject)
+ if (!state->apply_with_reject)
return -1;
frag->rejected = 1;
}
@@ -3093,14 +3223,14 @@ static int read_file_or_gitlink(const struct cache_entry *ce, struct strbuf *buf
return read_blob_object(buf, ce->sha1, ce->ce_mode);
}
-static struct patch *in_fn_table(const char *name)
+static struct patch *in_fn_table(struct apply_state *state, const char *name)
{
struct string_list_item *item;
if (name == NULL)
return NULL;
- item = string_list_lookup(&fn_table, name);
+ item = string_list_lookup(&state->fn_table, name);
if (item != NULL)
return (struct patch *)item->util;
@@ -3132,7 +3262,7 @@ static int was_deleted(struct patch *patch)
return patch == PATH_WAS_DELETED;
}
-static void add_to_fn_table(struct patch *patch)
+static void add_to_fn_table(struct apply_state *state, struct patch *patch)
{
struct string_list_item *item;
@@ -3142,7 +3272,7 @@ static void add_to_fn_table(struct patch *patch)
* file creations and copies
*/
if (patch->new_name != NULL) {
- item = string_list_insert(&fn_table, patch->new_name);
+ item = string_list_insert(&state->fn_table, patch->new_name);
item->util = patch;
}
@@ -3151,12 +3281,12 @@ static void add_to_fn_table(struct patch *patch)
* later chunks shouldn't patch old names
*/
if ((patch->new_name == NULL) || (patch->is_rename)) {
- item = string_list_insert(&fn_table, patch->old_name);
+ item = string_list_insert(&state->fn_table, patch->old_name);
item->util = PATH_WAS_DELETED;
}
}
-static void prepare_fn_table(struct patch *patch)
+static void prepare_fn_table(struct apply_state *state, struct patch *patch)
{
/*
* store information about incoming file deletion
@@ -3164,7 +3294,7 @@ static void prepare_fn_table(struct patch *patch)
while (patch) {
if ((patch->new_name == NULL) || (patch->is_rename)) {
struct string_list_item *item;
- item = string_list_insert(&fn_table, patch->old_name);
+ item = string_list_insert(&state->fn_table, patch->old_name);
item->util = PATH_TO_BE_DELETED;
}
patch = patch->next;
@@ -3185,7 +3315,9 @@ static int checkout_target(struct index_state *istate,
return 0;
}
-static struct patch *previous_patch(struct patch *patch, int *gone)
+static struct patch *previous_patch(struct apply_state *state,
+ struct patch *patch,
+ int *gone)
{
struct patch *previous;
@@ -3193,7 +3325,7 @@ static struct patch *previous_patch(struct patch *patch, int *gone)
if (patch->is_copy || patch->is_rename)
return NULL; /* "git" patches do not depend on the order */
- previous = in_fn_table(patch->old_name);
+ previous = in_fn_table(state, patch->old_name);
if (!previous)
return NULL;
@@ -3218,15 +3350,16 @@ static int verify_index_match(const struct cache_entry *ce, struct stat *st)
#define SUBMODULE_PATCH_WITHOUT_INDEX 1
-static int load_patch_target(struct strbuf *buf,
+static int load_patch_target(struct apply_state *state,
+ struct strbuf *buf,
const struct cache_entry *ce,
struct stat *st,
const char *name,
unsigned expected_mode)
{
- if (cached || check_index) {
+ if (state->cached || state->check_index) {
if (read_file_or_gitlink(ce, buf))
- return error(_("read of %s failed"), name);
+ return error(_("failed to read %s"), name);
} else if (name) {
if (S_ISGITLINK(expected_mode)) {
if (ce)
@@ -3237,7 +3370,7 @@ static int load_patch_target(struct strbuf *buf,
return error(_("reading from '%s' beyond a symbolic link"), name);
} else {
if (read_old_data(st, name, buf))
- return error(_("read of %s failed"), name);
+ return error(_("failed to read %s"), name);
}
}
return 0;
@@ -3250,7 +3383,8 @@ static int load_patch_target(struct strbuf *buf,
* applying a non-git patch that incrementally updates the tree,
* we read from the result of a previous diff.
*/
-static int load_preimage(struct image *image,
+static int load_preimage(struct apply_state *state,
+ struct image *image,
struct patch *patch, struct stat *st,
const struct cache_entry *ce)
{
@@ -3260,7 +3394,7 @@ static int load_preimage(struct image *image,
struct patch *previous;
int status;
- previous = previous_patch(patch, &status);
+ previous = previous_patch(state, patch, &status);
if (status)
return error(_("path %s has been renamed/deleted"),
patch->old_name);
@@ -3268,7 +3402,7 @@ static int load_preimage(struct image *image,
/* We have a patched copy in memory; use that. */
strbuf_add(&buf, previous->result, previous->resultsize);
} else {
- status = load_patch_target(&buf, ce, st,
+ status = load_patch_target(state, &buf, ce, st,
patch->old_name, patch->old_mode);
if (status < 0)
return status;
@@ -3282,7 +3416,7 @@ static int load_preimage(struct image *image,
free_fragment_list(patch->fragments);
patch->fragments = NULL;
} else if (status) {
- return error(_("read of %s failed"), patch->old_name);
+ return error(_("failed to read %s"), patch->old_name);
}
}
@@ -3327,7 +3461,9 @@ static int three_way_merge(struct image *image,
* the current contents of the new_name. In no cases other than that
* this function will be called.
*/
-static int load_current(struct image *image, struct patch *patch)
+static int load_current(struct apply_state *state,
+ struct image *image,
+ struct patch *patch)
{
struct strbuf buf = STRBUF_INIT;
int status, pos;
@@ -3354,7 +3490,7 @@ static int load_current(struct image *image, struct patch *patch)
if (verify_index_match(ce, &st))
return error(_("%s: does not match index"), name);
- status = load_patch_target(&buf, ce, &st, name, mode);
+ status = load_patch_target(state, &buf, ce, &st, name, mode);
if (status < 0)
return status;
else if (status)
@@ -3364,8 +3500,11 @@ static int load_current(struct image *image, struct patch *patch)
return 0;
}
-static int try_threeway(struct image *image, struct patch *patch,
- struct stat *st, const struct cache_entry *ce)
+static int try_threeway(struct apply_state *state,
+ struct image *image,
+ struct patch *patch,
+ struct stat *st,
+ const struct cache_entry *ce)
{
unsigned char pre_sha1[20], post_sha1[20], our_sha1[20];
struct strbuf buf = STRBUF_INIT;
@@ -3391,7 +3530,7 @@ static int try_threeway(struct image *image, struct patch *patch,
img = strbuf_detach(&buf, &len);
prepare_image(&tmp_image, img, len, 1);
/* Apply the patch to get the post image */
- if (apply_fragments(&tmp_image, patch) < 0) {
+ if (apply_fragments(state, &tmp_image, patch) < 0) {
clear_image(&tmp_image);
return -1;
}
@@ -3401,11 +3540,11 @@ static int try_threeway(struct image *image, struct patch *patch,
/* our_sha1[] is ours */
if (patch->is_new) {
- if (load_current(&tmp_image, patch))
+ if (load_current(state, &tmp_image, patch))
return error("cannot read the current contents of '%s'",
patch->new_name);
} else {
- if (load_preimage(&tmp_image, patch, st, ce))
+ if (load_preimage(state, &tmp_image, patch, st, ce))
return error("cannot read the current contents of '%s'",
patch->old_name);
}
@@ -3435,22 +3574,23 @@ static int try_threeway(struct image *image, struct patch *patch,
return 0;
}
-static int apply_data(struct patch *patch, struct stat *st, const struct cache_entry *ce)
+static int apply_data(struct apply_state *state, struct patch *patch,
+ struct stat *st, const struct cache_entry *ce)
{
struct image image;
- if (load_preimage(&image, patch, st, ce) < 0)
+ if (load_preimage(state, &image, patch, st, ce) < 0)
return -1;
if (patch->direct_to_threeway ||
- apply_fragments(&image, patch) < 0) {
+ apply_fragments(state, &image, patch) < 0) {
/* Note: with --reject, apply_fragments() returns 0 */
- if (!threeway || try_threeway(&image, patch, st, ce) < 0)
+ if (!state->threeway || try_threeway(state, &image, patch, st, ce) < 0)
return -1;
}
patch->result = image.buf;
patch->resultsize = image.len;
- add_to_fn_table(patch);
+ add_to_fn_table(state, patch);
free(image.line_allocated);
if (0 < patch->is_delete && patch->resultsize)
@@ -3470,7 +3610,10 @@ static int apply_data(struct patch *patch, struct stat *st, const struct cache_e
* check_patch() separately makes sure (and errors out otherwise) that
* the path the patch creates does not exist in the current tree.
*/
-static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st)
+static int check_preimage(struct apply_state *state,
+ struct patch *patch,
+ struct cache_entry **ce,
+ struct stat *st)
{
const char *old_name = patch->old_name;
struct patch *previous = NULL;
@@ -3481,19 +3624,19 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
return 0;
assert(patch->is_new <= 0);
- previous = previous_patch(patch, &status);
+ previous = previous_patch(state, patch, &status);
if (status)
return error(_("path %s has been renamed/deleted"), old_name);
if (previous) {
st_mode = previous->new_mode;
- } else if (!cached) {
+ } else if (!state->cached) {
stat_ret = lstat(old_name, st);
if (stat_ret && errno != ENOENT)
return error(_("%s: %s"), old_name, strerror(errno));
}
- if (check_index && !previous) {
+ if (state->check_index && !previous) {
int pos = cache_name_pos(old_name, strlen(old_name));
if (pos < 0) {
if (patch->is_new < 0)
@@ -3505,9 +3648,9 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
if (checkout_target(&the_index, *ce, st))
return -1;
}
- if (!cached && verify_index_match(*ce, st))
+ if (!state->cached && verify_index_match(*ce, st))
return error(_("%s: does not match index"), old_name);
- if (cached)
+ if (state->cached)
st_mode = (*ce)->ce_mode;
} else if (stat_ret < 0) {
if (patch->is_new < 0)
@@ -3515,7 +3658,7 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
return error(_("%s: %s"), old_name, strerror(errno));
}
- if (!cached && !previous)
+ if (!state->cached && !previous)
st_mode = ce_mode_from_stat(*ce, st->st_mode);
if (patch->is_new < 0)
@@ -3543,15 +3686,17 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
#define EXISTS_IN_INDEX 1
#define EXISTS_IN_WORKTREE 2
-static int check_to_create(const char *new_name, int ok_if_exists)
+static int check_to_create(struct apply_state *state,
+ const char *new_name,
+ int ok_if_exists)
{
struct stat nst;
- if (check_index &&
+ if (state->check_index &&
cache_name_pos(new_name, strlen(new_name)) >= 0 &&
!ok_if_exists)
return EXISTS_IN_INDEX;
- if (cached)
+ if (state->cached)
return 0;
if (!lstat(new_name, &nst)) {
@@ -3574,56 +3719,46 @@ static int check_to_create(const char *new_name, int ok_if_exists)
return 0;
}
-/*
- * We need to keep track of how symlinks in the preimage are
- * manipulated by the patches. A patch to add a/b/c where a/b
- * is a symlink should not be allowed to affect the directory
- * the symlink points at, but if the same patch removes a/b,
- * it is perfectly fine, as the patch removes a/b to make room
- * to create a directory a/b so that a/b/c can be created.
- */
-static struct string_list symlink_changes;
-#define SYMLINK_GOES_AWAY 01
-#define SYMLINK_IN_RESULT 02
-
-static uintptr_t register_symlink_changes(const char *path, uintptr_t what)
+static uintptr_t register_symlink_changes(struct apply_state *state,
+ const char *path,
+ uintptr_t what)
{
struct string_list_item *ent;
- ent = string_list_lookup(&symlink_changes, path);
+ ent = string_list_lookup(&state->symlink_changes, path);
if (!ent) {
- ent = string_list_insert(&symlink_changes, path);
+ ent = string_list_insert(&state->symlink_changes, path);
ent->util = (void *)0;
}
ent->util = (void *)(what | ((uintptr_t)ent->util));
return (uintptr_t)ent->util;
}
-static uintptr_t check_symlink_changes(const char *path)
+static uintptr_t check_symlink_changes(struct apply_state *state, const char *path)
{
struct string_list_item *ent;
- ent = string_list_lookup(&symlink_changes, path);
+ ent = string_list_lookup(&state->symlink_changes, path);
if (!ent)
return 0;
return (uintptr_t)ent->util;
}
-static void prepare_symlink_changes(struct patch *patch)
+static void prepare_symlink_changes(struct apply_state *state, struct patch *patch)
{
for ( ; patch; patch = patch->next) {
if ((patch->old_name && S_ISLNK(patch->old_mode)) &&
(patch->is_rename || patch->is_delete))
/* the symlink at patch->old_name is removed */
- register_symlink_changes(patch->old_name, SYMLINK_GOES_AWAY);
+ register_symlink_changes(state, patch->old_name, SYMLINK_GOES_AWAY);
if (patch->new_name && S_ISLNK(patch->new_mode))
/* the symlink at patch->new_name is created or remains */
- register_symlink_changes(patch->new_name, SYMLINK_IN_RESULT);
+ register_symlink_changes(state, patch->new_name, SYMLINK_IN_RESULT);
}
}
-static int path_is_beyond_symlink_1(struct strbuf *name)
+static int path_is_beyond_symlink_1(struct apply_state *state, struct strbuf *name)
{
do {
unsigned int change;
@@ -3633,7 +3768,7 @@ static int path_is_beyond_symlink_1(struct strbuf *name)
if (!name->len)
break;
name->buf[name->len] = '\0';
- change = check_symlink_changes(name->buf);
+ change = check_symlink_changes(state, name->buf);
if (change & SYMLINK_IN_RESULT)
return 1;
if (change & SYMLINK_GOES_AWAY)
@@ -3644,7 +3779,7 @@ static int path_is_beyond_symlink_1(struct strbuf *name)
continue;
/* otherwise, check the preimage */
- if (check_index) {
+ if (state->check_index) {
struct cache_entry *ce;
ce = cache_file_exists(name->buf, name->len, ignore_case);
@@ -3659,14 +3794,14 @@ static int path_is_beyond_symlink_1(struct strbuf *name)
return 0;
}
-static int path_is_beyond_symlink(const char *name_)
+static int path_is_beyond_symlink(struct apply_state *state, const char *name_)
{
int ret;
struct strbuf name = STRBUF_INIT;
assert(*name_ != '\0');
strbuf_addstr(&name, name_);
- ret = path_is_beyond_symlink_1(&name);
+ ret = path_is_beyond_symlink_1(state, &name);
strbuf_release(&name);
return ret;
@@ -3693,7 +3828,7 @@ static void die_on_unsafe_path(struct patch *patch)
* Check and apply the patch in-core; leave the result in patch->result
* for the caller to write it out to the final destination.
*/
-static int check_patch(struct patch *patch)
+static int check_patch(struct apply_state *state, struct patch *patch)
{
struct stat st;
const char *old_name = patch->old_name;
@@ -3706,7 +3841,7 @@ static int check_patch(struct patch *patch)
patch->rejected = 1; /* we will drop this after we succeed */
- status = check_preimage(patch, &ce, &st);
+ status = check_preimage(state, patch, &ce, &st);
if (status)
return status;
old_name = patch->old_name;
@@ -3725,7 +3860,7 @@ static int check_patch(struct patch *patch)
* B and rename from A to B is handled the same way by asking
* was_deleted().
*/
- if ((tpatch = in_fn_table(new_name)) &&
+ if ((tpatch = in_fn_table(state, new_name)) &&
(was_deleted(tpatch) || to_be_deleted(tpatch)))
ok_if_exists = 1;
else
@@ -3733,9 +3868,9 @@ static int check_patch(struct patch *patch)
if (new_name &&
((0 < patch->is_new) || patch->is_rename || patch->is_copy)) {
- int err = check_to_create(new_name, ok_if_exists);
+ int err = check_to_create(state, new_name, ok_if_exists);
- if (err && threeway) {
+ if (err && state->threeway) {
patch->direct_to_threeway = 1;
} else switch (err) {
case 0:
@@ -3776,7 +3911,7 @@ static int check_patch(struct patch *patch)
}
}
- if (!unsafe_paths)
+ if (!state->unsafe_paths)
die_on_unsafe_path(patch);
/*
@@ -3788,27 +3923,27 @@ static int check_patch(struct patch *patch)
* is not deposited to a path that is beyond a symbolic link
* here.
*/
- if (!patch->is_delete && path_is_beyond_symlink(patch->new_name))
+ if (!patch->is_delete && path_is_beyond_symlink(state, patch->new_name))
return error(_("affected file '%s' is beyond a symbolic link"),
patch->new_name);
- if (apply_data(patch, &st, ce) < 0)
+ if (apply_data(state, patch, &st, ce) < 0)
return error(_("%s: patch does not apply"), name);
patch->rejected = 0;
return 0;
}
-static int check_patch_list(struct patch *patch)
+static int check_patch_list(struct apply_state *state, struct patch *patch)
{
int err = 0;
- prepare_symlink_changes(patch);
- prepare_fn_table(patch);
+ prepare_symlink_changes(state, patch);
+ prepare_fn_table(state, patch);
while (patch) {
- if (apply_verbosely)
+ if (state->apply_verbosely)
say_patch_name(stderr,
_("Checking patch %s..."), patch);
- err |= check_patch(patch);
+ err |= check_patch(state, patch);
patch = patch->next;
}
return err;
@@ -3912,7 +4047,7 @@ static void build_fake_ancestor(struct patch *list, const char *filename)
discard_index(&result);
}
-static void stat_patch_list(struct patch *patch)
+static void stat_patch_list(struct apply_state *state, struct patch *patch)
{
int files, adds, dels;
@@ -3920,13 +4055,14 @@ static void stat_patch_list(struct patch *patch)
files++;
adds += patch->lines_added;
dels += patch->lines_deleted;
- show_stats(patch);
+ show_stats(state, patch);
}
print_stat_summary(stdout, files, adds, dels);
}
-static void numstat_patch_list(struct patch *patch)
+static void numstat_patch_list(struct apply_state *state,
+ struct patch *patch)
{
for ( ; patch; patch = patch->next) {
const char *name;
@@ -3935,7 +4071,7 @@ static void numstat_patch_list(struct patch *patch)
printf("-\t-\t");
else
printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
- write_name_quoted(name, stdout, line_termination);
+ write_name_quoted(name, stdout, state->line_termination);
}
}
@@ -4017,49 +4153,53 @@ static void summary_patch_list(struct patch *patch)
}
}
-static void patch_stats(struct patch *patch)
+static void patch_stats(struct apply_state *state, struct patch *patch)
{
int lines = patch->lines_added + patch->lines_deleted;
- if (lines > max_change)
- max_change = lines;
+ if (lines > state->max_change)
+ state->max_change = lines;
if (patch->old_name) {
int len = quote_c_style(patch->old_name, NULL, NULL, 0);
if (!len)
len = strlen(patch->old_name);
- if (len > max_len)
- max_len = len;
+ if (len > state->max_len)
+ state->max_len = len;
}
if (patch->new_name) {
int len = quote_c_style(patch->new_name, NULL, NULL, 0);
if (!len)
len = strlen(patch->new_name);
- if (len > max_len)
- max_len = len;
+ if (len > state->max_len)
+ state->max_len = len;
}
}
-static void remove_file(struct patch *patch, int rmdir_empty)
+static void remove_file(struct apply_state *state, struct patch *patch, int rmdir_empty)
{
- if (update_index) {
+ if (state->update_index) {
if (remove_file_from_cache(patch->old_name) < 0)
die(_("unable to remove %s from index"), patch->old_name);
}
- if (!cached) {
+ if (!state->cached) {
if (!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {
remove_path(patch->old_name);
}
}
}
-static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
+static void add_index_file(struct apply_state *state,
+ const char *path,
+ unsigned mode,
+ void *buf,
+ unsigned long size)
{
struct stat st;
struct cache_entry *ce;
int namelen = strlen(path);
unsigned ce_size = cache_entry_size(namelen);
- if (!update_index)
+ if (!state->update_index)
return;
ce = xcalloc(1, ce_size);
@@ -4074,7 +4214,7 @@ static void add_index_file(const char *path, unsigned mode, void *buf, unsigned
get_sha1_hex(s, ce->sha1))
die(_("corrupt patch for submodule %s"), path);
} else {
- if (!cached) {
+ if (!state->cached) {
if (lstat(path, &st) < 0)
die_errno(_("unable to stat newly created file '%s'"),
path);
@@ -4126,9 +4266,13 @@ static int try_create_file(const char *path, unsigned int mode, const char *buf,
* which is true 99% of the time anyway. If they don't,
* we create them and try again.
*/
-static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
+static void create_one_file(struct apply_state *state,
+ char *path,
+ unsigned mode,
+ const char *buf,
+ unsigned long size)
{
- if (cached)
+ if (state->cached)
return;
if (!try_create_file(path, mode, buf, size))
return;
@@ -4169,13 +4313,14 @@ static void create_one_file(char *path, unsigned mode, const char *buf, unsigned
die_errno(_("unable to write file '%s' mode %o"), path, mode);
}
-static void add_conflicted_stages_file(struct patch *patch)
+static void add_conflicted_stages_file(struct apply_state *state,
+ struct patch *patch)
{
int stage, namelen;
unsigned ce_size, mode;
struct cache_entry *ce;
- if (!update_index)
+ if (!state->update_index)
return;
namelen = strlen(patch->new_name);
ce_size = cache_entry_size(namelen);
@@ -4196,7 +4341,7 @@ static void add_conflicted_stages_file(struct patch *patch)
}
}
-static void create_file(struct patch *patch)
+static void create_file(struct apply_state *state, struct patch *patch)
{
char *path = patch->new_name;
unsigned mode = patch->new_mode;
@@ -4205,25 +4350,27 @@ static void create_file(struct patch *patch)
if (!mode)
mode = S_IFREG | 0644;
- create_one_file(path, mode, buf, size);
+ create_one_file(state, path, mode, buf, size);
if (patch->conflicted_threeway)
- add_conflicted_stages_file(patch);
+ add_conflicted_stages_file(state, patch);
else
- add_index_file(path, mode, buf, size);
+ add_index_file(state, path, mode, buf, size);
}
/* phase zero is to remove, phase one is to create */
-static void write_out_one_result(struct patch *patch, int phase)
+static void write_out_one_result(struct apply_state *state,
+ struct patch *patch,
+ int phase)
{
if (patch->is_delete > 0) {
if (phase == 0)
- remove_file(patch, 1);
+ remove_file(state, patch, 1);
return;
}
if (patch->is_new > 0 || patch->is_copy) {
if (phase == 1)
- create_file(patch);
+ create_file(state, patch);
return;
}
/*
@@ -4231,12 +4378,12 @@ static void write_out_one_result(struct patch *patch, int phase)
* thing: remove the old, write the new
*/
if (phase == 0)
- remove_file(patch, patch->is_rename);
+ remove_file(state, patch, patch->is_rename);
if (phase == 1)
- create_file(patch);
+ create_file(state, patch);
}
-static int write_out_one_reject(struct patch *patch)
+static int write_out_one_reject(struct apply_state *state, struct patch *patch)
{
FILE *rej;
char namebuf[PATH_MAX];
@@ -4251,7 +4398,7 @@ static int write_out_one_reject(struct patch *patch)
}
if (!cnt) {
- if (apply_verbosely)
+ if (state->apply_verbosely)
say_patch_name(stderr,
_("Applied patch %s cleanly."), patch);
return 0;
@@ -4307,7 +4454,7 @@ static int write_out_one_reject(struct patch *patch)
return -1;
}
-static int write_out_results(struct patch *list)
+static int write_out_results(struct apply_state *state, struct patch *list)
{
int phase;
int errs = 0;
@@ -4320,9 +4467,9 @@ static int write_out_results(struct patch *list)
if (l->rejected)
errs = 1;
else {
- write_out_one_result(l, phase);
+ write_out_one_result(state, l, phase);
if (phase == 1) {
- if (write_out_one_reject(l))
+ if (write_out_one_reject(state, l))
errs = 1;
if (l->conflicted_threeway) {
string_list_append(&cpath, l->new_name);
@@ -4353,14 +4500,17 @@ static struct lock_file lock_file;
#define INACCURATE_EOF (1<<0)
#define RECOUNT (1<<1)
-static int apply_patch(int fd, const char *filename, int options)
+static int apply_patch(struct apply_state *state,
+ int fd,
+ const char *filename,
+ int options)
{
size_t offset;
struct strbuf buf = STRBUF_INIT; /* owns the patch text */
struct patch *list = NULL, **listp = &list;
int skipped_patch = 0;
- patch_input_file = filename;
+ state->patch_input_file = filename;
read_patch_file(&buf, fd);
offset = 0;
while (offset < buf.len) {
@@ -4370,20 +4520,20 @@ static int apply_patch(int fd, const char *filename, int options)
patch = xcalloc(1, sizeof(*patch));
patch->inaccurate_eof = !!(options & INACCURATE_EOF);
patch->recount = !!(options & RECOUNT);
- nr = parse_chunk(buf.buf + offset, buf.len - offset, patch);
+ nr = parse_chunk(state, buf.buf + offset, buf.len - offset, patch);
if (nr < 0) {
free_patch(patch);
break;
}
- if (apply_in_reverse)
+ if (state->apply_in_reverse)
reverse_patches(patch);
- if (use_patch(patch)) {
- patch_stats(patch);
+ if (use_patch(state, patch)) {
+ patch_stats(state, patch);
*listp = patch;
listp = &patch->next;
}
else {
- if (apply_verbosely)
+ if (state->apply_verbosely)
say_patch_name(stderr, _("Skipped patch '%s'."), patch);
free_patch(patch);
skipped_patch++;
@@ -4394,45 +4544,45 @@ static int apply_patch(int fd, const char *filename, int options)
if (!list && !skipped_patch)
die(_("unrecognized input"));
- if (whitespace_error && (ws_error_action == die_on_ws_error))
- apply = 0;
+ if (state->whitespace_error && (state->ws_error_action == die_on_ws_error))
+ state->apply = 0;
- update_index = check_index && apply;
- if (update_index && newfd < 0)
- newfd = hold_locked_index(&lock_file, 1);
+ state->update_index = state->check_index && state->apply;
+ if (state->update_index && state->newfd < 0)
+ state->newfd = hold_locked_index(state->lock_file, 1);
- if (check_index) {
+ if (state->check_index) {
if (read_cache() < 0)
die(_("unable to read index file"));
}
- if ((check || apply) &&
- check_patch_list(list) < 0 &&
- !apply_with_reject)
+ if ((state->check || state->apply) &&
+ check_patch_list(state, list) < 0 &&
+ !state->apply_with_reject)
exit(1);
- if (apply && write_out_results(list)) {
- if (apply_with_reject)
+ if (state->apply && write_out_results(state, list)) {
+ if (state->apply_with_reject)
exit(1);
/* with --3way, we still need to write the index out */
return 1;
}
- if (fake_ancestor)
- build_fake_ancestor(list, fake_ancestor);
+ if (state->fake_ancestor)
+ build_fake_ancestor(list, state->fake_ancestor);
- if (diffstat)
- stat_patch_list(list);
+ if (state->diffstat)
+ stat_patch_list(state, list);
- if (numstat)
- numstat_patch_list(list);
+ if (state->numstat)
+ numstat_patch_list(state, list);
- if (summary)
+ if (state->summary)
summary_patch_list(list);
free_patch_list(list);
strbuf_release(&buf);
- string_list_clear(&fn_table, 0);
+ string_list_clear(&state->fn_table, 0);
return 0;
}
@@ -4446,220 +4596,284 @@ static void git_apply_config(void)
static int option_parse_exclude(const struct option *opt,
const char *arg, int unset)
{
- add_name_limit(arg, 1);
+ struct apply_state *state = opt->value;
+ add_name_limit(state, arg, 1);
return 0;
}
static int option_parse_include(const struct option *opt,
const char *arg, int unset)
{
- add_name_limit(arg, 0);
- has_include = 1;
+ struct apply_state *state = opt->value;
+ add_name_limit(state, arg, 0);
+ state->has_include = 1;
return 0;
}
static int option_parse_p(const struct option *opt,
- const char *arg, int unset)
+ const char *arg,
+ int unset)
{
- p_value = atoi(arg);
- p_value_known = 1;
+ struct apply_state *state = opt->value;
+ state->p_value = atoi(arg);
+ state->p_value_known = 1;
return 0;
}
static int option_parse_space_change(const struct option *opt,
- const char *arg, int unset)
+ const char *arg, int unset)
{
+ struct apply_state *state = opt->value;
if (unset)
- ws_ignore_action = ignore_ws_none;
+ state->ws_ignore_action = ignore_ws_none;
else
- ws_ignore_action = ignore_ws_change;
+ state->ws_ignore_action = ignore_ws_change;
return 0;
}
static int option_parse_whitespace(const struct option *opt,
const char *arg, int unset)
{
- const char **whitespace_option = opt->value;
-
- *whitespace_option = arg;
- parse_whitespace_option(arg);
+ struct apply_state *state = opt->value;
+ state->whitespace_option = arg;
+ parse_whitespace_option(state, arg);
return 0;
}
static int option_parse_directory(const struct option *opt,
const char *arg, int unset)
{
- strbuf_reset(&root);
- strbuf_addstr(&root, arg);
- strbuf_complete(&root, '/');
+ struct apply_state *state = opt->value;
+ strbuf_reset(&state->root);
+ strbuf_addstr(&state->root, arg);
+ strbuf_complete(&state->root, '/');
return 0;
}
-int cmd_apply(int argc, const char **argv, const char *prefix_)
+static void init_apply_state(struct apply_state *state,
+ const char *prefix,
+ struct lock_file *lock_file)
+{
+ memset(state, 0, sizeof(*state));
+ state->prefix = prefix;
+ state->prefix_length = state->prefix ? strlen(state->prefix) : 0;
+ state->lock_file = lock_file;
+ state->newfd = -1;
+ state->apply = 1;
+ state->line_termination = '\n';
+ state->p_value = 1;
+ state->p_context = UINT_MAX;
+ state->squelch_whitespace_errors = 5;
+ state->ws_error_action = warn_on_ws_error;
+ state->ws_ignore_action = ignore_ws_none;
+ state->linenr = 1;
+ string_list_init(&state->fn_table, 0);
+ string_list_init(&state->limit_by_name, 0);
+ string_list_init(&state->symlink_changes, 0);
+ strbuf_init(&state->root, 0);
+
+ git_apply_config();
+ if (apply_default_whitespace)
+ parse_whitespace_option(state, apply_default_whitespace);
+ if (apply_default_ignorewhitespace)
+ parse_ignorewhitespace_option(state, apply_default_ignorewhitespace);
+}
+
+static void clear_apply_state(struct apply_state *state)
+{
+ string_list_clear(&state->limit_by_name, 0);
+ string_list_clear(&state->symlink_changes, 0);
+ strbuf_release(&state->root);
+
+ /* &state->fn_table is cleared at the end of apply_patch() */
+}
+
+static void check_apply_state(struct apply_state *state, int force_apply)
+{
+ int is_not_gitdir = !startup_info->have_repository;
+
+ if (state->apply_with_reject && state->threeway)
+ die("--reject and --3way cannot be used together.");
+ if (state->cached && state->threeway)
+ die("--cached and --3way cannot be used together.");
+ if (state->threeway) {
+ if (is_not_gitdir)
+ die(_("--3way outside a repository"));
+ state->check_index = 1;
+ }
+ if (state->apply_with_reject)
+ state->apply = state->apply_verbosely = 1;
+ if (!force_apply && (state->diffstat || state->numstat || state->summary || state->check || state->fake_ancestor))
+ state->apply = 0;
+ if (state->check_index && is_not_gitdir)
+ die(_("--index outside a repository"));
+ if (state->cached) {
+ if (is_not_gitdir)
+ die(_("--cached outside a repository"));
+ state->check_index = 1;
+ }
+ if (state->check_index)
+ state->unsafe_paths = 0;
+ if (!state->lock_file)
+ die("BUG: state->lock_file should not be NULL");
+}
+
+static int apply_all_patches(struct apply_state *state,
+ int argc,
+ const char **argv,
+ int options)
{
int i;
int errs = 0;
- int is_not_gitdir = !startup_info->have_repository;
- int force_apply = 0;
+ int read_stdin = 1;
+
+ for (i = 0; i < argc; i++) {
+ const char *arg = argv[i];
+ int fd;
+
+ if (!strcmp(arg, "-")) {
+ errs |= apply_patch(state, 0, "<stdin>", options);
+ read_stdin = 0;
+ continue;
+ } else if (0 < state->prefix_length)
+ arg = prefix_filename(state->prefix,
+ state->prefix_length,
+ arg);
+
+ fd = open(arg, O_RDONLY);
+ if (fd < 0)
+ die_errno(_("can't open patch '%s'"), arg);
+ read_stdin = 0;
+ set_default_whitespace_mode(state);
+ errs |= apply_patch(state, fd, arg, options);
+ close(fd);
+ }
+ set_default_whitespace_mode(state);
+ if (read_stdin)
+ errs |= apply_patch(state, 0, "<stdin>", options);
+
+ if (state->whitespace_error) {
+ if (state->squelch_whitespace_errors &&
+ state->squelch_whitespace_errors < state->whitespace_error) {
+ int squelched =
+ state->whitespace_error - state->squelch_whitespace_errors;
+ warning(Q_("squelched %d whitespace error",
+ "squelched %d whitespace errors",
+ squelched),
+ squelched);
+ }
+ if (state->ws_error_action == die_on_ws_error)
+ die(Q_("%d line adds whitespace errors.",
+ "%d lines add whitespace errors.",
+ state->whitespace_error),
+ state->whitespace_error);
+ if (state->applied_after_fixing_ws && state->apply)
+ warning("%d line%s applied after"
+ " fixing whitespace errors.",
+ state->applied_after_fixing_ws,
+ state->applied_after_fixing_ws == 1 ? "" : "s");
+ else if (state->whitespace_error)
+ warning(Q_("%d line adds whitespace errors.",
+ "%d lines add whitespace errors.",
+ state->whitespace_error),
+ state->whitespace_error);
+ }
+
+ if (state->update_index) {
+ if (write_locked_index(&the_index, state->lock_file, COMMIT_LOCK))
+ die(_("Unable to write new index file"));
+ state->newfd = -1;
+ }
+
+ return !!errs;
+}
- const char *whitespace_option = NULL;
+int cmd_apply(int argc, const char **argv, const char *prefix)
+{
+ int force_apply = 0;
+ int options = 0;
+ int ret;
+ struct apply_state state;
struct option builtin_apply_options[] = {
- { OPTION_CALLBACK, 0, "exclude", NULL, N_("path"),
+ { OPTION_CALLBACK, 0, "exclude", &state, N_("path"),
N_("don't apply changes matching the given path"),
0, option_parse_exclude },
- { OPTION_CALLBACK, 0, "include", NULL, N_("path"),
+ { OPTION_CALLBACK, 0, "include", &state, N_("path"),
N_("apply changes matching the given path"),
0, option_parse_include },
- { OPTION_CALLBACK, 'p', NULL, NULL, N_("num"),
+ { OPTION_CALLBACK, 'p', NULL, &state, N_("num"),
N_("remove <num> leading slashes from traditional diff paths"),
0, option_parse_p },
- OPT_BOOL(0, "no-add", &no_add,
+ OPT_BOOL(0, "no-add", &state.no_add,
N_("ignore additions made by the patch")),
- OPT_BOOL(0, "stat", &diffstat,
+ OPT_BOOL(0, "stat", &state.diffstat,
N_("instead of applying the patch, output diffstat for the input")),
OPT_NOOP_NOARG(0, "allow-binary-replacement"),
OPT_NOOP_NOARG(0, "binary"),
- OPT_BOOL(0, "numstat", &numstat,
+ OPT_BOOL(0, "numstat", &state.numstat,
N_("show number of added and deleted lines in decimal notation")),
- OPT_BOOL(0, "summary", &summary,
+ OPT_BOOL(0, "summary", &state.summary,
N_("instead of applying the patch, output a summary for the input")),
- OPT_BOOL(0, "check", &check,
+ OPT_BOOL(0, "check", &state.check,
N_("instead of applying the patch, see if the patch is applicable")),
- OPT_BOOL(0, "index", &check_index,
+ OPT_BOOL(0, "index", &state.check_index,
N_("make sure the patch is applicable to the current index")),
- OPT_BOOL(0, "cached", &cached,
+ OPT_BOOL(0, "cached", &state.cached,
N_("apply a patch without touching the working tree")),
- OPT_BOOL(0, "unsafe-paths", &unsafe_paths,
+ OPT_BOOL(0, "unsafe-paths", &state.unsafe_paths,
N_("accept a patch that touches outside the working area")),
OPT_BOOL(0, "apply", &force_apply,
N_("also apply the patch (use with --stat/--summary/--check)")),
- OPT_BOOL('3', "3way", &threeway,
+ OPT_BOOL('3', "3way", &state.threeway,
N_( "attempt three-way merge if a patch does not apply")),
- OPT_FILENAME(0, "build-fake-ancestor", &fake_ancestor,
+ OPT_FILENAME(0, "build-fake-ancestor", &state.fake_ancestor,
N_("build a temporary index based on embedded index information")),
/* Think twice before adding "--nul" synonym to this */
- OPT_SET_INT('z', NULL, &line_termination,
+ OPT_SET_INT('z', NULL, &state.line_termination,
N_("paths are separated with NUL character"), '\0'),
- OPT_INTEGER('C', NULL, &p_context,
+ OPT_INTEGER('C', NULL, &state.p_context,
N_("ensure at least <n> lines of context match")),
- { OPTION_CALLBACK, 0, "whitespace", &whitespace_option, N_("action"),
+ { OPTION_CALLBACK, 0, "whitespace", &state, N_("action"),
N_("detect new or modified lines that have whitespace errors"),
0, option_parse_whitespace },
- { OPTION_CALLBACK, 0, "ignore-space-change", NULL, NULL,
+ { OPTION_CALLBACK, 0, "ignore-space-change", &state, NULL,
N_("ignore changes in whitespace when finding context"),
PARSE_OPT_NOARG, option_parse_space_change },
- { OPTION_CALLBACK, 0, "ignore-whitespace", NULL, NULL,
+ { OPTION_CALLBACK, 0, "ignore-whitespace", &state, NULL,
N_("ignore changes in whitespace when finding context"),
PARSE_OPT_NOARG, option_parse_space_change },
- OPT_BOOL('R', "reverse", &apply_in_reverse,
+ OPT_BOOL('R', "reverse", &state.apply_in_reverse,
N_("apply the patch in reverse")),
- OPT_BOOL(0, "unidiff-zero", &unidiff_zero,
+ OPT_BOOL(0, "unidiff-zero", &state.unidiff_zero,
N_("don't expect at least one line of context")),
- OPT_BOOL(0, "reject", &apply_with_reject,
+ OPT_BOOL(0, "reject", &state.apply_with_reject,
N_("leave the rejected hunks in corresponding *.rej files")),
- OPT_BOOL(0, "allow-overlap", &allow_overlap,
+ OPT_BOOL(0, "allow-overlap", &state.allow_overlap,
N_("allow overlapping hunks")),
- OPT__VERBOSE(&apply_verbosely, N_("be verbose")),
+ OPT__VERBOSE(&state.apply_verbosely, N_("be verbose")),
OPT_BIT(0, "inaccurate-eof", &options,
N_("tolerate incorrectly detected missing new-line at the end of file"),
INACCURATE_EOF),
OPT_BIT(0, "recount", &options,
N_("do not trust the line counts in the hunk headers"),
RECOUNT),
- { OPTION_CALLBACK, 0, "directory", NULL, N_("root"),
+ { OPTION_CALLBACK, 0, "directory", &state, N_("root"),
N_("prepend <root> to all filenames"),
0, option_parse_directory },
OPT_END()
};
- prefix = prefix_;
- prefix_length = prefix ? strlen(prefix) : 0;
- git_apply_config();
- if (apply_default_whitespace)
- parse_whitespace_option(apply_default_whitespace);
- if (apply_default_ignorewhitespace)
- parse_ignorewhitespace_option(apply_default_ignorewhitespace);
+ init_apply_state(&state, prefix, &lock_file);
- argc = parse_options(argc, argv, prefix, builtin_apply_options,
+ argc = parse_options(argc, argv, state.prefix, builtin_apply_options,
apply_usage, 0);
- if (apply_with_reject && threeway)
- die("--reject and --3way cannot be used together.");
- if (cached && threeway)
- die("--cached and --3way cannot be used together.");
- if (threeway) {
- if (is_not_gitdir)
- die(_("--3way outside a repository"));
- check_index = 1;
- }
- if (apply_with_reject)
- apply = apply_verbosely = 1;
- if (!force_apply && (diffstat || numstat || summary || check || fake_ancestor))
- apply = 0;
- if (check_index && is_not_gitdir)
- die(_("--index outside a repository"));
- if (cached) {
- if (is_not_gitdir)
- die(_("--cached outside a repository"));
- check_index = 1;
- }
- if (check_index)
- unsafe_paths = 0;
+ check_apply_state(&state, force_apply);
- for (i = 0; i < argc; i++) {
- const char *arg = argv[i];
- int fd;
+ ret = apply_all_patches(&state, argc, argv, options);
- if (!strcmp(arg, "-")) {
- errs |= apply_patch(0, "<stdin>", options);
- read_stdin = 0;
- continue;
- } else if (0 < prefix_length)
- arg = prefix_filename(prefix, prefix_length, arg);
+ clear_apply_state(&state);
- fd = open(arg, O_RDONLY);
- if (fd < 0)
- die_errno(_("can't open patch '%s'"), arg);
- read_stdin = 0;
- set_default_whitespace_mode(whitespace_option);
- errs |= apply_patch(fd, arg, options);
- close(fd);
- }
- set_default_whitespace_mode(whitespace_option);
- if (read_stdin)
- errs |= apply_patch(0, "<stdin>", options);
- if (whitespace_error) {
- if (squelch_whitespace_errors &&
- squelch_whitespace_errors < whitespace_error) {
- int squelched =
- whitespace_error - squelch_whitespace_errors;
- warning(Q_("squelched %d whitespace error",
- "squelched %d whitespace errors",
- squelched),
- squelched);
- }
- if (ws_error_action == die_on_ws_error)
- die(Q_("%d line adds whitespace errors.",
- "%d lines add whitespace errors.",
- whitespace_error),
- whitespace_error);
- if (applied_after_fixing_ws && apply)
- warning("%d line%s applied after"
- " fixing whitespace errors.",
- applied_after_fixing_ws,
- applied_after_fixing_ws == 1 ? "" : "s");
- else if (whitespace_error)
- warning(Q_("%d line adds whitespace errors.",
- "%d lines add whitespace errors.",
- whitespace_error),
- whitespace_error);
- }
-
- if (update_index) {
- if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
- die(_("Unable to write new index file"));
- }
-
- return !!errs;
+ return ret;
}
diff --git a/builtin/blame.c b/builtin/blame.c
index 5e5d30e..f618392 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -56,7 +56,7 @@ static int show_progress;
static struct date_mode blame_date_mode = { DATE_ISO8601 };
static size_t blame_date_width;
-static struct string_list mailmap;
+static struct string_list mailmap = STRING_LIST_INIT_NODUP;
#ifndef DEBUG
#define DEBUG 0
@@ -598,7 +598,7 @@ static struct origin *find_origin(struct scoreboard *sb,
p->status);
case 'M':
porigin = get_origin(sb, parent, origin->path);
- hashcpy(porigin->blob_sha1, p->one->sha1);
+ hashcpy(porigin->blob_sha1, p->one->oid.hash);
porigin->mode = p->one->mode;
break;
case 'A':
@@ -608,7 +608,7 @@ static struct origin *find_origin(struct scoreboard *sb,
}
}
diff_flush(&diff_opts);
- free_pathspec(&diff_opts.pathspec);
+ clear_pathspec(&diff_opts.pathspec);
return porigin;
}
@@ -644,13 +644,13 @@ static struct origin *find_rename(struct scoreboard *sb,
if ((p->status == 'R' || p->status == 'C') &&
!strcmp(p->two->path, origin->path)) {
porigin = get_origin(sb, parent, p->one->path);
- hashcpy(porigin->blob_sha1, p->one->sha1);
+ hashcpy(porigin->blob_sha1, p->one->oid.hash);
porigin->mode = p->one->mode;
break;
}
}
diff_flush(&diff_opts);
- free_pathspec(&diff_opts.pathspec);
+ clear_pathspec(&diff_opts.pathspec);
return porigin;
}
@@ -1308,7 +1308,7 @@ static void find_copy_in_parent(struct scoreboard *sb,
continue;
norigin = get_origin(sb, parent, p->one->path);
- hashcpy(norigin->blob_sha1, p->one->sha1);
+ hashcpy(norigin->blob_sha1, p->one->oid.hash);
norigin->mode = p->one->mode;
fill_origin_blob(&sb->revs->diffopt, norigin, &file_p);
if (!file_p.ptr)
@@ -1342,7 +1342,7 @@ static void find_copy_in_parent(struct scoreboard *sb,
} while (unblamed);
target->suspects = reverse_blame(leftover, NULL);
diff_flush(&diff_opts);
- free_pathspec(&diff_opts.pathspec);
+ clear_pathspec(&diff_opts.pathspec);
}
/*
@@ -2111,7 +2111,7 @@ static void find_alignment(struct scoreboard *sb, int *option)
unsigned largest_score = 0;
struct blame_entry *e;
int compute_auto_abbrev = (abbrev < 0);
- int auto_abbrev = default_abbrev;
+ int auto_abbrev = DEFAULT_ABBREV;
for (e = sb->ent; e; e = e->next) {
struct origin *suspect = e->suspect;
@@ -2244,7 +2244,8 @@ static void verify_working_tree_path(struct commit *work_tree, const char *path)
pos = cache_name_pos(path, strlen(path));
if (pos >= 0)
; /* path is in the index */
- else if (!strcmp(active_cache[-1 - pos]->name, path))
+ else if (-1 - pos < active_nr &&
+ !strcmp(active_cache[-1 - pos]->name, path))
; /* path is in the index, unmerged */
else
die("no such path '%s' in HEAD", path);
@@ -2527,12 +2528,12 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
enum object_type type;
struct commit *final_commit = NULL;
- static struct string_list range_list;
- static int output_option = 0, opt = 0;
- static int show_stats = 0;
- static const char *revs_file = NULL;
- static const char *contents_from = NULL;
- static const struct option options[] = {
+ struct string_list range_list = STRING_LIST_INIT_NODUP;
+ int output_option = 0, opt = 0;
+ int show_stats = 0;
+ const char *revs_file = NULL;
+ const char *contents_from = NULL;
+ const struct option options[] = {
OPT_BOOL(0, "incremental", &incremental, N_("Show blame entries as we find them, incrementally")),
OPT_BOOL('b', NULL, &blank_boundary, N_("Show blank SHA-1 for boundary commits (Default: off)")),
OPT_BOOL(0, "root", &show_root, N_("Do not treat root commits as boundaries (Default: off)")),
@@ -2808,7 +2809,7 @@ parse_done:
lno = prepare_lines(&sb);
if (lno && !range_list.nr)
- string_list_append(&range_list, xstrdup("1"));
+ string_list_append(&range_list, "1");
anchor = 1;
range_set_init(&ranges, range_list.nr);
diff --git a/builtin/branch.c b/builtin/branch.c
index 2ecde53..6810c3a 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -212,7 +212,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
die(_("Couldn't look up commit object for HEAD"));
}
for (i = 0; i < argc; i++, strbuf_release(&bname)) {
- const char *target;
+ char *target = NULL;
int flags = 0;
strbuf_branchname(&bname, argv[i]);
@@ -231,11 +231,11 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
}
}
- target = resolve_ref_unsafe(name,
- RESOLVE_REF_READING
- | RESOLVE_REF_NO_RECURSE
- | RESOLVE_REF_ALLOW_BAD_NAME,
- sha1, &flags);
+ target = resolve_refdup(name,
+ RESOLVE_REF_READING
+ | RESOLVE_REF_NO_RECURSE
+ | RESOLVE_REF_ALLOW_BAD_NAME,
+ sha1, &flags);
if (!target) {
error(remote_branch
? _("remote-tracking branch '%s' not found.")
@@ -248,7 +248,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
check_branch_commit(bname.buf, name, sha1, head_rev, kinds,
force)) {
ret = 1;
- continue;
+ goto next;
}
if (delete_ref(name, is_null_sha1(sha1) ? NULL : sha1,
@@ -258,7 +258,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
: _("Error deleting branch '%s'"),
bname.buf);
ret = 1;
- continue;
+ goto next;
}
if (!quiet) {
printf(remote_branch
@@ -270,6 +270,9 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
: find_unique_abbrev(sha1, DEFAULT_ABBREV));
}
delete_branch_config(bname.buf);
+
+ next:
+ free(target);
}
free(name);
@@ -614,14 +617,11 @@ static int edit_branch_description(const char *branch_name)
if (!buf.len || buf.buf[buf.len-1] != '\n')
strbuf_addch(&buf, '\n');
strbuf_commented_addf(&buf,
- "Please edit the description for the branch\n"
- " %s\n"
- "Lines starting with '%c' will be stripped.\n",
+ _("Please edit the description for the branch\n"
+ " %s\n"
+ "Lines starting with '%c' will be stripped.\n"),
branch_name, comment_line_char);
- if (write_file_gently(git_path(edit_description), "%s", buf.buf)) {
- strbuf_release(&buf);
- return error_errno(_("could not write branch description template"));
- }
+ write_file_buf(git_path(edit_description), buf.buf, buf.len);
strbuf_reset(&buf);
if (launch_editor(git_path(edit_description), &buf, NULL)) {
strbuf_release(&buf);
@@ -807,7 +807,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
* create_branch takes care of setting up the tracking
* info and making sure new_upstream is correct
*/
- create_branch(head, branch->name, new_upstream, 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE);
+ create_branch(branch->name, new_upstream, 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE);
} else if (unset_upstream) {
struct branch *branch = branch_get(argv[0]);
struct strbuf buf = STRBUF_INIT;
@@ -853,7 +853,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
strbuf_release(&buf);
branch_existed = ref_exists(branch->refname);
- create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
+ create_branch(argv[0], (argc == 2) ? argv[1] : head,
force, reflog, 0, quiet, track);
/*
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 2dfe626..560f6c2 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -440,7 +440,7 @@ static int batch_objects(struct batch_options *opt)
}
static const char * const cat_file_usage[] = {
- N_("git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<type>|--textconv) <object>"),
+ N_("git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv) <object>"),
N_("git cat-file (--batch | --batch-check) [--follow-symlinks]"),
NULL
};
diff --git a/builtin/checkout.c b/builtin/checkout.c
index d3b2968..899bd8d 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -154,8 +154,8 @@ static int check_stages(unsigned stages, const struct cache_entry *ce, int pos)
return 0;
}
-static int checkout_stage(int stage, struct cache_entry *ce, int pos,
- struct checkout *state)
+static int checkout_stage(int stage, const struct cache_entry *ce, int pos,
+ const struct checkout *state)
{
while (pos < active_nr &&
!strcmp(active_cache[pos]->name, ce->name)) {
@@ -169,7 +169,7 @@ static int checkout_stage(int stage, struct cache_entry *ce, int pos,
return error(_("path '%s' does not have their version"), ce->name);
}
-static int checkout_merged(int pos, struct checkout *state)
+static int checkout_merged(int pos, const struct checkout *state)
{
struct cache_entry *ce = active_cache[pos];
const char *path = ce->name;
@@ -276,7 +276,7 @@ static int checkout_paths(const struct checkout_opts *opts,
hold_locked_index(lock_file, 1);
if (read_cache_preload(&opts->pathspec) < 0)
- return error(_("corrupt index file"));
+ return error(_("index file corrupt"));
if (opts->source_tree)
read_tree_some(opts->source_tree, &opts->pathspec);
@@ -470,7 +470,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
hold_locked_index(lock_file, 1);
if (read_cache_preload(NULL) < 0)
- return error(_("corrupt index file"));
+ return error(_("index file corrupt"));
resolve_undo_clear();
if (opts->force) {
@@ -548,7 +548,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
* entries in the index.
*/
- add_files_to_cache(NULL, NULL, 0, 0);
+ add_files_to_cache(NULL, NULL, 0);
/*
* NEEDSWORK: carrying over local changes
* when branches have different end-of-line
@@ -567,10 +567,13 @@ static int merge_working_tree(const struct checkout_opts *opts,
o.ancestor = old->name;
o.branch1 = new->name;
o.branch2 = "local";
- merge_trees(&o, new->commit->tree, work,
+ ret = merge_trees(&o, new->commit->tree, work,
old->commit->tree, &result);
+ if (ret < 0)
+ exit(128);
ret = reset_tree(new->commit->tree, opts, 0,
writeout_error);
+ strbuf_release(&o.obuf);
if (ret)
return ret;
}
@@ -628,7 +631,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
}
}
else
- create_branch(old->name, opts->new_branch, new->name,
+ create_branch(opts->new_branch, new->name,
opts->new_branch_force ? 1 : 0,
opts->new_branch_log,
opts->new_branch_force ? 1 : 0,
@@ -982,7 +985,7 @@ static int parse_branchname_arg(int argc, const char **argv,
int recover_with_dwim = dwim_new_local_branch_ok;
if (!has_dash_dash &&
- (check_filename(NULL, arg) || !no_wildcard(arg)))
+ (check_filename(opts->prefix, arg) || !no_wildcard(arg)))
recover_with_dwim = 0;
/*
* Accept "git checkout foo" and "git checkout foo --"
@@ -1035,7 +1038,7 @@ static int parse_branchname_arg(int argc, const char **argv,
if (!*source_tree) /* case (1): want a tree */
die(_("reference is not a tree: %s"), arg);
- if (!has_dash_dash) {/* case (3).(d) -> (1) */
+ if (!has_dash_dash) { /* case (3).(d) -> (1) */
/*
* Do not complain the most common case
* git checkout branch
@@ -1043,7 +1046,7 @@ static int parse_branchname_arg(int argc, const char **argv,
* it would be extremely annoying.
*/
if (argc)
- verify_non_filename(NULL, arg);
+ verify_non_filename(opts->prefix, arg);
} else {
argcount++;
argv++;
@@ -1138,7 +1141,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
OPT_STRING('B', NULL, &opts.new_branch_force, N_("branch"),
N_("create/reset and checkout a branch")),
OPT_BOOL('l', NULL, &opts.new_branch_log, N_("create reflog for new branch")),
- OPT_BOOL(0, "detach", &opts.force_detach, N_("detach the HEAD at named commit")),
+ OPT_BOOL(0, "detach", &opts.force_detach, N_("detach HEAD at named commit")),
OPT_SET_INT('t', "track", &opts.track, N_("set upstream info for new branch"),
BRANCH_TRACK_EXPLICIT),
OPT_STRING(0, "orphan", &opts.new_orphan_branch, N_("new-branch"), N_("new unparented branch")),
diff --git a/builtin/clone.c b/builtin/clone.c
index 8f7db98..a35d622 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -49,8 +49,8 @@ static char *option_upload_pack = "git-upload-pack";
static int option_verbosity;
static int option_progress = -1;
static enum transport_family family;
-static struct string_list option_config;
-static struct string_list option_reference;
+static struct string_list option_config = STRING_LIST_INIT_NODUP;
+static struct string_list option_reference = STRING_LIST_INIT_NODUP;
static int option_dissociate;
static int max_jobs = -1;
@@ -355,8 +355,11 @@ static void copy_alternates(struct strbuf *src, struct strbuf *dst,
continue;
}
abs_path = mkpathdup("%s/objects/%s", src_repo, line.buf);
- normalize_path_copy(abs_path, abs_path);
- add_to_alternates_file(abs_path);
+ if (!normalize_path_copy(abs_path, abs_path))
+ add_to_alternates_file(abs_path);
+ else
+ warning("skipping invalid relative alternate: %s/%s",
+ src_repo, line.buf);
free(abs_path);
}
strbuf_release(&line);
@@ -624,13 +627,13 @@ static void update_remote_refs(const struct ref *refs,
const struct ref *rm = mapped_refs;
if (check_connectivity) {
- if (transport->progress)
- fprintf(stderr, _("Checking connectivity... "));
- if (check_everything_connected_with_transport(iterate_ref_map,
- 0, &rm, transport))
+ struct check_connected_options opt = CHECK_CONNECTED_INIT;
+
+ opt.transport = transport;
+ opt.progress = transport->progress;
+
+ if (check_connected(iterate_ref_map, &rm, &opt))
die(_("remote did not send all necessary objects"));
- if (transport->progress)
- fprintf(stderr, _("done.\n"));
}
if (refs) {
diff --git a/builtin/commit.c b/builtin/commit.c
index 77e3dc8..63a8424 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -387,7 +387,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
*/
if (all || (also && pathspec.nr)) {
hold_locked_index(&index_lock, 1);
- add_files_to_cache(also ? prefix : NULL, &pathspec, 0, 0);
+ add_files_to_cache(also ? prefix : NULL, &pathspec, 0);
refresh_cache_or_die(refresh_flags);
update_main_cache_tree(WRITE_TREE_SILENT);
if (write_locked_index(&the_index, &index_lock, CLOSE_LOCK))
@@ -1647,7 +1647,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
const char *index_file, *reflog_msg;
char *nl;
unsigned char sha1[20];
- struct commit_list *parents = NULL, **pptr = &parents;
+ struct commit_list *parents = NULL;
struct stat statbuf;
struct commit *current_head = NULL;
struct commit_extra_header *extra = NULL;
@@ -1693,20 +1693,18 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
if (!reflog_msg)
reflog_msg = "commit (initial)";
} else if (amend) {
- struct commit_list *c;
-
if (!reflog_msg)
reflog_msg = "commit (amend)";
- for (c = current_head->parents; c; c = c->next)
- pptr = &commit_list_insert(c->item, pptr)->next;
+ parents = copy_commit_list(current_head->parents);
} else if (whence == FROM_MERGE) {
struct strbuf m = STRBUF_INIT;
FILE *fp;
int allow_fast_forward = 1;
+ struct commit_list **pptr = &parents;
if (!reflog_msg)
reflog_msg = "commit (merge)";
- pptr = &commit_list_insert(current_head, pptr)->next;
+ pptr = commit_list_append(current_head, pptr);
fp = fopen(git_path_merge_head(), "r");
if (fp == NULL)
die_errno(_("could not open '%s' for reading"),
@@ -1717,7 +1715,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
parent = get_merge_parent(m.buf);
if (!parent)
die(_("Corrupt MERGE_HEAD file (%s)"), m.buf);
- pptr = &commit_list_insert(parent, pptr)->next;
+ pptr = commit_list_append(parent, pptr);
}
fclose(fp);
strbuf_release(&m);
@@ -1734,7 +1732,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
reflog_msg = (whence == FROM_CHERRY_PICK)
? "commit (cherry-pick)"
: "commit";
- pptr = &commit_list_insert(current_head, pptr)->next;
+ commit_list_insert(current_head, &parents);
}
/* Finally, get the commit message */
diff --git a/builtin/config.c b/builtin/config.c
index 1d7c6ef..6cbf733 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -25,7 +25,6 @@ static char term = '\n';
static int use_global_config, use_system_config, use_local_config;
static struct git_config_source given_config_source;
static int actions, types;
-static const char *get_color_slot, *get_colorbool_slot;
static int end_null;
static int respect_includes = -1;
static int show_origin;
@@ -604,7 +603,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
given_config_source.file : git_path("config"));
if (use_global_config) {
int fd = open(config_file, O_CREAT | O_EXCL | O_WRONLY, 0666);
- if (fd) {
+ if (fd >= 0) {
char *content = default_user_config();
write_str_in_full(fd, content);
free(content);
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 8164b58..c0652a7 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -368,7 +368,7 @@ static void show_filemodify(struct diff_queue_struct *q,
print_path(spec->path);
putchar('\n');
- if (!hashcmp(ospec->sha1, spec->sha1) &&
+ if (!oidcmp(&ospec->oid, &spec->oid) &&
ospec->mode == spec->mode)
break;
/* fallthrough */
@@ -383,10 +383,10 @@ static void show_filemodify(struct diff_queue_struct *q,
if (no_data || S_ISGITLINK(spec->mode))
printf("M %06o %s ", spec->mode,
sha1_to_hex(anonymize ?
- anonymize_sha1(spec->sha1) :
- spec->sha1));
+ anonymize_sha1(spec->oid.hash) :
+ spec->oid.hash));
else {
- struct object *object = lookup_object(spec->sha1);
+ struct object *object = lookup_object(spec->oid.hash);
printf("M %06o :%d ", spec->mode,
get_object_mark(object));
}
@@ -572,7 +572,7 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
/* Export the referenced blobs, and remember the marks. */
for (i = 0; i < diff_queued_diff.nr; i++)
if (!S_ISGITLINK(diff_queued_diff.queue[i]->two->mode))
- export_blob(diff_queued_diff.queue[i]->two->sha1);
+ export_blob(diff_queued_diff.queue[i]->two->oid.hash);
refname = commit->util;
if (anonymize) {
diff --git a/builtin/fetch.c b/builtin/fetch.c
index f896aa1..cd7e3ce 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -15,6 +15,7 @@
#include "submodule.h"
#include "connected.h"
#include "argv-array.h"
+#include "utf8.h"
static const char * const builtin_fetch_usage[] = {
N_("git fetch [<options>] [<repository> [<refspec>...]]"),
@@ -232,9 +233,10 @@ static void find_non_local_tags(struct transport *transport,
* as one to ignore by setting util to NULL.
*/
if (ends_with(ref->name, "^{}")) {
- if (item && !has_object_file(&ref->old_oid) &&
+ if (item &&
+ !has_object_file_with_flags(&ref->old_oid, HAS_SHA1_QUICK) &&
!will_fetch(head, ref->old_oid.hash) &&
- !has_sha1_file(item->util) &&
+ !has_sha1_file_with_flags(item->util, HAS_SHA1_QUICK) &&
!will_fetch(head, item->util))
item->util = NULL;
item = NULL;
@@ -247,7 +249,8 @@ static void find_non_local_tags(struct transport *transport,
* to check if it is a lightweight tag that we want to
* fetch.
*/
- if (item && !has_sha1_file(item->util) &&
+ if (item &&
+ !has_sha1_file_with_flags(item->util, HAS_SHA1_QUICK) &&
!will_fetch(head, item->util))
item->util = NULL;
@@ -267,7 +270,8 @@ static void find_non_local_tags(struct transport *transport,
* We may have a final lightweight tag that needs to be
* checked to see if it needs fetching.
*/
- if (item && !has_sha1_file(item->util) &&
+ if (item &&
+ !has_sha1_file_with_flags(item->util, HAS_SHA1_QUICK) &&
!will_fetch(head, item->util))
item->util = NULL;
@@ -449,7 +453,132 @@ fail:
: STORE_REF_ERROR_OTHER;
}
-#define REFCOL_WIDTH 10
+static int refcol_width = 10;
+static int compact_format;
+
+static void adjust_refcol_width(const struct ref *ref)
+{
+ int max, rlen, llen, len;
+
+ /* uptodate lines are only shown on high verbosity level */
+ if (!verbosity && !oidcmp(&ref->peer_ref->old_oid, &ref->old_oid))
+ return;
+
+ max = term_columns();
+ rlen = utf8_strwidth(prettify_refname(ref->name));
+
+ llen = utf8_strwidth(prettify_refname(ref->peer_ref->name));
+
+ /*
+ * rough estimation to see if the output line is too long and
+ * should not be counted (we can't do precise calculation
+ * anyway because we don't know if the error explanation part
+ * will be printed in update_local_ref)
+ */
+ if (compact_format) {
+ llen = 0;
+ max = max * 2 / 3;
+ }
+ len = 21 /* flag and summary */ + rlen + 4 /* -> */ + llen;
+ if (len >= max)
+ return;
+
+ /*
+ * Not precise calculation for compact mode because '*' can
+ * appear on the left hand side of '->' and shrink the column
+ * back.
+ */
+ if (refcol_width < rlen)
+ refcol_width = rlen;
+}
+
+static void prepare_format_display(struct ref *ref_map)
+{
+ struct ref *rm;
+ const char *format = "full";
+
+ git_config_get_string_const("fetch.output", &format);
+ if (!strcasecmp(format, "full"))
+ compact_format = 0;
+ else if (!strcasecmp(format, "compact"))
+ compact_format = 1;
+ else
+ die(_("configuration fetch.output contains invalid value %s"),
+ format);
+
+ for (rm = ref_map; rm; rm = rm->next) {
+ if (rm->status == REF_STATUS_REJECT_SHALLOW ||
+ !rm->peer_ref ||
+ !strcmp(rm->name, "HEAD"))
+ continue;
+
+ adjust_refcol_width(rm);
+ }
+}
+
+static void print_remote_to_local(struct strbuf *display,
+ const char *remote, const char *local)
+{
+ strbuf_addf(display, "%-*s -> %s", refcol_width, remote, local);
+}
+
+static int find_and_replace(struct strbuf *haystack,
+ const char *needle,
+ const char *placeholder)
+{
+ const char *p = strstr(haystack->buf, needle);
+ int plen, nlen;
+
+ if (!p)
+ return 0;
+
+ if (p > haystack->buf && p[-1] != '/')
+ return 0;
+
+ plen = strlen(p);
+ nlen = strlen(needle);
+ if (plen > nlen && p[nlen] != '/')
+ return 0;
+
+ strbuf_splice(haystack, p - haystack->buf, nlen,
+ placeholder, strlen(placeholder));
+ return 1;
+}
+
+static void print_compact(struct strbuf *display,
+ const char *remote, const char *local)
+{
+ struct strbuf r = STRBUF_INIT;
+ struct strbuf l = STRBUF_INIT;
+
+ if (!strcmp(remote, local)) {
+ strbuf_addf(display, "%-*s -> *", refcol_width, remote);
+ return;
+ }
+
+ strbuf_addstr(&r, remote);
+ strbuf_addstr(&l, local);
+
+ if (!find_and_replace(&r, local, "*"))
+ find_and_replace(&l, remote, "*");
+ print_remote_to_local(display, r.buf, l.buf);
+
+ strbuf_release(&r);
+ strbuf_release(&l);
+}
+
+static void format_display(struct strbuf *display, char code,
+ const char *summary, const char *error,
+ const char *remote, const char *local)
+{
+ strbuf_addf(display, "%c %-*s ", code, TRANSPORT_SUMMARY(summary));
+ if (!compact_format)
+ print_remote_to_local(display, remote, local);
+ else
+ print_compact(display, remote, local);
+ if (error)
+ strbuf_addf(display, " (%s)", error);
+}
static int update_local_ref(struct ref *ref,
const char *remote,
@@ -467,9 +596,8 @@ static int update_local_ref(struct ref *ref,
if (!oidcmp(&ref->old_oid, &ref->new_oid)) {
if (verbosity > 0)
- strbuf_addf(display, "= %-*s %-*s -> %s",
- TRANSPORT_SUMMARY(_("[up to date]")),
- REFCOL_WIDTH, remote, pretty_ref);
+ format_display(display, '=', _("[up to date]"), NULL,
+ remote, pretty_ref);
return 0;
}
@@ -481,10 +609,9 @@ static int update_local_ref(struct ref *ref,
* If this is the head, and it's not okay to update
* the head, and the old value of the head isn't empty...
*/
- strbuf_addf(display,
- _("! %-*s %-*s -> %s (can't fetch in current branch)"),
- TRANSPORT_SUMMARY(_("[rejected]")),
- REFCOL_WIDTH, remote, pretty_ref);
+ format_display(display, '!', _("[rejected]"),
+ _("can't fetch in current branch"),
+ remote, pretty_ref);
return 1;
}
@@ -492,11 +619,9 @@ static int update_local_ref(struct ref *ref,
starts_with(ref->name, "refs/tags/")) {
int r;
r = s_update_ref("updating tag", ref, 0);
- strbuf_addf(display, "%c %-*s %-*s -> %s%s",
- r ? '!' : '-',
- TRANSPORT_SUMMARY(_("[tag update]")),
- REFCOL_WIDTH, remote, pretty_ref,
- r ? _(" (unable to update local ref)") : "");
+ format_display(display, r ? '!' : 't', _("[tag update]"),
+ r ? _("unable to update local ref") : NULL,
+ remote, pretty_ref);
return r;
}
@@ -527,11 +652,9 @@ static int update_local_ref(struct ref *ref,
(recurse_submodules != RECURSE_SUBMODULES_ON))
check_for_new_submodule_commits(ref->new_oid.hash);
r = s_update_ref(msg, ref, 0);
- strbuf_addf(display, "%c %-*s %-*s -> %s%s",
- r ? '!' : '*',
- TRANSPORT_SUMMARY(what),
- REFCOL_WIDTH, remote, pretty_ref,
- r ? _(" (unable to update local ref)") : "");
+ format_display(display, r ? '!' : '*', what,
+ r ? _("unable to update local ref") : NULL,
+ remote, pretty_ref);
return r;
}
@@ -545,11 +668,9 @@ static int update_local_ref(struct ref *ref,
(recurse_submodules != RECURSE_SUBMODULES_ON))
check_for_new_submodule_commits(ref->new_oid.hash);
r = s_update_ref("fast-forward", ref, 1);
- strbuf_addf(display, "%c %-*s %-*s -> %s%s",
- r ? '!' : ' ',
- TRANSPORT_SUMMARY_WIDTH, quickref.buf,
- REFCOL_WIDTH, remote, pretty_ref,
- r ? _(" (unable to update local ref)") : "");
+ format_display(display, r ? '!' : ' ', quickref.buf,
+ r ? _("unable to update local ref") : NULL,
+ remote, pretty_ref);
strbuf_release(&quickref);
return r;
} else if (force || ref->force) {
@@ -562,18 +683,14 @@ static int update_local_ref(struct ref *ref,
(recurse_submodules != RECURSE_SUBMODULES_ON))
check_for_new_submodule_commits(ref->new_oid.hash);
r = s_update_ref("forced-update", ref, 1);
- strbuf_addf(display, "%c %-*s %-*s -> %s (%s)",
- r ? '!' : '+',
- TRANSPORT_SUMMARY_WIDTH, quickref.buf,
- REFCOL_WIDTH, remote, pretty_ref,
- r ? _("unable to update local ref") : _("forced update"));
+ format_display(display, r ? '!' : '+', quickref.buf,
+ r ? _("unable to update local ref") : _("forced update"),
+ remote, pretty_ref);
strbuf_release(&quickref);
return r;
} else {
- strbuf_addf(display, "! %-*s %-*s -> %s %s",
- TRANSPORT_SUMMARY(_("[rejected]")),
- REFCOL_WIDTH, remote, pretty_ref,
- _("(non-fast-forward)"));
+ format_display(display, '!', _("[rejected]"), _("non-fast-forward"),
+ remote, pretty_ref);
return 1;
}
}
@@ -615,11 +732,13 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
url = xstrdup("foreign");
rm = ref_map;
- if (check_everything_connected(iterate_ref_map, 0, &rm)) {
+ if (check_connected(iterate_ref_map, &rm, NULL)) {
rc = error(_("%s did not send all necessary objects\n"), url);
goto abort;
}
+ prepare_format_display(ref_map);
+
/*
* We do a pass for each fetch_head_status type in their enum order, so
* merged entries are written before not-for-merge. That lets readers
@@ -714,11 +833,10 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
rc |= update_local_ref(ref, what, rm, &note);
free(ref);
} else
- strbuf_addf(&note, "* %-*s %-*s -> FETCH_HEAD",
- TRANSPORT_SUMMARY_WIDTH,
- *kind ? kind : "branch",
- REFCOL_WIDTH,
- *what ? what : "HEAD");
+ format_display(&note, '*',
+ *kind ? kind : "branch", NULL,
+ *what ? what : "HEAD",
+ "FETCH_HEAD");
if (note.len) {
if (verbosity >= 0 && !shown_url) {
fprintf(stderr, _("From %.*s\n"),
@@ -751,6 +869,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
static int quickfetch(struct ref *ref_map)
{
struct ref *rm = ref_map;
+ struct check_connected_options opt = CHECK_CONNECTED_INIT;
/*
* If we are deepening a shallow clone we already have these
@@ -761,7 +880,8 @@ static int quickfetch(struct ref *ref_map)
*/
if (depth)
return -1;
- return check_everything_connected(iterate_ref_map, 1, &rm);
+ opt.quiet = 1;
+ return check_connected(iterate_ref_map, &rm, &opt);
}
static int fetch_refs(struct transport *transport, struct ref *ref_map)
@@ -806,19 +926,21 @@ static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map,
for (ref = stale_refs; ref; ref = ref->next)
string_list_append(&refnames, ref->name);
- result = delete_refs(&refnames);
+ result = delete_refs(&refnames, 0);
string_list_clear(&refnames, 0);
}
if (verbosity >= 0) {
for (ref = stale_refs; ref; ref = ref->next) {
+ struct strbuf sb = STRBUF_INIT;
if (!shown_url) {
fprintf(stderr, _("From %.*s\n"), url_len, url);
shown_url = 1;
}
- fprintf(stderr, " x %-*s %-*s -> %s\n",
- TRANSPORT_SUMMARY(_("[deleted]")),
- REFCOL_WIDTH, _("(none)"), prettify_refname(ref->name));
+ format_display(&sb, '-', _("[deleted]"), NULL,
+ _("(none)"), prettify_refname(ref->name));
+ fprintf(stderr, " %s\n",sb.buf);
+ strbuf_release(&sb);
warn_dangling_symref(stderr, dangling_msg, ref->name);
}
}
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index ac84e99..dc2e9e4 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -395,7 +395,7 @@ static void shortlog(const char *name,
for (i = 0; i < subjects.nr; i++)
if (i >= limit)
- strbuf_addf(out, " ...\n");
+ strbuf_addstr(out, " ...\n");
else
strbuf_addf(out, " %s\n", subjects.items[i].string);
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 9923b10..2de272e 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -13,6 +13,7 @@
#include "dir.h"
#include "progress.h"
#include "streaming.h"
+#include "decorate.h"
#define REACHABLE 0x0001
#define SEEN 0x0002
@@ -35,11 +36,26 @@ static int write_lost_and_found;
static int verbose;
static int show_progress = -1;
static int show_dangling = 1;
+static int name_objects;
#define ERROR_OBJECT 01
#define ERROR_REACHABLE 02
#define ERROR_PACK 04
#define ERROR_REFS 010
+static const char *describe_object(struct object *obj)
+{
+ static struct strbuf buf = STRBUF_INIT;
+ char *name = name_objects ?
+ lookup_decoration(fsck_walk_options.object_names, obj) : NULL;
+
+ strbuf_reset(&buf);
+ strbuf_addstr(&buf, oid_to_hex(&obj->oid));
+ if (name)
+ strbuf_addf(&buf, " (%s)", name);
+
+ return buf.buf;
+}
+
static int fsck_config(const char *var, const char *value, void *cb)
{
if (strcmp(var, "fsck.skiplist") == 0) {
@@ -67,7 +83,7 @@ static void objreport(struct object *obj, const char *msg_type,
const char *err)
{
fprintf(stderr, "%s in %s %s: %s\n",
- msg_type, typename(obj->type), oid_to_hex(&obj->oid), err);
+ msg_type, typename(obj->type), describe_object(obj), err);
}
static int objerror(struct object *obj, const char *err)
@@ -77,7 +93,8 @@ static int objerror(struct object *obj, const char *err)
return -1;
}
-static int fsck_error_func(struct object *obj, int type, const char *message)
+static int fsck_error_func(struct fsck_options *o,
+ struct object *obj, int type, const char *message)
{
objreport(obj, (type == FSCK_WARN) ? "warning" : "error", message);
return (type == FSCK_WARN) ? 0 : 1;
@@ -97,7 +114,7 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt
if (!obj) {
/* ... these references to parent->fld are safe here */
printf("broken link from %7s %s\n",
- typename(parent->type), oid_to_hex(&parent->oid));
+ typename(parent->type), describe_object(parent));
printf("broken link from %7s %s\n",
(type == OBJ_ANY ? "unknown" : typename(type)), "unknown");
errors_found |= ERROR_REACHABLE;
@@ -114,9 +131,9 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt
if (!(obj->flags & HAS_OBJ)) {
if (parent && !has_object_file(&obj->oid)) {
printf("broken link from %7s %s\n",
- typename(parent->type), oid_to_hex(&parent->oid));
+ typename(parent->type), describe_object(parent));
printf(" to %7s %s\n",
- typename(obj->type), oid_to_hex(&obj->oid));
+ typename(obj->type), describe_object(obj));
errors_found |= ERROR_REACHABLE;
}
return 1;
@@ -190,7 +207,8 @@ static void check_reachable_object(struct object *obj)
return; /* it is in pack - forget about it */
if (connectivity_only && has_object_file(&obj->oid))
return;
- printf("missing %s %s\n", typename(obj->type), oid_to_hex(&obj->oid));
+ printf("missing %s %s\n", typename(obj->type),
+ describe_object(obj));
errors_found |= ERROR_REACHABLE;
return;
}
@@ -215,7 +233,8 @@ static void check_unreachable_object(struct object *obj)
* since this is something that is prunable.
*/
if (show_unreachable) {
- printf("unreachable %s %s\n", typename(obj->type), oid_to_hex(&obj->oid));
+ printf("unreachable %s %s\n", typename(obj->type),
+ describe_object(obj));
return;
}
@@ -234,11 +253,11 @@ static void check_unreachable_object(struct object *obj)
if (!obj->used) {
if (show_dangling)
printf("dangling %s %s\n", typename(obj->type),
- oid_to_hex(&obj->oid));
+ describe_object(obj));
if (write_lost_and_found) {
char *filename = git_pathdup("lost-found/%s/%s",
obj->type == OBJ_COMMIT ? "commit" : "other",
- oid_to_hex(&obj->oid));
+ describe_object(obj));
FILE *f;
if (safe_create_leading_directories_const(filename)) {
@@ -252,7 +271,7 @@ static void check_unreachable_object(struct object *obj)
if (stream_blob_to_fd(fileno(f), obj->oid.hash, NULL, 1))
die_errno("Could not write '%s'", filename);
} else
- fprintf(f, "%s\n", oid_to_hex(&obj->oid));
+ fprintf(f, "%s\n", describe_object(obj));
if (fclose(f))
die_errno("Could not finish '%s'",
filename);
@@ -271,7 +290,7 @@ static void check_unreachable_object(struct object *obj)
static void check_object(struct object *obj)
{
if (verbose)
- fprintf(stderr, "Checking %s\n", oid_to_hex(&obj->oid));
+ fprintf(stderr, "Checking %s\n", describe_object(obj));
if (obj->flags & REACHABLE)
check_reachable_object(obj);
@@ -307,7 +326,7 @@ static int fsck_obj(struct object *obj)
if (verbose)
fprintf(stderr, "Checking %s %s\n",
- typename(obj->type), oid_to_hex(&obj->oid));
+ typename(obj->type), describe_object(obj));
if (fsck_walk(obj, NULL, &fsck_obj_options))
objerror(obj, "broken links");
@@ -326,15 +345,17 @@ static int fsck_obj(struct object *obj)
free_commit_buffer(commit);
if (!commit->parents && show_root)
- printf("root %s\n", oid_to_hex(&commit->object.oid));
+ printf("root %s\n", describe_object(&commit->object));
}
if (obj->type == OBJ_TAG) {
struct tag *tag = (struct tag *) obj;
if (show_tags && tag->tagged) {
- printf("tagged %s %s", typename(tag->tagged->type), oid_to_hex(&tag->tagged->oid));
- printf(" (%s) in %s\n", tag->tag, oid_to_hex(&tag->object.oid));
+ printf("tagged %s %s", typename(tag->tagged->type),
+ describe_object(tag->tagged));
+ printf(" (%s) in %s\n", tag->tag,
+ describe_object(&tag->object));
}
}
@@ -372,13 +393,18 @@ static int fsck_obj_buffer(const unsigned char *sha1, enum object_type type,
static int default_refs;
-static void fsck_handle_reflog_sha1(const char *refname, unsigned char *sha1)
+static void fsck_handle_reflog_sha1(const char *refname, unsigned char *sha1,
+ unsigned long timestamp)
{
struct object *obj;
if (!is_null_sha1(sha1)) {
obj = lookup_object(sha1);
if (obj) {
+ if (timestamp && name_objects)
+ add_decoration(fsck_walk_options.object_names,
+ obj,
+ xstrfmt("%s@{%ld}", refname, timestamp));
obj->used = 1;
mark_object_reachable(obj);
} else {
@@ -398,8 +424,8 @@ static int fsck_handle_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
fprintf(stderr, "Checking reflog %s->%s\n",
sha1_to_hex(osha1), sha1_to_hex(nsha1));
- fsck_handle_reflog_sha1(refname, osha1);
- fsck_handle_reflog_sha1(refname, nsha1);
+ fsck_handle_reflog_sha1(refname, osha1, 0);
+ fsck_handle_reflog_sha1(refname, nsha1, timestamp);
return 0;
}
@@ -428,6 +454,9 @@ static int fsck_handle_ref(const char *refname, const struct object_id *oid,
}
default_refs++;
obj->used = 1;
+ if (name_objects)
+ add_decoration(fsck_walk_options.object_names,
+ obj, xstrdup(refname));
mark_object_reachable(obj);
return 0;
@@ -543,6 +572,9 @@ static int fsck_cache_tree(struct cache_tree *it)
return 1;
}
obj->used = 1;
+ if (name_objects)
+ add_decoration(fsck_walk_options.object_names,
+ obj, xstrdup(":"));
mark_object_reachable(obj);
if (obj->type != OBJ_TREE)
err |= objerror(obj, "non-tree in cache-tree");
@@ -571,6 +603,7 @@ static struct option fsck_opts[] = {
OPT_BOOL(0, "lost-found", &write_lost_and_found,
N_("write dangling objects in .git/lost-found")),
OPT_BOOL(0, "progress", &show_progress, N_("show progress")),
+ OPT_BOOL(0, "name-objects", &name_objects, N_("show verbose names for reachable objects")),
OPT_END(),
};
@@ -600,6 +633,10 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
include_reflogs = 0;
}
+ if (name_objects)
+ fsck_walk_options.object_names =
+ xcalloc(1, sizeof(struct decoration));
+
git_config(fsck_config, NULL);
fsck_head_link();
@@ -655,6 +692,9 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
continue;
obj->used = 1;
+ if (name_objects)
+ add_decoration(fsck_walk_options.object_names,
+ obj, xstrdup(arg));
mark_object_reachable(obj);
heads++;
continue;
@@ -687,6 +727,10 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
continue;
obj = &blob->object;
obj->used = 1;
+ if (name_objects)
+ add_decoration(fsck_walk_options.object_names,
+ obj,
+ xstrfmt(":%s", active_cache[i]->name));
mark_object_reachable(obj);
}
if (active_cache_tree)
diff --git a/builtin/gc.c b/builtin/gc.c
index 332bcf7..069950d 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -28,7 +28,7 @@ static const char * const builtin_gc_usage[] = {
static int pack_refs = 1;
static int prune_reflogs = 1;
-static int aggressive_depth = 250;
+static int aggressive_depth = 50;
static int aggressive_window = 250;
static int gc_auto_threshold = 6700;
static int gc_auto_pack_limit = 50;
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 1008d7f..1d2ea58 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -77,6 +77,7 @@ static int strict;
static int do_fsck_object;
static struct fsck_options fsck_options = FSCK_OPTIONS_STRICT;
static int verbose;
+static int show_resolving_progress;
static int show_stat;
static int check_self_contained_and_connected;
@@ -1191,7 +1192,7 @@ static void resolve_deltas(void)
qsort(ref_deltas, nr_ref_deltas, sizeof(struct ref_delta_entry),
compare_ref_delta_entry);
- if (verbose)
+ if (verbose || show_resolving_progress)
progress = start_progress(_("Resolving deltas"),
nr_ref_deltas + nr_ofs_deltas);
@@ -1626,6 +1627,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
struct pack_idx_option opts;
unsigned char pack_sha1[20];
unsigned foreign_nr = 1; /* zero is a "good" value, assume bad */
+ int report_end_of_input = 0;
if (argc == 2 && !strcmp(argv[1], "-h"))
usage(index_pack_usage);
@@ -1695,6 +1697,10 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
input_len = sizeof(*hdr);
} else if (!strcmp(arg, "-v")) {
verbose = 1;
+ } else if (!strcmp(arg, "--show-resolving-progress")) {
+ show_resolving_progress = 1;
+ } else if (!strcmp(arg, "--report-end-of-input")) {
+ report_end_of_input = 1;
} else if (!strcmp(arg, "-o")) {
if (index_name || (i+1) >= argc)
usage(index_pack_usage);
@@ -1752,6 +1758,8 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
obj_stat = xcalloc(st_add(nr_objects, 1), sizeof(struct object_stat));
ofs_deltas = xcalloc(nr_objects, sizeof(struct ofs_delta_entry));
parse_pack_objects(pack_sha1);
+ if (report_end_of_input)
+ write_in_full(2, "\0", 1);
resolve_deltas();
conclude_pack(fix_thin_pack, curr_pack, pack_sha1);
free(ofs_deltas);
diff --git a/builtin/init-db.c b/builtin/init-db.c
index b2d8d40..3a45f0b 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -397,13 +397,16 @@ int init_db(const char *template_dir, unsigned int flags)
if (!(flags & INIT_DB_QUIET)) {
int len = strlen(git_dir);
- /* TRANSLATORS: The first '%s' is either "Reinitialized
- existing" or "Initialized empty", the second " shared" or
- "", and the last '%s%s' is the verbatim directory name. */
- printf(_("%s%s Git repository in %s%s\n"),
- reinit ? _("Reinitialized existing") : _("Initialized empty"),
- get_shared_repository() ? _(" shared") : "",
- git_dir, len && git_dir[len-1] != '/' ? "/" : "");
+ if (reinit)
+ printf(get_shared_repository()
+ ? _("Reinitialized existing shared Git repository in %s%s\n")
+ : _("Reinitialized existing Git repository in %s%s\n"),
+ git_dir, len && git_dir[len-1] != '/' ? "/" : "");
+ else
+ printf(get_shared_repository()
+ ? _("Initialized empty shared Git repository in %s%s\n")
+ : _("Initialized empty Git repository in %s%s\n"),
+ git_dir, len && git_dir[len-1] != '/' ? "/" : "");
}
return 0;
diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
index b99ae4b..175f147 100644
--- a/builtin/interpret-trailers.c
+++ b/builtin/interpret-trailers.c
@@ -20,7 +20,7 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
{
int in_place = 0;
int trim_empty = 0;
- struct string_list trailers = STRING_LIST_INIT_DUP;
+ struct string_list trailers = STRING_LIST_INIT_NODUP;
struct option options[] = {
OPT_BOOL(0, "in-place", &in_place, N_("edit files in place")),
diff --git a/builtin/log.c b/builtin/log.c
index 099f4f7..cd9c4a4 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -33,6 +33,7 @@ static const char *default_date_mode = NULL;
static int default_abbrev_commit;
static int default_show_root = 1;
static int default_follow;
+static int default_show_signature;
static int decoration_style;
static int decoration_given;
static int use_mailmap_config;
@@ -119,6 +120,7 @@ static void cmd_log_init_defaults(struct rev_info *rev)
rev->abbrev_commit = default_abbrev_commit;
rev->show_root_diff = default_show_root;
rev->subject_prefix = fmt_patch_subject_prefix;
+ rev->show_signature = default_show_signature;
DIFF_OPT_SET(&rev->diffopt, ALLOW_TEXTCONV);
if (default_date_mode)
@@ -236,16 +238,17 @@ static void show_early_header(struct rev_info *rev, const char *stage, int nr)
if (rev->commit_format != CMIT_FMT_ONELINE)
putchar(rev->diffopt.line_termination);
}
- printf(_("Final output: %d %s\n"), nr, stage);
+ fprintf(rev->diffopt.file, _("Final output: %d %s\n"), nr, stage);
}
static struct itimerval early_output_timer;
static void log_show_early(struct rev_info *revs, struct commit_list *list)
{
- int i = revs->early_output;
+ int i = revs->early_output, close_file = revs->diffopt.close_file;
int show_header = 1;
+ revs->diffopt.close_file = 0;
sort_in_topological_order(&list, revs->sort_order);
while (list && i) {
struct commit *commit = list->item;
@@ -262,14 +265,19 @@ static void log_show_early(struct rev_info *revs, struct commit_list *list)
case commit_ignore:
break;
case commit_error:
+ if (close_file)
+ fclose(revs->diffopt.file);
return;
}
list = list->next;
}
/* Did we already get enough commits for the early output? */
- if (!i)
+ if (!i) {
+ if (close_file)
+ fclose(revs->diffopt.file);
return;
+ }
/*
* ..if no, then repeat it twice a second until we
@@ -331,7 +339,7 @@ static int cmd_log_walk(struct rev_info *rev)
{
struct commit *commit;
int saved_nrl = 0;
- int saved_dcctc = 0;
+ int saved_dcctc = 0, close_file = rev->diffopt.close_file;
if (rev->early_output)
setup_early_output(rev);
@@ -347,6 +355,7 @@ static int cmd_log_walk(struct rev_info *rev)
* and HAS_CHANGES being accumulated in rev->diffopt, so be careful to
* retain that state information if replacing rev->diffopt in this loop
*/
+ rev->diffopt.close_file = 0;
while ((commit = get_revision(rev)) != NULL) {
if (!log_tree_commit(rev, commit) && rev->max_count >= 0)
/*
@@ -367,6 +376,8 @@ static int cmd_log_walk(struct rev_info *rev)
}
rev->diffopt.degraded_cc_to_c = saved_dcctc;
rev->diffopt.needed_rename_limit = saved_nrl;
+ if (close_file)
+ fclose(rev->diffopt.file);
if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF &&
DIFF_OPT_TST(&rev->diffopt, CHECK_FAILED)) {
@@ -409,6 +420,10 @@ static int git_log_config(const char *var, const char *value, void *cb)
use_mailmap_config = git_config_bool(var, value);
return 0;
}
+ if (!strcmp(var, "log.showsignature")) {
+ default_show_signature = git_config_bool(var, value);
+ return 0;
+ }
if (grep_config(var, value, cb) < 0)
return -1;
@@ -445,7 +460,7 @@ static void show_tagger(char *buf, int len, struct rev_info *rev)
pp.fmt = rev->commit_format;
pp.date_mode = rev->date_mode;
pp_user_info(&pp, "Tagger", &out, buf, get_log_output_encoding());
- printf("%s", out.buf);
+ fprintf(rev->diffopt.file, "%s", out.buf);
strbuf_release(&out);
}
@@ -456,7 +471,7 @@ static int show_blob_object(const unsigned char *sha1, struct rev_info *rev, con
char *buf;
unsigned long size;
- fflush(stdout);
+ fflush(rev->diffopt.file);
if (!DIFF_OPT_TOUCHED(&rev->diffopt, ALLOW_TEXTCONV) ||
!DIFF_OPT_TST(&rev->diffopt, ALLOW_TEXTCONV))
return stream_blob_to_fd(1, sha1, NULL, 0);
@@ -496,7 +511,7 @@ static int show_tag_object(const unsigned char *sha1, struct rev_info *rev)
}
if (offset < size)
- fwrite(buf + offset, size - offset, 1, stdout);
+ fwrite(buf + offset, size - offset, 1, rev->diffopt.file);
free(buf);
return 0;
}
@@ -505,7 +520,8 @@ static int show_tree_object(const unsigned char *sha1,
struct strbuf *base,
const char *pathname, unsigned mode, int stage, void *context)
{
- printf("%s%s\n", pathname, S_ISDIR(mode) ? "/" : "");
+ FILE *file = context;
+ fprintf(file, "%s%s\n", pathname, S_ISDIR(mode) ? "/" : "");
return 0;
}
@@ -565,7 +581,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)
if (rev.shown_one)
putchar('\n');
- printf("%stag %s%s\n",
+ fprintf(rev.diffopt.file, "%stag %s%s\n",
diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
t->tag,
diff_get_color_opt(&rev.diffopt, DIFF_RESET));
@@ -584,12 +600,12 @@ int cmd_show(int argc, const char **argv, const char *prefix)
case OBJ_TREE:
if (rev.shown_one)
putchar('\n');
- printf("%stree %s%s\n\n",
+ fprintf(rev.diffopt.file, "%stree %s%s\n\n",
diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
name,
diff_get_color_opt(&rev.diffopt, DIFF_RESET));
read_tree_recursive((struct tree *)o, "", 0, 0, &match_all,
- show_tree_object, NULL);
+ show_tree_object, rev.diffopt.file);
rev.shown_one = 1;
break;
case OBJ_COMMIT:
@@ -674,9 +690,9 @@ static int auto_number = 1;
static char *default_attach = NULL;
-static struct string_list extra_hdr;
-static struct string_list extra_to;
-static struct string_list extra_cc;
+static struct string_list extra_hdr = STRING_LIST_INIT_NODUP;
+static struct string_list extra_to = STRING_LIST_INIT_NODUP;
+static struct string_list extra_cc = STRING_LIST_INIT_NODUP;
static void add_header(const char *value)
{
@@ -703,6 +719,7 @@ static void add_header(const char *value)
static int thread;
static int do_signoff;
static int base_auto;
+static char *from;
static const char *signature = git_version_string;
static const char *signature_file;
static int config_cover_letter;
@@ -791,15 +808,25 @@ static int git_format_config(const char *var, const char *value, void *cb)
base_auto = git_config_bool(var, value);
return 0;
}
+ if (!strcmp(var, "format.from")) {
+ int b = git_config_maybe_bool(var, value);
+ free(from);
+ if (b < 0)
+ from = xstrdup(value);
+ else if (b)
+ from = xstrdup(git_committer_info(IDENT_NO_DATE));
+ else
+ from = NULL;
+ return 0;
+ }
return git_log_config(var, value, cb);
}
-static FILE *realstdout = NULL;
static const char *output_directory = NULL;
static int outdir_offset;
-static int reopen_stdout(struct commit *commit, const char *subject,
+static int open_next_file(struct commit *commit, const char *subject,
struct rev_info *rev, int quiet)
{
struct strbuf filename = STRBUF_INIT;
@@ -821,9 +848,9 @@ static int reopen_stdout(struct commit *commit, const char *subject,
fmt_output_subject(&filename, subject, rev);
if (!quiet)
- fprintf(realstdout, "%s\n", filename.buf + outdir_offset);
+ printf("%s\n", filename.buf + outdir_offset);
- if (freopen(filename.buf, "w", stdout) == NULL)
+ if ((rev->diffopt.file = fopen(filename.buf, "w")) == NULL)
return error(_("Cannot open patch file %s"), filename.buf);
strbuf_release(&filename);
@@ -882,15 +909,15 @@ static void gen_message_id(struct rev_info *info, char *base)
info->message_id = strbuf_detach(&buf, NULL);
}
-static void print_signature(void)
+static void print_signature(FILE *file)
{
if (!signature || !*signature)
return;
- printf("-- \n%s", signature);
+ fprintf(file, "-- \n%s", signature);
if (signature[strlen(signature)-1] != '\n')
- putchar('\n');
- putchar('\n');
+ putc('\n', file);
+ putc('\n', file);
}
static void add_branch_description(struct strbuf *buf, const char *branch_name)
@@ -953,13 +980,13 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
struct pretty_print_context pp = {0};
struct commit *head = list[0];
- if (rev->commit_format != CMIT_FMT_EMAIL)
+ if (!cmit_fmt_is_mail(rev->commit_format))
die(_("Cover letter needs email format"));
committer = git_committer_info(0);
if (!use_stdout &&
- reopen_stdout(NULL, rev->numbered_files ? NULL : "cover-letter", rev, quiet))
+ open_next_file(NULL, rev->numbered_files ? NULL : "cover-letter", rev, quiet))
return;
log_write_email_headers(rev, head, &pp.subject, &pp.after_subject,
@@ -982,7 +1009,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
pp_title_line(&pp, &msg, &sb, encoding, need_8bit_cte);
pp_remainder(&pp, &msg, &sb, 0);
add_branch_description(&sb, branch_name);
- printf("%s\n", sb.buf);
+ fprintf(rev->diffopt.file, "%s\n", sb.buf);
strbuf_release(&sb);
@@ -991,6 +1018,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
log.wrap = 72;
log.in1 = 2;
log.in2 = 4;
+ log.file = rev->diffopt.file;
for (i = 0; i < nr; i++)
shortlog_add_commit(&log, list[i]);
@@ -1013,8 +1041,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
diffcore_std(&opts);
diff_flush(&opts);
- printf("\n");
- print_signature();
+ fprintf(rev->diffopt.file, "\n");
}
static const char *clean_message_id(const char *msg_id)
@@ -1315,7 +1342,7 @@ static void prepare_bases(struct base_tree_info *bases,
struct object_id *patch_id;
if (commit->util)
continue;
- if (commit_patch_id(commit, &diffopt, sha1))
+ if (commit_patch_id(commit, &diffopt, sha1, 0))
die(_("cannot get patch id"));
ALLOC_GROW(bases->patch_id, bases->nr_patch_id + 1, bases->alloc_patch_id);
patch_id = bases->patch_id + bases->nr_patch_id;
@@ -1324,7 +1351,7 @@ static void prepare_bases(struct base_tree_info *bases,
}
}
-static void print_bases(struct base_tree_info *bases)
+static void print_bases(struct base_tree_info *bases, FILE *file)
{
int i;
@@ -1333,11 +1360,11 @@ static void print_bases(struct base_tree_info *bases)
return;
/* Show the base commit */
- printf("base-commit: %s\n", oid_to_hex(&bases->base_commit));
+ fprintf(file, "\nbase-commit: %s\n", oid_to_hex(&bases->base_commit));
/* Show the prerequisite patches */
for (i = bases->nr_patch_id - 1; i >= 0; i--)
- printf("prerequisite-patch-id: %s\n", oid_to_hex(&bases->patch_id[i]));
+ fprintf(file, "prerequisite-patch-id: %s\n", oid_to_hex(&bases->patch_id[i]));
free(bases->patch_id);
bases->nr_patch_id = 0;
@@ -1368,7 +1395,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
int quiet = 0;
int reroll_count = -1;
char *branch_name = NULL;
- char *from = NULL;
char *base_commit = NULL;
struct base_tree_info bases;
@@ -1569,6 +1595,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
setup_pager();
if (output_directory) {
+ if (rev.diffopt.use_color != GIT_COLOR_ALWAYS)
+ rev.diffopt.use_color = GIT_COLOR_NEVER;
if (use_stdout)
die(_("standard output, or directory, which one?"));
if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
@@ -1626,9 +1654,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
get_patch_ids(&rev, &ids);
}
- if (!use_stdout)
- realstdout = xfdopen(xdup(1), "w");
-
if (prepare_revision_walk(&rev))
die(_("revision walk setup failed"));
rev.boundary = 1;
@@ -1693,7 +1718,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
gen_message_id(&rev, "cover");
make_cover_letter(&rev, use_stdout,
origin, nr, list, branch_name, quiet);
- print_bases(&bases);
+ print_bases(&bases, rev.diffopt.file);
+ print_signature(rev.diffopt.file);
total++;
start_number--;
}
@@ -1739,7 +1765,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
}
if (!use_stdout &&
- reopen_stdout(rev.numbered_files ? NULL : commit, NULL, &rev, quiet))
+ open_next_file(rev.numbered_files ? NULL : commit, NULL, &rev, quiet))
die(_("Failed to create output files"));
shown = log_tree_commit(&rev, commit);
free_commit_buffer(commit);
@@ -1753,16 +1779,16 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
if (!use_stdout)
rev.shown_one = 0;
if (shown) {
+ print_bases(&bases, rev.diffopt.file);
if (rev.mime_boundary)
- printf("\n--%s%s--\n\n\n",
+ fprintf(rev.diffopt.file, "\n--%s%s--\n\n\n",
mime_boundary_leader,
rev.mime_boundary);
else
- print_signature();
- print_bases(&bases);
+ print_signature(rev.diffopt.file);
}
if (!use_stdout)
- fclose(stdout);
+ fclose(rev.diffopt.file);
}
free(list);
free(branch_name);
@@ -1794,15 +1820,15 @@ static const char * const cherry_usage[] = {
};
static void print_commit(char sign, struct commit *commit, int verbose,
- int abbrev)
+ int abbrev, FILE *file)
{
if (!verbose) {
- printf("%c %s\n", sign,
+ fprintf(file, "%c %s\n", sign,
find_unique_abbrev(commit->object.oid.hash, abbrev));
} else {
struct strbuf buf = STRBUF_INIT;
pp_commit_easy(CMIT_FMT_ONELINE, commit, &buf);
- printf("%c %s %s\n", sign,
+ fprintf(file, "%c %s %s\n", sign,
find_unique_abbrev(commit->object.oid.hash, abbrev),
buf.buf);
strbuf_release(&buf);
@@ -1883,7 +1909,7 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
commit = list->item;
if (has_commit_patch_id(commit, &ids))
sign = '-';
- print_commit(sign, commit, verbose, abbrev);
+ print_commit(sign, commit, verbose, abbrev, revs.diffopt.file);
list = list->next;
}
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index f02e3d2..00ea91a 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -118,7 +118,8 @@ static void show_killed_files(struct dir_struct *dir)
*/
pos = cache_name_pos(ent->name, ent->len);
if (0 <= pos)
- die("bug in show-killed-files");
+ die("BUG: killed-file %.*s not found",
+ ent->len, ent->name);
pos = -pos - 1;
while (pos < active_nr &&
ce_stage(active_cache[pos]))
diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c
index 4859ede..3068168 100644
--- a/builtin/mailsplit.c
+++ b/builtin/mailsplit.c
@@ -45,6 +45,19 @@ static int is_from_line(const char *line, int len)
static struct strbuf buf = STRBUF_INIT;
static int keep_cr;
+static int mboxrd;
+
+static int is_gtfrom(const struct strbuf *buf)
+{
+ size_t min = strlen(">From ");
+ size_t ngt;
+
+ if (buf->len < min)
+ return 0;
+
+ ngt = strspn(buf->buf, ">");
+ return ngt && starts_with(buf->buf + ngt, "From ");
+}
/* Called with the first line (potentially partial)
* already in buf[] -- normally that should begin with
@@ -77,6 +90,9 @@ static int split_one(FILE *mbox, const char *name, int allow_bare)
strbuf_addch(&buf, '\n');
}
+ if (mboxrd && is_gtfrom(&buf))
+ strbuf_remove(&buf, 0, 1);
+
if (fwrite(buf.buf, 1, buf.len, output) != buf.len)
die_errno("cannot write output");
@@ -271,6 +287,8 @@ int cmd_mailsplit(int argc, const char **argv, const char *prefix)
keep_cr = 1;
} else if ( arg[1] == 'o' && arg[2] ) {
dir = arg+2;
+ } else if (!strcmp(arg, "--mboxrd")) {
+ mboxrd = 1;
} else if ( arg[1] == '-' && !arg[2] ) {
argp++; /* -- marks end of options */
break;
diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index c0d1822..b572a37 100644
--- a/builtin/merge-base.c
+++ b/builtin/merge-base.c
@@ -173,6 +173,9 @@ static int handle_fork_point(int argc, const char **argv)
revs.initial = 1;
for_each_reflog_ent(refname, collect_one_reflog_ent, &revs);
+ if (!revs.nr && !get_sha1(refname, sha1))
+ add_one_commit(sha1, &revs);
+
for (i = 0; i < revs.nr; i++)
revs.commit[i]->object.flags &= ~TMP_MARK;
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index 491efd5..fd2c455 100644
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -9,10 +9,10 @@ static const char builtin_merge_recursive_usage[] =
static const char *better_branch_name(const char *branch)
{
- static char githead_env[8 + 40 + 1];
+ static char githead_env[8 + GIT_SHA1_HEXSZ + 1];
char *name;
- if (strlen(branch) != 40)
+ if (strlen(branch) != GIT_SHA1_HEXSZ)
return branch;
xsnprintf(githead_env, sizeof(githead_env), "GITHEAD_%s", branch);
name = getenv(githead_env);
@@ -21,10 +21,10 @@ static const char *better_branch_name(const char *branch)
int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
{
- const unsigned char *bases[21];
+ const struct object_id *bases[21];
unsigned bases_count = 0;
int i, failed;
- unsigned char h1[20], h2[20];
+ struct object_id h1, h2;
struct merge_options o;
struct commit *result;
@@ -46,10 +46,10 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
continue;
}
if (bases_count < ARRAY_SIZE(bases)-1) {
- unsigned char *sha = xmalloc(20);
- if (get_sha1(argv[i], sha))
+ struct object_id *oid = xmalloc(sizeof(struct object_id));
+ if (get_oid(argv[i], oid))
die("Could not parse object '%s'", argv[i]);
- bases[bases_count++] = sha;
+ bases[bases_count++] = oid;
}
else
warning("Cannot handle more than %d bases. "
@@ -62,9 +62,9 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
o.branch1 = argv[++i];
o.branch2 = argv[++i];
- if (get_sha1(o.branch1, h1))
+ if (get_oid(o.branch1, &h1))
die("Could not resolve ref '%s'", o.branch1);
- if (get_sha1(o.branch2, h2))
+ if (get_oid(o.branch2, &h2))
die("Could not resolve ref '%s'", o.branch2);
o.branch1 = better_branch_name(o.branch1);
@@ -73,7 +73,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
if (o.verbosity >= 3)
printf("Merging %s with %s\n", o.branch1, o.branch2);
- failed = merge_recursive_generic(&o, h1, h2, bases_count, bases, &result);
+ failed = merge_recursive_generic(&o, &h1, &h2, bases_count, bases, &result);
if (failed < 0)
return 128; /* die() error code */
return failed;
diff --git a/builtin/merge.c b/builtin/merge.c
index 6ec3126..a8b57c7 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -212,7 +212,7 @@ static struct option builtin_merge_options[] = {
PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, FF_ONLY },
OPT_RERERE_AUTOUPDATE(&allow_rerere_auto),
OPT_BOOL(0, "verify-signatures", &verify_signatures,
- N_("Verify that the named commit has a valid GPG signature")),
+ N_("verify that the named commit has a valid GPG signature")),
OPT_CALLBACK('s', "strategy", &use_strategies, N_("strategy"),
N_("merge strategy to use"), option_parse_strategy),
OPT_CALLBACK('X', "strategy-option", &xopts, N_("option=value"),
@@ -337,15 +337,9 @@ static void squash_message(struct commit *commit, struct commit_list *remotehead
struct rev_info rev;
struct strbuf out = STRBUF_INIT;
struct commit_list *j;
- const char *filename;
- int fd;
struct pretty_print_context ctx = {0};
printf(_("Squash commit -- not updating HEAD\n"));
- filename = git_path_squash_msg();
- fd = open(filename, O_WRONLY | O_CREAT, 0666);
- if (fd < 0)
- die_errno(_("Could not write to '%s'"), filename);
init_revisions(&rev, NULL);
rev.ignore_merges = 1;
@@ -372,10 +366,7 @@ static void squash_message(struct commit *commit, struct commit_list *remotehead
oid_to_hex(&commit->object.oid));
pretty_print_commit(&ctx, commit, &out);
}
- if (write_in_full(fd, out.buf, out.len) != out.len)
- die_errno(_("Writing SQUASH_MSG"));
- if (close(fd))
- die_errno(_("Finishing SQUASH_MSG"));
+ write_file_buf(git_path_squash_msg(), out.buf, out.len);
strbuf_release(&out);
}
@@ -502,7 +493,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
if (ref_exists(truname.buf)) {
strbuf_addf(msg,
"%s\t\tbranch '%s'%s of .\n",
- sha1_to_hex(remote_head->object.oid.hash),
+ oid_to_hex(&remote_head->object.oid),
truname.buf + 11,
(early ? " (early part)" : ""));
strbuf_release(&truname);
@@ -516,7 +507,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
desc = merge_remote_util(remote_head);
if (desc && desc->obj && desc->obj->type == OBJ_TAG) {
strbuf_addf(msg, "%s\t\t%s '%s'\n",
- sha1_to_hex(desc->obj->oid.hash),
+ oid_to_hex(&desc->obj->oid),
typename(desc->obj->type),
remote);
goto cleanup;
@@ -524,7 +515,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
}
strbuf_addf(msg, "%s\t\tcommit '%s'\n",
- sha1_to_hex(remote_head->object.oid.hash), remote);
+ oid_to_hex(&remote_head->object.oid), remote);
cleanup:
strbuf_release(&buf);
strbuf_release(&bname);
@@ -683,6 +674,8 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
hold_locked_index(&lock, 1);
clean = merge_recursive(&o, head,
remoteheads->item, reversed, &result);
+ if (clean < 0)
+ exit(128);
if (active_cache_changed &&
write_locked_index(&the_index, &lock, COMMIT_LOCK))
die (_("unable to write %s"), get_index_file());
@@ -732,18 +725,6 @@ static void add_strategies(const char *string, unsigned attr)
}
-static void write_merge_msg(struct strbuf *msg)
-{
- const char *filename = git_path_merge_msg();
- int fd = open(filename, O_WRONLY | O_CREAT, 0666);
- if (fd < 0)
- die_errno(_("Could not open '%s' for writing"),
- filename);
- if (write_in_full(fd, msg->buf, msg->len) != msg->len)
- die_errno(_("Could not write to '%s'"), filename);
- close(fd);
-}
-
static void read_merge_msg(struct strbuf *msg)
{
const char *filename = git_path_merge_msg();
@@ -777,7 +758,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
strbuf_addch(&msg, '\n');
if (0 < option_edit)
strbuf_commented_addf(&msg, _(merge_editor_comment), comment_line_char);
- write_merge_msg(&msg);
+ write_file_buf(git_path_merge_msg(), msg.buf, msg.len);
if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg",
git_path_merge_msg(), "merge", NULL))
abort_commit(remoteheads, NULL);
@@ -940,8 +921,6 @@ static int setup_with_upstream(const char ***argv)
static void write_merge_state(struct commit_list *remoteheads)
{
- const char *filename;
- int fd;
struct commit_list *j;
struct strbuf buf = STRBUF_INIT;
@@ -955,26 +934,14 @@ static void write_merge_state(struct commit_list *remoteheads)
}
strbuf_addf(&buf, "%s\n", oid_to_hex(oid));
}
- filename = git_path_merge_head();
- fd = open(filename, O_WRONLY | O_CREAT, 0666);
- if (fd < 0)
- die_errno(_("Could not open '%s' for writing"), filename);
- if (write_in_full(fd, buf.buf, buf.len) != buf.len)
- die_errno(_("Could not write to '%s'"), filename);
- close(fd);
+ write_file_buf(git_path_merge_head(), buf.buf, buf.len);
strbuf_addch(&merge_msg, '\n');
- write_merge_msg(&merge_msg);
+ write_file_buf(git_path_merge_msg(), merge_msg.buf, merge_msg.len);
- filename = git_path_merge_mode();
- fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0666);
- if (fd < 0)
- die_errno(_("Could not open '%s' for writing"), filename);
strbuf_reset(&buf);
if (fast_forward == FF_NO)
- strbuf_addf(&buf, "no-ff");
- if (write_in_full(fd, buf.buf, buf.len) != buf.len)
- die_errno(_("Could not write to '%s'"), filename);
- close(fd);
+ strbuf_addstr(&buf, "no-ff");
+ write_file_buf(git_path_merge_mode(), buf.buf, buf.len);
}
static int default_edit_option(void)
@@ -990,7 +957,7 @@ static int default_edit_option(void)
if (e) {
int v = git_config_maybe_bool(name, e);
if (v < 0)
- die("Bad value '%s' in environment '%s'", e, name);
+ die(_("Bad value '%s' in environment '%s'"), e, name);
return v;
}
@@ -1091,7 +1058,7 @@ static void handle_fetch_head(struct commit_list **remotes, struct strbuf *merge
if (!commit) {
if (ptr)
*ptr = '\0';
- die("not something we can merge in %s: %s",
+ die(_("not something we can merge in %s: %s"),
filename, merge_names->buf + pos);
}
remotes = &commit_list_insert(commit, remotes)->next;
@@ -1125,7 +1092,7 @@ static struct commit_list *collect_parents(struct commit *head_commit,
struct commit *commit = get_merge_parent(argv[i]);
if (!commit)
help_unknown_ref(argv[i], "merge",
- "not something we can merge");
+ _("not something we can merge"));
remotes = &commit_list_insert(commit, remotes)->next;
}
remoteheads = reduce_parents(head_commit, head_subsumed, remoteheads);
@@ -1342,7 +1309,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
for (p = remoteheads; p; p = p->next) {
struct commit *commit = p->item;
strbuf_addf(&buf, "GITHEAD_%s",
- sha1_to_hex(commit->object.oid.hash));
+ oid_to_hex(&commit->object.oid));
setenv(buf.buf, merge_remote_util(commit)->name, 1);
strbuf_reset(&buf);
if (fast_forward != FF_ONLY &&
@@ -1397,11 +1364,11 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
* If head can reach all the merge then we are up to date.
* but first the most common case of merging one remote.
*/
- finish_up_to_date("Already up-to-date.");
+ finish_up_to_date(_("Already up-to-date."));
goto done;
} else if (fast_forward != FF_NO && !remoteheads->next &&
!common->next &&
- !hashcmp(common->item->object.oid.hash, head_commit->object.oid.hash)) {
+ !oidcmp(&common->item->object.oid, &head_commit->object.oid)) {
/* Again the most common case of merging one remote. */
struct strbuf msg = STRBUF_INIT;
struct commit *commit;
@@ -1475,14 +1442,13 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
* HEAD^^" would be missed.
*/
common_one = get_merge_bases(head_commit, j->item);
- if (hashcmp(common_one->item->object.oid.hash,
- j->item->object.oid.hash)) {
+ if (oidcmp(&common_one->item->object.oid, &j->item->object.oid)) {
up_to_date = 0;
break;
}
}
if (up_to_date) {
- finish_up_to_date("Already up-to-date. Yeeah!");
+ finish_up_to_date(_("Already up-to-date. Yeeah!"));
goto done;
}
}
@@ -1506,7 +1472,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
* Stash away the local changes so that we can try more than one.
*/
save_state(stash))
- hashcpy(stash, null_sha1);
+ hashclr(stash);
for (i = 0; i < use_strategies_nr; i++) {
int ret;
diff --git a/builtin/mv.c b/builtin/mv.c
index 446a316..2f43877 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -26,7 +26,7 @@ static const char **internal_copy_pathspec(const char *prefix,
int i;
const char **result;
ALLOC_ARRAY(result, count + 1);
- memcpy(result, pathspec, count * sizeof(const char *));
+ COPY_ARRAY(result, pathspec, count);
result[count] = NULL;
for (i = 0; i < count; i++) {
int length = strlen(result[i]);
diff --git a/builtin/notes.c b/builtin/notes.c
index c65b59a..f848b89 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -91,7 +91,7 @@ static const char * const git_notes_get_ref_usage[] = {
};
static const char note_template[] =
- "\nWrite/edit the notes for the following object:\n";
+ N_("Write/edit the notes for the following object:");
struct note_data {
int given;
@@ -179,7 +179,8 @@ static void prepare_note_data(const unsigned char *object, struct note_data *d,
copy_obj_to_fd(fd, old_note);
strbuf_addch(&buf, '\n');
- strbuf_add_commented_lines(&buf, note_template, strlen(note_template));
+ strbuf_add_commented_lines(&buf, "\n", strlen("\n"));
+ strbuf_add_commented_lines(&buf, _(note_template), strlen(_(note_template)));
strbuf_addch(&buf, '\n');
write_or_die(fd, buf.buf, buf.len);
@@ -749,7 +750,7 @@ static int git_config_get_notes_strategy(const char *key,
if (git_config_get_string(key, &value))
return 1;
if (parse_notes_merge_strategy(value, strategy))
- git_die_config(key, "unknown notes merge strategy %s", value);
+ git_die_config(key, _("unknown notes merge strategy %s"), value);
free(value);
return 0;
@@ -788,15 +789,15 @@ static int merge(int argc, const char **argv, const char *prefix)
if (strategy || do_commit + do_abort == 0)
do_merge = 1;
if (do_merge + do_commit + do_abort != 1) {
- error("cannot mix --commit, --abort or -s/--strategy");
+ error(_("cannot mix --commit, --abort or -s/--strategy"));
usage_with_options(git_notes_merge_usage, options);
}
if (do_merge && argc != 1) {
- error("Must specify a notes ref to merge");
+ error(_("Must specify a notes ref to merge"));
usage_with_options(git_notes_merge_usage, options);
} else if (!do_merge && argc) {
- error("too many parameters");
+ error(_("too many parameters"));
usage_with_options(git_notes_merge_usage, options);
}
@@ -817,7 +818,7 @@ static int merge(int argc, const char **argv, const char *prefix)
if (strategy) {
if (parse_notes_merge_strategy(strategy, &o.strategy)) {
- error("Unknown -s/--strategy: %s", strategy);
+ error(_("Unknown -s/--strategy: %s"), strategy);
usage_with_options(git_notes_merge_usage, options);
}
} else {
@@ -857,11 +858,11 @@ static int merge(int argc, const char **argv, const char *prefix)
die(_("A notes merge into %s is already in-progress at %s"),
default_notes_ref(), wt->path);
if (create_symref("NOTES_MERGE_REF", default_notes_ref(), NULL))
- die("Failed to store link to current notes ref (%s)",
+ die(_("Failed to store link to current notes ref (%s)"),
default_notes_ref());
- printf("Automatic notes merge failed. Fix conflicts in %s and "
- "commit the result with 'git notes merge --commit', or "
- "abort the merge with 'git notes merge --abort'.\n",
+ printf(_("Automatic notes merge failed. Fix conflicts in %s and "
+ "commit the result with 'git notes merge --commit', or "
+ "abort the merge with 'git notes merge --abort'.\n"),
git_path(NOTES_MERGE_WORKTREE));
}
@@ -934,8 +935,8 @@ static int prune(int argc, const char **argv, const char *prefix)
struct notes_tree *t;
int show_only = 0, verbose = 0;
struct option options[] = {
- OPT__DRY_RUN(&show_only, "do not remove, show only"),
- OPT__VERBOSE(&verbose, "report pruned notes"),
+ OPT__DRY_RUN(&show_only, N_("do not remove, show only")),
+ OPT__VERBOSE(&verbose, N_("report pruned notes")),
OPT_END()
};
@@ -964,7 +965,7 @@ static int get_ref(int argc, const char **argv, const char *prefix)
git_notes_get_ref_usage, 0);
if (argc) {
- error("too many parameters");
+ error(_("too many parameters"));
usage_with_options(git_notes_get_ref_usage, options);
}
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index f854ca4..0954375 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -44,7 +44,9 @@ static int non_empty;
static int reuse_delta = 1, reuse_object = 1;
static int keep_unreachable, unpack_unreachable, include_tag;
static unsigned long unpack_unreachable_expiration;
+static int pack_loose_unreachable;
static int local;
+static int have_non_local_packs;
static int incremental;
static int ignore_packed_keep;
static int allow_ofs_delta;
@@ -977,6 +979,23 @@ static int want_object_in_pack(const unsigned char *sha1,
return 1;
if (incremental)
return 0;
+
+ /*
+ * When asked to do --local (do not include an
+ * object that appears in a pack we borrow
+ * from elsewhere) or --honor-pack-keep (do not
+ * include an object that appears in a pack marked
+ * with .keep), we need to make sure no copy of this
+ * object come from in _any_ pack that causes us to
+ * omit it, and need to complete this loop. When
+ * neither option is in effect, we know the object
+ * we just found is going to be packed, so break
+ * out of the loop to return 1 now.
+ */
+ if (!ignore_packed_keep &&
+ (!local || !have_non_local_packs))
+ break;
+
if (local && !p->pack_local)
return 0;
if (ignore_packed_keep && p->pack_local && p->pack_keep)
@@ -2104,6 +2123,35 @@ static void ll_find_deltas(struct object_entry **list, unsigned list_size,
#define ll_find_deltas(l, s, w, d, p) find_deltas(l, &s, w, d, p)
#endif
+static void add_tag_chain(const struct object_id *oid)
+{
+ struct tag *tag;
+
+ /*
+ * We catch duplicates already in add_object_entry(), but we'd
+ * prefer to do this extra check to avoid having to parse the
+ * tag at all if we already know that it's being packed (e.g., if
+ * it was included via bitmaps, we would not have parsed it
+ * previously).
+ */
+ if (packlist_find(&to_pack, oid->hash, NULL))
+ return;
+
+ tag = lookup_tag(oid->hash);
+ while (1) {
+ if (!tag || parse_tag(tag) || !tag->tagged)
+ die("unable to pack objects reachable from tag %s",
+ oid_to_hex(oid));
+
+ add_object_entry(tag->object.oid.hash, OBJ_TAG, NULL, 0);
+
+ if (tag->tagged->type != OBJ_TAG)
+ return;
+
+ tag = (struct tag *)tag->tagged;
+ }
+}
+
static int add_ref_tag(const char *path, const struct object_id *oid, int flag, void *cb_data)
{
struct object_id peeled;
@@ -2111,7 +2159,7 @@ static int add_ref_tag(const char *path, const struct object_id *oid, int flag,
if (starts_with(path, "refs/tags/") && /* is a tag? */
!peel_ref(path, peeled.hash) && /* peelable? */
packlist_find(&to_pack, peeled.hash, NULL)) /* object packed? */
- add_object_entry(oid->hash, OBJ_TAG, NULL, 0);
+ add_tag_chain(oid);
return 0;
}
@@ -2379,6 +2427,32 @@ static void add_objects_in_unpacked_packs(struct rev_info *revs)
free(in_pack.array);
}
+static int add_loose_object(const unsigned char *sha1, const char *path,
+ void *data)
+{
+ enum object_type type = sha1_object_info(sha1, NULL);
+
+ if (type < 0) {
+ warning("loose object at %s could not be examined", path);
+ return 0;
+ }
+
+ add_object_entry(sha1, type, "", 0);
+ return 0;
+}
+
+/*
+ * We actually don't even have to worry about reachability here.
+ * add_object_entry will weed out duplicates, so we just add every
+ * loose object we find.
+ */
+static void add_unreachable_loose_objects(void)
+{
+ for_each_loose_file_in_objdir(get_object_directory(),
+ add_loose_object,
+ NULL, NULL, NULL);
+}
+
static int has_sha1_pack_kept_or_nonlocal(const unsigned char *sha1)
{
static struct packed_git *last_found = (void *)1;
@@ -2548,6 +2622,8 @@ static void get_object_list(int ac, const char **av)
if (keep_unreachable)
add_objects_in_unpacked_packs(&revs);
+ if (pack_loose_unreachable)
+ add_unreachable_loose_objects();
if (unpack_unreachable)
loosen_unused_packed_objects(&revs);
@@ -2648,6 +2724,8 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
N_("include tag objects that refer to objects to be packed")),
OPT_BOOL(0, "keep-unreachable", &keep_unreachable,
N_("keep unreachable objects")),
+ OPT_BOOL(0, "pack-loose-unreachable", &pack_loose_unreachable,
+ N_("pack loose unreachable objects")),
{ OPTION_CALLBACK, 0, "unpack-unreachable", NULL, N_("time"),
N_("unpack unreachable objects newer than <time>"),
PARSE_OPT_OPTARG, option_parse_unpack_unreachable },
@@ -2753,6 +2831,28 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
progress = 2;
prepare_packed_git();
+ if (ignore_packed_keep) {
+ struct packed_git *p;
+ for (p = packed_git; p; p = p->next)
+ if (p->pack_local && p->pack_keep)
+ break;
+ if (!p) /* no keep-able packs found */
+ ignore_packed_keep = 0;
+ }
+ if (local) {
+ /*
+ * unlike ignore_packed_keep above, we do not want to
+ * unset "local" based on looking at packs, as it
+ * also covers non-local objects
+ */
+ struct packed_git *p;
+ for (p = packed_git; p; p = p->next) {
+ if (!p->pack_local) {
+ have_non_local_packs = 1;
+ break;
+ }
+ }
+ }
if (progress)
progress_state = start_progress(_("Counting objects"), 0);
diff --git a/builtin/pull.c b/builtin/pull.c
index 1d7333c..398aae1 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -815,6 +815,9 @@ static int run_rebase(const unsigned char *curr_head,
argv_array_push(&args, "--no-autostash");
else if (opt_autostash == 1)
argv_array_push(&args, "--autostash");
+ if (opt_verify_signatures &&
+ !strcmp(opt_verify_signatures, "--verify-signatures"))
+ warning(_("ignoring --verify-signatures for rebase"));
argv_array_push(&args, "--onto");
argv_array_push(&args, sha1_to_hex(merge_head));
@@ -852,7 +855,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
git_config(git_pull_config, NULL);
if (read_cache_unmerged())
- die_resolve_conflict("Pull");
+ die_resolve_conflict("pull");
if (file_exists(git_path("MERGE_HEAD")))
die_conclude_merge();
diff --git a/builtin/push.c b/builtin/push.c
index 4e9e4db..3bb9d6b 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -353,7 +353,8 @@ static int push_with_options(struct transport *transport, int flags)
return 1;
}
-static int do_push(const char *repo, int flags)
+static int do_push(const char *repo, int flags,
+ const struct string_list *push_options)
{
int i, errs;
struct remote *remote = pushremote_get(repo);
@@ -376,6 +377,9 @@ static int do_push(const char *repo, int flags)
if (remote->mirror)
flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
+ if (push_options->nr)
+ flags |= TRANSPORT_PUSH_OPTIONS;
+
if ((flags & TRANSPORT_PUSH_ALL) && refspec) {
if (!strcmp(*refspec, "refs/tags/*"))
return error(_("--all and --tags are incompatible"));
@@ -406,13 +410,16 @@ static int do_push(const char *repo, int flags)
for (i = 0; i < url_nr; i++) {
struct transport *transport =
transport_get(remote, url[i]);
+ if (flags & TRANSPORT_PUSH_OPTIONS)
+ transport->push_options = push_options;
if (push_with_options(transport, flags))
errs++;
}
} else {
struct transport *transport =
transport_get(remote, NULL);
-
+ if (flags & TRANSPORT_PUSH_OPTIONS)
+ transport->push_options = push_options;
if (push_with_options(transport, flags))
errs++;
}
@@ -500,6 +507,9 @@ int cmd_push(int argc, const char **argv, const char *prefix)
int push_cert = -1;
int rc;
const char *repo = NULL; /* default repository */
+ static struct string_list push_options = STRING_LIST_INIT_DUP;
+ static struct string_list_item *item;
+
struct option options[] = {
OPT__VERBOSITY(&verbosity),
OPT_STRING( 0 , "repo", &repo, N_("repository"), N_("repository")),
@@ -533,6 +543,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
0, "signed", &push_cert, "yes|no|if-asked", N_("GPG sign the push"),
PARSE_OPT_OPTARG, option_parse_push_signed },
OPT_BIT(0, "atomic", &flags, N_("request atomic transaction on remote side"), TRANSPORT_PUSH_ATOMIC),
+ OPT_STRING_LIST('o', "push-option", &push_options, N_("server-specific"), N_("option to transmit")),
OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"),
TRANSPORT_FAMILY_IPV4),
OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"),
@@ -563,7 +574,11 @@ int cmd_push(int argc, const char **argv, const char *prefix)
set_refspecs(argv + 1, argc - 1, repo);
}
- rc = do_push(repo, flags);
+ for_each_string_list_item(item, &push_options)
+ if (strchr(item->string, '\n'))
+ die(_("push options must not have new line characters"));
+
+ rc = do_push(repo, flags, &push_options);
if (rc == -1)
usage_with_options(push_usage, options);
else
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 05d0440..011db00 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -44,10 +44,12 @@ static struct strbuf fsck_msg_types = STRBUF_INIT;
static int receive_unpack_limit = -1;
static int transfer_unpack_limit = -1;
static int advertise_atomic_push = 1;
+static int advertise_push_options;
static int unpack_limit = 100;
static int report_status;
static int use_sideband;
static int use_atomic;
+static int use_push_options;
static int quiet;
static int prefer_ofs_delta = 1;
static int auto_update_server_info;
@@ -76,6 +78,13 @@ static long nonce_stamp_slop;
static unsigned long nonce_stamp_slop_limit;
static struct ref_transaction *transaction;
+static enum {
+ KEEPALIVE_NEVER = 0,
+ KEEPALIVE_AFTER_NUL,
+ KEEPALIVE_ALWAYS
+} use_keepalive;
+static int keepalive_in_sec = 5;
+
static enum deny_action parse_deny_action(const char *var, const char *value)
{
if (value) {
@@ -193,6 +202,16 @@ static int receive_pack_config(const char *var, const char *value, void *cb)
return 0;
}
+ if (strcmp(var, "receive.advertisepushoptions") == 0) {
+ advertise_push_options = git_config_bool(var, value);
+ return 0;
+ }
+
+ if (strcmp(var, "receive.keepalive") == 0) {
+ keepalive_in_sec = git_config_int(var, value);
+ return 0;
+ }
+
return git_default_config(var, value, cb);
}
@@ -211,6 +230,8 @@ static void show_ref(const char *path, const unsigned char *sha1)
strbuf_addstr(&cap, " ofs-delta");
if (push_cert_nonce)
strbuf_addf(&cap, " push-cert=%s", push_cert_nonce);
+ if (advertise_push_options)
+ strbuf_addstr(&cap, " push-options");
strbuf_addf(&cap, " agent=%s", git_user_agent_sanitized());
packet_write(1, "%s %s%c%s\n",
sha1_to_hex(sha1), path, 0, cap.buf);
@@ -319,10 +340,60 @@ static void rp_error(const char *err, ...)
static int copy_to_sideband(int in, int out, void *arg)
{
char data[128];
+ int keepalive_active = 0;
+
+ if (keepalive_in_sec <= 0)
+ use_keepalive = KEEPALIVE_NEVER;
+ if (use_keepalive == KEEPALIVE_ALWAYS)
+ keepalive_active = 1;
+
while (1) {
- ssize_t sz = xread(in, data, sizeof(data));
+ ssize_t sz;
+
+ if (keepalive_active) {
+ struct pollfd pfd;
+ int ret;
+
+ pfd.fd = in;
+ pfd.events = POLLIN;
+ ret = poll(&pfd, 1, 1000 * keepalive_in_sec);
+
+ if (ret < 0) {
+ if (errno == EINTR)
+ continue;
+ else
+ break;
+ } else if (ret == 0) {
+ /* no data; send a keepalive packet */
+ static const char buf[] = "0005\1";
+ write_or_die(1, buf, sizeof(buf) - 1);
+ continue;
+ } /* else there is actual data to read */
+ }
+
+ sz = xread(in, data, sizeof(data));
if (sz <= 0)
break;
+
+ if (use_keepalive == KEEPALIVE_AFTER_NUL && !keepalive_active) {
+ const char *p = memchr(data, '\0', sz);
+ if (p) {
+ /*
+ * The NUL tells us to start sending keepalives. Make
+ * sure we send any other data we read along
+ * with it.
+ */
+ keepalive_active = 1;
+ send_sideband(1, 2, data, p - data, use_sideband);
+ send_sideband(1, 2, p + 1, sz - (p - data + 1), use_sideband);
+ continue;
+ }
+ }
+
+ /*
+ * Either we're not looking for a NUL signal, or we didn't see
+ * it yet; just pass along the data.
+ */
send_sideband(1, 2, data, sz, use_sideband);
}
close(in);
@@ -550,8 +621,16 @@ static void prepare_push_cert_sha1(struct child_process *proc)
}
}
+struct receive_hook_feed_state {
+ struct command *cmd;
+ int skip_broken;
+ struct strbuf buf;
+ const struct string_list *push_options;
+};
+
typedef int (*feed_fn)(void *, const char **, size_t *);
-static int run_and_feed_hook(const char *hook_name, feed_fn feed, void *feed_state)
+static int run_and_feed_hook(const char *hook_name, feed_fn feed,
+ struct receive_hook_feed_state *feed_state)
{
struct child_process proc = CHILD_PROCESS_INIT;
struct async muxer;
@@ -567,6 +646,16 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed, void *feed_sta
proc.argv = argv;
proc.in = -1;
proc.stdout_to_stderr = 1;
+ if (feed_state->push_options) {
+ int i;
+ for (i = 0; i < feed_state->push_options->nr; i++)
+ argv_array_pushf(&proc.env_array,
+ "GIT_PUSH_OPTION_%d=%s", i,
+ feed_state->push_options->items[i].string);
+ argv_array_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT=%d",
+ feed_state->push_options->nr);
+ } else
+ argv_array_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT");
if (use_sideband) {
memset(&muxer, 0, sizeof(muxer));
@@ -606,12 +695,6 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed, void *feed_sta
return finish_command(&proc);
}
-struct receive_hook_feed_state {
- struct command *cmd;
- int skip_broken;
- struct strbuf buf;
-};
-
static int feed_receive_hook(void *state_, const char **bufp, size_t *sizep)
{
struct receive_hook_feed_state *state = state_;
@@ -634,8 +717,10 @@ static int feed_receive_hook(void *state_, const char **bufp, size_t *sizep)
return 0;
}
-static int run_receive_hook(struct command *commands, const char *hook_name,
- int skip_broken)
+static int run_receive_hook(struct command *commands,
+ const char *hook_name,
+ int skip_broken,
+ const struct string_list *push_options)
{
struct receive_hook_feed_state state;
int status;
@@ -646,6 +731,7 @@ static int run_receive_hook(struct command *commands, const char *hook_name,
if (feed_receive_hook(&state, NULL, NULL))
return 0;
state.cmd = commands;
+ state.push_options = push_options;
status = run_and_feed_hook(hook_name, feed_receive_hook, &state);
strbuf_release(&state.buf);
return status;
@@ -737,7 +823,7 @@ static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
{
static struct lock_file shallow_lock;
struct sha1_array extra = SHA1_ARRAY_INIT;
- const char *alt_file;
+ struct check_connected_options opt = CHECK_CONNECTED_INIT;
uint32_t mask = 1 << (cmd->index % 32);
int i;
@@ -749,9 +835,8 @@ static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
!delayed_reachability_test(si, i))
sha1_array_append(&extra, si->shallow->sha1[i]);
- setup_alternate_shallow(&shallow_lock, &alt_file, &extra);
- if (check_shallow_connected(command_singleton_iterator,
- 0, cmd, alt_file)) {
+ setup_alternate_shallow(&shallow_lock, &opt.shallow_file, &extra);
+ if (check_connected(command_singleton_iterator, cmd, &opt)) {
rollback_lock_file(&shallow_lock);
sha1_array_clear(&extra);
return -1;
@@ -1160,8 +1245,8 @@ static void set_connectivity_errors(struct command *commands,
if (shallow_update && si->shallow_ref[cmd->index])
/* to be checked in update_shallow_ref() */
continue;
- if (!check_everything_connected(command_singleton_iterator,
- 0, &singleton))
+ if (!check_connected(command_singleton_iterator, &singleton,
+ NULL))
continue;
cmd->error_string = "missing necessary objects";
}
@@ -1316,11 +1401,15 @@ cleanup:
static void execute_commands(struct command *commands,
const char *unpacker_error,
- struct shallow_info *si)
+ struct shallow_info *si,
+ const struct string_list *push_options)
{
+ struct check_connected_options opt = CHECK_CONNECTED_INIT;
struct command *cmd;
unsigned char sha1[20];
struct iterate_data data;
+ struct async muxer;
+ int err_fd = 0;
if (unpacker_error) {
for (cmd = commands; cmd; cmd = cmd->next)
@@ -1328,14 +1417,28 @@ static void execute_commands(struct command *commands,
return;
}
+ if (use_sideband) {
+ memset(&muxer, 0, sizeof(muxer));
+ muxer.proc = copy_to_sideband;
+ muxer.in = -1;
+ if (!start_async(&muxer))
+ err_fd = muxer.in;
+ /* ...else, continue without relaying sideband */
+ }
+
data.cmds = commands;
data.si = si;
- if (check_everything_connected(iterate_receive_command_list, 0, &data))
+ opt.err_fd = err_fd;
+ opt.progress = err_fd && !quiet;
+ if (check_connected(iterate_receive_command_list, &data, &opt))
set_connectivity_errors(commands, si);
+ if (use_sideband)
+ finish_async(&muxer);
+
reject_updates_to_hidden(commands);
- if (run_receive_hook(commands, "pre-receive", 0)) {
+ if (run_receive_hook(commands, "pre-receive", 0, push_options)) {
for (cmd = commands; cmd; cmd = cmd->next) {
if (!cmd->error_string)
cmd->error_string = "pre-receive hook declined";
@@ -1437,6 +1540,9 @@ static struct command *read_head_info(struct sha1_array *shallow)
if (advertise_atomic_push
&& parse_feature_request(feature_list, "atomic"))
use_atomic = 1;
+ if (advertise_push_options
+ && parse_feature_request(feature_list, "push-options"))
+ use_push_options = 1;
}
if (!strcmp(line, "push-cert")) {
@@ -1469,6 +1575,21 @@ static struct command *read_head_info(struct sha1_array *shallow)
return commands;
}
+static void read_push_options(struct string_list *options)
+{
+ while (1) {
+ char *line;
+ int len;
+
+ line = packet_read_line(0, &len);
+
+ if (!line)
+ break;
+
+ string_list_append(options, line);
+ }
+}
+
static const char *parse_pack_header(struct pack_header *hdr)
{
switch (read_pack_header(0, hdr)) {
@@ -1546,6 +1667,10 @@ static const char *unpack(int err_fd, struct shallow_info *si)
(uintmax_t)getpid(),
hostname);
+ if (!quiet && err_fd)
+ argv_array_push(&child.args, "--show-resolving-progress");
+ if (use_sideband)
+ argv_array_push(&child.args, "--report-end-of-input");
if (fsck_objects)
argv_array_pushf(&child.args, "--strict%s",
fsck_msg_types.buf);
@@ -1575,6 +1700,7 @@ static const char *unpack_with_sideband(struct shallow_info *si)
if (!use_sideband)
return unpack(0, si);
+ use_keepalive = KEEPALIVE_AFTER_NUL;
memset(&muxer, 0, sizeof(muxer));
muxer.proc = copy_to_sideband;
muxer.in = -1;
@@ -1754,6 +1880,10 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
if ((commands = read_head_info(&shallow)) != NULL) {
const char *unpack_status = NULL;
+ struct string_list push_options = STRING_LIST_INIT_DUP;
+
+ if (use_push_options)
+ read_push_options(&push_options);
prepare_shallow_info(&si, &shallow);
if (!si.nr_ours && !si.nr_theirs)
@@ -1762,20 +1892,36 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
unpack_status = unpack_with_sideband(&si);
update_shallow_info(commands, &si, &ref);
}
- execute_commands(commands, unpack_status, &si);
+ use_keepalive = KEEPALIVE_ALWAYS;
+ execute_commands(commands, unpack_status, &si,
+ &push_options);
if (pack_lockfile)
unlink_or_warn(pack_lockfile);
if (report_status)
report(commands, unpack_status);
- run_receive_hook(commands, "post-receive", 1);
+ run_receive_hook(commands, "post-receive", 1,
+ &push_options);
run_update_post_hook(commands);
+ if (push_options.nr)
+ string_list_clear(&push_options, 0);
if (auto_gc) {
const char *argv_gc_auto[] = {
"gc", "--auto", "--quiet", NULL,
};
- int opt = RUN_GIT_CMD | RUN_COMMAND_STDOUT_TO_STDERR;
+ struct child_process proc = CHILD_PROCESS_INIT;
+
+ proc.no_stdin = 1;
+ proc.stdout_to_stderr = 1;
+ proc.err = use_sideband ? -1 : 0;
+ proc.git_cmd = 1;
+ proc.argv = argv_gc_auto;
+
close_all_packs();
- run_command_v_opt(argv_gc_auto, opt);
+ if (!start_command(&proc)) {
+ if (use_sideband)
+ copy_to_sideband(proc.err, -1, NULL);
+ finish_command(&proc);
+ }
}
if (auto_update_server_info)
update_server_info(0);
diff --git a/builtin/remote.c b/builtin/remote.c
index d33766b..9f6a6b3 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -247,7 +247,7 @@ struct branch_info {
enum { NO_REBASE, NORMAL_REBASE, INTERACTIVE_REBASE } rebase;
};
-static struct string_list branch_list;
+static struct string_list branch_list = STRING_LIST_INIT_NODUP;
static const char *abbrev_ref(const char *name, const char *prefix)
{
@@ -539,10 +539,6 @@ static int add_branch_for_removal(const char *refname,
return 0;
}
- /* make sure that symrefs are deleted */
- if (flags & REF_ISSYMREF)
- return unlink(git_path("%s", refname));
-
string_list_append(branches->branches, refname);
return 0;
@@ -788,7 +784,7 @@ static int rm(int argc, const char **argv)
strbuf_release(&buf);
if (!result)
- result = delete_refs(&branches);
+ result = delete_refs(&branches, REF_NODEREF);
string_list_clear(&branches, 0);
if (skipped.nr) {
@@ -952,7 +948,7 @@ static int show_local_info_item(struct string_list_item *item, void *cb_data)
struct show_info *show_info = cb_data;
struct branch_info *branch_info = item->util;
struct string_list *merge = &branch_info->merge;
- const char *also;
+ int width = show_info->width + 4;
int i;
if (branch_info->rebase && branch_info->merge.nr > 1) {
@@ -963,19 +959,18 @@ static int show_local_info_item(struct string_list_item *item, void *cb_data)
printf(" %-*s ", show_info->width, item->string);
if (branch_info->rebase) {
- printf_ln(_(branch_info->rebase == INTERACTIVE_REBASE ?
- "rebases interactively onto remote %s" :
- "rebases onto remote %s"), merge->items[0].string);
+ printf_ln(branch_info->rebase == INTERACTIVE_REBASE
+ ? _("rebases interactively onto remote %s")
+ : _("rebases onto remote %s"), merge->items[0].string);
return 0;
} else if (show_info->any_rebase) {
printf_ln(_(" merges with remote %s"), merge->items[0].string);
- also = _(" and with remote");
+ width++;
} else {
printf_ln(_("merges with remote %s"), merge->items[0].string);
- also = _(" and with remote");
}
for (i = 1; i < merge->nr; i++)
- printf(" %-*s %s %s\n", show_info->width, "", also,
+ printf(_("%-*s and with remote %s\n"), width, "",
merge->items[i].string);
return 0;
@@ -1158,11 +1153,11 @@ static int show(int argc, const char **argv)
the one in " Fetch URL: %s" translation */
printf_ln(_(" Push URL: %s"), url[i]);
if (!i)
- printf_ln(_(" Push URL: %s"), "(no URL)");
+ printf_ln(_(" Push URL: %s"), _("(no URL)"));
if (no_query)
- printf_ln(_(" HEAD branch: %s"), "(not queried)");
+ printf_ln(_(" HEAD branch: %s"), _("(not queried)"));
else if (!states.heads.nr)
- printf_ln(_(" HEAD branch: %s"), "(unknown)");
+ printf_ln(_(" HEAD branch: %s"), _("(unknown)"));
else if (states.heads.nr == 1)
printf_ln(_(" HEAD branch: %s"), states.heads.items[0].string);
else {
@@ -1305,7 +1300,7 @@ static int prune_remote(const char *remote, int dry_run)
string_list_sort(&refs_to_prune);
if (!dry_run)
- result |= delete_refs(&refs_to_prune);
+ result |= delete_refs(&refs_to_prune, 0);
for_each_string_list_item(item, &states.stale) {
const char *refname = item->util;
diff --git a/builtin/repack.c b/builtin/repack.c
index 858db38..80dd06b 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -146,6 +146,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
int pack_everything = 0;
int delete_redundant = 0;
const char *unpack_unreachable = NULL;
+ int keep_unreachable = 0;
const char *window = NULL, *window_memory = NULL;
const char *depth = NULL;
const char *max_pack_size = NULL;
@@ -175,6 +176,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
N_("write bitmap index")),
OPT_STRING(0, "unpack-unreachable", &unpack_unreachable, N_("approxidate"),
N_("with -A, do not loosen objects older than this")),
+ OPT_BOOL('k', "keep-unreachable", &keep_unreachable,
+ N_("with -a, repack unreachable objects")),
OPT_STRING(0, "window", &window, N_("n"),
N_("size of the window used for delta compression")),
OPT_STRING(0, "window-memory", &window_memory, N_("bytes"),
@@ -196,6 +199,10 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
if (delete_redundant && repository_format_precious_objects)
die(_("cannot delete packs in a precious-objects repo"));
+ if (keep_unreachable &&
+ (unpack_unreachable || (pack_everything & LOOSEN_UNREACHABLE)))
+ die(_("--keep-unreachable and -A are incompatible"));
+
if (pack_kept_objects < 0)
pack_kept_objects = write_bitmaps;
@@ -239,6 +246,9 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
} else if (pack_everything & LOOSEN_UNREACHABLE) {
argv_array_push(&cmd.args,
"--unpack-unreachable");
+ } else if (keep_unreachable) {
+ argv_array_push(&cmd.args, "--keep-unreachable");
+ argv_array_push(&cmd.args, "--pack-loose-unreachable");
} else {
argv_array_push(&cmd.env_array, "GIT_REF_PARANOIA=1");
}
@@ -378,7 +388,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
item->string,
exts[ext].name);
if (remove_path(fname))
- warning(_("removing '%s' failed"), fname);
+ warning(_("failed to remove '%s'"), fname);
free(fname);
}
}
diff --git a/builtin/reset.c b/builtin/reset.c
index e8c5767..9400acc 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -24,7 +24,7 @@
static const char * const git_reset_usage[] = {
N_("git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"),
- N_("git reset [-q] <tree-ish> [--] <paths>..."),
+ N_("git reset [-q] [<tree-ish>] [--] <paths>..."),
N_("git reset --patch [<tree-ish>] [--] [<paths>...]"),
NULL
};
@@ -121,7 +121,7 @@ static void update_index_from_diff(struct diff_queue_struct *q,
for (i = 0; i < q->nr; i++) {
struct diff_filespec *one = q->queue[i]->one;
- int is_missing = !(one->mode && !is_null_sha1(one->sha1));
+ int is_missing = !(one->mode && !is_null_oid(&one->oid));
struct cache_entry *ce;
if (is_missing && !intent_to_add) {
@@ -129,7 +129,7 @@ static void update_index_from_diff(struct diff_queue_struct *q,
continue;
}
- ce = make_cache_entry(one->mode, one->sha1, one->path,
+ ce = make_cache_entry(one->mode, one->oid.hash, one->path,
0, 0);
if (!ce)
die(_("make_cache_entry failed for path '%s'"),
@@ -158,7 +158,7 @@ static int read_from_tree(const struct pathspec *pathspec,
return 1;
diffcore_std(&opt);
diff_flush(&opt);
- free_pathspec(&opt.pathspec);
+ clear_pathspec(&opt.pathspec);
return 0;
}
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index b82bcc3..0ba82b1 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -9,6 +9,7 @@
#include "log-tree.h"
#include "graph.h"
#include "bisect.h"
+#include "progress.h"
static const char rev_list_usage[] =
"git rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
@@ -49,12 +50,17 @@ static const char rev_list_usage[] =
" --bisect-all"
;
+static struct progress *progress;
+static unsigned progress_counter;
+
static void finish_commit(struct commit *commit, void *data);
static void show_commit(struct commit *commit, void *data)
{
struct rev_list_info *info = data;
struct rev_info *revs = info->revs;
+ display_progress(progress, ++progress_counter);
+
if (info->flags & REV_LIST_QUIET) {
finish_commit(commit, data);
return;
@@ -190,6 +196,7 @@ static void show_object(struct object *obj, const char *name, void *cb_data)
{
struct rev_list_info *info = cb_data;
finish_object(obj, name, cb_data);
+ display_progress(progress, ++progress_counter);
if (info->flags & REV_LIST_QUIET)
return;
show_object_with_name(stdout, obj, name);
@@ -276,6 +283,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
int bisect_show_vars = 0;
int bisect_find_all = 0;
int use_bitmap_index = 0;
+ const char *show_progress = NULL;
git_config(git_default_config, NULL);
init_revisions(&revs, prefix);
@@ -325,6 +333,10 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
test_bitmap_walk(&revs);
return 0;
}
+ if (skip_prefix(arg, "--progress=", &arg)) {
+ show_progress = arg;
+ continue;
+ }
usage(rev_list_usage);
}
@@ -355,6 +367,9 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
if (bisect_list)
revs.limited = 1;
+ if (show_progress)
+ progress = start_progress_delay(show_progress, 0, 0, 2);
+
if (use_bitmap_index && !revs.prune) {
if (revs.count && !revs.left_right && !revs.cherry_mark) {
uint32_t commit_count;
@@ -392,6 +407,8 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
traverse_commit_list(&revs, show_commit, show_object, &info);
+ stop_progress(&progress);
+
if (revs.count) {
if (revs.left_right && revs.cherry_mark)
printf("%d\t%d\t%d\n", revs.count_left, revs.count_right, revs.count_same);
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index bfc082e..25fa8a6 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -233,11 +233,11 @@ void shortlog_init(struct shortlog *log)
int cmd_shortlog(int argc, const char **argv, const char *prefix)
{
- static struct shortlog log;
- static struct rev_info rev;
+ struct shortlog log = { STRING_LIST_INIT_NODUP };
+ struct rev_info rev;
int nongit = !startup_info->have_repository;
- static const struct option options[] = {
+ const struct option options[] = {
OPT_BOOL('n', "numbered", &log.sort_by_number,
N_("sort output according to the number of commits per author")),
OPT_BOOL('s', "summary", &log.summary,
@@ -276,6 +276,7 @@ parse_done:
log.user_format = rev.commit_format == CMIT_FMT_USERFORMAT;
log.abbrev = rev.abbrev;
+ log.file = rev.diffopt.file;
/* assume HEAD if from a tty */
if (!nongit && !rev.pending.nr && isatty(0))
@@ -289,6 +290,8 @@ parse_done:
get_from_rev(&rev, &log);
shortlog_output(&log);
+ if (log.file != stdout)
+ fclose(log.file);
return 0;
}
@@ -310,22 +313,24 @@ void shortlog_output(struct shortlog *log)
for (i = 0; i < log->list.nr; i++) {
const struct string_list_item *item = &log->list.items[i];
if (log->summary) {
- printf("%6d\t%s\n", (int)UTIL_TO_INT(item), item->string);
+ fprintf(log->file, "%6d\t%s\n",
+ (int)UTIL_TO_INT(item), item->string);
} else {
struct string_list *onelines = item->util;
- printf("%s (%d):\n", item->string, onelines->nr);
+ fprintf(log->file, "%s (%d):\n",
+ item->string, onelines->nr);
for (j = onelines->nr - 1; j >= 0; j--) {
const char *msg = onelines->items[j].string;
if (log->wrap_lines) {
strbuf_reset(&sb);
add_wrapped_shortlog_msg(&sb, msg, log);
- fwrite(sb.buf, sb.len, 1, stdout);
+ fwrite(sb.buf, sb.len, 1, log->file);
}
else
- printf(" %s\n", msg);
+ fprintf(log->file, " %s\n", msg);
}
- putchar('\n');
+ putc('\n', log->file);
onelines->strdup_strings = 1;
string_list_clear(onelines, 0);
free(onelines);
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 926d205..dbe5699 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -444,8 +444,7 @@ static int module_name(int argc, const char **argv, const char *prefix)
static int clone_submodule(const char *path, const char *gitdir, const char *url,
const char *depth, const char *reference, int quiet)
{
- struct child_process cp;
- child_process_init(&cp);
+ struct child_process cp = CHILD_PROCESS_INIT;
argv_array_push(&cp.args, "clone");
argv_array_push(&cp.args, "--no-checkout");
@@ -579,6 +578,7 @@ struct submodule_update_clone {
/* configuration parameters which are passed on to the children */
int quiet;
+ int recommend_shallow;
const char *reference;
const char *depth;
const char *recursive_prefix;
@@ -589,10 +589,14 @@ struct submodule_update_clone {
/* If we want to stop as fast as possible and return an error */
unsigned quickstop : 1;
+
+ /* failed clones to be retried again */
+ const struct cache_entry **failed_clones;
+ int failed_clones_nr, failed_clones_alloc;
};
#define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \
- SUBMODULE_UPDATE_STRATEGY_INIT, 0, NULL, NULL, NULL, NULL, \
- STRING_LIST_INIT_DUP, 0}
+ SUBMODULE_UPDATE_STRATEGY_INIT, 0, -1, NULL, NULL, NULL, NULL, \
+ STRING_LIST_INIT_DUP, 0, NULL, 0, 0}
static void next_submodule_warn_missing(struct submodule_update_clone *suc,
@@ -633,7 +637,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
if (suc->recursive_prefix)
strbuf_addf(&sb, "%s/%s", suc->recursive_prefix, ce->name);
else
- strbuf_addf(&sb, "%s", ce->name);
+ strbuf_addstr(&sb, ce->name);
strbuf_addf(out, _("Skipping unmerged submodule %s"), sb.buf);
strbuf_addch(out, '\n');
goto cleanup;
@@ -696,6 +700,8 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
argv_array_push(&child->args, "--quiet");
if (suc->prefix)
argv_array_pushl(&child->args, "--prefix", suc->prefix, NULL);
+ if (suc->recommend_shallow && sub->recommend_shallow == 1)
+ argv_array_push(&child->args, "--depth=1");
argv_array_pushl(&child->args, "--path", sub->path, NULL);
argv_array_pushl(&child->args, "--name", sub->name, NULL);
argv_array_pushl(&child->args, "--url", url, NULL);
@@ -715,23 +721,52 @@ cleanup:
static int update_clone_get_next_task(struct child_process *child,
struct strbuf *err,
void *suc_cb,
- void **void_task_cb)
+ void **idx_task_cb)
{
struct submodule_update_clone *suc = suc_cb;
+ const struct cache_entry *ce;
+ int index;
for (; suc->current < suc->list.nr; suc->current++) {
- const struct cache_entry *ce = suc->list.entries[suc->current];
+ ce = suc->list.entries[suc->current];
if (prepare_to_clone_next_submodule(ce, child, suc, err)) {
+ int *p = xmalloc(sizeof(*p));
+ *p = suc->current;
+ *idx_task_cb = p;
suc->current++;
return 1;
}
}
+
+ /*
+ * The loop above tried cloning each submodule once, now try the
+ * stragglers again, which we can imagine as an extension of the
+ * entry list.
+ */
+ index = suc->current - suc->list.nr;
+ if (index < suc->failed_clones_nr) {
+ int *p;
+ ce = suc->failed_clones[index];
+ if (!prepare_to_clone_next_submodule(ce, child, suc, err)) {
+ suc->current ++;
+ strbuf_addstr(err, "BUG: submodule considered for "
+ "cloning, doesn't need cloning "
+ "any more?\n");
+ return 0;
+ }
+ p = xmalloc(sizeof(*p));
+ *p = suc->current;
+ *idx_task_cb = p;
+ suc->current ++;
+ return 1;
+ }
+
return 0;
}
static int update_clone_start_failure(struct strbuf *err,
void *suc_cb,
- void *void_task_cb)
+ void *idx_task_cb)
{
struct submodule_update_clone *suc = suc_cb;
suc->quickstop = 1;
@@ -741,15 +776,39 @@ static int update_clone_start_failure(struct strbuf *err,
static int update_clone_task_finished(int result,
struct strbuf *err,
void *suc_cb,
- void *void_task_cb)
+ void *idx_task_cb)
{
+ const struct cache_entry *ce;
struct submodule_update_clone *suc = suc_cb;
+ int *idxP = *(int**)idx_task_cb;
+ int idx = *idxP;
+ free(idxP);
+
if (!result)
return 0;
- suc->quickstop = 1;
- return 1;
+ if (idx < suc->list.nr) {
+ ce = suc->list.entries[idx];
+ strbuf_addf(err, _("Failed to clone '%s'. Retry scheduled"),
+ ce->name);
+ strbuf_addch(err, '\n');
+ ALLOC_GROW(suc->failed_clones,
+ suc->failed_clones_nr + 1,
+ suc->failed_clones_alloc);
+ suc->failed_clones[suc->failed_clones_nr++] = ce;
+ return 0;
+ } else {
+ idx -= suc->list.nr;
+ ce = suc->failed_clones[idx];
+ strbuf_addf(err, _("Failed to clone '%s' a second time, aborting"),
+ ce->name);
+ strbuf_addch(err, '\n');
+ suc->quickstop = 1;
+ return 1;
+ }
+
+ return 0;
}
static int update_clone(int argc, const char **argv, const char *prefix)
@@ -778,6 +837,8 @@ static int update_clone(int argc, const char **argv, const char *prefix)
"specified number of revisions")),
OPT_INTEGER('j', "jobs", &max_jobs,
N_("parallel jobs")),
+ OPT_BOOL(0, "recommend-shallow", &suc.recommend_shallow,
+ N_("whether the initial clone should follow the shallow recommendation")),
OPT__QUIET(&suc.quiet, N_("don't print cloning progress")),
OPT_END()
};
@@ -835,13 +896,64 @@ static int resolve_relative_path(int argc, const char **argv, const char *prefix
{
struct strbuf sb = STRBUF_INIT;
if (argc != 3)
- die("submodule--helper relative_path takes exactly 2 arguments, got %d", argc);
+ die("submodule--helper relative-path takes exactly 2 arguments, got %d", argc);
printf("%s", relative_path(argv[1], argv[2], &sb));
strbuf_release(&sb);
return 0;
}
+static const char *remote_submodule_branch(const char *path)
+{
+ const struct submodule *sub;
+ gitmodules_config();
+ git_config(submodule_config, NULL);
+
+ sub = submodule_from_path(null_sha1, path);
+ if (!sub)
+ return NULL;
+
+ if (!sub->branch)
+ return "master";
+
+ if (!strcmp(sub->branch, ".")) {
+ unsigned char sha1[20];
+ const char *refname = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
+
+ if (!refname)
+ die(_("No such ref: %s"), "HEAD");
+
+ /* detached HEAD */
+ if (!strcmp(refname, "HEAD"))
+ die(_("Submodule (%s) branch configured to inherit "
+ "branch from superproject, but the superproject "
+ "is not on any branch"), sub->name);
+
+ if (!skip_prefix(refname, "refs/heads/", &refname))
+ die(_("Expecting a full ref name, got %s"), refname);
+ return refname;
+ }
+
+ return sub->branch;
+}
+
+static int resolve_remote_submodule_branch(int argc, const char **argv,
+ const char *prefix)
+{
+ const char *ret;
+ struct strbuf sb = STRBUF_INIT;
+ if (argc != 2)
+ die("submodule--helper remote-branch takes exactly one arguments, got %d", argc);
+
+ ret = remote_submodule_branch(argv[1]);
+ if (!ret)
+ die("submodule %s doesn't exist", argv[1]);
+
+ printf("%s", ret);
+ strbuf_release(&sb);
+ return 0;
+}
+
struct cmd_struct {
const char *cmd;
int (*fn)(int, const char **, const char *);
@@ -855,7 +967,8 @@ static struct cmd_struct commands[] = {
{"relative-path", resolve_relative_path},
{"resolve-relative-url", resolve_relative_url},
{"resolve-relative-url-test", resolve_relative_url_test},
- {"init", module_init}
+ {"init", module_init},
+ {"remote-branch", resolve_remote_submodule_branch}
};
int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c
index 9c29a64..96eed94 100644
--- a/builtin/symbolic-ref.c
+++ b/builtin/symbolic-ref.c
@@ -56,6 +56,8 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
ret = check_symref(argv[0], 1, 0, 0);
if (ret)
die("Cannot delete %s, not a symbolic ref", argv[0]);
+ if (!strcmp(argv[0], "HEAD"))
+ die("deleting '%s' is not allowed", argv[0]);
return delete_ref(argv[0], NULL, REF_NODEREF);
}
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 875e7ed..172470b 100644
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -355,7 +355,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size,
return; /* we are done */
else {
/* cannot resolve yet --- queue it */
- hashcpy(obj_list[nr].sha1, null_sha1);
+ hashclr(obj_list[nr].sha1);
add_delta_to_list(nr, base_sha1, 0, delta_data, delta_size);
return;
}
@@ -406,7 +406,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size,
* The delta base object is itself a delta that
* has not been resolved yet.
*/
- hashcpy(obj_list[nr].sha1, null_sha1);
+ hashclr(obj_list[nr].sha1);
add_delta_to_list(nr, null_sha1, base_offset, delta_data, delta_size);
return;
}
diff --git a/builtin/update-index.c b/builtin/update-index.c
index b8b8522..9e9e040 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -419,30 +419,18 @@ static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
return 0;
}
-static void chmod_path(int flip, const char *path)
+static void chmod_path(char flip, const char *path)
{
int pos;
struct cache_entry *ce;
- unsigned int mode;
pos = cache_name_pos(path, strlen(path));
if (pos < 0)
goto fail;
ce = active_cache[pos];
- mode = ce->ce_mode;
- if (!S_ISREG(mode))
- goto fail;
- switch (flip) {
- case '+':
- ce->ce_mode |= 0111; break;
- case '-':
- ce->ce_mode &= ~0111; break;
- default:
+ if (chmod_cache_entry(ce, flip) < 0)
goto fail;
- }
- cache_tree_invalidate_path(&the_index, path);
- ce->ce_flags |= CE_UPDATE_IN_BASE;
- active_cache_changed |= CE_ENTRY_CHANGED;
+
report("chmod %cx '%s'", flip, path);
return;
fail:
@@ -759,7 +747,7 @@ static int do_reupdate(int ac, const char **av,
if (save_nr != active_nr)
goto redo;
}
- free_pathspec(&pathspec);
+ clear_pathspec(&pathspec);
return 0;
}
@@ -1146,7 +1134,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
break;
default:
- die("Bug: bad untracked_cache value: %d", untracked_cache);
+ die("BUG: bad untracked_cache value: %d", untracked_cache);
}
if (active_cache_changed) {
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 96a2834..5c4854d 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -13,8 +13,10 @@
static const char * const worktree_usage[] = {
N_("git worktree add [<options>] <path> [<branch>]"),
- N_("git worktree prune [<options>]"),
N_("git worktree list [<options>]"),
+ N_("git worktree lock [<options>] <path>"),
+ N_("git worktree prune [<options>]"),
+ N_("git worktree unlock <path>"),
NULL
};
@@ -95,7 +97,7 @@ static void prune_worktrees(void)
if (!dir)
return;
while ((d = readdir(dir)) != NULL) {
- if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
+ if (is_dot_or_dotdot(d->d_name))
continue;
strbuf_reset(&reason);
if (!prune_worktree(d->d_name, &reason))
@@ -192,7 +194,7 @@ static int add_worktree(const char *path, const char *refname,
struct strbuf sb = STRBUF_INIT;
const char *name;
struct stat st;
- struct child_process cp;
+ struct child_process cp = CHILD_PROCESS_INIT;
struct argv_array child_env = ARGV_ARRAY_INIT;
int counter = 0, len, ret;
struct strbuf symref = STRBUF_INIT;
@@ -262,7 +264,7 @@ static int add_worktree(const char *path, const char *refname,
*/
strbuf_reset(&sb);
strbuf_addf(&sb, "%s/HEAD", sb_repo.buf);
- write_file(sb.buf, "0000000000000000000000000000000000000000");
+ write_file(sb.buf, "%s", sha1_to_hex(null_sha1));
strbuf_reset(&sb);
strbuf_addf(&sb, "%s/commondir", sb_repo.buf);
write_file(sb.buf, "../..");
@@ -271,7 +273,6 @@ static int add_worktree(const char *path, const char *refname,
argv_array_pushf(&child_env, "%s=%s", GIT_DIR_ENVIRONMENT, sb_git.buf);
argv_array_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path);
- memset(&cp, 0, sizeof(cp));
cp.git_cmd = 1;
if (commit)
@@ -337,9 +338,12 @@ static int add(int ac, const char **av, const char *prefix)
if (ac < 1 || ac > 2)
usage_with_options(worktree_usage, options);
- path = prefix ? prefix_filename(prefix, strlen(prefix), av[0]) : av[0];
+ path = prefix_filename(prefix, strlen(prefix), av[0]);
branch = ac < 2 ? "HEAD" : av[1];
+ if (!strcmp(branch, "-"))
+ branch = "@{-1}";
+
opts.force_new_branch = !!new_branch_force;
if (opts.force_new_branch) {
struct strbuf symref = STRBUF_INIT;
@@ -360,8 +364,7 @@ static int add(int ac, const char **av, const char *prefix)
}
if (opts.new_branch) {
- struct child_process cp;
- memset(&cp, 0, sizeof(cp));
+ struct child_process cp = CHILD_PROCESS_INIT;
cp.git_cmd = 1;
argv_array_push(&cp.args, "branch");
if (opts.force_new_branch)
@@ -459,19 +462,87 @@ static int list(int ac, const char **av, const char *prefix)
return 0;
}
+static int lock_worktree(int ac, const char **av, const char *prefix)
+{
+ const char *reason = "", *old_reason;
+ struct option options[] = {
+ OPT_STRING(0, "reason", &reason, N_("string"),
+ N_("reason for locking")),
+ OPT_END()
+ };
+ struct worktree **worktrees, *wt;
+
+ ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
+ if (ac != 1)
+ usage_with_options(worktree_usage, options);
+
+ worktrees = get_worktrees();
+ wt = find_worktree(worktrees, prefix, av[0]);
+ if (!wt)
+ die(_("'%s' is not a working tree"), av[0]);
+ if (is_main_worktree(wt))
+ die(_("The main working tree cannot be locked or unlocked"));
+
+ old_reason = is_worktree_locked(wt);
+ if (old_reason) {
+ if (*old_reason)
+ die(_("'%s' is already locked, reason: %s"),
+ av[0], old_reason);
+ die(_("'%s' is already locked"), av[0]);
+ }
+
+ write_file(git_common_path("worktrees/%s/locked", wt->id),
+ "%s", reason);
+ free_worktrees(worktrees);
+ return 0;
+}
+
+static int unlock_worktree(int ac, const char **av, const char *prefix)
+{
+ struct option options[] = {
+ OPT_END()
+ };
+ struct worktree **worktrees, *wt;
+ int ret;
+
+ ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
+ if (ac != 1)
+ usage_with_options(worktree_usage, options);
+
+ worktrees = get_worktrees();
+ wt = find_worktree(worktrees, prefix, av[0]);
+ if (!wt)
+ die(_("'%s' is not a working tree"), av[0]);
+ if (is_main_worktree(wt))
+ die(_("The main working tree cannot be locked or unlocked"));
+ if (!is_worktree_locked(wt))
+ die(_("'%s' is not locked"), av[0]);
+ ret = unlink_or_warn(git_common_path("worktrees/%s/locked", wt->id));
+ free_worktrees(worktrees);
+ return ret;
+}
+
int cmd_worktree(int ac, const char **av, const char *prefix)
{
struct option options[] = {
OPT_END()
};
+ git_config(git_default_config, NULL);
+
if (ac < 2)
usage_with_options(worktree_usage, options);
+ if (!prefix)
+ prefix = "";
if (!strcmp(av[1], "add"))
return add(ac - 1, av + 1, prefix);
if (!strcmp(av[1], "prune"))
return prune(ac - 1, av + 1, prefix);
if (!strcmp(av[1], "list"))
return list(ac - 1, av + 1, prefix);
+ if (!strcmp(av[1], "lock"))
+ return lock_worktree(ac - 1, av + 1, prefix);
+ if (!strcmp(av[1], "unlock"))
+ return unlock_worktree(ac - 1, av + 1, prefix);
usage_with_options(worktree_usage, options);
}
diff --git a/cache.h b/cache.h
index 1fd2d5d..1ec9021 100644
--- a/cache.h
+++ b/cache.h
@@ -367,8 +367,9 @@ extern void free_name_hash(struct index_state *istate);
#define rename_cache_entry_at(pos, new_name) rename_index_entry_at(&the_index, (pos), (new_name))
#define remove_cache_entry_at(pos) remove_index_entry_at(&the_index, (pos))
#define remove_file_from_cache(path) remove_file_from_index(&the_index, (path))
-#define add_to_cache(path, st, flags) add_to_index(&the_index, (path), (st), (flags), 0)
-#define add_file_to_cache(path, flags) add_file_to_index(&the_index, (path), (flags), 0)
+#define add_to_cache(path, st, flags) add_to_index(&the_index, (path), (st), (flags))
+#define add_file_to_cache(path, flags) add_file_to_index(&the_index, (path), (flags))
+#define chmod_cache_entry(ce, flip) chmod_index_entry(&the_index, (ce), (flip))
#define refresh_cache(flags) refresh_index(&the_index, (flags), NULL, NULL, NULL)
#define ce_match_stat(ce, st, options) ie_match_stat(&the_index, (ce), (st), (options))
#define ce_modified(ce, st, options) ie_modified(&the_index, (ce), (st), (options))
@@ -581,9 +582,10 @@ extern int remove_file_from_index(struct index_state *, const char *path);
#define ADD_CACHE_IGNORE_ERRORS 4
#define ADD_CACHE_IGNORE_REMOVAL 8
#define ADD_CACHE_INTENT 16
-extern int add_to_index(struct index_state *, const char *path, struct stat *, int flags, int force_mode);
-extern int add_file_to_index(struct index_state *, const char *path, int flags, int force_mode);
+extern int add_to_index(struct index_state *, const char *path, struct stat *, int flags);
+extern int add_file_to_index(struct index_state *, const char *path, int flags);
extern struct cache_entry *make_cache_entry(unsigned int mode, const unsigned char *sha1, const char *path, int stage, unsigned int refresh_options);
+extern int chmod_index_entry(struct index_state *, struct cache_entry *ce, char flip);
extern int ce_same_name(const struct cache_entry *a, const struct cache_entry *b);
extern void set_object_name_for_intent_to_add_entry(struct cache_entry *ce);
extern int index_name_is_other(const struct index_state *, const char *, int);
@@ -1004,6 +1006,11 @@ int adjust_shared_perm(const char *path);
* directory while we were working. To be robust against this kind of
* race, callers might want to try invoking the function again when it
* returns SCLD_VANISHED.
+ *
+ * safe_create_leading_directories() temporarily changes path while it
+ * is working but restores it before returning.
+ * safe_create_leading_directories_const() doesn't modify path, even
+ * temporarily.
*/
enum scld_error {
SCLD_OK = 0,
@@ -1116,6 +1123,7 @@ static inline int has_sha1_file(const unsigned char *sha1)
/* Same as the above, except for struct object_id. */
extern int has_object_file(const struct object_id *oid);
+extern int has_object_file_with_flags(const struct object_id *oid, int flags);
/*
* Return true iff an alternate object database has a loose object
@@ -1134,6 +1142,16 @@ static inline unsigned int hexval(unsigned char c)
return hexval_table[c];
}
+/*
+ * Convert two consecutive hexadecimal digits into a char. Return a
+ * negative value on error. Don't run over the end of short strings.
+ */
+static inline int hex2chr(const char *s)
+{
+ int val = hexval(s[0]);
+ return (val < 0) ? val : (val << 4) | hexval(s[1]);
+}
+
/* Convert to/from hex/sha1 representation */
#define MINIMUM_ABBREV minimum_abbrev
#define DEFAULT_ABBREV default_abbrev
@@ -1194,6 +1212,7 @@ extern int get_oid_hex(const char *hex, struct object_id *sha1);
* printf("%s -> %s", sha1_to_hex(one), sha1_to_hex(two));
*/
extern char *sha1_to_hex_r(char *out, const unsigned char *sha1);
+extern char *oid_to_hex_r(char *out, const struct object_id *oid);
extern char *sha1_to_hex(const unsigned char *sha1); /* static buffer result! */
extern char *oid_to_hex(const struct object_id *oid); /* same static buffer as sha1_to_hex */
@@ -1373,6 +1392,13 @@ extern struct packed_git {
char pack_name[FLEX_ARRAY]; /* more */
} *packed_git;
+/*
+ * A most-recently-used ordered version of the packed_git list, which can
+ * be iterated instead of packed_git (and marked via mru_mark).
+ */
+struct mru;
+extern struct mru *packed_git_mru;
+
struct pack_entry {
off_t offset;
unsigned char sha1[20];
@@ -1412,7 +1438,6 @@ extern unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t
extern void close_pack_windows(struct packed_git *);
extern void close_all_packs(void);
extern void unuse_pack(struct pack_window **);
-extern void free_pack_by_name(const char *);
extern void clear_delta_base_cache(void);
extern struct packed_git *add_packed_git(const char *path, size_t path_len, int local);
@@ -1562,10 +1587,18 @@ struct git_config_source {
const char *blob;
};
+enum config_origin_type {
+ CONFIG_ORIGIN_BLOB,
+ CONFIG_ORIGIN_FILE,
+ CONFIG_ORIGIN_STDIN,
+ CONFIG_ORIGIN_SUBMODULE_BLOB,
+ CONFIG_ORIGIN_CMDLINE
+};
+
typedef int (*config_fn_t)(const char *, const char *, void *);
extern int git_default_config(const char *, const char *, void *);
extern int git_config_from_file(config_fn_t fn, const char *, void *);
-extern int git_config_from_mem(config_fn_t fn, const char *origin_type,
+extern int git_config_from_mem(config_fn_t fn, const enum config_origin_type,
const char *name, const char *buf, size_t len, void *data);
extern void git_config_push_parameter(const char *text);
extern int git_config_from_parameters(config_fn_t fn, void *data);
@@ -1607,6 +1640,16 @@ extern const char *get_log_output_encoding(void);
extern const char *get_commit_output_encoding(void);
extern int git_config_parse_parameter(const char *, config_fn_t fn, void *data);
+
+enum config_scope {
+ CONFIG_SCOPE_UNKNOWN = 0,
+ CONFIG_SCOPE_SYSTEM,
+ CONFIG_SCOPE_GLOBAL,
+ CONFIG_SCOPE_REPO,
+ CONFIG_SCOPE_CMDLINE,
+};
+
+extern enum config_scope current_config_scope(void);
extern const char *current_config_origin_type(void);
extern const char *current_config_name(void);
@@ -1699,6 +1742,8 @@ extern int ignore_untracked_cache_config;
struct key_value_info {
const char *filename;
int linenr;
+ enum config_origin_type origin_type;
+ enum config_scope scope;
};
extern NORETURN void git_die_config(const char *key, const char *err, ...) __attribute__((format(printf, 2, 3)));
@@ -1724,7 +1769,6 @@ extern int copy_file(const char *dst, const char *src, int mode);
extern int copy_file_with_time(const char *dst, const char *src, int mode);
extern void write_or_die(int fd, const void *buf, size_t count);
-extern int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg);
extern void fsync_or_die(int fd, const char *);
extern ssize_t read_in_full(int fd, void *buf, size_t count);
@@ -1736,8 +1780,21 @@ static inline ssize_t write_str_in_full(int fd, const char *str)
return write_in_full(fd, str, strlen(str));
}
-extern int write_file(const char *path, const char *fmt, ...);
-extern int write_file_gently(const char *path, const char *fmt, ...);
+/**
+ * Open (and truncate) the file at path, write the contents of buf to it,
+ * and close it. Dies if any errors are encountered.
+ */
+extern void write_file_buf(const char *path, const char *buf, size_t len);
+
+/**
+ * Like write_file_buf(), but format the contents into a buffer first.
+ * Additionally, write_file() will append a newline if one is not already
+ * present, making it convenient to write text files:
+ *
+ * write_file(path, "counter: %d", ctr);
+ */
+__attribute__((format (printf, 2, 3)))
+extern void write_file(const char *path, const char *fmt, ...);
/* pager.c */
extern void setup_pager(void);
@@ -1774,7 +1831,7 @@ void packet_trace_identity(const char *prog);
* return 0 if success, 1 - if addition of a file failed and
* ADD_FILES_IGNORE_ERRORS was specified in flags
*/
-int add_files_to_cache(const char *prefix, const struct pathspec *pathspec, int flags, int force_mode);
+int add_files_to_cache(const char *prefix, const struct pathspec *pathspec, int flags);
/* diff.c */
extern int diff_auto_refresh_index;
diff --git a/color.c b/color.c
index 8f85153..1b95e6b 100644
--- a/color.c
+++ b/color.c
@@ -123,19 +123,34 @@ static int parse_color(struct color *out, const char *name, int len)
return -1;
}
-static int parse_attr(const char *name, int len)
+static int parse_attr(const char *name, size_t len)
{
- static const int attr_values[] = { 1, 2, 4, 5, 7,
- 22, 22, 24, 25, 27 };
- static const char * const attr_names[] = {
- "bold", "dim", "ul", "blink", "reverse",
- "nobold", "nodim", "noul", "noblink", "noreverse"
+ static const struct {
+ const char *name;
+ size_t len;
+ int val, neg;
+ } attrs[] = {
+#define ATTR(x, val, neg) { (x), sizeof(x)-1, (val), (neg) }
+ ATTR("bold", 1, 22),
+ ATTR("dim", 2, 22),
+ ATTR("italic", 3, 23),
+ ATTR("ul", 4, 24),
+ ATTR("blink", 5, 25),
+ ATTR("reverse", 7, 27),
+ ATTR("strike", 9, 29)
+#undef ATTR
};
+ int negate = 0;
int i;
- for (i = 0; i < ARRAY_SIZE(attr_names); i++) {
- const char *str = attr_names[i];
- if (!strncasecmp(name, str, len) && !str[len])
- return attr_values[i];
+
+ if (skip_prefix_mem(name, len, "no", &name, &len)) {
+ skip_prefix_mem(name, len, "-", &name, &len);
+ negate = 1;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(attrs); i++) {
+ if (attrs[i].len == len && !memcmp(attrs[i].name, name, len))
+ return negate ? attrs[i].neg : attrs[i].val;
}
return -1;
}
@@ -200,7 +215,7 @@ int color_parse_mem(const char *value, int value_len, char *dst)
/* [fg [bg]] [attr]... */
while (len > 0) {
const char *word = ptr;
- struct color c;
+ struct color c = { COLOR_UNSPECIFIED };
int val, wordlen = 0;
while (len > 0 && !isspace(word[wordlen])) {
diff --git a/color.h b/color.h
index b9ead16..9062765 100644
--- a/color.h
+++ b/color.h
@@ -3,20 +3,23 @@
struct strbuf;
-/* 2 + (2 * num_attrs) + 8 + 1 + 8 + 'm' + NUL */
-/* "\033[1;2;4;5;7;38;5;2xx;48;5;2xxm\0" */
/*
* The maximum length of ANSI color sequence we would generate:
* - leading ESC '[' 2
- * - attr + ';' 3 * 10 (e.g. "1;")
+ * - attr + ';' 2 * num_attr (e.g. "1;")
+ * - no-attr + ';' 3 * num_attr (e.g. "22;")
* - fg color + ';' 17 (e.g. "38;2;255;255;255;")
* - bg color + ';' 17 (e.g. "48;2;255;255;255;")
* - terminating 'm' NUL 2
*
- * The above overcounts attr (we only use 5 not 8) and one semicolon
- * but it is close enough.
+ * The above overcounts by one semicolon but it is close enough.
+ *
+ * The space for attributes is also slightly overallocated, as
+ * the negation for some attributes is the same (e.g., nobold and nodim).
+ *
+ * We allocate space for 7 attributes.
*/
-#define COLOR_MAXLEN 70
+#define COLOR_MAXLEN 75
#define GIT_COLOR_NORMAL ""
#define GIT_COLOR_RESET "\033[m"
diff --git a/combine-diff.c b/combine-diff.c
index 8f2313d..8e2a577 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -44,9 +44,9 @@ static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr,
memset(p->parent, 0,
sizeof(p->parent[0]) * num_parent);
- hashcpy(p->oid.hash, q->queue[i]->two->sha1);
+ oidcpy(&p->oid, &q->queue[i]->two->oid);
p->mode = q->queue[i]->two->mode;
- hashcpy(p->parent[n].oid.hash, q->queue[i]->one->sha1);
+ oidcpy(&p->parent[n].oid, &q->queue[i]->one->oid);
p->parent[n].mode = q->queue[i]->one->mode;
p->parent[n].status = q->queue[i]->status;
*tail = p;
@@ -77,7 +77,7 @@ static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr,
continue;
}
- hashcpy(p->parent[n].oid.hash, q->queue[i]->one->sha1);
+ oidcpy(&p->parent[n].oid, &q->queue[i]->one->oid);
p->parent[n].mode = q->queue[i]->one->mode;
p->parent[n].status = q->queue[i]->status;
@@ -1268,16 +1268,16 @@ static struct diff_filepair *combined_pair(struct combine_diff_path *p,
for (i = 0; i < num_parent; i++) {
pair->one[i].path = p->path;
pair->one[i].mode = p->parent[i].mode;
- hashcpy(pair->one[i].sha1, p->parent[i].oid.hash);
- pair->one[i].sha1_valid = !is_null_oid(&p->parent[i].oid);
+ oidcpy(&pair->one[i].oid, &p->parent[i].oid);
+ pair->one[i].oid_valid = !is_null_oid(&p->parent[i].oid);
pair->one[i].has_more_entries = 1;
}
pair->one[num_parent - 1].has_more_entries = 0;
pair->two->path = p->path;
pair->two->mode = p->mode;
- hashcpy(pair->two->sha1, p->oid.hash);
- pair->two->sha1_valid = !is_null_oid(&p->oid);
+ oidcpy(&pair->two->oid, &p->oid);
+ pair->two->oid_valid = !is_null_oid(&p->oid);
return pair;
}
@@ -1525,7 +1525,7 @@ void diff_tree_combined(const unsigned char *sha1,
free(tmp);
}
- free_pathspec(&diffopts.pathspec);
+ clear_pathspec(&diffopts.pathspec);
}
void diff_tree_combined_merge(const struct commit *commit, int dense,
diff --git a/commit-slab.h b/commit-slab.h
index f84b449..42d16dc 100644
--- a/commit-slab.h
+++ b/commit-slab.h
@@ -8,7 +8,7 @@
*
* After including this header file, using:
*
- * define_commit_slab(indegee, int);
+ * define_commit_slab(indegree, int);
*
* will let you call the following functions:
*
@@ -126,16 +126,16 @@ static MAYBE_UNUSED elemtype *slabname## _peek(struct slabname *s, \
return slabname##_at_peek(s, c, 0); \
} \
\
-static int stat_ ##slabname## realloc
+struct slabname
/*
- * Note that this seemingly redundant second declaration is required
+ * Note that this redundant forward declaration is required
* to allow a terminating semicolon, which makes instantiations look
* like function declarations. I.e., the expansion of
*
* define_commit_slab(indegree, int);
*
- * ends in 'static int stat_indegreerealloc;'. This would otherwise
+ * ends in 'struct indegree;'. This would otherwise
* be a syntax error according (at least) to ISO C. It's hard to
* catch because GCC silently parses it by default.
*/
diff --git a/commit.c b/commit.c
index 5f616b7..aada266 100644
--- a/commit.c
+++ b/commit.c
@@ -931,7 +931,7 @@ static int remove_redundant(struct commit **array, int cnt)
}
/* Now collect the result */
- memcpy(work, array, sizeof(*array) * cnt);
+ COPY_ARRAY(work, array, cnt);
for (i = filled = 0; i < cnt; i++)
if (!redundant[i])
array[filled++] = work[i];
@@ -1626,16 +1626,6 @@ struct commit_list **commit_list_append(struct commit *commit,
return &new->next;
}
-void print_commit_list(struct commit_list *list,
- const char *format_cur,
- const char *format_last)
-{
- for ( ; list; list = list->next) {
- const char *format = list->next ? format_cur : format_last;
- printf(format, oid_to_hex(&list->item->object.oid));
- }
-}
-
const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
{
int key_len = strlen(key);
diff --git a/commit.h b/commit.h
index 15ee924..32e1a11 100644
--- a/commit.h
+++ b/commit.h
@@ -131,11 +131,17 @@ enum cmit_fmt {
CMIT_FMT_FULLER,
CMIT_FMT_ONELINE,
CMIT_FMT_EMAIL,
+ CMIT_FMT_MBOXRD,
CMIT_FMT_USERFORMAT,
CMIT_FMT_UNSPECIFIED
};
+static inline int cmit_fmt_is_mail(enum cmit_fmt fmt)
+{
+ return (fmt == CMIT_FMT_EMAIL || fmt == CMIT_FMT_MBOXRD);
+}
+
struct pretty_print_context {
/*
* Callers should tweak these to change the behavior of pp_* functions.
@@ -373,10 +379,6 @@ extern int parse_signed_commit(const struct commit *commit,
struct strbuf *message, struct strbuf *signature);
extern int remove_signature(struct strbuf *buf);
-extern void print_commit_list(struct commit_list *list,
- const char *format_cur,
- const char *format_last);
-
/*
* Check the signature of the given commit. The result of the check is stored
* in sig->check_result, 'G' for a good signature, 'U' for a good signature
diff --git a/common-main.c b/common-main.c
index 44a29e8..c654f95 100644
--- a/common-main.c
+++ b/common-main.c
@@ -33,7 +33,7 @@ int main(int argc, const char **argv)
git_setup_gettext();
- argv[0] = git_extract_argv0_path(argv[0]);
+ git_extract_argv0_path(argv[0]);
restore_sigpipe_to_default();
diff --git a/compat/nedmalloc/nedmalloc.c b/compat/nedmalloc/nedmalloc.c
index 2d4ef59..1cc31c3 100644
--- a/compat/nedmalloc/nedmalloc.c
+++ b/compat/nedmalloc/nedmalloc.c
@@ -948,22 +948,6 @@ void **nedpindependent_comalloc(nedpool *p, size_t elems, size_t *sizes, void **
return ret;
}
-#ifdef OVERRIDE_STRDUP
-/*
- * This implementation is purely there to override the libc version, to
- * avoid a crash due to allocation and free on different 'heaps'.
- */
-char *strdup(const char *s1)
-{
- size_t len = strlen(s1) + 1;
- char *s2 = malloc(len);
-
- if (s2)
- memcpy(s2, s1, len);
- return s2;
-}
-#endif
-
#if defined(__cplusplus)
}
#endif
diff --git a/compat/strdup.c b/compat/strdup.c
new file mode 100644
index 0000000..f3fb978
--- /dev/null
+++ b/compat/strdup.c
@@ -0,0 +1,11 @@
+#include "../git-compat-util.h"
+
+char *gitstrdup(const char *s1)
+{
+ size_t len = strlen(s1) + 1;
+ char *s2 = malloc(len);
+
+ if (s2)
+ memcpy(s2, s1, len);
+ return s2;
+}
diff --git a/config.c b/config.c
index d7ce34b..0dfed68 100644
--- a/config.c
+++ b/config.c
@@ -24,7 +24,7 @@ struct config_source {
size_t pos;
} buf;
} u;
- const char *origin_type;
+ enum config_origin_type origin_type;
const char *name;
const char *path;
int die_on_error;
@@ -38,7 +38,33 @@ struct config_source {
long (*do_ftell)(struct config_source *c);
};
+/*
+ * These variables record the "current" config source, which
+ * can be accessed by parsing callbacks.
+ *
+ * The "cf" variable will be non-NULL only when we are actually parsing a real
+ * config source (file, blob, cmdline, etc).
+ *
+ * The "current_config_kvi" variable will be non-NULL only when we are feeding
+ * cached config from a configset into a callback.
+ *
+ * They should generally never be non-NULL at the same time. If they are both
+ * NULL, then we aren't parsing anything (and depending on the function looking
+ * at the variables, it's either a bug for it to be called in the first place,
+ * or it's a function which can be reused for non-config purposes, and should
+ * fall back to some sane behavior).
+ */
static struct config_source *cf;
+static struct key_value_info *current_config_kvi;
+
+/*
+ * Similar to the variables above, this gives access to the "scope" of the
+ * current value (repo, global, etc). For cached values, it can be found via
+ * the current_config_kvi as above. During parsing, the current value can be
+ * found in this variable. It's not part of "cf" because it transcends a single
+ * file (i.e., a file included from .git/config is still in "repo" scope).
+ */
+static enum config_scope current_parsing_scope;
static int zlib_compression_seen;
@@ -131,7 +157,9 @@ static int handle_path_include(const char *path, struct config_include_data *inc
if (!access_or_die(path, R_OK, 0)) {
if (++inc->depth > MAX_INCLUDE_DEPTH)
die(include_depth_advice, MAX_INCLUDE_DEPTH, path,
- cf && cf->name ? cf->name : "the command line");
+ !cf ? "<unknown>" :
+ cf->name ? cf->name :
+ "the command line");
ret = git_config_from_file(git_config_include, path, inc);
inc->depth--;
}
@@ -205,32 +233,41 @@ int git_config_parse_parameter(const char *text,
int git_config_from_parameters(config_fn_t fn, void *data)
{
const char *env = getenv(CONFIG_DATA_ENVIRONMENT);
+ int ret = 0;
char *envw;
const char **argv = NULL;
int nr = 0, alloc = 0;
int i;
+ struct config_source source;
if (!env)
return 0;
+
+ memset(&source, 0, sizeof(source));
+ source.prev = cf;
+ source.origin_type = CONFIG_ORIGIN_CMDLINE;
+ cf = &source;
+
/* sq_dequote will write over it */
envw = xstrdup(env);
if (sq_dequote_to_argv(envw, &argv, &nr, &alloc) < 0) {
- free(envw);
- return error("bogus format in " CONFIG_DATA_ENVIRONMENT);
+ ret = error("bogus format in " CONFIG_DATA_ENVIRONMENT);
+ goto out;
}
for (i = 0; i < nr; i++) {
if (git_config_parse_parameter(argv[i], fn, data) < 0) {
- free(argv);
- free(envw);
- return -1;
+ ret = -1;
+ goto out;
}
}
+out:
free(argv);
free(envw);
- return nr > 0;
+ cf = source.prev;
+ return ret;
}
static int get_next_char(void)
@@ -417,6 +454,8 @@ static int git_parse_source(config_fn_t fn, void *data)
int comment = 0;
int baselen = 0;
struct strbuf *var = &cf->var;
+ int error_return = 0;
+ char *error_msg = NULL;
/* U+FEFF Byte Order Mark in UTF8 */
const char *bomptr = utf8_bom;
@@ -471,10 +510,40 @@ static int git_parse_source(config_fn_t fn, void *data)
if (get_value(fn, data, var) < 0)
break;
}
+
+ switch (cf->origin_type) {
+ case CONFIG_ORIGIN_BLOB:
+ error_msg = xstrfmt(_("bad config line %d in blob %s"),
+ cf->linenr, cf->name);
+ break;
+ case CONFIG_ORIGIN_FILE:
+ error_msg = xstrfmt(_("bad config line %d in file %s"),
+ cf->linenr, cf->name);
+ break;
+ case CONFIG_ORIGIN_STDIN:
+ error_msg = xstrfmt(_("bad config line %d in standard input"),
+ cf->linenr);
+ break;
+ case CONFIG_ORIGIN_SUBMODULE_BLOB:
+ error_msg = xstrfmt(_("bad config line %d in submodule-blob %s"),
+ cf->linenr, cf->name);
+ break;
+ case CONFIG_ORIGIN_CMDLINE:
+ error_msg = xstrfmt(_("bad config line %d in command line %s"),
+ cf->linenr, cf->name);
+ break;
+ default:
+ error_msg = xstrfmt(_("bad config line %d in %s"),
+ cf->linenr, cf->name);
+ }
+
if (cf->die_on_error)
- die(_("bad config line %d in %s %s"), cf->linenr, cf->origin_type, cf->name);
+ die("%s", error_msg);
else
- return error(_("bad config line %d in %s %s"), cf->linenr, cf->origin_type, cf->name);
+ error_return = error("%s", error_msg);
+
+ free(error_msg);
+ return error_return;
}
static int parse_unit_factor(const char *end, uintmax_t *val)
@@ -583,16 +652,35 @@ int git_parse_ulong(const char *value, unsigned long *ret)
NORETURN
static void die_bad_number(const char *name, const char *value)
{
- const char *reason = errno == ERANGE ?
- "out of range" :
- "invalid unit";
+ const char * error_type = (errno == ERANGE)? _("out of range"):_("invalid unit");
+
if (!value)
value = "";
- if (cf && cf->origin_type && cf->name)
- die(_("bad numeric config value '%s' for '%s' in %s %s: %s"),
- value, name, cf->origin_type, cf->name, reason);
- die(_("bad numeric config value '%s' for '%s': %s"), value, name, reason);
+ if (!(cf && cf->name))
+ die(_("bad numeric config value '%s' for '%s': %s"),
+ value, name, error_type);
+
+ switch (cf->origin_type) {
+ case CONFIG_ORIGIN_BLOB:
+ die(_("bad numeric config value '%s' for '%s' in blob %s: %s"),
+ value, name, cf->name, error_type);
+ case CONFIG_ORIGIN_FILE:
+ die(_("bad numeric config value '%s' for '%s' in file %s: %s"),
+ value, name, cf->name, error_type);
+ case CONFIG_ORIGIN_STDIN:
+ die(_("bad numeric config value '%s' for '%s' in standard input: %s"),
+ value, name, error_type);
+ case CONFIG_ORIGIN_SUBMODULE_BLOB:
+ die(_("bad numeric config value '%s' for '%s' in submodule-blob %s: %s"),
+ value, name, cf->name, error_type);
+ case CONFIG_ORIGIN_CMDLINE:
+ die(_("bad numeric config value '%s' for '%s' in command line %s: %s"),
+ value, name, cf->name, error_type);
+ default:
+ die(_("bad numeric config value '%s' for '%s' in %s: %s"),
+ value, name, cf->name, error_type);
+ }
}
int git_config_int(const char *name, const char *value)
@@ -1069,7 +1157,8 @@ static int do_config_from(struct config_source *top, config_fn_t fn, void *data)
}
static int do_config_from_file(config_fn_t fn,
- const char *origin_type, const char *name, const char *path, FILE *f,
+ const enum config_origin_type origin_type,
+ const char *name, const char *path, FILE *f,
void *data)
{
struct config_source top;
@@ -1088,7 +1177,7 @@ static int do_config_from_file(config_fn_t fn,
static int git_config_from_stdin(config_fn_t fn, void *data)
{
- return do_config_from_file(fn, "standard input", "", NULL, stdin, data);
+ return do_config_from_file(fn, CONFIG_ORIGIN_STDIN, "", NULL, stdin, data);
}
int git_config_from_file(config_fn_t fn, const char *filename, void *data)
@@ -1099,14 +1188,14 @@ int git_config_from_file(config_fn_t fn, const char *filename, void *data)
f = fopen(filename, "r");
if (f) {
flockfile(f);
- ret = do_config_from_file(fn, "file", filename, filename, f, data);
+ ret = do_config_from_file(fn, CONFIG_ORIGIN_FILE, filename, filename, f, data);
funlockfile(f);
fclose(f);
}
return ret;
}
-int git_config_from_mem(config_fn_t fn, const char *origin_type,
+int git_config_from_mem(config_fn_t fn, const enum config_origin_type origin_type,
const char *name, const char *buf, size_t len, void *data)
{
struct config_source top;
@@ -1143,7 +1232,7 @@ static int git_config_from_blob_sha1(config_fn_t fn,
return error("reference '%s' does not point to a blob", name);
}
- ret = git_config_from_mem(fn, "blob", name, buf, size, data);
+ ret = git_config_from_mem(fn, CONFIG_ORIGIN_BLOB, name, buf, size, data);
free(buf);
return ret;
@@ -1197,47 +1286,36 @@ int git_config_system(void)
static int do_git_config_sequence(config_fn_t fn, void *data)
{
- int ret = 0, found = 0;
+ int ret = 0;
char *xdg_config = xdg_config_home("config");
char *user_config = expand_user_path("~/.gitconfig");
char *repo_config = git_pathdup("config");
- if (git_config_system() && !access_or_die(git_etc_gitconfig(), R_OK, 0)) {
+ current_parsing_scope = CONFIG_SCOPE_SYSTEM;
+ if (git_config_system() && !access_or_die(git_etc_gitconfig(), R_OK, 0))
ret += git_config_from_file(fn, git_etc_gitconfig(),
data);
- found += 1;
- }
- if (xdg_config && !access_or_die(xdg_config, R_OK, ACCESS_EACCES_OK)) {
+ current_parsing_scope = CONFIG_SCOPE_GLOBAL;
+ if (xdg_config && !access_or_die(xdg_config, R_OK, ACCESS_EACCES_OK))
ret += git_config_from_file(fn, xdg_config, data);
- found += 1;
- }
- if (user_config && !access_or_die(user_config, R_OK, ACCESS_EACCES_OK)) {
+ if (user_config && !access_or_die(user_config, R_OK, ACCESS_EACCES_OK))
ret += git_config_from_file(fn, user_config, data);
- found += 1;
- }
- if (repo_config && !access_or_die(repo_config, R_OK, 0)) {
+ current_parsing_scope = CONFIG_SCOPE_REPO;
+ if (repo_config && !access_or_die(repo_config, R_OK, 0))
ret += git_config_from_file(fn, repo_config, data);
- found += 1;
- }
- switch (git_config_from_parameters(fn, data)) {
- case -1: /* error */
+ current_parsing_scope = CONFIG_SCOPE_CMDLINE;
+ if (git_config_from_parameters(fn, data) < 0)
die(_("unable to parse command-line config"));
- break;
- case 0: /* found nothing */
- break;
- default: /* found at least one item */
- found++;
- break;
- }
+ current_parsing_scope = CONFIG_SCOPE_UNKNOWN;
free(xdg_config);
free(user_config);
free(repo_config);
- return ret == 0 ? found : ret;
+ return ret;
}
int git_config_with_options(config_fn_t fn, void *data,
@@ -1272,7 +1350,7 @@ static void git_config_raw(config_fn_t fn, void *data)
if (git_config_with_options(fn, data, NULL, 1) < 0)
/*
* git_config_with_options() normally returns only
- * positive values, as most errors are fatal, and
+ * zero, as most errors are fatal, and
* non-fatal potential errors are guarded by "if"
* statements that are entered only when no error is
* possible.
@@ -1290,16 +1368,20 @@ static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)
struct string_list *values;
struct config_set_element *entry;
struct configset_list *list = &cs->list;
- struct key_value_info *kv_info;
for (i = 0; i < list->nr; i++) {
entry = list->items[i].e;
value_index = list->items[i].value_index;
values = &entry->value_list;
- if (fn(entry->key, values->items[value_index].string, data) < 0) {
- kv_info = values->items[value_index].util;
- git_die_config_linenr(entry->key, kv_info->filename, kv_info->linenr);
- }
+
+ current_config_kvi = values->items[value_index].util;
+
+ if (fn(entry->key, values->items[value_index].string, data) < 0)
+ git_die_config_linenr(entry->key,
+ current_config_kvi->filename,
+ current_config_kvi->linenr);
+
+ current_config_kvi = NULL;
}
}
@@ -1356,14 +1438,19 @@ static int configset_add_value(struct config_set *cs, const char *key, const cha
l_item->e = e;
l_item->value_index = e->value_list.nr - 1;
- if (cf) {
+ if (!cf)
+ die("BUG: configset_add_value has no source");
+ if (cf->name) {
kv_info->filename = strintern(cf->name);
kv_info->linenr = cf->linenr;
+ kv_info->origin_type = cf->origin_type;
} else {
/* for values read from `git_config_from_parameters()` */
kv_info->filename = NULL;
kv_info->linenr = -1;
+ kv_info->origin_type = CONFIG_ORIGIN_CMDLINE;
}
+ kv_info->scope = current_parsing_scope;
si->util = kv_info;
return 0;
@@ -2442,10 +2529,46 @@ int parse_config_key(const char *var,
const char *current_config_origin_type(void)
{
- return cf && cf->origin_type ? cf->origin_type : "command line";
+ int type;
+ if (current_config_kvi)
+ type = current_config_kvi->origin_type;
+ else if(cf)
+ type = cf->origin_type;
+ else
+ die("BUG: current_config_origin_type called outside config callback");
+
+ switch (type) {
+ case CONFIG_ORIGIN_BLOB:
+ return "blob";
+ case CONFIG_ORIGIN_FILE:
+ return "file";
+ case CONFIG_ORIGIN_STDIN:
+ return "standard input";
+ case CONFIG_ORIGIN_SUBMODULE_BLOB:
+ return "submodule-blob";
+ case CONFIG_ORIGIN_CMDLINE:
+ return "command line";
+ default:
+ die("BUG: unknown config origin type");
+ }
}
const char *current_config_name(void)
{
- return cf && cf->name ? cf->name : "";
+ const char *name;
+ if (current_config_kvi)
+ name = current_config_kvi->filename;
+ else if (cf)
+ name = cf->name;
+ else
+ die("BUG: current_config_name called outside config callback");
+ return name ? name : "";
+}
+
+enum config_scope current_config_scope(void)
+{
+ if (current_config_kvi)
+ return current_config_kvi->scope;
+ else
+ return current_parsing_scope;
}
diff --git a/config.mak.uname b/config.mak.uname
index 4cd62bd..b232908 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -36,6 +36,8 @@ ifeq ($(uname_S),Linux)
HAVE_DEV_TTY = YesPlease
HAVE_CLOCK_GETTIME = YesPlease
HAVE_CLOCK_MONOTONIC = YesPlease
+ # -lrt is needed for clock_gettime on glibc <= 2.16
+ NEEDS_LIBRT = YesPlease
HAVE_GETDELIM = YesPlease
SANE_TEXT_GREP=-a
endif
@@ -207,6 +209,7 @@ ifeq ($(uname_S),FreeBSD)
HAVE_PATHS_H = YesPlease
GMTIME_UNRELIABLE_ERRORS = UnfortunatelyYes
HAVE_BSD_SYSCTL = YesPlease
+ PAGER_ENV = LESS=FRX LV=-c MORE=FRX
endif
ifeq ($(uname_S),OpenBSD)
NO_STRCASESTR = YesPlease
diff --git a/configure.ac b/configure.ac
index aa9c91d..0b15f04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -528,16 +528,6 @@ AC_CHECK_LIB([curl], [curl_global_init],
[NO_CURL=],
[NO_CURL=YesPlease])
-if test -z "${NO_CURL}" && test -z "${NO_OPENSSL}"; then
-
-AC_CHECK_LIB([curl], [Curl_ssl_init],
-[NEEDS_SSL_WITH_CURL=YesPlease],
-[NEEDS_SSL_WITH_CURL=])
-
-GIT_CONF_SUBST([NEEDS_SSL_WITH_CURL])
-
-fi
-
GIT_UNSTASH_FLAGS($CURLDIR)
GIT_CONF_SUBST([NO_CURL])
@@ -550,6 +540,17 @@ AC_CHECK_PROG([CURL_CONFIG], [curl-config],
if test $CURL_CONFIG != no; then
GIT_CONF_SUBST([CURL_CONFIG])
+ if test -z "${NO_OPENSSL}"; then
+ AC_MSG_CHECKING([if Curl supports SSL])
+ if test $(curl-config --features|grep SSL) = SSL; then
+ NEEDS_SSL_WITH_CURL=YesPlease
+ AC_MSG_RESULT([yes])
+ else
+ NEEDS_SSL_WITH_CURL=
+ AC_MSG_RESULT([no])
+ fi
+ GIT_CONF_SUBST([NEEDS_SSL_WITH_CURL])
+ fi
fi
fi
@@ -835,9 +836,10 @@ AC_CHECK_TYPE([struct addrinfo],[
])
GIT_CONF_SUBST([NO_IPV6])
#
-# Define NO_REGEX if you have no or inferior regex support in your C library.
-AC_CACHE_CHECK([whether the platform regex can handle null bytes],
- [ac_cv_c_excellent_regex], [
+# Define NO_REGEX if your C library lacks regex support with REG_STARTEND
+# feature.
+AC_CACHE_CHECK([whether the platform regex supports REG_STARTEND],
+ [ac_cv_c_regex_with_reg_startend], [
AC_EGREP_CPP(yippeeyeswehaveit,
AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
#include <regex.h>
@@ -846,10 +848,10 @@ AC_EGREP_CPP(yippeeyeswehaveit,
yippeeyeswehaveit
#endif
]),
- [ac_cv_c_excellent_regex=yes],
- [ac_cv_c_excellent_regex=no])
+ [ac_cv_c_regex_with_reg_startend=yes],
+ [ac_cv_c_regex_with_reg_startend=no])
])
-if test $ac_cv_c_excellent_regex = yes; then
+if test $ac_cv_c_regex_with_reg_startend = yes; then
NO_REGEX=
else
NO_REGEX=YesPlease
diff --git a/connect.c b/connect.c
index c53f3f1..722dc3f 100644
--- a/connect.c
+++ b/connect.c
@@ -658,6 +658,19 @@ static enum protocol parse_connect_url(const char *url_orig, char **ret_host,
static struct child_process no_fork = CHILD_PROCESS_INIT;
+static const char *get_ssh_command(void)
+{
+ const char *ssh;
+
+ if ((ssh = getenv("GIT_SSH_COMMAND")))
+ return ssh;
+
+ if (!git_config_get_string_const("core.sshcommand", &ssh))
+ return ssh;
+
+ return NULL;
+}
+
/*
* This returns a dummy child_process if the transport protocol does not
* need fork(2), or a struct child_process object if it does. Once done,
@@ -758,7 +771,7 @@ struct child_process *git_connect(int fd[2], const char *url,
return NULL;
}
- ssh = getenv("GIT_SSH_COMMAND");
+ ssh = get_ssh_command();
if (!ssh) {
const char *base;
char *ssh_dup;
diff --git a/connected.c b/connected.c
index bf1b12e..8e3e4b1 100644
--- a/connected.c
+++ b/connected.c
@@ -4,10 +4,6 @@
#include "connected.h"
#include "transport.h"
-int check_everything_connected(sha1_iterate_fn fn, int quiet, void *cb_data)
-{
- return check_everything_connected_with_transport(fn, quiet, cb_data, NULL);
-}
/*
* If we feed all the commits we want to verify to this command
*
@@ -19,22 +15,27 @@ int check_everything_connected(sha1_iterate_fn fn, int quiet, void *cb_data)
*
* Returns 0 if everything is connected, non-zero otherwise.
*/
-static int check_everything_connected_real(sha1_iterate_fn fn,
- int quiet,
- void *cb_data,
- struct transport *transport,
- const char *shallow_file)
+int check_connected(sha1_iterate_fn fn, void *cb_data,
+ struct check_connected_options *opt)
{
struct child_process rev_list = CHILD_PROCESS_INIT;
- const char *argv[9];
+ struct check_connected_options defaults = CHECK_CONNECTED_INIT;
char commit[41];
unsigned char sha1[20];
- int err = 0, ac = 0;
+ int err = 0;
struct packed_git *new_pack = NULL;
+ struct transport *transport;
size_t base_len;
- if (fn(cb_data, sha1))
+ if (!opt)
+ opt = &defaults;
+ transport = opt->transport;
+
+ if (fn(cb_data, sha1)) {
+ if (opt->err_fd)
+ close(opt->err_fd);
return err;
+ }
if (transport && transport->smart_options &&
transport->smart_options->self_contained_and_connected &&
@@ -47,24 +48,28 @@ static int check_everything_connected_real(sha1_iterate_fn fn,
strbuf_release(&idx_file);
}
- if (shallow_file) {
- argv[ac++] = "--shallow-file";
- argv[ac++] = shallow_file;
+ if (opt->shallow_file) {
+ argv_array_push(&rev_list.args, "--shallow-file");
+ argv_array_push(&rev_list.args, opt->shallow_file);
}
- argv[ac++] = "rev-list";
- argv[ac++] = "--objects";
- argv[ac++] = "--stdin";
- argv[ac++] = "--not";
- argv[ac++] = "--all";
- if (quiet)
- argv[ac++] = "--quiet";
- argv[ac] = NULL;
+ argv_array_push(&rev_list.args,"rev-list");
+ argv_array_push(&rev_list.args, "--objects");
+ argv_array_push(&rev_list.args, "--stdin");
+ argv_array_push(&rev_list.args, "--not");
+ argv_array_push(&rev_list.args, "--all");
+ argv_array_push(&rev_list.args, "--quiet");
+ if (opt->progress)
+ argv_array_pushf(&rev_list.args, "--progress=%s",
+ _("Checking connectivity"));
- rev_list.argv = argv;
rev_list.git_cmd = 1;
rev_list.in = -1;
rev_list.no_stdout = 1;
- rev_list.no_stderr = quiet;
+ if (opt->err_fd)
+ rev_list.err = opt->err_fd;
+ else
+ rev_list.no_stderr = opt->quiet;
+
if (start_command(&rev_list))
return error(_("Could not run 'git rev-list'"));
@@ -98,19 +103,3 @@ static int check_everything_connected_real(sha1_iterate_fn fn,
sigchain_pop(SIGPIPE);
return finish_command(&rev_list) || err;
}
-
-int check_everything_connected_with_transport(sha1_iterate_fn fn,
- int quiet,
- void *cb_data,
- struct transport *transport)
-{
- return check_everything_connected_real(fn, quiet, cb_data,
- transport, NULL);
-}
-
-int check_shallow_connected(sha1_iterate_fn fn, int quiet, void *cb_data,
- const char *shallow_file)
-{
- return check_everything_connected_real(fn, quiet, cb_data,
- NULL, shallow_file);
-}
diff --git a/connected.h b/connected.h
index 071d408..afa48cc 100644
--- a/connected.h
+++ b/connected.h
@@ -11,17 +11,42 @@ struct transport;
typedef int (*sha1_iterate_fn)(void *, unsigned char [20]);
/*
+ * Named-arguments struct for check_connected. All arguments are
+ * optional, and can be left to defaults as set by CHECK_CONNECTED_INIT.
+ */
+struct check_connected_options {
+ /* Avoid printing any errors to stderr. */
+ int quiet;
+
+ /* --shallow-file to pass to rev-list sub-process */
+ const char *shallow_file;
+
+ /* Transport whose objects we are checking, if available. */
+ struct transport *transport;
+
+ /*
+ * If non-zero, send error messages to this descriptor rather
+ * than stderr. The descriptor is closed before check_connected
+ * returns.
+ */
+ int err_fd;
+
+ /* If non-zero, show progress as we traverse the objects. */
+ int progress;
+};
+
+#define CHECK_CONNECTED_INIT { 0 }
+
+/*
* Make sure that our object store has all the commits necessary to
* connect the ancestry chain to some of our existing refs, and all
* the trees and blobs that these commits use.
*
* Return 0 if Ok, non zero otherwise (i.e. some missing objects)
+ *
+ * If "opt" is NULL, behaves as if CHECK_CONNECTED_INIT was passed.
*/
-extern int check_everything_connected(sha1_iterate_fn, int quiet, void *cb_data);
-extern int check_shallow_connected(sha1_iterate_fn, int quiet, void *cb_data,
- const char *shallow_file);
-extern int check_everything_connected_with_transport(sha1_iterate_fn, int quiet,
- void *cb_data,
- struct transport *transport);
+int check_connected(sha1_iterate_fn fn, void *cb_data,
+ struct check_connected_options *opt);
#endif /* CONNECTED_H */
diff --git a/contrib/coccinelle/.gitignore b/contrib/coccinelle/.gitignore
new file mode 100644
index 0000000..d3f2964
--- /dev/null
+++ b/contrib/coccinelle/.gitignore
@@ -0,0 +1 @@
+*.patch*
diff --git a/contrib/coccinelle/README b/contrib/coccinelle/README
new file mode 100644
index 0000000..9c2f887
--- /dev/null
+++ b/contrib/coccinelle/README
@@ -0,0 +1,2 @@
+This directory provides examples of Coccinelle (http://coccinelle.lip6.fr/)
+semantic patches that might be useful to developers.
diff --git a/contrib/coccinelle/array.cocci b/contrib/coccinelle/array.cocci
new file mode 100644
index 0000000..2d7f25d
--- /dev/null
+++ b/contrib/coccinelle/array.cocci
@@ -0,0 +1,26 @@
+@@
+type T;
+T *dst;
+T *src;
+expression n;
+@@
+- memcpy(dst, src, n * sizeof(*dst));
++ COPY_ARRAY(dst, src, n);
+
+@@
+type T;
+T *dst;
+T *src;
+expression n;
+@@
+- memcpy(dst, src, n * sizeof(*src));
++ COPY_ARRAY(dst, src, n);
+
+@@
+type T;
+T *dst;
+T *src;
+expression n;
+@@
+- memcpy(dst, src, n * sizeof(T));
++ COPY_ARRAY(dst, src, n);
diff --git a/contrib/coccinelle/free.cocci b/contrib/coccinelle/free.cocci
new file mode 100644
index 0000000..e282131
--- /dev/null
+++ b/contrib/coccinelle/free.cocci
@@ -0,0 +1,5 @@
+@@
+expression E;
+@@
+- if (E)
+ free(E);
diff --git a/contrib/coccinelle/object_id.cocci b/contrib/coccinelle/object_id.cocci
new file mode 100644
index 0000000..09afdbf
--- /dev/null
+++ b/contrib/coccinelle/object_id.cocci
@@ -0,0 +1,110 @@
+@@
+expression E1;
+@@
+- is_null_sha1(E1.hash)
++ is_null_oid(&E1)
+
+@@
+expression E1;
+@@
+- is_null_sha1(E1->hash)
++ is_null_oid(E1)
+
+@@
+expression E1;
+@@
+- sha1_to_hex(E1.hash)
++ oid_to_hex(&E1)
+
+@@
+identifier f != oid_to_hex;
+expression E1;
+@@
+ f(...) {...
+- sha1_to_hex(E1->hash)
++ oid_to_hex(E1)
+ ...}
+
+@@
+expression E1, E2;
+@@
+- sha1_to_hex_r(E1, E2.hash)
++ oid_to_hex_r(E1, &E2)
+
+@@
+identifier f != oid_to_hex_r;
+expression E1, E2;
+@@
+ f(...) {...
+- sha1_to_hex_r(E1, E2->hash)
++ oid_to_hex_r(E1, E2)
+ ...}
+
+@@
+expression E1;
+@@
+- hashclr(E1.hash)
++ oidclr(&E1)
+
+@@
+identifier f != oidclr;
+expression E1;
+@@
+ f(...) {...
+- hashclr(E1->hash)
++ oidclr(E1)
+ ...}
+
+@@
+expression E1, E2;
+@@
+- hashcmp(E1.hash, E2.hash)
++ oidcmp(&E1, &E2)
+
+@@
+identifier f != oidcmp;
+expression E1, E2;
+@@
+ f(...) {...
+- hashcmp(E1->hash, E2->hash)
++ oidcmp(E1, E2)
+ ...}
+
+@@
+expression E1, E2;
+@@
+- hashcmp(E1->hash, E2.hash)
++ oidcmp(E1, &E2)
+
+@@
+expression E1, E2;
+@@
+- hashcmp(E1.hash, E2->hash)
++ oidcmp(&E1, E2)
+
+@@
+expression E1, E2;
+@@
+- hashcpy(E1.hash, E2.hash)
++ oidcpy(&E1, &E2)
+
+@@
+identifier f != oidcpy;
+expression E1, E2;
+@@
+ f(...) {...
+- hashcpy(E1->hash, E2->hash)
++ oidcpy(E1, E2)
+ ...}
+
+@@
+expression E1, E2;
+@@
+- hashcpy(E1->hash, E2.hash)
++ oidcpy(E1, &E2)
+
+@@
+expression E1, E2;
+@@
+- hashcpy(E1.hash, E2->hash)
++ oidcpy(&E1, E2)
diff --git a/contrib/coccinelle/strbuf.cocci b/contrib/coccinelle/strbuf.cocci
new file mode 100644
index 0000000..63995f2
--- /dev/null
+++ b/contrib/coccinelle/strbuf.cocci
@@ -0,0 +1,40 @@
+@ strbuf_addf_with_format_only @
+expression E;
+constant fmt;
+@@
+ strbuf_addf(E,
+(
+ fmt
+|
+ _(fmt)
+)
+ );
+
+@ script:python @
+fmt << strbuf_addf_with_format_only.fmt;
+@@
+cocci.include_match("%" not in fmt)
+
+@ extends strbuf_addf_with_format_only @
+@@
+- strbuf_addf
++ strbuf_addstr
+ (E,
+(
+ fmt
+|
+ _(fmt)
+)
+ );
+
+@@
+expression E1, E2;
+@@
+- strbuf_addf(E1, "%s", E2);
++ strbuf_addstr(E1, E2);
+
+@@
+expression E1, E2, E3;
+@@
+- strbuf_addstr(E1, find_unique_abbrev(E2, E3));
++ strbuf_add_unique_abbrev(E1, E2, E3);
diff --git a/contrib/coccinelle/xstrdup_or_null.cocci b/contrib/coccinelle/xstrdup_or_null.cocci
new file mode 100644
index 0000000..3fceef1
--- /dev/null
+++ b/contrib/coccinelle/xstrdup_or_null.cocci
@@ -0,0 +1,7 @@
+@@
+expression E;
+expression V;
+@@
+- if (E)
+- V = xstrdup(E);
++ V = xstrdup_or_null(E);
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index bd25b0a..21016bf 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -338,7 +338,7 @@ __git_tags ()
__git_refs ()
{
local i hash dir="$(__gitdir "${1-}")" track="${2-}"
- local format refs
+ local format refs pfx
if [ -d "$dir" ]; then
case "$cur" in
refs|refs/*)
@@ -347,14 +347,15 @@ __git_refs ()
track=""
;;
*)
+ [[ "$cur" == ^* ]] && pfx="^"
for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD; do
- if [ -e "$dir/$i" ]; then echo $i; fi
+ if [ -e "$dir/$i" ]; then echo $pfx$i; fi
done
format="refname:short"
refs="refs/tags refs/heads refs/remotes"
;;
esac
- git --git-dir="$dir" for-each-ref --format="%($format)" \
+ git --git-dir="$dir" for-each-ref --format="$pfx%($format)" \
$refs
if [ -n "$track" ]; then
# employ the heuristic used by git checkout
@@ -803,6 +804,50 @@ __git_find_on_cmdline ()
done
}
+# Echo the value of an option set on the command line or config
+#
+# $1: short option name
+# $2: long option name including =
+# $3: list of possible values
+# $4: config string (optional)
+#
+# example:
+# result="$(__git_get_option_value "-d" "--do-something=" \
+# "yes no" "core.doSomething")"
+#
+# result is then either empty (no option set) or "yes" or "no"
+#
+# __git_get_option_value requires 3 arguments
+__git_get_option_value ()
+{
+ local c short_opt long_opt val
+ local result= values config_key word
+
+ short_opt="$1"
+ long_opt="$2"
+ values="$3"
+ config_key="$4"
+
+ ((c = $cword - 1))
+ while [ $c -ge 0 ]; do
+ word="${words[c]}"
+ for val in $values; do
+ if [ "$short_opt$val" = "$word" ] ||
+ [ "$long_opt$val" = "$word" ]; then
+ result="$val"
+ break 2
+ fi
+ done
+ ((c--))
+ done
+
+ if [ -n "$config_key" ] && [ -z "$result" ]; then
+ result="$(git --git-dir="$(__gitdir)" config "$config_key")"
+ fi
+
+ echo "$result"
+}
+
__git_has_doubledash ()
{
local c=1
@@ -964,8 +1009,8 @@ _git_branch ()
while [ $c -lt $cword ]; do
i="${words[c]}"
case "$i" in
- -d|-m) only_local_ref="y" ;;
- -r) has_r="y" ;;
+ -d|--delete|-m|--move) only_local_ref="y" ;;
+ -r|--remotes) has_r="y" ;;
esac
((c++))
done
@@ -979,7 +1024,7 @@ _git_branch ()
--color --no-color --verbose --abbrev= --no-abbrev
--track --no-track --contains --merged --no-merged
--set-upstream-to= --edit-description --list
- --unset-upstream
+ --unset-upstream --delete --move --remotes
"
;;
*)
@@ -1099,6 +1144,8 @@ _git_clone ()
esac
}
+__git_untracked_file_modes="all no normal"
+
_git_commit ()
{
case "$prev" in
@@ -1120,7 +1167,7 @@ _git_commit ()
return
;;
--untracked-files=*)
- __gitcomp "all no normal" "" "${cur##--untracked-files=}"
+ __gitcomp "$__git_untracked_file_modes" "" "${cur##--untracked-files=}"
return
;;
--*)
@@ -1159,6 +1206,8 @@ _git_describe ()
__git_diff_algorithms="myers minimal patience histogram"
+__git_diff_submodule_formats="log short"
+
__git_diff_common_options="--stat --numstat --shortstat --summary
--patch-with-stat --name-only --name-status --color
--no-color --color-words --no-renames --check
@@ -1174,6 +1223,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
--dirstat --dirstat= --dirstat-by-file
--dirstat-by-file= --cumulative
--diff-algorithm=
+ --submodule --submodule=
"
_git_diff ()
@@ -1185,6 +1235,10 @@ _git_diff ()
__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
return
;;
+ --submodule=*)
+ __gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
+ return
+ ;;
--*)
__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
--base --ours --theirs --no-index
@@ -1448,6 +1502,14 @@ _git_log ()
__gitcomp "full short no" "" "${cur##--decorate=}"
return
;;
+ --diff-algorithm=*)
+ __gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
+ return
+ ;;
+ --submodule=*)
+ __gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
+ return
+ ;;
--*)
__gitcomp "
$__git_log_common_options
@@ -1781,6 +1843,56 @@ _git_stage ()
_git_add
}
+_git_status ()
+{
+ local complete_opt
+ local untracked_state
+
+ case "$cur" in
+ --ignore-submodules=*)
+ __gitcomp "none untracked dirty all" "" "${cur##--ignore-submodules=}"
+ return
+ ;;
+ --untracked-files=*)
+ __gitcomp "$__git_untracked_file_modes" "" "${cur##--untracked-files=}"
+ return
+ ;;
+ --column=*)
+ __gitcomp "
+ always never auto column row plain dense nodense
+ " "" "${cur##--column=}"
+ return
+ ;;
+ --*)
+ __gitcomp "
+ --short --branch --porcelain --long --verbose
+ --untracked-files= --ignore-submodules= --ignored
+ --column= --no-column
+ "
+ return
+ ;;
+ esac
+
+ untracked_state="$(__git_get_option_value "-u" "--untracked-files=" \
+ "$__git_untracked_file_modes" "status.showUntrackedFiles")"
+
+ case "$untracked_state" in
+ no)
+ # --ignored option does not matter
+ complete_opt=
+ ;;
+ all|normal|*)
+ complete_opt="--cached --directory --no-empty-directory --others"
+
+ if [ -n "$(__git_find_on_cmdline "--ignored")" ]; then
+ complete_opt="$complete_opt --ignored --exclude=*"
+ fi
+ ;;
+ esac
+
+ __git_complete_index_file "$complete_opt"
+}
+
__git_config_get_set_variables ()
{
local prevword word config_file= c=$cword
@@ -2086,6 +2198,7 @@ _git_config ()
format.attach
format.cc
format.coverLetter
+ format.from
format.headers
format.numbered
format.pretty
@@ -2360,6 +2473,10 @@ _git_show ()
__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
return
;;
+ --submodule=*)
+ __gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
+ return
+ ;;
--*)
__gitcomp "--pretty= --format= --abbrev-commit --oneline
--show-signature
@@ -2596,6 +2713,32 @@ _git_whatchanged ()
_git_log
}
+_git_worktree ()
+{
+ local subcommands="add list lock prune unlock"
+ local subcommand="$(__git_find_on_cmdline "$subcommands")"
+ if [ -z "$subcommand" ]; then
+ __gitcomp "$subcommands"
+ else
+ case "$subcommand,$cur" in
+ add,--*)
+ __gitcomp "--detach"
+ ;;
+ list,--*)
+ __gitcomp "--porcelain"
+ ;;
+ lock,--*)
+ __gitcomp "--reason"
+ ;;
+ prune,--*)
+ __gitcomp "--dry-run --expire --verbose"
+ ;;
+ *)
+ ;;
+ esac
+ fi
+}
+
__git_main ()
{
local i c=1 command __git_dir
diff --git a/contrib/diff-highlight/Makefile b/contrib/diff-highlight/Makefile
new file mode 100644
index 0000000..9018724
--- /dev/null
+++ b/contrib/diff-highlight/Makefile
@@ -0,0 +1,5 @@
+# nothing to build
+all:
+
+test:
+ $(MAKE) -C t
diff --git a/contrib/diff-highlight/diff-highlight b/contrib/diff-highlight/diff-highlight
index ffefc31..81bd804 100755
--- a/contrib/diff-highlight/diff-highlight
+++ b/contrib/diff-highlight/diff-highlight
@@ -21,6 +21,10 @@ my $RESET = "\x1b[m";
my $COLOR = qr/\x1b\[[0-9;]*m/;
my $BORING = qr/$COLOR|\s/;
+# The patch portion of git log -p --graph should only ever have preceding | and
+# not / or \ as merge history only shows up on the commit line.
+my $GRAPH = qr/$COLOR?\|$COLOR?\s+/;
+
my @removed;
my @added;
my $in_hunk;
@@ -32,12 +36,12 @@ $SIG{PIPE} = 'DEFAULT';
while (<>) {
if (!$in_hunk) {
print;
- $in_hunk = /^$COLOR*\@/;
+ $in_hunk = /^$GRAPH*$COLOR*\@\@ /;
}
- elsif (/^$COLOR*-/) {
+ elsif (/^$GRAPH*$COLOR*-/) {
push @removed, $_;
}
- elsif (/^$COLOR*\+/) {
+ elsif (/^$GRAPH*$COLOR*\+/) {
push @added, $_;
}
else {
@@ -46,7 +50,7 @@ while (<>) {
@added = ();
print;
- $in_hunk = /^$COLOR*[\@ ]/;
+ $in_hunk = /^$GRAPH*$COLOR*[\@ ]/;
}
# Most of the time there is enough output to keep things streaming,
@@ -163,6 +167,9 @@ sub highlight_pair {
}
}
+# we split either by $COLOR or by character. This has the side effect of
+# leaving in graph cruft. It works because the graph cruft does not contain "-"
+# or "+"
sub split_line {
local $_ = shift;
return utf8::decode($_) ?
@@ -211,8 +218,8 @@ sub is_pair_interesting {
my $suffix_a = join('', @$a[($sa+1)..$#$a]);
my $suffix_b = join('', @$b[($sb+1)..$#$b]);
- return $prefix_a !~ /^$COLOR*-$BORING*$/ ||
- $prefix_b !~ /^$COLOR*\+$BORING*$/ ||
+ return $prefix_a !~ /^$GRAPH*$COLOR*-$BORING*$/ ||
+ $prefix_b !~ /^$GRAPH*$COLOR*\+$BORING*$/ ||
$suffix_a !~ /^$BORING*$/ ||
$suffix_b !~ /^$BORING*$/;
}
diff --git a/contrib/diff-highlight/t/.gitignore b/contrib/diff-highlight/t/.gitignore
new file mode 100644
index 0000000..7dcbb23
--- /dev/null
+++ b/contrib/diff-highlight/t/.gitignore
@@ -0,0 +1,2 @@
+/trash directory*
+/test-results
diff --git a/contrib/diff-highlight/t/Makefile b/contrib/diff-highlight/t/Makefile
new file mode 100644
index 0000000..5ff5275
--- /dev/null
+++ b/contrib/diff-highlight/t/Makefile
@@ -0,0 +1,22 @@
+-include ../../../config.mak.autogen
+-include ../../../config.mak
+
+# copied from ../../t/Makefile
+SHELL_PATH ?= $(SHELL)
+SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
+T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
+
+all: test
+test: $(T)
+
+.PHONY: help clean all test $(T)
+
+help:
+ @echo 'Run "$(MAKE) test" to launch test scripts'
+ @echo 'Run "$(MAKE) clean" to remove trash folders'
+
+$(T):
+ @echo "*** $@ ***"; '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
+
+clean:
+ $(RM) -r 'trash directory'.*
diff --git a/contrib/diff-highlight/t/t9400-diff-highlight.sh b/contrib/diff-highlight/t/t9400-diff-highlight.sh
new file mode 100755
index 0000000..3b43dbe
--- /dev/null
+++ b/contrib/diff-highlight/t/t9400-diff-highlight.sh
@@ -0,0 +1,296 @@
+#!/bin/sh
+
+test_description='Test diff-highlight'
+
+CURR_DIR=$(pwd)
+TEST_OUTPUT_DIRECTORY=$(pwd)
+TEST_DIRECTORY="$CURR_DIR"/../../../t
+DIFF_HIGHLIGHT="$CURR_DIR"/../diff-highlight
+
+CW="$(printf "\033[7m")" # white
+CR="$(printf "\033[27m")" # reset
+
+. "$TEST_DIRECTORY"/test-lib.sh
+
+if ! test_have_prereq PERL
+then
+ skip_all='skipping diff-highlight tests; perl not available'
+ test_done
+fi
+
+# dh_test is a test helper function which takes 3 file names as parameters. The
+# first 2 files are used to generate diff and commit output, which is then
+# piped through diff-highlight. The 3rd file should contain the expected output
+# of diff-highlight (minus the diff/commit header, ie. everything after and
+# including the first @@ line).
+dh_test () {
+ a="$1" b="$2" &&
+
+ cat >patch.exp &&
+
+ {
+ cat "$a" >file &&
+ git add file &&
+ git commit -m "Add a file" &&
+
+ cat "$b" >file &&
+ git diff file >diff.raw &&
+ git commit -a -m "Update a file" &&
+ git show >commit.raw
+ } >/dev/null &&
+
+ "$DIFF_HIGHLIGHT" <diff.raw | test_strip_patch_header >diff.act &&
+ "$DIFF_HIGHLIGHT" <commit.raw | test_strip_patch_header >commit.act &&
+ test_cmp patch.exp diff.act &&
+ test_cmp patch.exp commit.act
+}
+
+test_strip_patch_header () {
+ sed -n '/^@@/,$p' $*
+}
+
+# dh_test_setup_history generates a contrived graph such that we have at least
+# 1 nesting (E) and 2 nestings (F).
+#
+# A branch
+# /
+# D---E---F master
+#
+# git log --all --graph
+# * commit
+# | A
+# | * commit
+# | | F
+# | * commit
+# |/
+# | E
+# * commit
+# D
+#
+dh_test_setup_history () {
+ echo "file1" >file1 &&
+ echo "file2" >file2 &&
+ echo "file3" >file3 &&
+
+ cat file1 >file &&
+ git add file &&
+ git commit -m "D" &&
+
+ git checkout -b branch &&
+ cat file2 >file &&
+ git commit -a -m "A" &&
+
+ git checkout master &&
+ cat file2 >file &&
+ git commit -a -m "E" &&
+
+ cat file3 >file &&
+ git commit -a -m "F"
+}
+
+left_trim () {
+ "$PERL_PATH" -pe 's/^\s+//'
+}
+
+trim_graph () {
+ # graphs start with * or |
+ # followed by a space or / or \
+ "$PERL_PATH" -pe 's@^((\*|\|)( |/|\\))+@@'
+}
+
+test_expect_success 'diff-highlight highlights the beginning of a line' '
+ cat >a <<-\EOF &&
+ aaa
+ bbb
+ ccc
+ EOF
+
+ cat >b <<-\EOF &&
+ aaa
+ 0bb
+ ccc
+ EOF
+
+ dh_test a b <<-EOF
+ @@ -1,3 +1,3 @@
+ aaa
+ -${CW}b${CR}bb
+ +${CW}0${CR}bb
+ ccc
+ EOF
+'
+
+test_expect_success 'diff-highlight highlights the end of a line' '
+ cat >a <<-\EOF &&
+ aaa
+ bbb
+ ccc
+ EOF
+
+ cat >b <<-\EOF &&
+ aaa
+ bb0
+ ccc
+ EOF
+
+ dh_test a b <<-EOF
+ @@ -1,3 +1,3 @@
+ aaa
+ -bb${CW}b${CR}
+ +bb${CW}0${CR}
+ ccc
+ EOF
+'
+
+test_expect_success 'diff-highlight highlights the middle of a line' '
+ cat >a <<-\EOF &&
+ aaa
+ bbb
+ ccc
+ EOF
+
+ cat >b <<-\EOF &&
+ aaa
+ b0b
+ ccc
+ EOF
+
+ dh_test a b <<-EOF
+ @@ -1,3 +1,3 @@
+ aaa
+ -b${CW}b${CR}b
+ +b${CW}0${CR}b
+ ccc
+ EOF
+'
+
+test_expect_success 'diff-highlight does not highlight whole line' '
+ cat >a <<-\EOF &&
+ aaa
+ bbb
+ ccc
+ EOF
+
+ cat >b <<-\EOF &&
+ aaa
+ 000
+ ccc
+ EOF
+
+ dh_test a b <<-EOF
+ @@ -1,3 +1,3 @@
+ aaa
+ -bbb
+ +000
+ ccc
+ EOF
+'
+
+test_expect_failure 'diff-highlight highlights mismatched hunk size' '
+ cat >a <<-\EOF &&
+ aaa
+ bbb
+ EOF
+
+ cat >b <<-\EOF &&
+ aaa
+ b0b
+ ccc
+ EOF
+
+ dh_test a b <<-EOF
+ @@ -1,3 +1,3 @@
+ aaa
+ -b${CW}b${CR}b
+ +b${CW}0${CR}b
+ +ccc
+ EOF
+'
+
+# These two code points share the same leading byte in UTF-8 representation;
+# a naive byte-wise diff would highlight only the second byte.
+#
+# - U+00f3 ("o" with acute)
+o_accent=$(printf '\303\263')
+# - U+00f8 ("o" with stroke)
+o_stroke=$(printf '\303\270')
+
+test_expect_success 'diff-highlight treats multibyte utf-8 as a unit' '
+ echo "unic${o_accent}de" >a &&
+ echo "unic${o_stroke}de" >b &&
+ dh_test a b <<-EOF
+ @@ -1 +1 @@
+ -unic${CW}${o_accent}${CR}de
+ +unic${CW}${o_stroke}${CR}de
+ EOF
+'
+
+# Unlike the UTF-8 above, these are combining code points which are meant
+# to modify the character preceding them:
+#
+# - U+0301 (combining acute accent)
+combine_accent=$(printf '\314\201')
+# - U+0302 (combining circumflex)
+combine_circum=$(printf '\314\202')
+
+test_expect_failure 'diff-highlight treats combining code points as a unit' '
+ echo "unico${combine_accent}de" >a &&
+ echo "unico${combine_circum}de" >b &&
+ dh_test a b <<-EOF
+ @@ -1 +1 @@
+ -unic${CW}o${combine_accent}${CR}de
+ +unic${CW}o${combine_circum}${CR}de
+ EOF
+'
+
+test_expect_success 'diff-highlight works with the --graph option' '
+ dh_test_setup_history &&
+
+ # topo-order so that the order of the commits is the same as with --graph
+ # trim graph elements so we can do a diff
+ # trim leading space because our trim_graph is not perfect
+ git log --branches -p --topo-order |
+ "$DIFF_HIGHLIGHT" | left_trim >graph.exp &&
+ git log --branches -p --graph |
+ "$DIFF_HIGHLIGHT" | trim_graph | left_trim >graph.act &&
+ test_cmp graph.exp graph.act
+'
+
+# Most combined diffs won't meet diff-highlight's line-number filter. So we
+# create one here where one side drops a line and the other modifies it. That
+# should result in a diff like:
+#
+# - modified content
+# ++resolved content
+#
+# which naively looks like one side added "+resolved".
+test_expect_success 'diff-highlight ignores combined diffs' '
+ echo "content" >file &&
+ git add file &&
+ git commit -m base &&
+
+ >file &&
+ git commit -am master &&
+
+ git checkout -b other HEAD^ &&
+ echo "modified content" >file &&
+ git commit -am other &&
+
+ test_must_fail git merge master &&
+ echo "resolved content" >file &&
+ git commit -am resolved &&
+
+ cat >expect <<-\EOF &&
+ --- a/file
+ +++ b/file
+ @@@ -1,1 -1,0 +1,1 @@@
+ - modified content
+ ++resolved content
+ EOF
+
+ git show -c | "$DIFF_HIGHLIGHT" >actual.raw &&
+ sed -n "/^---/,\$p" <actual.raw >actual &&
+ test_cmp expect actual
+'
+
+test_done
diff --git a/contrib/git-jump/README b/contrib/git-jump/README
index 1cebc32..225e3f0 100644
--- a/contrib/git-jump/README
+++ b/contrib/git-jump/README
@@ -29,7 +29,7 @@ Obviously this trivial case isn't that interesting; you could just open
`foo.c` yourself. But when you have many changes scattered across a
project, you can use the editor's support to "jump" from point to point.
-Git-jump can generate three types of interesting lists:
+Git-jump can generate four types of interesting lists:
1. The beginning of any diff hunks.
@@ -37,6 +37,8 @@ Git-jump can generate three types of interesting lists:
3. Any grep matches.
+ 4. Any whitespace errors detected by `git diff --check`.
+
Using git-jump
--------------
@@ -83,7 +85,7 @@ complete list of files and line numbers for each match.
Limitations
-----------
-This scripts was written and tested with vim. Given that the quickfix
+This script was written and tested with vim. Given that the quickfix
format is the same as what gcc produces, I expect emacs users have a
similar feature for iterating through the list, but I know nothing about
how to activate it.
diff --git a/contrib/git-jump/git-jump b/contrib/git-jump/git-jump
index dc90cd6..427f206 100755
--- a/contrib/git-jump/git-jump
+++ b/contrib/git-jump/git-jump
@@ -12,6 +12,8 @@ diff: elements are diff hunks. Arguments are given to diff.
merge: elements are merge conflicts. Arguments are ignored.
grep: elements are grep hits. Arguments are given to grep.
+
+ws: elements are whitespace errors. Arguments are given to diff --check.
EOF
}
@@ -25,7 +27,7 @@ mode_diff() {
perl -ne '
if (m{^\+\+\+ (.*)}) { $file = $1; next }
defined($file) or next;
- if (m/^@@ .*\+(\d+)/) { $line = $1; next }
+ if (m/^@@ .*?\+(\d+)/) { $line = $1; next }
defined($line) or next;
if (/^ /) { $line++; next }
if (/^[-+]\s*(.*)/) {
@@ -55,6 +57,10 @@ mode_grep() {
'
}
+mode_ws() {
+ git diff --check "$@"
+}
+
if test $# -lt 1; then
usage >&2
exit 1
diff --git a/contrib/hooks/multimail/CHANGES b/contrib/hooks/multimail/CHANGES
index 100cc7a..2076cf9 100644
--- a/contrib/hooks/multimail/CHANGES
+++ b/contrib/hooks/multimail/CHANGES
@@ -1,3 +1,62 @@
+Release 1.4.0
+=============
+
+New features to troubleshoot a git-multimail installation
+---------------------------------------------------------
+
+* One can now perform a basic check of git-multimail's setup by
+ running the hook with the environment variable
+ GIT_MULTIMAIL_CHECK_SETUP set to a non-empty string. See
+ doc/troubleshooting.rst for details.
+
+* A new log files system was added. See the multimailhook.logFile,
+ multimailhook.errorLogFile and multimailhook.debugLogFile variables.
+
+* git_multimail.py can now be made more verbose using
+ multimailhook.verbose.
+
+* A new option --check-ref-filter is now available to help debugging
+ the refFilter* options.
+
+Formatting emails
+-----------------
+
+* Formatting of emails was made slightly more compact, to reduce the
+ odds of having long subject lines truncated or wrapped in short list
+ of commits.
+
+* multimailhook.emailPrefix may now use the '%(repo_shortname)s'
+ placeholder for the repository's short name.
+
+* A new option multimailhook.subjectMaxLength is available to truncate
+ overly long subject lines.
+
+Bug fixes and minor changes
+---------------------------
+
+* Options refFilterDoSendRegex and refFilterDontSendRegex were
+ essentially broken. They should work now.
+
+* The behavior when both refFilter{Do,Dont}SendRegex and
+ refFilter{Exclusion,Inclusion}Regex are set have been slightly
+ changed. Exclusion/Inclusion is now strictly stronger than
+ DoSend/DontSend.
+
+* The management of precedence when a setting can be computed in
+ multiple ways has been considerably refactored and modified.
+ multimailhook.from and multimailhook.reponame now have precedence
+ over the environment-specific settings ($GL_REPO/$GL_USER for
+ gitolite, --stash-user/repo for Stash, --submitter/--project for
+ Gerrit).
+
+* The coverage of the testsuite has been considerably improved. All
+ configuration variables now appear at least once in the testsuite.
+
+This version was tested with Python 2.6 to 3.5. It also mostly works
+with Python 2.4, but there is one known breakage in the testsuite
+related to non-ascii characters. It was tested with Git
+1.7.10.406.gdc801, 1.8.5.6, 2.1.4, and 2.10.0.rc0.1.g07c9292.
+
Release 1.3.1 (bugfix-only release)
===================================
diff --git a/contrib/hooks/multimail/CONTRIBUTING.rst b/contrib/hooks/multimail/CONTRIBUTING.rst
index 530ecbf..da65570 100644
--- a/contrib/hooks/multimail/CONTRIBUTING.rst
+++ b/contrib/hooks/multimail/CONTRIBUTING.rst
@@ -4,8 +4,9 @@ Contributing
git-multimail is an open-source project, built by volunteers. We would
welcome your help!
-The current maintainers are Michael Haggerty <mhagger@alum.mit.edu>
-and Matthieu Moy <matthieu.moy@grenoble-inp.fr>.
+The current maintainers are Matthieu Moy
+<matthieu.moy@grenoble-inp.fr> and Michael Haggerty
+<mhagger@alum.mit.edu>.
Please note that although a copy of git-multimail is distributed in
the "contrib" section of the main Git project, development takes place
@@ -22,6 +23,10 @@ to the maintainers). Please sign off your patches as per the `Git
project practice
<https://github.com/git/git/blob/master/Documentation/SubmittingPatches#L234>`__.
+Please vote for issues you would like to be addressed in priority
+(click "add your reaction" and then the "+1" thumbs-up button on the
+GitHub issue).
+
General discussion of git-multimail can take place on the main `Git
mailing list`_.
diff --git a/contrib/hooks/multimail/README b/contrib/hooks/multimail/README
index 0c91d19..5105373 100644
--- a/contrib/hooks/multimail/README
+++ b/contrib/hooks/multimail/README
@@ -1,11 +1,11 @@
-git-multimail 1.3.1
-===================
+git-multimail version 1.4.0
+===========================
.. image:: https://travis-ci.org/git-multimail/git-multimail.svg?branch=master
:target: https://travis-ci.org/git-multimail/git-multimail
git-multimail is a tool for sending notification emails on pushes to a
-Git repository. It includes a Python module called git_multimail.py,
+Git repository. It includes a Python module called ``git_multimail.py``,
which can either be used as a hook script directly or can be imported
as a Python module into another script.
@@ -93,20 +93,20 @@ Requirements
Invocation
----------
-git_multimail.py is designed to be used as a ``post-receive`` hook in a
+``git_multimail.py`` is designed to be used as a ``post-receive`` hook in a
Git repository (see githooks(5)). Link or copy it to
$GIT_DIR/hooks/post-receive within the repository for which email
notifications are desired. Usually it should be installed on the
central repository for a project, to which all commits are eventually
pushed.
-For use on pre-v1.5.1 Git servers, git_multimail.py can also work as
+For use on pre-v1.5.1 Git servers, ``git_multimail.py`` can also work as
an ``update`` hook, taking its arguments on the command line. To use
this script in this manner, link or copy it to $GIT_DIR/hooks/update.
Please note that the script is not completely reliable in this mode
-[2]_.
+[1]_.
-Alternatively, git_multimail.py can be imported as a Python module
+Alternatively, ``git_multimail.py`` can be imported as a Python module
into your own Python post-receive script. This method is a bit more
work, but allows the behavior of the hook to be customized using
arbitrary Python code. For example, you can use a custom environment
@@ -122,7 +122,7 @@ arbitrary Python code. For example, you can use a custom environment
Or you can change how emails are sent by writing your own Mailer
class. The ``post-receive`` script in this directory demonstrates how
-to use git_multimail.py as a Python module. (If you make interesting
+to use ``git_multimail.py`` as a Python module. (If you make interesting
changes of this type, please consider sharing them with the
community.)
@@ -151,7 +151,10 @@ multimailhook.environment
the repository name is derived from the repository's path.
gitolite
- the username of the pusher is read from $GL_USER, the repository
+ Environment to use when ``git-multimail`` is ran as a gitolite_
+ hook.
+
+ The username of the pusher is read from $GL_USER, the repository
name is read from $GL_REPO, and the From: header value is
optionally read from gitolite.conf (see multimailhook.from).
@@ -294,7 +297,7 @@ multimailhook.htmlInIntro, multimailhook.htmlInFooter
like ``<a href="foo">link</a>``, the reader will see the HTML
source code and not a proper link.
- Set ``multimailhook.htmlInIntro`` to true to allow writting HTML
+ Set ``multimailhook.htmlInIntro`` to true to allow writing HTML
formatting in introduction templates. Similarly, set
``multimailhook.htmlInFooter`` for HTML in the footer.
@@ -444,7 +447,9 @@ multimailhook.emailPrefix
email filtering (though filtering based on the X-Git-* email
headers is probably more robust). Default is the short name of
the repository in square brackets; e.g., ``[myrepo]``. Set this
- value to the empty string to suppress the email prefix.
+ value to the empty string to suppress the email prefix. You may
+ use the placeholder ``%(repo_shortname)s`` for the short name of
+ the repository.
multimailhook.emailMaxLines
The maximum number of lines that should be included in the body of
@@ -461,6 +466,17 @@ multimailhook.emailMaxLineLength
lines, the diffs are probably unreadable anyway. To disable line
truncation, set this option to 0.
+multimailhook.subjectMaxLength
+ The maximum length of the subject line (i.e. the ``oneline`` field
+ in templates, not including the prefix). Lines longer than this
+ limit are truncated to this length with a trailing ``[...]`` added
+ to indicate the missing text. This option The default is to use
+ ``multimailhook.emailMaxLineLength``. This option avoids sending
+ emails with overly long subject lines, but should not be needed if
+ the commit messages follow the Git convention (one short subject
+ line, then a blank line, then the message body). To disable line
+ truncation, set this option to 0.
+
multimailhook.maxCommitEmails
The maximum number of commit emails to send for a given change.
When the number of patches is larger that this value, only the
@@ -474,12 +490,15 @@ multimailhook.emailStrictUTF8
not valid UTF-8 are converted to the Unicode replacement
character, U+FFFD. The default is `true`.
+ This option is ineffective with Python 3, where non-UTF-8
+ characters are unconditionally replaced.
+
multimailhook.diffOpts
Options passed to ``git diff-tree`` when generating the summary
information for ReferenceChange emails. Default is ``--stat
--summary --find-copies-harder``. Add -p to those options to
include a unified diff of changes in addition to the usual summary
- output. Shell quoting is allowed; see multimailhook.logOpts for
+ output. Shell quoting is allowed; see ``multimailhook.logOpts`` for
details.
multimailhook.graphOpts
@@ -516,7 +535,7 @@ multimailhook.commitLogOpts
multimailhook.dateSubstitute
String to use as a substitute for ``Date:`` in the output of ``git
- log`` while formatting commit messages. This is usefull to avoid
+ log`` while formatting commit messages. This is useful to avoid
emitting a line that can be interpreted by mailers as the start of
a cited message (Zimbra webmail in particular). Defaults to
``CommitDate:``. Set to an empty string or ``none`` to deactivate
@@ -564,6 +583,8 @@ multimailhook.refFilterInclusionRegex, multimailhook.refFilterExclusionRegex, mu
the user-interface is not stable yet (in particular, the option
names may change). If you want to participate in stabilizing the
feature, please contact the maintainers and/or send pull-requests.
+ If you are happy with the current shape of the feature, please
+ report it too.
Regular expressions that can be used to limit refs for which email
updates will be sent. It is an error to specify both an inclusion
@@ -613,6 +634,32 @@ multimailhook.refFilterInclusionRegex, multimailhook.refFilterExclusionRegex, mu
[multimailhook]
refFilterExclusionRegex = ^refs/tags/|^refs/heads/master$
+ ``refFilterInclusionRegex`` and ``refFilterExclusionRegex`` are
+ strictly stronger than ``refFilterDoSendRegex`` and
+ ``refFilterDontSendRegex``. In other words, adding a ref to a
+ DoSend/DontSend regex has no effect if it is already excluded by a
+ Exclusion/Inclusion regex.
+
+multimailhook.logFile, multimailhook.errorLogFile, multimailhook.debugLogFile
+
+ When set, these variable designate path to files where
+ git-multimail will log some messages. Normal messages and error
+ messages are sent to ``logFile``, and error messages are also sent
+ to ``errorLogFile``. Debug messages and all other messages are
+ sent to ``debugLogFile``. The recommended way is to set only one
+ of these variables, but it is also possible to set several of them
+ (part of the information is then duplicated in several log files,
+ for example errors are duplicated to all log files).
+
+ Relative path are relative to the Git repository where the push is
+ done.
+
+multimailhook.verbose
+
+ Verbosity level of git-multimail on its standard output. By
+ default, show only error and info messages. If set to true, show
+ also debug messages.
+
Email filtering aids
--------------------
@@ -628,8 +675,8 @@ Customizing email contents
git-multimail mostly generates emails by expanding templates. The
templates can be customized. To avoid the need to edit
-git_multimail.py directly, the preferred way to change the templates
-is to write a separate Python script that imports git_multimail.py as
+``git_multimail.py`` directly, the preferred way to change the templates
+is to write a separate Python script that imports ``git_multimail.py`` as
a module, then replaces the templates in place. See the provided
post-receive script for an example of how this is done.
@@ -645,8 +692,8 @@ GenericEnvironment
a stand-alone Git repository.
GitoliteEnvironment
- a Git repository that is managed by gitolite
- [3]_. For such repositories, the identity of the pusher is read from
+ a Git repository that is managed by gitolite_. For such
+ repositories, the identity of the pusher is read from
environment variable $GL_USER, the name of the repository is read
from $GL_REPO (if it is not overridden by multimailhook.reponame),
and the From: header value is optionally read from gitolite.conf
@@ -662,7 +709,7 @@ option to the script.
If you need to customize the script in ways that are not supported by
the existing environments, you can define your own environment class
class using arbitrary Python code. To do so, you need to import
-git_multimail.py as a Python module, as demonstrated by the example
+``git_multimail.py`` as a Python module, as demonstrated by the example
post-receive script. Then implement your environment class; it should
usually inherit from one of the existing Environment classes and
possibly one or more of the EnvironmentMixin classes. Then set the
@@ -690,9 +737,7 @@ contribute to git-multimail.
Footnotes
---------
-.. [1] http://www.python.org/dev/peps/pep-0394/
-
-.. [2] Because of the way information is passed to update hooks, the
+.. [1] Because of the way information is passed to update hooks, the
script's method of determining whether a commit has already
been seen does not work when it is used as an ``update`` script.
In particular, no notification email will be generated for a
@@ -700,4 +745,4 @@ Footnotes
push. A workaround is to use --force-send to force sending the
emails.
-.. [3] https://github.com/sitaramc/gitolite
+.. _gitolite: https://github.com/sitaramc/gitolite
diff --git a/contrib/hooks/multimail/README.Git b/contrib/hooks/multimail/README.Git
index 1210bde..161b023 100644
--- a/contrib/hooks/multimail/README.Git
+++ b/contrib/hooks/multimail/README.Git
@@ -6,10 +6,10 @@ website:
https://github.com/git-multimail/git-multimail
The version in this directory was obtained from the upstream project
-on May 13 2016 and consists of the "git-multimail" subdirectory from
+on August 17 2016 and consists of the "git-multimail" subdirectory from
revision
- 3ce5470d4abf7251604cbf64e73a962e1b617f5e refs/tags/1.3.1
+ 07b1cb6bfd7be156c62e1afa17cae13b850a869f refs/tags/1.4.0
Please see the README file in this directory for information about how
to report bugs or contribute to git-multimail.
diff --git a/contrib/hooks/multimail/doc/troubleshooting.rst b/contrib/hooks/multimail/doc/troubleshooting.rst
index d3f346f..651b509 100644
--- a/contrib/hooks/multimail/doc/troubleshooting.rst
+++ b/contrib/hooks/multimail/doc/troubleshooting.rst
@@ -1,6 +1,40 @@
Troubleshooting issues with git-multimail: a FAQ
================================================
+How to check that git-multimail is properly set up?
+---------------------------------------------------
+
+Since version 1.4.0, git-multimail allows a simple self-checking of
+its configuration: run it with the environment variable
+``GIT_MULTIMAIL_CHECK_SETUP`` set to a non-empty string. You should
+get something like this::
+
+ $ GIT_MULTIMAIL_CHECK_SETUP=true /home/moy/dev/git-multimail/git-multimail/git_multimail.py
+ Environment values:
+ administrator : 'the administrator of this repository'
+ charset : 'utf-8'
+ emailprefix : '[git-multimail] '
+ fqdn : 'anie'
+ projectdesc : 'UNNAMED PROJECT'
+ pusher : 'moy'
+ repo_path : '/home/moy/dev/git-multimail'
+ repo_shortname : 'git-multimail'
+
+ Now, checking that git-multimail's standard input is properly set ...
+ Please type some text and then press Return
+ foo
+ You have just entered:
+ foo
+ git-multimail seems properly set up.
+
+If you forgot to set an important variable, you may get instead::
+
+ $ GIT_MULTIMAIL_CHECK_SETUP=true /home/moy/dev/git-multimail/git-multimail/git_multimail.py
+ No email recipients configured!
+
+Do not set ``$GIT_MULTIMAIL_CHECK_SETUP`` other than for testing your
+configuration: it would disable the hook completely.
+
Git is not using the right address in the From/To/Reply-To field
----------------------------------------------------------------
diff --git a/contrib/hooks/multimail/git_multimail.py b/contrib/hooks/multimail/git_multimail.py
index 54ab4a4..c7f8640 100755
--- a/contrib/hooks/multimail/git_multimail.py
+++ b/contrib/hooks/multimail/git_multimail.py
@@ -1,8 +1,8 @@
#! /usr/bin/env python
-__version__ = '1.3.1'
+__version__ = '1.4.0'
-# Copyright (c) 2015 Matthieu Moy and others
+# Copyright (c) 2015-2016 Matthieu Moy and others
# Copyright (c) 2012-2014 Michael Haggerty and others
# Derived from contrib/hooks/post-receive-email, which is
# Copyright (c) 2007 Andy Parkins
@@ -56,6 +56,7 @@ import socket
import subprocess
import shlex
import optparse
+import logging
import smtplib
try:
import ssl
@@ -86,8 +87,8 @@ if PYTHON3:
def str_to_bytes(s):
return s.encode(ENCODING)
- def bytes_to_str(s):
- return s.decode(ENCODING)
+ def bytes_to_str(s, errors='strict'):
+ return s.decode(ENCODING, errors)
unicode = str
@@ -98,6 +99,15 @@ if PYTHON3:
f.buffer.write(msg.encode(sys.getdefaultencoding()))
except UnicodeEncodeError:
f.buffer.write(msg.encode(ENCODING))
+
+ def read_line(f):
+ # Try reading with the default encoding. If it fails,
+ # try UTF-8.
+ out = f.buffer.readline()
+ try:
+ return out.decode(sys.getdefaultencoding())
+ except UnicodeEncodeError:
+ return out.decode(ENCODING)
else:
def is_string(s):
try:
@@ -108,12 +118,15 @@ else:
def str_to_bytes(s):
return s
- def bytes_to_str(s):
+ def bytes_to_str(s, errors='strict'):
return s
def write_str(f, msg):
f.write(msg)
+ def read_line(f):
+ return f.readline()
+
def next(it):
return it.next()
@@ -213,8 +226,8 @@ reference pointing at a previous point in the repository history.
\\
O -- O -- O (%(oldrev_short)s)
-Any revisions marked "omits" are not gone; other references still
-refer to them. Any revisions marked "discards" are gone forever.
+Any revisions marked "omit" are not gone; other references still
+refer to them. Any revisions marked "discard" are gone forever.
"""
@@ -233,8 +246,8 @@ You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
-Any revisions marked "omits" are not gone; other references still
-refer to them. Any revisions marked "discards" are gone forever.
+Any revisions marked "omit" are not gone; other references still
+refer to them. Any revisions marked "discard" are gone forever.
"""
@@ -258,22 +271,22 @@ from the repository.
NEW_REVISIONS_TEMPLATE = """\
The %(tot)s revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
-listed as "adds" were already present in the repository and have only
+listed as "add" were already present in the repository and have only
been added to this reference.
"""
TAG_CREATED_TEMPLATE = """\
- at %(newrev_short)-9s (%(newrev_type)s)
+ at %(newrev_short)-8s (%(newrev_type)s)
"""
TAG_UPDATED_TEMPLATE = """\
*** WARNING: tag %(short_refname)s was modified! ***
- from %(oldrev_short)-9s (%(oldrev_type)s)
- to %(newrev_short)-9s (%(newrev_type)s)
+ from %(oldrev_short)-8s (%(oldrev_type)s)
+ to %(newrev_short)-8s (%(newrev_type)s)
"""
@@ -286,7 +299,7 @@ TAG_DELETED_TEMPLATE = """\
# The template used in summary tables. It looks best if this uses the
# same alignment as TAG_CREATED_TEMPLATE and TAG_UPDATED_TEMPLATE.
BRIEF_SUMMARY_TEMPLATE = """\
-%(action)10s %(rev_short)-9s %(text)s
+%(action)8s %(rev_short)-8s %(text)s
"""
@@ -434,11 +447,16 @@ def read_output(cmd, input=None, keepends=False, **kw):
input = str_to_bytes(input)
else:
stdin = None
+ errors = 'strict'
+ if 'errors' in kw:
+ errors = kw['errors']
+ del kw['errors']
p = subprocess.Popen(
- cmd, stdin=stdin, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kw
+ tuple(str_to_bytes(w) for w in cmd),
+ stdin=stdin, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kw
)
(out, err) = p.communicate(input)
- out = bytes_to_str(out)
+ out = bytes_to_str(out, errors=errors)
retcode = p.wait()
if retcode:
raise CommandError(cmd, retcode)
@@ -1020,7 +1038,9 @@ class Change(object):
for line in footer:
yield line
- def get_alt_fromaddr(self):
+ def get_specific_fromaddr(self):
+ """For kinds of Changes which specify it, return the kind-specific
+ From address to use."""
return None
@@ -1045,7 +1065,7 @@ class Revision(Change):
self.cc_recipients = ', '.join(to.strip() for to in self._cc_recipients())
if self.cc_recipients:
self.environment.log_msg(
- 'Add %s to CC for %s\n' % (self.cc_recipients, self.rev.sha1))
+ 'Add %s to CC for %s' % (self.cc_recipients, self.rev.sha1))
def _cc_recipients(self):
cc_recipients = []
@@ -1065,6 +1085,10 @@ class Revision(Change):
['log', '--format=%s', '--no-walk', self.rev.sha1]
)
+ max_subject_length = self.environment.get_max_subject_length()
+ if max_subject_length > 0 and len(oneline) > max_subject_length:
+ oneline = oneline[:max_subject_length - 6] + ' [...]'
+
values['rev'] = self.rev.sha1
values['rev_short'] = self.rev.short
values['change_type'] = self.change_type
@@ -1121,7 +1145,7 @@ class Revision(Change):
for line in read_git_lines(
['log'] + self.environment.commitlogopts + ['-1', self.rev.sha1],
keepends=True,
- ):
+ errors='replace'):
if line.startswith('Date: ') and self.environment.date_substitute:
yield self.environment.date_substitute + line[len('Date: '):]
else:
@@ -1135,7 +1159,7 @@ class Revision(Change):
self._contains_diff()
return Change.generate_email(self, push, body_filter, extra_header_values)
- def get_alt_fromaddr(self):
+ def get_specific_fromaddr(self):
return self.environment.from_commit
@@ -1193,7 +1217,7 @@ class ReferenceChange(Change):
# Tracking branch:
environment.log_warning(
'*** Push-update of tracking branch %r\n'
- '*** - incomplete email generated.\n'
+ '*** - incomplete email generated.'
% (refname,)
)
klass = OtherReferenceChange
@@ -1201,7 +1225,7 @@ class ReferenceChange(Change):
# Some other reference namespace:
environment.log_warning(
'*** Push-update of strange reference %r\n'
- '*** - incomplete email generated.\n'
+ '*** - incomplete email generated.'
% (refname,)
)
klass = OtherReferenceChange
@@ -1209,7 +1233,7 @@ class ReferenceChange(Change):
# Anything else (is there anything else?)
environment.log_warning(
'*** Unknown type of update to %r (%s)\n'
- '*** - incomplete email generated.\n'
+ '*** - incomplete email generated.'
% (refname, rev.type,)
)
klass = OtherReferenceChange
@@ -1446,9 +1470,9 @@ class ReferenceChange(Change):
if discards and adds:
for (sha1, subject) in discards:
if sha1 in discarded_commits:
- action = 'discards'
+ action = 'discard'
else:
- action = 'omits'
+ action = 'omit'
yield self.expand(
BRIEF_SUMMARY_TEMPLATE, action=action,
rev_short=sha1, text=subject,
@@ -1457,7 +1481,7 @@ class ReferenceChange(Change):
if sha1 in new_commits:
action = 'new'
else:
- action = 'adds'
+ action = 'add'
yield self.expand(
BRIEF_SUMMARY_TEMPLATE, action=action,
rev_short=sha1, text=subject,
@@ -1469,9 +1493,9 @@ class ReferenceChange(Change):
elif discards:
for (sha1, subject) in discards:
if sha1 in discarded_commits:
- action = 'discards'
+ action = 'discard'
else:
- action = 'omits'
+ action = 'omit'
yield self.expand(
BRIEF_SUMMARY_TEMPLATE, action=action,
rev_short=sha1, text=subject,
@@ -1490,7 +1514,7 @@ class ReferenceChange(Change):
if sha1 in new_commits:
action = 'new'
else:
- action = 'adds'
+ action = 'add'
yield self.expand(
BRIEF_SUMMARY_TEMPLATE, action=action,
rev_short=sha1, text=subject,
@@ -1543,7 +1567,7 @@ class ReferenceChange(Change):
for r in discarded_revisions:
(sha1, subject) = r.rev.get_summary()
yield r.expand(
- BRIEF_SUMMARY_TEMPLATE, action='discards', text=subject,
+ BRIEF_SUMMARY_TEMPLATE, action='discard', text=subject,
)
for line in self.generate_revision_change_graph(push):
yield line
@@ -1581,7 +1605,7 @@ class ReferenceChange(Change):
)
yield '\n'
- def get_alt_fromaddr(self):
+ def get_specific_fromaddr(self):
return self.environment.from_refchange
@@ -1791,13 +1815,13 @@ class AnnotatedTagChange(ReferenceChange):
except CommandError:
prevtag = None
if prevtag:
- yield ' replaces %s\n' % (prevtag,)
+ yield ' replaces %s\n' % (prevtag,)
else:
prevtag = None
- yield ' length %s bytes\n' % (read_git_output(['cat-file', '-s', tagobject]),)
+ yield ' length %s bytes\n' % (read_git_output(['cat-file', '-s', tagobject]),)
- yield ' tagged by %s\n' % (tagger,)
- yield ' on %s\n' % (tagged,)
+ yield ' by %s\n' % (tagger,)
+ yield ' on %s\n' % (tagged,)
yield '\n'
# Show the content of the tag message; this might contain a
@@ -1914,6 +1938,9 @@ class OtherReferenceChange(ReferenceChange):
class Mailer(object):
"""An object that can send emails."""
+ def __init__(self, environment):
+ self.environment = environment
+
def send(self, lines, to_addrs):
"""Send an email consisting of lines.
@@ -1948,14 +1975,14 @@ class SendMailer(Mailer):
'Try setting multimailhook.sendmailCommand.'
)
- def __init__(self, command=None, envelopesender=None):
+ def __init__(self, environment, command=None, envelopesender=None):
"""Construct a SendMailer instance.
command should be the command and arguments used to invoke
sendmail, as a list of strings. If an envelopesender is
provided, it will also be passed to the command, via '-f
envelopesender'."""
-
+ super(SendMailer, self).__init__(environment)
if command:
self.command = command[:]
else:
@@ -1968,7 +1995,7 @@ class SendMailer(Mailer):
try:
p = subprocess.Popen(self.command, stdin=subprocess.PIPE)
except OSError:
- sys.stderr.write(
+ self.environment.get_logger().error(
'*** Cannot execute command: %s\n' % ' '.join(self.command) +
'*** %s\n' % sys.exc_info()[1] +
'*** Try setting multimailhook.mailer to "smtp"\n' +
@@ -1979,15 +2006,16 @@ class SendMailer(Mailer):
lines = (str_to_bytes(line) for line in lines)
p.stdin.writelines(lines)
except Exception:
- sys.stderr.write(
+ self.environment.get_logger().error(
'*** Error while generating commit email\n'
'*** - mail sending aborted.\n'
)
- try:
+ if hasattr(p, 'terminate'):
# subprocess.terminate() is not available in Python 2.4
p.terminate()
- except AttributeError:
- pass
+ else:
+ import signal
+ os.kill(p.pid, signal.SIGTERM)
raise
else:
p.stdin.close()
@@ -1999,14 +2027,16 @@ class SendMailer(Mailer):
class SMTPMailer(Mailer):
"""Send emails using Python's smtplib."""
- def __init__(self, envelopesender, smtpserver,
+ def __init__(self, environment,
+ envelopesender, smtpserver,
smtpservertimeout=10.0, smtpserverdebuglevel=0,
smtpencryption='none',
smtpuser='', smtppass='',
smtpcacerts=''
):
+ super(SMTPMailer, self).__init__(environment)
if not envelopesender:
- sys.stderr.write(
+ self.environment.get_logger().error(
'fatal: git_multimail: cannot use SMTPMailer without a sender address.\n'
'please set either multimailhook.envelopeSender or user.email\n'
)
@@ -2041,7 +2071,7 @@ class SMTPMailer(Mailer):
self.smtp = call(smtplib.SMTP_SSL, self.smtpserver, timeout=self.smtpservertimeout)
elif self.security == 'tls':
if 'ssl' not in sys.modules:
- sys.stderr.write(
+ self.environment.get_logger().error(
'*** Your Python version does not have the ssl library installed\n'
'*** smtpEncryption=tls is not available.\n'
'*** Either upgrade Python to 2.6 or later\n'
@@ -2071,7 +2101,7 @@ class SMTPMailer(Mailer):
self.smtp.sock,
cert_reqs=ssl.CERT_NONE
)
- sys.stderr.write(
+ self.environment.get_logger().error(
'*** Warning, the server certificat is not verified (smtp) ***\n'
'*** set the option smtpCACerts ***\n'
)
@@ -2094,10 +2124,10 @@ class SMTPMailer(Mailer):
% self.smtpserverdebuglevel)
self.smtp.set_debuglevel(self.smtpserverdebuglevel)
except Exception:
- sys.stderr.write(
+ self.environment.get_logger().error(
'*** Error establishing SMTP connection to %s ***\n'
- % self.smtpserver)
- sys.stderr.write('*** %s\n' % sys.exc_info()[1])
+ '*** %s\n'
+ % (self.smtpserver, sys.exc_info()[1]))
sys.exit(1)
def __del__(self):
@@ -2115,10 +2145,11 @@ class SMTPMailer(Mailer):
to_addrs = [email for (name, email) in getaddresses([to_addrs])]
self.smtp.sendmail(self.envelopesender, to_addrs, msg)
except smtplib.SMTPResponseException:
- sys.stderr.write('*** Error sending email ***\n')
err = sys.exc_info()[1]
- sys.stderr.write('*** Error %d: %s\n' % (err.smtp_code,
- bytes_to_str(err.smtp_error)))
+ self.environment.get_logger().error(
+ '*** Error sending email ***\n'
+ '*** Error %d: %s\n'
+ % (err.smtp_code, bytes_to_str(err.smtp_error)))
try:
smtp = self.smtp
# delete the field before quit() so that in case of
@@ -2126,9 +2157,10 @@ class SMTPMailer(Mailer):
del self.smtp
smtp.quit()
except:
- sys.stderr.write('*** Error closing the SMTP connection ***\n')
- sys.stderr.write('*** Exiting anyway ... ***\n')
- sys.stderr.write('*** %s\n' % sys.exc_info()[1])
+ self.environment.get_logger().error(
+ '*** Error closing the SMTP connection ***\n'
+ '*** Exiting anyway ... ***\n'
+ '*** %s\n' % sys.exc_info()[1])
sys.exit(1)
@@ -2250,6 +2282,11 @@ class Environment(object):
to send and when computing what commits are considered new
to the repository. Default is "^refs/notes/".
+ get_max_subject_length()
+
+ Return an int giving the maximal length for the subject
+ (git log --oneline).
+
They should also define the following attributes:
announce_show_shortlog (bool)
@@ -2324,6 +2361,15 @@ class Environment(object):
multimailhook.fromRefchange and multimailhook.fromCommit
by ConfigEnvironmentMixin.
+ log_file, error_log_file, debug_log_file (string)
+
+ Name of a file to which logs should be sent.
+
+ verbose (int)
+
+ How verbose the system should be.
+ - 0 (default): show info, errors, ...
+ - 1 : show basic debug info
"""
REPO_NAME_RE = re.compile(r'^(?P<name>.+?)(?:\.git)$')
@@ -2346,6 +2392,7 @@ class Environment(object):
self.quiet = False
self.stdout = False
self.combine_when_single_commit = True
+ self.logger = None
self.COMPUTED_KEYS = [
'administrator',
@@ -2360,6 +2407,12 @@ class Environment(object):
self._values = None
+ def get_logger(self):
+ """Get (possibly creates) the logger associated to this environment."""
+ if self.logger is None:
+ self.logger = Logger(self)
+ return self.logger
+
def get_repo_shortname(self):
"""Use the last part of the repo path, with ".git" stripped off if present."""
@@ -2467,6 +2520,11 @@ class Environment(object):
# which we simply do not have right now.
return "^refs/notes/"
+ def get_max_subject_length(self):
+ """Return the maximal subject line (git log --oneline) length.
+ Longer subject lines will be truncated."""
+ raise NotImplementedError()
+
def filter_body(self, lines):
"""Filter the lines intended for an email body.
@@ -2482,19 +2540,22 @@ class Environment(object):
"""Write the string msg on a log file or on stderr.
Sends the text to stderr by default, override to change the behavior."""
- write_str(sys.stderr, msg)
+ self.get_logger().info(msg)
def log_warning(self, msg):
"""Write the string msg on a log file or on stderr.
Sends the text to stderr by default, override to change the behavior."""
- write_str(sys.stderr, msg)
+ self.get_logger().warning(msg)
def log_error(self, msg):
"""Write the string msg on a log file or on stderr.
Sends the text to stderr by default, override to change the behavior."""
- write_str(sys.stderr, msg)
+ self.get_logger().error(msg)
+
+ def check(self):
+ pass
class ConfigEnvironmentMixin(Environment):
@@ -2613,6 +2674,14 @@ class ConfigOptionsEnvironmentMixin(ConfigEnvironmentMixin):
if combine is not None:
self.combine_when_single_commit = combine
+ self.log_file = config.get('logFile', default=None)
+ self.error_log_file = config.get('errorLogFile', default=None)
+ self.debug_log_file = config.get('debugLogFile', default=None)
+ if config.get_bool('Verbose', default=False):
+ self.verbose = 1
+ else:
+ self.verbose = 0
+
def get_administrator(self):
return (
self.config.get('administrator') or
@@ -2631,11 +2700,21 @@ class ConfigOptionsEnvironmentMixin(ConfigEnvironmentMixin):
if emailprefix is not None:
emailprefix = emailprefix.strip()
if emailprefix:
- return emailprefix + ' '
- else:
- return ''
+ emailprefix += ' '
else:
- return '[%s] ' % (self.get_repo_shortname(),)
+ emailprefix = '[%(repo_shortname)s] '
+ short_name = self.get_repo_shortname()
+ try:
+ return emailprefix % {'repo_shortname': short_name}
+ except:
+ self.get_logger().error(
+ '*** Invalid multimailhook.emailPrefix: %s\n' % emailprefix +
+ '*** %s\n' % sys.exc_info()[1] +
+ "*** Only the '%(repo_shortname)s' placeholder is allowed\n"
+ )
+ raise ConfigurationException(
+ '"%s" is not an allowed setting for emailPrefix' % emailprefix
+ )
def get_sender(self):
return self.config.get('envelopesender')
@@ -2656,9 +2735,9 @@ class ConfigOptionsEnvironmentMixin(ConfigEnvironmentMixin):
def get_fromaddr(self, change=None):
fromaddr = self.config.get('from')
if change:
- alt_fromaddr = change.get_alt_fromaddr()
- if alt_fromaddr:
- fromaddr = alt_fromaddr
+ specific_fromaddr = change.get_specific_fromaddr()
+ if specific_fromaddr:
+ fromaddr = specific_fromaddr
if fromaddr:
fromaddr = self.process_addr(fromaddr, change)
if fromaddr:
@@ -2684,7 +2763,7 @@ class ConfigOptionsEnvironmentMixin(ConfigEnvironmentMixin):
class FilterLinesEnvironmentMixin(Environment):
"""Handle encoding and maximum line length of body lines.
- emailmaxlinelength (int or None)
+ email_max_line_length (int or None)
The maximum length of any single line in the email body.
Longer lines are truncated at that length with ' [...]'
@@ -2699,10 +2778,13 @@ class FilterLinesEnvironmentMixin(Environment):
"""
- def __init__(self, strict_utf8=True, emailmaxlinelength=500, **kw):
+ def __init__(self, strict_utf8=True,
+ email_max_line_length=500, max_subject_length=500,
+ **kw):
super(FilterLinesEnvironmentMixin, self).__init__(**kw)
self.__strict_utf8 = strict_utf8
- self.__emailmaxlinelength = emailmaxlinelength
+ self.__email_max_line_length = email_max_line_length
+ self.__max_subject_length = max_subject_length
def filter_body(self, lines):
lines = super(FilterLinesEnvironmentMixin, self).filter_body(lines)
@@ -2711,15 +2793,18 @@ class FilterLinesEnvironmentMixin(Environment):
lines = (line.decode(ENCODING, 'replace') for line in lines)
# Limit the line length in Unicode-space to avoid
# splitting characters:
- if self.__emailmaxlinelength:
- lines = limit_linelength(lines, self.__emailmaxlinelength)
+ if self.__email_max_line_length > 0:
+ lines = limit_linelength(lines, self.__email_max_line_length)
if not PYTHON3:
lines = (line.encode(ENCODING, 'replace') for line in lines)
- elif self.__emailmaxlinelength:
- lines = limit_linelength(lines, self.__emailmaxlinelength)
+ elif self.__email_max_line_length:
+ lines = limit_linelength(lines, self.__email_max_line_length)
return lines
+ def get_max_subject_length(self):
+ return self.__max_subject_length
+
class ConfigFilterLinesEnvironmentMixin(
ConfigEnvironmentMixin,
@@ -2732,9 +2817,13 @@ class ConfigFilterLinesEnvironmentMixin(
if strict_utf8 is not None:
kw['strict_utf8'] = strict_utf8
- emailmaxlinelength = config.get('emailmaxlinelength')
- if emailmaxlinelength is not None:
- kw['emailmaxlinelength'] = int(emailmaxlinelength)
+ email_max_line_length = config.get('emailmaxlinelength')
+ if email_max_line_length is not None:
+ kw['email_max_line_length'] = int(email_max_line_length)
+
+ max_subject_length = config.get('subjectMaxLength', default=email_max_line_length)
+ if max_subject_length is not None:
+ kw['max_subject_length'] = int(max_subject_length)
super(ConfigFilterLinesEnvironmentMixin, self).__init__(
config=config, **kw
@@ -2750,7 +2839,7 @@ class MaxlinesEnvironmentMixin(Environment):
def filter_body(self, lines):
lines = super(MaxlinesEnvironmentMixin, self).filter_body(lines)
- if self.__emailmaxlines:
+ if self.__emailmaxlines > 0:
lines = limit_lines(lines, self.__emailmaxlines)
return lines
@@ -2843,25 +2932,64 @@ class StaticRecipientsEnvironmentMixin(Environment):
# actual *contents* of the change being reported, we only
# choose based on the *type* of the change. Therefore we can
# compute them once and for all:
- if not (refchange_recipients or
- announce_recipients or
- revision_recipients or
- scancommitforcc):
- raise ConfigurationException('No email recipients configured!')
self.__refchange_recipients = refchange_recipients
self.__announce_recipients = announce_recipients
self.__revision_recipients = revision_recipients
+ def check(self):
+ if not (self.get_refchange_recipients(None) or
+ self.get_announce_recipients(None) or
+ self.get_revision_recipients(None) or
+ self.get_scancommitforcc()):
+ raise ConfigurationException('No email recipients configured!')
+ super(StaticRecipientsEnvironmentMixin, self).check()
+
def get_refchange_recipients(self, refchange):
+ if self.__refchange_recipients is None:
+ return super(StaticRecipientsEnvironmentMixin,
+ self).get_refchange_recipients(refchange)
return self.__refchange_recipients
def get_announce_recipients(self, annotated_tag_change):
+ if self.__announce_recipients is None:
+ return super(StaticRecipientsEnvironmentMixin,
+ self).get_refchange_recipients(annotated_tag_change)
return self.__announce_recipients
def get_revision_recipients(self, revision):
+ if self.__revision_recipients is None:
+ return super(StaticRecipientsEnvironmentMixin,
+ self).get_refchange_recipients(revision)
return self.__revision_recipients
+class CLIRecipientsEnvironmentMixin(Environment):
+ """Mixin storing recipients information comming from the
+ command-line."""
+
+ def __init__(self, cli_recipients=None, **kw):
+ super(CLIRecipientsEnvironmentMixin, self).__init__(**kw)
+ self.__cli_recipients = cli_recipients
+
+ def get_refchange_recipients(self, refchange):
+ if self.__cli_recipients is None:
+ return super(CLIRecipientsEnvironmentMixin,
+ self).get_refchange_recipients(refchange)
+ return self.__cli_recipients
+
+ def get_announce_recipients(self, annotated_tag_change):
+ if self.__cli_recipients is None:
+ return super(CLIRecipientsEnvironmentMixin,
+ self).get_announce_recipients(annotated_tag_change)
+ return self.__cli_recipients
+
+ def get_revision_recipients(self, revision):
+ if self.__cli_recipients is None:
+ return super(CLIRecipientsEnvironmentMixin,
+ self).get_revision_recipients(revision)
+ return self.__cli_recipients
+
+
class ConfigRecipientsEnvironmentMixin(
ConfigEnvironmentMixin,
StaticRecipientsEnvironmentMixin
@@ -2935,24 +3063,20 @@ class StaticRefFilterEnvironmentMixin(Environment):
if ref_filter_do_send_regex and ref_filter_dont_send_regex:
raise ConfigurationException(
"Cannot specify both a ref doSend and dontSend regex.")
- if ref_filter_do_send_regex or ref_filter_dont_send_regex:
- self.__is_do_send_filter = bool(ref_filter_do_send_regex)
- if ref_filter_incl_regex:
- ref_filter_send_regex = ref_filter_incl_regex
- elif ref_filter_excl_regex:
- ref_filter_send_regex = ref_filter_excl_regex
- else:
- ref_filter_send_regex = '.*'
- self.__is_do_send_filter = True
- try:
- self.__send_compiled_regex = re.compile(ref_filter_send_regex)
- except Exception:
- raise ConfigurationException(
- 'Invalid Ref Filter Regex "%s": %s' %
- (ref_filter_send_regex, sys.exc_info()[1]))
+ self.__is_do_send_filter = bool(ref_filter_do_send_regex)
+ if ref_filter_do_send_regex:
+ ref_filter_send_regex = ref_filter_do_send_regex
+ elif ref_filter_dont_send_regex:
+ ref_filter_send_regex = ref_filter_dont_send_regex
else:
- self.__send_compiled_regex = self.__compiled_regex
- self.__is_do_send_filter = self.__is_inclusion_filter
+ ref_filter_send_regex = '.*'
+ self.__is_do_send_filter = True
+ try:
+ self.__send_compiled_regex = re.compile(ref_filter_send_regex)
+ except Exception:
+ raise ConfigurationException(
+ 'Invalid Ref Filter Regex "%s": %s' %
+ (ref_filter_send_regex, sys.exc_info()[1]))
def get_ref_filter_regex(self, send_filter=False):
if send_filter:
@@ -3023,34 +3147,21 @@ class GenericEnvironmentMixin(Environment):
return self.osenv.get('USER', self.osenv.get('USERNAME', 'unknown user'))
-class GenericEnvironment(
- ProjectdescEnvironmentMixin,
- ConfigMaxlinesEnvironmentMixin,
- ComputeFQDNEnvironmentMixin,
- ConfigFilterLinesEnvironmentMixin,
- ConfigRecipientsEnvironmentMixin,
- ConfigRefFilterEnvironmentMixin,
- PusherDomainEnvironmentMixin,
- ConfigOptionsEnvironmentMixin,
- GenericEnvironmentMixin,
- Environment,
- ):
- pass
+class GitoliteEnvironmentHighPrecMixin(Environment):
+ def get_pusher(self):
+ return self.osenv.get('GL_USER', 'unknown user')
-class GitoliteEnvironmentMixin(Environment):
+class GitoliteEnvironmentLowPrecMixin(Environment):
def get_repo_shortname(self):
# The gitolite environment variable $GL_REPO is a pretty good
# repo_shortname (though it's probably not as good as a value
# the user might have explicitly put in his config).
return (
self.osenv.get('GL_REPO', None) or
- super(GitoliteEnvironmentMixin, self).get_repo_shortname()
+ super(GitoliteEnvironmentLowPrecMixin, self).get_repo_shortname()
)
- def get_pusher(self):
- return self.osenv.get('GL_USER', 'unknown user')
-
def get_fromaddr(self, change=None):
GL_USER = self.osenv.get('GL_USER')
if GL_USER is not None:
@@ -3088,7 +3199,7 @@ class GitoliteEnvironmentMixin(Environment):
return m.group(1)
finally:
f.close()
- return super(GitoliteEnvironmentMixin, self).get_fromaddr(change)
+ return super(GitoliteEnvironmentLowPrecMixin, self).get_fromaddr(change)
class IncrementalDateTime(object):
@@ -3109,67 +3220,43 @@ class IncrementalDateTime(object):
return formatted
-class GitoliteEnvironment(
- ProjectdescEnvironmentMixin,
- ConfigMaxlinesEnvironmentMixin,
- ComputeFQDNEnvironmentMixin,
- ConfigFilterLinesEnvironmentMixin,
- ConfigRecipientsEnvironmentMixin,
- ConfigRefFilterEnvironmentMixin,
- PusherDomainEnvironmentMixin,
- ConfigOptionsEnvironmentMixin,
- GitoliteEnvironmentMixin,
- Environment,
- ):
- pass
-
-
-class StashEnvironmentMixin(Environment):
+class StashEnvironmentHighPrecMixin(Environment):
def __init__(self, user=None, repo=None, **kw):
- super(StashEnvironmentMixin, self).__init__(**kw)
+ super(StashEnvironmentHighPrecMixin,
+ self).__init__(user=user, repo=repo, **kw)
self.__user = user
self.__repo = repo
- def get_repo_shortname(self):
- return self.__repo
-
def get_pusher(self):
return re.match('(.*?)\s*<', self.__user).group(1)
def get_pusher_email(self):
return self.__user
- def get_fromaddr(self, change=None):
- return self.__user
+class StashEnvironmentLowPrecMixin(Environment):
+ def __init__(self, user=None, repo=None, **kw):
+ super(StashEnvironmentLowPrecMixin, self).__init__(**kw)
+ self.__repo = repo
+ self.__user = user
-class StashEnvironment(
- StashEnvironmentMixin,
- ProjectdescEnvironmentMixin,
- ConfigMaxlinesEnvironmentMixin,
- ComputeFQDNEnvironmentMixin,
- ConfigFilterLinesEnvironmentMixin,
- ConfigRecipientsEnvironmentMixin,
- ConfigRefFilterEnvironmentMixin,
- PusherDomainEnvironmentMixin,
- ConfigOptionsEnvironmentMixin,
- Environment,
- ):
- pass
+ def get_repo_shortname(self):
+ return self.__repo
+
+ def get_fromaddr(self, change=None):
+ return self.__user
-class GerritEnvironmentMixin(Environment):
+class GerritEnvironmentHighPrecMixin(Environment):
def __init__(self, project=None, submitter=None, update_method=None, **kw):
- super(GerritEnvironmentMixin, self).__init__(**kw)
+ super(GerritEnvironmentHighPrecMixin,
+ self).__init__(submitter=submitter, project=project, **kw)
self.__project = project
self.__submitter = submitter
self.__update_method = update_method
"Make an 'update_method' value available for templates."
self.COMPUTED_KEYS += ['update_method']
- def get_repo_shortname(self):
- return self.__project
-
def get_pusher(self):
if self.__submitter:
if self.__submitter.find('<') != -1:
@@ -3192,16 +3279,10 @@ class GerritEnvironmentMixin(Environment):
if self.__submitter:
return self.__submitter
else:
- return super(GerritEnvironmentMixin, self).get_pusher_email()
-
- def get_fromaddr(self, change=None):
- if self.__submitter and self.__submitter.find('<') != -1:
- return self.__submitter
- else:
- return super(GerritEnvironmentMixin, self).get_fromaddr(change)
+ return super(GerritEnvironmentHighPrecMixin, self).get_pusher_email()
def get_default_ref_ignore_regex(self):
- default = super(GerritEnvironmentMixin, self).get_default_ref_ignore_regex()
+ default = super(GerritEnvironmentHighPrecMixin, self).get_default_ref_ignore_regex()
return default + '|^refs/changes/|^refs/cache-automerge/|^refs/meta/'
def get_revision_recipients(self, revision):
@@ -3214,25 +3295,26 @@ class GerritEnvironmentMixin(Environment):
if committer == 'Gerrit Code Review':
return []
else:
- return super(GerritEnvironmentMixin, self).get_revision_recipients(revision)
+ return super(GerritEnvironmentHighPrecMixin, self).get_revision_recipients(revision)
def get_update_method(self):
return self.__update_method
-class GerritEnvironment(
- GerritEnvironmentMixin,
- ProjectdescEnvironmentMixin,
- ConfigMaxlinesEnvironmentMixin,
- ComputeFQDNEnvironmentMixin,
- ConfigFilterLinesEnvironmentMixin,
- ConfigRecipientsEnvironmentMixin,
- ConfigRefFilterEnvironmentMixin,
- PusherDomainEnvironmentMixin,
- ConfigOptionsEnvironmentMixin,
- Environment,
- ):
- pass
+class GerritEnvironmentLowPrecMixin(Environment):
+ def __init__(self, project=None, submitter=None, **kw):
+ super(GerritEnvironmentLowPrecMixin, self).__init__(**kw)
+ self.__project = project
+ self.__submitter = submitter
+
+ def get_repo_shortname(self):
+ return self.__project
+
+ def get_fromaddr(self, change=None):
+ if self.__submitter and self.__submitter.find('<') != -1:
+ return self.__submitter
+ else:
+ return super(GerritEnvironmentLowPrecMixin, self).get_fromaddr(change)
class Push(object):
@@ -3498,13 +3580,13 @@ class Push(object):
if not change.recipients:
change.environment.log_warning(
'*** no recipients configured so no email will be sent\n'
- '*** for %r update %s->%s\n'
+ '*** for %r update %s->%s'
% (change.refname, change.old.sha1, change.new.sha1,)
)
else:
if not change.environment.quiet:
change.environment.log_msg(
- 'Sending notification emails to: %s\n' % (change.recipients,))
+ 'Sending notification emails to: %s' % (change.recipients,))
extra_values = {'send_date': next(send_date)}
rev = change.send_single_combined_email(sha1s)
@@ -3527,14 +3609,14 @@ class Push(object):
change.environment.log_warning(
'*** Too many new commits (%d), not sending commit emails.\n' % len(sha1s) +
'*** Try setting multimailhook.maxCommitEmails to a greater value\n' +
- '*** Currently, multimailhook.maxCommitEmails=%d\n' % max_emails
+ '*** Currently, multimailhook.maxCommitEmails=%d' % max_emails
)
return
for (num, sha1) in enumerate(sha1s):
rev = Revision(change, GitObject(sha1), num=num + 1, tot=len(sha1s))
if not rev.recipients and rev.cc_recipients:
- change.environment.log_msg('*** Replacing Cc: with To:\n')
+ change.environment.log_msg('*** Replacing Cc: with To:')
rev.recipients = rev.cc_recipients
rev.cc_recipients = None
if rev.recipients:
@@ -3548,7 +3630,7 @@ class Push(object):
if unhandled_sha1s:
change.environment.log_error(
'ERROR: No emails were sent for the following new commits:\n'
- ' %s\n'
+ ' %s'
% ('\n '.join(sorted(unhandled_sha1s)),)
)
@@ -3562,12 +3644,23 @@ def include_ref(refname, ref_filter_regex, is_inclusion_filter):
def run_as_post_receive_hook(environment, mailer):
- ref_filter_regex, is_inclusion_filter = environment.get_ref_filter_regex(True)
+ environment.check()
+ send_filter_regex, send_is_inclusion_filter = environment.get_ref_filter_regex(True)
+ ref_filter_regex, is_inclusion_filter = environment.get_ref_filter_regex(False)
changes = []
- for line in sys.stdin:
+ while True:
+ line = read_line(sys.stdin)
+ if line == '':
+ break
(oldrev, newrev, refname) = line.strip().split(' ', 2)
+ environment.get_logger().debug(
+ "run_as_post_receive_hook: oldrev=%s, newrev=%s, refname=%s" %
+ (oldrev, newrev, refname))
+
if not include_ref(refname, ref_filter_regex, is_inclusion_filter):
continue
+ if not include_ref(refname, send_filter_regex, send_is_inclusion_filter):
+ continue
changes.append(
ReferenceChange.create(environment, oldrev, newrev, refname)
)
@@ -3579,9 +3672,13 @@ def run_as_post_receive_hook(environment, mailer):
def run_as_update_hook(environment, mailer, refname, oldrev, newrev, force_send=False):
- ref_filter_regex, is_inclusion_filter = environment.get_ref_filter_regex(True)
+ environment.check()
+ send_filter_regex, send_is_inclusion_filter = environment.get_ref_filter_regex(True)
+ ref_filter_regex, is_inclusion_filter = environment.get_ref_filter_regex(False)
if not include_ref(refname, ref_filter_regex, is_inclusion_filter):
return
+ if not include_ref(refname, send_filter_regex, send_is_inclusion_filter):
+ return
changes = [
ReferenceChange.create(
environment,
@@ -3596,6 +3693,75 @@ def run_as_update_hook(environment, mailer, refname, oldrev, newrev, force_send=
mailer.__del__()
+def check_ref_filter(environment):
+ send_filter_regex, send_is_inclusion = environment.get_ref_filter_regex(True)
+ ref_filter_regex, ref_is_inclusion = environment.get_ref_filter_regex(False)
+
+ def inc_exc_lusion(b):
+ if b:
+ return 'inclusion'
+ else:
+ return 'exclusion'
+
+ if send_filter_regex:
+ sys.stdout.write("DoSend/DontSend filter regex (" +
+ (inc_exc_lusion(send_is_inclusion)) +
+ '): ' + send_filter_regex.pattern +
+ '\n')
+ if send_filter_regex:
+ sys.stdout.write("Include/Exclude filter regex (" +
+ (inc_exc_lusion(ref_is_inclusion)) +
+ '): ' + ref_filter_regex.pattern +
+ '\n')
+ sys.stdout.write(os.linesep)
+
+ sys.stdout.write(
+ "Refs marked as EXCLUDE are excluded by either refFilterInclusionRegex\n"
+ "or refFilterExclusionRegex. No emails will be sent for commits included\n"
+ "in these refs.\n"
+ "Refs marked as DONT-SEND are excluded by either refFilterDoSendRegex or\n"
+ "refFilterDontSendRegex, but not by either refFilterInclusionRegex or\n"
+ "refFilterExclusionRegex. Emails will be sent for commits included in these\n"
+ "refs only when the commit reaches a ref which isn't excluded.\n"
+ "Refs marked as DO-SEND are not excluded by any filter. Emails will\n"
+ "be sent normally for commits included in these refs.\n")
+
+ sys.stdout.write(os.linesep)
+
+ for refname in read_git_lines(['for-each-ref', '--format', '%(refname)']):
+ sys.stdout.write(refname)
+ if not include_ref(refname, ref_filter_regex, ref_is_inclusion):
+ sys.stdout.write(' EXCLUDE')
+ elif not include_ref(refname, send_filter_regex, send_is_inclusion):
+ sys.stdout.write(' DONT-SEND')
+ else:
+ sys.stdout.write(' DO-SEND')
+
+ sys.stdout.write(os.linesep)
+
+
+def show_env(environment, out):
+ out.write('Environment values:\n')
+ for (k, v) in sorted(environment.get_values().items()):
+ if k: # Don't show the {'' : ''} pair.
+ out.write(' %s : %r\n' % (k, v))
+ out.write('\n')
+ # Flush to avoid interleaving with further log output
+ out.flush()
+
+
+def check_setup(environment):
+ environment.check()
+ show_env(environment, sys.stdout)
+ sys.stdout.write("Now, checking that git-multimail's standard input "
+ "is properly set ..." + os.linesep)
+ sys.stdout.write("Please type some text and then press Return" + os.linesep)
+ stdin = sys.stdin.readline()
+ sys.stdout.write("You have just entered:" + os.linesep)
+ sys.stdout.write(stdin)
+ sys.stdout.write("git-multimail seems properly set up." + os.linesep)
+
+
def choose_mailer(config, environment):
mailer = config.get('mailer', default='sendmail')
@@ -3608,6 +3774,7 @@ def choose_mailer(config, environment):
smtppass = config.get('smtppass', default='')
smtpcacerts = config.get('smtpcacerts', default='')
mailer = SMTPMailer(
+ environment,
envelopesender=(environment.get_sender() or environment.get_fromaddr()),
smtpserver=smtpserver, smtpservertimeout=smtpservertimeout,
smtpserverdebuglevel=smtpserverdebuglevel,
@@ -3620,43 +3787,41 @@ def choose_mailer(config, environment):
command = config.get('sendmailcommand')
if command:
command = shlex.split(command)
- mailer = SendMailer(command=command, envelopesender=environment.get_sender())
+ mailer = SendMailer(environment,
+ command=command, envelopesender=environment.get_sender())
else:
environment.log_error(
'fatal: multimailhook.mailer is set to an incorrect value: "%s"\n' % mailer +
- 'please use one of "smtp" or "sendmail".\n'
+ 'please use one of "smtp" or "sendmail".'
)
sys.exit(1)
return mailer
KNOWN_ENVIRONMENTS = {
- 'generic': GenericEnvironmentMixin,
- 'gitolite': GitoliteEnvironmentMixin,
- 'stash': StashEnvironmentMixin,
- 'gerrit': GerritEnvironmentMixin,
+ 'generic': {'highprec': GenericEnvironmentMixin},
+ 'gitolite': {'highprec': GitoliteEnvironmentHighPrecMixin,
+ 'lowprec': GitoliteEnvironmentLowPrecMixin},
+ 'stash': {'highprec': StashEnvironmentHighPrecMixin,
+ 'lowprec': StashEnvironmentLowPrecMixin},
+ 'gerrit': {'highprec': GerritEnvironmentHighPrecMixin,
+ 'lowprec': GerritEnvironmentLowPrecMixin},
}
def choose_environment(config, osenv=None, env=None, recipients=None,
hook_info=None):
+ env_name = choose_environment_name(config, env, osenv)
+ environment_klass = build_environment_klass(env_name)
+ env = build_environment(environment_klass, env_name, config,
+ osenv, recipients, hook_info)
+ return env
+
+
+def choose_environment_name(config, env, osenv):
if not osenv:
osenv = os.environ
- environment_mixins = [
- ConfigRefFilterEnvironmentMixin,
- ProjectdescEnvironmentMixin,
- ConfigMaxlinesEnvironmentMixin,
- ComputeFQDNEnvironmentMixin,
- ConfigFilterLinesEnvironmentMixin,
- PusherDomainEnvironmentMixin,
- ConfigOptionsEnvironmentMixin,
- ]
- environment_kw = {
- 'osenv': osenv,
- 'config': config,
- }
-
if not env:
env = config.get('environment')
@@ -3665,8 +3830,58 @@ def choose_environment(config, osenv=None, env=None, recipients=None,
env = 'gitolite'
else:
env = 'generic'
+ return env
+
+
+COMMON_ENVIRONMENT_MIXINS = [
+ ConfigRecipientsEnvironmentMixin,
+ CLIRecipientsEnvironmentMixin,
+ ConfigRefFilterEnvironmentMixin,
+ ProjectdescEnvironmentMixin,
+ ConfigMaxlinesEnvironmentMixin,
+ ComputeFQDNEnvironmentMixin,
+ ConfigFilterLinesEnvironmentMixin,
+ PusherDomainEnvironmentMixin,
+ ConfigOptionsEnvironmentMixin,
+ ]
+
+
+def build_environment_klass(env_name):
+ if 'class' in KNOWN_ENVIRONMENTS[env_name]:
+ return KNOWN_ENVIRONMENTS[env_name]['class']
+
+ environment_mixins = []
+ known_env = KNOWN_ENVIRONMENTS[env_name]
+ if 'highprec' in known_env:
+ high_prec_mixin = known_env['highprec']
+ environment_mixins.append(high_prec_mixin)
+ environment_mixins = environment_mixins + COMMON_ENVIRONMENT_MIXINS
+ if 'lowprec' in known_env:
+ low_prec_mixin = known_env['lowprec']
+ environment_mixins.append(low_prec_mixin)
+ environment_mixins.append(Environment)
+ klass_name = env_name.capitalize() + 'Environement'
+ environment_klass = type(
+ klass_name,
+ tuple(environment_mixins),
+ {},
+ )
+ KNOWN_ENVIRONMENTS[env_name]['class'] = environment_klass
+ return environment_klass
+
- environment_mixins.insert(0, KNOWN_ENVIRONMENTS[env])
+GerritEnvironment = build_environment_klass('gerrit')
+StashEnvironment = build_environment_klass('stash')
+GitoliteEnvironment = build_environment_klass('gitolite')
+GenericEnvironment = build_environment_klass('generic')
+
+
+def build_environment(environment_klass, env, config,
+ osenv, recipients, hook_info):
+ environment_kw = {
+ 'osenv': osenv,
+ 'config': config,
+ }
if env == 'stash':
environment_kw['user'] = hook_info['stash_user']
@@ -3676,20 +3891,8 @@ def choose_environment(config, osenv=None, env=None, recipients=None,
environment_kw['submitter'] = hook_info['submitter']
environment_kw['update_method'] = hook_info['update_method']
- if recipients:
- environment_mixins.insert(0, StaticRecipientsEnvironmentMixin)
- environment_kw['refchange_recipients'] = recipients
- environment_kw['announce_recipients'] = recipients
- environment_kw['revision_recipients'] = recipients
- environment_kw['scancommitforcc'] = config.get('scancommitforcc')
- else:
- environment_mixins.insert(0, ConfigRecipientsEnvironmentMixin)
+ environment_kw['cli_recipients'] = recipients
- environment_klass = type(
- 'EffectiveEnvironment',
- tuple(environment_mixins) + (Environment,),
- {},
- )
return environment_klass(**environment_kw)
@@ -3710,7 +3913,8 @@ def get_version():
return __version__
-def compute_gerrit_options(options, args, required_gerrit_options):
+def compute_gerrit_options(options, args, required_gerrit_options,
+ raw_refname):
if None in required_gerrit_options:
raise SystemExit("Error: Specify all of --oldrev, --newrev, --refname, "
"and --project; or none of them.")
@@ -3727,24 +3931,11 @@ def compute_gerrit_options(options, args, required_gerrit_options):
# Gerrit oddly omits 'refs/heads/' in the refname when calling
# ref-updated hook; put it back.
git_dir = get_git_dir()
- if (not os.path.exists(os.path.join(git_dir, options.refname)) and
+ if (not os.path.exists(os.path.join(git_dir, raw_refname)) and
os.path.exists(os.path.join(git_dir, 'refs', 'heads',
- options.refname))):
+ raw_refname))):
options.refname = 'refs/heads/' + options.refname
- # Convert each string option unicode for Python3.
- if PYTHON3:
- opts = ['environment', 'recipients', 'oldrev', 'newrev', 'refname',
- 'project', 'submitter', 'stash-user', 'stash-repo']
- for opt in opts:
- if not hasattr(options, opt):
- continue
- obj = getattr(options, opt)
- if obj:
- enc = obj.encode('utf-8', 'surrogateescape')
- dec = enc.decode('utf-8', 'replace')
- setattr(options, opt, dec)
-
# New revisions can appear in a gerrit repository either due to someone
# pushing directly (in which case options.submitter will be set), or they
# can press "Submit this patchset" in the web UI for some CR (in which
@@ -3784,6 +3975,20 @@ def compute_gerrit_options(options, args, required_gerrit_options):
def check_hook_specific_args(options, args):
+ raw_refname = options.refname
+ # Convert each string option unicode for Python3.
+ if PYTHON3:
+ opts = ['environment', 'recipients', 'oldrev', 'newrev', 'refname',
+ 'project', 'submitter', 'stash_user', 'stash_repo']
+ for opt in opts:
+ if not hasattr(options, opt):
+ continue
+ obj = getattr(options, opt)
+ if obj:
+ enc = obj.encode('utf-8', 'surrogateescape')
+ dec = enc.decode('utf-8', 'replace')
+ setattr(options, opt, dec)
+
# First check for stash arguments
if (options.stash_user is None) != (options.stash_repo is None):
raise SystemExit("Error: Specify both of --stash-user and "
@@ -3797,12 +4002,78 @@ def check_hook_specific_args(options, args):
required_gerrit_options = (options.oldrev, options.newrev, options.refname,
options.project)
if required_gerrit_options != (None,) * 4:
- return compute_gerrit_options(options, args, required_gerrit_options)
+ return compute_gerrit_options(options, args, required_gerrit_options,
+ raw_refname)
# No special options in use, just return what we started with
return options, args, {}
+class Logger(object):
+ def parse_verbose(self, verbose):
+ if verbose > 0:
+ return logging.DEBUG
+ else:
+ return logging.INFO
+
+ def create_log_file(self, environment, name, path, verbosity):
+ log_file = logging.getLogger(name)
+ file_handler = logging.FileHandler(path)
+ log_fmt = logging.Formatter("%(asctime)s [%(levelname)-5.5s] %(message)s")
+ file_handler.setFormatter(log_fmt)
+ log_file.addHandler(file_handler)
+ log_file.setLevel(verbosity)
+ return log_file
+
+ def __init__(self, environment):
+ self.environment = environment
+ self.loggers = []
+ stderr_log = logging.getLogger('git_multimail.stderr')
+
+ class EncodedStderr(object):
+ def write(self, x):
+ write_str(sys.stderr, x)
+
+ def flush(self):
+ sys.stderr.flush()
+
+ stderr_handler = logging.StreamHandler(EncodedStderr())
+ stderr_log.addHandler(stderr_handler)
+ stderr_log.setLevel(self.parse_verbose(environment.verbose))
+ self.loggers.append(stderr_log)
+
+ if environment.debug_log_file is not None:
+ debug_log_file = self.create_log_file(
+ environment, 'git_multimail.debug', environment.debug_log_file, logging.DEBUG)
+ self.loggers.append(debug_log_file)
+
+ if environment.log_file is not None:
+ log_file = self.create_log_file(
+ environment, 'git_multimail.file', environment.log_file, logging.INFO)
+ self.loggers.append(log_file)
+
+ if environment.error_log_file is not None:
+ error_log_file = self.create_log_file(
+ environment, 'git_multimail.error', environment.error_log_file, logging.ERROR)
+ self.loggers.append(error_log_file)
+
+ def info(self, msg):
+ for l in self.loggers:
+ l.info(msg)
+
+ def debug(self, msg):
+ for l in self.loggers:
+ l.debug(msg)
+
+ def warning(self, msg):
+ for l in self.loggers:
+ l.warning(msg)
+
+ def error(self, msg):
+ for l in self.loggers:
+ l.error(msg)
+
+
def main(args):
parser = optparse.OptionParser(
description=__doc__,
@@ -3829,7 +4100,7 @@ def main(args):
'--show-env', action='store_true', default=False,
help=(
'Write to stderr the values determined for the environment '
- '(intended for debugging purposes).'
+ '(intended for debugging purposes), then proceed normally.'
),
)
parser.add_option(
@@ -3854,6 +4125,22 @@ def main(args):
"Display git-multimail's version"
),
)
+
+ parser.add_option(
+ '--python-version', action='store_true', default=False,
+ help=(
+ "Display the version of Python used by git-multimail"
+ ),
+ )
+
+ parser.add_option(
+ '--check-ref-filter', action='store_true', default=False,
+ help=(
+ 'List refs and show information on how git-multimail '
+ 'will process them.'
+ )
+ )
+
# The following options permit this script to be run as a gerrit
# ref-updated hook. See e.g.
# code.google.com/p/gerrit/source/browse/Documentation/config-hooks.txt
@@ -3880,11 +4167,16 @@ def main(args):
sys.stdout.write('git-multimail version ' + get_version() + '\n')
return
+ if options.python_version:
+ sys.stdout.write('Python version ' + sys.version + '\n')
+ return
+
if options.c:
Config.add_config_parameters(options.c)
config = Config('multimailhook')
+ environment = None
try:
environment = choose_environment(
config, osenv=os.environ,
@@ -3894,38 +4186,52 @@ def main(args):
)
if options.show_env:
- sys.stderr.write('Environment values:\n')
- for (k, v) in sorted(environment.get_values().items()):
- sys.stderr.write(' %s : %r\n' % (k, v))
- sys.stderr.write('\n')
+ show_env(environment, sys.stderr)
if options.stdout or environment.stdout:
mailer = OutputMailer(sys.stdout)
else:
mailer = choose_mailer(config, environment)
+ must_check_setup = os.environ.get('GIT_MULTIMAIL_CHECK_SETUP')
+ if must_check_setup == '':
+ must_check_setup = False
+ if options.check_ref_filter:
+ check_ref_filter(environment)
+ elif must_check_setup:
+ check_setup(environment)
# Dual mode: if arguments were specified on the command line, run
# like an update hook; otherwise, run as a post-receive hook.
- if args:
+ elif args:
if len(args) != 3:
parser.error('Need zero or three non-option arguments')
(refname, oldrev, newrev) = args
+ environment.get_logger().debug(
+ "run_as_update_hook: refname=%s, oldrev=%s, newrev=%s, force_send=%s" %
+ (refname, oldrev, newrev, options.force_send))
run_as_update_hook(environment, mailer, refname, oldrev, newrev, options.force_send)
else:
run_as_post_receive_hook(environment, mailer)
except ConfigurationException:
sys.exit(sys.exc_info()[1])
+ except SystemExit:
+ raise
except Exception:
t, e, tb = sys.exc_info()
import traceback
- sys.stdout.write('\n')
- sys.stdout.write('Exception \'' + t.__name__ +
- '\' raised. Please report this as a bug to\n')
- sys.stdout.write('https://github.com/git-multimail/git-multimail/issues\n')
- sys.stdout.write('with the information below:\n\n')
- sys.stdout.write('git-multimail version ' + get_version() + '\n')
- sys.stdout.write('Python version ' + sys.version + '\n')
- traceback.print_exc(file=sys.stdout)
+ sys.stderr.write('\n') # Avoid mixing message with previous output
+ msg = (
+ 'Exception \'' + t.__name__ +
+ '\' raised. Please report this as a bug to\n'
+ 'https://github.com/git-multimail/git-multimail/issues\n'
+ 'with the information below:\n\n'
+ 'git-multimail version ' + get_version() + '\n'
+ 'Python version ' + sys.version + '\n' +
+ traceback.format_exc())
+ try:
+ environment.get_logger().error(msg)
+ except:
+ sys.stderr.write(msg)
sys.exit(1)
if __name__ == '__main__':
diff --git a/contrib/mw-to-git/.perlcriticrc b/contrib/mw-to-git/.perlcriticrc
index 5a9955d..158958d 100644
--- a/contrib/mw-to-git/.perlcriticrc
+++ b/contrib/mw-to-git/.perlcriticrc
@@ -19,7 +19,7 @@
[InputOutput::RequireCheckedSyscalls]
functions = open say close
-# This rules demands to add a dependancy for the Readonly module. This is not
+# This rule demands to add a dependency for the Readonly module. This is not
# wished.
[-ValuesAndExpressions::ProhibitConstantPragma]
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
index 8dd74a9..41e74fb 100755
--- a/contrib/mw-to-git/git-remote-mediawiki.perl
+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
@@ -963,7 +963,7 @@ sub mw_upload_file {
print {*STDERR} "Check the configuration of file uploads in your mediawiki.\n";
return $newrevid;
}
- # Deleting and uploading a file requires a priviledged user
+ # Deleting and uploading a file requires a privileged user
if ($file_deleted) {
$mediawiki = connect_maybe($mediawiki, $remotename, $url);
my $query = {
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index b567eae..dec085a 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -4,8 +4,9 @@
#
# Copyright (C) 2009 Avery Pennarun <apenwarr@gmail.com>
#
-if [ $# -eq 0 ]; then
- set -- -h
+if test $# -eq 0
+then
+ set -- -h
fi
OPTS_SPEC="\
git subtree add --prefix=<prefix> <commit>
@@ -48,89 +49,144 @@ squash=
message=
prefix=
-debug()
-{
- if [ -n "$debug" ]; then
+debug () {
+ if test -n "$debug"
+ then
printf "%s\n" "$*" >&2
fi
}
-say()
-{
- if [ -z "$quiet" ]; then
+say () {
+ if test -z "$quiet"
+ then
printf "%s\n" "$*" >&2
fi
}
-progress()
-{
- if [ -z "$quiet" ]; then
+progress () {
+ if test -z "$quiet"
+ then
printf "%s\r" "$*" >&2
fi
}
-assert()
-{
- if "$@"; then
- :
- else
+assert () {
+ if ! "$@"
+ then
die "assertion failed: " "$@"
fi
}
-#echo "Options: $*"
-
-while [ $# -gt 0 ]; do
+while test $# -gt 0
+do
opt="$1"
shift
+
case "$opt" in
- -q) quiet=1 ;;
- -d) debug=1 ;;
- --annotate) annotate="$1"; shift ;;
- --no-annotate) annotate= ;;
- -b) branch="$1"; shift ;;
- -P) prefix="${1%/}"; shift ;;
- -m) message="$1"; shift ;;
- --no-prefix) prefix= ;;
- --onto) onto="$1"; shift ;;
- --no-onto) onto= ;;
- --rejoin) rejoin=1 ;;
- --no-rejoin) rejoin= ;;
- --ignore-joins) ignore_joins=1 ;;
- --no-ignore-joins) ignore_joins= ;;
- --squash) squash=1 ;;
- --no-squash) squash= ;;
- --) break ;;
- *) die "Unexpected option: $opt" ;;
+ -q)
+ quiet=1
+ ;;
+ -d)
+ debug=1
+ ;;
+ --annotate)
+ annotate="$1"
+ shift
+ ;;
+ --no-annotate)
+ annotate=
+ ;;
+ -b)
+ branch="$1"
+ shift
+ ;;
+ -P)
+ prefix="${1%/}"
+ shift
+ ;;
+ -m)
+ message="$1"
+ shift
+ ;;
+ --no-prefix)
+ prefix=
+ ;;
+ --onto)
+ onto="$1"
+ shift
+ ;;
+ --no-onto)
+ onto=
+ ;;
+ --rejoin)
+ rejoin=1
+ ;;
+ --no-rejoin)
+ rejoin=
+ ;;
+ --ignore-joins)
+ ignore_joins=1
+ ;;
+ --no-ignore-joins)
+ ignore_joins=
+ ;;
+ --squash)
+ squash=1
+ ;;
+ --no-squash)
+ squash=
+ ;;
+ --)
+ break
+ ;;
+ *)
+ die "Unexpected option: $opt"
+ ;;
esac
done
command="$1"
shift
+
case "$command" in
- add|merge|pull) default= ;;
- split|push) default="--default HEAD" ;;
- *) die "Unknown command '$command'" ;;
+add|merge|pull)
+ default=
+ ;;
+split|push)
+ default="--default HEAD"
+ ;;
+*)
+ die "Unknown command '$command'"
+ ;;
esac
-if [ -z "$prefix" ]; then
+if test -z "$prefix"
+then
die "You must provide the --prefix option."
fi
case "$command" in
- add) [ -e "$prefix" ] &&
- die "prefix '$prefix' already exists." ;;
- *) [ -e "$prefix" ] ||
- die "'$prefix' does not exist; use 'git subtree add'" ;;
+add)
+ test -e "$prefix" &&
+ die "prefix '$prefix' already exists."
+ ;;
+*)
+ test -e "$prefix" ||
+ die "'$prefix' does not exist; use 'git subtree add'"
+ ;;
esac
dir="$(dirname "$prefix/.")"
-if [ "$command" != "pull" -a "$command" != "add" -a "$command" != "push" ]; then
+if test "$command" != "pull" &&
+ test "$command" != "add" &&
+ test "$command" != "push"
+then
revs=$(git rev-parse $default --revs-only "$@") || exit $?
- dirs="$(git rev-parse --no-revs --no-flags "$@")" || exit $?
- if [ -n "$dirs" ]; then
+ dirs=$(git rev-parse --no-revs --no-flags "$@") || exit $?
+ if test -n "$dirs"
+ then
die "Error: Use --prefix instead of bare filenames."
fi
fi
@@ -142,78 +198,82 @@ debug "dir: {$dir}"
debug "opts: {$*}"
debug
-cache_setup()
-{
+cache_setup () {
cachedir="$GIT_DIR/subtree-cache/$$"
- rm -rf "$cachedir" || die "Can't delete old cachedir: $cachedir"
- mkdir -p "$cachedir" || die "Can't create new cachedir: $cachedir"
- mkdir -p "$cachedir/notree" || die "Can't create new cachedir: $cachedir/notree"
+ rm -rf "$cachedir" ||
+ die "Can't delete old cachedir: $cachedir"
+ mkdir -p "$cachedir" ||
+ die "Can't create new cachedir: $cachedir"
+ mkdir -p "$cachedir/notree" ||
+ die "Can't create new cachedir: $cachedir/notree"
debug "Using cachedir: $cachedir" >&2
}
-cache_get()
-{
- for oldrev in $*; do
- if [ -r "$cachedir/$oldrev" ]; then
+cache_get () {
+ for oldrev in "$@"
+ do
+ if test -r "$cachedir/$oldrev"
+ then
read newrev <"$cachedir/$oldrev"
echo $newrev
fi
done
}
-cache_miss()
-{
- for oldrev in $*; do
- if [ ! -r "$cachedir/$oldrev" ]; then
+cache_miss () {
+ for oldrev in "$@"
+ do
+ if ! test -r "$cachedir/$oldrev"
+ then
echo $oldrev
fi
done
}
-check_parents()
-{
- missed=$(cache_miss $*)
- for miss in $missed; do
- if [ ! -r "$cachedir/notree/$miss" ]; then
+check_parents () {
+ missed=$(cache_miss "$@")
+ for miss in $missed
+ do
+ if ! test -r "$cachedir/notree/$miss"
+ then
debug " incorrect order: $miss"
fi
done
}
-set_notree()
-{
+set_notree () {
echo "1" > "$cachedir/notree/$1"
}
-cache_set()
-{
+cache_set () {
oldrev="$1"
newrev="$2"
- if [ "$oldrev" != "latest_old" \
- -a "$oldrev" != "latest_new" \
- -a -e "$cachedir/$oldrev" ]; then
+ if test "$oldrev" != "latest_old" &&
+ test "$oldrev" != "latest_new" &&
+ test -e "$cachedir/$oldrev"
+ then
die "cache for $oldrev already exists!"
fi
echo "$newrev" >"$cachedir/$oldrev"
}
-rev_exists()
-{
- if git rev-parse "$1" >/dev/null 2>&1; then
+rev_exists () {
+ if git rev-parse "$1" >/dev/null 2>&1
+ then
return 0
else
return 1
fi
}
-rev_is_descendant_of_branch()
-{
+rev_is_descendant_of_branch () {
newrev="$1"
branch="$2"
- branch_hash=$(git rev-parse $branch)
- match=$(git rev-list -1 $branch_hash ^$newrev)
+ branch_hash=$(git rev-parse "$branch")
+ match=$(git rev-list -1 "$branch_hash" "^$newrev")
- if [ -z "$match" ]; then
+ if test -z "$match"
+ then
return 0
else
return 1
@@ -223,15 +283,14 @@ rev_is_descendant_of_branch()
# if a commit doesn't have a parent, this might not work. But we only want
# to remove the parent from the rev-list, and since it doesn't exist, it won't
# be there anyway, so do nothing in that case.
-try_remove_previous()
-{
- if rev_exists "$1^"; then
+try_remove_previous () {
+ if rev_exists "$1^"
+ then
echo "^$1^"
fi
}
-find_latest_squash()
-{
+find_latest_squash () {
debug "Looking for latest squash ($dir)..."
dir="$1"
sq=
@@ -239,37 +298,43 @@ find_latest_squash()
sub=
git log --grep="^git-subtree-dir: $dir/*\$" \
--pretty=format:'START %H%n%s%n%n%b%nEND%n' HEAD |
- while read a b junk; do
+ while read a b junk
+ do
debug "$a $b $junk"
debug "{{$sq/$main/$sub}}"
case "$a" in
- START) sq="$b" ;;
- git-subtree-mainline:) main="$b" ;;
- git-subtree-split:)
- sub="$(git rev-parse "$b^0")" ||
- die "could not rev-parse split hash $b from commit $sq"
- ;;
- END)
- if [ -n "$sub" ]; then
- if [ -n "$main" ]; then
- # a rejoin commit?
- # Pretend its sub was a squash.
- sq="$sub"
- fi
- debug "Squash found: $sq $sub"
- echo "$sq" "$sub"
- break
+ START)
+ sq="$b"
+ ;;
+ git-subtree-mainline:)
+ main="$b"
+ ;;
+ git-subtree-split:)
+ sub="$(git rev-parse "$b^0")" ||
+ die "could not rev-parse split hash $b from commit $sq"
+ ;;
+ END)
+ if test -n "$sub"
+ then
+ if test -n "$main"
+ then
+ # a rejoin commit?
+ # Pretend its sub was a squash.
+ sq="$sub"
fi
- sq=
- main=
- sub=
- ;;
+ debug "Squash found: $sq $sub"
+ echo "$sq" "$sub"
+ break
+ fi
+ sq=
+ main=
+ sub=
+ ;;
esac
done
}
-find_existing_splits()
-{
+find_existing_splits () {
debug "Looking for prior splits..."
dir="$1"
revs="$2"
@@ -277,37 +342,43 @@ find_existing_splits()
sub=
git log --grep="^git-subtree-dir: $dir/*\$" \
--pretty=format:'START %H%n%s%n%n%b%nEND%n' $revs |
- while read a b junk; do
+ while read a b junk
+ do
case "$a" in
- START) sq="$b" ;;
- git-subtree-mainline:) main="$b" ;;
- git-subtree-split:)
- sub="$(git rev-parse "$b^0")" ||
- die "could not rev-parse split hash $b from commit $sq"
- ;;
- END)
- debug " Main is: '$main'"
- if [ -z "$main" -a -n "$sub" ]; then
- # squash commits refer to a subtree
- debug " Squash: $sq from $sub"
- cache_set "$sq" "$sub"
- fi
- if [ -n "$main" -a -n "$sub" ]; then
- debug " Prior: $main -> $sub"
- cache_set $main $sub
- cache_set $sub $sub
- try_remove_previous "$main"
- try_remove_previous "$sub"
- fi
- main=
- sub=
- ;;
+ START)
+ sq="$b"
+ ;;
+ git-subtree-mainline:)
+ main="$b"
+ ;;
+ git-subtree-split:)
+ sub="$(git rev-parse "$b^0")" ||
+ die "could not rev-parse split hash $b from commit $sq"
+ ;;
+ END)
+ debug " Main is: '$main'"
+ if test -z "$main" -a -n "$sub"
+ then
+ # squash commits refer to a subtree
+ debug " Squash: $sq from $sub"
+ cache_set "$sq" "$sub"
+ fi
+ if test -n "$main" -a -n "$sub"
+ then
+ debug " Prior: $main -> $sub"
+ cache_set $main $sub
+ cache_set $sub $sub
+ try_remove_previous "$main"
+ try_remove_previous "$sub"
+ fi
+ main=
+ sub=
+ ;;
esac
done
}
-copy_commit()
-{
+copy_commit () {
# We're going to set some environment vars here, so
# do it in a subshell to get rid of them safely later
debug copy_commit "{$1}" "{$2}" "{$3}"
@@ -325,66 +396,69 @@ copy_commit()
GIT_COMMITTER_NAME \
GIT_COMMITTER_EMAIL \
GIT_COMMITTER_DATE
- (printf "%s" "$annotate"; cat ) |
+ (
+ printf "%s" "$annotate"
+ cat
+ ) |
git commit-tree "$2" $3 # reads the rest of stdin
) || die "Can't copy commit $1"
}
-add_msg()
-{
+add_msg () {
dir="$1"
latest_old="$2"
latest_new="$3"
- if [ -n "$message" ]; then
+ if test -n "$message"
+ then
commit_message="$message"
else
commit_message="Add '$dir/' from commit '$latest_new'"
fi
cat <<-EOF
$commit_message
-
+
git-subtree-dir: $dir
git-subtree-mainline: $latest_old
git-subtree-split: $latest_new
EOF
}
-add_squashed_msg()
-{
- if [ -n "$message" ]; then
+add_squashed_msg () {
+ if test -n "$message"
+ then
echo "$message"
else
echo "Merge commit '$1' as '$2'"
fi
}
-rejoin_msg()
-{
+rejoin_msg () {
dir="$1"
latest_old="$2"
latest_new="$3"
- if [ -n "$message" ]; then
+ if test -n "$message"
+ then
commit_message="$message"
else
commit_message="Split '$dir/' into commit '$latest_new'"
fi
cat <<-EOF
$commit_message
-
+
git-subtree-dir: $dir
git-subtree-mainline: $latest_old
git-subtree-split: $latest_new
EOF
}
-squash_msg()
-{
+squash_msg () {
dir="$1"
oldsub="$2"
newsub="$3"
newsub_short=$(git rev-parse --short "$newsub")
-
- if [ -n "$oldsub" ]; then
+
+ if test -n "$oldsub"
+ then
oldsub_short=$(git rev-parse --short "$oldsub")
echo "Squashed '$dir/' changes from $oldsub_short..$newsub_short"
echo
@@ -393,41 +467,41 @@ squash_msg()
else
echo "Squashed '$dir/' content from commit $newsub_short"
fi
-
+
echo
echo "git-subtree-dir: $dir"
echo "git-subtree-split: $newsub"
}
-toptree_for_commit()
-{
+toptree_for_commit () {
commit="$1"
git log -1 --pretty=format:'%T' "$commit" -- || exit $?
}
-subtree_for_commit()
-{
+subtree_for_commit () {
commit="$1"
dir="$2"
git ls-tree "$commit" -- "$dir" |
- while read mode type tree name; do
- assert [ "$name" = "$dir" ]
- assert [ "$type" = "tree" -o "$type" = "commit" ]
- [ "$type" = "commit" ] && continue # ignore submodules
+ while read mode type tree name
+ do
+ assert test "$name" = "$dir"
+ assert test "$type" = "tree" -o "$type" = "commit"
+ test "$type" = "commit" && continue # ignore submodules
echo $tree
break
done
}
-tree_changed()
-{
+tree_changed () {
tree=$1
shift
- if [ $# -ne 1 ]; then
+ if test $# -ne 1
+ then
return 0 # weird parents, consider it changed
else
ptree=$(toptree_for_commit $1)
- if [ "$ptree" != "$tree" ]; then
+ if test "$ptree" != "$tree"
+ then
return 0 # changed
else
return 1 # not changed
@@ -435,118 +509,127 @@ tree_changed()
fi
}
-new_squash_commit()
-{
+new_squash_commit () {
old="$1"
oldsub="$2"
newsub="$3"
tree=$(toptree_for_commit $newsub) || exit $?
- if [ -n "$old" ]; then
- squash_msg "$dir" "$oldsub" "$newsub" |
- git commit-tree "$tree" -p "$old" || exit $?
+ if test -n "$old"
+ then
+ squash_msg "$dir" "$oldsub" "$newsub" |
+ git commit-tree "$tree" -p "$old" || exit $?
else
squash_msg "$dir" "" "$newsub" |
- git commit-tree "$tree" || exit $?
+ git commit-tree "$tree" || exit $?
fi
}
-copy_or_skip()
-{
+copy_or_skip () {
rev="$1"
tree="$2"
newparents="$3"
- assert [ -n "$tree" ]
+ assert test -n "$tree"
identical=
nonidentical=
p=
gotparents=
- for parent in $newparents; do
+ for parent in $newparents
+ do
ptree=$(toptree_for_commit $parent) || exit $?
- [ -z "$ptree" ] && continue
- if [ "$ptree" = "$tree" ]; then
+ test -z "$ptree" && continue
+ if test "$ptree" = "$tree"
+ then
# an identical parent could be used in place of this rev.
identical="$parent"
else
nonidentical="$parent"
fi
-
+
# sometimes both old parents map to the same newparent;
# eliminate duplicates
is_new=1
- for gp in $gotparents; do
- if [ "$gp" = "$parent" ]; then
+ for gp in $gotparents
+ do
+ if test "$gp" = "$parent"
+ then
is_new=
break
fi
done
- if [ -n "$is_new" ]; then
+ if test -n "$is_new"
+ then
gotparents="$gotparents $parent"
p="$p -p $parent"
fi
done
copycommit=
- if [ -n "$identical" ] && [ -n "$nonidentical" ]; then
+ if test -n "$identical" && test -n "$nonidentical"
+ then
extras=$(git rev-list --count $identical..$nonidentical)
- if [ "$extras" -ne 0 ]; then
+ if test "$extras" -ne 0
+ then
# we need to preserve history along the other branch
copycommit=1
fi
fi
- if [ -n "$identical" ] && [ -z "$copycommit" ]; then
+ if test -n "$identical" && test -z "$copycommit"
+ then
echo $identical
else
- copy_commit $rev $tree "$p" || exit $?
+ copy_commit "$rev" "$tree" "$p" || exit $?
fi
}
-ensure_clean()
-{
- if ! git diff-index HEAD --exit-code --quiet 2>&1; then
+ensure_clean () {
+ if ! git diff-index HEAD --exit-code --quiet 2>&1
+ then
die "Working tree has modifications. Cannot add."
fi
- if ! git diff-index --cached HEAD --exit-code --quiet 2>&1; then
+ if ! git diff-index --cached HEAD --exit-code --quiet 2>&1
+ then
die "Index has modifications. Cannot add."
fi
}
-ensure_valid_ref_format()
-{
+ensure_valid_ref_format () {
git check-ref-format "refs/heads/$1" ||
- die "'$1' does not look like a ref"
+ die "'$1' does not look like a ref"
}
-cmd_add()
-{
- if [ -e "$dir" ]; then
+cmd_add () {
+ if test -e "$dir"
+ then
die "'$dir' already exists. Cannot add."
fi
ensure_clean
-
- if [ $# -eq 1 ]; then
- git rev-parse -q --verify "$1^{commit}" >/dev/null ||
- die "'$1' does not refer to a commit"
-
- "cmd_add_commit" "$@"
- elif [ $# -eq 2 ]; then
- # Technically we could accept a refspec here but we're
- # just going to turn around and add FETCH_HEAD under the
- # specified directory. Allowing a refspec might be
- # misleading because we won't do anything with any other
- # branches fetched via the refspec.
- ensure_valid_ref_format "$2"
-
- "cmd_add_repository" "$@"
+
+ if test $# -eq 1
+ then
+ git rev-parse -q --verify "$1^{commit}" >/dev/null ||
+ die "'$1' does not refer to a commit"
+
+ cmd_add_commit "$@"
+
+ elif test $# -eq 2
+ then
+ # Technically we could accept a refspec here but we're
+ # just going to turn around and add FETCH_HEAD under the
+ # specified directory. Allowing a refspec might be
+ # misleading because we won't do anything with any other
+ # branches fetched via the refspec.
+ ensure_valid_ref_format "$2"
+
+ cmd_add_repository "$@"
else
- say "error: parameters were '$@'"
- die "Provide either a commit or a repository and commit."
+ say "error: parameters were '$@'"
+ die "Provide either a commit or a repository and commit."
fi
}
-cmd_add_repository()
-{
+cmd_add_repository () {
echo "git fetch" "$@"
repository=$1
refspec=$2
@@ -556,60 +639,63 @@ cmd_add_repository()
cmd_add_commit "$@"
}
-cmd_add_commit()
-{
+cmd_add_commit () {
revs=$(git rev-parse $default --revs-only "$@") || exit $?
set -- $revs
rev="$1"
-
+
debug "Adding $dir as '$rev'..."
git read-tree --prefix="$dir" $rev || exit $?
git checkout -- "$dir" || exit $?
tree=$(git write-tree) || exit $?
-
+
headrev=$(git rev-parse HEAD) || exit $?
- if [ -n "$headrev" -a "$headrev" != "$rev" ]; then
+ if test -n "$headrev" && test "$headrev" != "$rev"
+ then
headp="-p $headrev"
else
headp=
fi
-
- if [ -n "$squash" ]; then
+
+ if test -n "$squash"
+ then
rev=$(new_squash_commit "" "" "$rev") || exit $?
commit=$(add_squashed_msg "$rev" "$dir" |
- git commit-tree $tree $headp -p "$rev") || exit $?
+ git commit-tree "$tree" $headp -p "$rev") || exit $?
else
revp=$(peel_committish "$rev") &&
- commit=$(add_msg "$dir" "$headrev" "$rev" |
- git commit-tree $tree $headp -p "$revp") || exit $?
+ commit=$(add_msg "$dir" $headrev "$rev" |
+ git commit-tree "$tree" $headp -p "$revp") || exit $?
fi
git reset "$commit" || exit $?
-
+
say "Added dir '$dir'"
}
-cmd_split()
-{
+cmd_split () {
debug "Splitting $dir..."
cache_setup || exit $?
-
- if [ -n "$onto" ]; then
+
+ if test -n "$onto"
+ then
debug "Reading history for --onto=$onto..."
git rev-list $onto |
- while read rev; do
+ while read rev
+ do
# the 'onto' history is already just the subdir, so
# any parent we find there can be used verbatim
debug " cache: $rev"
- cache_set $rev $rev
+ cache_set "$rev" "$rev"
done
fi
-
- if [ -n "$ignore_joins" ]; then
+
+ if test -n "$ignore_joins"
+ then
unrevs=
else
unrevs="$(find_existing_splits "$dir" "$revs")"
fi
-
+
# We can't restrict rev-list to only $dir here, because some of our
# parents have the $dir contents the root, and those won't match.
# (and rev-list --follow doesn't seem to solve this)
@@ -618,12 +704,14 @@ cmd_split()
revcount=0
createcount=0
eval "$grl" |
- while read rev parents; do
+ while read rev parents
+ do
revcount=$(($revcount + 1))
progress "$revcount/$revmax ($createcount)"
debug "Processing commit: $rev"
- exists=$(cache_get $rev)
- if [ -n "$exists" ]; then
+ exists=$(cache_get "$rev")
+ if test -n "$exists"
+ then
debug " prior: $exists"
continue
fi
@@ -631,77 +719,89 @@ cmd_split()
debug " parents: $parents"
newparents=$(cache_get $parents)
debug " newparents: $newparents"
-
- tree=$(subtree_for_commit $rev "$dir")
+
+ tree=$(subtree_for_commit "$rev" "$dir")
debug " tree is: $tree"
check_parents $parents
-
+
# ugly. is there no better way to tell if this is a subtree
# vs. a mainline commit? Does it matter?
- if [ -z $tree ]; then
- set_notree $rev
- if [ -n "$newparents" ]; then
- cache_set $rev $rev
+ if test -z "$tree"
+ then
+ set_notree "$rev"
+ if test -n "$newparents"
+ then
+ cache_set "$rev" "$rev"
fi
continue
fi
newrev=$(copy_or_skip "$rev" "$tree" "$newparents") || exit $?
debug " newrev is: $newrev"
- cache_set $rev $newrev
- cache_set latest_new $newrev
- cache_set latest_old $rev
+ cache_set "$rev" "$newrev"
+ cache_set latest_new "$newrev"
+ cache_set latest_old "$rev"
done || exit $?
+
latest_new=$(cache_get latest_new)
- if [ -z "$latest_new" ]; then
+ if test -z "$latest_new"
+ then
die "No new revisions were found"
fi
-
- if [ -n "$rejoin" ]; then
+
+ if test -n "$rejoin"
+ then
debug "Merging split branch into HEAD..."
latest_old=$(cache_get latest_old)
git merge -s ours \
--allow-unrelated-histories \
- -m "$(rejoin_msg "$dir" $latest_old $latest_new)" \
- $latest_new >&2 || exit $?
- fi
- if [ -n "$branch" ]; then
- if rev_exists "refs/heads/$branch"; then
- if ! rev_is_descendant_of_branch $latest_new $branch; then
+ -m "$(rejoin_msg "$dir" "$latest_old" "$latest_new")" \
+ "$latest_new" >&2 || exit $?
+ fi
+ if test -n "$branch"
+ then
+ if rev_exists "refs/heads/$branch"
+ then
+ if ! rev_is_descendant_of_branch "$latest_new" "$branch"
+ then
die "Branch '$branch' is not an ancestor of commit '$latest_new'."
fi
action='Updated'
else
action='Created'
fi
- git update-ref -m 'subtree split' "refs/heads/$branch" $latest_new || exit $?
+ git update-ref -m 'subtree split' \
+ "refs/heads/$branch" "$latest_new" || exit $?
say "$action branch '$branch'"
fi
- echo $latest_new
+ echo "$latest_new"
exit 0
}
-cmd_merge()
-{
+cmd_merge () {
revs=$(git rev-parse $default --revs-only "$@") || exit $?
ensure_clean
-
+
set -- $revs
- if [ $# -ne 1 ]; then
+ if test $# -ne 1
+ then
die "You must provide exactly one revision. Got: '$revs'"
fi
rev="$1"
-
- if [ -n "$squash" ]; then
+
+ if test -n "$squash"
+ then
first_split="$(find_latest_squash "$dir")"
- if [ -z "$first_split" ]; then
+ if test -z "$first_split"
+ then
die "Can't squash-merge: '$dir' was never added."
fi
set $first_split
old=$1
sub=$2
- if [ "$sub" = "$rev" ]; then
+ if test "$sub" = "$rev"
+ then
say "Subtree is already at commit $rev."
exit 0
fi
@@ -711,25 +811,29 @@ cmd_merge()
fi
version=$(git version)
- if [ "$version" \< "git version 1.7" ]; then
- if [ -n "$message" ]; then
- git merge -s subtree --message="$message" $rev
+ if test "$version" \< "git version 1.7"
+ then
+ if test -n "$message"
+ then
+ git merge -s subtree --message="$message" "$rev"
else
- git merge -s subtree $rev
+ git merge -s subtree "$rev"
fi
else
- if [ -n "$message" ]; then
- git merge -Xsubtree="$prefix" --message="$message" $rev
+ if test -n "$message"
+ then
+ git merge -Xsubtree="$prefix" \
+ --message="$message" "$rev"
else
git merge -Xsubtree="$prefix" $rev
fi
fi
}
-cmd_pull()
-{
- if [ $# -ne 2 ]; then
- die "You must provide <repository> <ref>"
+cmd_pull () {
+ if test $# -ne 2
+ then
+ die "You must provide <repository> <ref>"
fi
ensure_clean
ensure_valid_ref_format "$2"
@@ -739,20 +843,21 @@ cmd_pull()
cmd_merge "$@"
}
-cmd_push()
-{
- if [ $# -ne 2 ]; then
- die "You must provide <repository> <ref>"
+cmd_push () {
+ if test $# -ne 2
+ then
+ die "You must provide <repository> <ref>"
fi
ensure_valid_ref_format "$2"
- if [ -e "$dir" ]; then
- repository=$1
- refspec=$2
- echo "git push using: " $repository $refspec
- localrev=$(git subtree split --prefix="$prefix") || die
- git push "$repository" $localrev:refs/heads/$refspec
+ if test -e "$dir"
+ then
+ repository=$1
+ refspec=$2
+ echo "git push using: " "$repository" "$refspec"
+ localrev=$(git subtree split --prefix="$prefix") || die
+ git push "$repository" "$localrev":"refs/heads/$refspec"
else
- die "'$dir' must already exist. Try 'git subtree add'."
+ die "'$dir' must already exist. Try 'git subtree add'."
fi
}
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 9751cfe..3c87eba 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -948,7 +948,7 @@ test_expect_success 'split a new subtree without --onto option' '
# also test that we still can split out an entirely new subtree
# if the parent of the first commit in the tree is not empty,
- # then the new subtree has accidently been attached to something
+ # then the new subtree has accidentally been attached to something
git subtree split --prefix="sub dir2" --branch subproj2-br &&
check_equal "$(git log --pretty=format:%P -1 subproj2-br)" ""
)
diff --git a/convert.c b/convert.c
index 67d69b5..077f5e6 100644
--- a/convert.c
+++ b/convert.c
@@ -189,33 +189,25 @@ static enum eol output_eol(enum crlf_action crlf_action)
}
static void check_safe_crlf(const char *path, enum crlf_action crlf_action,
- struct text_stat *stats, enum safe_crlf checksafe)
+ struct text_stat *old_stats, struct text_stat *new_stats,
+ enum safe_crlf checksafe)
{
- if (!checksafe)
- return;
-
- if (output_eol(crlf_action) == EOL_LF) {
+ if (old_stats->crlf && !new_stats->crlf ) {
/*
- * CRLFs would not be restored by checkout:
- * check if we'd remove CRLFs
+ * CRLFs would not be restored by checkout
*/
- if (stats->crlf) {
- if (checksafe == SAFE_CRLF_WARN)
- warning("CRLF will be replaced by LF in %s.\nThe file will have its original line endings in your working directory.", path);
- else /* i.e. SAFE_CRLF_FAIL */
- die("CRLF would be replaced by LF in %s.", path);
- }
- } else if (output_eol(crlf_action) == EOL_CRLF) {
+ if (checksafe == SAFE_CRLF_WARN)
+ warning("CRLF will be replaced by LF in %s.\nThe file will have its original line endings in your working directory.", path);
+ else /* i.e. SAFE_CRLF_FAIL */
+ die("CRLF would be replaced by LF in %s.", path);
+ } else if (old_stats->lonelf && !new_stats->lonelf ) {
/*
- * CRLFs would be added by checkout:
- * check if we have "naked" LFs
+ * CRLFs would be added by checkout
*/
- if (stats->lonelf) {
- if (checksafe == SAFE_CRLF_WARN)
- warning("LF will be replaced by CRLF in %s.\nThe file will have its original line endings in your working directory.", path);
- else /* i.e. SAFE_CRLF_FAIL */
- die("LF would be replaced by CRLF in %s", path);
- }
+ if (checksafe == SAFE_CRLF_WARN)
+ warning("LF will be replaced by CRLF in %s.\nThe file will have its original line endings in your working directory.", path);
+ else /* i.e. SAFE_CRLF_FAIL */
+ die("LF would be replaced by CRLF in %s", path);
}
}
@@ -233,12 +225,35 @@ static int has_cr_in_index(const char *path)
return has_cr;
}
+static int will_convert_lf_to_crlf(size_t len, struct text_stat *stats,
+ enum crlf_action crlf_action)
+{
+ if (output_eol(crlf_action) != EOL_CRLF)
+ return 0;
+ /* No "naked" LF? Nothing to convert, regardless. */
+ if (!stats->lonelf)
+ return 0;
+
+ if (crlf_action == CRLF_AUTO || crlf_action == CRLF_AUTO_INPUT || crlf_action == CRLF_AUTO_CRLF) {
+ /* If we have any CR or CRLF line endings, we do not touch it */
+ /* This is the new safer autocrlf-handling */
+ if (stats->lonecr || stats->crlf)
+ return 0;
+
+ if (convert_is_binary(len, stats))
+ return 0;
+ }
+ return 1;
+
+}
+
static int crlf_to_git(const char *path, const char *src, size_t len,
struct strbuf *buf,
enum crlf_action crlf_action, enum safe_crlf checksafe)
{
struct text_stat stats;
char *dst;
+ int convert_crlf_into_lf;
if (crlf_action == CRLF_BINARY ||
(src && !len))
@@ -252,6 +267,8 @@ static int crlf_to_git(const char *path, const char *src, size_t len,
return 1;
gather_stats(src, len, &stats);
+ /* Optimization: No CRLF? Nothing to convert, regardless. */
+ convert_crlf_into_lf = !!stats.crlf;
if (crlf_action == CRLF_AUTO || crlf_action == CRLF_AUTO_INPUT || crlf_action == CRLF_AUTO_CRLF) {
if (convert_is_binary(len, &stats))
@@ -263,12 +280,24 @@ static int crlf_to_git(const char *path, const char *src, size_t len,
if (checksafe == SAFE_CRLF_RENORMALIZE)
checksafe = SAFE_CRLF_FALSE;
else if (has_cr_in_index(path))
- return 0;
+ convert_crlf_into_lf = 0;
}
- check_safe_crlf(path, crlf_action, &stats, checksafe);
-
- /* Optimization: No CRLF? Nothing to convert, regardless. */
- if (!stats.crlf)
+ if (checksafe && len) {
+ struct text_stat new_stats;
+ memcpy(&new_stats, &stats, sizeof(new_stats));
+ /* simulate "git add" */
+ if (convert_crlf_into_lf) {
+ new_stats.lonelf += new_stats.crlf;
+ new_stats.crlf = 0;
+ }
+ /* simulate "git checkout" */
+ if (will_convert_lf_to_crlf(len, &new_stats, crlf_action)) {
+ new_stats.crlf += new_stats.lonelf;
+ new_stats.lonelf = 0;
+ }
+ check_safe_crlf(path, crlf_action, &stats, &new_stats, checksafe);
+ }
+ if (!convert_crlf_into_lf)
return 0;
/*
@@ -314,21 +343,9 @@ static int crlf_to_worktree(const char *path, const char *src, size_t len,
return 0;
gather_stats(src, len, &stats);
-
- /* No "naked" LF? Nothing to convert, regardless. */
- if (!stats.lonelf)
+ if (!will_convert_lf_to_crlf(len, &stats, crlf_action))
return 0;
- if (crlf_action == CRLF_AUTO || crlf_action == CRLF_AUTO_INPUT || crlf_action == CRLF_AUTO_CRLF) {
- /* If we have any CR or CRLF line endings, we do not touch it */
- /* This is the new safer autocrlf-handling */
- if (stats.lonecr || stats.crlf )
- return 0;
-
- if (convert_is_binary(len, &stats))
- return 0;
- }
-
/* are we "faking" in place editing ? */
if (src == buf->buf)
to_free = strbuf_detach(buf, NULL);
diff --git a/daemon.c b/daemon.c
index 425aad0..ff0fa58 100644
--- a/daemon.c
+++ b/daemon.c
@@ -160,6 +160,7 @@ static const char *path_ok(const char *directory, struct hostinfo *hi)
{
static char rpath[PATH_MAX];
static char interp_path[PATH_MAX];
+ size_t rlen;
const char *path;
const char *dir;
@@ -187,8 +188,12 @@ static const char *path_ok(const char *directory, struct hostinfo *hi)
namlen = slash - dir;
restlen -= namlen;
loginfo("userpath <%s>, request <%s>, namlen %d, restlen %d, slash <%s>", user_path, dir, namlen, restlen, slash);
- snprintf(rpath, PATH_MAX, "%.*s/%s%.*s",
- namlen, dir, user_path, restlen, slash);
+ rlen = snprintf(rpath, sizeof(rpath), "%.*s/%s%.*s",
+ namlen, dir, user_path, restlen, slash);
+ if (rlen >= sizeof(rpath)) {
+ logerror("user-path too large: %s", rpath);
+ return NULL;
+ }
dir = rpath;
}
}
@@ -207,7 +212,15 @@ static const char *path_ok(const char *directory, struct hostinfo *hi)
strbuf_expand(&expanded_path, interpolated_path,
expand_path, &context);
- strlcpy(interp_path, expanded_path.buf, PATH_MAX);
+
+ rlen = strlcpy(interp_path, expanded_path.buf,
+ sizeof(interp_path));
+ if (rlen >= sizeof(interp_path)) {
+ logerror("interpolated path too large: %s",
+ interp_path);
+ return NULL;
+ }
+
strbuf_release(&expanded_path);
loginfo("Interpolated dir '%s'", interp_path);
@@ -219,7 +232,11 @@ static const char *path_ok(const char *directory, struct hostinfo *hi)
logerror("'%s': Non-absolute path denied (base-path active)", dir);
return NULL;
}
- snprintf(rpath, PATH_MAX, "%s%s", base_path, dir);
+ rlen = snprintf(rpath, sizeof(rpath), "%s%s", base_path, dir);
+ if (rlen >= sizeof(rpath)) {
+ logerror("base-path too large: %s", rpath);
+ return NULL;
+ }
dir = rpath;
}
diff --git a/diff.c b/diff.c
index abff2ee..8c78fce 100644
--- a/diff.c
+++ b/diff.c
@@ -354,7 +354,6 @@ struct emit_callback {
const char **label_path;
struct diff_words_data *diff_words;
struct diff_options *opt;
- int *found_changesp;
struct strbuf *header;
};
@@ -722,7 +721,6 @@ static void emit_rewrite_diff(const char *name_a,
memset(&ecbdata, 0, sizeof(ecbdata));
ecbdata.color_diff = want_color(o->use_color);
- ecbdata.found_changesp = &o->found_changes;
ecbdata.ws_rule = whitespace_rule(name_b);
ecbdata.opt = o;
if (ecbdata.ws_rule & WS_BLANK_AT_EOF) {
@@ -951,7 +949,8 @@ static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex,
{
if (word_regex && *begin < buffer->size) {
regmatch_t match[1];
- if (!regexec(word_regex, buffer->ptr + *begin, 1, match, 0)) {
+ if (!regexec_buf(word_regex, buffer->ptr + *begin,
+ buffer->size - *begin, 1, match, 0)) {
char *p = memchr(buffer->ptr + *begin + match[0].rm_so,
'\n', match[0].rm_eo - match[0].rm_so);
*end = p ? p - buffer->ptr : match[0].rm_eo + *begin;
@@ -1216,12 +1215,13 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
struct diff_options *o = ecbdata->opt;
const char *line_prefix = diff_line_prefix(o);
+ o->found_changes = 1;
+
if (ecbdata->header) {
- fprintf(ecbdata->opt->file, "%s", ecbdata->header->buf);
+ fprintf(o->file, "%s", ecbdata->header->buf);
strbuf_reset(ecbdata->header);
ecbdata->header = NULL;
}
- *(ecbdata->found_changesp) = 1;
if (ecbdata->label_path[0]) {
const char *name_a_tab, *name_b_tab;
@@ -1229,9 +1229,9 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
- fprintf(ecbdata->opt->file, "%s%s--- %s%s%s\n",
+ fprintf(o->file, "%s%s--- %s%s%s\n",
line_prefix, meta, ecbdata->label_path[0], reset, name_a_tab);
- fprintf(ecbdata->opt->file, "%s%s+++ %s%s%s\n",
+ fprintf(o->file, "%s%s+++ %s%s%s\n",
line_prefix, meta, ecbdata->label_path[1], reset, name_b_tab);
ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
}
@@ -1249,15 +1249,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
find_lno(line, ecbdata);
emit_hunk_header(ecbdata, line, len);
if (line[len-1] != '\n')
- putc('\n', ecbdata->opt->file);
- return;
- }
-
- if (len < 1) {
- emit_line(ecbdata->opt, reset, reset, line, len);
- if (ecbdata->diff_words
- && ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN)
- fputs("~\n", ecbdata->opt->file);
+ putc('\n', o->file);
return;
}
@@ -1282,8 +1274,8 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
}
diff_words_flush(ecbdata);
if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) {
- emit_line(ecbdata->opt, context, reset, line, len);
- fputs("~\n", ecbdata->opt->file);
+ emit_line(o, context, reset, line, len);
+ fputs("~\n", o->file);
} else {
/*
* Skip the prefix character, if any. With
@@ -1294,7 +1286,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
line++;
len--;
}
- emit_line(ecbdata->opt, context, reset, line, len);
+ emit_line(o, context, reset, line, len);
}
return;
}
@@ -1316,8 +1308,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
default:
/* incomplete line at the end */
ecbdata->lno_in_preimage++;
- emit_line(ecbdata->opt,
- diff_get_color(ecbdata->color_diff, DIFF_CONTEXT),
+ emit_line(o, diff_get_color(ecbdata->color_diff, DIFF_CONTEXT),
reset, line, len);
break;
}
@@ -1933,8 +1924,8 @@ static void show_dirstat(struct diff_options *options)
name = p->two->path ? p->two->path : p->one->path;
- if (p->one->sha1_valid && p->two->sha1_valid)
- content_changed = hashcmp(p->one->sha1, p->two->sha1);
+ if (p->one->oid_valid && p->two->oid_valid)
+ content_changed = oidcmp(&p->one->oid, &p->two->oid);
else
content_changed = 1;
@@ -1963,7 +1954,7 @@ static void show_dirstat(struct diff_options *options)
if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
diff_populate_filespec(p->one, 0);
diff_populate_filespec(p->two, 0);
- diffcore_count_changes(p->one, p->two, NULL, NULL, 0,
+ diffcore_count_changes(p->one, p->two, NULL, NULL,
&copied, &added);
diff_free_filespec_data(p->one);
diff_free_filespec_data(p->two);
@@ -2306,7 +2297,8 @@ static void builtin_diff(const char *name_a,
const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
show_submodule_summary(o->file, one->path ? one->path : two->path,
line_prefix,
- one->sha1, two->sha1, two->dirty_submodule,
+ one->oid.hash, two->oid.hash,
+ two->dirty_submodule,
meta, del, add, reset);
return;
}
@@ -2384,7 +2376,7 @@ static void builtin_diff(const char *name_a,
if (!one->data && !two->data &&
S_ISREG(one->mode) && S_ISREG(two->mode) &&
!DIFF_OPT_TST(o, BINARY)) {
- if (!hashcmp(one->sha1, two->sha1)) {
+ if (!oidcmp(&one->oid, &two->oid)) {
if (must_show_header)
fprintf(o->file, "%s", header.buf);
goto free_ab_and_return;
@@ -2437,7 +2429,6 @@ static void builtin_diff(const char *name_a,
memset(&ecbdata, 0, sizeof(ecbdata));
ecbdata.label_path = lbl;
ecbdata.color_diff = want_color(o->use_color);
- ecbdata.found_changesp = &o->found_changes;
ecbdata.ws_rule = whitespace_rule(name_b);
if (ecbdata.ws_rule & WS_BLANK_AT_EOF)
check_blank_at_eof(&mf1, &mf2, &ecbdata);
@@ -2505,7 +2496,7 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
return;
}
- same_contents = !hashcmp(one->sha1, two->sha1);
+ same_contents = !oidcmp(&one->oid, &two->oid);
if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) {
data->is_binary = 1;
@@ -2638,8 +2629,8 @@ void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
{
if (mode) {
spec->mode = canon_mode(mode);
- hashcpy(spec->sha1, sha1);
- spec->sha1_valid = sha1_valid;
+ hashcpy(spec->oid.hash, sha1);
+ spec->oid_valid = sha1_valid;
}
}
@@ -2728,7 +2719,8 @@ static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
if (s->dirty_submodule)
dirty = "-dirty";
- strbuf_addf(&buf, "Subproject commit %s%s\n", sha1_to_hex(s->sha1), dirty);
+ strbuf_addf(&buf, "Subproject commit %s%s\n",
+ oid_to_hex(&s->oid), dirty);
s->size = buf.len;
if (size_only) {
s->data = NULL;
@@ -2771,8 +2763,8 @@ int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
if (S_ISGITLINK(s->mode))
return diff_populate_gitlink(s, size_only);
- if (!s->sha1_valid ||
- reuse_worktree_file(s->path, s->sha1, 0)) {
+ if (!s->oid_valid ||
+ reuse_worktree_file(s->path, s->oid.hash, 0)) {
struct strbuf buf = STRBUF_INIT;
struct stat st;
int fd;
@@ -2829,9 +2821,10 @@ int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
else {
enum object_type type;
if (size_only || (flags & CHECK_BINARY)) {
- type = sha1_object_info(s->sha1, &s->size);
+ type = sha1_object_info(s->oid.hash, &s->size);
if (type < 0)
- die("unable to read %s", sha1_to_hex(s->sha1));
+ die("unable to read %s",
+ oid_to_hex(&s->oid));
if (size_only)
return 0;
if (s->size > big_file_threshold && s->is_binary == -1) {
@@ -2839,9 +2832,9 @@ int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
return 0;
}
}
- s->data = read_sha1_file(s->sha1, &type, &s->size);
+ s->data = read_sha1_file(s->oid.hash, &type, &s->size);
if (!s->data)
- die("unable to read %s", sha1_to_hex(s->sha1));
+ die("unable to read %s", oid_to_hex(&s->oid));
s->should_free = 1;
}
return 0;
@@ -2870,7 +2863,7 @@ void diff_free_filespec_data(struct diff_filespec *s)
static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
void *blob,
unsigned long size,
- const unsigned char *sha1,
+ const struct object_id *oid,
int mode)
{
int fd;
@@ -2895,7 +2888,7 @@ static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
die_errno("unable to write temp-file");
close_tempfile(&temp->tempfile);
temp->name = get_tempfile_path(&temp->tempfile);
- sha1_to_hex_r(temp->hex, sha1);
+ oid_to_hex_r(temp->hex, oid);
xsnprintf(temp->mode, sizeof(temp->mode), "%06o", mode);
strbuf_release(&buf);
strbuf_release(&template);
@@ -2919,8 +2912,8 @@ static struct diff_tempfile *prepare_temp_file(const char *name,
}
if (!S_ISGITLINK(one->mode) &&
- (!one->sha1_valid ||
- reuse_worktree_file(name, one->sha1, 1))) {
+ (!one->oid_valid ||
+ reuse_worktree_file(name, one->oid.hash, 1))) {
struct stat st;
if (lstat(name, &st) < 0) {
if (errno == ENOENT)
@@ -2932,19 +2925,19 @@ static struct diff_tempfile *prepare_temp_file(const char *name,
if (strbuf_readlink(&sb, name, st.st_size) < 0)
die_errno("readlink(%s)", name);
prep_temp_blob(name, temp, sb.buf, sb.len,
- (one->sha1_valid ?
- one->sha1 : null_sha1),
- (one->sha1_valid ?
+ (one->oid_valid ?
+ &one->oid : &null_oid),
+ (one->oid_valid ?
one->mode : S_IFLNK));
strbuf_release(&sb);
}
else {
/* we can borrow from the file in the work tree */
temp->name = name;
- if (!one->sha1_valid)
+ if (!one->oid_valid)
sha1_to_hex_r(temp->hex, null_sha1);
else
- sha1_to_hex_r(temp->hex, one->sha1);
+ sha1_to_hex_r(temp->hex, one->oid.hash);
/* Even though we may sometimes borrow the
* contents from the work tree, we always want
* one->mode. mode is trustworthy even when
@@ -2959,7 +2952,7 @@ static struct diff_tempfile *prepare_temp_file(const char *name,
if (diff_populate_filespec(one, 0))
die("cannot read data blob for %s", one->path);
prep_temp_blob(name, temp, one->data, one->size,
- one->sha1, one->mode);
+ &one->oid, one->mode);
}
return temp;
}
@@ -3072,7 +3065,7 @@ static void fill_metainfo(struct strbuf *msg,
default:
*must_show_header = 0;
}
- if (one && two && hashcmp(one->sha1, two->sha1)) {
+ if (one && two && oidcmp(&one->oid, &two->oid)) {
int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
if (DIFF_OPT_TST(o, BINARY)) {
@@ -3082,8 +3075,8 @@ static void fill_metainfo(struct strbuf *msg,
abbrev = 40;
}
strbuf_addf(msg, "%s%sindex %s..", line_prefix, set,
- find_unique_abbrev(one->sha1, abbrev));
- strbuf_addstr(msg, find_unique_abbrev(two->sha1, abbrev));
+ find_unique_abbrev(one->oid.hash, abbrev));
+ strbuf_add_unique_abbrev(msg, two->oid.hash, abbrev);
if (one->mode == two->mode)
strbuf_addf(msg, " %06o", one->mode);
strbuf_addf(msg, "%s\n", reset);
@@ -3138,20 +3131,20 @@ static void run_diff_cmd(const char *pgm,
static void diff_fill_sha1_info(struct diff_filespec *one)
{
if (DIFF_FILE_VALID(one)) {
- if (!one->sha1_valid) {
+ if (!one->oid_valid) {
struct stat st;
if (one->is_stdin) {
- hashcpy(one->sha1, null_sha1);
+ oidclr(&one->oid);
return;
}
if (lstat(one->path, &st) < 0)
die_errno("stat '%s'", one->path);
- if (index_path(one->sha1, one->path, &st, 0))
+ if (index_path(one->oid.hash, one->path, &st, 0))
die("cannot hash %s", one->path);
}
}
else
- hashclr(one->sha1);
+ oidclr(&one->oid);
}
static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
@@ -3984,6 +3977,8 @@ int diff_opt_parse(struct diff_options *options,
if (!options->file)
die_errno("Could not open '%s'", path);
options->close_file = 1;
+ if (options->use_color != GIT_COLOR_ALWAYS)
+ options->use_color = GIT_COLOR_NEVER;
return argcount;
} else
return 0;
@@ -4094,7 +4089,8 @@ void diff_free_filepair(struct diff_filepair *p)
free(p);
}
-/* This is different from find_unique_abbrev() in that
+/*
+ * This is different from find_unique_abbrev() in that
* it stuffs the result with dots for alignment.
*/
const char *diff_unique_abbrev(const unsigned char *sha1, int len)
@@ -4106,6 +4102,26 @@ const char *diff_unique_abbrev(const unsigned char *sha1, int len)
abbrev = find_unique_abbrev(sha1, len);
abblen = strlen(abbrev);
+
+ /*
+ * In well-behaved cases, where the abbbreviated result is the
+ * same as the requested length, append three dots after the
+ * abbreviation (hence the whole logic is limited to the case
+ * where abblen < 37); when the actual abbreviated result is a
+ * bit longer than the requested length, we reduce the number
+ * of dots so that they match the well-behaved ones. However,
+ * if the actual abbreviation is longer than the requested
+ * length by more than three, we give up on aligning, and add
+ * three dots anyway, to indicate that the output is not the
+ * full object name. Yes, this may be suboptimal, but this
+ * appears only in "diff --raw --abbrev" output and it is not
+ * worth the effort to change it now. Note that this would
+ * likely to work fine when the automatic sizing of default
+ * abbreviation length is used--we would be fed -1 in "len" in
+ * that case, and will end up always appending three-dots, but
+ * the automatic sizing is supposed to give abblen that ensures
+ * uniqueness across all objects (statistically speaking).
+ */
if (abblen < 37) {
static char hex[41];
if (len < abblen && abblen <= len + 2)
@@ -4125,8 +4141,9 @@ static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
fprintf(opt->file, "%s", diff_line_prefix(opt));
if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
- diff_unique_abbrev(p->one->sha1, opt->abbrev));
- fprintf(opt->file, "%s ", diff_unique_abbrev(p->two->sha1, opt->abbrev));
+ diff_unique_abbrev(p->one->oid.hash, opt->abbrev));
+ fprintf(opt->file, "%s ",
+ diff_unique_abbrev(p->two->oid.hash, opt->abbrev));
}
if (p->score) {
fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
@@ -4175,11 +4192,11 @@ int diff_unmodified_pair(struct diff_filepair *p)
/* both are valid and point at the same path. that is, we are
* dealing with a change.
*/
- if (one->sha1_valid && two->sha1_valid &&
- !hashcmp(one->sha1, two->sha1) &&
+ if (one->oid_valid && two->oid_valid &&
+ !oidcmp(&one->oid, &two->oid) &&
!one->dirty_submodule && !two->dirty_submodule)
return 1; /* no change */
- if (!one->sha1_valid && !two->sha1_valid)
+ if (!one->oid_valid && !two->oid_valid)
return 1; /* both look at the same file on the filesystem. */
return 0;
}
@@ -4240,7 +4257,7 @@ void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
s->path,
DIFF_FILE_VALID(s) ? "valid" : "invalid",
s->mode,
- s->sha1_valid ? sha1_to_hex(s->sha1) : "");
+ s->oid_valid ? oid_to_hex(&s->oid) : "");
fprintf(stderr, "queue[%d] %s size %lu\n",
x, one ? one : "",
s->size);
@@ -4310,11 +4327,11 @@ static void diff_resolve_rename_copy(void)
else
p->status = DIFF_STATUS_RENAMED;
}
- else if (hashcmp(p->one->sha1, p->two->sha1) ||
+ else if (oidcmp(&p->one->oid, &p->two->oid) ||
p->one->mode != p->two->mode ||
p->one->dirty_submodule ||
p->two->dirty_submodule ||
- is_null_sha1(p->one->sha1))
+ is_null_oid(&p->one->oid))
p->status = DIFF_STATUS_MODIFIED;
else {
/* This is a "no-change" entry and should not
@@ -4456,7 +4473,7 @@ static void patch_id_consume(void *priv, char *line, unsigned long len)
}
/* returns 0 upon success, and writes result into sha1 */
-static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
+static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1, int diff_header_only)
{
struct diff_queue_struct *q = &diff_queued_diff;
int i;
@@ -4491,9 +4508,6 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
diff_fill_sha1_info(p->one);
diff_fill_sha1_info(p->two);
- if (fill_mmfile(&mf1, p->one) < 0 ||
- fill_mmfile(&mf2, p->two) < 0)
- return error("unable to read files to diff");
len1 = remove_space(p->one->path, strlen(p->one->path));
len2 = remove_space(p->two->path, strlen(p->two->path));
@@ -4528,10 +4542,19 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
len2, p->two->path);
git_SHA1_Update(&ctx, buffer, len1);
+ if (diff_header_only)
+ continue;
+
+ if (fill_mmfile(&mf1, p->one) < 0 ||
+ fill_mmfile(&mf2, p->two) < 0)
+ return error("unable to read files to diff");
+
if (diff_filespec_is_binary(p->one) ||
diff_filespec_is_binary(p->two)) {
- git_SHA1_Update(&ctx, sha1_to_hex(p->one->sha1), 40);
- git_SHA1_Update(&ctx, sha1_to_hex(p->two->sha1), 40);
+ git_SHA1_Update(&ctx, oid_to_hex(&p->one->oid),
+ 40);
+ git_SHA1_Update(&ctx, oid_to_hex(&p->two->oid),
+ 40);
continue;
}
@@ -4548,11 +4571,11 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
return 0;
}
-int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1)
+int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1, int diff_header_only)
{
struct diff_queue_struct *q = &diff_queued_diff;
int i;
- int result = diff_get_patch_id(options, sha1);
+ int result = diff_get_patch_id(options, sha1, diff_header_only);
for (i = 0; i < q->nr; i++)
diff_free_filepair(q->queue[i]);
@@ -4823,7 +4846,7 @@ static int diff_filespec_check_stat_unmatch(struct diff_filepair *p)
*/
if (!DIFF_FILE_VALID(p->one) || /* (1) */
!DIFF_FILE_VALID(p->two) ||
- (p->one->sha1_valid && p->two->sha1_valid) ||
+ (p->one->oid_valid && p->two->oid_valid) ||
(p->one->mode != p->two->mode) ||
diff_populate_filespec(p->one, CHECK_SIZE_ONLY) ||
diff_populate_filespec(p->two, CHECK_SIZE_ONLY) ||
@@ -5119,8 +5142,9 @@ size_t fill_textconv(struct userdiff_driver *driver,
if (!driver->textconv)
die("BUG: fill_textconv called with non-textconv driver");
- if (driver->textconv_cache && df->sha1_valid) {
- *outbuf = notes_cache_get(driver->textconv_cache, df->sha1,
+ if (driver->textconv_cache && df->oid_valid) {
+ *outbuf = notes_cache_get(driver->textconv_cache,
+ df->oid.hash,
&size);
if (*outbuf)
return size;
@@ -5130,9 +5154,9 @@ size_t fill_textconv(struct userdiff_driver *driver,
if (!*outbuf)
die("unable to read files to diff");
- if (driver->textconv_cache && df->sha1_valid) {
+ if (driver->textconv_cache && df->oid_valid) {
/* ignore errors, as we might be in a readonly repository */
- notes_cache_put(driver->textconv_cache, df->sha1, *outbuf,
+ notes_cache_put(driver->textconv_cache, df->oid.hash, *outbuf,
size);
/*
* we could save up changes and flush them all at the end,
diff --git a/diff.h b/diff.h
index 125447b..7883729 100644
--- a/diff.h
+++ b/diff.h
@@ -342,7 +342,7 @@ extern int run_diff_files(struct rev_info *revs, unsigned int option);
extern int run_diff_index(struct rev_info *revs, int cached);
extern int do_diff_cache(const unsigned char *, struct diff_options *);
-extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
+extern int diff_flush_patch_id(struct diff_options *, unsigned char *, int);
extern int diff_result_code(struct diff_options *, int);
diff --git a/diffcore-break.c b/diffcore-break.c
index 5473493..c64359f 100644
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -57,8 +57,8 @@ static int should_break(struct diff_filespec *src,
return 1; /* even their types are different */
}
- if (src->sha1_valid && dst->sha1_valid &&
- !hashcmp(src->sha1, dst->sha1))
+ if (src->oid_valid && dst->oid_valid &&
+ !oidcmp(&src->oid, &dst->oid))
return 0; /* they are the same */
if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
@@ -73,7 +73,6 @@ static int should_break(struct diff_filespec *src,
if (diffcore_count_changes(src, dst,
&src->cnt_data, &dst->cnt_data,
- 0,
&src_copied, &literal_added))
return 0;
diff --git a/diffcore-delta.c b/diffcore-delta.c
index 4159748..e2db85a 100644
--- a/diffcore-delta.c
+++ b/diffcore-delta.c
@@ -169,7 +169,6 @@ int diffcore_count_changes(struct diff_filespec *src,
struct diff_filespec *dst,
void **src_count_p,
void **dst_count_p,
- unsigned long delta_limit,
unsigned long *src_copied,
unsigned long *literal_added)
{
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 55067ca..9795ca1 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -23,7 +23,6 @@ static void diffgrep_consume(void *priv, char *line, unsigned long len)
{
struct diffgrep_cb *data = priv;
regmatch_t regmatch;
- int hold;
if (line[0] != '+' && line[0] != '-')
return;
@@ -33,11 +32,8 @@ static void diffgrep_consume(void *priv, char *line, unsigned long len)
* caller early.
*/
return;
- /* Yuck -- line ought to be "const char *"! */
- hold = line[len];
- line[len] = '\0';
- data->hit = !regexec(data->regexp, line + 1, 1, &regmatch, 0);
- line[len] = hold;
+ data->hit = !regexec_buf(data->regexp, line + 1, len - 1, 1,
+ &regmatch, 0);
}
static int diff_grep(mmfile_t *one, mmfile_t *two,
@@ -50,9 +46,11 @@ static int diff_grep(mmfile_t *one, mmfile_t *two,
xdemitconf_t xecfg;
if (!one)
- return !regexec(regexp, two->ptr, 1, &regmatch, 0);
+ return !regexec_buf(regexp, two->ptr, two->size,
+ 1, &regmatch, 0);
if (!two)
- return !regexec(regexp, one->ptr, 1, &regmatch, 0);
+ return !regexec_buf(regexp, one->ptr, one->size,
+ 1, &regmatch, 0);
/*
* We have both sides; need to run textual diff and see if
@@ -83,8 +81,8 @@ static unsigned int contains(mmfile_t *mf, regex_t *regexp, kwset_t kws)
regmatch_t regmatch;
int flags = 0;
- assert(data[sz] == '\0');
- while (*data && !regexec(regexp, data, 1, &regmatch, flags)) {
+ while (*data &&
+ !regexec_buf(regexp, data, sz, 1, &regmatch, flags)) {
flags |= REG_NOTBOL;
data += regmatch.rm_eo;
if (*data && regmatch.rm_so == regmatch.rm_eo)
diff --git a/diffcore-rename.c b/diffcore-rename.c
index 7f03eb5..15c014d 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -60,7 +60,8 @@ static int add_rename_dst(struct diff_filespec *two)
memmove(rename_dst + first + 1, rename_dst + first,
(rename_dst_nr - first - 1) * sizeof(*rename_dst));
rename_dst[first].two = alloc_filespec(two->path);
- fill_filespec(rename_dst[first].two, two->sha1, two->sha1_valid, two->mode);
+ fill_filespec(rename_dst[first].two, two->oid.hash, two->oid_valid,
+ two->mode);
rename_dst[first].pair = NULL;
return 0;
}
@@ -144,7 +145,6 @@ static int estimate_similarity(struct diff_filespec *src,
* call into this function in that case.
*/
unsigned long max_size, delta_size, base_size, src_copied, literal_added;
- unsigned long delta_limit;
int score;
/* We deal only with regular files. Symlink renames are handled
@@ -190,11 +190,8 @@ static int estimate_similarity(struct diff_filespec *src,
if (!dst->cnt_data && diff_populate_filespec(dst, 0))
return 0;
- delta_limit = (unsigned long)
- (base_size * (MAX_SCORE-minimum_score) / MAX_SCORE);
if (diffcore_count_changes(src, dst,
&src->cnt_data, &dst->cnt_data,
- delta_limit,
&src_copied, &literal_added))
return 0;
@@ -260,12 +257,13 @@ struct file_similarity {
static unsigned int hash_filespec(struct diff_filespec *filespec)
{
- if (!filespec->sha1_valid) {
+ if (!filespec->oid_valid) {
if (diff_populate_filespec(filespec, 0))
return 0;
- hash_sha1_file(filespec->data, filespec->size, "blob", filespec->sha1);
+ hash_sha1_file(filespec->data, filespec->size, "blob",
+ filespec->oid.hash);
}
- return sha1hash(filespec->sha1);
+ return sha1hash(filespec->oid.hash);
}
static int find_identical_files(struct hashmap *srcs,
@@ -287,7 +285,7 @@ static int find_identical_files(struct hashmap *srcs,
struct diff_filespec *source = p->filespec;
/* False hash collision? */
- if (hashcmp(source->sha1, target->sha1))
+ if (oidcmp(&source->oid, &target->oid))
continue;
/* Non-regular files? If so, the modes must match! */
if (!S_ISREG(source->mode) || !S_ISREG(target->mode)) {
@@ -466,7 +464,7 @@ void diffcore_rename(struct diff_options *options)
strcmp(options->single_follow, p->two->path))
continue; /* not interested */
else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
- is_empty_blob_sha1(p->two->sha1))
+ is_empty_blob_sha1(p->two->oid.hash))
continue;
else if (add_rename_dst(p->two) < 0) {
warning("skipping rename detection, detected"
@@ -476,7 +474,7 @@ void diffcore_rename(struct diff_options *options)
}
}
else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
- is_empty_blob_sha1(p->one->sha1))
+ is_empty_blob_sha1(p->one->oid.hash))
continue;
else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
/*
@@ -539,7 +537,7 @@ void diffcore_rename(struct diff_options *options)
rename_dst_nr * rename_src_nr, 50, 1);
}
- mx = xcalloc(st_mult(num_create, NUM_CANDIDATE_PER_DST), sizeof(*mx));
+ mx = xcalloc(st_mult(NUM_CANDIDATE_PER_DST, num_create), sizeof(*mx));
for (dst_cnt = i = 0; i < rename_dst_nr; i++) {
struct diff_filespec *two = rename_dst[i].two;
struct diff_score *m;
diff --git a/diffcore.h b/diffcore.h
index 33ea2de..6230241 100644
--- a/diffcore.h
+++ b/diffcore.h
@@ -25,7 +25,7 @@
struct userdiff_driver;
struct diff_filespec {
- unsigned char sha1[20];
+ struct object_id oid;
char *path;
void *data;
void *cnt_data;
@@ -33,7 +33,7 @@ struct diff_filespec {
int count; /* Reference count */
int rename_used; /* Count of rename users */
unsigned short mode; /* file mode */
- unsigned sha1_valid : 1; /* if true, use sha1 and trust mode;
+ unsigned oid_valid : 1; /* if true, use oid and trust mode;
* if false, use the name and read from
* the filesystem.
*/
@@ -142,7 +142,6 @@ extern int diffcore_count_changes(struct diff_filespec *src,
struct diff_filespec *dst,
void **src_count_p,
void **dst_count_p,
- unsigned long delta_limit,
unsigned long *src_copied,
unsigned long *literal_added);
diff --git a/dir-iterator.c b/dir-iterator.c
new file mode 100644
index 0000000..34182a9
--- /dev/null
+++ b/dir-iterator.c
@@ -0,0 +1,202 @@
+#include "cache.h"
+#include "dir.h"
+#include "iterator.h"
+#include "dir-iterator.h"
+
+struct dir_iterator_level {
+ int initialized;
+
+ DIR *dir;
+
+ /*
+ * The length of the directory part of path at this level
+ * (including a trailing '/'):
+ */
+ size_t prefix_len;
+
+ /*
+ * The last action that has been taken with the current entry
+ * (needed for directories, which have to be included in the
+ * iteration and also iterated into):
+ */
+ enum {
+ DIR_STATE_ITER,
+ DIR_STATE_RECURSE
+ } dir_state;
+};
+
+/*
+ * The full data structure used to manage the internal directory
+ * iteration state. It includes members that are not part of the
+ * public interface.
+ */
+struct dir_iterator_int {
+ struct dir_iterator base;
+
+ /*
+ * The number of levels currently on the stack. This is always
+ * at least 1, because when it becomes zero the iteration is
+ * ended and this struct is freed.
+ */
+ size_t levels_nr;
+
+ /* The number of levels that have been allocated on the stack */
+ size_t levels_alloc;
+
+ /*
+ * A stack of levels. levels[0] is the uppermost directory
+ * that will be included in this iteration.
+ */
+ struct dir_iterator_level *levels;
+};
+
+int dir_iterator_advance(struct dir_iterator *dir_iterator)
+{
+ struct dir_iterator_int *iter =
+ (struct dir_iterator_int *)dir_iterator;
+
+ while (1) {
+ struct dir_iterator_level *level =
+ &iter->levels[iter->levels_nr - 1];
+ struct dirent *de;
+
+ if (!level->initialized) {
+ /*
+ * Note: dir_iterator_begin() ensures that
+ * path is not the empty string.
+ */
+ if (!is_dir_sep(iter->base.path.buf[iter->base.path.len - 1]))
+ strbuf_addch(&iter->base.path, '/');
+ level->prefix_len = iter->base.path.len;
+
+ level->dir = opendir(iter->base.path.buf);
+ if (!level->dir && errno != ENOENT) {
+ warning("error opening directory %s: %s",
+ iter->base.path.buf, strerror(errno));
+ /* Popping the level is handled below */
+ }
+
+ level->initialized = 1;
+ } else if (S_ISDIR(iter->base.st.st_mode)) {
+ if (level->dir_state == DIR_STATE_ITER) {
+ /*
+ * The directory was just iterated
+ * over; now prepare to iterate into
+ * it.
+ */
+ level->dir_state = DIR_STATE_RECURSE;
+ ALLOC_GROW(iter->levels, iter->levels_nr + 1,
+ iter->levels_alloc);
+ level = &iter->levels[iter->levels_nr++];
+ level->initialized = 0;
+ continue;
+ } else {
+ /*
+ * The directory has already been
+ * iterated over and iterated into;
+ * we're done with it.
+ */
+ }
+ }
+
+ if (!level->dir) {
+ /*
+ * This level is exhausted (or wasn't opened
+ * successfully); pop up a level.
+ */
+ if (--iter->levels_nr == 0)
+ return dir_iterator_abort(dir_iterator);
+
+ continue;
+ }
+
+ /*
+ * Loop until we find an entry that we can give back
+ * to the caller:
+ */
+ while (1) {
+ strbuf_setlen(&iter->base.path, level->prefix_len);
+ errno = 0;
+ de = readdir(level->dir);
+
+ if (!de) {
+ /* This level is exhausted; pop up a level. */
+ if (errno) {
+ warning("error reading directory %s: %s",
+ iter->base.path.buf, strerror(errno));
+ } else if (closedir(level->dir))
+ warning("error closing directory %s: %s",
+ iter->base.path.buf, strerror(errno));
+
+ level->dir = NULL;
+ if (--iter->levels_nr == 0)
+ return dir_iterator_abort(dir_iterator);
+ break;
+ }
+
+ if (is_dot_or_dotdot(de->d_name))
+ continue;
+
+ strbuf_addstr(&iter->base.path, de->d_name);
+ if (lstat(iter->base.path.buf, &iter->base.st) < 0) {
+ if (errno != ENOENT)
+ warning("error reading path '%s': %s",
+ iter->base.path.buf,
+ strerror(errno));
+ continue;
+ }
+
+ /*
+ * We have to set these each time because
+ * the path strbuf might have been realloc()ed.
+ */
+ iter->base.relative_path =
+ iter->base.path.buf + iter->levels[0].prefix_len;
+ iter->base.basename =
+ iter->base.path.buf + level->prefix_len;
+ level->dir_state = DIR_STATE_ITER;
+
+ return ITER_OK;
+ }
+ }
+}
+
+int dir_iterator_abort(struct dir_iterator *dir_iterator)
+{
+ struct dir_iterator_int *iter = (struct dir_iterator_int *)dir_iterator;
+
+ for (; iter->levels_nr; iter->levels_nr--) {
+ struct dir_iterator_level *level =
+ &iter->levels[iter->levels_nr - 1];
+
+ if (level->dir && closedir(level->dir)) {
+ strbuf_setlen(&iter->base.path, level->prefix_len);
+ warning("error closing directory %s: %s",
+ iter->base.path.buf, strerror(errno));
+ }
+ }
+
+ free(iter->levels);
+ strbuf_release(&iter->base.path);
+ free(iter);
+ return ITER_DONE;
+}
+
+struct dir_iterator *dir_iterator_begin(const char *path)
+{
+ struct dir_iterator_int *iter = xcalloc(1, sizeof(*iter));
+ struct dir_iterator *dir_iterator = &iter->base;
+
+ if (!path || !*path)
+ die("BUG: empty path passed to dir_iterator_begin()");
+
+ strbuf_init(&iter->base.path, PATH_MAX);
+ strbuf_addstr(&iter->base.path, path);
+
+ ALLOC_GROW(iter->levels, 10, iter->levels_alloc);
+
+ iter->levels_nr = 1;
+ iter->levels[0].initialized = 0;
+
+ return dir_iterator;
+}
diff --git a/dir-iterator.h b/dir-iterator.h
new file mode 100644
index 0000000..27739e6
--- /dev/null
+++ b/dir-iterator.h
@@ -0,0 +1,87 @@
+#ifndef DIR_ITERATOR_H
+#define DIR_ITERATOR_H
+
+/*
+ * Iterate over a directory tree.
+ *
+ * Iterate over a directory tree, recursively, including paths of all
+ * types and hidden paths. Skip "." and ".." entries and don't follow
+ * symlinks except for the original path.
+ *
+ * Every time dir_iterator_advance() is called, update the members of
+ * the dir_iterator structure to reflect the next path in the
+ * iteration. The order that paths are iterated over within a
+ * directory is undefined, but directory paths are always iterated
+ * over before the subdirectory contents.
+ *
+ * A typical iteration looks like this:
+ *
+ * int ok;
+ * struct iterator *iter = dir_iterator_begin(path);
+ *
+ * while ((ok = dir_iterator_advance(iter)) == ITER_OK) {
+ * if (want_to_stop_iteration()) {
+ * ok = dir_iterator_abort(iter);
+ * break;
+ * }
+ *
+ * // Access information about the current path:
+ * if (S_ISDIR(iter->st.st_mode))
+ * printf("%s is a directory\n", iter->relative_path);
+ * }
+ *
+ * if (ok != ITER_DONE)
+ * handle_error();
+ *
+ * Callers are allowed to modify iter->path while they are working,
+ * but they must restore it to its original contents before calling
+ * dir_iterator_advance() again.
+ */
+
+struct dir_iterator {
+ /* The current path: */
+ struct strbuf path;
+
+ /*
+ * The current path relative to the starting path. This part
+ * of the path always uses "/" characters to separate path
+ * components:
+ */
+ const char *relative_path;
+
+ /* The current basename: */
+ const char *basename;
+
+ /* The result of calling lstat() on path: */
+ struct stat st;
+};
+
+/*
+ * Start a directory iteration over path. Return a dir_iterator that
+ * holds the internal state of the iteration.
+ *
+ * The iteration includes all paths under path, not including path
+ * itself and not including "." or ".." entries.
+ *
+ * path is the starting directory. An internal copy will be made.
+ */
+struct dir_iterator *dir_iterator_begin(const char *path);
+
+/*
+ * Advance the iterator to the first or next item and return ITER_OK.
+ * If the iteration is exhausted, free the dir_iterator and any
+ * resources associated with it and return ITER_DONE. On error, free
+ * dir_iterator and associated resources and return ITER_ERROR. It is
+ * a bug to use iterator or call this function again after it has
+ * returned ITER_DONE or ITER_ERROR.
+ */
+int dir_iterator_advance(struct dir_iterator *iterator);
+
+/*
+ * End the iteration before it has been exhausted. Free the
+ * dir_iterator and any associated resources and return ITER_DONE. On
+ * error, free the dir_iterator and return ITER_ERROR.
+ */
+int dir_iterator_abort(struct dir_iterator *iterator);
+
+#endif
diff --git a/dir.h b/dir.h
index bfde698..da1a858 100644
--- a/dir.h
+++ b/dir.h
@@ -262,9 +262,32 @@ extern int is_empty_dir(const char *dir);
extern void setup_standard_excludes(struct dir_struct *dir);
+
+/* Constants for remove_dir_recursively: */
+
+/*
+ * If a non-directory is found within path, stop and return an error.
+ * (In this case some empty directories might already have been
+ * removed.)
+ */
#define REMOVE_DIR_EMPTY_ONLY 01
+
+/*
+ * If any Git work trees are found within path, skip them without
+ * considering it an error.
+ */
#define REMOVE_DIR_KEEP_NESTED_GIT 02
+
+/* Remove the contents of path, but leave path itself. */
#define REMOVE_DIR_KEEP_TOPLEVEL 04
+
+/*
+ * Remove path and its contents, recursively. flags is a combination
+ * of the above REMOVE_DIR_* constants. Return 0 on success.
+ *
+ * This function uses path as temporary scratch space, but restores it
+ * before returning.
+ */
extern int remove_dir_recursively(struct strbuf *path, int flag);
/* tries to remove the path with empty directories along it, ignores ENOENT */
diff --git a/exec_cmd.c b/exec_cmd.c
index 9d5703a..19ac214 100644
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -38,21 +38,17 @@ char *system_path(const char *path)
return strbuf_detach(&d, NULL);
}
-const char *git_extract_argv0_path(const char *argv0)
+void git_extract_argv0_path(const char *argv0)
{
const char *slash;
if (!argv0 || !*argv0)
- return NULL;
+ return;
slash = find_last_dir_sep(argv0);
- if (slash) {
+ if (slash)
argv0_path = xstrndup(argv0, slash - argv0);
- return slash + 1;
- }
-
- return argv0;
}
void git_set_argv_exec_path(const char *exec_path)
diff --git a/exec_cmd.h b/exec_cmd.h
index 1f6b433..ff0b480 100644
--- a/exec_cmd.h
+++ b/exec_cmd.h
@@ -4,7 +4,7 @@
struct argv_array;
extern void git_set_argv_exec_path(const char *exec_path);
-extern const char *git_extract_argv0_path(const char *path);
+extern void git_extract_argv0_path(const char *path);
extern const char *git_exec_path(void);
extern void setup_path(void);
extern const char **prepare_git_cmd(struct argv_array *out, const char **argv);
diff --git a/fast-import.c b/fast-import.c
index 84a1375..bf53ac9 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -165,6 +165,7 @@ Format of STDIN stream:
#include "csum-file.h"
#include "quote.h"
#include "dir.h"
+#include "run-command.h"
#define PACK_ID_BITS 16
#define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
@@ -281,6 +282,7 @@ struct recent_command {
/* Configured limits on output */
static unsigned long max_depth = 10;
static off_t max_packsize;
+static int unpack_limit = 100;
static int force_update;
static int pack_compression_level = Z_DEFAULT_COMPRESSION;
static int pack_compression_seen;
@@ -595,6 +597,33 @@ static struct object_entry *insert_object(unsigned char *sha1)
return e;
}
+static void invalidate_pack_id(unsigned int id)
+{
+ unsigned int h;
+ unsigned long lu;
+ struct tag *t;
+
+ for (h = 0; h < ARRAY_SIZE(object_table); h++) {
+ struct object_entry *e;
+
+ for (e = object_table[h]; e; e = e->next)
+ if (e->pack_id == id)
+ e->pack_id = MAX_PACK_ID;
+ }
+
+ for (lu = 0; lu < branch_table_sz; lu++) {
+ struct branch *b;
+
+ for (b = branch_table[lu]; b; b = b->table_next_branch)
+ if (b->pack_id == id)
+ b->pack_id = MAX_PACK_ID;
+ }
+
+ for (t = first_tag; t; t = t->next_tag)
+ if (t->pack_id == id)
+ t->pack_id = MAX_PACK_ID;
+}
+
static unsigned int hc_str(const char *s, size_t len)
{
unsigned int r = 0;
@@ -950,6 +979,23 @@ static void unkeep_all_packs(void)
}
}
+static int loosen_small_pack(const struct packed_git *p)
+{
+ struct child_process unpack = CHILD_PROCESS_INIT;
+
+ if (lseek(p->pack_fd, 0, SEEK_SET) < 0)
+ die_errno("Failed seeking to start of '%s'", p->pack_name);
+
+ unpack.in = p->pack_fd;
+ unpack.git_cmd = 1;
+ unpack.stdout_to_stderr = 1;
+ argv_array_push(&unpack.args, "unpack-objects");
+ if (!show_stats)
+ argv_array_push(&unpack.args, "-q");
+
+ return run_command(&unpack);
+}
+
static void end_packfile(void)
{
static int running;
@@ -972,6 +1018,14 @@ static void end_packfile(void)
fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
pack_data->pack_name, object_count,
cur_pack_sha1, pack_size);
+
+ if (object_count <= unpack_limit) {
+ if (!loosen_small_pack(pack_data)) {
+ invalidate_pack_id(pack_id);
+ goto discard_pack;
+ }
+ }
+
close(pack_data->pack_fd);
idx_name = keep_pack(create_index());
@@ -1002,6 +1056,7 @@ static void end_packfile(void)
pack_id++;
}
else {
+discard_pack:
close(pack_data->pack_fd);
unlink_or_warn(pack_data->pack_name);
}
@@ -3319,6 +3374,7 @@ static void parse_option(const char *option)
static void git_pack_config(void)
{
int indexversion_value;
+ int limit;
unsigned long packsizelimit_value;
if (!git_config_get_ulong("pack.depth", &max_depth)) {
@@ -3343,6 +3399,11 @@ static void git_pack_config(void)
if (!git_config_get_ulong("pack.packsizelimit", &packsizelimit_value))
max_packsize = packsizelimit_value;
+ if (!git_config_get_int("fastimport.unpacklimit", &limit))
+ unpack_limit = limit;
+ else if (!git_config_get_int("transfer.unpacklimit", &limit))
+ unpack_limit = limit;
+
git_config(git_default_config, NULL);
}
diff --git a/fetch-pack.c b/fetch-pack.c
index b501d5c..413937e 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -243,16 +243,21 @@ static void insert_one_alternate_ref(const struct ref *ref, void *unused)
#define INITIAL_FLUSH 16
#define PIPESAFE_FLUSH 32
-#define LARGE_FLUSH 1024
+#define LARGE_FLUSH 16384
static int next_flush(struct fetch_pack_args *args, int count)
{
- int flush_limit = args->stateless_rpc ? LARGE_FLUSH : PIPESAFE_FLUSH;
-
- if (count < flush_limit)
- count <<= 1;
- else
- count += flush_limit;
+ if (args->stateless_rpc) {
+ if (count < LARGE_FLUSH)
+ count <<= 1;
+ else
+ count = count * 11 / 10;
+ } else {
+ if (count < PIPESAFE_FLUSH)
+ count <<= 1;
+ else
+ count += PIPESAFE_FLUSH;
+ }
return count;
}
@@ -423,10 +428,17 @@ static int find_common(struct fetch_pack_args *args,
const char *hex = sha1_to_hex(result_sha1);
packet_buf_write(&req_buf, "have %s\n", hex);
state_len = req_buf.len;
- }
+ /*
+ * Reset in_vain because an ack
+ * for this commit has not been
+ * seen.
+ */
+ in_vain = 0;
+ } else if (!args->stateless_rpc
+ || ack != ACK_common)
+ in_vain = 0;
mark_common(commit, 0, 1);
retval = 0;
- in_vain = 0;
got_continue = 1;
if (ack == ACK_ready) {
clear_prio_queue(&rev_list);
diff --git a/fsck.c b/fsck.c
index 0531545..c9cf3de 100644
--- a/fsck.c
+++ b/fsck.c
@@ -9,6 +9,7 @@
#include "refs.h"
#include "utf8.h"
#include "sha1-array.h"
+#include "decorate.h"
#define FSCK_FATAL -1
#define FSCK_INFO -2
@@ -290,35 +291,87 @@ static int report(struct fsck_options *options, struct object *object,
va_start(ap, fmt);
strbuf_vaddf(&sb, fmt, ap);
- result = options->error_func(object, msg_type, sb.buf);
+ result = options->error_func(options, object, msg_type, sb.buf);
strbuf_release(&sb);
va_end(ap);
return result;
}
+static char *get_object_name(struct fsck_options *options, struct object *obj)
+{
+ if (!options->object_names)
+ return NULL;
+ return lookup_decoration(options->object_names, obj);
+}
+
+static void put_object_name(struct fsck_options *options, struct object *obj,
+ const char *fmt, ...)
+{
+ va_list ap;
+ struct strbuf buf = STRBUF_INIT;
+ char *existing;
+
+ if (!options->object_names)
+ return;
+ existing = lookup_decoration(options->object_names, obj);
+ if (existing)
+ return;
+ va_start(ap, fmt);
+ strbuf_vaddf(&buf, fmt, ap);
+ add_decoration(options->object_names, obj, strbuf_detach(&buf, NULL));
+ va_end(ap);
+}
+
+static const char *describe_object(struct fsck_options *o, struct object *obj)
+{
+ static struct strbuf buf = STRBUF_INIT;
+ char *name;
+
+ strbuf_reset(&buf);
+ strbuf_addstr(&buf, oid_to_hex(&obj->oid));
+ if (o->object_names && (name = lookup_decoration(o->object_names, obj)))
+ strbuf_addf(&buf, " (%s)", name);
+
+ return buf.buf;
+}
+
static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *options)
{
struct tree_desc desc;
struct name_entry entry;
int res = 0;
+ const char *name;
if (parse_tree(tree))
return -1;
+ name = get_object_name(options, &tree->object);
init_tree_desc(&desc, tree->buffer, tree->size);
while (tree_entry(&desc, &entry)) {
+ struct object *obj;
int result;
if (S_ISGITLINK(entry.mode))
continue;
- if (S_ISDIR(entry.mode))
- result = options->walk(&lookup_tree(entry.oid->hash)->object, OBJ_TREE, data, options);
- else if (S_ISREG(entry.mode) || S_ISLNK(entry.mode))
- result = options->walk(&lookup_blob(entry.oid->hash)->object, OBJ_BLOB, data, options);
+
+ if (S_ISDIR(entry.mode)) {
+ obj = &lookup_tree(entry.oid->hash)->object;
+ if (name)
+ put_object_name(options, obj, "%s%s/", name,
+ entry.path);
+ result = options->walk(obj, OBJ_TREE, data, options);
+ }
+ else if (S_ISREG(entry.mode) || S_ISLNK(entry.mode)) {
+ obj = &lookup_blob(entry.oid->hash)->object;
+ if (name)
+ put_object_name(options, obj, "%s%s", name,
+ entry.path);
+ result = options->walk(obj, OBJ_BLOB, data, options);
+ }
else {
result = error("in tree %s: entry %s has bad mode %.6o",
- oid_to_hex(&tree->object.oid), entry.path, entry.mode);
+ describe_object(options, &tree->object), entry.path, entry.mode);
}
if (result < 0)
return result;
@@ -330,20 +383,55 @@ static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *op
static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_options *options)
{
+ int counter = 0, generation = 0, name_prefix_len = 0;
struct commit_list *parents;
int res;
int result;
+ const char *name;
if (parse_commit(commit))
return -1;
+ name = get_object_name(options, &commit->object);
+ if (name)
+ put_object_name(options, &commit->tree->object, "%s:", name);
+
result = options->walk((struct object *)commit->tree, OBJ_TREE, data, options);
if (result < 0)
return result;
res = result;
parents = commit->parents;
+ if (name && parents) {
+ int len = strlen(name), power;
+
+ if (len && name[len - 1] == '^') {
+ generation = 1;
+ name_prefix_len = len - 1;
+ }
+ else { /* parse ~<generation> suffix */
+ for (generation = 0, power = 1;
+ len && isdigit(name[len - 1]);
+ power *= 10)
+ generation += power * (name[--len] - '0');
+ if (power > 1 && len && name[len - 1] == '~')
+ name_prefix_len = len - 1;
+ }
+ }
+
while (parents) {
+ if (name) {
+ struct object *obj = &parents->item->object;
+
+ if (++counter > 1)
+ put_object_name(options, obj, "%s^%d",
+ name, counter);
+ else if (generation > 0)
+ put_object_name(options, obj, "%.*s~%d",
+ name_prefix_len, name, generation + 1);
+ else
+ put_object_name(options, obj, "%s^", name);
+ }
result = options->walk((struct object *)parents->item, OBJ_COMMIT, data, options);
if (result < 0)
return result;
@@ -356,8 +444,12 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio
static int fsck_walk_tag(struct tag *tag, void *data, struct fsck_options *options)
{
+ char *name = get_object_name(options, &tag->object);
+
if (parse_tag(tag))
return -1;
+ if (name)
+ put_object_name(options, tag->tagged, "%s", name);
return options->walk(tag->tagged, OBJ_ANY, data, options);
}
@@ -375,7 +467,7 @@ int fsck_walk(struct object *obj, void *data, struct fsck_options *options)
case OBJ_TAG:
return fsck_walk_tag((struct tag *)obj, data, options);
default:
- error("Unknown object type for %s", oid_to_hex(&obj->oid));
+ error("Unknown object type for %s", describe_object(options, obj));
return -1;
}
}
@@ -818,12 +910,13 @@ int fsck_object(struct object *obj, void *data, unsigned long size,
obj->type);
}
-int fsck_error_function(struct object *obj, int msg_type, const char *message)
+int fsck_error_function(struct fsck_options *o,
+ struct object *obj, int msg_type, const char *message)
{
if (msg_type == FSCK_WARN) {
- warning("object %s: %s", oid_to_hex(&obj->oid), message);
+ warning("object %s: %s", describe_object(o, obj), message);
return 0;
}
- error("object %s: %s", oid_to_hex(&obj->oid), message);
+ error("object %s: %s", describe_object(o, obj), message);
return 1;
}
diff --git a/fsck.h b/fsck.h
index dded84b..1891c18 100644
--- a/fsck.h
+++ b/fsck.h
@@ -23,9 +23,11 @@ int is_valid_msg_type(const char *msg_id, const char *msg_type);
typedef int (*fsck_walk_func)(struct object *obj, int type, void *data, struct fsck_options *options);
/* callback for fsck_object, type is FSCK_ERROR or FSCK_WARN */
-typedef int (*fsck_error)(struct object *obj, int type, const char *message);
+typedef int (*fsck_error)(struct fsck_options *o,
+ struct object *obj, int type, const char *message);
-int fsck_error_function(struct object *obj, int type, const char *message);
+int fsck_error_function(struct fsck_options *o,
+ struct object *obj, int type, const char *message);
struct fsck_options {
fsck_walk_func walk;
@@ -33,6 +35,7 @@ struct fsck_options {
unsigned strict:1;
int *msg_type;
struct sha1_array *skiplist;
+ struct decoration *object_names;
};
#define FSCK_OPTIONS_DEFAULT { NULL, fsck_error_function, 0, NULL }
diff --git a/git-bisect.sh b/git-bisect.sh
index 5d1cb00..ae3cb01 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -33,7 +33,6 @@ Please use "git help bisect" to get the full man page.'
OPTIONS_SPEC=
. git-sh-setup
-. git-sh-i18n
_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
@@ -275,10 +274,11 @@ bisect_state() {
check_and_set_terms $state
case "$#,$state" in
0,*)
- die "$(gettext "Please call 'bisect_state' with at least one argument.")" ;;
+ die "Please call 'bisect_state' with at least one argument." ;;
1,"$TERM_BAD"|1,"$TERM_GOOD"|1,skip)
- rev=$(git rev-parse --verify $(bisect_head)) ||
- die "$(gettext "Bad rev input: $(bisect_head)")"
+ bisected_head=$(bisect_head)
+ rev=$(git rev-parse --verify "$bisected_head") ||
+ die "$(eval_gettext "Bad rev input: \$bisected_head")"
bisect_write "$state" "$rev"
check_expected_revs "$rev" ;;
2,"$TERM_BAD"|*,"$TERM_GOOD"|*,skip)
diff --git a/git-compat-util.h b/git-compat-util.h
index b4b7f44..d89a786 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -436,6 +436,7 @@ static inline int const_error(void)
return -1;
}
#define error(...) (error(__VA_ARGS__), const_error())
+#define error_errno(...) (error_errno(__VA_ARGS__), const_error())
#endif
extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params));
@@ -474,6 +475,23 @@ static inline int skip_prefix(const char *str, const char *prefix,
}
/*
+ * Like skip_prefix, but promises never to read past "len" bytes of the input
+ * buffer, and returns the remaining number of bytes in "out" via "outlen".
+ */
+static inline int skip_prefix_mem(const char *buf, size_t len,
+ const char *prefix,
+ const char **out, size_t *outlen)
+{
+ size_t prefix_len = strlen(prefix);
+ if (prefix_len <= len && !memcmp(buf, prefix, prefix_len)) {
+ *out = buf + prefix_len;
+ *outlen = len - prefix_len;
+ return 1;
+ }
+ return 0;
+}
+
+/*
* If buf ends with suffix, return 1 and subtract the length of the suffix
* from *len. Otherwise, return 0 and leave *len untouched.
*/
@@ -646,6 +664,14 @@ void *gitmemmem(const void *haystack, size_t haystacklen,
const void *needle, size_t needlelen);
#endif
+#ifdef OVERRIDE_STRDUP
+#ifdef strdup
+#undef strdup
+#endif
+#define strdup gitstrdup
+char *gitstrdup(const char *s);
+#endif
+
#ifdef NO_GETPAGESIZE
#define getpagesize() sysconf(_SC_PAGESIZE)
#endif
@@ -772,6 +798,14 @@ extern FILE *fopen_for_writing(const char *path);
#define ALLOC_ARRAY(x, alloc) (x) = xmalloc(st_mult(sizeof(*(x)), (alloc)))
#define REALLOC_ARRAY(x, alloc) (x) = xrealloc((x), st_mult(sizeof(*(x)), (alloc)))
+#define COPY_ARRAY(dst, src, n) copy_array((dst), (src), (n), sizeof(*(dst)) + \
+ BUILD_ASSERT_OR_ZERO(sizeof(*(dst)) == sizeof(*(src))))
+static inline void copy_array(void *dst, const void *src, size_t n, size_t size)
+{
+ if (n)
+ memcpy(dst, src, st_mult(size, n));
+}
+
/*
* These functions help you allocate structs with flex arrays, and copy
* the data directly into the array. For example, if you had:
@@ -814,11 +848,14 @@ extern FILE *fopen_for_writing(const char *path);
* times, and it must be assignable as an lvalue.
*/
#define FLEX_ALLOC_MEM(x, flexname, buf, len) do { \
- (x) = NULL; /* silence -Wuninitialized for offset calculation */ \
- (x) = xalloc_flex(sizeof(*(x)), (char *)(&((x)->flexname)) - (char *)(x), (buf), (len)); \
+ size_t flex_array_len_ = (len); \
+ (x) = xcalloc(1, st_add3(sizeof(*(x)), flex_array_len_, 1)); \
+ memcpy((void *)(x)->flexname, (buf), flex_array_len_); \
} while (0)
#define FLEXPTR_ALLOC_MEM(x, ptrname, buf, len) do { \
- (x) = xalloc_flex(sizeof(*(x)), sizeof(*(x)), (buf), (len)); \
+ size_t flex_array_len_ = (len); \
+ (x) = xcalloc(1, st_add3(sizeof(*(x)), flex_array_len_, 1)); \
+ memcpy((x) + 1, (buf), flex_array_len_); \
(x)->ptrname = (void *)((x)+1); \
} while(0)
#define FLEX_ALLOC_STR(x, flexname, str) \
@@ -826,14 +863,6 @@ extern FILE *fopen_for_writing(const char *path);
#define FLEXPTR_ALLOC_STR(x, ptrname, str) \
FLEXPTR_ALLOC_MEM((x), ptrname, (str), strlen(str))
-static inline void *xalloc_flex(size_t base_len, size_t offset,
- const void *src, size_t src_len)
-{
- unsigned char *ret = xcalloc(1, st_add3(base_len, src_len, 1));
- memcpy(ret + offset, src, src_len);
- return ret;
-}
-
static inline char *xstrdup_or_null(const char *str)
{
return str ? xstrdup(str) : NULL;
@@ -948,6 +977,19 @@ void git_qsort(void *base, size_t nmemb, size_t size,
#define qsort git_qsort
#endif
+#ifndef REG_STARTEND
+#error "Git requires REG_STARTEND support. Compile with NO_REGEX=NeedsStartEnd"
+#endif
+
+static inline int regexec_buf(const regex_t *preg, const char *buf, size_t size,
+ size_t nmatch, regmatch_t pmatch[], int eflags)
+{
+ assert(nmatch > 0 && pmatch);
+ pmatch[0].rm_so = 0;
+ pmatch[0].rm_eo = size;
+ return regexec(preg, buf, nmatch, pmatch, eflags | REG_STARTEND);
+}
+
#ifndef DIR_HAS_BSD_GROUP_SEMANTICS
# define FORCE_DIR_SET_GID S_ISGID
#else
@@ -1048,6 +1090,6 @@ struct tm *git_gmtime_r(const time_t *, struct tm *);
#define getc_unlocked(fh) getc(fh)
#endif
-#endif
-
extern int cmd_main(int, const char **);
+
+#endif
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 864b687..01d2cc2 100644
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
@@ -369,6 +369,9 @@ A rescan will be automatically started now.
# -- Create the commit.
#
set cmd [list commit-tree $tree_id]
+ if {[is_config_true commit.gpgsign]} {
+ lappend cmd -S
+ }
foreach p [concat $PARENT $MERGE_HEAD] {
lappend cmd -p $p
}
diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index 460d32f..5ab6f8f 100644
--- a/git-gui/lib/merge.tcl
+++ b/git-gui/lib/merge.tcl
@@ -112,12 +112,7 @@ method _start {} {
close $fh
set _last_merged_branch $branch
- set cmd [list git]
- lappend cmd merge
- lappend cmd --strategy=recursive
- lappend cmd [git fmt-merge-msg <[gitdir FETCH_HEAD]]
- lappend cmd HEAD
- lappend cmd $name
+ set cmd [list git merge --strategy=recursive FETCH_HEAD]
ui_status [mc "Merging %s and %s..." $current_branch $stitle]
set cons [console::new [mc "Merge"] "merge $stitle"]
diff --git a/git-gui/po/ja.po b/git-gui/po/ja.po
index 9aff249..208651c 100644
--- a/git-gui/po/ja.po
+++ b/git-gui/po/ja.po
@@ -1,47 +1,50 @@
# Translation of git-gui to Japanese
# Copyright (C) 2007 Shawn Pearce
# This file is distributed under the same license as the git-gui package.
+#
# ã—らã„ã— ãªãªã“ <nanako3@bluebottle.com>, 2007.
+# Satoshi Yasushima <s.yasushima@gmail.com>, 2016.
#
msgid ""
msgstr ""
"Project-Id-Version: git-gui\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-26 15:47-0800\n"
-"PO-Revision-Date: 2010-02-02 19:03+0900\n"
-"Last-Translator: ã—らã„ã— ãªãªã“ <nanako3@lavabit.com>\n"
+"POT-Creation-Date: 2016-05-27 17:52+0900\n"
+"PO-Revision-Date: 2016-06-22 12:50+0900\n"
+"Last-Translator: Satoshi Yasushima <s.yasushima@gmail.com>\n"
"Language-Team: Japanese\n"
+"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903
-#: git-gui.sh:922
-msgid "git-gui: fatal error"
-msgstr "git-gui: 致命的ãªã‚¨ãƒ©ãƒ¼"
-
-#: git-gui.sh:743
+#: git-gui.sh:861
#, tcl-format
msgid "Invalid font specified in %s:"
msgstr "%s ã«ç„¡åŠ¹ãªãƒ•ã‚©ãƒ³ãƒˆãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã™:"
-#: git-gui.sh:779
+#: git-gui.sh:915
msgid "Main Font"
msgstr "主フォント"
-#: git-gui.sh:780
+#: git-gui.sh:916
msgid "Diff/Console Font"
msgstr "diff/コンソール・フォント"
-#: git-gui.sh:794
+#: git-gui.sh:931 git-gui.sh:945 git-gui.sh:958 git-gui.sh:1048 git-gui.sh:1067
+#: git-gui.sh:3125
+msgid "git-gui: fatal error"
+msgstr "git-gui: 致命的ãªã‚¨ãƒ©ãƒ¼"
+
+#: git-gui.sh:932
msgid "Cannot find git in PATH."
msgstr "PATH 中㫠git ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: git-gui.sh:821
+#: git-gui.sh:959
msgid "Cannot parse Git version string:"
msgstr "Git ãƒãƒ¼ã‚¸ãƒ§ãƒ³åãŒç†è§£ã§ãã¾ã›ã‚“:"
-#: git-gui.sh:839
+#: git-gui.sh:984
#, tcl-format
msgid ""
"Git version cannot be determined.\n"
@@ -60,475 +63,502 @@ msgstr ""
"\n"
"'%s' ã¯ãƒãƒ¼ã‚¸ãƒ§ãƒ³ 1.5.0 ã¨æ€ã£ã¦è‰¯ã„ã§ã™ã‹ï¼Ÿ\n"
-#: git-gui.sh:1128
+#: git-gui.sh:1281
msgid "Git directory not found:"
msgstr "Git ディレクトリãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“:"
-#: git-gui.sh:1146
+#: git-gui.sh:1315
msgid "Cannot move to top of working directory:"
msgstr "作業ディレクトリã®æœ€ä¸Šä½ã«ç§»å‹•ã§ãã¾ã›ã‚“"
-#: git-gui.sh:1154
+#: git-gui.sh:1323
msgid "Cannot use bare repository:"
msgstr "裸ã®ãƒªãƒã‚¸ãƒˆãƒªã¯ä½¿ãˆã¾ã›ã‚“:"
-#: git-gui.sh:1162
+#: git-gui.sh:1331
msgid "No working directory"
msgstr "作業ディレクトリãŒã‚ã‚Šã¾ã›ã‚“"
-#: git-gui.sh:1334 lib/checkout_op.tcl:306
+#: git-gui.sh:1503 lib/checkout_op.tcl:306
msgid "Refreshing file status..."
msgstr "ファイル状態を更新ã—ã¦ã„ã¾ã™â€¦"
-#: git-gui.sh:1390
+#: git-gui.sh:1563
msgid "Scanning for modified files ..."
msgstr "変更ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’スキャンã—ã¦ã„ã¾ã™â€¦"
-#: git-gui.sh:1454
+#: git-gui.sh:1639
msgid "Calling prepare-commit-msg hook..."
msgstr "prepare-commit-msg フックを実行中・・・"
-#: git-gui.sh:1471
+#: git-gui.sh:1656
msgid "Commit declined by prepare-commit-msg hook."
msgstr "prepare-commit-msg フックãŒã‚³ãƒŸãƒƒãƒˆã‚’æ‹’å¦ã—ã¾ã—ãŸ"
-#: git-gui.sh:1629 lib/browser.tcl:246
+#: git-gui.sh:1814 lib/browser.tcl:252
msgid "Ready."
msgstr "準備完了"
-#: git-gui.sh:1787
+#: git-gui.sh:1978
#, tcl-format
-msgid "Displaying only %s of %s files."
-msgstr "全体ã§%s個ã®å†…ã®%sファイルã ã‘表示ã—ã¦ã„ã¾ã™"
+msgid ""
+"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files."
+msgstr ""
+"表示å¯èƒ½ãªé™ç•Œ (gui.maxfilesdisplayed = %s) ã«é”ã—ãŸã‚ã€å…¨ä½“ã§%s個ã®ãƒ•ã‚¡ã‚¤ãƒ«"
+"を表示ã§ãã¾ã›ã‚“"
-#: git-gui.sh:1913
+#: git-gui.sh:2101
msgid "Unmodified"
msgstr "変更無ã—"
-#: git-gui.sh:1915
+#: git-gui.sh:2103
msgid "Modified, not staged"
msgstr "変更ã‚ã‚Šã€ã‚³ãƒŸãƒƒãƒˆæœªäºˆå®š"
-#: git-gui.sh:1916 git-gui.sh:1924
+#: git-gui.sh:2104 git-gui.sh:2116
msgid "Staged for commit"
msgstr "コミット予定済"
-#: git-gui.sh:1917 git-gui.sh:1925
+#: git-gui.sh:2105 git-gui.sh:2117
msgid "Portions staged for commit"
msgstr "部分的ã«ã‚³ãƒŸãƒƒãƒˆäºˆå®šæ¸ˆ"
-#: git-gui.sh:1918 git-gui.sh:1926
+#: git-gui.sh:2106 git-gui.sh:2118
msgid "Staged for commit, missing"
msgstr "コミット予定済ã€ãƒ•ã‚¡ã‚¤ãƒ«ç„¡ã—"
-#: git-gui.sh:1920
+#: git-gui.sh:2108
msgid "File type changed, not staged"
msgstr "ファイル型変更ã€ã‚³ãƒŸãƒƒãƒˆæœªäºˆå®š"
-#: git-gui.sh:1921
+#: git-gui.sh:2109 git-gui.sh:2110
+msgid "File type changed, old type staged for commit"
+msgstr "ファイル型変更ã€æ—§åž‹ã‚³ãƒŸãƒƒãƒˆäºˆå®šæ¸ˆ"
+
+#: git-gui.sh:2111
msgid "File type changed, staged"
msgstr "ファイル型変更ã€ã‚³ãƒŸãƒƒãƒˆäºˆå®šæ¸ˆ"
-#: git-gui.sh:1923
+#: git-gui.sh:2112
+msgid "File type change staged, modification not staged"
+msgstr "ファイル型変更コミット予定済ã€å¤‰æ›´ã‚³ãƒŸãƒƒãƒˆæœªäºˆå®š"
+
+#: git-gui.sh:2113
+msgid "File type change staged, file missing"
+msgstr "ファイル型変更コミット予定済ã€ãƒ•ã‚¡ã‚¤ãƒ«ç„¡ã—"
+
+#: git-gui.sh:2115
msgid "Untracked, not staged"
msgstr "管ç†å¤–ã€ã‚³ãƒŸãƒƒãƒˆæœªäºˆå®š"
-#: git-gui.sh:1928
+#: git-gui.sh:2120
msgid "Missing"
msgstr "ファイル無ã—"
-#: git-gui.sh:1929
+#: git-gui.sh:2121
msgid "Staged for removal"
msgstr "削除予定済"
-#: git-gui.sh:1930
+#: git-gui.sh:2122
msgid "Staged for removal, still present"
msgstr "削除予定済ã€ãƒ•ã‚¡ã‚¤ãƒ«æœªå‰Šé™¤"
-#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935
-#: git-gui.sh:1936 git-gui.sh:1937
+#: git-gui.sh:2124 git-gui.sh:2125 git-gui.sh:2126 git-gui.sh:2127
+#: git-gui.sh:2128 git-gui.sh:2129
msgid "Requires merge resolution"
msgstr "è¦ãƒžãƒ¼ã‚¸è§£æ±º"
-#: git-gui.sh:1972
+#: git-gui.sh:2164
msgid "Starting gitk... please wait..."
msgstr "gitk を起動中…ãŠå¾…ã¡ä¸‹ã•ã„…"
-#: git-gui.sh:1984
+#: git-gui.sh:2176
msgid "Couldn't find gitk in PATH"
msgstr "PATH 中㫠gitk ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: git-gui.sh:2043
+#: git-gui.sh:2235
msgid "Couldn't find git gui in PATH"
msgstr "PATH 中㫠git gui ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: git-gui.sh:2455 lib/choose_repository.tcl:36
+#: git-gui.sh:2654 lib/choose_repository.tcl:41
msgid "Repository"
msgstr "リãƒã‚¸ãƒˆãƒª"
-#: git-gui.sh:2456
+#: git-gui.sh:2655
msgid "Edit"
msgstr "編集"
-#: git-gui.sh:2458 lib/choose_rev.tcl:561
+#: git-gui.sh:2657 lib/choose_rev.tcl:567
msgid "Branch"
msgstr "ブランãƒ"
-#: git-gui.sh:2461 lib/choose_rev.tcl:548
+#: git-gui.sh:2660 lib/choose_rev.tcl:554
msgid "Commit@@noun"
msgstr "コミット"
-#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:2663 lib/merge.tcl:123 lib/merge.tcl:152 lib/merge.tcl:170
msgid "Merge"
msgstr "マージ"
-#: git-gui.sh:2465 lib/choose_rev.tcl:557
+#: git-gui.sh:2664 lib/choose_rev.tcl:563
msgid "Remote"
msgstr "リモート"
-#: git-gui.sh:2468
+#: git-gui.sh:2667
msgid "Tools"
msgstr "ツール"
-#: git-gui.sh:2477
+#: git-gui.sh:2676
msgid "Explore Working Copy"
msgstr "ワーキングコピーをブラウズ"
-#: git-gui.sh:2483
+#: git-gui.sh:2682
+msgid "Git Bash"
+msgstr ""
+
+#: git-gui.sh:2692
msgid "Browse Current Branch's Files"
msgstr "ç¾åœ¨ã®ãƒ–ランãƒã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’見る"
-#: git-gui.sh:2487
+#: git-gui.sh:2696
msgid "Browse Branch Files..."
msgstr "ブランãƒã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’見る…"
-#: git-gui.sh:2492
+#: git-gui.sh:2701
msgid "Visualize Current Branch's History"
msgstr "ç¾åœ¨ã®ãƒ–ランãƒã®å±¥æ­´ã‚’見る"
-#: git-gui.sh:2496
+#: git-gui.sh:2705
msgid "Visualize All Branch History"
msgstr "å…¨ã¦ã®ãƒ–ランãƒã®å±¥æ­´ã‚’見る"
-#: git-gui.sh:2503
+#: git-gui.sh:2712
#, tcl-format
msgid "Browse %s's Files"
msgstr "ブランム%s ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’見る"
-#: git-gui.sh:2505
+#: git-gui.sh:2714
#, tcl-format
msgid "Visualize %s's History"
msgstr "ブランム%s ã®å±¥æ­´ã‚’見る"
-#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:2719 lib/database.tcl:40 lib/database.tcl:66
msgid "Database Statistics"
msgstr "データベース統計"
-#: git-gui.sh:2513 lib/database.tcl:34
+#: git-gui.sh:2722 lib/database.tcl:33
msgid "Compress Database"
msgstr "データベース圧縮"
-#: git-gui.sh:2516
+#: git-gui.sh:2725
msgid "Verify Database"
msgstr "データベース検証"
-#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8
+#: git-gui.sh:2732 git-gui.sh:2736 git-gui.sh:2740 lib/shortcut.tcl:8
#: lib/shortcut.tcl:40 lib/shortcut.tcl:72
msgid "Create Desktop Icon"
msgstr "デスクトップ・アイコンを作る"
-#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
+#: git-gui.sh:2748 lib/choose_repository.tcl:193 lib/choose_repository.tcl:201
msgid "Quit"
msgstr "終了"
-#: git-gui.sh:2547
+#: git-gui.sh:2756
msgid "Undo"
msgstr "å…ƒã«æˆ»ã™"
-#: git-gui.sh:2550
+#: git-gui.sh:2759
msgid "Redo"
msgstr "ã‚„ã‚Šç›´ã—"
-#: git-gui.sh:2554 git-gui.sh:3109
+#: git-gui.sh:2763 git-gui.sh:3368
msgid "Cut"
msgstr "切りå–ã‚Š"
-#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259
+#: git-gui.sh:2766 git-gui.sh:3371 git-gui.sh:3445 git-gui.sh:3530
#: lib/console.tcl:69
msgid "Copy"
msgstr "コピー"
-#: git-gui.sh:2560 git-gui.sh:3115
+#: git-gui.sh:2769 git-gui.sh:3374
msgid "Paste"
msgstr "貼り付ã‘"
-#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26
-#: lib/remote_branch_delete.tcl:38
+#: git-gui.sh:2772 git-gui.sh:3377 lib/remote_branch_delete.tcl:39
+#: lib/branch_delete.tcl:28
msgid "Delete"
msgstr "削除"
-#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71
+#: git-gui.sh:2776 git-gui.sh:3381 git-gui.sh:3534 lib/console.tcl:71
msgid "Select All"
msgstr "å…¨ã¦é¸æŠž"
-#: git-gui.sh:2576
+#: git-gui.sh:2785
msgid "Create..."
msgstr "作æˆâ€¦"
-#: git-gui.sh:2582
+#: git-gui.sh:2791
msgid "Checkout..."
msgstr "ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ"
-#: git-gui.sh:2588
+#: git-gui.sh:2797
msgid "Rename..."
msgstr "åå‰å¤‰æ›´â€¦"
-#: git-gui.sh:2593
+#: git-gui.sh:2802
msgid "Delete..."
msgstr "削除…"
-#: git-gui.sh:2598
+#: git-gui.sh:2807
msgid "Reset..."
msgstr "リセット…"
-#: git-gui.sh:2608
+#: git-gui.sh:2817
msgid "Done"
msgstr "完了"
-#: git-gui.sh:2610
+#: git-gui.sh:2819
msgid "Commit@@verb"
msgstr "コミット"
-#: git-gui.sh:2619 git-gui.sh:3050
+#: git-gui.sh:2828 git-gui.sh:3309
msgid "New Commit"
msgstr "æ–°è¦ã‚³ãƒŸãƒƒãƒˆ"
-#: git-gui.sh:2627 git-gui.sh:3057
+#: git-gui.sh:2836 git-gui.sh:3316
msgid "Amend Last Commit"
msgstr "最新コミットを訂正"
-#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2846 git-gui.sh:3270 lib/remote_branch_delete.tcl:101
msgid "Rescan"
msgstr "å†ã‚¹ã‚­ãƒ£ãƒ³"
-#: git-gui.sh:2643
+#: git-gui.sh:2852
msgid "Stage To Commit"
msgstr "コミット予定ã™ã‚‹"
-#: git-gui.sh:2649
+#: git-gui.sh:2858
msgid "Stage Changed Files To Commit"
msgstr "変更ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’コミット予定"
-#: git-gui.sh:2655
+#: git-gui.sh:2864
msgid "Unstage From Commit"
msgstr "コミットã‹ã‚‰é™ã‚ã™"
-#: git-gui.sh:2661 lib/index.tcl:412
+#: git-gui.sh:2870 lib/index.tcl:442
msgid "Revert Changes"
msgstr "変更を元ã«æˆ»ã™"
-#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341
+#: git-gui.sh:2878 git-gui.sh:3581 git-gui.sh:3612
msgid "Show Less Context"
msgstr "文脈を少ãªã"
-#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345
+#: git-gui.sh:2882 git-gui.sh:3585 git-gui.sh:3616
msgid "Show More Context"
msgstr "文脈を多ã"
-#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133
+#: git-gui.sh:2889 git-gui.sh:3283 git-gui.sh:3392
msgid "Sign Off"
msgstr "ç½²å"
-#: git-gui.sh:2696
+#: git-gui.sh:2905
msgid "Local Merge..."
msgstr "ローカル・マージ…"
-#: git-gui.sh:2701
+#: git-gui.sh:2910
msgid "Abort Merge..."
msgstr "マージ中止…"
-#: git-gui.sh:2713 git-gui.sh:2741
+#: git-gui.sh:2922 git-gui.sh:2950
msgid "Add..."
msgstr "追加"
-#: git-gui.sh:2717
+#: git-gui.sh:2926
msgid "Push..."
msgstr "プッシュ…"
-#: git-gui.sh:2721
+#: git-gui.sh:2930
msgid "Delete Branch..."
msgstr "ブランãƒå‰Šé™¤..."
-#: git-gui.sh:2731 git-gui.sh:3292
+#: git-gui.sh:2940 git-gui.sh:3563
msgid "Options..."
msgstr "オプション…"
-#: git-gui.sh:2742
+#: git-gui.sh:2951
msgid "Remove..."
msgstr "削除..."
-#: git-gui.sh:2751 lib/choose_repository.tcl:50
+#: git-gui.sh:2960 lib/choose_repository.tcl:55
msgid "Help"
msgstr "ヘルプ"
-#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14
-#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
+#: git-gui.sh:2964 git-gui.sh:2968 lib/about.tcl:14
+#: lib/choose_repository.tcl:49 lib/choose_repository.tcl:58
#, tcl-format
msgid "About %s"
msgstr "%s ã«ã¤ã„ã¦"
-#: git-gui.sh:2783
+#: git-gui.sh:2992
msgid "Online Documentation"
msgstr "オンライン・ドキュメント"
-#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
+#: git-gui.sh:2995 lib/choose_repository.tcl:52 lib/choose_repository.tcl:61
msgid "Show SSH Key"
msgstr "SSH キーを表示"
-#: git-gui.sh:2893
+#: git-gui.sh:3014 git-gui.sh:3146
+msgid "Usage"
+msgstr "使ã„æ–¹"
+
+#: git-gui.sh:3095 lib/blame.tcl:573
+msgid "Error"
+msgstr "エラー"
+
+#: git-gui.sh:3126
#, tcl-format
msgid "fatal: cannot stat path %s: No such file or directory"
msgstr ""
"致命的: パス %s ㌠stat ã§ãã¾ã›ã‚“。ãã®ã‚ˆã†ãªãƒ•ã‚¡ã‚¤ãƒ«ã‚„ディレクトリã¯ã‚ã‚Šã¾"
"ã›ã‚“"
-#: git-gui.sh:2926
+#: git-gui.sh:3159
msgid "Current Branch:"
msgstr "ç¾åœ¨ã®ãƒ–ランãƒ"
-#: git-gui.sh:2947
+#: git-gui.sh:3185
msgid "Staged Changes (Will Commit)"
msgstr "ステージングã•ã‚ŒãŸï¼ˆã‚³ãƒŸãƒƒãƒˆäºˆå®šæ¸ˆã®ï¼‰å¤‰æ›´"
-#: git-gui.sh:2967
+#: git-gui.sh:3205
msgid "Unstaged Changes"
msgstr "コミット予定ã«å…¥ã£ã¦ã„ãªã„変更"
-#: git-gui.sh:3017
+#: git-gui.sh:3276
msgid "Stage Changed"
msgstr "変更をコミット予定ã«å…¥ã‚Œã‚‹"
-#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193
+#: git-gui.sh:3295 lib/transport.tcl:137 lib/transport.tcl:229
msgid "Push"
msgstr "プッシュ"
-#: git-gui.sh:3071
+#: git-gui.sh:3330
msgid "Initial Commit Message:"
msgstr "最åˆã®ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸:"
-#: git-gui.sh:3072
+#: git-gui.sh:3331
msgid "Amended Commit Message:"
msgstr "訂正ã—ãŸã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸:"
-#: git-gui.sh:3073
+#: git-gui.sh:3332
msgid "Amended Initial Commit Message:"
msgstr "訂正ã—ãŸæœ€åˆã®ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸:"
-#: git-gui.sh:3074
+#: git-gui.sh:3333
msgid "Amended Merge Commit Message:"
msgstr "訂正ã—ãŸãƒžãƒ¼ã‚¸ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸:"
-#: git-gui.sh:3075
+#: git-gui.sh:3334
msgid "Merge Commit Message:"
msgstr "マージコミットメッセージ:"
-#: git-gui.sh:3076
+#: git-gui.sh:3335
msgid "Commit Message:"
msgstr "コミットメッセージ:"
-#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73
+#: git-gui.sh:3384 git-gui.sh:3538 lib/console.tcl:73
msgid "Copy All"
msgstr "å…¨ã¦ã‚³ãƒ”ー"
-#: git-gui.sh:3149 lib/blame.tcl:104
+#: git-gui.sh:3408 lib/blame.tcl:105
msgid "File:"
msgstr "ファイル:"
-#: git-gui.sh:3255
+#: git-gui.sh:3526
msgid "Refresh"
msgstr "å†èª­ã¿è¾¼ã¿"
-#: git-gui.sh:3276
+#: git-gui.sh:3547
msgid "Decrease Font Size"
msgstr "フォントをå°ã•ã"
-#: git-gui.sh:3280
+#: git-gui.sh:3551
msgid "Increase Font Size"
msgstr "フォントを大ãã"
-#: git-gui.sh:3288 lib/blame.tcl:281
+#: git-gui.sh:3559 lib/blame.tcl:294
msgid "Encoding"
msgstr "エンコーディング"
-#: git-gui.sh:3299
+#: git-gui.sh:3570
msgid "Apply/Reverse Hunk"
msgstr "パッãƒã‚’é©ç”¨/å–り消ã™"
-#: git-gui.sh:3304
+#: git-gui.sh:3575
msgid "Apply/Reverse Line"
msgstr "パッãƒè¡Œã‚’é©ç”¨/å–り消ã™"
-#: git-gui.sh:3323
+#: git-gui.sh:3594
msgid "Run Merge Tool"
msgstr "マージツールを起動"
-#: git-gui.sh:3328
+#: git-gui.sh:3599
msgid "Use Remote Version"
msgstr "リモートã®æ–¹ã‚’採用"
-#: git-gui.sh:3332
+#: git-gui.sh:3603
msgid "Use Local Version"
msgstr "ローカルã®æ–¹ã‚’採用"
-#: git-gui.sh:3336
+#: git-gui.sh:3607
msgid "Revert To Base"
msgstr "ベース版を採用"
-#: git-gui.sh:3354
+#: git-gui.sh:3625
msgid "Visualize These Changes In The Submodule"
msgstr "サブモジュール内ã®ã“れらã®å¤‰æ›´ã‚’見る"
-#: git-gui.sh:3358
+#: git-gui.sh:3629
msgid "Visualize Current Branch History In The Submodule"
msgstr "サブモジュール内ã§ç¾åœ¨ã®ãƒ–ランãƒã®å±¥æ­´ã‚’見る"
-#: git-gui.sh:3362
+#: git-gui.sh:3633
msgid "Visualize All Branch History In The Submodule"
msgstr "サブモジュール内ã§å…¨ã¦ã®ãƒ–ランãƒã®å±¥æ­´ã‚’見る"
-#: git-gui.sh:3367
+#: git-gui.sh:3638
msgid "Start git gui In The Submodule"
msgstr "サブモジュール内ã§git guiã‚’èµ·å‹•ã™ã‚‹"
-#: git-gui.sh:3389
+#: git-gui.sh:3673
msgid "Unstage Hunk From Commit"
msgstr "パッãƒã‚’コミット予定ã‹ã‚‰å¤–ã™"
-#: git-gui.sh:3391
+#: git-gui.sh:3675
msgid "Unstage Lines From Commit"
msgstr "コミット予定ã‹ã‚‰è¡Œã‚’外ã™"
-#: git-gui.sh:3393
+#: git-gui.sh:3677
msgid "Unstage Line From Commit"
msgstr "コミット予定ã‹ã‚‰è¡Œã‚’外ã™"
-#: git-gui.sh:3396
+#: git-gui.sh:3680
msgid "Stage Hunk For Commit"
msgstr "パッãƒã‚’コミット予定ã«åŠ ãˆã‚‹"
-#: git-gui.sh:3398
+#: git-gui.sh:3682
msgid "Stage Lines For Commit"
msgstr "パッãƒè¡Œã‚’コミット予定ã«åŠ ãˆã‚‹"
-#: git-gui.sh:3400
+#: git-gui.sh:3684
msgid "Stage Line For Commit"
msgstr "パッãƒè¡Œã‚’コミット予定ã«åŠ ãˆã‚‹"
-#: git-gui.sh:3424
+#: git-gui.sh:3709
msgid "Initializing..."
msgstr "åˆæœŸåŒ–ã—ã¦ã„ã¾ã™â€¦"
-#: git-gui.sh:3541
+#: git-gui.sh:3852
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
@@ -543,7 +573,7 @@ msgstr ""
"以下ã®ç’°å¢ƒå¤‰æ•°ã¯ %s ãŒèµ·å‹•ã™ã‚‹ Git サブプロセスã«ã‚ˆã£ã¦ç„¡è¦–ã•ã‚Œã‚‹ã§ã—ょã†:\n"
"\n"
-#: git-gui.sh:3570
+#: git-gui.sh:3881
msgid ""
"\n"
"This is due to a known issue with the\n"
@@ -553,7 +583,7 @@ msgstr ""
"ã“れ㯠Cygwin ã§é…布ã•ã‚Œã¦ã„ã‚‹ Tcl ãƒã‚¤ãƒŠãƒªã«\n"
"é–¢ã—ã¦ã®æ—¢çŸ¥ã®å•é¡Œã«ã‚ˆã‚Šã¾ã™"
-#: git-gui.sh:3575
+#: git-gui.sh:3886
#, tcl-format
msgid ""
"\n"
@@ -568,249 +598,294 @@ msgstr ""
"個人的㪠~/.gitconfig ファイル内㧠user.name 㨠user.email ã®å€¤ã‚’設定\n"
"ã™ã‚‹ã®ãŒã€%s ã®è‰¯ã„代用ã¨ãªã‚Šã¾ã™\n"
-#: lib/about.tcl:26
-msgid "git-gui - a graphical user interface for Git."
-msgstr "Git ã®ã‚°ãƒ©ãƒ•ã‚£ã‚«ãƒ«UI git-gui"
-
-#: lib/blame.tcl:72
-msgid "File Viewer"
-msgstr "ファイルピューワ"
-
-#: lib/blame.tcl:78
-msgid "Commit:"
-msgstr "コミット:"
-
-#: lib/blame.tcl:271
-msgid "Copy Commit"
-msgstr "コミットをコピー"
-
-#: lib/blame.tcl:275
-msgid "Find Text..."
-msgstr "テキストを検索"
-
-#: lib/blame.tcl:284
-msgid "Do Full Copy Detection"
-msgstr "コピー検知"
-
-#: lib/blame.tcl:288
-msgid "Show History Context"
-msgstr "文脈を見ã›ã‚‹"
+#: lib/merge.tcl:13
+msgid ""
+"Cannot merge while amending.\n"
+"\n"
+"You must finish amending this commit before starting any type of merge.\n"
+msgstr ""
+"訂正中ã«ã¯ãƒžãƒ¼ã‚¸ã§ãã¾ã›ã‚“。\n"
+"\n"
+"訂正処ç†ã‚’完了ã™ã‚‹ã¾ã§ã¯æ–°ãŸã«ãƒžãƒ¼ã‚¸ã‚’開始ã§ãã¾ã›ã‚“。\n"
-#: lib/blame.tcl:291
-msgid "Blame Parent Commit"
-msgstr "親コミットを註釈"
+#: lib/merge.tcl:27
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan. A "
+"rescan must be performed before a merge can be performed.\n"
+"\n"
+"The rescan will be automatically started now.\n"
+msgstr ""
+"最後ã«ã‚¹ã‚­ãƒ£ãƒ³ã—ãŸçŠ¶æ…‹ã¯ãƒªãƒã‚¸ãƒˆãƒªã®çŠ¶æ…‹ã¨åˆè‡´ã—ã¾ã›ã‚“。\n"
+"\n"
+"最後ã«ã‚¹ã‚­ãƒ£ãƒ³ã—ã¦ä»¥å¾Œã€åˆ¥ã® Git プログラムãŒãƒªãƒã‚¸ãƒˆãƒªã‚’変更ã—ã¦ã„ã¾ã™ã€‚マー"
+"ジを開始ã™ã‚‹å‰ã«ã€å†ã‚¹ã‚­ãƒ£ãƒ³ãŒå¿…è¦ã§ã™ã€‚\n"
+"\n"
+"自動的ã«å†ã‚¹ã‚­ãƒ£ãƒ³ã‚’開始ã—ã¾ã™ã€‚\n"
-#: lib/blame.tcl:450
+#: lib/merge.tcl:45
#, tcl-format
-msgid "Reading %s..."
-msgstr "%s を読んã§ã„ã¾ã™â€¦"
-
-#: lib/blame.tcl:557
-msgid "Loading copy/move tracking annotations..."
-msgstr "コピー・移動追跡データを読んã§ã„ã¾ã™â€¦"
-
-#: lib/blame.tcl:577
-msgid "lines annotated"
-msgstr "行を注釈ã—ã¾ã—ãŸ"
+msgid ""
+"You are in the middle of a conflicted merge.\n"
+"\n"
+"File %s has merge conflicts.\n"
+"\n"
+"You must resolve them, stage the file, and commit to complete the current "
+"merge. Only then can you begin another merge.\n"
+msgstr ""
+"è¡çªã®ã‚ã£ãŸãƒžãƒ¼ã‚¸ã®é€”中ã§ã™ã€‚\n"
+"\n"
+"ファイル %s ã«ã¯ãƒžãƒ¼ã‚¸ä¸­ã®è¡çªãŒæ®‹ã£ã¦ã„ã¾ã™ã€‚\n"
+"\n"
+"ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®è¡çªã‚’解決ã—ã€ã‚³ãƒŸãƒƒãƒˆäºˆå®šã«åŠ ãˆã¦ã€ã‚³ãƒŸãƒƒãƒˆã™ã‚‹ã“ã¨ã§ãƒžãƒ¼ã‚¸ã‚’"
+"完了ã—ã¾ã™ã€‚ãã†ã‚„ã£ã¦å§‹ã‚ã¦ã€æ–°ãŸãªãƒžãƒ¼ã‚¸ã‚’開始ã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚\n"
-#: lib/blame.tcl:769
-msgid "Loading original location annotations..."
-msgstr "å…ƒä½ç½®è¡Œã®æ³¨é‡ˆãƒ‡ãƒ¼ã‚¿ã‚’読んã§ã„ã¾ã™â€¦"
+#: lib/merge.tcl:55
+#, tcl-format
+msgid ""
+"You are in the middle of a change.\n"
+"\n"
+"File %s is modified.\n"
+"\n"
+"You should complete the current commit before starting a merge. Doing so "
+"will help you abort a failed merge, should the need arise.\n"
+msgstr ""
+"変更ã®é€”中ã§ã™ã€‚\n"
+"\n"
+"ファイル %s ã¯å¤‰æ›´ä¸­ã§ã™ã€‚\n"
+"\n"
+"ç¾åœ¨ã®ã‚³ãƒŸãƒƒãƒˆã‚’完了ã—ã¦ã‹ã‚‰ãƒžãƒ¼ã‚¸ã‚’開始ã—ã¦ä¸‹ã•ã„。ãã†ã™ã‚‹æ–¹ãŒãƒžãƒ¼ã‚¸ã«å¤±æ•—"
+"ã—ãŸã¨ãã®å›žå¾©ãŒæ¥½ã§ã™ã€‚\n"
-#: lib/blame.tcl:772
-msgid "Annotation complete."
-msgstr "注釈完了ã—ã¾ã—ãŸ"
+#: lib/merge.tcl:108
+#, tcl-format
+msgid "%s of %s"
+msgstr "%s ã® %s ブランãƒ"
-#: lib/blame.tcl:802
-msgid "Busy"
-msgstr "実行中"
+#: lib/merge.tcl:122
+#, tcl-format
+msgid "Merging %s and %s..."
+msgstr "%s 㨠%s をマージ中・・・"
-#: lib/blame.tcl:803
-msgid "Annotation process is already running."
-msgstr "ã™ã§ã« blame プロセスを実行中ã§ã™ã€‚"
+#: lib/merge.tcl:133
+msgid "Merge completed successfully."
+msgstr "マージãŒå®Œäº†ã—ã¾ã—ãŸ"
-#: lib/blame.tcl:842
-msgid "Running thorough copy detection..."
-msgstr "コピー検知を実行中…"
+#: lib/merge.tcl:135
+msgid "Merge failed. Conflict resolution is required."
+msgstr "マージãŒå¤±æ•—ã—ã¾ã—ãŸã€‚è¡çªã®è§£æ±ºãŒå¿…è¦ã§ã™ã€‚"
-#: lib/blame.tcl:910
-msgid "Loading annotation..."
-msgstr "注釈を読ã¿è¾¼ã‚“ã§ã„ã¾ã™â€¦"
+#: lib/merge.tcl:160
+#, tcl-format
+msgid "Merge Into %s"
+msgstr "%s ã«ãƒžãƒ¼ã‚¸"
-#: lib/blame.tcl:963
-msgid "Author:"
-msgstr "作者:"
+#: lib/merge.tcl:166 lib/checkout_op.tcl:567 lib/tools_dlg.tcl:336
+msgid "Visualize"
+msgstr "å¯è¦–化"
-#: lib/blame.tcl:967
-msgid "Committer:"
-msgstr "コミット者:"
+#: lib/merge.tcl:174 lib/remote_branch_delete.tcl:43 lib/branch_delete.tcl:34
+#: lib/checkout_op.tcl:579 lib/branch_rename.tcl:32 lib/tools_dlg.tcl:41
+#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/option.tcl:127
+#: lib/transport.tcl:141 lib/choose_font.tcl:45 lib/branch_checkout.tcl:30
+#: lib/browser.tcl:292 lib/remote_add.tcl:34 lib/branch_create.tcl:37
+msgid "Cancel"
+msgstr "中止"
-#: lib/blame.tcl:972
-msgid "Original File:"
-msgstr "元ファイル"
+#: lib/merge.tcl:179
+msgid "Revision To Merge"
+msgstr "マージã™ã‚‹ãƒªãƒ“ジョン"
-#: lib/blame.tcl:1020
-msgid "Cannot find HEAD commit:"
-msgstr "HEAD コミットãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
+#: lib/merge.tcl:214
+msgid ""
+"Cannot abort while amending.\n"
+"\n"
+"You must finish amending this commit.\n"
+msgstr ""
+"訂正中ã«ã¯ä¸­æ­¢ã§ãã¾ã›ã‚“。\n"
+"\n"
+"ã¾ãšä»Šã®ã‚³ãƒŸãƒƒãƒˆè¨‚正を完了ã•ã›ã¦ä¸‹ã•ã„。\n"
-#: lib/blame.tcl:1075
-msgid "Cannot find parent commit:"
-msgstr "親コミットãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“:"
+#: lib/merge.tcl:224
+msgid ""
+"Abort merge?\n"
+"\n"
+"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
+"\n"
+"Continue with aborting the current merge?"
+msgstr ""
+"マージを中断ã—ã¾ã™ã‹ï¼Ÿ\n"
+"\n"
+"ç¾åœ¨ã®ãƒžãƒ¼ã‚¸ã‚’中断ã™ã‚‹ã¨ã€ã‚³ãƒŸãƒƒãƒˆã—ã¦ã„ãªã„å…¨ã¦ã®å¤‰æ›´ãŒå¤±ã‚ã‚Œã¾ã™ã€‚\n"
+"\n"
+"マージを中断ã—ã¦ã‚ˆã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
-#: lib/blame.tcl:1090
-msgid "Unable to display parent"
-msgstr "親を表示ã§ãã¾ã›ã‚“"
+#: lib/merge.tcl:230
+msgid ""
+"Reset changes?\n"
+"\n"
+"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
+"\n"
+"Continue with resetting the current changes?"
+msgstr ""
+"変更点をリセットã—ã¾ã™ã‹ï¼Ÿ\n"
+"\n"
+"変更点をリセットã™ã‚‹ã¨ã€ã‚³ãƒŸãƒƒãƒˆã—ã¦ã„ãªã„å…¨ã¦ã®å¤‰æ›´ãŒå¤±ã‚ã‚Œã¾ã™ã€‚\n"
+"\n"
+"リセットã—ã¦ã‚ˆã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
-#: lib/blame.tcl:1091 lib/diff.tcl:320
-msgid "Error loading diff:"
-msgstr "diff を読む際ã®ã‚¨ãƒ©ãƒ¼ã§ã™:"
+#: lib/merge.tcl:241
+msgid "Aborting"
+msgstr "中断ã—ã¦ã„ã¾ã™"
-#: lib/blame.tcl:1231
-msgid "Originally By:"
-msgstr "原作者:"
+#: lib/merge.tcl:241
+msgid "files reset"
+msgstr "リセットã—ãŸãƒ•ã‚¡ã‚¤ãƒ«"
-#: lib/blame.tcl:1237
-msgid "In File:"
-msgstr "ファイル:"
+#: lib/merge.tcl:269
+msgid "Abort failed."
+msgstr "中断ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: lib/blame.tcl:1242
-msgid "Copied Or Moved Here By:"
-msgstr "複写・移動者:"
+#: lib/merge.tcl:271
+msgid "Abort completed. Ready."
+msgstr "中断完了。"
-#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
-msgid "Checkout Branch"
-msgstr "ブランãƒã‚’ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ"
+#: lib/error.tcl:20 lib/error.tcl:116
+msgid "error"
+msgstr "エラー"
-#: lib/branch_checkout.tcl:23
-msgid "Checkout"
-msgstr "ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ"
+#: lib/error.tcl:36
+msgid "warning"
+msgstr "警告"
-#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
-#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172
-#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
-#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
-#: lib/transport.tcl:108
-msgid "Cancel"
-msgstr "中止"
+#: lib/error.tcl:96
+msgid "You must correct the above errors before committing."
+msgstr "コミットã™ã‚‹å‰ã«ã€ä»¥ä¸Šã®ã‚¨ãƒ©ãƒ¼ã‚’修正ã—ã¦ä¸‹ã•ã„"
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
-msgid "Revision"
-msgstr "リビジョン"
+#: lib/date.tcl:25
+#, tcl-format
+msgid "Invalid date from Git: %s"
+msgstr "Git ã‹ã‚‰å‡ºãŸç„¡åŠ¹ãªæ—¥ä»˜: %s"
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
-msgid "Options"
-msgstr "オプション"
+#: lib/encoding.tcl:443
+msgid "Default"
+msgstr "デフォールト"
-#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
-msgid "Fetch Tracking Branch"
-msgstr "トラッキング・ブランãƒã‚’フェッãƒ"
+#: lib/encoding.tcl:448
+#, tcl-format
+msgid "System (%s)"
+msgstr "システム (%s)"
-#: lib/branch_checkout.tcl:44
-msgid "Detach From Local Branch"
-msgstr "ローカル・ブランãƒã‹ã‚‰å‰Šé™¤"
+#: lib/encoding.tcl:459 lib/encoding.tcl:465
+msgid "Other"
+msgstr "ãã®ä»–"
-#: lib/branch_create.tcl:22
-msgid "Create Branch"
-msgstr "ブランãƒã‚’作æˆ"
+#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
+msgid "Delete Branch Remotely"
+msgstr "リモートブランãƒå‰Šé™¤"
-#: lib/branch_create.tcl:27
-msgid "Create New Branch"
-msgstr "ブランãƒã‚’æ–°è¦ä½œæˆ"
+#: lib/remote_branch_delete.tcl:48
+msgid "From Repository"
+msgstr "å…ƒã®ãƒªãƒã‚¸ãƒˆãƒª"
-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381
-msgid "Create"
-msgstr "作æˆ"
+#: lib/remote_branch_delete.tcl:51 lib/transport.tcl:165
+msgid "Remote:"
+msgstr "リモート:"
-#: lib/branch_create.tcl:40
-msgid "Branch Name"
-msgstr "ブランãƒå"
+#: lib/remote_branch_delete.tcl:72 lib/transport.tcl:187
+msgid "Arbitrary Location:"
+msgstr "ä»»æ„ã®ä½ç½®:"
-#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
-msgid "Name:"
-msgstr "åå‰:"
+#: lib/remote_branch_delete.tcl:88
+msgid "Branches"
+msgstr "ブランãƒ"
-#: lib/branch_create.tcl:58
-msgid "Match Tracking Branch Name"
-msgstr "トラッキング・ブランãƒåã‚’åˆã‚ã›ã‚‹"
+#: lib/remote_branch_delete.tcl:110
+msgid "Delete Only If"
+msgstr "æ¡ä»¶ä»˜ã§å‰Šé™¤"
-#: lib/branch_create.tcl:66
-msgid "Starting Revision"
-msgstr "åˆæœŸãƒªãƒ“ジョン"
+#: lib/remote_branch_delete.tcl:112
+msgid "Merged Into:"
+msgstr "マージ先:"
-#: lib/branch_create.tcl:72
-msgid "Update Existing Branch:"
-msgstr "既存ã®ãƒ–ランãƒã‚’æ›´æ–°:"
+#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53
+msgid "Always (Do not perform merge checks)"
+msgstr "ç„¡æ¡ä»¶ï¼ˆãƒžãƒ¼ã‚¸æ¤œæŸ»ã‚’ã—ãªã„)"
-#: lib/branch_create.tcl:75
-msgid "No"
-msgstr "ã„ã„ãˆ"
+#: lib/remote_branch_delete.tcl:153
+msgid "A branch is required for 'Merged Into'."
+msgstr "'マージ先' ã«ã¯ãƒ–ランãƒãŒå¿…è¦ã§ã™ã€‚"
-#: lib/branch_create.tcl:80
-msgid "Fast Forward Only"
-msgstr "æ—©é€ã‚Šã®ã¿"
+#: lib/remote_branch_delete.tcl:185
+#, tcl-format
+msgid ""
+"The following branches are not completely merged into %s:\n"
+"\n"
+" - %s"
+msgstr ""
+"以下ã®ãƒ–ランãƒã¯ %s ã«å®Œå…¨ã«ãƒžãƒ¼ã‚¸ã•ã‚Œã¦ã„ã¾ã›ã‚“:\n"
+"\n"
+" - %s"
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571
-msgid "Reset"
-msgstr "リセット"
+#: lib/remote_branch_delete.tcl:190
+#, tcl-format
+msgid ""
+"One or more of the merge tests failed because you have not fetched the "
+"necessary commits. Try fetching from %s first."
+msgstr ""
+"å¿…è¦ãªã‚³ãƒŸãƒƒãƒˆãŒä¸è¶³ã—ã¦ã„ã‚‹ãŸã‚ã«ã€ãƒžãƒ¼ã‚¸æ¤œæŸ»ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚ã¾ãš %s ã‹ã‚‰"
+"フェッãƒã—ã¦ä¸‹ã•ã„。"
-#: lib/branch_create.tcl:97
-msgid "Checkout After Creation"
-msgstr "作æˆã—ã¦ã™ããƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ"
+#: lib/remote_branch_delete.tcl:208
+msgid "Please select one or more branches to delete."
+msgstr "削除ã™ã‚‹ãƒ–ランãƒã‚’é¸æŠžã—ã¦ä¸‹ã•ã„。"
-#: lib/branch_create.tcl:131
-msgid "Please select a tracking branch."
-msgstr "トラッキング・ブランãƒã‚’é¸æŠžã—ã¦ä¸‹ã•ã„。"
+#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115
+msgid ""
+"Recovering deleted branches is difficult.\n"
+"\n"
+"Delete the selected branches?"
+msgstr ""
+"削除ã—ãŸãƒ–ランãƒã‚’回復ã™ã‚‹ã®ã¯å›°é›£ã§ã™ã€‚\n"
+"\n"
+"é¸æŠžã—ãŸãƒ–ランãƒã‚’削除ã—ã¦è‰¯ã„ã§ã™ã‹ï¼Ÿ"
-#: lib/branch_create.tcl:140
+#: lib/remote_branch_delete.tcl:227
#, tcl-format
-msgid "Tracking branch %s is not a branch in the remote repository."
-msgstr "トラッキング・ブランム%s ã¯é éš”リãƒã‚¸ãƒˆãƒªã®ãƒ–ランãƒã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
+msgid "Deleting branches from %s"
+msgstr "%s ã‹ã‚‰ãƒ–ランãƒã‚’削除ã—ã¦ã„ã¾ã™ã€‚"
-#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
-msgid "Please supply a branch name."
-msgstr "ブランãƒåを指定ã—ã¦ä¸‹ã•ã„。"
+#: lib/remote_branch_delete.tcl:300
+msgid "No repository selected."
+msgstr "リãƒã‚¸ãƒˆãƒªãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
+#: lib/remote_branch_delete.tcl:305
#, tcl-format
-msgid "'%s' is not an acceptable branch name."
-msgstr "'%s' ã¯ãƒ–ランãƒåã«ä½¿ãˆã¾ã›ã‚“。"
+msgid "Scanning %s..."
+msgstr "%s をスキャンã—ã¦ã„ã¾ã™â€¦"
-#: lib/branch_delete.tcl:15
+#: lib/branch_delete.tcl:16
msgid "Delete Branch"
msgstr "ブランãƒå‰Šé™¤"
-#: lib/branch_delete.tcl:20
+#: lib/branch_delete.tcl:21
msgid "Delete Local Branch"
msgstr "ローカル・ブランãƒã‚’削除"
-#: lib/branch_delete.tcl:37
+#: lib/branch_delete.tcl:39
msgid "Local Branches"
msgstr "ローカル・ブランãƒ"
-#: lib/branch_delete.tcl:52
+#: lib/branch_delete.tcl:51
msgid "Delete Only If Merged Into"
msgstr "マージ済ã¿ã®æ™‚ã®ã¿å‰Šé™¤"
-#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119
-msgid "Always (Do not perform merge checks)"
-msgstr "ç„¡æ¡ä»¶ï¼ˆãƒžãƒ¼ã‚¸æ¤œæŸ»ã‚’ã—ãªã„)"
-
#: lib/branch_delete.tcl:103
#, tcl-format
msgid "The following branches are not completely merged into %s:"
msgstr "以下ã®ãƒ–ランãƒã¯ %s ã«å®Œå…¨ã«ãƒžãƒ¼ã‚¸ã•ã‚Œã¦ã„ã¾ã›ã‚“:"
-#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217
-msgid ""
-"Recovering deleted branches is difficult.\n"
-"\n"
-"Delete the selected branches?"
-msgstr ""
-"削除ã—ãŸãƒ–ランãƒã‚’回復ã™ã‚‹ã®ã¯å›°é›£ã§ã™ã€‚\n"
-"\n"
-"é¸æŠžã—ãŸãƒ–ランãƒã‚’削除ã—ã¦è‰¯ã„ã§ã™ã‹ï¼Ÿ"
-
#: lib/branch_delete.tcl:141
#, tcl-format
msgid ""
@@ -820,62 +895,63 @@ msgstr ""
"以下ã®ãƒ–ランãƒã‚’削除ã§ãã¾ã›ã‚“:\n"
"%s"
-#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
-msgid "Rename Branch"
-msgstr "ブランãƒã®åå‰å¤‰æ›´"
+#: lib/choose_rev.tcl:52
+msgid "This Detached Checkout"
+msgstr "分離ã•ã‚ŒãŸãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ"
-#: lib/branch_rename.tcl:26
-msgid "Rename"
-msgstr "åå‰å¤‰æ›´"
+#: lib/choose_rev.tcl:60
+msgid "Revision Expression:"
+msgstr "リビジョンå¼:"
-#: lib/branch_rename.tcl:36
-msgid "Branch:"
-msgstr "ブランãƒ:"
+#: lib/choose_rev.tcl:72
+msgid "Local Branch"
+msgstr "ローカル・ブランãƒ"
-#: lib/branch_rename.tcl:39
-msgid "New Name:"
-msgstr "æ–°ã—ã„åå‰:"
+#: lib/choose_rev.tcl:77
+msgid "Tracking Branch"
+msgstr "トラッキング・ブランãƒ"
-#: lib/branch_rename.tcl:75
-msgid "Please select a branch to rename."
-msgstr "åå‰ã‚’変更ã™ã‚‹ãƒ–ランãƒã‚’é¸ã‚“ã§ä¸‹ã•ã„。"
+#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544
+msgid "Tag"
+msgstr "ã‚¿ã‚°"
-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202
+#: lib/choose_rev.tcl:321
#, tcl-format
-msgid "Branch '%s' already exists."
-msgstr "'%s'ã¨ã„ã†ãƒ–ランãƒã¯æ—¢ã«å­˜åœ¨ã—ã¾ã™ã€‚"
+msgid "Invalid revision: %s"
+msgstr "無効ãªãƒªãƒ“ジョン: %s"
-#: lib/branch_rename.tcl:117
-#, tcl-format
-msgid "Failed to rename '%s'."
-msgstr "'%s'ã®åå‰å¤‰æ›´ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+#: lib/choose_rev.tcl:342
+msgid "No revision selected."
+msgstr "リビジョンãŒæœªé¸æŠžã§ã™ã€‚"
-#: lib/browser.tcl:17
-msgid "Starting..."
-msgstr "起動中…"
+#: lib/choose_rev.tcl:350
+msgid "Revision expression is empty."
+msgstr "リビジョンå¼ãŒç©ºã§ã™ã€‚"
-#: lib/browser.tcl:26
-msgid "File Browser"
-msgstr "ファイル・ブラウザ"
+#: lib/choose_rev.tcl:537
+msgid "Updated"
+msgstr "æ›´æ–°ã—ã¾ã—ãŸ"
-#: lib/browser.tcl:126 lib/browser.tcl:143
-#, tcl-format
-msgid "Loading %s..."
-msgstr "%s をロード中…"
+#: lib/choose_rev.tcl:565
+msgid "URL"
+msgstr "URL"
-#: lib/browser.tcl:187
-msgid "[Up To Parent]"
-msgstr "[上ä½ãƒ•ã‚©ãƒ«ãƒ€ã¸]"
+#: lib/console.tcl:59
+msgid "Working... please wait..."
+msgstr "実行中…ãŠå¾…ã¡ä¸‹ã•ã„…"
-#: lib/browser.tcl:267 lib/browser.tcl:273
-msgid "Browse Branch Files"
-msgstr "ç¾åœ¨ã®ãƒ–ランãƒã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’見る"
+#: lib/console.tcl:81 lib/checkout_op.tcl:146 lib/database.tcl:30
+#: lib/sshkey.tcl:55
+msgid "Close"
+msgstr "é–‰ã˜ã‚‹"
-#: lib/browser.tcl:278 lib/choose_repository.tcl:398
-#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497
-#: lib/choose_repository.tcl:1028
-msgid "Browse"
-msgstr "ブラウズ"
+#: lib/console.tcl:186
+msgid "Success"
+msgstr "æˆåŠŸ"
+
+#: lib/console.tcl:200
+msgid "Error: Command Failed"
+msgstr "エラー: コマンドãŒå¤±æ•—ã—ã¾ã—ãŸ"
#: lib/checkout_op.tcl:85
#, tcl-format
@@ -887,11 +963,6 @@ msgstr "%s ã‹ã‚‰ %s をフェッãƒã—ã¦ã„ã¾ã™"
msgid "fatal: Cannot resolve %s"
msgstr "致命的エラー: %s を解決ã§ãã¾ã›ã‚“"
-#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31
-#: lib/sshkey.tcl:53
-msgid "Close"
-msgstr "é–‰ã˜ã‚‹"
-
#: lib/checkout_op.tcl:175
#, tcl-format
msgid "Branch '%s' does not exist."
@@ -902,6 +973,11 @@ msgstr "ブランãƒ'%s'ã¯å­˜åœ¨ã—ã¾ã›ã‚“。"
msgid "Failed to configure simplified git-pull for '%s'."
msgstr "'%s' ã«ç°¡æ˜“ git-pull を設定ã§ãã¾ã›ã‚“ã§ã—ãŸ"
+#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102
+#, tcl-format
+msgid "Branch '%s' already exists."
+msgstr "'%s'ã¨ã„ã†ãƒ–ランãƒã¯æ—¢ã«å­˜åœ¨ã—ã¾ã™ã€‚"
+
#: lib/checkout_op.tcl:229
#, tcl-format
msgid ""
@@ -999,9 +1075,9 @@ msgstr "失ãªã‚ã‚ŒãŸã‚³ãƒŸãƒƒãƒˆã‚’回復ã™ã‚‹ã®ã¯ç°¡å˜ã§ã¯ã‚ã‚Šã¾ã›
msgid "Reset '%s'?"
msgstr "'%s' をリセットã—ã¾ã™ã‹ï¼Ÿ"
-#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343
-msgid "Visualize"
-msgstr "å¯è¦–化"
+#: lib/checkout_op.tcl:571 lib/branch_create.tcl:85
+msgid "Reset"
+msgstr "リセット"
#: lib/checkout_op.tcl:635
#, tcl-format
@@ -1019,509 +1095,838 @@ msgstr ""
"ã¾ã—ãŸãŒã€ Git ã®å†…部データを更新ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚\n"
"èµ·ã“ã‚‹ã¯ãšã®ãªã„エラーã§ã™ã€‚ã‚ãらã‚㦠%s を終了ã—ã¾ã™ã€‚"
-#: lib/choose_font.tcl:39
-msgid "Select"
-msgstr "é¸æŠž"
+#: lib/blame.tcl:73
+msgid "File Viewer"
+msgstr "ファイルピューワ"
-#: lib/choose_font.tcl:53
-msgid "Font Family"
-msgstr "フォント・ファミリー"
+#: lib/blame.tcl:79
+msgid "Commit:"
+msgstr "コミット:"
-#: lib/choose_font.tcl:74
-msgid "Font Size"
-msgstr "フォントã®å¤§ãã•"
+#: lib/blame.tcl:280
+msgid "Copy Commit"
+msgstr "コミットをコピー"
-#: lib/choose_font.tcl:91
-msgid "Font Example"
-msgstr "フォント・サンプル"
+#: lib/blame.tcl:284
+msgid "Find Text..."
+msgstr "テキストを検索"
-#: lib/choose_font.tcl:103
-msgid ""
-"This is example text.\n"
-"If you like this text, it can be your font."
-msgstr ""
-"ã“ã‚Œã¯ã‚µãƒ³ãƒ—ル文ã§ã™ã€‚\n"
-"ã“ã®ãƒ•ã‚©ãƒ³ãƒˆãŒæ°—ã«å…¥ã‚Œã°ãŠä½¿ã„ã«ãªã‚Œã¾ã™ã€‚"
+#: lib/blame.tcl:288
+msgid "Goto Line..."
+msgstr "指定行ã«ç§»å‹•â€¦"
+
+#: lib/blame.tcl:297
+msgid "Do Full Copy Detection"
+msgstr "コピー検知"
+
+#: lib/blame.tcl:301
+msgid "Show History Context"
+msgstr "文脈を見ã›ã‚‹"
+
+#: lib/blame.tcl:304
+msgid "Blame Parent Commit"
+msgstr "親コミットを注釈"
+
+#: lib/blame.tcl:466
+#, tcl-format
+msgid "Reading %s..."
+msgstr "%s を読んã§ã„ã¾ã™â€¦"
+
+#: lib/blame.tcl:594
+msgid "Loading copy/move tracking annotations..."
+msgstr "コピー・移動追跡データを読んã§ã„ã¾ã™â€¦"
+
+#: lib/blame.tcl:614
+msgid "lines annotated"
+msgstr "行を注釈ã—ã¾ã—ãŸ"
+
+#: lib/blame.tcl:806
+msgid "Loading original location annotations..."
+msgstr "å…ƒä½ç½®è¡Œã®æ³¨é‡ˆãƒ‡ãƒ¼ã‚¿ã‚’読んã§ã„ã¾ã™â€¦"
+
+#: lib/blame.tcl:809
+msgid "Annotation complete."
+msgstr "注釈完了ã—ã¾ã—ãŸ"
+
+#: lib/blame.tcl:839
+msgid "Busy"
+msgstr "実行中"
+
+#: lib/blame.tcl:840
+msgid "Annotation process is already running."
+msgstr "ã™ã§ã« blame プロセスを実行中ã§ã™ã€‚"
+
+#: lib/blame.tcl:879
+msgid "Running thorough copy detection..."
+msgstr "コピー検知を実行中…"
+
+#: lib/blame.tcl:947
+msgid "Loading annotation..."
+msgstr "注釈を読ã¿è¾¼ã‚“ã§ã„ã¾ã™â€¦"
-#: lib/choose_repository.tcl:28
+#: lib/blame.tcl:1000
+msgid "Author:"
+msgstr "作者:"
+
+#: lib/blame.tcl:1004
+msgid "Committer:"
+msgstr "コミット者:"
+
+#: lib/blame.tcl:1009
+msgid "Original File:"
+msgstr "元ファイル"
+
+#: lib/blame.tcl:1057
+msgid "Cannot find HEAD commit:"
+msgstr "HEAD コミットãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
+
+#: lib/blame.tcl:1112
+msgid "Cannot find parent commit:"
+msgstr "親コミットãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“:"
+
+#: lib/blame.tcl:1127
+msgid "Unable to display parent"
+msgstr "親を表示ã§ãã¾ã›ã‚“"
+
+#: lib/blame.tcl:1128 lib/diff.tcl:356
+msgid "Error loading diff:"
+msgstr "diff を読む際ã®ã‚¨ãƒ©ãƒ¼ã§ã™:"
+
+#: lib/blame.tcl:1269
+msgid "Originally By:"
+msgstr "原作者:"
+
+#: lib/blame.tcl:1275
+msgid "In File:"
+msgstr "ファイル:"
+
+#: lib/blame.tcl:1280
+msgid "Copied Or Moved Here By:"
+msgstr "複写・移動者:"
+
+#: lib/about.tcl:26
+msgid "git-gui - a graphical user interface for Git."
+msgstr "Git ã®ã‚°ãƒ©ãƒ•ã‚£ã‚«ãƒ«UI git-gui"
+
+#: lib/choose_repository.tcl:33
msgid "Git Gui"
msgstr "Git GUI"
-#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386
+#: lib/choose_repository.tcl:92 lib/choose_repository.tcl:412
msgid "Create New Repository"
msgstr "æ–°ã—ã„リãƒã‚¸ãƒˆãƒªã‚’作る"
-#: lib/choose_repository.tcl:93
+#: lib/choose_repository.tcl:98
msgid "New..."
msgstr "æ–°è¦â€¦"
-#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471
+#: lib/choose_repository.tcl:105 lib/choose_repository.tcl:496
msgid "Clone Existing Repository"
msgstr "既存リãƒã‚¸ãƒˆãƒªã‚’複製ã™ã‚‹"
-#: lib/choose_repository.tcl:106
+#: lib/choose_repository.tcl:116
msgid "Clone..."
msgstr "複製…"
-#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016
+#: lib/choose_repository.tcl:123 lib/choose_repository.tcl:1064
msgid "Open Existing Repository"
msgstr "既存リãƒã‚¸ãƒˆãƒªã‚’é–‹ã"
-#: lib/choose_repository.tcl:119
+#: lib/choose_repository.tcl:129
msgid "Open..."
msgstr "é–‹ã…"
-#: lib/choose_repository.tcl:132
+#: lib/choose_repository.tcl:142
msgid "Recent Repositories"
msgstr "最近使ã£ãŸãƒªãƒã‚¸ãƒˆãƒª"
-#: lib/choose_repository.tcl:138
+#: lib/choose_repository.tcl:148
msgid "Open Recent Repository:"
msgstr "最近使ã£ãŸãƒªãƒã‚¸ãƒˆãƒªã‚’é–‹ã"
-#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313
-#: lib/choose_repository.tcl:320
+#: lib/choose_repository.tcl:316 lib/choose_repository.tcl:323
+#: lib/choose_repository.tcl:330
#, tcl-format
msgid "Failed to create repository %s:"
msgstr "リãƒã‚¸ãƒˆãƒª %s を作製ã§ãã¾ã›ã‚“:"
-#: lib/choose_repository.tcl:391
+#: lib/choose_repository.tcl:407 lib/branch_create.tcl:33
+msgid "Create"
+msgstr "作æˆ"
+
+#: lib/choose_repository.tcl:417
msgid "Directory:"
msgstr "ディレクトリ:"
-#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550
-#: lib/choose_repository.tcl:1052
+#: lib/choose_repository.tcl:422 lib/choose_repository.tcl:509
+#: lib/choose_repository.tcl:518 lib/choose_repository.tcl:1074
+#: lib/browser.tcl:288
+msgid "Browse"
+msgstr "ブラウズ"
+
+#: lib/choose_repository.tcl:447 lib/choose_repository.tcl:573
+#: lib/choose_repository.tcl:1098
msgid "Git Repository"
msgstr "GIT リãƒã‚¸ãƒˆãƒª"
-#: lib/choose_repository.tcl:448
+#: lib/choose_repository.tcl:472
#, tcl-format
msgid "Directory %s already exists."
msgstr "ディレクトリ '%s' ã¯æ—¢ã«å­˜åœ¨ã—ã¾ã™ã€‚"
-#: lib/choose_repository.tcl:452
+#: lib/choose_repository.tcl:476
#, tcl-format
msgid "File %s already exists."
msgstr "ファイル '%s' ã¯æ—¢ã«å­˜åœ¨ã—ã¾ã™ã€‚"
-#: lib/choose_repository.tcl:466
+#: lib/choose_repository.tcl:491
msgid "Clone"
msgstr "複製"
-#: lib/choose_repository.tcl:479
+#: lib/choose_repository.tcl:504
msgid "Source Location:"
msgstr "ソースã®ä½ç½®"
-#: lib/choose_repository.tcl:490
+#: lib/choose_repository.tcl:513
msgid "Target Directory:"
msgstr "先ディレクトリ:"
-#: lib/choose_repository.tcl:502
+#: lib/choose_repository.tcl:523
msgid "Clone Type:"
msgstr "複製方å¼:"
-#: lib/choose_repository.tcl:508
+#: lib/choose_repository.tcl:528
msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
msgstr "標準(高速・中冗長度・ãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯)"
-#: lib/choose_repository.tcl:514
+#: lib/choose_repository.tcl:533
msgid "Full Copy (Slower, Redundant Backup)"
msgstr "全複写(低速・冗長ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—)"
-#: lib/choose_repository.tcl:520
+#: lib/choose_repository.tcl:538
msgid "Shared (Fastest, Not Recommended, No Backup)"
msgstr "共有(最高速・éžæŽ¨å¥¨ãƒ»ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ç„¡ã—)"
-#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603
-#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819
-#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066
+#: lib/choose_repository.tcl:545
+msgid "Recursively clone submodules too"
+msgstr "サブモジュールもå†å¸°çš„ã«è¤‡è£½ã™ã‚‹"
+
+#: lib/choose_repository.tcl:579 lib/choose_repository.tcl:626
+#: lib/choose_repository.tcl:772 lib/choose_repository.tcl:842
+#: lib/choose_repository.tcl:1104 lib/choose_repository.tcl:1112
#, tcl-format
msgid "Not a Git repository: %s"
msgstr "Git リãƒã‚¸ãƒˆãƒªã§ã¯ã‚ã‚Šã¾ã›ã‚“: %s"
-#: lib/choose_repository.tcl:592
+#: lib/choose_repository.tcl:615
msgid "Standard only available for local repository."
msgstr "標準方å¼ã¯åŒä¸€è¨ˆç®—機上ã®ãƒªãƒã‚¸ãƒˆãƒªã«ã®ã¿ä½¿ãˆã¾ã™ã€‚"
-#: lib/choose_repository.tcl:596
+#: lib/choose_repository.tcl:619
msgid "Shared only available for local repository."
msgstr "共有方å¼ã¯åŒä¸€è¨ˆç®—機上ã®ãƒªãƒã‚¸ãƒˆãƒªã«ã®ã¿ä½¿ãˆã¾ã™ã€‚"
-#: lib/choose_repository.tcl:617
+#: lib/choose_repository.tcl:640
#, tcl-format
msgid "Location %s already exists."
msgstr "'%s' ã¯æ—¢ã«å­˜åœ¨ã—ã¾ã™ã€‚"
-#: lib/choose_repository.tcl:628
+#: lib/choose_repository.tcl:651
msgid "Failed to configure origin"
msgstr "origin を設定ã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: lib/choose_repository.tcl:640
+#: lib/choose_repository.tcl:663
msgid "Counting objects"
msgstr "オブジェクトを数ãˆã¦ã„ã¾ã™"
-#: lib/choose_repository.tcl:641
+#: lib/choose_repository.tcl:664
msgid "buckets"
msgstr "ãƒã‚±ãƒ„"
-#: lib/choose_repository.tcl:665
+#: lib/choose_repository.tcl:688
#, tcl-format
msgid "Unable to copy objects/info/alternates: %s"
msgstr "objects/info/alternates を複写ã§ãã¾ã›ã‚“: %s"
-#: lib/choose_repository.tcl:701
+#: lib/choose_repository.tcl:724
#, tcl-format
msgid "Nothing to clone from %s."
msgstr "%s ã‹ã‚‰è¤‡è£½ã™ã‚‹å†…容ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917
-#: lib/choose_repository.tcl:929
+#: lib/choose_repository.tcl:726 lib/choose_repository.tcl:940
+#: lib/choose_repository.tcl:952
msgid "The 'master' branch has not been initialized."
msgstr "'master' ブランãƒãŒåˆæœŸåŒ–ã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: lib/choose_repository.tcl:716
+#: lib/choose_repository.tcl:739
msgid "Hardlinks are unavailable. Falling back to copying."
msgstr "ãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯ãŒä½œã‚Œãªã„ã®ã§ã€ã‚³ãƒ”ーã—ã¾ã™"
-#: lib/choose_repository.tcl:728
+#: lib/choose_repository.tcl:751
#, tcl-format
msgid "Cloning from %s"
msgstr "%s ã‹ã‚‰è¤‡è£½ã—ã¦ã„ã¾ã™"
-#: lib/choose_repository.tcl:759
+#: lib/choose_repository.tcl:782
msgid "Copying objects"
msgstr "オブジェクトを複写ã—ã¦ã„ã¾ã™"
-#: lib/choose_repository.tcl:760
+#: lib/choose_repository.tcl:783
msgid "KiB"
msgstr "KiB"
-#: lib/choose_repository.tcl:784
+#: lib/choose_repository.tcl:807
#, tcl-format
msgid "Unable to copy object: %s"
msgstr "オブジェクトを複写ã§ãã¾ã›ã‚“: %s"
-#: lib/choose_repository.tcl:794
+#: lib/choose_repository.tcl:817
msgid "Linking objects"
msgstr "オブジェクトを連çµã—ã¦ã„ã¾ã™"
-#: lib/choose_repository.tcl:795
+#: lib/choose_repository.tcl:818
msgid "objects"
msgstr "オブジェクト"
-#: lib/choose_repository.tcl:803
+#: lib/choose_repository.tcl:826
#, tcl-format
msgid "Unable to hardlink object: %s"
msgstr "オブジェクトをãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯ã§ãã¾ã›ã‚“: %s"
-#: lib/choose_repository.tcl:858
+#: lib/choose_repository.tcl:881
msgid "Cannot fetch branches and objects. See console output for details."
msgstr "ブランãƒã‚„オブジェクトをå–å¾—ã§ãã¾ã›ã‚“。コンソール出力を見ã¦ä¸‹ã•ã„"
-#: lib/choose_repository.tcl:869
+#: lib/choose_repository.tcl:892
msgid "Cannot fetch tags. See console output for details."
msgstr "ã‚¿ã‚°ã‚’å–å¾—ã§ãã¾ã›ã‚“。コンソール出力を見ã¦ä¸‹ã•ã„"
-#: lib/choose_repository.tcl:893
+#: lib/choose_repository.tcl:916
msgid "Cannot determine HEAD. See console output for details."
msgstr "HEAD を確定ã§ãã¾ã›ã‚“。コンソール出力を見ã¦ä¸‹ã•ã„"
-#: lib/choose_repository.tcl:902
+#: lib/choose_repository.tcl:925
#, tcl-format
msgid "Unable to cleanup %s"
msgstr "%s を掃除ã§ãã¾ã›ã‚“"
-#: lib/choose_repository.tcl:908
+#: lib/choose_repository.tcl:931
msgid "Clone failed."
msgstr "複写ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: lib/choose_repository.tcl:915
+#: lib/choose_repository.tcl:938
msgid "No default branch obtained."
msgstr "デフォールト・ブランãƒãŒå–å¾—ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ"
-#: lib/choose_repository.tcl:926
+#: lib/choose_repository.tcl:949
#, tcl-format
msgid "Cannot resolve %s as a commit."
msgstr "%s をコミットã¨ã—ã¦è§£é‡ˆã§ãã¾ã›ã‚“"
-#: lib/choose_repository.tcl:938
+#: lib/choose_repository.tcl:961
msgid "Creating working directory"
msgstr "作業ディレクトリを作æˆã—ã¦ã„ã¾ã™"
-#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130
-#: lib/index.tcl:198
+#: lib/choose_repository.tcl:962 lib/index.tcl:70 lib/index.tcl:136
+#: lib/index.tcl:207
msgid "files"
msgstr "ファイル"
-#: lib/choose_repository.tcl:968
+#: lib/choose_repository.tcl:981
+msgid "Cannot clone submodules."
+msgstr "サブモジュールãŒè¤‡è£½ã§ãã¾ã›ã‚“。"
+
+#: lib/choose_repository.tcl:990
+msgid "Cloning submodules"
+msgstr "サブモジュールを複製ã—ã¦ã„ã¾ã™"
+
+#: lib/choose_repository.tcl:1015
msgid "Initial file checkout failed."
msgstr "åˆæœŸãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: lib/choose_repository.tcl:1011
+#: lib/choose_repository.tcl:1059
msgid "Open"
msgstr "é–‹ã"
-#: lib/choose_repository.tcl:1021
+#: lib/choose_repository.tcl:1069
msgid "Repository:"
msgstr "リãƒã‚¸ãƒˆãƒª:"
-#: lib/choose_repository.tcl:1072
+#: lib/choose_repository.tcl:1118
#, tcl-format
msgid "Failed to open repository %s:"
msgstr "リãƒã‚¸ãƒˆãƒª %s ã‚’é–‹ã‘ã¾ã›ã‚“:"
-#: lib/choose_rev.tcl:53
-msgid "This Detached Checkout"
-msgstr "分離ã•ã‚ŒãŸãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ"
+#: lib/branch_rename.tcl:15 lib/branch_rename.tcl:23
+msgid "Rename Branch"
+msgstr "ブランãƒã®åå‰å¤‰æ›´"
-#: lib/choose_rev.tcl:60
-msgid "Revision Expression:"
-msgstr "リビジョンå¼:"
+#: lib/branch_rename.tcl:28
+msgid "Rename"
+msgstr "åå‰å¤‰æ›´"
-#: lib/choose_rev.tcl:74
-msgid "Local Branch"
-msgstr "ローカル・ブランãƒ"
+#: lib/branch_rename.tcl:38
+msgid "Branch:"
+msgstr "ブランãƒ:"
-#: lib/choose_rev.tcl:79
-msgid "Tracking Branch"
-msgstr "トラッキング・ブランãƒ"
+#: lib/branch_rename.tcl:46
+msgid "New Name:"
+msgstr "æ–°ã—ã„åå‰:"
-#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
-msgid "Tag"
-msgstr "ã‚¿ã‚°"
+#: lib/branch_rename.tcl:81
+msgid "Please select a branch to rename."
+msgstr "åå‰ã‚’変更ã™ã‚‹ãƒ–ランãƒã‚’é¸ã‚“ã§ä¸‹ã•ã„。"
+
+#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154
+msgid "Please supply a branch name."
+msgstr "ブランãƒåを指定ã—ã¦ä¸‹ã•ã„。"
-#: lib/choose_rev.tcl:317
+#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165
#, tcl-format
-msgid "Invalid revision: %s"
-msgstr "無効ãªãƒªãƒ“ジョン: %s"
+msgid "'%s' is not an acceptable branch name."
+msgstr "'%s' ã¯ãƒ–ランãƒåã«ä½¿ãˆã¾ã›ã‚“。"
-#: lib/choose_rev.tcl:338
-msgid "No revision selected."
-msgstr "リビジョンãŒæœªé¸æŠžã§ã™ã€‚"
+#: lib/branch_rename.tcl:123
+#, tcl-format
+msgid "Failed to rename '%s'."
+msgstr "'%s'ã®åå‰å¤‰æ›´ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: lib/choose_rev.tcl:346
-msgid "Revision expression is empty."
-msgstr "リビジョンå¼ãŒç©ºã§ã™ã€‚"
+#: lib/shortcut.tcl:21 lib/shortcut.tcl:62
+msgid "Cannot write shortcut:"
+msgstr "ショートカットãŒæ›¸ã‘ã¾ã›ã‚“:"
-#: lib/choose_rev.tcl:531
-msgid "Updated"
-msgstr "æ›´æ–°ã—ã¾ã—ãŸ"
+#: lib/shortcut.tcl:137
+msgid "Cannot write icon:"
+msgstr "アイコンãŒæ›¸ã‘ã¾ã›ã‚“:"
-#: lib/choose_rev.tcl:559
-msgid "URL"
-msgstr "URL"
+#: lib/search.tcl:48
+msgid "Find:"
+msgstr "検索:"
-#: lib/commit.tcl:9
-msgid ""
-"There is nothing to amend.\n"
-"\n"
-"You are about to create the initial commit. There is no commit before this "
-"to amend.\n"
-msgstr ""
-"訂正ã™ã‚‹ã‚³ãƒŸãƒƒãƒˆãŒãã‚‚ãã‚‚ã‚ã‚Šã¾ã›ã‚“。\n"
-"\n"
-"ã“ã‚Œã‹ã‚‰ä½œã‚‹ã®ã¯æœ€åˆã®ã‚³ãƒŸãƒƒãƒˆã§ã™ã€‚ãã®å‰ã«ã¯ã¾ã è¨‚æ­£ã™ã‚‹ã‚ˆã†ãªã‚³ãƒŸãƒƒãƒˆã¯ã‚"
-"ã‚Šã¾ã›ã‚“。\n"
+#: lib/search.tcl:50
+msgid "Next"
+msgstr "次"
-#: lib/commit.tcl:18
+#: lib/search.tcl:51
+msgid "Prev"
+msgstr "å‰"
+
+#: lib/search.tcl:52
+msgid "RegExp"
+msgstr "æ­£è¦è¡¨ç¾"
+
+#: lib/search.tcl:54
+msgid "Case"
+msgstr "大文字å°æ–‡å­—を区別"
+
+#: lib/status_bar.tcl:87
+#, tcl-format
+msgid "%s ... %*i of %*i %s (%3i%%)"
+msgstr "%1$s ... %4$*i %6$s 中㮠%2$*i (%7$3i%%)"
+
+#: lib/tools_dlg.tcl:22
+msgid "Add Tool"
+msgstr "ツールã®è¿½åŠ "
+
+#: lib/tools_dlg.tcl:28
+msgid "Add New Tool Command"
+msgstr "æ–°è¦ãƒ„ールコマンドã®è¿½åŠ "
+
+#: lib/tools_dlg.tcl:34
+msgid "Add globally"
+msgstr "全体ã«è¿½åŠ "
+
+#: lib/tools_dlg.tcl:37 lib/remote_add.tcl:30
+msgid "Add"
+msgstr "追加"
+
+#: lib/tools_dlg.tcl:46
+msgid "Tool Details"
+msgstr "ツールã®è©³ç´°"
+
+#: lib/tools_dlg.tcl:49
+msgid "Use '/' separators to create a submenu tree:"
+msgstr "'/' ã§ã‚µãƒ–メニューを区切りã¾ã™:"
+
+#: lib/tools_dlg.tcl:51 lib/remote_add.tcl:41 lib/branch_create.tcl:44
+msgid "Name:"
+msgstr "åå‰:"
+
+#: lib/tools_dlg.tcl:60
+msgid "Command:"
+msgstr "コマンド:"
+
+#: lib/tools_dlg.tcl:71
+msgid "Show a dialog before running"
+msgstr "èµ·å‹•ã™ã‚‹å‰ã«ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã‚’表示"
+
+#: lib/tools_dlg.tcl:77
+msgid "Ask the user to select a revision (sets $REVISION)"
+msgstr "ユーザã«ã‚³ãƒŸãƒƒãƒˆã‚’一ã¤é¸ã°ã›ã‚‹ ($REVISION ã«ã‚»ãƒƒãƒˆã—ã¾ã™)"
+
+#: lib/tools_dlg.tcl:82
+msgid "Ask the user for additional arguments (sets $ARGS)"
+msgstr "ユーザã«ä»–ã®å¼•æ•°ã‚’追加ã•ã›ã‚‹ ($ARGS ã«ã‚»ãƒƒãƒˆã—ã¾ã™)"
+
+#: lib/tools_dlg.tcl:89
+msgid "Don't show the command output window"
+msgstr "コマンドã‹ã‚‰ã®å‡ºåŠ›ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’見ã›ãªã„"
+
+#: lib/tools_dlg.tcl:94
+msgid "Run only if a diff is selected ($FILENAME not empty)"
+msgstr "パッãƒãŒé¸ã°ã‚Œã¦ã„ã‚‹ã¨ãã ã‘å‹•ã‹ã™($FILENAME ãŒç©ºã§ãªã„)"
+
+#: lib/tools_dlg.tcl:118
+msgid "Please supply a name for the tool."
+msgstr "ツールåを指定ã—ã¦ä¸‹ã•ã„。"
+
+#: lib/tools_dlg.tcl:126
+#, tcl-format
+msgid "Tool '%s' already exists."
+msgstr "ツール '%s' ã¯æ—¢ã«å­˜åœ¨ã—ã¾ã™ã€‚"
+
+#: lib/tools_dlg.tcl:148
+#, tcl-format
msgid ""
-"Cannot amend while merging.\n"
-"\n"
-"You are currently in the middle of a merge that has not been fully "
-"completed. You cannot amend the prior commit unless you first abort the "
-"current merge activity.\n"
+"Could not add tool:\n"
+"%s"
msgstr ""
-"マージ中ã«ã‚³ãƒŸãƒƒãƒˆã®è¨‚æ­£ã¯ã§ãã¾ã›ã‚“。\n"
-"\n"
-"ç¾åœ¨ã¯ã¾ã ãƒžãƒ¼ã‚¸ã®é€”中ã§ã™ã€‚å…ˆã«ã“ã®ãƒžãƒ¼ã‚¸ã‚’中止ã—ãªã„ã¨ã€å‰ã®ã‚³ãƒŸãƒƒãƒˆã®è¨‚æ­£"
-"ã¯ã§ãã¾ã›ã‚“\n"
+"ツールを追加ã§ãã¾ã›ã‚“:\n"
+"%s"
-#: lib/commit.tcl:48
-msgid "Error loading commit data for amend:"
-msgstr "訂正ã™ã‚‹ã‚³ãƒŸãƒƒãƒˆã®ãƒ‡ãƒ¼ã‚¿ã‚’読ã‚ã¾ã›ã‚“:"
+#: lib/tools_dlg.tcl:187
+msgid "Remove Tool"
+msgstr "ツールã®å‰Šé™¤"
-#: lib/commit.tcl:75
-msgid "Unable to obtain your identity:"
-msgstr "ユーザã®æ­£ä½“を確èªã§ãã¾ã›ã‚“:"
+#: lib/tools_dlg.tcl:193
+msgid "Remove Tool Commands"
+msgstr "ツールコマンドã®å‰Šé™¤"
-#: lib/commit.tcl:80
-msgid "Invalid GIT_COMMITTER_IDENT:"
-msgstr "GIT_COMMITTER_IDENT ãŒç„¡åŠ¹ã§ã™:"
+#: lib/tools_dlg.tcl:198
+msgid "Remove"
+msgstr "削除"
-#: lib/commit.tcl:129
+#: lib/tools_dlg.tcl:231
+msgid "(Blue denotes repository-local tools)"
+msgstr "(é’色ã¯ãƒ­ãƒ¼ã‚«ãƒ«ãƒ¬ãƒã‚¸ãƒˆãƒªã®ãƒ„ールã§ã™)"
+
+#: lib/tools_dlg.tcl:292
#, tcl-format
-msgid "warning: Tcl does not support encoding '%s'."
-msgstr "警告: Tcl ã¯ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚° '%s' をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“"
+msgid "Run Command: %s"
+msgstr "コマンドを起動: %s"
-#: lib/commit.tcl:149
+#: lib/tools_dlg.tcl:306
+msgid "Arguments"
+msgstr "引数"
+
+#: lib/tools_dlg.tcl:321 lib/branch_checkout.tcl:35 lib/browser.tcl:297
+msgid "Revision"
+msgstr "リビジョン"
+
+#: lib/tools_dlg.tcl:341
+msgid "OK"
+msgstr "OK"
+
+#: lib/tools.tcl:75
+#, tcl-format
+msgid "Running %s requires a selected file."
+msgstr "ファイルをé¸æŠžã—ã¦ã‹ã‚‰ %s ã‚’èµ·å‹•ã—ã¦ãã ã•ã„。"
+
+#: lib/tools.tcl:91
+#, tcl-format
+msgid "Are you sure you want to run %1$s on file \"%2$s\"?"
+msgstr "本当ã«ãƒ•ã‚¡ã‚¤ãƒ« \"%2$s\"㧠%1$s ã‚’èµ·å‹•ã—ã¾ã™ã‹?"
+
+#: lib/tools.tcl:95
+#, tcl-format
+msgid "Are you sure you want to run %s?"
+msgstr "本当㫠%s ã‚’èµ·å‹•ã—ã¾ã™ã‹?"
+
+#: lib/tools.tcl:116
+#, tcl-format
+msgid "Tool: %s"
+msgstr "ツール: %s"
+
+#: lib/tools.tcl:117
+#, tcl-format
+msgid "Running: %s"
+msgstr "実行中: %s"
+
+#: lib/tools.tcl:155
+#, tcl-format
+msgid "Tool completed successfully: %s"
+msgstr "ツールãŒå®Œäº†ã—ã¾ã—ãŸ: %s"
+
+#: lib/tools.tcl:157
+#, tcl-format
+msgid "Tool failed: %s"
+msgstr "ツールãŒå¤±æ•—ã—ã¾ã—ãŸ: %s"
+
+#: lib/mergetool.tcl:8
+msgid "Force resolution to the base version?"
+msgstr "共通ã®ç‰ˆã‚’使ã„ã¾ã™ã‹?"
+
+#: lib/mergetool.tcl:9
+msgid "Force resolution to this branch?"
+msgstr "自分ã®å´ã®ç‰ˆã‚’使ã„ã¾ã™ã‹?"
+
+#: lib/mergetool.tcl:10
+msgid "Force resolution to the other branch?"
+msgstr "相手制ã®ç‰ˆã‚’使ã„ã¾ã™ã‹?"
+
+#: lib/mergetool.tcl:14
+#, tcl-format
msgid ""
-"Last scanned state does not match repository state.\n"
+"Note that the diff shows only conflicting changes.\n"
"\n"
-"Another Git program has modified this repository since the last scan. A "
-"rescan must be performed before another commit can be created.\n"
+"%s will be overwritten.\n"
"\n"
-"The rescan will be automatically started now.\n"
+"This operation can be undone only by restarting the merge."
msgstr ""
-"最後ã«ã‚¹ã‚­ãƒ£ãƒ³ã—ãŸçŠ¶æ…‹ã¯ãƒªãƒã‚¸ãƒˆãƒªã®çŠ¶æ…‹ã¨åˆè‡´ã—ã¾ã›ã‚“。\n"
+"競åˆã™ã‚‹å¤‰æ›´ç‚¹ã ã‘ãŒè¡¨ç¤ºã•ã‚Œã¦ã„ã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。\n"
"\n"
-"最後ã«ã‚¹ã‚­ãƒ£ãƒ³ã—ã¦ä»¥å¾Œã€åˆ¥ã® Git プログラムãŒãƒªãƒã‚¸ãƒˆãƒªã‚’変更ã—ã¦ã„ã¾ã™ã€‚æ–°ã—"
-"ãコミットã™ã‚‹å‰ã«ã€å†ã‚¹ã‚­ãƒ£ãƒ³ãŒå¿…è¦ã§ã™ã€‚\n"
+"%s ã¯ä¸Šæ›¸ãã•ã‚Œã¾ã™ã€‚\n"
"\n"
-"自動的ã«å†ã‚¹ã‚­ãƒ£ãƒ³ã‚’開始ã—ã¾ã™ã€‚\n"
+"ã‚„ã‚Šç›´ã™ã«ã¯ãƒžãƒ¼ã‚¸å…¨ä½“ã‚’ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。"
-#: lib/commit.tcl:172
+#: lib/mergetool.tcl:45
#, tcl-format
-msgid ""
-"Unmerged files cannot be committed.\n"
-"\n"
-"File %s has merge conflicts. You must resolve them and stage the file "
-"before committing.\n"
+msgid "File %s seems to have unresolved conflicts, still stage?"
msgstr ""
-"マージã—ã¦ã„ãªã„ファイルã¯ã‚³ãƒŸãƒƒãƒˆã§ãã¾ã›ã‚“。\n"
-"\n"
-"ファイル %s ã«ã¯ãƒžãƒ¼ã‚¸è¡çªãŒæ®‹ã£ã¦ã„ã¾ã™ã€‚ã¾ãšè§£æ±ºã—ã¦ã‚³ãƒŸãƒƒãƒˆäºˆå®šã«åŠ ãˆã‚‹å¿…"
-"è¦ãŒã‚ã‚Šã¾ã™ã€‚\n"
+"ファイル %s ã«ã¯è§£æ±ºã—ã¦ã„ãªã„競åˆéƒ¨åˆ†ãŒã¾ã ã‚るよã†ã§ã™ãŒã€ã„ã„ã§ã™ã‹?"
+
+#: lib/mergetool.tcl:60
+#, tcl-format
+msgid "Adding resolution for %s"
+msgstr "%s ã¸ã®è§£æ±ºã‚’ステージã—ã¾ã™"
+
+#: lib/mergetool.tcl:141
+msgid "Cannot resolve deletion or link conflicts using a tool"
+msgstr "ツールã§ã¯å‰Šé™¤ã‚„リンク競åˆã¯æ‰±ãˆã¾ã›ã‚“"
-#: lib/commit.tcl:180
+#: lib/mergetool.tcl:146
+msgid "Conflict file does not exist"
+msgstr "競åˆãƒ•ã‚¡ã‚¤ãƒ«ã¯å­˜åœ¨ã—ã¾ã›ã‚“。"
+
+#: lib/mergetool.tcl:246
#, tcl-format
-msgid ""
-"Unknown file state %s detected.\n"
-"\n"
-"File %s cannot be committed by this program.\n"
-msgstr ""
-"ä¸æ˜Žãªãƒ•ã‚¡ã‚¤ãƒ«çŠ¶æ…‹ %s ã§ã™ã€‚\n"
-"\n"
-"ファイル %s ã¯æœ¬ãƒ—ログラムã§ã¯ã‚³ãƒŸãƒƒãƒˆã§ãã¾ã›ã‚“。\n"
+msgid "Not a GUI merge tool: '%s'"
+msgstr "GUI マージツールã§ã¯ã‚ã‚Šã¾ã›ã‚“: %s"
-#: lib/commit.tcl:188
+#: lib/mergetool.tcl:275
+#, tcl-format
+msgid "Unsupported merge tool '%s'"
+msgstr "マージツール '%s' ã¯ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“"
+
+#: lib/mergetool.tcl:310
+msgid "Merge tool is already running, terminate it?"
+msgstr "マージツールã¯ã™ã§ã«èµ·å‹•ã—ã¦ã„ã¾ã™ã€‚終了ã—ã¾ã™ã‹?"
+
+#: lib/mergetool.tcl:330
+#, tcl-format
msgid ""
-"No changes to commit.\n"
-"\n"
-"You must stage at least 1 file before you can commit.\n"
+"Error retrieving versions:\n"
+"%s"
msgstr ""
-"コミットã™ã‚‹å¤‰æ›´ãŒã‚ã‚Šã¾ã›ã‚“。\n"
-"\n"
-"最低一ã¤ã®å¤‰æ›´ã‚’コミット予定ã«åŠ ãˆã¦ã‹ã‚‰ã‚³ãƒŸãƒƒãƒˆã—ã¦ä¸‹ã•ã„。\n"
+"版ã®å–り出ã—時ã«ã‚¨ãƒ©ãƒ¼ãŒå‡ºã¾ã—ãŸ:\n"
+"%s"
-#: lib/commit.tcl:203
+#: lib/mergetool.tcl:350
+#, tcl-format
msgid ""
-"Please supply a commit message.\n"
-"\n"
-"A good commit message has the following format:\n"
+"Could not start the merge tool:\n"
"\n"
-"- First line: Describe in one sentence what you did.\n"
-"- Second line: Blank\n"
-"- Remaining lines: Describe why this change is good.\n"
+"%s"
msgstr ""
-"コミット・メッセージを入力ã—ã¦ä¸‹ã•ã„。\n"
-"\n"
-"æ­£ã—ã„コミット・メッセージã¯:\n"
+"マージツールãŒèµ·å‹•ã§ãã¾ã›ã‚“:\n"
"\n"
-"- 第1行: 何をã—ãŸã‹ã€ã‚’1行ã§è¦ç´„。\n"
-"- 第2行: 空白\n"
-"- 残りã®è¡Œ: ãªãœã€ã“ã®å¤‰æ›´ãŒè‰¯ã„変更ã‹ã€ã®èª¬æ˜Žã€‚\n"
-
-#: lib/commit.tcl:234
-msgid "Calling pre-commit hook..."
-msgstr "コミットå‰ãƒ•ãƒƒã‚¯ã‚’実行中・・・"
+"%s"
-#: lib/commit.tcl:249
-msgid "Commit declined by pre-commit hook."
-msgstr "コミットå‰ãƒ•ãƒƒã‚¯ãŒã‚³ãƒŸãƒƒãƒˆã‚’æ‹’å¦ã—ã¾ã—ãŸ"
+#: lib/mergetool.tcl:354
+msgid "Running merge tool..."
+msgstr "マージツールを実行ã—ã¦ã„ã¾ã™..."
-#: lib/commit.tcl:272
-msgid "Calling commit-msg hook..."
-msgstr "コミット・メッセージ・フックを実行中・・・"
+#: lib/mergetool.tcl:382 lib/mergetool.tcl:390
+msgid "Merge tool failed."
+msgstr "マージツールãŒå¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: lib/commit.tcl:287
-msgid "Commit declined by commit-msg hook."
-msgstr "コミット・メッセージ・フックãŒã‚³ãƒŸãƒƒãƒˆã‚’æ‹’å¦ã—ã¾ã—ãŸ"
+#: lib/option.tcl:11
+#, tcl-format
+msgid "Invalid global encoding '%s'"
+msgstr "全体エンコーディング㫠無効㪠%s ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã™"
-#: lib/commit.tcl:300
-msgid "Committing changes..."
-msgstr "変更点をコミット中・・・"
+#: lib/option.tcl:19
+#, tcl-format
+msgid "Invalid repo encoding '%s'"
+msgstr "リãƒã‚¸ãƒˆãƒªã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã« 無効㪠%s ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã™"
-#: lib/commit.tcl:316
-msgid "write-tree failed:"
-msgstr "write-tree ãŒå¤±æ•—ã—ã¾ã—ãŸ:"
+#: lib/option.tcl:119
+msgid "Restore Defaults"
+msgstr "既定値ã«æˆ»ã™"
-#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382
-msgid "Commit failed."
-msgstr "コミットã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+#: lib/option.tcl:123
+msgid "Save"
+msgstr "ä¿å­˜"
-#: lib/commit.tcl:334
+#: lib/option.tcl:133
#, tcl-format
-msgid "Commit %s appears to be corrupt"
-msgstr "コミット %s ã¯å£Šã‚Œã¦ã„ã¾ã™"
+msgid "%s Repository"
+msgstr "%s リãƒã‚¸ãƒˆãƒª"
-#: lib/commit.tcl:339
-msgid ""
-"No changes to commit.\n"
-"\n"
-"No files were modified by this commit and it was not a merge commit.\n"
-"\n"
-"A rescan will be automatically started now.\n"
-msgstr ""
-"コミットã™ã‚‹å¤‰æ›´ãŒã‚ã‚Šã¾ã›ã‚“。\n"
-"\n"
-"マージã§ãªãã€ã¾ãŸã€ä¸€ã¤ã‚‚変更点ãŒã‚ã‚Šã¾ã›ã‚“。\n"
-"\n"
-"自動的ã«å†ã‚¹ã‚­ãƒ£ãƒ³ã‚’開始ã—ã¾ã™ã€‚\n"
+#: lib/option.tcl:134
+msgid "Global (All Repositories)"
+msgstr "大域(全ã¦ã®ãƒªãƒã‚¸ãƒˆãƒªï¼‰"
-#: lib/commit.tcl:346
-msgid "No changes to commit."
-msgstr "コミットã™ã‚‹å¤‰æ›´ãŒã‚ã‚Šã¾ã›ã‚“。"
+#: lib/option.tcl:140
+msgid "User Name"
+msgstr "ユーザå"
-#: lib/commit.tcl:360
-msgid "commit-tree failed:"
-msgstr "commit-tree ãŒå¤±æ•—ã—ã¾ã—ãŸ:"
+#: lib/option.tcl:141
+msgid "Email Address"
+msgstr "é›»å­ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹"
-#: lib/commit.tcl:381
-msgid "update-ref failed:"
-msgstr "update-ref ãŒå¤±æ•—ã—ã¾ã—ãŸ:"
+#: lib/option.tcl:143
+msgid "Summarize Merge Commits"
+msgstr "マージコミットã®è¦ç´„"
+
+#: lib/option.tcl:144
+msgid "Merge Verbosity"
+msgstr "マージã®å†—長度"
+
+#: lib/option.tcl:145
+msgid "Show Diffstat After Merge"
+msgstr "マージ後㫠diffstat を表示"
+
+#: lib/option.tcl:146
+msgid "Use Merge Tool"
+msgstr "マージツールを使用"
+
+#: lib/option.tcl:148
+msgid "Trust File Modification Timestamps"
+msgstr "ファイル変更時刻を信頼ã™ã‚‹"
+
+#: lib/option.tcl:149
+msgid "Prune Tracking Branches During Fetch"
+msgstr "フェッãƒä¸­ã«ãƒˆãƒ©ãƒƒã‚­ãƒ³ã‚°ãƒ–ランãƒã‚’刈る"
-#: lib/commit.tcl:469
+#: lib/option.tcl:150
+msgid "Match Tracking Branches"
+msgstr "トラッキングブランãƒã‚’åˆã‚ã›ã‚‹"
+
+#: lib/option.tcl:151
+msgid "Use Textconv For Diffs and Blames"
+msgstr "diff ã¨æ³¨é‡ˆã« textconv を使ã†"
+
+#: lib/option.tcl:152
+msgid "Blame Copy Only On Changed Files"
+msgstr "変更ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ã¿ã‚³ãƒ”ー検知を行ãªã†"
+
+#: lib/option.tcl:153
+msgid "Maximum Length of Recent Repositories List"
+msgstr "最近使ã£ãŸãƒªãƒã‚¸ãƒˆãƒªä¸€è¦§ã®ä¸Šé™"
+
+#: lib/option.tcl:154
+msgid "Minimum Letters To Blame Copy On"
+msgstr "コピーを検知ã™ã‚‹æœ€å°‘文字数"
+
+#: lib/option.tcl:155
+msgid "Blame History Context Radius (days)"
+msgstr "注釈ã™ã‚‹å±¥æ­´åŠå¾„(日数)"
+
+#: lib/option.tcl:156
+msgid "Number of Diff Context Lines"
+msgstr "diff ã®æ–‡è„ˆè¡Œæ•°"
+
+#: lib/option.tcl:157
+msgid "Additional Diff Parameters"
+msgstr "diff ã®è¿½åŠ å¼•æ•°"
+
+#: lib/option.tcl:158
+msgid "Commit Message Text Width"
+msgstr "コミットメッセージã®ãƒ†ã‚­ã‚¹ãƒˆå¹…"
+
+#: lib/option.tcl:159
+msgid "New Branch Name Template"
+msgstr "æ–°ã—ã„ブランãƒåã®ãƒ†ãƒ³ãƒ—レート"
+
+#: lib/option.tcl:160
+msgid "Default File Contents Encoding"
+msgstr "ファイル内容ã®ãƒ‡ãƒ•ã‚©ãƒ¼ãƒ«ãƒˆã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°"
+
+#: lib/option.tcl:161
+msgid "Warn before committing to a detached head"
+msgstr "分離 HEAD ã®ã‚³ãƒŸãƒƒãƒˆå‰ã«è­¦å‘Šã™ã‚‹"
+
+#: lib/option.tcl:162
+msgid "Staging of untracked files"
+msgstr "管ç†å¤–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’コミット予定ã™ã‚‹"
+
+#: lib/option.tcl:163
+msgid "Show untracked files"
+msgstr "管ç†å¤–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示ã™ã‚‹"
+
+#: lib/option.tcl:164
+msgid "Tab spacing"
+msgstr "タブ幅"
+
+#: lib/option.tcl:210
+msgid "Change"
+msgstr "変更"
+
+#: lib/option.tcl:254
+msgid "Spelling Dictionary:"
+msgstr "スペルãƒã‚§ãƒƒã‚¯è¾žæ›¸"
+
+#: lib/option.tcl:284
+msgid "Change Font"
+msgstr "フォントを変更"
+
+#: lib/option.tcl:288
#, tcl-format
-msgid "Created commit %s: %s"
-msgstr "コミット %s を作æˆã—ã¾ã—ãŸ: %s"
+msgid "Choose %s"
+msgstr "%s ã‚’é¸æŠž"
-#: lib/console.tcl:59
-msgid "Working... please wait..."
-msgstr "実行中…ãŠå¾…ã¡ä¸‹ã•ã„…"
+#: lib/option.tcl:294
+msgid "pt."
+msgstr "ãƒã‚¤ãƒ³ãƒˆ"
-#: lib/console.tcl:186
-msgid "Success"
-msgstr "æˆåŠŸ"
+#: lib/option.tcl:308
+msgid "Preferences"
+msgstr "設定"
-#: lib/console.tcl:200
-msgid "Error: Command Failed"
-msgstr "エラー: コマンドãŒå¤±æ•—ã—ã¾ã—ãŸ"
+#: lib/option.tcl:310 lib/branch_checkout.tcl:39 lib/branch_create.tcl:69
+msgid "Options"
+msgstr "オプション"
-#: lib/database.tcl:43
+#: lib/option.tcl:345
+msgid "Failed to completely save options:"
+msgstr "完全ã«ã‚ªãƒ—ションをä¿å­˜ã§ãã¾ã›ã‚“:"
+
+#: lib/database.tcl:42
msgid "Number of loose objects"
msgstr "ã°ã‚‰ã°ã‚‰ãªã‚ªãƒ–ジェクトã®æ•°"
-#: lib/database.tcl:44
+#: lib/database.tcl:43
msgid "Disk space used by loose objects"
msgstr "ã°ã‚‰ã°ã‚‰ãªã‚ªãƒ–ジェクトã®ä½¿ç”¨ã™ã‚‹ãƒ‡ã‚£ã‚¹ã‚¯é‡"
-#: lib/database.tcl:45
+#: lib/database.tcl:44
msgid "Number of packed objects"
msgstr "パックã•ã‚ŒãŸã‚ªãƒ–ジェクトã®æ•°"
-#: lib/database.tcl:46
+#: lib/database.tcl:45
msgid "Number of packs"
msgstr "パックã®æ•°"
-#: lib/database.tcl:47
+#: lib/database.tcl:46
msgid "Disk space used by packed objects"
msgstr "パックã•ã‚ŒãŸã‚ªãƒ–ジェクトã®ä½¿ç”¨ã™ã‚‹ãƒ‡ã‚£ã‚¹ã‚¯é‡"
-#: lib/database.tcl:48
+#: lib/database.tcl:47
msgid "Packed objects waiting for pruning"
msgstr "パックã«å­˜åœ¨ã™ã‚‹ã®ã§æ¨ã¦ã¦è‰¯ã„オブジェクトã®æ•°"
-#: lib/database.tcl:49
+#: lib/database.tcl:48
msgid "Garbage files"
msgstr "ゴミファイル"
@@ -1549,12 +1954,132 @@ msgstr ""
"\n"
"データベースを圧縮ã—ã¾ã™ã‹ï¼Ÿ"
-#: lib/date.tcl:25
+#: lib/transport.tcl:6 lib/remote_add.tcl:132
#, tcl-format
-msgid "Invalid date from Git: %s"
-msgstr "Git ã‹ã‚‰å‡ºãŸç„¡åŠ¹ãªæ—¥ä»˜: %s"
+msgid "fetch %s"
+msgstr "%s ã‚’å–å¾—"
-#: lib/diff.tcl:64
+#: lib/transport.tcl:7
+#, tcl-format
+msgid "Fetching new changes from %s"
+msgstr "%s ã‹ã‚‰æ–°ã—ã„変更をフェッãƒã—ã¦ã„ã¾ã™"
+
+#: lib/transport.tcl:18
+#, tcl-format
+msgid "remote prune %s"
+msgstr "リモート刈込 %s"
+
+#: lib/transport.tcl:19
+#, tcl-format
+msgid "Pruning tracking branches deleted from %s"
+msgstr "%s ã‹ã‚‰å‰Šé™¤ã•ã‚ŒãŸãƒˆãƒ©ãƒƒã‚­ãƒ³ã‚°ãƒ»ãƒ–ランãƒã‚’刈ã£ã¦ã„ã¾ã™"
+
+#: lib/transport.tcl:25
+msgid "fetch all remotes"
+msgstr "ã™ã¹ã¦ã®ãƒªãƒ¢ãƒ¼ãƒˆã‚’å–å¾—"
+
+#: lib/transport.tcl:26
+msgid "Fetching new changes from all remotes"
+msgstr "ã™ã¹ã¦ã®ãƒªãƒ¢ãƒ¼ãƒˆã‹ã‚‰æ–°ã—ã„変更をフェッãƒã—ã¦ã„ã¾ã™"
+
+#: lib/transport.tcl:40
+msgid "remote prune all remotes"
+msgstr "リモート刈込 ã™ã¹ã¦ã®ãƒªãƒ¢ãƒ¼ãƒˆ"
+
+#: lib/transport.tcl:41
+msgid "Pruning tracking branches deleted from all remotes"
+msgstr "ã™ã¹ã¦ã®ãƒªãƒ¢ãƒ¼ãƒˆã‹ã‚‰å‰Šé™¤ã•ã‚ŒãŸãƒˆãƒ©ãƒƒã‚­ãƒ³ã‚°ãƒ»ãƒ–ランãƒã‚’刈ã£ã¦ã„ã¾ã™"
+
+#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110
+#: lib/remote_add.tcl:162
+#, tcl-format
+msgid "push %s"
+msgstr "%s をプッシュ"
+
+#: lib/transport.tcl:55
+#, tcl-format
+msgid "Pushing changes to %s"
+msgstr "%s ã¸å¤‰æ›´ã‚’プッシュã—ã¦ã„ã¾ã™"
+
+#: lib/transport.tcl:93
+#, tcl-format
+msgid "Mirroring to %s"
+msgstr "%s ã¸ãƒŸãƒ©ãƒ¼ã—ã¦ã„ã¾ã™"
+
+#: lib/transport.tcl:111
+#, tcl-format
+msgid "Pushing %s %s to %s"
+msgstr "%3$s 㸠%1$s %2$s をプッシュã—ã¦ã„ã¾ã™"
+
+#: lib/transport.tcl:132
+msgid "Push Branches"
+msgstr "ブランãƒã‚’プッシュ"
+
+#: lib/transport.tcl:147
+msgid "Source Branches"
+msgstr "å…ƒã®ãƒ–ランãƒ"
+
+#: lib/transport.tcl:162
+msgid "Destination Repository"
+msgstr "é€ã‚Šå…ˆãƒªãƒã‚¸ãƒˆãƒª"
+
+#: lib/transport.tcl:205
+msgid "Transfer Options"
+msgstr "通信オプション"
+
+#: lib/transport.tcl:207
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr "既存ブランãƒã‚’上書ã(変更を破棄ã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™)"
+
+#: lib/transport.tcl:211
+msgid "Use thin pack (for slow network connections)"
+msgstr "Thin Pack を使ã†ï¼ˆé…ã„ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šï¼‰"
+
+#: lib/transport.tcl:215
+msgid "Include tags"
+msgstr "ã‚¿ã‚°ã‚’å«ã‚ã‚‹"
+
+#: lib/choose_font.tcl:41
+msgid "Select"
+msgstr "é¸æŠž"
+
+#: lib/choose_font.tcl:55
+msgid "Font Family"
+msgstr "フォント・ファミリー"
+
+#: lib/choose_font.tcl:76
+msgid "Font Size"
+msgstr "フォントã®å¤§ãã•"
+
+#: lib/choose_font.tcl:93
+msgid "Font Example"
+msgstr "フォント・サンプル"
+
+#: lib/choose_font.tcl:105
+msgid ""
+"This is example text.\n"
+"If you like this text, it can be your font."
+msgstr ""
+"ã“ã‚Œã¯ã‚µãƒ³ãƒ—ル文ã§ã™ã€‚\n"
+"ã“ã®ãƒ•ã‚©ãƒ³ãƒˆãŒæ°—ã«å…¥ã‚Œã°ãŠä½¿ã„ã«ãªã‚Œã¾ã™ã€‚"
+
+#: lib/remote.tcl:200
+msgid "Push to"
+msgstr "プッシュ先"
+
+#: lib/remote.tcl:218
+msgid "Remove Remote"
+msgstr "リモートを削除"
+
+#: lib/remote.tcl:223
+msgid "Prune from"
+msgstr "ã‹ã‚‰åˆˆè¾¼ã‚€â€¦"
+
+#: lib/remote.tcl:228
+msgid "Fetch from"
+msgstr "å–å¾—å…ƒ"
+
+#: lib/diff.tcl:77
#, tcl-format
msgid ""
"No differences detected.\n"
@@ -1576,12 +2101,12 @@ msgstr ""
"\n"
"åŒæ§˜ãªçŠ¶æ…‹ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’探ã™ãŸã‚ã«ã€è‡ªå‹•çš„ã«å†ã‚¹ã‚­ãƒ£ãƒ³ã‚’開始ã—ã¾ã™ã€‚"
-#: lib/diff.tcl:104
+#: lib/diff.tcl:117
#, tcl-format
msgid "Loading diff of %s..."
msgstr "%s ã®å¤‰æ›´ç‚¹ã‚’ロード中…"
-#: lib/diff.tcl:125
+#: lib/diff.tcl:140
msgid ""
"LOCAL: deleted\n"
"REMOTE:\n"
@@ -1589,7 +2114,7 @@ msgstr ""
"LOCAL: 削除\n"
"Remote:\n"
-#: lib/diff.tcl:130
+#: lib/diff.tcl:145
msgid ""
"REMOTE: deleted\n"
"LOCAL:\n"
@@ -1597,32 +2122,32 @@ msgstr ""
"REMOTE: 削除\n"
"LOCAL:\n"
-#: lib/diff.tcl:137
+#: lib/diff.tcl:152
msgid "LOCAL:\n"
msgstr "LOCAL:\n"
-#: lib/diff.tcl:140
+#: lib/diff.tcl:155
msgid "REMOTE:\n"
msgstr "REMOTE\n"
-#: lib/diff.tcl:202 lib/diff.tcl:319
+#: lib/diff.tcl:217 lib/diff.tcl:355
#, tcl-format
msgid "Unable to display %s"
msgstr "%s を表示ã§ãã¾ã›ã‚“"
-#: lib/diff.tcl:203
+#: lib/diff.tcl:218
msgid "Error loading file:"
msgstr "ファイルを読む際ã®ã‚¨ãƒ©ãƒ¼ã§ã™:"
-#: lib/diff.tcl:210
+#: lib/diff.tcl:225
msgid "Git Repository (subproject)"
msgstr "Git リãƒã‚¸ãƒˆãƒª(サブプロジェクト)"
-#: lib/diff.tcl:222
+#: lib/diff.tcl:237
msgid "* Binary file (not showing content)."
msgstr "* ãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«(内容ã¯è¡¨ç¤ºã—ã¾ã›ã‚“)"
-#: lib/diff.tcl:227
+#: lib/diff.tcl:242
#, tcl-format
msgid ""
"* Untracked file is %d bytes.\n"
@@ -1631,7 +2156,7 @@ msgstr ""
"* 管ç†å¤–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å¤§ãã•ã¯ %d ãƒã‚¤ãƒˆã§ã™ã€‚\n"
"* 最åˆã® %d ãƒã‚¤ãƒˆã ã‘表示ã—ã¦ã„ã¾ã™ã€‚\n"
-#: lib/diff.tcl:233
+#: lib/diff.tcl:248
#, tcl-format
msgid ""
"\n"
@@ -1643,56 +2168,47 @@ msgstr ""
"* %s ã¯ç®¡ç†å¤–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã“ã“ã§åˆ‡ã‚ŠãŠã¨ã—ã¾ã—ãŸã€‚\n"
"* 全体を見るã«ã¯å¤–部エディタを使ã£ã¦ãã ã•ã„。\n"
-#: lib/diff.tcl:482
+#: lib/diff.tcl:578
msgid "Failed to unstage selected hunk."
msgstr "é¸æŠžã•ã‚ŒãŸãƒ‘ッãƒã‚’コミット予定ã‹ã‚‰å¤–ã›ã¾ã›ã‚“。"
-#: lib/diff.tcl:489
+#: lib/diff.tcl:585
msgid "Failed to stage selected hunk."
msgstr "é¸æŠžã•ã‚ŒãŸãƒ‘ッãƒã‚’コミット予定ã«åŠ ãˆã‚‰ã‚Œã¾ã›ã‚“。"
-#: lib/diff.tcl:568
+#: lib/diff.tcl:664
msgid "Failed to unstage selected line."
msgstr "é¸æŠžã•ã‚ŒãŸãƒ‘ッãƒè¡Œã‚’コミット予定ã‹ã‚‰å¤–ã›ã¾ã›ã‚“。"
-#: lib/diff.tcl:576
+#: lib/diff.tcl:672
msgid "Failed to stage selected line."
msgstr "é¸æŠžã•ã‚ŒãŸãƒ‘ッãƒè¡Œã‚’コミット予定ã«åŠ ãˆã‚‰ã‚Œã¾ã›ã‚“。"
-#: lib/encoding.tcl:443
-msgid "Default"
-msgstr "デフォールト"
-
-#: lib/encoding.tcl:448
-#, tcl-format
-msgid "System (%s)"
-msgstr "システム (%s)"
-
-#: lib/encoding.tcl:459 lib/encoding.tcl:465
-msgid "Other"
-msgstr "ãã®ä»–"
+#: lib/branch_checkout.tcl:16 lib/branch_checkout.tcl:21
+msgid "Checkout Branch"
+msgstr "ブランãƒã‚’ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ"
-#: lib/error.tcl:20 lib/error.tcl:114
-msgid "error"
-msgstr "エラー"
+#: lib/branch_checkout.tcl:26
+msgid "Checkout"
+msgstr "ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ"
-#: lib/error.tcl:36
-msgid "warning"
-msgstr "警告"
+#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92
+msgid "Fetch Tracking Branch"
+msgstr "トラッキング・ブランãƒã‚’フェッãƒ"
-#: lib/error.tcl:94
-msgid "You must correct the above errors before committing."
-msgstr "コミットã™ã‚‹å‰ã«ã€ä»¥ä¸Šã®ã‚¨ãƒ©ãƒ¼ã‚’修正ã—ã¦ä¸‹ã•ã„"
+#: lib/branch_checkout.tcl:47
+msgid "Detach From Local Branch"
+msgstr "ローカル・ブランãƒã‹ã‚‰å‰Šé™¤"
#: lib/index.tcl:6
msgid "Unable to unlock the index."
msgstr "インデックスをロックã§ãã¾ã›ã‚“"
-#: lib/index.tcl:15
+#: lib/index.tcl:17
msgid "Index Error"
msgstr "索引エラー"
-#: lib/index.tcl:17
+#: lib/index.tcl:19
msgid ""
"Updating the Git index failed. A rescan will be automatically started to "
"resynchronize git-gui."
@@ -1700,433 +2216,330 @@ msgstr ""
"GIT インデックスã®æ›´æ–°ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚git-gui ã¨åŒæœŸã‚’ã¨ã‚‹ãŸã‚ã«å†ã‚¹ã‚­ãƒ£ãƒ³ã—"
"ã¾ã™ã€‚"
-#: lib/index.tcl:28
+#: lib/index.tcl:30
msgid "Continue"
msgstr "続行"
-#: lib/index.tcl:31
+#: lib/index.tcl:33
msgid "Unlock Index"
msgstr "インデックスã®ãƒ­ãƒƒã‚¯è§£é™¤"
-#: lib/index.tcl:289
+#: lib/index.tcl:298
#, tcl-format
msgid "Unstaging %s from commit"
msgstr "コミットã‹ã‚‰ '%s' ã‚’é™ã‚ã™"
-#: lib/index.tcl:328
+#: lib/index.tcl:337
msgid "Ready to commit."
msgstr "コミット準備完了"
-#: lib/index.tcl:341
+#: lib/index.tcl:350
#, tcl-format
msgid "Adding %s"
msgstr "コミット㫠%s を加ãˆã¦ã„ã¾ã™"
-#: lib/index.tcl:398
+#: lib/index.tcl:380
+#, tcl-format
+msgid "Stage %d untracked files?"
+msgstr "管ç†å¤–ã® %d ファイルをコミット予定ã¨ã—ã¾ã™ã‹ï¼Ÿ"
+
+#: lib/index.tcl:428
#, tcl-format
msgid "Revert changes in file %s?"
msgstr "ファイル %s ã«ã—ãŸå¤‰æ›´ã‚’å…ƒã«æˆ»ã—ã¾ã™ã‹ï¼Ÿ"
-#: lib/index.tcl:400
+#: lib/index.tcl:430
#, tcl-format
msgid "Revert changes in these %i files?"
msgstr "ã“れら %i 個ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«ã—ãŸå¤‰æ›´ã‚’å…ƒã«æˆ»ã—ã¾ã™ã‹ï¼Ÿ"
-#: lib/index.tcl:408
+#: lib/index.tcl:438
msgid "Any unstaged changes will be permanently lost by the revert."
msgstr "変更を元ã«æˆ»ã™ã¨ã‚³ãƒŸãƒƒãƒˆäºˆå®šã—ã¦ã„ãªã„変更ã¯å…¨ã¦å¤±ã‚ã‚Œã¾ã™ã€‚"
-#: lib/index.tcl:411
+#: lib/index.tcl:441
msgid "Do Nothing"
msgstr "何もã—ãªã„"
-#: lib/index.tcl:429
+#: lib/index.tcl:459
msgid "Reverting selected files"
msgstr "é¸æŠžã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã«ã—ãŸå¤‰æ›´ã‚’å…ƒã«æˆ»ã—ã¾ã™"
-#: lib/index.tcl:433
+#: lib/index.tcl:463
#, tcl-format
msgid "Reverting %s"
msgstr "%s ã«ã—ãŸå¤‰æ›´ã‚’å…ƒã«æˆ»ã—ã¾ã™"
-#: lib/merge.tcl:13
+#: lib/sshkey.tcl:31
+msgid "No keys found."
+msgstr "キーãŒã‚ã‚Šã¾ã›ã‚“。"
+
+#: lib/sshkey.tcl:34
+#, tcl-format
+msgid "Found a public key in: %s"
+msgstr "公開éµãŒã‚ã‚Šã¾ã—ãŸ: %s"
+
+#: lib/sshkey.tcl:40
+msgid "Generate Key"
+msgstr "éµã‚’生æˆ"
+
+#: lib/sshkey.tcl:58
+msgid "Copy To Clipboard"
+msgstr "クリップボードã«ã‚³ãƒ”ー"
+
+#: lib/sshkey.tcl:72
+msgid "Your OpenSSH Public Key"
+msgstr "ã‚ãªãŸã® OpenSSH 公開éµ"
+
+#: lib/sshkey.tcl:80
+msgid "Generating..."
+msgstr "生æˆä¸­..."
+
+#: lib/sshkey.tcl:86
+#, tcl-format
msgid ""
-"Cannot merge while amending.\n"
+"Could not start ssh-keygen:\n"
"\n"
-"You must finish amending this commit before starting any type of merge.\n"
+"%s"
msgstr ""
-"訂正中ã«ã¯ãƒžãƒ¼ã‚¸ã§ãã¾ã›ã‚“。\n"
+"ssh-keygen ã‚’èµ·å‹•ã§ãã¾ã›ã‚“:\n"
"\n"
-"訂正処ç†ã‚’完了ã™ã‚‹ã¾ã§ã¯æ–°ãŸã«ãƒžãƒ¼ã‚¸ã‚’開始ã§ãã¾ã›ã‚“。\n"
+"%s"
-#: lib/merge.tcl:27
+#: lib/sshkey.tcl:113
+msgid "Generation failed."
+msgstr "生æˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+
+#: lib/sshkey.tcl:120
+msgid "Generation succeeded, but no keys found."
+msgstr "生æˆã«ã¯æˆåŠŸã—ã¾ã—ãŸãŒã€éµãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
+
+#: lib/sshkey.tcl:123
+#, tcl-format
+msgid "Your key is in: %s"
+msgstr "ã‚ãªãŸã®éµã¯ %s ã«ã‚ã‚Šã¾ã™"
+
+#: lib/commit.tcl:9
msgid ""
-"Last scanned state does not match repository state.\n"
-"\n"
-"Another Git program has modified this repository since the last scan. A "
-"rescan must be performed before a merge can be performed.\n"
+"There is nothing to amend.\n"
"\n"
-"The rescan will be automatically started now.\n"
+"You are about to create the initial commit. There is no commit before this "
+"to amend.\n"
msgstr ""
-"最後ã«ã‚¹ã‚­ãƒ£ãƒ³ã—ãŸçŠ¶æ…‹ã¯ãƒªãƒã‚¸ãƒˆãƒªã®çŠ¶æ…‹ã¨åˆè‡´ã—ã¾ã›ã‚“。\n"
-"\n"
-"最後ã«ã‚¹ã‚­ãƒ£ãƒ³ã—ã¦ä»¥å¾Œã€åˆ¥ã® Git プログラムãŒãƒªãƒã‚¸ãƒˆãƒªã‚’変更ã—ã¦ã„ã¾ã™ã€‚マー"
-"ジを開始ã™ã‚‹å‰ã«ã€å†ã‚¹ã‚­ãƒ£ãƒ³ãŒå¿…è¦ã§ã™ã€‚\n"
+"訂正ã™ã‚‹ã‚³ãƒŸãƒƒãƒˆãŒãã‚‚ãã‚‚ã‚ã‚Šã¾ã›ã‚“。\n"
"\n"
-"自動的ã«å†ã‚¹ã‚­ãƒ£ãƒ³ã‚’開始ã—ã¾ã™ã€‚\n"
+"ã“ã‚Œã‹ã‚‰ä½œã‚‹ã®ã¯æœ€åˆã®ã‚³ãƒŸãƒƒãƒˆã§ã™ã€‚ãã®å‰ã«ã¯ã¾ã è¨‚æ­£ã™ã‚‹ã‚ˆã†ãªã‚³ãƒŸãƒƒãƒˆã¯ã‚"
+"ã‚Šã¾ã›ã‚“。\n"
-#: lib/merge.tcl:45
-#, tcl-format
+#: lib/commit.tcl:18
msgid ""
-"You are in the middle of a conflicted merge.\n"
-"\n"
-"File %s has merge conflicts.\n"
+"Cannot amend while merging.\n"
"\n"
-"You must resolve them, stage the file, and commit to complete the current "
-"merge. Only then can you begin another merge.\n"
+"You are currently in the middle of a merge that has not been fully "
+"completed. You cannot amend the prior commit unless you first abort the "
+"current merge activity.\n"
msgstr ""
-"è¡çªã®ã‚ã£ãŸãƒžãƒ¼ã‚¸ã®é€”中ã§ã™ã€‚\n"
-"\n"
-"ファイル %s ã«ã¯ãƒžãƒ¼ã‚¸ä¸­ã®è¡çªãŒæ®‹ã£ã¦ã„ã¾ã™ã€‚\n"
+"マージ中ã«ã‚³ãƒŸãƒƒãƒˆã®è¨‚æ­£ã¯ã§ãã¾ã›ã‚“。\n"
"\n"
-"ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®è¡çªã‚’解決ã—ã€ã‚³ãƒŸãƒƒãƒˆäºˆå®šã«åŠ ãˆã¦ã€ã‚³ãƒŸãƒƒãƒˆã™ã‚‹ã“ã¨ã§ãƒžãƒ¼ã‚¸ã‚’"
-"完了ã—ã¾ã™ã€‚ãã†ã‚„ã£ã¦å§‹ã‚ã¦ã€æ–°ãŸãªãƒžãƒ¼ã‚¸ã‚’開始ã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚\n"
+"ç¾åœ¨ã¯ã¾ã ãƒžãƒ¼ã‚¸ã®é€”中ã§ã™ã€‚å…ˆã«ã“ã®ãƒžãƒ¼ã‚¸ã‚’中止ã—ãªã„ã¨ã€å‰ã®ã‚³ãƒŸãƒƒãƒˆã®è¨‚æ­£"
+"ã¯ã§ãã¾ã›ã‚“\n"
-#: lib/merge.tcl:55
+#: lib/commit.tcl:48
+msgid "Error loading commit data for amend:"
+msgstr "訂正ã™ã‚‹ã‚³ãƒŸãƒƒãƒˆã®ãƒ‡ãƒ¼ã‚¿ã‚’読ã‚ã¾ã›ã‚“:"
+
+#: lib/commit.tcl:75
+msgid "Unable to obtain your identity:"
+msgstr "ユーザã®æ­£ä½“を確èªã§ãã¾ã›ã‚“:"
+
+#: lib/commit.tcl:80
+msgid "Invalid GIT_COMMITTER_IDENT:"
+msgstr "GIT_COMMITTER_IDENT ãŒç„¡åŠ¹ã§ã™:"
+
+#: lib/commit.tcl:129
#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr "警告: Tcl ã¯ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚° '%s' をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“"
+
+#: lib/commit.tcl:149
msgid ""
-"You are in the middle of a change.\n"
+"Last scanned state does not match repository state.\n"
"\n"
-"File %s is modified.\n"
+"Another Git program has modified this repository since the last scan. A "
+"rescan must be performed before another commit can be created.\n"
"\n"
-"You should complete the current commit before starting a merge. Doing so "
-"will help you abort a failed merge, should the need arise.\n"
+"The rescan will be automatically started now.\n"
msgstr ""
-"変更ã®é€”中ã§ã™ã€‚\n"
+"最後ã«ã‚¹ã‚­ãƒ£ãƒ³ã—ãŸçŠ¶æ…‹ã¯ãƒªãƒã‚¸ãƒˆãƒªã®çŠ¶æ…‹ã¨åˆè‡´ã—ã¾ã›ã‚“。\n"
"\n"
-"ファイル %s ã¯å¤‰æ›´ä¸­ã§ã™ã€‚\n"
+"最後ã«ã‚¹ã‚­ãƒ£ãƒ³ã—ã¦ä»¥å¾Œã€åˆ¥ã® Git プログラムãŒãƒªãƒã‚¸ãƒˆãƒªã‚’変更ã—ã¦ã„ã¾ã™ã€‚æ–°ã—"
+"ãコミットã™ã‚‹å‰ã«ã€å†ã‚¹ã‚­ãƒ£ãƒ³ãŒå¿…è¦ã§ã™ã€‚\n"
"\n"
-"ç¾åœ¨ã®ã‚³ãƒŸãƒƒãƒˆã‚’完了ã—ã¦ã‹ã‚‰ãƒžãƒ¼ã‚¸ã‚’開始ã—ã¦ä¸‹ã•ã„。ãã†ã™ã‚‹æ–¹ãŒãƒžãƒ¼ã‚¸ã«å¤±æ•—"
-"ã—ãŸã¨ãã®å›žå¾©ãŒæ¥½ã§ã™ã€‚\n"
-
-#: lib/merge.tcl:107
-#, tcl-format
-msgid "%s of %s"
-msgstr "%s ã® %s ブランãƒ"
+"自動的ã«å†ã‚¹ã‚­ãƒ£ãƒ³ã‚’開始ã—ã¾ã™ã€‚\n"
-#: lib/merge.tcl:120
+#: lib/commit.tcl:173
#, tcl-format
-msgid "Merging %s and %s..."
-msgstr "%s 㨠%s をマージ中・・・"
-
-#: lib/merge.tcl:131
-msgid "Merge completed successfully."
-msgstr "マージãŒå®Œäº†ã—ã¾ã—ãŸ"
-
-#: lib/merge.tcl:133
-msgid "Merge failed. Conflict resolution is required."
-msgstr "マージãŒå¤±æ•—ã—ã¾ã—ãŸã€‚è¡çªã®è§£æ±ºãŒå¿…è¦ã§ã™ã€‚"
+msgid ""
+"Unmerged files cannot be committed.\n"
+"\n"
+"File %s has merge conflicts. You must resolve them and stage the file "
+"before committing.\n"
+msgstr ""
+"マージã—ã¦ã„ãªã„ファイルã¯ã‚³ãƒŸãƒƒãƒˆã§ãã¾ã›ã‚“。\n"
+"\n"
+"ファイル %s ã«ã¯ãƒžãƒ¼ã‚¸è¡çªãŒæ®‹ã£ã¦ã„ã¾ã™ã€‚ã¾ãšè§£æ±ºã—ã¦ã‚³ãƒŸãƒƒãƒˆäºˆå®šã«åŠ ãˆã‚‹å¿…"
+"è¦ãŒã‚ã‚Šã¾ã™ã€‚\n"
-#: lib/merge.tcl:158
+#: lib/commit.tcl:181
#, tcl-format
-msgid "Merge Into %s"
-msgstr "%s ã«ãƒžãƒ¼ã‚¸"
-
-#: lib/merge.tcl:177
-msgid "Revision To Merge"
-msgstr "マージã™ã‚‹ãƒªãƒ“ジョン"
-
-#: lib/merge.tcl:212
msgid ""
-"Cannot abort while amending.\n"
+"Unknown file state %s detected.\n"
"\n"
-"You must finish amending this commit.\n"
+"File %s cannot be committed by this program.\n"
msgstr ""
-"訂正中ã«ã¯ä¸­æ­¢ã§ãã¾ã›ã‚“。\n"
+"ä¸æ˜Žãªãƒ•ã‚¡ã‚¤ãƒ«çŠ¶æ…‹ %s ã§ã™ã€‚\n"
"\n"
-"ã¾ãšä»Šã®ã‚³ãƒŸãƒƒãƒˆè¨‚正を完了ã•ã›ã¦ä¸‹ã•ã„。\n"
+"ファイル %s ã¯æœ¬ãƒ—ログラムã§ã¯ã‚³ãƒŸãƒƒãƒˆã§ãã¾ã›ã‚“。\n"
-#: lib/merge.tcl:222
+#: lib/commit.tcl:189
msgid ""
-"Abort merge?\n"
-"\n"
-"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
+"No changes to commit.\n"
"\n"
-"Continue with aborting the current merge?"
+"You must stage at least 1 file before you can commit.\n"
msgstr ""
-"マージを中断ã—ã¾ã™ã‹ï¼Ÿ\n"
-"\n"
-"ç¾åœ¨ã®ãƒžãƒ¼ã‚¸ã‚’中断ã™ã‚‹ã¨ã€ã‚³ãƒŸãƒƒãƒˆã—ã¦ã„ãªã„å…¨ã¦ã®å¤‰æ›´ãŒå¤±ã‚ã‚Œã¾ã™ã€‚\n"
+"コミットã™ã‚‹å¤‰æ›´ãŒã‚ã‚Šã¾ã›ã‚“。\n"
"\n"
-"マージを中断ã—ã¦ã‚ˆã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
+"最低一ã¤ã®å¤‰æ›´ã‚’コミット予定ã«åŠ ãˆã¦ã‹ã‚‰ã‚³ãƒŸãƒƒãƒˆã—ã¦ä¸‹ã•ã„。\n"
-#: lib/merge.tcl:228
+#: lib/commit.tcl:204
msgid ""
-"Reset changes?\n"
+"Please supply a commit message.\n"
"\n"
-"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
+"A good commit message has the following format:\n"
"\n"
-"Continue with resetting the current changes?"
+"- First line: Describe in one sentence what you did.\n"
+"- Second line: Blank\n"
+"- Remaining lines: Describe why this change is good.\n"
msgstr ""
-"変更点をリセットã—ã¾ã™ã‹ï¼Ÿ\n"
+"コミット・メッセージを入力ã—ã¦ä¸‹ã•ã„。\n"
"\n"
-"変更点をリセットã™ã‚‹ã¨ã€ã‚³ãƒŸãƒƒãƒˆã—ã¦ã„ãªã„å…¨ã¦ã®å¤‰æ›´ãŒå¤±ã‚ã‚Œã¾ã™ã€‚\n"
+"æ­£ã—ã„コミット・メッセージã¯:\n"
"\n"
-"リセットã—ã¦ã‚ˆã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
-
-#: lib/merge.tcl:239
-msgid "Aborting"
-msgstr "中断ã—ã¦ã„ã¾ã™"
-
-#: lib/merge.tcl:239
-msgid "files reset"
-msgstr "リセットã—ãŸãƒ•ã‚¡ã‚¤ãƒ«"
-
-#: lib/merge.tcl:267
-msgid "Abort failed."
-msgstr "中断ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-
-#: lib/merge.tcl:269
-msgid "Abort completed. Ready."
-msgstr "中断完了。"
-
-#: lib/mergetool.tcl:8
-msgid "Force resolution to the base version?"
-msgstr "共通ã®ç‰ˆã‚’使ã„ã¾ã™ã‹?"
+"- 第1行: 何をã—ãŸã‹ã€ã‚’1行ã§è¦ç´„。\n"
+"- 第2行: 空白\n"
+"- 残りã®è¡Œ: ãªãœã€ã“ã®å¤‰æ›´ãŒè‰¯ã„変更ã‹ã€ã®èª¬æ˜Žã€‚\n"
-#: lib/mergetool.tcl:9
-msgid "Force resolution to this branch?"
-msgstr "自分ã®å´ã®ç‰ˆã‚’使ã„ã¾ã™ã‹?"
+#: lib/commit.tcl:235
+msgid "Calling pre-commit hook..."
+msgstr "コミットå‰ãƒ•ãƒƒã‚¯ã‚’実行中・・・"
-#: lib/mergetool.tcl:10
-msgid "Force resolution to the other branch?"
-msgstr "相手制ã®ç‰ˆã‚’使ã„ã¾ã™ã‹?"
+#: lib/commit.tcl:250
+msgid "Commit declined by pre-commit hook."
+msgstr "コミットå‰ãƒ•ãƒƒã‚¯ãŒã‚³ãƒŸãƒƒãƒˆã‚’æ‹’å¦ã—ã¾ã—ãŸ"
-#: lib/mergetool.tcl:14
-#, tcl-format
+#: lib/commit.tcl:269
msgid ""
-"Note that the diff shows only conflicting changes.\n"
-"\n"
-"%s will be overwritten.\n"
-"\n"
-"This operation can be undone only by restarting the merge."
+"You are about to commit on a detached head. This is a potentially dangerous "
+"thing to do because if you switch to another branch you will lose your "
+"changes and it can be difficult to retrieve them later from the reflog. You "
+"should probably cancel this commit and create a new branch to continue.\n"
+" \n"
+" Do you really want to proceed with your Commit?"
msgstr ""
-"競åˆã™ã‚‹å¤‰æ›´ç‚¹ã ã‘ãŒè¡¨ç¤ºã•ã‚Œã¦ã„ã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。\n"
+"分離 HEAD ã§ã®å¤‰æ›´ã‚’コミットã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚"
+"ã“ã‚Œã¯æ½œåœ¨çš„ã«å±é™ºãªè¡Œç‚ºã§ã€ç†ç”±ã¯åˆ¥ã®ãƒ–ランãƒã¸ã®åˆ‡ã‚Šæ›¿ãˆã§"
+"変更ãŒæ¶ˆå¤±ã—ã€reflog ã‹ã‚‰ã®äº‹å¾Œå¾©æ—§ã‚‚困難ã¨ãªã‚‹ãŸã‚ã§ã™ã€‚"
+"ãŠãらãã“ã®ã‚³ãƒŸãƒƒãƒˆã¯ã‚­ãƒ£ãƒ³ã‚»ãƒ«ã—æ–°ã—ã作æˆã—ãŸãƒ–ランãƒã§"
+"è¡Œã†ã¹ãã§ã™ã€‚\n"
"\n"
-"%s ã¯ä¸Šæ›¸ãã•ã‚Œã¾ã™ã€‚\n"
-"\n"
-"ã‚„ã‚Šç›´ã™ã«ã¯ãƒžãƒ¼ã‚¸å…¨ä½“ã‚’ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。"
+" 本当ã«ã‚³ãƒŸãƒƒãƒˆã‚’続行ã—ã¾ã™ã‹ï¼Ÿ"
-#: lib/mergetool.tcl:45
-#, tcl-format
-msgid "File %s seems to have unresolved conflicts, still stage?"
-msgstr ""
-"ファイル %s ã«ã¯è§£æ±ºã—ã¦ã„ãªã„競åˆéƒ¨åˆ†ãŒã¾ã ã‚るよã†ã§ã™ãŒã€ã„ã„ã§ã™ã‹?"
-
-#: lib/mergetool.tcl:60
-#, tcl-format
-msgid "Adding resolution for %s"
-msgstr "%s ã¸ã®è§£æ±ºã‚’ステージã—ã¾ã™"
-
-#: lib/mergetool.tcl:141
-msgid "Cannot resolve deletion or link conflicts using a tool"
-msgstr "ツールã§ã¯å‰Šé™¤ã‚„リンク競åˆã¯æ‰±ãˆã¾ã›ã‚“"
+#: lib/commit.tcl:290
+msgid "Calling commit-msg hook..."
+msgstr "コミット・メッセージ・フックを実行中・・・"
-#: lib/mergetool.tcl:146
-msgid "Conflict file does not exist"
-msgstr "競åˆãƒ•ã‚¡ã‚¤ãƒ«ã¯å­˜åœ¨ã—ã¾ã›ã‚“。"
+#: lib/commit.tcl:305
+msgid "Commit declined by commit-msg hook."
+msgstr "コミット・メッセージ・フックãŒã‚³ãƒŸãƒƒãƒˆã‚’æ‹’å¦ã—ã¾ã—ãŸ"
-#: lib/mergetool.tcl:264
-#, tcl-format
-msgid "Not a GUI merge tool: '%s'"
-msgstr "GUI マージツールã§ã¯ã‚ã‚Šã¾ã›ã‚“: %s"
+#: lib/commit.tcl:318
+msgid "Committing changes..."
+msgstr "変更点をコミット中・・・"
-#: lib/mergetool.tcl:268
-#, tcl-format
-msgid "Unsupported merge tool '%s'"
-msgstr "マージツール '%s' ã¯ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“"
+#: lib/commit.tcl:334
+msgid "write-tree failed:"
+msgstr "write-tree ãŒå¤±æ•—ã—ã¾ã—ãŸ:"
-#: lib/mergetool.tcl:303
-msgid "Merge tool is already running, terminate it?"
-msgstr "マージツールã¯ã™ã§ã«èµ·å‹•ã—ã¦ã„ã¾ã™ã€‚終了ã—ã¾ã™ã‹?"
+#: lib/commit.tcl:335 lib/commit.tcl:379 lib/commit.tcl:400
+msgid "Commit failed."
+msgstr "コミットã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: lib/mergetool.tcl:323
+#: lib/commit.tcl:352
#, tcl-format
-msgid ""
-"Error retrieving versions:\n"
-"%s"
-msgstr ""
-"版ã®å–り出ã—時ã«ã‚¨ãƒ©ãƒ¼ãŒå‡ºã¾ã—ãŸ:\n"
-"%s"
+msgid "Commit %s appears to be corrupt"
+msgstr "コミット %s ã¯å£Šã‚Œã¦ã„ã¾ã™"
-#: lib/mergetool.tcl:343
-#, tcl-format
+#: lib/commit.tcl:357
msgid ""
-"Could not start the merge tool:\n"
+"No changes to commit.\n"
"\n"
-"%s"
+"No files were modified by this commit and it was not a merge commit.\n"
+"\n"
+"A rescan will be automatically started now.\n"
msgstr ""
-"マージツールãŒèµ·å‹•ã§ãã¾ã›ã‚“:\n"
+"コミットã™ã‚‹å¤‰æ›´ãŒã‚ã‚Šã¾ã›ã‚“。\n"
"\n"
-"%s"
-
-#: lib/mergetool.tcl:347
-msgid "Running merge tool..."
-msgstr "マージツールを実行ã—ã¦ã„ã¾ã™..."
-
-#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
-msgid "Merge tool failed."
-msgstr "マージツールãŒå¤±æ•—ã—ã¾ã—ãŸã€‚"
-
-#: lib/option.tcl:11
-#, tcl-format
-msgid "Invalid global encoding '%s'"
-msgstr "全体エンコーディング㫠無効㪠%s ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã™"
+"マージã§ãªãã€ã¾ãŸã€ä¸€ã¤ã‚‚変更点ãŒã‚ã‚Šã¾ã›ã‚“。\n"
+"\n"
+"自動的ã«å†ã‚¹ã‚­ãƒ£ãƒ³ã‚’開始ã—ã¾ã™ã€‚\n"
-#: lib/option.tcl:19
-#, tcl-format
-msgid "Invalid repo encoding '%s'"
-msgstr "リãƒã‚¸ãƒˆãƒªã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã« 無効㪠%s ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã™"
+#: lib/commit.tcl:364
+msgid "No changes to commit."
+msgstr "コミットã™ã‚‹å¤‰æ›´ãŒã‚ã‚Šã¾ã›ã‚“。"
-#: lib/option.tcl:117
-msgid "Restore Defaults"
-msgstr "既定値ã«æˆ»ã™"
+#: lib/commit.tcl:378
+msgid "commit-tree failed:"
+msgstr "commit-tree ãŒå¤±æ•—ã—ã¾ã—ãŸ:"
-#: lib/option.tcl:121
-msgid "Save"
-msgstr "ä¿å­˜"
+#: lib/commit.tcl:399
+msgid "update-ref failed:"
+msgstr "update-ref ãŒå¤±æ•—ã—ã¾ã—ãŸ:"
-#: lib/option.tcl:131
+#: lib/commit.tcl:492
#, tcl-format
-msgid "%s Repository"
-msgstr "%s リãƒã‚¸ãƒˆãƒª"
-
-#: lib/option.tcl:132
-msgid "Global (All Repositories)"
-msgstr "大域(全ã¦ã®ãƒªãƒã‚¸ãƒˆãƒªï¼‰"
-
-#: lib/option.tcl:138
-msgid "User Name"
-msgstr "ユーザå"
-
-#: lib/option.tcl:139
-msgid "Email Address"
-msgstr "é›»å­ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹"
-
-#: lib/option.tcl:141
-msgid "Summarize Merge Commits"
-msgstr "マージコミットã®è¦ç´„"
-
-#: lib/option.tcl:142
-msgid "Merge Verbosity"
-msgstr "マージã®å†—長度"
-
-#: lib/option.tcl:143
-msgid "Show Diffstat After Merge"
-msgstr "マージ後㫠diffstat を表示"
-
-#: lib/option.tcl:144
-msgid "Use Merge Tool"
-msgstr "マージツールを使用"
-
-#: lib/option.tcl:146
-msgid "Trust File Modification Timestamps"
-msgstr "ファイル変更時刻を信頼ã™ã‚‹"
-
-#: lib/option.tcl:147
-msgid "Prune Tracking Branches During Fetch"
-msgstr "フェッãƒä¸­ã«ãƒˆãƒ©ãƒƒã‚­ãƒ³ã‚°ãƒ–ランãƒã‚’刈る"
-
-#: lib/option.tcl:148
-msgid "Match Tracking Branches"
-msgstr "トラッキングブランãƒã‚’åˆã‚ã›ã‚‹"
-
-#: lib/option.tcl:149
-msgid "Blame Copy Only On Changed Files"
-msgstr "変更ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ã¿ã‚³ãƒ”ー検知を行ãªã†"
-
-#: lib/option.tcl:150
-msgid "Minimum Letters To Blame Copy On"
-msgstr "コピーを検知ã™ã‚‹æœ€å°‘文字数"
-
-#: lib/option.tcl:151
-msgid "Blame History Context Radius (days)"
-msgstr "註釈ã™ã‚‹å±¥æ­´åŠå¾„(日数)"
-
-#: lib/option.tcl:152
-msgid "Number of Diff Context Lines"
-msgstr "diff ã®æ–‡è„ˆè¡Œæ•°"
-
-#: lib/option.tcl:153
-msgid "Commit Message Text Width"
-msgstr "コミットメッセージã®ãƒ†ã‚­ã‚¹ãƒˆå¹…"
-
-#: lib/option.tcl:154
-msgid "New Branch Name Template"
-msgstr "æ–°ã—ã„ブランãƒåã®ãƒ†ãƒ³ãƒ—レート"
-
-#: lib/option.tcl:155
-msgid "Default File Contents Encoding"
-msgstr "ファイル内容ã®ãƒ‡ãƒ•ã‚©ãƒ¼ãƒ«ãƒˆã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°"
-
-#: lib/option.tcl:203
-msgid "Change"
-msgstr "変更"
+msgid "Created commit %s: %s"
+msgstr "コミット %s を作æˆã—ã¾ã—ãŸ: %s"
-#: lib/option.tcl:230
-msgid "Spelling Dictionary:"
-msgstr "スペルãƒã‚§ãƒƒã‚¯è¾žæ›¸"
+#: lib/browser.tcl:17
+msgid "Starting..."
+msgstr "起動中…"
-#: lib/option.tcl:254
-msgid "Change Font"
-msgstr "フォントを変更"
+#: lib/browser.tcl:27
+msgid "File Browser"
+msgstr "ファイル・ブラウザ"
-#: lib/option.tcl:258
+#: lib/browser.tcl:132 lib/browser.tcl:149
#, tcl-format
-msgid "Choose %s"
-msgstr "%s ã‚’é¸æŠž"
-
-#: lib/option.tcl:264
-msgid "pt."
-msgstr "ãƒã‚¤ãƒ³ãƒˆ"
-
-#: lib/option.tcl:278
-msgid "Preferences"
-msgstr "設定"
-
-#: lib/option.tcl:314
-msgid "Failed to completely save options:"
-msgstr "完全ã«ã‚ªãƒ—ションをä¿å­˜ã§ãã¾ã›ã‚“:"
-
-#: lib/remote.tcl:163
-msgid "Remove Remote"
-msgstr "リモートを削除"
-
-#: lib/remote.tcl:168
-msgid "Prune from"
-msgstr "ã‹ã‚‰åˆˆè¾¼ã‚€â€¦"
+msgid "Loading %s..."
+msgstr "%s をロード中…"
-#: lib/remote.tcl:173
-msgid "Fetch from"
-msgstr "å–å¾—å…ƒ"
+#: lib/browser.tcl:193
+msgid "[Up To Parent]"
+msgstr "[上ä½ãƒ•ã‚©ãƒ«ãƒ€ã¸]"
-#: lib/remote.tcl:215
-msgid "Push to"
-msgstr "プッシュ先"
+#: lib/browser.tcl:275 lib/browser.tcl:282
+msgid "Browse Branch Files"
+msgstr "ç¾åœ¨ã®ãƒ–ランãƒã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’見る"
-#: lib/remote_add.tcl:19
+#: lib/remote_add.tcl:20
msgid "Add Remote"
msgstr "リモートを追加"
-#: lib/remote_add.tcl:24
+#: lib/remote_add.tcl:25
msgid "Add New Remote"
msgstr "リモートを新è¦ã«è¿½åŠ "
-#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
-msgid "Add"
-msgstr "追加"
-
-#: lib/remote_add.tcl:37
+#: lib/remote_add.tcl:39
msgid "Remote Details"
msgstr "リモートã®è©³ç´°"
@@ -2134,155 +2547,104 @@ msgstr "リモートã®è©³ç´°"
msgid "Location:"
msgstr "場所:"
-#: lib/remote_add.tcl:62
+#: lib/remote_add.tcl:60
msgid "Further Action"
msgstr "ãã®ä»–ã®å‹•ä½œ"
-#: lib/remote_add.tcl:65
+#: lib/remote_add.tcl:63
msgid "Fetch Immediately"
msgstr "å³åº§ã«å–å¾—"
-#: lib/remote_add.tcl:71
+#: lib/remote_add.tcl:69
msgid "Initialize Remote Repository and Push"
msgstr "リモートレãƒã‚¸ãƒˆãƒªã‚’åˆæœŸåŒ–ã—ã¦ãƒ—ッシュ"
-#: lib/remote_add.tcl:77
+#: lib/remote_add.tcl:75
msgid "Do Nothing Else Now"
msgstr "何もã—ãªã„"
-#: lib/remote_add.tcl:101
+#: lib/remote_add.tcl:100
msgid "Please supply a remote name."
msgstr "リモートåを指定ã—ã¦ä¸‹ã•ã„。"
-#: lib/remote_add.tcl:114
+#: lib/remote_add.tcl:113
#, tcl-format
msgid "'%s' is not an acceptable remote name."
msgstr "'%s' ã¯ãƒªãƒ¢ãƒ¼ãƒˆåã«ä½¿ãˆã¾ã›ã‚“。"
-#: lib/remote_add.tcl:125
+#: lib/remote_add.tcl:124
#, tcl-format
msgid "Failed to add remote '%s' of location '%s'."
msgstr "場所 '%2$s' ã®ãƒªãƒ¢ãƒ¼ãƒˆ '%1$s'ã®åå‰å¤‰æ›´ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: lib/remote_add.tcl:133 lib/transport.tcl:6
-#, tcl-format
-msgid "fetch %s"
-msgstr "%s ã‚’å–å¾—"
-
-#: lib/remote_add.tcl:134
+#: lib/remote_add.tcl:133
#, tcl-format
msgid "Fetching the %s"
msgstr "%s ã‹ã‚‰ãƒ•ã‚§ãƒƒãƒã—ã¦ã„ã¾ã™"
-#: lib/remote_add.tcl:157
+#: lib/remote_add.tcl:156
#, tcl-format
msgid "Do not know how to initialize repository at location '%s'."
msgstr "リãƒã‚¸ãƒˆãƒª '%s' ã‚’åˆæœŸåŒ–ã§ãã¾ã›ã‚“。"
-#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
-#: lib/transport.tcl:81
-#, tcl-format
-msgid "push %s"
-msgstr "%s をプッシュ"
-
-#: lib/remote_add.tcl:164
+#: lib/remote_add.tcl:163
#, tcl-format
msgid "Setting up the %s (at %s)"
msgstr "%2$s ã«ã‚ã‚‹ %1$s をセットアップã—ã¾ã™"
-#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
-msgid "Delete Branch Remotely"
-msgstr "é éš”ã§ãƒ–ランãƒå‰Šé™¤"
-
-#: lib/remote_branch_delete.tcl:47
-msgid "From Repository"
-msgstr "å…ƒã®ãƒªãƒã‚¸ãƒˆãƒª"
+#: lib/line.tcl:17
+msgid "Goto Line:"
+msgstr "行番å·"
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134
-msgid "Remote:"
-msgstr "リモート:"
+#: lib/line.tcl:23
+msgid "Go"
+msgstr "移動"
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
-msgid "Arbitrary Location:"
-msgstr "ä»»æ„ã®ä½ç½®:"
+#: lib/branch_create.tcl:23
+msgid "Create Branch"
+msgstr "ブランãƒã‚’作æˆ"
-#: lib/remote_branch_delete.tcl:84
-msgid "Branches"
-msgstr "ブランãƒ"
+#: lib/branch_create.tcl:28
+msgid "Create New Branch"
+msgstr "ブランãƒã‚’æ–°è¦ä½œæˆ"
-#: lib/remote_branch_delete.tcl:109
-msgid "Delete Only If"
-msgstr "æ¡ä»¶ä»˜ã§å‰Šé™¤"
+#: lib/branch_create.tcl:42
+msgid "Branch Name"
+msgstr "ブランãƒå"
-#: lib/remote_branch_delete.tcl:111
-msgid "Merged Into:"
-msgstr "マージ先:"
+#: lib/branch_create.tcl:57
+msgid "Match Tracking Branch Name"
+msgstr "トラッキング・ブランãƒåã‚’åˆã‚ã›ã‚‹"
-#: lib/remote_branch_delete.tcl:152
-msgid "A branch is required for 'Merged Into'."
-msgstr "'マージ先' ã«ã¯ãƒ–ランãƒãŒå¿…è¦ã§ã™ã€‚"
+#: lib/branch_create.tcl:66
+msgid "Starting Revision"
+msgstr "åˆæœŸãƒªãƒ“ジョン"
-#: lib/remote_branch_delete.tcl:184
-#, tcl-format
-msgid ""
-"The following branches are not completely merged into %s:\n"
-"\n"
-" - %s"
-msgstr ""
-"以下ã®ãƒ–ランãƒã¯ %s ã«å®Œå…¨ã«ãƒžãƒ¼ã‚¸ã•ã‚Œã¦ã„ã¾ã›ã‚“:\n"
-"\n"
-" - %s"
+#: lib/branch_create.tcl:72
+msgid "Update Existing Branch:"
+msgstr "既存ã®ãƒ–ランãƒã‚’æ›´æ–°:"
-#: lib/remote_branch_delete.tcl:189
-#, tcl-format
-msgid ""
-"One or more of the merge tests failed because you have not fetched the "
-"necessary commits. Try fetching from %s first."
-msgstr ""
-"å¿…è¦ãªã‚³ãƒŸãƒƒãƒˆãŒä¸è¶³ã—ã¦ã„ã‚‹ãŸã‚ã«ã€ãƒžãƒ¼ã‚¸æ¤œæŸ»ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚ã¾ãš %s ã‹ã‚‰"
-"フェッãƒã—ã¦ä¸‹ã•ã„。"
+#: lib/branch_create.tcl:75
+msgid "No"
+msgstr "ã„ã„ãˆ"
-#: lib/remote_branch_delete.tcl:207
-msgid "Please select one or more branches to delete."
-msgstr "削除ã™ã‚‹ãƒ–ランãƒã‚’é¸æŠžã—ã¦ä¸‹ã•ã„。"
+#: lib/branch_create.tcl:80
+msgid "Fast Forward Only"
+msgstr "æ—©é€ã‚Šã®ã¿"
-#: lib/remote_branch_delete.tcl:226
-#, tcl-format
-msgid "Deleting branches from %s"
-msgstr "%s ã‹ã‚‰ãƒ–ランãƒã‚’削除ã—ã¦ã„ã¾ã™ã€‚"
+#: lib/branch_create.tcl:97
+msgid "Checkout After Creation"
+msgstr "作æˆã—ã¦ã™ããƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ"
-#: lib/remote_branch_delete.tcl:292
-msgid "No repository selected."
-msgstr "リãƒã‚¸ãƒˆãƒªãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。"
+#: lib/branch_create.tcl:132
+msgid "Please select a tracking branch."
+msgstr "トラッキング・ブランãƒã‚’é¸æŠžã—ã¦ä¸‹ã•ã„。"
-#: lib/remote_branch_delete.tcl:297
+#: lib/branch_create.tcl:141
#, tcl-format
-msgid "Scanning %s..."
-msgstr "%s をスキャンã—ã¦ã„ã¾ã™â€¦"
-
-#: lib/search.tcl:21
-msgid "Find:"
-msgstr "検索:"
-
-#: lib/search.tcl:23
-msgid "Next"
-msgstr "次"
-
-#: lib/search.tcl:24
-msgid "Prev"
-msgstr "å‰"
-
-#: lib/search.tcl:25
-msgid "Case-Sensitive"
-msgstr "大文字å°æ–‡å­—を区別"
-
-#: lib/shortcut.tcl:21 lib/shortcut.tcl:62
-msgid "Cannot write shortcut:"
-msgstr "ショートカットãŒæ›¸ã‘ã¾ã›ã‚“:"
-
-#: lib/shortcut.tcl:137
-msgid "Cannot write icon:"
-msgstr "アイコンãŒæ›¸ã‘ã¾ã›ã‚“:"
+msgid "Tracking branch %s is not a branch in the remote repository."
+msgstr ""
+"トラッキング・ブランム%s ã¯ãƒªãƒ¢ãƒ¼ãƒˆãƒªãƒã‚¸ãƒˆãƒªã®ãƒ–ランãƒã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
#: lib/spellcheck.tcl:57
msgid "Unsupported spell checker"
@@ -2320,236 +2682,3 @@ msgstr "スペルãƒã‚§ãƒƒã‚«ãƒ¼ãŒäºˆæƒ³å¤–ã® EOF ã‚’è¿”ã—ã¾ã—ãŸ"
#: lib/spellcheck.tcl:392
msgid "Spell Checker Failed"
msgstr "スペルãƒã‚§ãƒƒã‚¯å¤±æ•—"
-
-#: lib/sshkey.tcl:31
-msgid "No keys found."
-msgstr "キーãŒã‚ã‚Šã¾ã›ã‚“。"
-
-#: lib/sshkey.tcl:34
-#, tcl-format
-msgid "Found a public key in: %s"
-msgstr "公開éµãŒã‚ã‚Šã¾ã—ãŸ: %s"
-
-#: lib/sshkey.tcl:40
-msgid "Generate Key"
-msgstr "éµã‚’生æˆ"
-
-#: lib/sshkey.tcl:56
-msgid "Copy To Clipboard"
-msgstr "クリップボードã«ã‚³ãƒ”ー"
-
-#: lib/sshkey.tcl:70
-msgid "Your OpenSSH Public Key"
-msgstr "ã‚ãªãŸã® OpenSSH 公開éµ"
-
-#: lib/sshkey.tcl:78
-msgid "Generating..."
-msgstr "生æˆä¸­..."
-
-#: lib/sshkey.tcl:84
-#, tcl-format
-msgid ""
-"Could not start ssh-keygen:\n"
-"\n"
-"%s"
-msgstr ""
-"ssh-keygen ã‚’èµ·å‹•ã§ãã¾ã›ã‚“:\n"
-"\n"
-"%s"
-
-#: lib/sshkey.tcl:111
-msgid "Generation failed."
-msgstr "生æˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-
-#: lib/sshkey.tcl:118
-msgid "Generation succeeded, but no keys found."
-msgstr "生æˆã«ã¯æˆåŠŸã—ã¾ã—ãŸãŒã€éµãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
-
-#: lib/sshkey.tcl:121
-#, tcl-format
-msgid "Your key is in: %s"
-msgstr "ã‚ãªãŸã®éµã¯ %s ã«ã‚ã‚Šã¾ã™"
-
-#: lib/status_bar.tcl:83
-#, tcl-format
-msgid "%s ... %*i of %*i %s (%3i%%)"
-msgstr "%1$s ... %4$*i %6$s 中㮠%2$*i (%7$3i%%)"
-
-#: lib/tools.tcl:75
-#, tcl-format
-msgid "Running %s requires a selected file."
-msgstr "ファイルをé¸æŠžã—ã¦ã‹ã‚‰ %s ã‚’èµ·å‹•ã—ã¦ãã ã•ã„。"
-
-#: lib/tools.tcl:90
-#, tcl-format
-msgid "Are you sure you want to run %s?"
-msgstr "本当㫠%s ã‚’èµ·å‹•ã—ã¾ã™ã‹?"
-
-#: lib/tools.tcl:110
-#, tcl-format
-msgid "Tool: %s"
-msgstr "ツール: %s"
-
-#: lib/tools.tcl:111
-#, tcl-format
-msgid "Running: %s"
-msgstr "実行中: %s"
-
-#: lib/tools.tcl:149
-#, tcl-format
-msgid "Tool completed successfully: %s"
-msgstr "ツールãŒå®Œäº†ã—ã¾ã—ãŸ: %s"
-
-#: lib/tools.tcl:151
-#, tcl-format
-msgid "Tool failed: %s"
-msgstr "ツールãŒå¤±æ•—ã—ã¾ã—ãŸ: %s"
-
-#: lib/tools_dlg.tcl:22
-msgid "Add Tool"
-msgstr "ツールã®è¿½åŠ "
-
-#: lib/tools_dlg.tcl:28
-msgid "Add New Tool Command"
-msgstr "æ–°è¦ãƒ„ールコマンドã®è¿½åŠ "
-
-#: lib/tools_dlg.tcl:33
-msgid "Add globally"
-msgstr "全体ã«è¿½åŠ "
-
-#: lib/tools_dlg.tcl:45
-msgid "Tool Details"
-msgstr "ツールã®è©³ç´°"
-
-#: lib/tools_dlg.tcl:48
-msgid "Use '/' separators to create a submenu tree:"
-msgstr "'/' ã§ã‚µãƒ–メニューを区切りã¾ã™:"
-
-#: lib/tools_dlg.tcl:61
-msgid "Command:"
-msgstr "コマンド:"
-
-#: lib/tools_dlg.tcl:74
-msgid "Show a dialog before running"
-msgstr "èµ·å‹•ã™ã‚‹å‰ã«ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã‚’表示"
-
-#: lib/tools_dlg.tcl:80
-msgid "Ask the user to select a revision (sets $REVISION)"
-msgstr "ユーザã«ã‚³ãƒŸãƒƒãƒˆã‚’一ã¤é¸ã°ã›ã‚‹ ($REVISION ã«ã‚»ãƒƒãƒˆã—ã¾ã™)"
-
-#: lib/tools_dlg.tcl:85
-msgid "Ask the user for additional arguments (sets $ARGS)"
-msgstr "ユーザã«ä»–ã®å¼•æ•°ã‚’追加ã•ã›ã‚‹ ($ARGS ã«ã‚»ãƒƒãƒˆã—ã¾ã™)"
-
-#: lib/tools_dlg.tcl:92
-msgid "Don't show the command output window"
-msgstr "コマンドã‹ã‚‰ã®å‡ºåŠ›ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’見ã›ãªã„"
-
-#: lib/tools_dlg.tcl:97
-msgid "Run only if a diff is selected ($FILENAME not empty)"
-msgstr "パッãƒãŒé¸ã°ã‚Œã¦ã„ã‚‹ã¨ãã ã‘å‹•ã‹ã™($FILENAME ãŒç©ºã§ãªã„)"
-
-#: lib/tools_dlg.tcl:121
-msgid "Please supply a name for the tool."
-msgstr "ツールåを指定ã—ã¦ä¸‹ã•ã„。"
-
-#: lib/tools_dlg.tcl:129
-#, tcl-format
-msgid "Tool '%s' already exists."
-msgstr "ツール '%s' ã¯æ—¢ã«å­˜åœ¨ã—ã¾ã™ã€‚"
-
-#: lib/tools_dlg.tcl:151
-#, tcl-format
-msgid ""
-"Could not add tool:\n"
-"%s"
-msgstr ""
-"ツールを追加ã§ãã¾ã›ã‚“:\n"
-"%s"
-
-#: lib/tools_dlg.tcl:190
-msgid "Remove Tool"
-msgstr "ツールã®å‰Šé™¤"
-
-#: lib/tools_dlg.tcl:196
-msgid "Remove Tool Commands"
-msgstr "ツールコマンドã®å‰Šé™¤"
-
-#: lib/tools_dlg.tcl:200
-msgid "Remove"
-msgstr "削除"
-
-#: lib/tools_dlg.tcl:236
-msgid "(Blue denotes repository-local tools)"
-msgstr "(é’色ã¯ãƒ­ãƒ¼ã‚«ãƒ«ãƒ¬ãƒã‚¸ãƒˆãƒªã®ãƒ„ールã§ã™)"
-
-#: lib/tools_dlg.tcl:297
-#, tcl-format
-msgid "Run Command: %s"
-msgstr "コマンドを起動: %s"
-
-#: lib/tools_dlg.tcl:311
-msgid "Arguments"
-msgstr "引数"
-
-#: lib/tools_dlg.tcl:348
-msgid "OK"
-msgstr "OK"
-
-#: lib/transport.tcl:7
-#, tcl-format
-msgid "Fetching new changes from %s"
-msgstr "%s ã‹ã‚‰æ–°ã—ã„変更をフェッãƒã—ã¦ã„ã¾ã™"
-
-#: lib/transport.tcl:18
-#, tcl-format
-msgid "remote prune %s"
-msgstr "é éš”刈込 %s"
-
-#: lib/transport.tcl:19
-#, tcl-format
-msgid "Pruning tracking branches deleted from %s"
-msgstr "%s ã‹ã‚‰å‰Šé™¤ã•ã‚ŒãŸãƒˆãƒ©ãƒƒã‚­ãƒ³ã‚°ãƒ»ãƒ–ランãƒã‚’刈ã£ã¦ã„ã¾ã™"
-
-#: lib/transport.tcl:26
-#, tcl-format
-msgid "Pushing changes to %s"
-msgstr "%s ã¸å¤‰æ›´ã‚’プッシュã—ã¦ã„ã¾ã™"
-
-#: lib/transport.tcl:64
-#, tcl-format
-msgid "Mirroring to %s"
-msgstr "%s ã¸ãƒŸãƒ©ãƒ¼ã—ã¦ã„ã¾ã™"
-
-#: lib/transport.tcl:82
-#, tcl-format
-msgid "Pushing %s %s to %s"
-msgstr "%3$s 㸠%1$s %2$s をプッシュã—ã¦ã„ã¾ã™"
-
-#: lib/transport.tcl:100
-msgid "Push Branches"
-msgstr "ブランãƒã‚’プッシュ"
-
-#: lib/transport.tcl:114
-msgid "Source Branches"
-msgstr "å…ƒã®ãƒ–ランãƒ"
-
-#: lib/transport.tcl:131
-msgid "Destination Repository"
-msgstr "é€ã‚Šå…ˆãƒªãƒã‚¸ãƒˆãƒª"
-
-#: lib/transport.tcl:169
-msgid "Transfer Options"
-msgstr "通信オプション"
-
-#: lib/transport.tcl:171
-msgid "Force overwrite existing branch (may discard changes)"
-msgstr "既存ブランãƒã‚’上書ã(変更を破棄ã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™)"
-
-#: lib/transport.tcl:175
-msgid "Use thin pack (for slow network connections)"
-msgstr "Thin Pack を使ã†ï¼ˆé…ã„ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šï¼‰"
-
-#: lib/transport.tcl:179
-msgid "Include tags"
-msgstr "ã‚¿ã‚°ã‚’å«ã‚ã‚‹"
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index dc2fd1b..bcf0d92 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -5,14 +5,11 @@
# Resolve two or more trees.
#
+. git-sh-setup
+
LF='
'
-die () {
- echo >&2 "$*"
- exit 1
-}
-
# The first parameters up to -- are merge bases; the rest are heads.
bases= head= remotes= sep_seen=
for arg
@@ -33,7 +30,7 @@ do
esac
done
-# Reject if this is not an Octopus -- resolve should be used instead.
+# Reject if this is not an octopus -- resolve should be used instead.
case "$remotes" in
?*' '?*)
;;
@@ -46,7 +43,7 @@ esac
if ! git diff-index --quiet --cached HEAD --
then
- echo "Error: Your local changes to the following files would be overwritten by merge"
+ gettextln "Error: Your local changes to the following files would be overwritten by merge"
git diff-index --cached --name-only HEAD -- | sed -e 's/^/ /'
exit 2
fi
@@ -61,8 +58,8 @@ do
# We allow only last one to have a hand-resolvable
# conflicts. Last round failed and we still had
# a head to merge.
- echo "Automated merge did not work."
- echo "Should not be doing an Octopus."
+ gettextln "Automated merge did not work."
+ gettextln "Should not be doing an octopus."
exit 2
esac
@@ -73,11 +70,11 @@ do
eval pretty_name=\${GITHEAD_$SHA1_UP:-$pretty_name}
fi
common=$(git merge-base --all $SHA1 $MRC) ||
- die "Unable to find common commit with $pretty_name"
+ die "$(eval_gettext "Unable to find common commit with \$pretty_name")"
case "$LF$common$LF" in
*"$LF$SHA1$LF"*)
- echo "Already up-to-date with $pretty_name"
+ eval_gettextln "Already up-to-date with \$pretty_name"
continue
;;
esac
@@ -89,7 +86,7 @@ do
# tree as the intermediate result of the merge.
# We still need to count this as part of the parent set.
- echo "Fast-forwarding to: $pretty_name"
+ eval_gettextln "Fast-forwarding to: \$pretty_name"
git read-tree -u -m $head $SHA1 || exit
MRC=$SHA1 MRT=$(git write-tree)
continue
@@ -97,12 +94,12 @@ do
NON_FF_MERGE=1
- echo "Trying simple merge with $pretty_name"
+ eval_gettextln "Trying simple merge with \$pretty_name"
git read-tree -u -m --aggressive $common $MRT $SHA1 || exit 2
next=$(git write-tree 2>/dev/null)
if test $? -ne 0
then
- echo "Simple merge did not work, trying automatic merge."
+ gettextln "Simple merge did not work, trying automatic merge."
git-merge-index -o git-merge-one-file -a ||
OCTOPUS_FAILURE=1
next=$(git write-tree 2>/dev/null)
diff --git a/git-p4.py b/git-p4.py
index b123aa2..fd5ca52 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1934,7 +1934,7 @@ class P4Submit(Command, P4UserMap):
if self.useClientSpec:
self.clientSpecDirs = getClientSpec()
- # Check for the existance of P4 branches
+ # Check for the existence of P4 branches
branchesDetected = (len(p4BranchesInGit().keys()) > 1)
if self.useClientSpec and not branchesDetected:
@@ -2274,7 +2274,7 @@ class P4Sync(Command, P4UserMap):
self.useClientSpec_from_options = False
self.clientSpecDirs = None
self.tempBranches = []
- self.tempBranchLocation = "git-p4-tmp"
+ self.tempBranchLocation = "refs/git-p4-tmp"
self.largeFileSystem = None
if gitConfig('git-p4.largeFileSystem'):
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 4f499d2..ca994c5 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -121,14 +121,14 @@ mark_action_done () {
sed -e 1q < "$todo" >> "$done"
sed -e 1d < "$todo" >> "$todo".new
mv -f "$todo".new "$todo"
- new_count=$(git stripspace --strip-comments <"$done" | wc -l)
+ new_count=$(( $(git stripspace --strip-comments <"$done" | wc -l) ))
echo $new_count >"$msgnum"
total=$(($new_count + $(git stripspace --strip-comments <"$todo" | wc -l)))
echo $total >"$end"
if test "$last_count" != "$new_count"
then
last_count=$new_count
- printf "Rebasing (%d/%d)\r" $new_count $total
+ eval_gettext "Rebasing (\$new_count/\$total)"; printf "\r"
test -z "$verbose" || echo
fi
}
@@ -144,29 +144,28 @@ reschedule_last_action () {
}
append_todo_help () {
- git stripspace --comment-lines >>"$todo" <<\EOF
-
+ gettext "
Commands:
p, pick = use commit
r, reword = use commit, but edit the commit message
e, edit = use commit, but stop for amending
s, squash = use commit, but meld into previous commit
- f, fixup = like "squash", but discard this commit's log message
+ f, fixup = like \"squash\", but discard this commit's log message
x, exec = run command (the rest of the line) using shell
d, drop = remove commit
These lines can be re-ordered; they are executed from top to bottom.
+" | git stripspace --comment-lines >>"$todo"
-EOF
if test $(get_missing_commit_check_level) = error
then
- git stripspace --comment-lines >>"$todo" <<\EOF
+ gettext "
Do not remove any line. Use 'drop' explicitly to remove a commit.
-EOF
+" | git stripspace --comment-lines >>"$todo"
else
- git stripspace --comment-lines >>"$todo" <<\EOF
+ gettext "
If you remove a line here THAT COMMIT WILL BE LOST.
-EOF
+" | git stripspace --comment-lines >>"$todo"
fi
}
@@ -200,13 +199,14 @@ exit_with_patch () {
make_patch $1
git rev-parse --verify HEAD > "$amend"
gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
- warn "You can amend the commit now, with"
- warn
- warn " git commit --amend $gpg_sign_opt_quoted"
- warn
- warn "Once you are satisfied with your changes, run"
- warn
- warn " git rebase --continue"
+ warn "$(eval_gettext "\
+You can amend the commit now, with
+
+ git commit --amend \$gpg_sign_opt_quoted
+
+Once you are satisfied with your changes, run
+
+ git rebase --continue")"
warn
exit $2
}
@@ -222,10 +222,12 @@ has_action () {
}
is_empty_commit() {
- tree=$(git rev-parse -q --verify "$1"^{tree} 2>/dev/null ||
- die "$1: not a commit that can be picked")
- ptree=$(git rev-parse -q --verify "$1"^^{tree} 2>/dev/null ||
- ptree=4b825dc642cb6eb9a060e54bf8d69288fbee4904)
+ tree=$(git rev-parse -q --verify "$1"^{tree} 2>/dev/null) || {
+ sha1=$1
+ die "$(eval_gettext "\$sha1: not a commit that can be picked")"
+ }
+ ptree=$(git rev-parse -q --verify "$1"^^{tree} 2>/dev/null) ||
+ ptree=4b825dc642cb6eb9a060e54bf8d69288fbee4904
test "$tree" = "$ptree"
}
@@ -261,7 +263,7 @@ pick_one () {
case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac
case "$force_rebase" in '') ;; ?*) ff= ;; esac
- output git rev-parse --verify $sha1 || die "Invalid commit name: $sha1"
+ output git rev-parse --verify $sha1 || die "$(eval_gettext "Invalid commit name: \$sha1")"
if is_empty_commit "$sha1"
then
@@ -303,7 +305,7 @@ pick_one_preserving_merges () {
git rev-parse HEAD > "$rewritten"/$current_commit
done <"$state_dir"/current-commit
rm "$state_dir"/current-commit ||
- die "Cannot write current commit's replacement sha1"
+ die "$(gettext "Cannot write current commit's replacement sha1")"
fi
fi
@@ -355,9 +357,9 @@ pick_one_preserving_merges () {
done
case $fast_forward in
t)
- output warn "Fast-forward to $sha1"
+ output warn "$(eval_gettext "Fast-forward to \$sha1")"
output git reset --hard $sha1 ||
- die "Cannot fast-forward to $sha1"
+ die "$(eval_gettext "Cannot fast-forward to \$sha1")"
;;
f)
first_parent=$(expr "$new_parents" : ' \([^ ]*\)')
@@ -366,12 +368,12 @@ pick_one_preserving_merges () {
then
# detach HEAD to current parent
output git checkout $first_parent 2> /dev/null ||
- die "Cannot move HEAD to $first_parent"
+ die "$(eval_gettext "Cannot move HEAD to \$first_parent")"
fi
case "$new_parents" in
' '*' '*)
- test "a$1" = a-n && die "Refusing to squash a merge: $sha1"
+ test "a$1" = a-n && die "$(eval_gettext "Refusing to squash a merge: \$sha1")"
# redo merge
author_script_content=$(get_author_ident_from_commit $sha1)
@@ -385,7 +387,7 @@ pick_one_preserving_merges () {
$merge_args $strategy_args -m "$msg_content" $new_parents'
then
printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG
- die_with_patch $sha1 "Error redoing merge $sha1"
+ die_with_patch $sha1 "$(eval_gettext "Error redoing merge \$sha1")"
fi
echo "$sha1 $(git rev-parse HEAD^0)" >> "$rewritten_list"
;;
@@ -393,40 +395,44 @@ pick_one_preserving_merges () {
output eval git cherry-pick \
${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \
"$strategy_args" "$@" ||
- die_with_patch $sha1 "Could not pick $sha1"
+ die_with_patch $sha1 "$(eval_gettext "Could not pick \$sha1")"
;;
esac
;;
esac
}
-nth_string () {
- case "$1" in
- *1[0-9]|*[04-9]) echo "$1"th;;
- *1) echo "$1"st;;
- *2) echo "$1"nd;;
- *3) echo "$1"rd;;
- esac
+this_nth_commit_message () {
+ n=$1
+ eval_gettext "This is the commit message #\${n}:"
+}
+
+skip_nth_commit_message () {
+ n=$1
+ eval_gettext "The commit message #\${n} will be skipped:"
}
update_squash_messages () {
if test -f "$squash_msg"; then
mv "$squash_msg" "$squash_msg".bak || exit
count=$(($(sed -n \
- -e "1s/^. This is a combination of \(.*\) commits\./\1/p" \
+ -e "1s/^$comment_char.*\([0-9][0-9]*\).*/\1/p" \
-e "q" < "$squash_msg".bak)+1))
{
- printf '%s\n' "$comment_char This is a combination of $count commits."
+ printf '%s\n' "$comment_char $(eval_ngettext \
+ "This is a combination of \$count commit." \
+ "This is a combination of \$count commits." \
+ $count)"
sed -e 1d -e '2,/^./{
/^$/d
}' <"$squash_msg".bak
} >"$squash_msg"
else
- commit_message HEAD > "$fixup_msg" || die "Cannot write $fixup_msg"
+ commit_message HEAD > "$fixup_msg" || die "$(gettext "Cannot write \$fixup_msg")"
count=2
{
- printf '%s\n' "$comment_char This is a combination of 2 commits."
- printf '%s\n' "$comment_char The first commit's message is:"
+ printf '%s\n' "$comment_char $(gettext "This is a combination of 2 commits.")"
+ printf '%s\n' "$comment_char $(gettext "This is the 1st commit message:")"
echo
cat "$fixup_msg"
} >"$squash_msg"
@@ -435,13 +441,13 @@ update_squash_messages () {
squash)
rm -f "$fixup_msg"
echo
- printf '%s\n' "$comment_char This is the $(nth_string $count) commit message:"
+ printf '%s\n' "$comment_char $(this_nth_commit_message $count)"
echo
commit_message $2
;;
fixup)
echo
- printf '%s\n' "$comment_char The $(nth_string $count) commit message will be skipped:"
+ printf '%s\n' "$comment_char $(skip_nth_commit_message $count)"
echo
# Change the space after the comment character to TAB:
commit_message $2 | git stripspace --comment-lines | sed -e 's/ / /'
@@ -460,12 +466,14 @@ peek_next_command () {
# messages, effectively causing the combined commit to be used as the
# new basis for any further squash/fixups. Args: sha1 rest
die_failed_squash() {
+ sha1=$1
+ rest=$2
mv "$squash_msg" "$msg" || exit
rm -f "$fixup_msg"
cp "$msg" "$GIT_DIR"/MERGE_MSG || exit
warn
- warn "Could not apply $1... $2"
- die_with_patch $1 ""
+ warn "$(eval_gettext "Could not apply \$sha1... \$rest")"
+ die_with_patch $sha1 ""
}
flush_rewritten_pending() {
@@ -489,6 +497,8 @@ record_in_rewritten() {
}
do_pick () {
+ sha1=$1
+ rest=$2
if test "$(git rev-parse HEAD)" = "$squash_onto"
then
# Set the correct commit message and author info on the
@@ -500,15 +510,15 @@ do_pick () {
# resolve before manually running git commit --amend then git
# rebase --continue.
git commit --allow-empty --allow-empty-message --amend \
- --no-post-rewrite -n -q -C $1 &&
- pick_one -n $1 &&
+ --no-post-rewrite -n -q -C $sha1 &&
+ pick_one -n $sha1 &&
git commit --allow-empty --allow-empty-message \
- --amend --no-post-rewrite -n -q -C $1 \
+ --amend --no-post-rewrite -n -q -C $sha1 \
${gpg_sign_opt:+"$gpg_sign_opt"} ||
- die_with_patch $1 "Could not apply $1... $2"
+ die_with_patch $sha1 "$(eval_gettext "Could not apply \$sha1... \$rest")"
else
- pick_one $1 ||
- die_with_patch $1 "Could not apply $1... $2"
+ pick_one $sha1 ||
+ die_with_patch $sha1 "$(eval_gettext "Could not apply \$sha1... \$rest")"
fi
}
@@ -536,10 +546,11 @@ do_next () {
mark_action_done
do_pick $sha1 "$rest"
git commit --amend --no-post-rewrite ${gpg_sign_opt:+"$gpg_sign_opt"} || {
- warn "Could not amend commit after successfully picking $sha1... $rest"
- warn "This is most likely due to an empty commit message, or the pre-commit hook"
- warn "failed. If the pre-commit hook failed, you may need to resolve the issue before"
- warn "you are able to reword the commit."
+ warn "$(eval_gettext "\
+Could not amend commit after successfully picking \$sha1... \$rest
+This is most likely due to an empty commit message, or the pre-commit hook
+failed. If the pre-commit hook failed, you may need to resolve the issue before
+you are able to reword the commit.")"
exit_with_patch $sha1 1
}
record_in_rewritten $sha1
@@ -550,7 +561,7 @@ do_next () {
mark_action_done
do_pick $sha1 "$rest"
sha1_abbrev=$(git rev-parse --short $sha1)
- warn "Stopped at $sha1_abbrev... $rest"
+ warn "$(eval_gettext "Stopped at \$sha1_abbrev... \$rest")"
exit_with_patch $sha1 0
;;
squash|s|fixup|f)
@@ -565,7 +576,7 @@ do_next () {
comment_for_reflog $squash_style
test -f "$done" && has_action "$done" ||
- die "Cannot '$squash_style' without a previous commit"
+ die "$(eval_gettext "Cannot '\$squash_style' without a previous commit")"
mark_action_done
update_squash_messages $squash_style $sha1
@@ -607,7 +618,7 @@ do_next () {
x|"exec")
read -r command rest < "$todo"
mark_action_done
- printf 'Executing: %s\n' "$rest"
+ eval_gettextln "Executing: \$rest"
"${SHELL:-@SHELL_PATH@}" -c "$rest" # Actual execution
status=$?
# Run in subshell because require_clean_work_tree can die.
@@ -615,13 +626,14 @@ do_next () {
(require_clean_work_tree "rebase" 2>/dev/null) || dirty=t
if test "$status" -ne 0
then
- warn "Execution failed: $rest"
+ warn "$(eval_gettext "Execution failed: \$rest")"
test "$dirty" = f ||
- warn "and made changes to the index and/or the working tree"
+ warn "$(gettext "and made changes to the index and/or the working tree")"
- warn "You can fix the problem, and then run"
- warn
- warn " git rebase --continue"
+ warn "$(gettext "\
+You can fix the problem, and then run
+
+ git rebase --continue")"
warn
if test $status -eq 127 # command not found
then
@@ -630,18 +642,20 @@ do_next () {
exit "$status"
elif test "$dirty" = t
then
- warn "Execution succeeded: $rest"
- warn "but left changes to the index and/or the working tree"
- warn "Commit or stash your changes, and then run"
- warn
- warn " git rebase --continue"
+ # TRANSLATORS: after these lines is a command to be issued by the user
+ warn "$(eval_gettext "\
+Execution succeeded: \$rest
+but left changes to the index and/or the working tree
+Commit or stash your changes, and then run
+
+ git rebase --continue")"
warn
exit 1
fi
;;
*)
- warn "Unknown command: $command $sha1 $rest"
- fixtodo="Please fix this using 'git rebase --edit-todo'."
+ warn "$(eval_gettext "Unknown command: \$command \$sha1 \$rest")"
+ fixtodo="$(gettext "Please fix this using 'git rebase --edit-todo'.")"
if git rev-parse --verify -q "$sha1" >/dev/null
then
die_with_patch $sha1 "$fixtodo"
@@ -676,7 +690,7 @@ do_next () {
"$hook" rebase < "$rewritten_list"
true # we don't care if this hook failed
fi &&
- warn "Successfully rebased and updated $head_name."
+ warn "$(eval_gettext "Successfully rebased and updated \$head_name.")"
return 1 # not failure; just to break the do_rest loop
}
@@ -723,7 +737,7 @@ skip_unnecessary_picks () {
record_in_rewritten "$onto"
;;
esac ||
- die "Could not skip unnecessary pick commands"
+ die "$(gettext "Could not skip unnecessary pick commands")"
}
transform_todo_ids () {
@@ -881,9 +895,9 @@ check_commit_sha () {
if test $badsha -ne 0
then
line="$(sed -n -e "${2}p" "$3")"
- warn "Warning: the SHA-1 is missing or isn't" \
- "a commit in the following line:"
- warn " - $line"
+ warn "$(eval_gettext "\
+Warning: the SHA-1 is missing or isn't a commit in the following line:
+ - \$line")"
warn
fi
@@ -914,9 +928,9 @@ check_bad_cmd_and_sha () {
;;
*)
line="$(sed -n -e "${lineno}p" "$1")"
- warn "Warning: the command isn't recognized" \
- "in the following line:"
- warn " - $line"
+ warn "$(eval_gettext "\
+Warning: the command isn't recognized in the following line:
+ - \$line")"
warn
retval=1
;;
@@ -953,7 +967,7 @@ warn_lines () {
# Switch to the branch in $into and notify it in the reflog
checkout_onto () {
GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name"
- output git checkout $onto || die_abort "could not detach HEAD"
+ output git checkout $onto || die_abort "$(gettext "could not detach HEAD")"
git update-ref ORIG_HEAD $orig_head
}
@@ -991,28 +1005,26 @@ check_todo_list () {
then
test "$check_level" = error && raise_error=t
- warn "Warning: some commits may have been dropped" \
- "accidentally."
- warn "Dropped commits (newer to older):"
+ warn "$(gettext "\
+Warning: some commits may have been dropped accidentally.
+Dropped commits (newer to older):")"
# Make the list user-friendly and display
opt="--no-walk=sorted --format=oneline --abbrev-commit --stdin"
git rev-list $opt <"$todo".miss | warn_lines
- warn "To avoid this message, use \"drop\" to" \
- "explicitly remove a commit."
- warn
- warn "Use 'git config rebase.missingCommitsCheck' to change" \
- "the level of warnings."
- warn "The possible behaviours are: ignore, warn, error."
+ warn "$(gettext "\
+To avoid this message, use \"drop\" to explicitly remove a commit.
+
+Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
+The possible behaviours are: ignore, warn, error.")"
warn
fi
;;
ignore)
;;
*)
- warn "Unrecognized setting $check_level for option" \
- "rebase.missingCommitsCheck. Ignoring."
+ warn "$(eval_gettext "Unrecognized setting \$check_level for option rebase.missingCommitsCheck. Ignoring.")"
;;
esac
@@ -1029,8 +1041,8 @@ check_todo_list () {
# placed before the commit of the next action
checkout_onto
- warn "You can fix this with 'git rebase --edit-todo'."
- die "Or you can abort the rebase with 'git rebase --abort'."
+ warn "$(gettext "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.")"
+ die "$(gettext "Or you can abort the rebase with 'git rebase --abort'.")"
fi
}
@@ -1054,41 +1066,43 @@ continue)
test ! -f "$GIT_DIR"/CHERRY_PICK_HEAD ||
rm "$GIT_DIR"/CHERRY_PICK_HEAD ||
- die "Could not remove CHERRY_PICK_HEAD"
+ die "$(gettext "Could not remove CHERRY_PICK_HEAD")"
else
if ! test -f "$author_script"
then
gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
- die "You have staged changes in your working tree. If these changes are meant to be
+ die "$(eval_gettext "\
+You have staged changes in your working tree.
+If these changes are meant to be
squashed into the previous commit, run:
- git commit --amend $gpg_sign_opt_quoted
+ git commit --amend \$gpg_sign_opt_quoted
If they are meant to go into a new commit, run:
- git commit $gpg_sign_opt_quoted
+ git commit \$gpg_sign_opt_quoted
-In both case, once you're done, continue with:
+In both cases, once you're done, continue with:
git rebase --continue
-"
+")"
fi
. "$author_script" ||
- die "Error trying to find the author identity to amend commit"
+ die "$(gettext "Error trying to find the author identity to amend commit")"
if test -f "$amend"
then
current_head=$(git rev-parse --verify HEAD)
test "$current_head" = $(cat "$amend") ||
- die "\
-You have uncommitted changes in your working tree. Please, commit them
-first and then run 'git rebase --continue' again."
+ die "$(gettext "\
+You have uncommitted changes in your working tree. Please commit them
+first and then run 'git rebase --continue' again.")"
do_with_author git commit --amend --no-verify -F "$msg" -e \
${gpg_sign_opt:+"$gpg_sign_opt"} ||
- die "Could not commit staged changes."
+ die "$(gettext "Could not commit staged changes.")"
else
do_with_author git commit --no-verify -F "$msg" -e \
${gpg_sign_opt:+"$gpg_sign_opt"} ||
- die "Could not commit staged changes."
+ die "$(gettext "Could not commit staged changes.")"
fi
fi
@@ -1112,40 +1126,36 @@ edit-todo)
mv -f "$todo".new "$todo"
collapse_todo_ids
append_todo_help
- git stripspace --comment-lines >>"$todo" <<\EOF
-
+ gettext "
You are editing the todo file of an ongoing interactive rebase.
To continue rebase after editing, run:
git rebase --continue
-EOF
+" | git stripspace --comment-lines >>"$todo"
git_sequence_editor "$todo" ||
- die "Could not execute editor"
+ die "$(gettext "Could not execute editor")"
expand_todo_ids
exit
;;
esac
-git var GIT_COMMITTER_IDENT >/dev/null ||
- die "You need to set your committer info first"
-
comment_for_reflog start
if test ! -z "$switch_to"
then
GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to"
output git checkout "$switch_to" -- ||
- die "Could not checkout $switch_to"
+ die "$(eval_gettext "Could not checkout \$switch_to")"
comment_for_reflog start
fi
-orig_head=$(git rev-parse --verify HEAD) || die "No HEAD?"
-mkdir -p "$state_dir" || die "Could not create temporary $state_dir"
+orig_head=$(git rev-parse --verify HEAD) || die "$(gettext "No HEAD?")"
+mkdir -p "$state_dir" || die "$(eval_gettext "Could not create temporary \$state_dir")"
-: > "$state_dir"/interactive || die "Could not mark as interactive"
+: > "$state_dir"/interactive || die "$(gettext "Could not mark as interactive")"
write_basic_state
if test t = "$preserve_merges"
then
@@ -1155,12 +1165,12 @@ then
for c in $(git merge-base --all $orig_head $upstream)
do
echo $onto > "$rewritten"/$c ||
- die "Could not init rewritten commits"
+ die "$(gettext "Could not init rewritten commits")"
done
else
mkdir "$rewritten" &&
echo $onto > "$rewritten"/root ||
- die "Could not init rewritten commits"
+ die "$(gettext "Could not init rewritten commits")"
fi
# No cherry-pick because our first pass is to determine
# parents to rewrite and skipping dropped commits would
@@ -1259,18 +1269,20 @@ todocount=${todocount##* }
cat >>"$todo" <<EOF
-$comment_char Rebase $shortrevisions onto $shortonto ($todocount command(s))
+$comment_char $(eval_ngettext \
+ "Rebase \$shortrevisions onto \$shortonto (\$todocount command)" \
+ "Rebase \$shortrevisions onto \$shortonto (\$todocount commands)" \
+ "$todocount")
EOF
append_todo_help
-git stripspace --comment-lines >>"$todo" <<\EOF
-
+gettext "
However, if you remove everything, the rebase will be aborted.
-EOF
+" | git stripspace --comment-lines >>"$todo"
if test -z "$keep_empty"
then
- printf '%s\n' "$comment_char Note that empty commits are commented out" >>"$todo"
+ printf '%s\n' "$comment_char $(gettext "Note that empty commits are commented out")" >>"$todo"
fi
@@ -1280,7 +1292,7 @@ has_action "$todo" ||
cp "$todo" "$todo".backup
collapse_todo_ids
git_sequence_editor "$todo" ||
- die_abort "Could not execute editor"
+ die_abort "$(gettext "Could not execute editor")"
has_action "$todo" ||
return 2
diff --git a/git-rebase.sh b/git-rebase.sh
index 44ede36..04f6e44 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -45,7 +45,6 @@ skip! skip current patch and continue
edit-todo! edit the todo list during an interactive rebase
"
. git-sh-setup
-. git-sh-i18n
set_reflog_action rebase
require_work_tree_exists
cd_to_toplevel
@@ -154,7 +153,7 @@ move_to_original_branch () {
git symbolic-ref \
-m "rebase finished: returning to $head_name" \
HEAD $head_name ||
- die "$(gettext "Could not move back to $head_name")"
+ die "$(eval_gettext "Could not move back to \$head_name")"
;;
esac
}
@@ -449,7 +448,7 @@ then
then
. git-parse-remote
error_on_missing_default_upstream "rebase" "rebase" \
- "against" "git rebase <branch>"
+ "against" "git rebase $(gettext '<branch>')"
fi
test "$fork_point" = auto && fork_point=t
diff --git a/git-send-email.perl b/git-send-email.perl
index 6958785..da81be4 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -621,6 +621,8 @@ if (@rev_list_opts) {
push @files, $repo->command('format-patch', '-o', tempdir(CLEANUP => 1), @rev_list_opts);
}
+@files = handle_backup_files(@files);
+
if ($validate) {
foreach my $f (@files) {
unless (-p $f) {
@@ -1727,6 +1729,44 @@ sub validate_patch {
return;
}
+sub handle_backup {
+ my ($last, $lastlen, $file, $known_suffix) = @_;
+ my ($suffix, $skip);
+
+ $skip = 0;
+ if (defined $last &&
+ ($lastlen < length($file)) &&
+ (substr($file, 0, $lastlen) eq $last) &&
+ ($suffix = substr($file, $lastlen)) !~ /^[a-z0-9]/i) {
+ if (defined $known_suffix && $suffix eq $known_suffix) {
+ print "Skipping $file with backup suffix '$known_suffix'.\n";
+ $skip = 1;
+ } else {
+ my $answer = ask("Do you really want to send $file? (y|N): ",
+ valid_re => qr/^(?:y|n)/i,
+ default => 'n');
+ $skip = ($answer ne 'y');
+ if ($skip) {
+ $known_suffix = $suffix;
+ }
+ }
+ }
+ return ($skip, $known_suffix);
+}
+
+sub handle_backup_files {
+ my @file = @_;
+ my ($last, $lastlen, $known_suffix, $skip, @result);
+ for my $file (@file) {
+ ($skip, $known_suffix) = handle_backup($last, $lastlen,
+ $file, $known_suffix);
+ push @result, $file unless $skip;
+ $last = $file;
+ $lastlen = length($file);
+ }
+ return @result;
+}
+
sub file_has_nonascii {
my $fn = shift;
open(my $fh, '<', $fn)
diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index e6c3116..1ef1889 100644
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
@@ -53,6 +53,13 @@ gettext_without_eval_gettext)
git sh-i18n--envsubst "$1"
)
}
+
+ eval_ngettext () {
+ ngettext "$1" "$2" "$3" | (
+ export PATH $(git sh-i18n--envsubst --variables "$2");
+ git sh-i18n--envsubst "$2"
+ )
+ }
;;
poison)
# Emit garbage so that tests that incorrectly rely on translatable
@@ -64,6 +71,10 @@ poison)
eval_gettext () {
printf "%s" "# GETTEXT POISON #"
}
+
+ eval_ngettext () {
+ printf "%s" "# GETTEXT POISON #"
+ }
;;
*)
gettext () {
@@ -76,6 +87,13 @@ poison)
git sh-i18n--envsubst "$1"
)
}
+
+ eval_ngettext () {
+ (test "$3" = 1 && printf "%s" "$1" || printf "%s" "$2") | (
+ export PATH $(git sh-i18n--envsubst --variables "$2");
+ git sh-i18n--envsubst "$2"
+ )
+ }
;;
esac
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 85db5f1..240c7eb 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -43,6 +43,9 @@ git_broken_path_fix () {
# @@BROKEN_PATH_FIX@@
+# Source git-sh-i18n for gettext support.
+. "$(git --exec-path)/git-sh-i18n"
+
die () {
die_with_status 1 "$@"
}
@@ -83,16 +86,16 @@ if test -n "$OPTIONS_SPEC"; then
else
dashless=$(basename -- "$0" | sed -e 's/-/ /')
usage() {
- die "usage: $dashless $USAGE"
+ die "$(eval_gettext "usage: \$dashless \$USAGE")"
}
if [ -z "$LONG_USAGE" ]
then
- LONG_USAGE="usage: $dashless $USAGE"
+ LONG_USAGE="$(eval_gettext "usage: \$dashless \$USAGE")"
else
- LONG_USAGE="usage: $dashless $USAGE
+ LONG_USAGE="$(eval_gettext "usage: \$dashless \$USAGE
-$LONG_USAGE"
+$LONG_USAGE")"
fi
case "$1" in
@@ -160,9 +163,11 @@ git_pager() {
else
GIT_PAGER=cat
fi
- : "${LESS=-FRX}"
- : "${LV=-c}"
- export LESS LV
+ for vardef in @@PAGER_ENV@@
+ do
+ var=${vardef%%=*}
+ eval ": \"\${$vardef}\" && export $var"
+ done
eval "$GIT_PAGER" '"$@"'
}
@@ -182,7 +187,7 @@ is_bare_repository () {
cd_to_toplevel () {
cdup=$(git rev-parse --show-toplevel) &&
cd "$cdup" || {
- echo >&2 "Cannot chdir to $cdup, the toplevel of the working tree"
+ gettextln "Cannot chdir to \$cdup, the toplevel of the working tree" >&2
exit 1
}
}
@@ -190,13 +195,16 @@ cd_to_toplevel () {
require_work_tree_exists () {
if test "z$(git rev-parse --is-bare-repository)" != zfalse
then
- die "fatal: $0 cannot be used without a working tree."
+ program_name=$0
+ die "$(gettext "fatal: \$program_name cannot be used without a working tree.")"
fi
}
require_work_tree () {
- test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true ||
- die "fatal: $0 cannot be used without a working tree."
+ test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true || {
+ program_name=$0
+ die "$(gettext "fatal: \$program_name cannot be used without a working tree.")"
+ }
}
require_clean_work_tree () {
@@ -206,24 +214,49 @@ require_clean_work_tree () {
if ! git diff-files --quiet --ignore-submodules
then
- echo >&2 "Cannot $1: You have unstaged changes."
+ action=$1
+ case "$action" in
+ rebase)
+ gettextln "Cannot rebase: You have unstaged changes." >&2
+ ;;
+ "rewrite branches")
+ gettextln "Cannot rewrite branches: You have unstaged changes." >&2
+ ;;
+ "pull with rebase")
+ gettextln "Cannot pull with rebase: You have unstaged changes." >&2
+ ;;
+ *)
+ eval_gettextln "Cannot \$action: You have unstaged changes." >&2
+ ;;
+ esac
err=1
fi
if ! git diff-index --cached --quiet --ignore-submodules HEAD --
then
- if [ $err = 0 ]
+ if test $err = 0
then
- echo >&2 "Cannot $1: Your index contains uncommitted changes."
+ action=$1
+ case "$action" in
+ rebase)
+ gettextln "Cannot rebase: Your index contains uncommitted changes." >&2
+ ;;
+ "pull with rebase")
+ gettextln "Cannot pull with rebase: Your index contains uncommitted changes." >&2
+ ;;
+ *)
+ eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2
+ ;;
+ esac
else
- echo >&2 "Additionally, your index contains uncommitted changes."
+ gettextln "Additionally, your index contains uncommitted changes." >&2
fi
err=1
fi
- if [ $err = 1 ]
+ if test $err = 1
then
- test -n "$2" && echo >&2 "$2"
+ test -n "$2" && echo "$2" >&2
exit 1
fi
}
@@ -336,12 +369,12 @@ git_dir_init () {
then
test -z "$(git rev-parse --show-cdup)" || {
exit=$?
- echo >&2 "You need to run this command from the toplevel of the working tree."
+ gettextln "You need to run this command from the toplevel of the working tree." >&2
exit $exit
}
fi
test -n "$GIT_DIR" && GIT_DIR=$(cd "$GIT_DIR" && pwd) || {
- echo >&2 "Unable to determine absolute path of git directory"
+ gettextln "Unable to determine absolute path of git directory" >&2
exit 1
}
: "${GIT_OBJECT_DIRECTORY="$(git rev-parse --git-path objects)"}"
diff --git a/git-stash.sh b/git-stash.sh
index c7509e8..826af18 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -15,7 +15,6 @@ SUBDIRECTORY_OK=Yes
OPTIONS_SPEC=
START_DIR=$(pwd)
. git-sh-setup
-. git-sh-i18n
require_work_tree
cd_to_toplevel
@@ -266,7 +265,7 @@ save_stash () {
create_stash "$stash_msg" $untracked
store_stash -m "$stash_msg" -q $w_commit ||
die "$(gettext "Cannot save the current status")"
- say Saved working directory and index state "$stash_msg"
+ say "$(eval_gettext "Saved working directory and index state \$stash_msg")"
if test -z "$patch_mode"
then
@@ -549,7 +548,7 @@ pop_stash() {
drop_stash "$@"
else
status=$?
- say "The stash is kept in case you need it again."
+ say "$(gettext "The stash is kept in case you need it again.")"
exit $status
fi
}
diff --git a/git-submodule.sh b/git-submodule.sh
index 78fdac9..b57f87d 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -9,14 +9,13 @@ USAGE="[--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <re
or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]
or: $dashless [--quiet] init [--] [<path>...]
or: $dashless [--quiet] deinit [-f|--force] (--all| [--] <path>...)
- or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--reference <repository>] [--recursive] [--] [<path>...]
+ or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--] [<path>...]
or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
or: $dashless [--quiet] foreach [--recursive] <command>
or: $dashless [--quiet] sync [--recursive] [--] [<path>...]"
OPTIONS_SPEC=
SUBDIRECTORY_OK=Yes
. git-sh-setup
-. git-sh-i18n
. git-parse-remote
require_work_tree
wt_prefix=$(git rev-parse --show-prefix)
@@ -50,7 +49,7 @@ die_if_unmatched ()
{
if test "$1" = "#unmatched"
then
- exit 1
+ exit ${2:-1}
fi
}
@@ -240,14 +239,15 @@ Use -f if you really want to add it." >&2
then
if test -z "$force"
then
- echo >&2 "$(eval_gettext "A git directory for '\$sm_name' is found locally with remote(s):")"
+ eval_gettextln >&2 "A git directory for '\$sm_name' is found locally with remote(s):"
GIT_DIR=".git/modules/$sm_name" GIT_WORK_TREE=. git remote -v | grep '(fetch)' | sed -e s,^," ", -e s,' (fetch)',, >&2
- echo >&2 "$(eval_gettext "If you want to reuse this local git directory instead of cloning again from")"
- echo >&2 " $realrepo"
- echo >&2 "$(eval_gettext "use the '--force' option. If the local git directory is not the correct repo")"
- die "$(eval_gettext "or you are unsure what this means choose another name with the '--name' option.")"
+ die "$(eval_gettextln "\
+If you want to reuse this local git directory instead of cloning again from
+ \$realrepo
+use the '--force' option. If the local git directory is not the correct repo
+or you are unsure what this means choose another name with the '--name' option.")"
else
- echo "$(eval_gettext "Reactivating local git directory for submodule '\$sm_name'.")"
+ eval_gettextln "Reactivating local git directory for submodule '\$sm_name'."
fi
fi
git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" ${reference:+"$reference"} ${depth:+"$depth"} || exit
@@ -312,11 +312,11 @@ cmd_foreach()
{
git submodule--helper list --prefix "$wt_prefix" ||
- echo "#unmatched"
+ echo "#unmatched" $?
} |
while read mode sha1 stage sm_path
do
- die_if_unmatched "$mode"
+ die_if_unmatched "$mode" "$sha1"
if test -e "$sm_path"/.git
then
displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
@@ -421,11 +421,11 @@ cmd_deinit()
{
git submodule--helper list --prefix "$wt_prefix" "$@" ||
- echo "#unmatched"
+ echo "#unmatched" $?
} |
while read mode sha1 stage sm_path
do
- die_if_unmatched "$mode"
+ die_if_unmatched "$mode" "$sha1"
name=$(git submodule--helper name "$sm_path") || exit
displaypath=$(git submodule--helper relative-path "$sm_path" "$wt_prefix")
@@ -436,8 +436,9 @@ cmd_deinit()
# Protect submodules containing a .git directory
if test -d "$sm_path/.git"
then
- echo >&2 "$(eval_gettext "Submodule work tree '\$displaypath' contains a .git directory")"
- die "$(eval_gettext "(use 'rm -rf' if you really want to remove it including all of its history)")"
+ die "$(eval_gettext "\
+Submodule work tree '\$displaypath' contains a .git directory
+(use 'rm -rf' if you really want to remove it including all of its history)")"
fi
if test -z "$force"
@@ -478,7 +479,8 @@ fetch_in_submodule () (
'')
git fetch ;;
*)
- git fetch $(get_default_remote) "$2" ;;
+ shift
+ git fetch $(get_default_remote) "$@" ;;
esac
)
@@ -528,6 +530,12 @@ cmd_update()
--checkout)
update="checkout"
;;
+ --recommend-shallow)
+ recommend_shallow="--recommend-shallow"
+ ;;
+ --no-recommend-shallow)
+ recommend_shallow="--no-recommend-shallow"
+ ;;
--depth)
case "$2" in '') usage ;; esac
depth="--depth=$2"
@@ -570,17 +578,17 @@ cmd_update()
${update:+--update "$update"} \
${reference:+--reference "$reference"} \
${depth:+--depth "$depth"} \
+ ${recommend_shallow:+"$recommend_shallow"} \
${jobs:+$jobs} \
- "$@" || echo "#unmatched"
+ "$@" || echo "#unmatched" $?
} | {
err=
while read mode sha1 stage just_cloned sm_path
do
- die_if_unmatched "$mode"
+ die_if_unmatched "$mode" "$sha1"
name=$(git submodule--helper name "$sm_path") || exit
url=$(git config submodule."$name".url)
- branch=$(get_submodule_config "$name" branch master)
if ! test -z "$update"
then
update_module=$update
@@ -606,16 +614,17 @@ cmd_update()
if test -n "$remote"
then
+ branch=$(git submodule--helper remote-branch "$sm_path")
if test -z "$nofetch"
then
# Fetch remote before determining tracking $sha1
- (sanitize_submodule_env; cd "$sm_path" && git-fetch) ||
+ fetch_in_submodule "$sm_path" $depth ||
die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")"
fi
remote_name=$(sanitize_submodule_env; cd "$sm_path" && get_default_remote)
sha1=$(sanitize_submodule_env; cd "$sm_path" &&
git rev-parse --verify "${remote_name}/${branch}") ||
- die "$(eval_gettext "Unable to find current ${remote_name}/${branch} revision in submodule path '\$sm_path'")"
+ die "$(eval_gettext "Unable to find current \${remote_name}/\${branch} revision in submodule path '\$sm_path'")"
fi
if test "$subsha1" != "$sha1" || test -n "$force"
@@ -632,14 +641,14 @@ cmd_update()
# Run fetch only if $sha1 isn't present or it
# is not reachable from a ref.
is_tip_reachable "$sm_path" "$sha1" ||
- fetch_in_submodule "$sm_path" ||
+ fetch_in_submodule "$sm_path" $depth ||
die "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'")"
# Now we tried the usual fetch, but $sha1 may
# not be reachable from any of the refs
is_tip_reachable "$sm_path" "$sha1" ||
- fetch_in_submodule "$sm_path" "$sha1" ||
- die "$(eval_gettext "Fetched in submodule path '\$displaypath', but it did not contain $sha1. Direct fetching of that commit failed.")"
+ fetch_in_submodule "$sm_path" $depth "$sha1" ||
+ die "$(eval_gettext "Fetched in submodule path '\$displaypath', but it did not contain \$sha1. Direct fetching of that commit failed.")"
fi
must_die_on_failure=
@@ -696,7 +705,7 @@ cmd_update()
if test $res -gt 0
then
die_msg="$(eval_gettext "Failed to recurse into submodule path '\$displaypath'")"
- if test $res -eq 1
+ if test $res -ne 2
then
err="${err};$die_msg"
continue
@@ -984,11 +993,11 @@ cmd_status()
{
git submodule--helper list --prefix "$wt_prefix" "$@" ||
- echo "#unmatched"
+ echo "#unmatched" $?
} |
while read mode sha1 stage sm_path
do
- die_if_unmatched "$mode"
+ die_if_unmatched "$mode" "$sha1"
name=$(git submodule--helper name "$sm_path") || exit
url=$(git config submodule."$name".url)
displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
@@ -1065,11 +1074,11 @@ cmd_sync()
cd_to_toplevel
{
git submodule--helper list --prefix "$wt_prefix" "$@" ||
- echo "#unmatched"
+ echo "#unmatched" $?
} |
while read mode sha1 stage sm_path
do
- die_if_unmatched "$mode"
+ die_if_unmatched "$mode" "$sha1"
name=$(git submodule--helper name "$sm_path")
url=$(git config -f .gitmodules --get submodule."$name".url)
diff --git a/git-svn.perl b/git-svn.perl
index 05eced0..4d41d22 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -339,7 +339,7 @@ if ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
die "failed to open $ENV{GIT_DIR}: $!\n";
$ENV{GIT_DIR} = $1 if <$fh> =~ /^gitdir: (.+)$/;
}
-} else {
+} elsif ($cmd) {
my ($git_dir, $cdup);
git_cmd_try {
$git_dir = command_oneline([qw/rev-parse --git-dir/]);
@@ -356,7 +356,7 @@ if ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
-read_git_config(\%opts);
+read_git_config(\%opts) if $ENV{GIT_DIR};
if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) {
Getopt::Long::Configure('pass_through');
}
@@ -507,7 +507,10 @@ sub init_subdir {
sub cmd_clone {
my ($url, $path) = @_;
- if (!defined $path &&
+ if (!$url) {
+ die "SVN repository location required ",
+ "as a command-line argument\n";
+ } elsif (!defined $path &&
(defined $_trunk || @_branches || @_tags ||
defined $_stdlayout) &&
$url !~ m#^[a-z\+]+://#) {
diff --git a/git.c b/git.c
index 0f1937f..7acf290 100644
--- a/git.c
+++ b/git.c
@@ -35,8 +35,7 @@ static void save_env_before_alias(void)
orig_cwd = xgetcwd();
for (i = 0; i < ARRAY_SIZE(env_names); i++) {
orig_env[i] = getenv(env_names[i]);
- if (orig_env[i])
- orig_env[i] = xstrdup(orig_env[i]);
+ orig_env[i] = xstrdup_or_null(orig_env[i]);
}
}
@@ -617,6 +616,11 @@ int cmd_main(int argc, const char **argv)
cmd = argv[0];
if (!cmd)
cmd = "git-help";
+ else {
+ const char *slash = find_last_dir_sep(cmd);
+ if (slash)
+ cmd = slash + 1;
+ }
trace_command_performance(argv);
diff --git a/gpg-interface.c b/gpg-interface.c
index c4b1e8c..8672eda 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -3,6 +3,7 @@
#include "strbuf.h"
#include "gpg-interface.h"
#include "sigchain.h"
+#include "tempfile.h"
static char *configured_signing_key;
static const char *gpg_program = "gpg";
@@ -150,42 +151,30 @@ const char *get_signing_key(void)
int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *signing_key)
{
struct child_process gpg = CHILD_PROCESS_INIT;
- const char *args[4];
- ssize_t len;
+ int ret;
size_t i, j, bottom;
+ struct strbuf gpg_status = STRBUF_INIT;
- gpg.argv = args;
- gpg.in = -1;
- gpg.out = -1;
- args[0] = gpg_program;
- args[1] = "-bsau";
- args[2] = signing_key;
- args[3] = NULL;
+ argv_array_pushl(&gpg.args,
+ gpg_program,
+ "--status-fd=2",
+ "-bsau", signing_key,
+ NULL);
- if (start_command(&gpg))
- return error(_("could not run gpg."));
+ bottom = signature->len;
/*
* When the username signingkey is bad, program could be terminated
* because gpg exits without reading and then write gets SIGPIPE.
*/
sigchain_push(SIGPIPE, SIG_IGN);
-
- if (write_in_full(gpg.in, buffer->buf, buffer->len) != buffer->len) {
- close(gpg.in);
- close(gpg.out);
- finish_command(&gpg);
- return error(_("gpg did not accept the data"));
- }
- close(gpg.in);
-
- bottom = signature->len;
- len = strbuf_read(signature, gpg.out, 1024);
- close(gpg.out);
-
+ ret = pipe_command(&gpg, buffer->buf, buffer->len,
+ signature, 1024, &gpg_status, 0);
sigchain_pop(SIGPIPE);
- if (finish_command(&gpg) || !len || len < 0)
+ ret |= !strstr(gpg_status.buf, "\n[GNUPG:] SIG_CREATED ");
+ strbuf_release(&gpg_status);
+ if (ret)
return error(_("gpg failed to sign the data"));
/* Strip CR from the line endings, in case we are on Windows. */
@@ -210,50 +199,39 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
struct strbuf *gpg_output, struct strbuf *gpg_status)
{
struct child_process gpg = CHILD_PROCESS_INIT;
- const char *args_gpg[] = {NULL, "--status-fd=1", "--verify", "FILE", "-", NULL};
- char path[PATH_MAX];
+ static struct tempfile temp;
int fd, ret;
struct strbuf buf = STRBUF_INIT;
- struct strbuf *pbuf = &buf;
- args_gpg[0] = gpg_program;
- fd = git_mkstemp(path, PATH_MAX, ".git_vtag_tmpXXXXXX");
+ fd = mks_tempfile_t(&temp, ".git_vtag_tmpXXXXXX");
if (fd < 0)
- return error_errno(_("could not create temporary file '%s'"), path);
- if (write_in_full(fd, signature, signature_size) < 0)
- return error_errno(_("failed writing detached signature to '%s'"), path);
+ return error_errno(_("could not create temporary file"));
+ if (write_in_full(fd, signature, signature_size) < 0) {
+ error_errno(_("failed writing detached signature to '%s'"),
+ temp.filename.buf);
+ delete_tempfile(&temp);
+ return -1;
+ }
close(fd);
- gpg.argv = args_gpg;
- gpg.in = -1;
- gpg.out = -1;
- if (gpg_output)
- gpg.err = -1;
- args_gpg[3] = path;
- if (start_command(&gpg)) {
- unlink(path);
- return error(_("could not run gpg."));
- }
+ argv_array_pushl(&gpg.args,
+ gpg_program,
+ "--status-fd=1",
+ "--keyid-format=long",
+ "--verify", temp.filename.buf, "-",
+ NULL);
- sigchain_push(SIGPIPE, SIG_IGN);
- write_in_full(gpg.in, payload, payload_size);
- close(gpg.in);
+ if (!gpg_status)
+ gpg_status = &buf;
- if (gpg_output) {
- strbuf_read(gpg_output, gpg.err, 0);
- close(gpg.err);
- }
- if (gpg_status)
- pbuf = gpg_status;
- strbuf_read(pbuf, gpg.out, 0);
- close(gpg.out);
-
- ret = finish_command(&gpg);
+ sigchain_push(SIGPIPE, SIG_IGN);
+ ret = pipe_command(&gpg, payload, payload_size,
+ gpg_status, 0, gpg_output, 0);
sigchain_pop(SIGPIPE);
- unlink_or_warn(path);
+ delete_tempfile(&temp);
- ret |= !strstr(pbuf->buf, "\n[GNUPG:] GOODSIG ");
+ ret |= !strstr(gpg_status->buf, "\n[GNUPG:] GOODSIG ");
strbuf_release(&buf); /* no matter it was used or not */
return ret;
diff --git a/graph.c b/graph.c
index ad766fa..4200f74 100644
--- a/graph.c
+++ b/graph.c
@@ -17,8 +17,8 @@
static void graph_padding_line(struct git_graph *graph, struct strbuf *sb);
/*
- * Print a strbuf to stdout. If the graph is non-NULL, all lines but the
- * first will be prefixed with the graph output.
+ * Print a strbuf. If the graph is non-NULL, all lines but the first will be
+ * prefixed with the graph output.
*
* If the strbuf ends with a newline, the output will end after this
* newline. A new graph line will not be printed after the final newline.
@@ -1145,6 +1145,7 @@ int graph_next_line(struct git_graph *graph, struct strbuf *sb)
static void graph_padding_line(struct git_graph *graph, struct strbuf *sb)
{
int i;
+ int chars_written = 0;
if (graph->state != GRAPH_COMMIT) {
graph_next_line(graph, sb);
@@ -1160,14 +1161,21 @@ static void graph_padding_line(struct git_graph *graph, struct strbuf *sb)
*/
for (i = 0; i < graph->num_columns; i++) {
struct column *col = &graph->columns[i];
+
strbuf_write_column(sb, col, '|');
- if (col->commit == graph->commit && graph->num_parents > 2)
- strbuf_addchars(sb, ' ', (graph->num_parents - 2) * 2);
- else
+ chars_written++;
+
+ if (col->commit == graph->commit && graph->num_parents > 2) {
+ int len = (graph->num_parents - 2) * 2;
+ strbuf_addchars(sb, ' ', len);
+ chars_written += len;
+ } else {
strbuf_addch(sb, ' ');
+ chars_written++;
+ }
}
- graph_pad_horizontally(graph, sb, graph->num_columns);
+ graph_pad_horizontally(graph, sb, chars_written);
/*
* Update graph->prev_state since we have output a padding line
@@ -1200,9 +1208,10 @@ void graph_show_commit(struct git_graph *graph)
while (!shown_commit_line && !graph_is_commit_finished(graph)) {
shown_commit_line = graph_next_line(graph, &msgbuf);
- fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
+ fwrite(msgbuf.buf, sizeof(char), msgbuf.len,
+ graph->revs->diffopt.file);
if (!shown_commit_line)
- putchar('\n');
+ putc('\n', graph->revs->diffopt.file);
strbuf_setlen(&msgbuf, 0);
}
@@ -1217,7 +1226,7 @@ void graph_show_oneline(struct git_graph *graph)
return;
graph_next_line(graph, &msgbuf);
- fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
+ fwrite(msgbuf.buf, sizeof(char), msgbuf.len, graph->revs->diffopt.file);
strbuf_release(&msgbuf);
}
@@ -1229,7 +1238,7 @@ void graph_show_padding(struct git_graph *graph)
return;
graph_padding_line(graph, &msgbuf);
- fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
+ fwrite(msgbuf.buf, sizeof(char), msgbuf.len, graph->revs->diffopt.file);
strbuf_release(&msgbuf);
}
@@ -1246,12 +1255,13 @@ int graph_show_remainder(struct git_graph *graph)
for (;;) {
graph_next_line(graph, &msgbuf);
- fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
+ fwrite(msgbuf.buf, sizeof(char), msgbuf.len,
+ graph->revs->diffopt.file);
strbuf_setlen(&msgbuf, 0);
shown = 1;
if (!graph_is_commit_finished(graph))
- putchar('\n');
+ putc('\n', graph->revs->diffopt.file);
else
break;
}
@@ -1266,7 +1276,8 @@ static void graph_show_strbuf(struct git_graph *graph, struct strbuf const *sb)
char *p;
if (!graph) {
- fwrite(sb->buf, sizeof(char), sb->len, stdout);
+ fwrite(sb->buf, sizeof(char), sb->len,
+ graph->revs->diffopt.file);
return;
}
@@ -1284,7 +1295,7 @@ static void graph_show_strbuf(struct git_graph *graph, struct strbuf const *sb)
} else {
len = (sb->buf + sb->len) - p;
}
- fwrite(p, sizeof(char), len, stdout);
+ fwrite(p, sizeof(char), len, graph->revs->diffopt.file);
if (next_p && *next_p != '\0')
graph_show_oneline(graph);
p = next_p;
@@ -1304,7 +1315,8 @@ void graph_show_commit_msg(struct git_graph *graph,
* CMIT_FMT_USERFORMAT are already missing a terminating
* newline. All of the other formats should have it.
*/
- fwrite(sb->buf, sizeof(char), sb->len, stdout);
+ fwrite(sb->buf, sizeof(char), sb->len,
+ graph->revs->diffopt.file);
return;
}
@@ -1325,7 +1337,7 @@ void graph_show_commit_msg(struct git_graph *graph,
* new line.
*/
if (!newline_terminated)
- putchar('\n');
+ putc('\n', graph->revs->diffopt.file);
graph_show_remainder(graph);
@@ -1333,6 +1345,6 @@ void graph_show_commit_msg(struct git_graph *graph,
* If sb ends with a newline, our output should too.
*/
if (newline_terminated)
- putchar('\n');
+ putc('\n', graph->revs->diffopt.file);
}
}
diff --git a/grep.c b/grep.c
index 58d599e..1194d35 100644
--- a/grep.c
+++ b/grep.c
@@ -693,10 +693,10 @@ static struct grep_expr *prep_header_patterns(struct grep_opt *opt)
for (p = opt->header_list; p; p = p->next) {
if (p->token != GREP_PATTERN_HEAD)
- die("bug: a non-header pattern in grep header list.");
+ die("BUG: a non-header pattern in grep header list.");
if (p->field < GREP_HEADER_FIELD_MIN ||
GREP_HEADER_FIELD_MAX <= p->field)
- die("bug: unknown header field %d", p->field);
+ die("BUG: unknown header field %d", p->field);
compile_regexp(p, opt);
}
@@ -709,7 +709,7 @@ static struct grep_expr *prep_header_patterns(struct grep_opt *opt)
h = compile_pattern_atom(&pp);
if (!h || pp != p->next)
- die("bug: malformed header expr");
+ die("BUG: malformed header expr");
if (!header_group[p->field]) {
header_group[p->field] = h;
continue;
@@ -898,17 +898,6 @@ static int fixmatch(struct grep_pat *p, char *line, char *eol,
}
}
-static int regmatch(const regex_t *preg, char *line, char *eol,
- regmatch_t *match, int eflags)
-{
-#ifdef REG_STARTEND
- match->rm_so = 0;
- match->rm_eo = eol - line;
- eflags |= REG_STARTEND;
-#endif
- return regexec(preg, line, 1, match, eflags);
-}
-
static int patmatch(struct grep_pat *p, char *line, char *eol,
regmatch_t *match, int eflags)
{
@@ -919,7 +908,8 @@ static int patmatch(struct grep_pat *p, char *line, char *eol,
else if (p->pcre_regexp)
hit = !pcrematch(p, line, eol, match, eflags);
else
- hit = !regmatch(&p->regexp, line, eol, match, eflags);
+ hit = !regexec_buf(&p->regexp, line, eol - line, 1, match,
+ eflags);
return hit;
}
@@ -1514,7 +1504,7 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
case GREP_BINARY_TEXT:
break;
default:
- die("bug: unknown binary handling mode");
+ die("BUG: unknown binary handling mode");
}
}
diff --git a/hex.c b/hex.c
index 0519f85..845b01a 100644
--- a/hex.c
+++ b/hex.c
@@ -39,16 +39,8 @@ int get_sha1_hex(const char *hex, unsigned char *sha1)
{
int i;
for (i = 0; i < GIT_SHA1_RAWSZ; i++) {
- unsigned int val;
- /*
- * hex[1]=='\0' is caught when val is checked below,
- * but if hex[0] is NUL we have to avoid reading
- * past the end of the string:
- */
- if (!hex[0])
- return -1;
- val = (hexval(hex[0]) << 4) | hexval(hex[1]);
- if (val & ~0xff)
+ int val = hex2chr(hex);
+ if (val < 0)
return -1;
*sha1++ = val;
hex += 2;
@@ -77,11 +69,17 @@ char *sha1_to_hex_r(char *buffer, const unsigned char *sha1)
return buffer;
}
+char *oid_to_hex_r(char *buffer, const struct object_id *oid)
+{
+ return sha1_to_hex_r(buffer, oid->hash);
+}
+
char *sha1_to_hex(const unsigned char *sha1)
{
static int bufno;
static char hexbuffer[4][GIT_SHA1_HEXSZ + 1];
- return sha1_to_hex_r(hexbuffer[3 & ++bufno], sha1);
+ bufno = (bufno + 1) % ARRAY_SIZE(hexbuffer);
+ return sha1_to_hex_r(hexbuffer[bufno], sha1);
}
char *oid_to_hex(const struct object_id *oid)
diff --git a/http-backend.c b/http-backend.c
index 0d59499..adc8c8c 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -75,55 +75,57 @@ static void format_write(int fd, const char *fmt, ...)
write_or_die(fd, buffer, n);
}
-static void http_status(unsigned code, const char *msg)
+static void http_status(struct strbuf *hdr, unsigned code, const char *msg)
{
- format_write(1, "Status: %u %s\r\n", code, msg);
+ strbuf_addf(hdr, "Status: %u %s\r\n", code, msg);
}
-static void hdr_str(const char *name, const char *value)
+static void hdr_str(struct strbuf *hdr, const char *name, const char *value)
{
- format_write(1, "%s: %s\r\n", name, value);
+ strbuf_addf(hdr, "%s: %s\r\n", name, value);
}
-static void hdr_int(const char *name, uintmax_t value)
+static void hdr_int(struct strbuf *hdr, const char *name, uintmax_t value)
{
- format_write(1, "%s: %" PRIuMAX "\r\n", name, value);
+ strbuf_addf(hdr, "%s: %" PRIuMAX "\r\n", name, value);
}
-static void hdr_date(const char *name, unsigned long when)
+static void hdr_date(struct strbuf *hdr, const char *name, unsigned long when)
{
const char *value = show_date(when, 0, DATE_MODE(RFC2822));
- hdr_str(name, value);
+ hdr_str(hdr, name, value);
}
-static void hdr_nocache(void)
+static void hdr_nocache(struct strbuf *hdr)
{
- hdr_str("Expires", "Fri, 01 Jan 1980 00:00:00 GMT");
- hdr_str("Pragma", "no-cache");
- hdr_str("Cache-Control", "no-cache, max-age=0, must-revalidate");
+ hdr_str(hdr, "Expires", "Fri, 01 Jan 1980 00:00:00 GMT");
+ hdr_str(hdr, "Pragma", "no-cache");
+ hdr_str(hdr, "Cache-Control", "no-cache, max-age=0, must-revalidate");
}
-static void hdr_cache_forever(void)
+static void hdr_cache_forever(struct strbuf *hdr)
{
unsigned long now = time(NULL);
- hdr_date("Date", now);
- hdr_date("Expires", now + 31536000);
- hdr_str("Cache-Control", "public, max-age=31536000");
+ hdr_date(hdr, "Date", now);
+ hdr_date(hdr, "Expires", now + 31536000);
+ hdr_str(hdr, "Cache-Control", "public, max-age=31536000");
}
-static void end_headers(void)
+static void end_headers(struct strbuf *hdr)
{
- write_or_die(1, "\r\n", 2);
+ strbuf_add(hdr, "\r\n", 2);
+ write_or_die(1, hdr->buf, hdr->len);
+ strbuf_release(hdr);
}
-__attribute__((format (printf, 1, 2)))
-static NORETURN void not_found(const char *err, ...)
+__attribute__((format (printf, 2, 3)))
+static NORETURN void not_found(struct strbuf *hdr, const char *err, ...)
{
va_list params;
- http_status(404, "Not Found");
- hdr_nocache();
- end_headers();
+ http_status(hdr, 404, "Not Found");
+ hdr_nocache(hdr);
+ end_headers(hdr);
va_start(params, err);
if (err && *err)
@@ -132,14 +134,14 @@ static NORETURN void not_found(const char *err, ...)
exit(0);
}
-__attribute__((format (printf, 1, 2)))
-static NORETURN void forbidden(const char *err, ...)
+__attribute__((format (printf, 2, 3)))
+static NORETURN void forbidden(struct strbuf *hdr, const char *err, ...)
{
va_list params;
- http_status(403, "Forbidden");
- hdr_nocache();
- end_headers();
+ http_status(hdr, 403, "Forbidden");
+ hdr_nocache(hdr);
+ end_headers(hdr);
va_start(params, err);
if (err && *err)
@@ -148,21 +150,23 @@ static NORETURN void forbidden(const char *err, ...)
exit(0);
}
-static void select_getanyfile(void)
+static void select_getanyfile(struct strbuf *hdr)
{
if (!getanyfile)
- forbidden("Unsupported service: getanyfile");
+ forbidden(hdr, "Unsupported service: getanyfile");
}
-static void send_strbuf(const char *type, struct strbuf *buf)
+static void send_strbuf(struct strbuf *hdr,
+ const char *type, struct strbuf *buf)
{
- hdr_int(content_length, buf->len);
- hdr_str(content_type, type);
- end_headers();
+ hdr_int(hdr, content_length, buf->len);
+ hdr_str(hdr, content_type, type);
+ end_headers(hdr);
write_or_die(1, buf->buf, buf->len);
}
-static void send_local_file(const char *the_type, const char *name)
+static void send_local_file(struct strbuf *hdr, const char *the_type,
+ const char *name)
{
char *p = git_pathdup("%s", name);
size_t buf_alloc = 8192;
@@ -172,14 +176,14 @@ static void send_local_file(const char *the_type, const char *name)
fd = open(p, O_RDONLY);
if (fd < 0)
- not_found("Cannot open '%s': %s", p, strerror(errno));
+ not_found(hdr, "Cannot open '%s': %s", p, strerror(errno));
if (fstat(fd, &sb) < 0)
die_errno("Cannot stat '%s'", p);
- hdr_int(content_length, sb.st_size);
- hdr_str(content_type, the_type);
- hdr_date(last_modified, sb.st_mtime);
- end_headers();
+ hdr_int(hdr, content_length, sb.st_size);
+ hdr_str(hdr, content_type, the_type);
+ hdr_date(hdr, last_modified, sb.st_mtime);
+ end_headers(hdr);
for (;;) {
ssize_t n = xread(fd, buf, buf_alloc);
@@ -194,32 +198,32 @@ static void send_local_file(const char *the_type, const char *name)
free(p);
}
-static void get_text_file(char *name)
+static void get_text_file(struct strbuf *hdr, char *name)
{
- select_getanyfile();
- hdr_nocache();
- send_local_file("text/plain", name);
+ select_getanyfile(hdr);
+ hdr_nocache(hdr);
+ send_local_file(hdr, "text/plain", name);
}
-static void get_loose_object(char *name)
+static void get_loose_object(struct strbuf *hdr, char *name)
{
- select_getanyfile();
- hdr_cache_forever();
- send_local_file("application/x-git-loose-object", name);
+ select_getanyfile(hdr);
+ hdr_cache_forever(hdr);
+ send_local_file(hdr, "application/x-git-loose-object", name);
}
-static void get_pack_file(char *name)
+static void get_pack_file(struct strbuf *hdr, char *name)
{
- select_getanyfile();
- hdr_cache_forever();
- send_local_file("application/x-git-packed-objects", name);
+ select_getanyfile(hdr);
+ hdr_cache_forever(hdr);
+ send_local_file(hdr, "application/x-git-packed-objects", name);
}
-static void get_idx_file(char *name)
+static void get_idx_file(struct strbuf *hdr, char *name)
{
- select_getanyfile();
- hdr_cache_forever();
- send_local_file("application/x-git-packed-objects-toc", name);
+ select_getanyfile(hdr);
+ hdr_cache_forever(hdr);
+ send_local_file(hdr, "application/x-git-packed-objects-toc", name);
}
static void http_config(void)
@@ -241,14 +245,14 @@ static void http_config(void)
strbuf_release(&var);
}
-static struct rpc_service *select_service(const char *name)
+static struct rpc_service *select_service(struct strbuf *hdr, const char *name)
{
const char *svc_name;
struct rpc_service *svc = NULL;
int i;
if (!skip_prefix(name, "git-", &svc_name))
- forbidden("Unsupported service: '%s'", name);
+ forbidden(hdr, "Unsupported service: '%s'", name);
for (i = 0; i < ARRAY_SIZE(rpc_service); i++) {
struct rpc_service *s = &rpc_service[i];
@@ -259,14 +263,14 @@ static struct rpc_service *select_service(const char *name)
}
if (!svc)
- forbidden("Unsupported service: '%s'", name);
+ forbidden(hdr, "Unsupported service: '%s'", name);
if (svc->enabled < 0) {
const char *user = getenv("REMOTE_USER");
svc->enabled = (user && *user) ? 1 : 0;
}
if (!svc->enabled)
- forbidden("Service not enabled: '%s'", svc->name);
+ forbidden(hdr, "Service not enabled: '%s'", svc->name);
return svc;
}
@@ -442,23 +446,23 @@ static int show_text_ref(const char *name, const struct object_id *oid,
return 0;
}
-static void get_info_refs(char *arg)
+static void get_info_refs(struct strbuf *hdr, char *arg)
{
const char *service_name = get_parameter("service");
struct strbuf buf = STRBUF_INIT;
- hdr_nocache();
+ hdr_nocache(hdr);
if (service_name) {
const char *argv[] = {NULL /* service name */,
"--stateless-rpc", "--advertise-refs",
".", NULL};
- struct rpc_service *svc = select_service(service_name);
+ struct rpc_service *svc = select_service(hdr, service_name);
strbuf_addf(&buf, "application/x-git-%s-advertisement",
svc->name);
- hdr_str(content_type, buf.buf);
- end_headers();
+ hdr_str(hdr, content_type, buf.buf);
+ end_headers(hdr);
packet_write(1, "# service=git-%s\n", svc->name);
packet_flush(1);
@@ -467,9 +471,9 @@ static void get_info_refs(char *arg)
run_service(argv, 0);
} else {
- select_getanyfile();
+ select_getanyfile(hdr);
for_each_namespaced_ref(show_text_ref, &buf);
- send_strbuf("text/plain", &buf);
+ send_strbuf(hdr, "text/plain", &buf);
}
strbuf_release(&buf);
}
@@ -494,24 +498,24 @@ static int show_head_ref(const char *refname, const struct object_id *oid,
return 0;
}
-static void get_head(char *arg)
+static void get_head(struct strbuf *hdr, char *arg)
{
struct strbuf buf = STRBUF_INIT;
- select_getanyfile();
+ select_getanyfile(hdr);
head_ref_namespaced(show_head_ref, &buf);
- send_strbuf("text/plain", &buf);
+ send_strbuf(hdr, "text/plain", &buf);
strbuf_release(&buf);
}
-static void get_info_packs(char *arg)
+static void get_info_packs(struct strbuf *hdr, char *arg)
{
size_t objdirlen = strlen(get_object_directory());
struct strbuf buf = STRBUF_INIT;
struct packed_git *p;
size_t cnt = 0;
- select_getanyfile();
+ select_getanyfile(hdr);
prepare_packed_git();
for (p = packed_git; p; p = p->next) {
if (p->pack_local)
@@ -525,12 +529,12 @@ static void get_info_packs(char *arg)
}
strbuf_addch(&buf, '\n');
- hdr_nocache();
- send_strbuf("text/plain; charset=utf-8", &buf);
+ hdr_nocache(hdr);
+ send_strbuf(hdr, "text/plain; charset=utf-8", &buf);
strbuf_release(&buf);
}
-static void check_content_type(const char *accepted_type)
+static void check_content_type(struct strbuf *hdr, const char *accepted_type)
{
const char *actual_type = getenv("CONTENT_TYPE");
@@ -538,9 +542,9 @@ static void check_content_type(const char *accepted_type)
actual_type = "";
if (strcmp(actual_type, accepted_type)) {
- http_status(415, "Unsupported Media Type");
- hdr_nocache();
- end_headers();
+ http_status(hdr, 415, "Unsupported Media Type");
+ hdr_nocache(hdr);
+ end_headers(hdr);
format_write(1,
"Expected POST with Content-Type '%s',"
" but received '%s' instead.\n",
@@ -549,23 +553,23 @@ static void check_content_type(const char *accepted_type)
}
}
-static void service_rpc(char *service_name)
+static void service_rpc(struct strbuf *hdr, char *service_name)
{
const char *argv[] = {NULL, "--stateless-rpc", ".", NULL};
- struct rpc_service *svc = select_service(service_name);
+ struct rpc_service *svc = select_service(hdr, service_name);
struct strbuf buf = STRBUF_INIT;
strbuf_reset(&buf);
strbuf_addf(&buf, "application/x-git-%s-request", svc->name);
- check_content_type(buf.buf);
+ check_content_type(hdr, buf.buf);
- hdr_nocache();
+ hdr_nocache(hdr);
strbuf_reset(&buf);
strbuf_addf(&buf, "application/x-git-%s-result", svc->name);
- hdr_str(content_type, buf.buf);
+ hdr_str(hdr, content_type, buf.buf);
- end_headers();
+ end_headers(hdr);
argv[0] = svc->name;
run_service(argv, svc->buffer_input);
@@ -576,11 +580,13 @@ static int dead;
static NORETURN void die_webcgi(const char *err, va_list params)
{
if (dead <= 1) {
+ struct strbuf hdr = STRBUF_INIT;
+
vreportf("fatal: ", err, params);
- http_status(500, "Internal Server Error");
- hdr_nocache();
- end_headers();
+ http_status(&hdr, 500, "Internal Server Error");
+ hdr_nocache(&hdr);
+ end_headers(&hdr);
}
exit(0); /* we successfully reported a failure ;-) */
}
@@ -617,7 +623,7 @@ static char* getdir(void)
static struct service_cmd {
const char *method;
const char *pattern;
- void (*imp)(char *);
+ void (*imp)(struct strbuf *, char *);
} services[] = {
{"GET", "/HEAD$", get_head},
{"GET", "/info/refs$", get_info_refs},
@@ -632,6 +638,21 @@ static struct service_cmd {
{"POST", "/git-receive-pack$", service_rpc}
};
+static int bad_request(struct strbuf *hdr, const struct service_cmd *c)
+{
+ const char *proto = getenv("SERVER_PROTOCOL");
+
+ if (proto && !strcmp(proto, "HTTP/1.1")) {
+ http_status(hdr, 405, "Method Not Allowed");
+ hdr_str(hdr, "Allow",
+ !strcmp(c->method, "GET") ? "GET, HEAD" : c->method);
+ } else
+ http_status(hdr, 400, "Bad Request");
+ hdr_nocache(hdr);
+ end_headers(hdr);
+ return 0;
+}
+
int cmd_main(int argc, const char **argv)
{
char *method = getenv("REQUEST_METHOD");
@@ -639,6 +660,7 @@ int cmd_main(int argc, const char **argv)
struct service_cmd *cmd = NULL;
char *cmd_arg = NULL;
int i;
+ struct strbuf hdr = STRBUF_INIT;
set_die_routine(die_webcgi);
set_die_is_recursing_routine(die_webcgi_recursing);
@@ -659,18 +681,8 @@ int cmd_main(int argc, const char **argv)
if (!regexec(&re, dir, 1, out, 0)) {
size_t n;
- if (strcmp(method, c->method)) {
- const char *proto = getenv("SERVER_PROTOCOL");
- if (proto && !strcmp(proto, "HTTP/1.1")) {
- http_status(405, "Method Not Allowed");
- hdr_str("Allow", !strcmp(c->method, "GET") ?
- "GET, HEAD" : c->method);
- } else
- http_status(400, "Bad Request");
- hdr_nocache();
- end_headers();
- return 0;
- }
+ if (strcmp(method, c->method))
+ return bad_request(&hdr, c);
cmd = c;
n = out[0].rm_eo - out[0].rm_so;
@@ -682,19 +694,19 @@ int cmd_main(int argc, const char **argv)
}
if (!cmd)
- not_found("Request not supported: '%s'", dir);
+ not_found(&hdr, "Request not supported: '%s'", dir);
setup_path();
if (!enter_repo(dir, 0))
- not_found("Not a git repository: '%s'", dir);
+ not_found(&hdr, "Not a git repository: '%s'", dir);
if (!getenv("GIT_HTTP_EXPORT_ALL") &&
access("git-daemon-export-ok", F_OK) )
- not_found("Repository not exported: '%s'", dir);
+ not_found(&hdr, "Repository not exported: '%s'", dir);
http_config();
max_request_buffer = git_env_ulong("GIT_HTTP_MAX_REQUEST_BUFFER",
max_request_buffer);
- cmd->imp(cmd_arg);
+ cmd->imp(&hdr, cmd_arg);
return 0;
}
diff --git a/http-walker.c b/http-walker.c
index 2c721f0..0b24255 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -2,6 +2,7 @@
#include "commit.h"
#include "walker.h"
#include "http.h"
+#include "list.h"
struct alt_base {
char *base;
@@ -23,7 +24,7 @@ struct object_request {
struct alt_base *repo;
enum object_request_state state;
struct http_object_request *req;
- struct object_request *next;
+ struct list_head node;
};
struct alternates_request {
@@ -41,7 +42,7 @@ struct walker_data {
struct alt_base *alt;
};
-static struct object_request *object_queue_head;
+static LIST_HEAD(object_queue_head);
static void fetch_alternates(struct walker *walker, const char *base);
@@ -110,19 +111,10 @@ static void process_object_response(void *callback_data)
static void release_object_request(struct object_request *obj_req)
{
- struct object_request *entry = object_queue_head;
-
if (obj_req->req !=NULL && obj_req->req->localfile != -1)
error("fd leakage in release: %d", obj_req->req->localfile);
- if (obj_req == object_queue_head) {
- object_queue_head = obj_req->next;
- } else {
- while (entry->next != NULL && entry->next != obj_req)
- entry = entry->next;
- if (entry->next == obj_req)
- entry->next = entry->next->next;
- }
+ list_del(&obj_req->node);
free(obj_req);
}
@@ -130,8 +122,10 @@ static void release_object_request(struct object_request *obj_req)
static int fill_active_slot(struct walker *walker)
{
struct object_request *obj_req;
+ struct list_head *pos, *tmp, *head = &object_queue_head;
- for (obj_req = object_queue_head; obj_req; obj_req = obj_req->next) {
+ list_for_each_safe(pos, tmp, head) {
+ obj_req = list_entry(pos, struct object_request, node);
if (obj_req->state == WAITING) {
if (has_sha1_file(obj_req->sha1))
obj_req->state = COMPLETE;
@@ -148,7 +142,6 @@ static int fill_active_slot(struct walker *walker)
static void prefetch(struct walker *walker, unsigned char *sha1)
{
struct object_request *newreq;
- struct object_request *tail;
struct walker_data *data = walker->data;
newreq = xmalloc(sizeof(*newreq));
@@ -157,18 +150,9 @@ static void prefetch(struct walker *walker, unsigned char *sha1)
newreq->repo = data->alt;
newreq->state = WAITING;
newreq->req = NULL;
- newreq->next = NULL;
http_is_verbose = walker->get_verbosely;
-
- if (object_queue_head == NULL) {
- object_queue_head = newreq;
- } else {
- tail = object_queue_head;
- while (tail->next != NULL)
- tail = tail->next;
- tail->next = newreq;
- }
+ list_add_tail(&newreq->node, &object_queue_head);
#ifdef USE_CURL_MULTI
fill_active_slots();
@@ -447,15 +431,19 @@ static void abort_object_request(struct object_request *obj_req)
release_object_request(obj_req);
}
-static int fetch_object(struct walker *walker, struct alt_base *repo, unsigned char *sha1)
+static int fetch_object(struct walker *walker, unsigned char *sha1)
{
char *hex = sha1_to_hex(sha1);
int ret = 0;
- struct object_request *obj_req = object_queue_head;
+ struct object_request *obj_req = NULL;
struct http_object_request *req;
+ struct list_head *pos, *head = &object_queue_head;
- while (obj_req != NULL && hashcmp(obj_req->sha1, sha1))
- obj_req = obj_req->next;
+ list_for_each(pos, head) {
+ obj_req = list_entry(pos, struct object_request, node);
+ if (!hashcmp(obj_req->sha1, sha1))
+ break;
+ }
if (obj_req == NULL)
return error("Couldn't find request for %s in the queue", hex);
@@ -488,6 +476,15 @@ static int fetch_object(struct walker *walker, struct alt_base *repo, unsigned c
req->localfile = -1;
}
+ /*
+ * we turned off CURLOPT_FAILONERROR to avoid losing a
+ * persistent connection and got CURLE_OK.
+ */
+ if (req->http_code == 404 && req->curl_result == CURLE_OK &&
+ (starts_with(req->url, "http://") ||
+ starts_with(req->url, "https://")))
+ req->curl_result = CURLE_HTTP_RETURNED_ERROR;
+
if (obj_req->state == ABORTED) {
ret = error("Request for %s aborted", hex);
} else if (req->curl_result != CURLE_OK &&
@@ -518,7 +515,7 @@ static int fetch(struct walker *walker, unsigned char *sha1)
struct walker_data *data = walker->data;
struct alt_base *altbase = data->alt;
- if (!fetch_object(walker, altbase, sha1))
+ if (!fetch_object(walker, sha1))
return 0;
while (altbase) {
if (!http_fetch_pack(walker, altbase, sha1))
diff --git a/http.c b/http.c
index d8e427b..bd0dba2 100644
--- a/http.c
+++ b/http.c
@@ -11,6 +11,7 @@
#include "gettext.h"
#include "transport.h"
+static struct trace_key trace_curl = TRACE_KEY_INIT(CURL);
#if LIBCURL_VERSION_NUM >= 0x070a08
long int git_curl_ipresolve = CURL_IPRESOLVE_WHATEVER;
#else
@@ -200,6 +201,13 @@ static void finish_active_slot(struct active_request_slot *slot)
slot->callback_func(slot->callback_data);
}
+static void xmulti_remove_handle(struct active_request_slot *slot)
+{
+#ifdef USE_CURL_MULTI
+ curl_multi_remove_handle(curlm, slot->curl);
+#endif
+}
+
#ifdef USE_CURL_MULTI
static void process_curl_messages(void)
{
@@ -215,7 +223,7 @@ static void process_curl_messages(void)
slot->curl != curl_message->easy_handle)
slot = slot->next;
if (slot != NULL) {
- curl_multi_remove_handle(curlm, slot->curl);
+ xmulti_remove_handle(slot);
slot->curl_result = curl_result;
finish_active_slot(slot);
} else {
@@ -343,7 +351,7 @@ static int http_options(const char *var, const char *value, void *cb)
static void init_curl_http_auth(CURL *result)
{
- if (!http_auth.username) {
+ if (!http_auth.username || !*http_auth.username) {
if (curl_empty_auth)
curl_easy_setopt(result, CURLOPT_USERPWD, ":");
return;
@@ -477,6 +485,125 @@ static void set_curl_keepalive(CURL *c)
}
#endif
+static void redact_sensitive_header(struct strbuf *header)
+{
+ const char *sensitive_header;
+
+ if (skip_prefix(header->buf, "Authorization:", &sensitive_header) ||
+ skip_prefix(header->buf, "Proxy-Authorization:", &sensitive_header)) {
+ /* The first token is the type, which is OK to log */
+ while (isspace(*sensitive_header))
+ sensitive_header++;
+ while (*sensitive_header && !isspace(*sensitive_header))
+ sensitive_header++;
+ /* Everything else is opaque and possibly sensitive */
+ strbuf_setlen(header, sensitive_header - header->buf);
+ strbuf_addstr(header, " <redacted>");
+ }
+}
+
+static void curl_dump_header(const char *text, unsigned char *ptr, size_t size, int hide_sensitive_header)
+{
+ struct strbuf out = STRBUF_INIT;
+ struct strbuf **headers, **header;
+
+ strbuf_addf(&out, "%s, %10.10ld bytes (0x%8.8lx)\n",
+ text, (long)size, (long)size);
+ trace_strbuf(&trace_curl, &out);
+ strbuf_reset(&out);
+ strbuf_add(&out, ptr, size);
+ headers = strbuf_split_max(&out, '\n', 0);
+
+ for (header = headers; *header; header++) {
+ if (hide_sensitive_header)
+ redact_sensitive_header(*header);
+ strbuf_insert((*header), 0, text, strlen(text));
+ strbuf_insert((*header), strlen(text), ": ", 2);
+ strbuf_rtrim((*header));
+ strbuf_addch((*header), '\n');
+ trace_strbuf(&trace_curl, (*header));
+ }
+ strbuf_list_free(headers);
+ strbuf_release(&out);
+}
+
+static void curl_dump_data(const char *text, unsigned char *ptr, size_t size)
+{
+ size_t i;
+ struct strbuf out = STRBUF_INIT;
+ unsigned int width = 60;
+
+ strbuf_addf(&out, "%s, %10.10ld bytes (0x%8.8lx)\n",
+ text, (long)size, (long)size);
+ trace_strbuf(&trace_curl, &out);
+
+ for (i = 0; i < size; i += width) {
+ size_t w;
+
+ strbuf_reset(&out);
+ strbuf_addf(&out, "%s: ", text);
+ for (w = 0; (w < width) && (i + w < size); w++) {
+ unsigned char ch = ptr[i + w];
+
+ strbuf_addch(&out,
+ (ch >= 0x20) && (ch < 0x80)
+ ? ch : '.');
+ }
+ strbuf_addch(&out, '\n');
+ trace_strbuf(&trace_curl, &out);
+ }
+ strbuf_release(&out);
+}
+
+static int curl_trace(CURL *handle, curl_infotype type, char *data, size_t size, void *userp)
+{
+ const char *text;
+ enum { NO_FILTER = 0, DO_FILTER = 1 };
+
+ switch (type) {
+ case CURLINFO_TEXT:
+ trace_printf_key(&trace_curl, "== Info: %s", data);
+ default: /* we ignore unknown types by default */
+ return 0;
+
+ case CURLINFO_HEADER_OUT:
+ text = "=> Send header";
+ curl_dump_header(text, (unsigned char *)data, size, DO_FILTER);
+ break;
+ case CURLINFO_DATA_OUT:
+ text = "=> Send data";
+ curl_dump_data(text, (unsigned char *)data, size);
+ break;
+ case CURLINFO_SSL_DATA_OUT:
+ text = "=> Send SSL data";
+ curl_dump_data(text, (unsigned char *)data, size);
+ break;
+ case CURLINFO_HEADER_IN:
+ text = "<= Recv header";
+ curl_dump_header(text, (unsigned char *)data, size, NO_FILTER);
+ break;
+ case CURLINFO_DATA_IN:
+ text = "<= Recv data";
+ curl_dump_data(text, (unsigned char *)data, size);
+ break;
+ case CURLINFO_SSL_DATA_IN:
+ text = "<= Recv SSL data";
+ curl_dump_data(text, (unsigned char *)data, size);
+ break;
+ }
+ return 0;
+}
+
+void setup_curl_trace(CURL *handle)
+{
+ if (!trace_want(&trace_curl))
+ return;
+ curl_easy_setopt(handle, CURLOPT_VERBOSE, 1L);
+ curl_easy_setopt(handle, CURLOPT_DEBUGFUNCTION, curl_trace);
+ curl_easy_setopt(handle, CURLOPT_DEBUGDATA, NULL);
+}
+
+
static CURL *get_curl_handle(void)
{
CURL *result = curl_easy_init();
@@ -575,9 +702,9 @@ static CURL *get_curl_handle(void)
warning("protocol restrictions not applied to curl redirects because\n"
"your curl version is too old (>= 7.19.4)");
#endif
-
if (getenv("GIT_CURL_VERBOSE"))
- curl_easy_setopt(result, CURLOPT_VERBOSE, 1);
+ curl_easy_setopt(result, CURLOPT_VERBOSE, 1L);
+ setup_curl_trace(result);
curl_easy_setopt(result, CURLOPT_USERAGENT,
user_agent ? user_agent : git_user_agent());
@@ -603,7 +730,7 @@ static CURL *get_curl_handle(void)
* precedence here, as in CURL.
*/
if (!curl_http_proxy) {
- if (!strcmp(http_auth.protocol, "https")) {
+ if (http_auth.protocol && !strcmp(http_auth.protocol, "https")) {
var_override(&curl_http_proxy, getenv("HTTPS_PROXY"));
var_override(&curl_http_proxy, getenv("https_proxy"));
} else {
@@ -761,9 +888,7 @@ void http_cleanup(void)
while (slot != NULL) {
struct active_request_slot *next = slot->next;
if (slot->curl != NULL) {
-#ifdef USE_CURL_MULTI
- curl_multi_remove_handle(curlm, slot->curl);
-#endif
+ xmulti_remove_handle(slot);
curl_easy_cleanup(slot->curl);
}
free(slot);
@@ -902,6 +1027,8 @@ int start_active_slot(struct active_request_slot *slot)
if (curlm_result != CURLM_OK &&
curlm_result != CURLM_CALL_MULTI_PERFORM) {
+ warning("curl_multi_add_handle failed: %s",
+ curl_multi_strerror(curlm_result));
active_requests--;
slot->in_use = 0;
return 0;
@@ -1041,13 +1168,13 @@ void run_active_slot(struct active_request_slot *slot)
static void release_active_slot(struct active_request_slot *slot)
{
closedown_active_slot(slot);
- if (slot->curl && curl_session_count > min_curl_sessions) {
-#ifdef USE_CURL_MULTI
- curl_multi_remove_handle(curlm, slot->curl);
-#endif
- curl_easy_cleanup(slot->curl);
- slot->curl = NULL;
- curl_session_count--;
+ if (slot->curl) {
+ xmulti_remove_handle(slot);
+ if (curl_session_count > min_curl_sessions) {
+ curl_easy_cleanup(slot->curl);
+ slot->curl = NULL;
+ curl_session_count--;
+ }
}
#ifdef USE_CURL_MULTI
fill_active_slots();
@@ -1855,8 +1982,19 @@ static size_t fwrite_sha1_file(char *ptr, size_t eltsize, size_t nmemb,
unsigned char expn[4096];
size_t size = eltsize * nmemb;
int posn = 0;
- struct http_object_request *freq =
- (struct http_object_request *)data;
+ struct http_object_request *freq = data;
+ struct active_request_slot *slot = freq->slot;
+
+ if (slot) {
+ CURLcode c = curl_easy_getinfo(slot->curl, CURLINFO_HTTP_CODE,
+ &slot->http_code);
+ if (c != CURLE_OK)
+ die("BUG: curl_easy_getinfo for HTTP code failed: %s",
+ curl_easy_strerror(c));
+ if (slot->http_code >= 400)
+ return size;
+ }
+
do {
ssize_t retval = xwrite(freq->localfile,
(char *) ptr + posn, size - posn);
@@ -1977,6 +2115,7 @@ struct http_object_request *new_http_object_request(const char *base_url,
freq->slot = get_active_slot();
curl_easy_setopt(freq->slot->curl, CURLOPT_FILE, freq);
+ curl_easy_setopt(freq->slot->curl, CURLOPT_FAILONERROR, 0);
curl_easy_setopt(freq->slot->curl, CURLOPT_WRITEFUNCTION, fwrite_sha1_file);
curl_easy_setopt(freq->slot->curl, CURLOPT_ERRORBUFFER, freq->errorstr);
curl_easy_setopt(freq->slot->curl, CURLOPT_URL, freq->url);
diff --git a/http.h b/http.h
index 36f558b..5ab9d9c 100644
--- a/http.h
+++ b/http.h
@@ -225,4 +225,6 @@ extern int finish_http_object_request(struct http_object_request *freq);
extern void abort_http_object_request(struct http_object_request *freq);
extern void release_http_object_request(struct http_object_request *freq);
+/* setup routine for curl_easy_setopt CURLOPT_DEBUGFUNCTION */
+void setup_curl_trace(CURL *handle);
#endif /* HTTP_H */
diff --git a/ident.c b/ident.c
index e20a772..d17b5bd 100644
--- a/ident.c
+++ b/ident.c
@@ -101,7 +101,7 @@ static int canonical_name(const char *host, struct strbuf *out)
memset (&hints, '\0', sizeof (hints));
hints.ai_flags = AI_CANONNAME;
if (!getaddrinfo(host, NULL, &hints, &ai)) {
- if (ai && strchr(ai->ai_canonname, '.')) {
+ if (ai && ai->ai_canonname && strchr(ai->ai_canonname, '.')) {
strbuf_addstr(out, ai->ai_canonname);
status = 0;
}
diff --git a/imap-send.c b/imap-send.c
index 9cbe27f..5c7e27a 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -511,7 +511,7 @@ static int nfsnprintf(char *buf, int blen, const char *fmt, ...)
va_start(va, fmt);
if (blen <= 0 || (unsigned)(ret = vsnprintf(buf, blen, fmt, va)) >= (unsigned)blen)
- die("Fatal: buffer too small. Please report a bug.");
+ die("BUG: buffer too small. Please report a bug.");
va_end(va);
return ret;
}
@@ -1082,10 +1082,8 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *f
cred.protocol = xstrdup(srvc->use_ssl ? "imaps" : "imap");
cred.host = xstrdup(srvc->host);
- if (srvc->user)
- cred.username = xstrdup(srvc->user);
- if (srvc->pass)
- cred.password = xstrdup(srvc->pass);
+ cred.username = xstrdup_or_null(srvc->user);
+ cred.password = xstrdup_or_null(srvc->pass);
credential_fill(&cred);
@@ -1410,6 +1408,7 @@ static CURL *setup_curl(struct imap_server_conf *srvc)
curl_easy_setopt(curl, CURLOPT_USERNAME, server.user);
curl_easy_setopt(curl, CURLOPT_PASSWORD, server.pass);
+ strbuf_addstr(&path, server.use_ssl ? "imaps://" : "imap://");
strbuf_addstr(&path, server.host);
if (!path.len || path.buf[path.len - 1] != '/')
strbuf_addch(&path, '/');
@@ -1443,6 +1442,7 @@ static CURL *setup_curl(struct imap_server_conf *srvc)
if (0 < verbosity || getenv("GIT_CURL_VERBOSE"))
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
+ setup_curl_trace(curl);
return curl;
}
diff --git a/iterator.h b/iterator.h
new file mode 100644
index 0000000..0f6900e
--- /dev/null
+++ b/iterator.h
@@ -0,0 +1,81 @@
+#ifndef ITERATOR_H
+#define ITERATOR_H
+
+/*
+ * Generic constants related to iterators.
+ */
+
+/*
+ * The attempt to advance the iterator was successful; the iterator
+ * reflects the new current entry.
+ */
+#define ITER_OK 0
+
+/*
+ * The iterator is exhausted and has been freed.
+ */
+#define ITER_DONE -1
+
+/*
+ * The iterator experienced an error. The iteration has been aborted
+ * and the iterator has been freed.
+ */
+#define ITER_ERROR -2
+
+/*
+ * Return values for selector functions for merge iterators. The
+ * numerical values of these constants are important and must be
+ * compatible with ITER_DONE and ITER_ERROR.
+ */
+enum iterator_selection {
+ /* End the iteration without an error: */
+ ITER_SELECT_DONE = ITER_DONE,
+
+ /* Report an error and abort the iteration: */
+ ITER_SELECT_ERROR = ITER_ERROR,
+
+ /*
+ * The next group of constants are masks that are useful
+ * mainly internally.
+ */
+
+ /* The LSB selects whether iter0/iter1 is the "current" iterator: */
+ ITER_CURRENT_SELECTION_MASK = 0x01,
+
+ /* iter0 is the "current" iterator this round: */
+ ITER_CURRENT_SELECTION_0 = 0x00,
+
+ /* iter1 is the "current" iterator this round: */
+ ITER_CURRENT_SELECTION_1 = 0x01,
+
+ /* Yield the value from the current iterator? */
+ ITER_YIELD_CURRENT = 0x02,
+
+ /* Discard the value from the secondary iterator? */
+ ITER_SKIP_SECONDARY = 0x04,
+
+ /*
+ * The constants that a selector function should usually
+ * return.
+ */
+
+ /* Yield the value from iter0: */
+ ITER_SELECT_0 = ITER_CURRENT_SELECTION_0 | ITER_YIELD_CURRENT,
+
+ /* Yield the value from iter0 and discard the one from iter1: */
+ ITER_SELECT_0_SKIP_1 = ITER_SELECT_0 | ITER_SKIP_SECONDARY,
+
+ /* Discard the value from iter0 without yielding anything this round: */
+ ITER_SKIP_0 = ITER_CURRENT_SELECTION_1 | ITER_SKIP_SECONDARY,
+
+ /* Yield the value from iter1: */
+ ITER_SELECT_1 = ITER_CURRENT_SELECTION_1 | ITER_YIELD_CURRENT,
+
+ /* Yield the value from iter1 and discard the one from iter0: */
+ ITER_SELECT_1_SKIP_0 = ITER_SELECT_1 | ITER_SKIP_SECONDARY,
+
+ /* Discard the value from iter1 without yielding anything this round: */
+ ITER_SKIP_1 = ITER_CURRENT_SELECTION_0 | ITER_SKIP_SECONDARY
+};
+
+#endif /* ITERATOR_H */
diff --git a/line-log.c b/line-log.c
index 1fbbe4f..916e724 100644
--- a/line-log.c
+++ b/line-log.c
@@ -519,7 +519,7 @@ static void fill_line_ends(struct diff_filespec *spec, long *lines,
char *data = NULL;
if (diff_populate_filespec(spec, 0))
- die("Cannot read blob %s", sha1_to_hex(spec->sha1));
+ die("Cannot read blob %s", oid_to_hex(&spec->oid));
ALLOC_ARRAY(ends, size);
ends[cur++] = 0;
@@ -840,7 +840,7 @@ static char *get_nth_line(long line, unsigned long *ends, void *data)
static void print_line(const char *prefix, char first,
long line, unsigned long *ends, void *data,
- const char *color, const char *reset)
+ const char *color, const char *reset, FILE *file)
{
char *begin = get_nth_line(line, ends, data);
char *end = get_nth_line(line+1, ends, data);
@@ -851,14 +851,14 @@ static void print_line(const char *prefix, char first,
had_nl = 1;
}
- fputs(prefix, stdout);
- fputs(color, stdout);
- putchar(first);
- fwrite(begin, 1, end-begin, stdout);
- fputs(reset, stdout);
- putchar('\n');
+ fputs(prefix, file);
+ fputs(color, file);
+ putc(first, file);
+ fwrite(begin, 1, end-begin, file);
+ fputs(reset, file);
+ putc('\n', file);
if (!had_nl)
- fputs("\\ No newline at end of file\n", stdout);
+ fputs("\\ No newline at end of file\n", file);
}
static char *output_prefix(struct diff_options *opt)
@@ -893,16 +893,16 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang
if (!pair || !diff)
return;
- if (pair->one->sha1_valid)
+ if (pair->one->oid_valid)
fill_line_ends(pair->one, &p_lines, &p_ends);
fill_line_ends(pair->two, &t_lines, &t_ends);
- printf("%s%sdiff --git a/%s b/%s%s\n", prefix, c_meta, pair->one->path, pair->two->path, c_reset);
- printf("%s%s--- %s%s%s\n", prefix, c_meta,
- pair->one->sha1_valid ? "a/" : "",
- pair->one->sha1_valid ? pair->one->path : "/dev/null",
+ fprintf(opt->file, "%s%sdiff --git a/%s b/%s%s\n", prefix, c_meta, pair->one->path, pair->two->path, c_reset);
+ fprintf(opt->file, "%s%s--- %s%s%s\n", prefix, c_meta,
+ pair->one->oid_valid ? "a/" : "",
+ pair->one->oid_valid ? pair->one->path : "/dev/null",
c_reset);
- printf("%s%s+++ b/%s%s\n", prefix, c_meta, pair->two->path, c_reset);
+ fprintf(opt->file, "%s%s+++ b/%s%s\n", prefix, c_meta, pair->two->path, c_reset);
for (i = 0; i < range->ranges.nr; i++) {
long p_start, p_end;
long t_start = range->ranges.ranges[i].start;
@@ -944,7 +944,7 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang
}
/* Now output a diff hunk for this range */
- printf("%s%s@@ -%ld,%ld +%ld,%ld @@%s\n",
+ fprintf(opt->file, "%s%s@@ -%ld,%ld +%ld,%ld @@%s\n",
prefix, c_frag,
p_start+1, p_end-p_start, t_start+1, t_end-t_start,
c_reset);
@@ -952,18 +952,18 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang
int k;
for (; t_cur < diff->target.ranges[j].start; t_cur++)
print_line(prefix, ' ', t_cur, t_ends, pair->two->data,
- c_context, c_reset);
+ c_context, c_reset, opt->file);
for (k = diff->parent.ranges[j].start; k < diff->parent.ranges[j].end; k++)
print_line(prefix, '-', k, p_ends, pair->one->data,
- c_old, c_reset);
+ c_old, c_reset, opt->file);
for (; t_cur < diff->target.ranges[j].end && t_cur < t_end; t_cur++)
print_line(prefix, '+', t_cur, t_ends, pair->two->data,
- c_new, c_reset);
+ c_new, c_reset, opt->file);
j++;
}
for (; t_cur < t_end; t_cur++)
print_line(prefix, ' ', t_cur, t_ends, pair->two->data,
- c_context, c_reset);
+ c_context, c_reset, opt->file);
}
free(p_ends);
@@ -976,7 +976,7 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang
*/
static void dump_diff_hacky(struct rev_info *rev, struct line_log_data *range)
{
- puts(output_prefix(&rev->diffopt));
+ fprintf(rev->diffopt.file, "%s\n", output_prefix(&rev->diffopt));
while (range) {
dump_diff_hacky_one(rev, range);
range = range->next;
@@ -1010,12 +1010,12 @@ static int process_diff_filepair(struct rev_info *rev,
if (rg->ranges.nr == 0)
return 0;
- assert(pair->two->sha1_valid);
+ assert(pair->two->oid_valid);
diff_populate_filespec(pair->two, 0);
file_target.ptr = pair->two->data;
file_target.size = pair->two->size;
- if (pair->one->sha1_valid) {
+ if (pair->one->oid_valid) {
diff_populate_filespec(pair->one, 0);
file_parent.ptr = pair->one->data;
file_parent.size = pair->one->size;
diff --git a/list.h b/list.h
new file mode 100644
index 0000000..a226a87
--- /dev/null
+++ b/list.h
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2002 Free Software Foundation, Inc.
+ * (originally part of the GNU C Library and Userspace RCU)
+ * Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
+ *
+ * Copyright (C) 2009 Pierre-Marc Fournier
+ * Conversion to RCU list.
+ * Copyright (C) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIST_H
+#define LIST_H 1
+
+/*
+ * The definitions of this file are adopted from those which can be
+ * found in the Linux kernel headers to enable people familiar with the
+ * latter find their way in these sources as well.
+ */
+
+/* Basic type for the double-link list. */
+struct list_head {
+ struct list_head *next, *prev;
+};
+
+/* avoid conflicts with BSD-only sys/queue.h */
+#undef LIST_HEAD
+/* Define a variable with the head and tail of the list. */
+#define LIST_HEAD(name) \
+ struct list_head name = { &(name), &(name) }
+
+/* Initialize a new list head. */
+#define INIT_LIST_HEAD(ptr) \
+ (ptr)->next = (ptr)->prev = (ptr)
+
+#define LIST_HEAD_INIT(name) { &(name), &(name) }
+
+/* Add new element at the head of the list. */
+static inline void list_add(struct list_head *newp, struct list_head *head)
+{
+ head->next->prev = newp;
+ newp->next = head->next;
+ newp->prev = head;
+ head->next = newp;
+}
+
+/* Add new element at the tail of the list. */
+static inline void list_add_tail(struct list_head *newp, struct list_head *head)
+{
+ head->prev->next = newp;
+ newp->next = head;
+ newp->prev = head->prev;
+ head->prev = newp;
+}
+
+/* Remove element from list. */
+static inline void __list_del(struct list_head *prev, struct list_head *next)
+{
+ next->prev = prev;
+ prev->next = next;
+}
+
+/* Remove element from list. */
+static inline void list_del(struct list_head *elem)
+{
+ __list_del(elem->prev, elem->next);
+}
+
+/* Remove element from list, initializing the element's list pointers. */
+static inline void list_del_init(struct list_head *elem)
+{
+ list_del(elem);
+ INIT_LIST_HEAD(elem);
+}
+
+/* Delete from list, add to another list as head. */
+static inline void list_move(struct list_head *elem, struct list_head *head)
+{
+ __list_del(elem->prev, elem->next);
+ list_add(elem, head);
+}
+
+/* Replace an old entry. */
+static inline void list_replace(struct list_head *old, struct list_head *newp)
+{
+ newp->next = old->next;
+ newp->prev = old->prev;
+ newp->prev->next = newp;
+ newp->next->prev = newp;
+}
+
+/* Join two lists. */
+static inline void list_splice(struct list_head *add, struct list_head *head)
+{
+ /* Do nothing if the list which gets added is empty. */
+ if (add != add->next) {
+ add->next->prev = head;
+ add->prev->next = head->next;
+ head->next->prev = add->prev;
+ head->next = add->next;
+ }
+}
+
+/* Get typed element from list at a given position. */
+#define list_entry(ptr, type, member) \
+ ((type *) ((char *) (ptr) - offsetof(type, member)))
+
+/* Get first entry from a list. */
+#define list_first_entry(ptr, type, member) \
+ list_entry((ptr)->next, type, member)
+
+/* Iterate forward over the elements of the list. */
+#define list_for_each(pos, head) \
+ for (pos = (head)->next; pos != (head); pos = pos->next)
+
+/*
+ * Iterate forward over the elements list. The list elements can be
+ * removed from the list while doing this.
+ */
+#define list_for_each_safe(pos, p, head) \
+ for (pos = (head)->next, p = pos->next; \
+ pos != (head); \
+ pos = p, p = pos->next)
+
+/* Iterate backward over the elements of the list. */
+#define list_for_each_prev(pos, head) \
+ for (pos = (head)->prev; pos != (head); pos = pos->prev)
+
+/*
+ * Iterate backwards over the elements list. The list elements can be
+ * removed from the list while doing this.
+ */
+#define list_for_each_prev_safe(pos, p, head) \
+ for (pos = (head)->prev, p = pos->prev; \
+ pos != (head); \
+ pos = p, p = pos->prev)
+
+static inline int list_empty(struct list_head *head)
+{
+ return head == head->next;
+}
+
+static inline void list_replace_init(struct list_head *old,
+ struct list_head *newp)
+{
+ struct list_head *head = old->next;
+
+ list_del(old);
+ list_add_tail(newp, head);
+ INIT_LIST_HEAD(old);
+}
+
+#endif /* LIST_H */
diff --git a/log-tree.c b/log-tree.c
index 8d39315..bfb735c 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -159,12 +159,12 @@ void load_ref_decorations(int flags)
}
}
-static void show_parents(struct commit *commit, int abbrev)
+static void show_parents(struct commit *commit, int abbrev, FILE *file)
{
struct commit_list *p;
for (p = commit->parents; p ; p = p->next) {
struct commit *parent = p->item;
- printf(" %s", find_unique_abbrev(parent->object.oid.hash, abbrev));
+ fprintf(file, " %s", find_unique_abbrev(parent->object.oid.hash, abbrev));
}
}
@@ -172,7 +172,7 @@ static void show_children(struct rev_info *opt, struct commit *commit, int abbre
{
struct commit_list *p = lookup_decoration(&opt->children, &commit->object);
for ( ; p; p = p->next) {
- printf(" %s", find_unique_abbrev(p->item->object.oid.hash, abbrev));
+ fprintf(opt->diffopt.file, " %s", find_unique_abbrev(p->item->object.oid.hash, abbrev));
}
}
@@ -263,8 +263,6 @@ void format_decorations_extended(struct strbuf *sb,
if (current_and_HEAD &&
decoration->type == DECORATION_REF_HEAD) {
- strbuf_addstr(sb, color_reset);
- strbuf_addstr(sb, color_commit);
strbuf_addstr(sb, " -> ");
strbuf_addstr(sb, color_reset);
strbuf_addstr(sb, decorate_get_color(use_color, current_and_HEAD->type));
@@ -286,11 +284,11 @@ void show_decorations(struct rev_info *opt, struct commit *commit)
struct strbuf sb = STRBUF_INIT;
if (opt->show_source && commit->util)
- printf("\t%s", (char *) commit->util);
+ fprintf(opt->diffopt.file, "\t%s", (char *) commit->util);
if (!opt->show_decorations)
return;
format_decorations(&sb, commit, opt->diffopt.use_color);
- fputs(sb.buf, stdout);
+ fputs(sb.buf, opt->diffopt.file);
strbuf_release(&sb);
}
@@ -364,18 +362,18 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit,
subject = "Subject: ";
}
- printf("From %s Mon Sep 17 00:00:00 2001\n", name);
+ fprintf(opt->diffopt.file, "From %s Mon Sep 17 00:00:00 2001\n", name);
graph_show_oneline(opt->graph);
if (opt->message_id) {
- printf("Message-Id: <%s>\n", opt->message_id);
+ fprintf(opt->diffopt.file, "Message-Id: <%s>\n", opt->message_id);
graph_show_oneline(opt->graph);
}
if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) {
int i, n;
n = opt->ref_message_ids->nr;
- printf("In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string);
+ fprintf(opt->diffopt.file, "In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string);
for (i = 0; i < n; i++)
- printf("%s<%s>\n", (i > 0 ? "\t" : "References: "),
+ fprintf(opt->diffopt.file, "%s<%s>\n", (i > 0 ? "\t" : "References: "),
opt->ref_message_ids->items[i].string);
graph_show_oneline(opt->graph);
}
@@ -432,7 +430,7 @@ static void show_sig_lines(struct rev_info *opt, int status, const char *bol)
reset = diff_get_color_opt(&opt->diffopt, DIFF_RESET);
while (*bol) {
eol = strchrnul(bol, '\n');
- printf("%s%.*s%s%s", color, (int)(eol - bol), bol, reset,
+ fprintf(opt->diffopt.file, "%s%.*s%s%s", color, (int)(eol - bol), bol, reset,
*eol ? "\n" : "");
graph_show_oneline(opt->graph);
bol = (*eol) ? (eol + 1) : eol;
@@ -553,17 +551,17 @@ void show_log(struct rev_info *opt)
if (!opt->graph)
put_revision_mark(opt, commit);
- fputs(find_unique_abbrev(commit->object.oid.hash, abbrev_commit), stdout);
+ fputs(find_unique_abbrev(commit->object.oid.hash, abbrev_commit), opt->diffopt.file);
if (opt->print_parents)
- show_parents(commit, abbrev_commit);
+ show_parents(commit, abbrev_commit, opt->diffopt.file);
if (opt->children.name)
show_children(opt, commit, abbrev_commit);
show_decorations(opt, commit);
if (opt->graph && !graph_is_commit_finished(opt->graph)) {
- putchar('\n');
+ putc('\n', opt->diffopt.file);
graph_show_remainder(opt->graph);
}
- putchar(opt->diffopt.line_termination);
+ putc(opt->diffopt.line_termination, opt->diffopt.file);
return;
}
@@ -589,7 +587,7 @@ void show_log(struct rev_info *opt)
if (opt->diffopt.line_termination == '\n' &&
!opt->missing_newline)
graph_show_padding(opt->graph);
- putchar(opt->diffopt.line_termination);
+ putc(opt->diffopt.line_termination, opt->diffopt.file);
}
opt->shown_one = 1;
@@ -603,32 +601,32 @@ void show_log(struct rev_info *opt)
* Print header line of header..
*/
- if (opt->commit_format == CMIT_FMT_EMAIL) {
+ if (cmit_fmt_is_mail(opt->commit_format)) {
log_write_email_headers(opt, commit, &ctx.subject, &extra_headers,
&ctx.need_8bit_cte);
} else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
- fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
+ fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), opt->diffopt.file);
if (opt->commit_format != CMIT_FMT_ONELINE)
- fputs("commit ", stdout);
+ fputs("commit ", opt->diffopt.file);
if (!opt->graph)
put_revision_mark(opt, commit);
fputs(find_unique_abbrev(commit->object.oid.hash, abbrev_commit),
- stdout);
+ opt->diffopt.file);
if (opt->print_parents)
- show_parents(commit, abbrev_commit);
+ show_parents(commit, abbrev_commit, opt->diffopt.file);
if (opt->children.name)
show_children(opt, commit, abbrev_commit);
if (parent)
- printf(" (from %s)",
+ fprintf(opt->diffopt.file, " (from %s)",
find_unique_abbrev(parent->object.oid.hash,
abbrev_commit));
- fputs(diff_get_color_opt(&opt->diffopt, DIFF_RESET), stdout);
+ fputs(diff_get_color_opt(&opt->diffopt, DIFF_RESET), opt->diffopt.file);
show_decorations(opt, commit);
if (opt->commit_format == CMIT_FMT_ONELINE) {
- putchar(' ');
+ putc(' ', opt->diffopt.file);
} else {
- putchar('\n');
+ putc('\n', opt->diffopt.file);
graph_show_oneline(opt->graph);
}
if (opt->reflog_info) {
@@ -696,7 +694,7 @@ void show_log(struct rev_info *opt)
if ((ctx.fmt != CMIT_FMT_USERFORMAT) &&
ctx.notes_message && *ctx.notes_message) {
- if (ctx.fmt == CMIT_FMT_EMAIL) {
+ if (cmit_fmt_is_mail(ctx.fmt)) {
strbuf_addstr(&msgbuf, "---\n");
opt->shown_dashes = 1;
}
@@ -704,7 +702,7 @@ void show_log(struct rev_info *opt)
}
if (opt->show_log_size) {
- printf("log size %i\n", (int)msgbuf.len);
+ fprintf(opt->diffopt.file, "log size %i\n", (int)msgbuf.len);
graph_show_oneline(opt->graph);
}
@@ -720,11 +718,11 @@ void show_log(struct rev_info *opt)
if (opt->graph)
graph_show_commit_msg(opt->graph, &msgbuf);
else
- fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
+ fwrite(msgbuf.buf, sizeof(char), msgbuf.len, opt->diffopt.file);
if (opt->use_terminator && !commit_format_is_empty(opt->commit_format)) {
if (!opt->missing_newline)
graph_show_padding(opt->graph);
- putchar(opt->diffopt.line_termination);
+ putc(opt->diffopt.line_termination, opt->diffopt.file);
}
strbuf_release(&msgbuf);
@@ -761,7 +759,7 @@ int log_tree_diff_flush(struct rev_info *opt)
struct strbuf *msg = NULL;
msg = opt->diffopt.output_prefix(&opt->diffopt,
opt->diffopt.output_prefix_data);
- fwrite(msg->buf, msg->len, 1, stdout);
+ fwrite(msg->buf, msg->len, 1, opt->diffopt.file);
}
/*
@@ -776,8 +774,8 @@ int log_tree_diff_flush(struct rev_info *opt)
*/
if (!opt->shown_dashes &&
(pch & opt->diffopt.output_format) == pch)
- printf("---");
- putchar('\n');
+ fprintf(opt->diffopt.file, "---");
+ putc('\n', opt->diffopt.file);
}
}
diff_flush(&opt->diffopt);
@@ -864,17 +862,18 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
int log_tree_commit(struct rev_info *opt, struct commit *commit)
{
struct log_info log;
- int shown;
+ int shown, close_file = opt->diffopt.close_file;
log.commit = commit;
log.parent = NULL;
opt->loginfo = &log;
+ opt->diffopt.close_file = 0;
if (opt->line_level_traverse)
return line_log_print(opt, commit);
if (opt->track_linear && !opt->linear && !opt->reverse_output_stage)
- printf("\n%s\n", opt->break_bar);
+ fprintf(opt->diffopt.file, "\n%s\n", opt->break_bar);
shown = log_tree_diff(opt, commit, &log);
if (!shown && opt->loginfo && opt->always_show_header) {
log.parent = NULL;
@@ -882,8 +881,10 @@ int log_tree_commit(struct rev_info *opt, struct commit *commit)
shown = 1;
}
if (opt->track_linear && !opt->linear && opt->reverse_output_stage)
- printf("\n%s\n", opt->break_bar);
+ fprintf(opt->diffopt.file, "\n%s\n", opt->break_bar);
opt->loginfo = NULL;
- maybe_flush_or_die(stdout, "stdout");
+ maybe_flush_or_die(opt->diffopt.file, "stdout");
+ if (close_file)
+ fclose(opt->diffopt.file);
return shown;
}
diff --git a/mailinfo.c b/mailinfo.c
index e19abe3..b4118a0 100644
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -54,6 +54,86 @@ static void parse_bogus_from(struct mailinfo *mi, const struct strbuf *line)
get_sane_name(&mi->name, &mi->name, &mi->email);
}
+static const char *unquote_comment(struct strbuf *outbuf, const char *in)
+{
+ int c;
+ int take_next_litterally = 0;
+
+ strbuf_addch(outbuf, '(');
+
+ while ((c = *in++) != 0) {
+ if (take_next_litterally == 1) {
+ take_next_litterally = 0;
+ } else {
+ switch (c) {
+ case '\\':
+ take_next_litterally = 1;
+ continue;
+ case '(':
+ in = unquote_comment(outbuf, in);
+ continue;
+ case ')':
+ strbuf_addch(outbuf, ')');
+ return in;
+ }
+ }
+
+ strbuf_addch(outbuf, c);
+ }
+
+ return in;
+}
+
+static const char *unquote_quoted_string(struct strbuf *outbuf, const char *in)
+{
+ int c;
+ int take_next_litterally = 0;
+
+ while ((c = *in++) != 0) {
+ if (take_next_litterally == 1) {
+ take_next_litterally = 0;
+ } else {
+ switch (c) {
+ case '\\':
+ take_next_litterally = 1;
+ continue;
+ case '"':
+ return in;
+ }
+ }
+
+ strbuf_addch(outbuf, c);
+ }
+
+ return in;
+}
+
+static void unquote_quoted_pair(struct strbuf *line)
+{
+ struct strbuf outbuf;
+ const char *in = line->buf;
+ int c;
+
+ strbuf_init(&outbuf, line->len);
+
+ while ((c = *in++) != 0) {
+ switch (c) {
+ case '"':
+ in = unquote_quoted_string(&outbuf, in);
+ continue;
+ case '(':
+ in = unquote_comment(&outbuf, in);
+ continue;
+ }
+
+ strbuf_addch(&outbuf, c);
+ }
+
+ strbuf_swap(&outbuf, line);
+ strbuf_release(&outbuf);
+
+}
+
static void handle_from(struct mailinfo *mi, const struct strbuf *from)
{
char *at;
@@ -63,6 +143,8 @@ static void handle_from(struct mailinfo *mi, const struct strbuf *from)
strbuf_init(&f, from->len);
strbuf_addbuf(&f, from);
+ unquote_quoted_pair(&f);
+
at = strchr(f.buf, '@');
if (!at) {
parse_bogus_from(mi, from);
diff --git a/mailmap.c b/mailmap.c
index b5c521f..c1a79c1 100644
--- a/mailmap.c
+++ b/mailmap.c
@@ -103,10 +103,8 @@ static void add_mapping(struct string_list *map,
} else {
struct mailmap_info *mi = xcalloc(1, sizeof(struct mailmap_info));
debug_mm("mailmap: adding (complex) entry for '%s'\n", old_email);
- if (new_name)
- mi->name = xstrdup(new_name);
- if (new_email)
- mi->email = xstrdup(new_email);
+ mi->name = xstrdup_or_null(new_name);
+ mi->email = xstrdup_or_null(new_email);
string_list_insert(&me->namemap, old_name)->util = mi;
}
diff --git a/merge-recursive.c b/merge-recursive.c
index a52139e..aa92e30 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -23,6 +23,37 @@
#include "dir.h"
#include "submodule.h"
+static void flush_output(struct merge_options *o)
+{
+ if (o->buffer_output < 2 && o->obuf.len) {
+ fputs(o->obuf.buf, stdout);
+ strbuf_reset(&o->obuf);
+ }
+}
+
+static int err(struct merge_options *o, const char *err, ...)
+{
+ va_list params;
+
+ if (o->buffer_output < 2)
+ flush_output(o);
+ else {
+ strbuf_complete(&o->obuf, '\n');
+ strbuf_addstr(&o->obuf, "error: ");
+ }
+ va_start(params, err);
+ strbuf_vaddf(&o->obuf, err, params);
+ va_end(params);
+ if (o->buffer_output > 1)
+ strbuf_addch(&o->obuf, '\n');
+ else {
+ error("%s", o->obuf.buf);
+ strbuf_reset(&o->obuf);
+ }
+
+ return -1;
+}
+
static struct tree *shift_tree_object(struct tree *one, struct tree *two,
const char *subtree_shift)
{
@@ -53,11 +84,11 @@ static struct commit *make_virtual_commit(struct tree *tree, const char *comment
* Since we use get_tree_entry(), which does not put the read object into
* the object pool, we cannot rely on a == b.
*/
-static int sha_eq(const unsigned char *a, const unsigned char *b)
+static int oid_eq(const struct object_id *a, const struct object_id *b)
{
if (!a && !b)
return 2;
- return a && b && hashcmp(a, b) == 0;
+ return a && b && oidcmp(a, b) == 0;
}
enum rename_type {
@@ -87,7 +118,7 @@ struct rename_conflict_info {
struct stage_data {
struct {
unsigned mode;
- unsigned char sha[20];
+ struct object_id oid;
} stages[4];
struct rename_conflict_info *rename_conflict_info;
unsigned processed:1;
@@ -131,11 +162,11 @@ static inline void setup_rename_conflict_info(enum rename_type rename_type,
int ostage2 = ostage1 ^ 1;
ci->ren1_other.path = pair1->one->path;
- hashcpy(ci->ren1_other.sha1, src_entry1->stages[ostage1].sha);
+ oidcpy(&ci->ren1_other.oid, &src_entry1->stages[ostage1].oid);
ci->ren1_other.mode = src_entry1->stages[ostage1].mode;
ci->ren2_other.path = pair2->one->path;
- hashcpy(ci->ren2_other.sha1, src_entry2->stages[ostage2].sha);
+ oidcpy(&ci->ren2_other.oid, &src_entry2->stages[ostage2].oid);
ci->ren2_other.mode = src_entry2->stages[ostage2].mode;
}
}
@@ -145,14 +176,6 @@ static int show(struct merge_options *o, int v)
return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
}
-static void flush_output(struct merge_options *o)
-{
- if (o->obuf.len) {
- fputs(o->obuf.buf, stdout);
- strbuf_reset(&o->obuf);
- }
-}
-
__attribute__((format (printf, 3, 4)))
static void output(struct merge_options *o, int v, const char *fmt, ...)
{
@@ -174,36 +197,38 @@ static void output(struct merge_options *o, int v, const char *fmt, ...)
static void output_commit_title(struct merge_options *o, struct commit *commit)
{
- int i;
- flush_output(o);
- for (i = o->call_depth; i--;)
- fputs(" ", stdout);
+ strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
if (commit->util)
- printf("virtual %s\n", merge_remote_util(commit)->name);
+ strbuf_addf(&o->obuf, "virtual %s\n",
+ merge_remote_util(commit)->name);
else {
- printf("%s ", find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV));
+ strbuf_add_unique_abbrev(&o->obuf, commit->object.oid.hash,
+ DEFAULT_ABBREV);
+ strbuf_addch(&o->obuf, ' ');
if (parse_commit(commit) != 0)
- printf(_("(bad commit)\n"));
+ strbuf_addstr(&o->obuf, _("(bad commit)\n"));
else {
const char *title;
const char *msg = get_commit_buffer(commit, NULL);
int len = find_commit_subject(msg, &title);
if (len)
- printf("%.*s\n", len, title);
+ strbuf_addf(&o->obuf, "%.*s\n", len, title);
unuse_commit_buffer(commit, msg);
}
}
+ flush_output(o);
}
-static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
+static int add_cacheinfo(struct merge_options *o,
+ unsigned int mode, const struct object_id *oid,
const char *path, int stage, int refresh, int options)
{
struct cache_entry *ce;
int ret;
- ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, 0);
+ ce = make_cache_entry(mode, oid ? oid->hash : null_sha1, path, stage, 0);
if (!ce)
- return error(_("addinfo_cache failed for path '%s'"), path);
+ return err(o, _("addinfo_cache failed for path '%s'"), path);
ret = add_cache_entry(ce, options);
if (refresh) {
@@ -265,15 +290,17 @@ struct tree *write_tree_from_memory(struct merge_options *o)
fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
(int)ce_namelen(ce), ce->name);
}
- die("Bug in merge-recursive.c");
+ die("BUG: unmerged index entries in merge-recursive.c");
}
if (!active_cache_tree)
active_cache_tree = cache_tree();
if (!cache_tree_fully_valid(active_cache_tree) &&
- cache_tree_update(&the_index, 0) < 0)
- die(_("error building trees"));
+ cache_tree_update(&the_index, 0) < 0) {
+ err(o, _("error building trees"));
+ return NULL;
+ }
result = lookup_tree(active_cache_tree->sha1);
@@ -320,11 +347,11 @@ static struct stage_data *insert_stage_data(const char *path,
struct string_list_item *item;
struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
get_tree_entry(o->object.oid.hash, path,
- e->stages[1].sha, &e->stages[1].mode);
+ e->stages[1].oid.hash, &e->stages[1].mode);
get_tree_entry(a->object.oid.hash, path,
- e->stages[2].sha, &e->stages[2].mode);
+ e->stages[2].oid.hash, &e->stages[2].mode);
get_tree_entry(b->object.oid.hash, path,
- e->stages[3].sha, &e->stages[3].mode);
+ e->stages[3].oid.hash, &e->stages[3].mode);
item = string_list_insert(entries, path);
item->util = e;
return e;
@@ -355,7 +382,7 @@ static struct string_list *get_unmerged(void)
}
e = item->util;
e->stages[ce_stage(ce)].mode = ce->ce_mode;
- hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
+ hashcpy(e->stages[ce_stage(ce)].oid.hash, ce->sha1);
}
return unmerged;
@@ -538,7 +565,8 @@ static struct string_list *get_renames(struct merge_options *o,
return renames;
}
-static int update_stages(const char *path, const struct diff_filespec *o,
+static int update_stages(struct merge_options *opt, const char *path,
+ const struct diff_filespec *o,
const struct diff_filespec *a,
const struct diff_filespec *b)
{
@@ -557,13 +585,13 @@ static int update_stages(const char *path, const struct diff_filespec *o,
if (remove_file_from_cache(path))
return -1;
if (o)
- if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options))
+ if (add_cacheinfo(opt, o->mode, &o->oid, path, 1, 0, options))
return -1;
if (a)
- if (add_cacheinfo(a->mode, a->sha1, path, 2, 0, options))
+ if (add_cacheinfo(opt, a->mode, &a->oid, path, 2, 0, options))
return -1;
if (b)
- if (add_cacheinfo(b->mode, b->sha1, path, 3, 0, options))
+ if (add_cacheinfo(opt, b->mode, &b->oid, path, 3, 0, options))
return -1;
return 0;
}
@@ -577,9 +605,9 @@ static void update_entry(struct stage_data *entry,
entry->stages[1].mode = o->mode;
entry->stages[2].mode = a->mode;
entry->stages[3].mode = b->mode;
- hashcpy(entry->stages[1].sha, o->sha1);
- hashcpy(entry->stages[2].sha, a->sha1);
- hashcpy(entry->stages[3].sha, b->sha1);
+ oidcpy(&entry->stages[1].oid, &o->oid);
+ oidcpy(&entry->stages[2].oid, &a->oid);
+ oidcpy(&entry->stages[3].oid, &b->oid);
}
static int remove_file(struct merge_options *o, int clean,
@@ -663,23 +691,21 @@ static int was_tracked(const char *path)
{
int pos = cache_name_pos(path, strlen(path));
- if (pos < 0)
- pos = -1 - pos;
- while (pos < active_nr &&
- !strcmp(path, active_cache[pos]->name)) {
- /*
- * If stage #0, it is definitely tracked.
- * If it has stage #2 then it was tracked
- * before this merge started. All other
- * cases the path was not tracked.
- */
- switch (ce_stage(active_cache[pos])) {
- case 0:
- case 2:
+ if (0 <= pos)
+ /* we have been tracking this path */
+ return 1;
+
+ /*
+ * Look for an unmerged entry for the path,
+ * specifically stage #2, which would indicate
+ * that "our" side before the merge started
+ * had the path tracked (and resulted in a conflict).
+ */
+ for (pos = -1 - pos;
+ pos < active_nr && !strcmp(path, active_cache[pos]->name);
+ pos++)
+ if (ce_stage(active_cache[pos]) == 2)
return 1;
- }
- pos++;
- }
return 0;
}
@@ -714,12 +740,10 @@ static int make_room_for_path(struct merge_options *o, const char *path)
/* Make sure leading directories are created */
status = safe_create_leading_directories_const(path);
if (status) {
- if (status == SCLD_EXISTS) {
+ if (status == SCLD_EXISTS)
/* something else exists */
- error(msg, path, _(": perhaps a D/F conflict?"));
- return -1;
- }
- die(msg, path, "");
+ return err(o, msg, path, _(": perhaps a D/F conflict?"));
+ return err(o, msg, path, "");
}
/*
@@ -727,7 +751,7 @@ static int make_room_for_path(struct merge_options *o, const char *path)
* tracking it.
*/
if (would_lose_untracked(path))
- return error(_("refusing to lose untracked file at '%s'"),
+ return err(o, _("refusing to lose untracked file at '%s'"),
path);
/* Successful unlink is good.. */
@@ -737,16 +761,18 @@ static int make_room_for_path(struct merge_options *o, const char *path)
if (errno == ENOENT)
return 0;
/* .. but not some other error (who really cares what?) */
- return error(msg, path, _(": perhaps a D/F conflict?"));
+ return err(o, msg, path, _(": perhaps a D/F conflict?"));
}
-static void update_file_flags(struct merge_options *o,
- const unsigned char *sha,
- unsigned mode,
- const char *path,
- int update_cache,
- int update_wd)
+static int update_file_flags(struct merge_options *o,
+ const struct object_id *oid,
+ unsigned mode,
+ const char *path,
+ int update_cache,
+ int update_wd)
{
+ int ret = 0;
+
if (o->call_depth)
update_wd = 0;
@@ -765,11 +791,13 @@ static void update_file_flags(struct merge_options *o,
goto update_index;
}
- buf = read_sha1_file(sha, &type, &size);
+ buf = read_sha1_file(oid->hash, &type, &size);
if (!buf)
- die(_("cannot read object %s '%s'"), sha1_to_hex(sha), path);
- if (type != OBJ_BLOB)
- die(_("blob expected for %s '%s'"), sha1_to_hex(sha), path);
+ return err(o, _("cannot read object %s '%s'"), oid_to_hex(oid), path);
+ if (type != OBJ_BLOB) {
+ ret = err(o, _("blob expected for %s '%s'"), oid_to_hex(oid), path);
+ goto free_buf;
+ }
if (S_ISREG(mode)) {
struct strbuf strbuf = STRBUF_INIT;
if (convert_to_working_tree(path, buf, size, &strbuf)) {
@@ -781,8 +809,7 @@ static void update_file_flags(struct merge_options *o,
if (make_room_for_path(o, path) < 0) {
update_wd = 0;
- free(buf);
- goto update_index;
+ goto free_buf;
}
if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
int fd;
@@ -791,8 +818,11 @@ static void update_file_flags(struct merge_options *o,
else
mode = 0666;
fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
- if (fd < 0)
- die_errno(_("failed to open '%s'"), path);
+ if (fd < 0) {
+ ret = err(o, _("failed to open '%s': %s"),
+ path, strerror(errno));
+ goto free_buf;
+ }
write_in_full(fd, buf, size);
close(fd);
} else if (S_ISLNK(mode)) {
@@ -800,31 +830,35 @@ static void update_file_flags(struct merge_options *o,
safe_create_leading_directories_const(path);
unlink(path);
if (symlink(lnk, path))
- die_errno(_("failed to symlink '%s'"), path);
+ ret = err(o, _("failed to symlink '%s': %s"),
+ path, strerror(errno));
free(lnk);
} else
- die(_("do not know what to do with %06o %s '%s'"),
- mode, sha1_to_hex(sha), path);
+ ret = err(o,
+ _("do not know what to do with %06o %s '%s'"),
+ mode, oid_to_hex(oid), path);
+ free_buf:
free(buf);
}
update_index:
- if (update_cache)
- add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
+ if (!ret && update_cache)
+ add_cacheinfo(o, mode, oid, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
+ return ret;
}
-static void update_file(struct merge_options *o,
- int clean,
- const unsigned char *sha,
- unsigned mode,
- const char *path)
+static int update_file(struct merge_options *o,
+ int clean,
+ const struct object_id *oid,
+ unsigned mode,
+ const char *path)
{
- update_file_flags(o, sha, mode, path, o->call_depth || clean, !o->call_depth);
+ return update_file_flags(o, oid, mode, path, o->call_depth || clean, !o->call_depth);
}
/* Low level file merging, update and removal */
struct merge_file_info {
- unsigned char sha[20];
+ struct object_id oid;
unsigned mode;
unsigned clean:1,
merge:1;
@@ -876,9 +910,9 @@ static int merge_3way(struct merge_options *o,
name2 = mkpathdup("%s", branch2);
}
- read_mmblob(&orig, one->sha1);
- read_mmblob(&src1, a->sha1);
- read_mmblob(&src2, b->sha1);
+ read_mmblob(&orig, one->oid.hash);
+ read_mmblob(&src1, a->oid.hash);
+ read_mmblob(&src2, b->oid.hash);
merge_status = ll_merge(result_buf, a->path, &orig, base_name,
&src1, name1, &src2, name2, &ll_opts);
@@ -892,138 +926,144 @@ static int merge_3way(struct merge_options *o,
return merge_status;
}
-static struct merge_file_info merge_file_1(struct merge_options *o,
+static int merge_file_1(struct merge_options *o,
const struct diff_filespec *one,
const struct diff_filespec *a,
const struct diff_filespec *b,
const char *branch1,
- const char *branch2)
+ const char *branch2,
+ struct merge_file_info *result)
{
- struct merge_file_info result;
- result.merge = 0;
- result.clean = 1;
+ result->merge = 0;
+ result->clean = 1;
if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
- result.clean = 0;
+ result->clean = 0;
if (S_ISREG(a->mode)) {
- result.mode = a->mode;
- hashcpy(result.sha, a->sha1);
+ result->mode = a->mode;
+ oidcpy(&result->oid, &a->oid);
} else {
- result.mode = b->mode;
- hashcpy(result.sha, b->sha1);
+ result->mode = b->mode;
+ oidcpy(&result->oid, &b->oid);
}
} else {
- if (!sha_eq(a->sha1, one->sha1) && !sha_eq(b->sha1, one->sha1))
- result.merge = 1;
+ if (!oid_eq(&a->oid, &one->oid) && !oid_eq(&b->oid, &one->oid))
+ result->merge = 1;
/*
* Merge modes
*/
if (a->mode == b->mode || a->mode == one->mode)
- result.mode = b->mode;
+ result->mode = b->mode;
else {
- result.mode = a->mode;
+ result->mode = a->mode;
if (b->mode != one->mode) {
- result.clean = 0;
- result.merge = 1;
+ result->clean = 0;
+ result->merge = 1;
}
}
- if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, one->sha1))
- hashcpy(result.sha, b->sha1);
- else if (sha_eq(b->sha1, one->sha1))
- hashcpy(result.sha, a->sha1);
+ if (oid_eq(&a->oid, &b->oid) || oid_eq(&a->oid, &one->oid))
+ oidcpy(&result->oid, &b->oid);
+ else if (oid_eq(&b->oid, &one->oid))
+ oidcpy(&result->oid, &a->oid);
else if (S_ISREG(a->mode)) {
mmbuffer_t result_buf;
- int merge_status;
+ int ret = 0, merge_status;
merge_status = merge_3way(o, &result_buf, one, a, b,
branch1, branch2);
if ((merge_status < 0) || !result_buf.ptr)
- die(_("Failed to execute internal merge"));
+ ret = err(o, _("Failed to execute internal merge"));
- if (write_sha1_file(result_buf.ptr, result_buf.size,
- blob_type, result.sha))
- die(_("Unable to add %s to database"),
- a->path);
+ if (!ret && write_sha1_file(result_buf.ptr, result_buf.size,
+ blob_type, result->oid.hash))
+ ret = err(o, _("Unable to add %s to database"),
+ a->path);
free(result_buf.ptr);
- result.clean = (merge_status == 0);
+ if (ret)
+ return ret;
+ result->clean = (merge_status == 0);
} else if (S_ISGITLINK(a->mode)) {
- result.clean = merge_submodule(result.sha,
- one->path, one->sha1,
- a->sha1, b->sha1,
+ result->clean = merge_submodule(result->oid.hash,
+ one->path,
+ one->oid.hash,
+ a->oid.hash,
+ b->oid.hash,
!o->call_depth);
} else if (S_ISLNK(a->mode)) {
- hashcpy(result.sha, a->sha1);
+ oidcpy(&result->oid, &a->oid);
- if (!sha_eq(a->sha1, b->sha1))
- result.clean = 0;
- } else {
- die(_("unsupported object type in the tree"));
- }
+ if (!oid_eq(&a->oid, &b->oid))
+ result->clean = 0;
+ } else
+ die("BUG: unsupported object type in the tree");
}
- return result;
+ return 0;
}
-static struct merge_file_info
-merge_file_special_markers(struct merge_options *o,
+static int merge_file_special_markers(struct merge_options *o,
const struct diff_filespec *one,
const struct diff_filespec *a,
const struct diff_filespec *b,
const char *branch1,
const char *filename1,
const char *branch2,
- const char *filename2)
+ const char *filename2,
+ struct merge_file_info *mfi)
{
char *side1 = NULL;
char *side2 = NULL;
- struct merge_file_info mfi;
+ int ret;
if (filename1)
side1 = xstrfmt("%s:%s", branch1, filename1);
if (filename2)
side2 = xstrfmt("%s:%s", branch2, filename2);
- mfi = merge_file_1(o, one, a, b,
- side1 ? side1 : branch1, side2 ? side2 : branch2);
+ ret = merge_file_1(o, one, a, b,
+ side1 ? side1 : branch1,
+ side2 ? side2 : branch2, mfi);
free(side1);
free(side2);
- return mfi;
+ return ret;
}
-static struct merge_file_info merge_file_one(struct merge_options *o,
+static int merge_file_one(struct merge_options *o,
const char *path,
- const unsigned char *o_sha, int o_mode,
- const unsigned char *a_sha, int a_mode,
- const unsigned char *b_sha, int b_mode,
+ const struct object_id *o_oid, int o_mode,
+ const struct object_id *a_oid, int a_mode,
+ const struct object_id *b_oid, int b_mode,
const char *branch1,
- const char *branch2)
+ const char *branch2,
+ struct merge_file_info *mfi)
{
struct diff_filespec one, a, b;
one.path = a.path = b.path = (char *)path;
- hashcpy(one.sha1, o_sha);
+ oidcpy(&one.oid, o_oid);
one.mode = o_mode;
- hashcpy(a.sha1, a_sha);
+ oidcpy(&a.oid, a_oid);
a.mode = a_mode;
- hashcpy(b.sha1, b_sha);
+ oidcpy(&b.oid, b_oid);
b.mode = b_mode;
- return merge_file_1(o, &one, &a, &b, branch1, branch2);
+ return merge_file_1(o, &one, &a, &b, branch1, branch2, mfi);
}
-static void handle_change_delete(struct merge_options *o,
+static int handle_change_delete(struct merge_options *o,
const char *path,
- const unsigned char *o_sha, int o_mode,
- const unsigned char *a_sha, int a_mode,
- const unsigned char *b_sha, int b_mode,
+ const struct object_id *o_oid, int o_mode,
+ const struct object_id *a_oid, int a_mode,
+ const struct object_id *b_oid, int b_mode,
const char *change, const char *change_past)
{
char *renamed = NULL;
+ int ret = 0;
if (dir_in_way(path, !o->call_depth)) {
- renamed = unique_path(o, path, a_sha ? o->branch1 : o->branch2);
+ renamed = unique_path(o, path, a_oid ? o->branch1 : o->branch2);
}
if (o->call_depth) {
@@ -1032,21 +1072,23 @@ static void handle_change_delete(struct merge_options *o,
* correct; since there is no true "middle point" between
* them, simply reuse the base version for virtual merge base.
*/
- remove_file_from_cache(path);
- update_file(o, 0, o_sha, o_mode, renamed ? renamed : path);
- } else if (!a_sha) {
+ ret = remove_file_from_cache(path);
+ if (!ret)
+ ret = update_file(o, 0, o_oid, o_mode,
+ renamed ? renamed : path);
+ } else if (!a_oid) {
if (!renamed) {
output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
"and %s in %s. Version %s of %s left in tree."),
change, path, o->branch1, change_past,
o->branch2, o->branch2, path);
- update_file(o, 0, b_sha, b_mode, path);
+ ret = update_file(o, 0, b_oid, b_mode, path);
} else {
output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
"and %s in %s. Version %s of %s left in tree at %s."),
change, path, o->branch1, change_past,
o->branch2, o->branch2, path, renamed);
- update_file(o, 0, b_sha, b_mode, renamed);
+ ret = update_file(o, 0, b_oid, b_mode, renamed);
}
} else {
if (!renamed) {
@@ -1059,7 +1101,7 @@ static void handle_change_delete(struct merge_options *o,
"and %s in %s. Version %s of %s left in tree at %s."),
change, path, o->branch2, change_past,
o->branch1, o->branch1, path, renamed);
- update_file(o, 0, a_sha, a_mode, renamed);
+ ret = update_file(o, 0, a_oid, a_mode, renamed);
}
/*
* No need to call update_file() on path when !renamed, since
@@ -1069,59 +1111,60 @@ static void handle_change_delete(struct merge_options *o,
*/
}
free(renamed);
+
+ return ret;
}
-static void conflict_rename_delete(struct merge_options *o,
+static int conflict_rename_delete(struct merge_options *o,
struct diff_filepair *pair,
const char *rename_branch,
const char *other_branch)
{
const struct diff_filespec *orig = pair->one;
const struct diff_filespec *dest = pair->two;
- const unsigned char *a_sha = NULL;
- const unsigned char *b_sha = NULL;
+ const struct object_id *a_oid = NULL;
+ const struct object_id *b_oid = NULL;
int a_mode = 0;
int b_mode = 0;
if (rename_branch == o->branch1) {
- a_sha = dest->sha1;
+ a_oid = &dest->oid;
a_mode = dest->mode;
} else {
- b_sha = dest->sha1;
+ b_oid = &dest->oid;
b_mode = dest->mode;
}
- handle_change_delete(o,
- o->call_depth ? orig->path : dest->path,
- orig->sha1, orig->mode,
- a_sha, a_mode,
- b_sha, b_mode,
- _("rename"), _("renamed"));
-
- if (o->call_depth) {
- remove_file_from_cache(dest->path);
- } else {
- update_stages(dest->path, NULL,
- rename_branch == o->branch1 ? dest : NULL,
- rename_branch == o->branch1 ? NULL : dest);
- }
+ if (handle_change_delete(o,
+ o->call_depth ? orig->path : dest->path,
+ &orig->oid, orig->mode,
+ a_oid, a_mode,
+ b_oid, b_mode,
+ _("rename"), _("renamed")))
+ return -1;
+ if (o->call_depth)
+ return remove_file_from_cache(dest->path);
+ else
+ return update_stages(o, dest->path, NULL,
+ rename_branch == o->branch1 ? dest : NULL,
+ rename_branch == o->branch1 ? NULL : dest);
}
static struct diff_filespec *filespec_from_entry(struct diff_filespec *target,
struct stage_data *entry,
int stage)
{
- unsigned char *sha = entry->stages[stage].sha;
+ struct object_id *oid = &entry->stages[stage].oid;
unsigned mode = entry->stages[stage].mode;
- if (mode == 0 || is_null_sha1(sha))
+ if (mode == 0 || is_null_oid(oid))
return NULL;
- hashcpy(target->sha1, sha);
+ oidcpy(&target->oid, oid);
target->mode = mode;
return target;
}
-static void handle_file(struct merge_options *o,
+static int handle_file(struct merge_options *o,
struct diff_filespec *rename,
int stage,
struct rename_conflict_info *ci)
@@ -1131,6 +1174,7 @@ static void handle_file(struct merge_options *o,
const char *cur_branch, *other_branch;
struct diff_filespec other;
struct diff_filespec *add;
+ int ret;
if (stage == 2) {
dst_entry = ci->dst_entry1;
@@ -1145,7 +1189,8 @@ static void handle_file(struct merge_options *o,
add = filespec_from_entry(&other, dst_entry, stage ^ 1);
if (add) {
char *add_name = unique_path(o, rename->path, other_branch);
- update_file(o, 0, add->sha1, add->mode, add_name);
+ if (update_file(o, 0, &add->oid, add->mode, add_name))
+ return -1;
remove_file(o, 0, rename->path, 0);
dst_name = unique_path(o, rename->path, cur_branch);
@@ -1156,17 +1201,20 @@ static void handle_file(struct merge_options *o,
rename->path, other_branch, dst_name);
}
}
- update_file(o, 0, rename->sha1, rename->mode, dst_name);
- if (stage == 2)
- update_stages(rename->path, NULL, rename, add);
+ if ((ret = update_file(o, 0, &rename->oid, rename->mode, dst_name)))
+ ; /* fall through, do allow dst_name to be released */
+ else if (stage == 2)
+ ret = update_stages(o, rename->path, NULL, rename, add);
else
- update_stages(rename->path, NULL, add, rename);
+ ret = update_stages(o, rename->path, NULL, add, rename);
if (dst_name != rename->path)
free(dst_name);
+
+ return ret;
}
-static void conflict_rename_rename_1to2(struct merge_options *o,
+static int conflict_rename_rename_1to2(struct merge_options *o,
struct rename_conflict_info *ci)
{
/* One file was renamed in both branches, but to different names. */
@@ -1184,18 +1232,21 @@ static void conflict_rename_rename_1to2(struct merge_options *o,
struct merge_file_info mfi;
struct diff_filespec other;
struct diff_filespec *add;
- mfi = merge_file_one(o, one->path,
- one->sha1, one->mode,
- a->sha1, a->mode,
- b->sha1, b->mode,
- ci->branch1, ci->branch2);
+ if (merge_file_one(o, one->path,
+ &one->oid, one->mode,
+ &a->oid, a->mode,
+ &b->oid, b->mode,
+ ci->branch1, ci->branch2, &mfi))
+ return -1;
+
/*
* FIXME: For rename/add-source conflicts (if we could detect
* such), this is wrong. We should instead find a unique
* pathname and then either rename the add-source file to that
* unique path, or use that unique path instead of src here.
*/
- update_file(o, 0, mfi.sha, mfi.mode, one->path);
+ if (update_file(o, 0, &mfi.oid, mfi.mode, one->path))
+ return -1;
/*
* Above, we put the merged content at the merge-base's
@@ -1206,22 +1257,26 @@ static void conflict_rename_rename_1to2(struct merge_options *o,
* resolving the conflict at that path in its favor.
*/
add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1);
- if (add)
- update_file(o, 0, add->sha1, add->mode, a->path);
+ if (add) {
+ if (update_file(o, 0, &add->oid, add->mode, a->path))
+ return -1;
+ }
else
remove_file_from_cache(a->path);
add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1);
- if (add)
- update_file(o, 0, add->sha1, add->mode, b->path);
+ if (add) {
+ if (update_file(o, 0, &add->oid, add->mode, b->path))
+ return -1;
+ }
else
remove_file_from_cache(b->path);
- } else {
- handle_file(o, a, 2, ci);
- handle_file(o, b, 3, ci);
- }
+ } else if (handle_file(o, a, 2, ci) || handle_file(o, b, 3, ci))
+ return -1;
+
+ return 0;
}
-static void conflict_rename_rename_2to1(struct merge_options *o,
+static int conflict_rename_rename_2to1(struct merge_options *o,
struct rename_conflict_info *ci)
{
/* Two files, a & b, were renamed to the same thing, c. */
@@ -1232,6 +1287,7 @@ static void conflict_rename_rename_2to1(struct merge_options *o,
char *path = c1->path; /* == c2->path */
struct merge_file_info mfi_c1;
struct merge_file_info mfi_c2;
+ int ret;
output(o, 1, _("CONFLICT (rename/rename): "
"Rename %s->%s in %s. "
@@ -1242,12 +1298,13 @@ static void conflict_rename_rename_2to1(struct merge_options *o,
remove_file(o, 1, a->path, o->call_depth || would_lose_untracked(a->path));
remove_file(o, 1, b->path, o->call_depth || would_lose_untracked(b->path));
- mfi_c1 = merge_file_special_markers(o, a, c1, &ci->ren1_other,
- o->branch1, c1->path,
- o->branch2, ci->ren1_other.path);
- mfi_c2 = merge_file_special_markers(o, b, &ci->ren2_other, c2,
- o->branch1, ci->ren2_other.path,
- o->branch2, c2->path);
+ if (merge_file_special_markers(o, a, c1, &ci->ren1_other,
+ o->branch1, c1->path,
+ o->branch2, ci->ren1_other.path, &mfi_c1) ||
+ merge_file_special_markers(o, b, &ci->ren2_other, c2,
+ o->branch1, ci->ren2_other.path,
+ o->branch2, c2->path, &mfi_c2))
+ return -1;
if (o->call_depth) {
/*
@@ -1258,19 +1315,25 @@ static void conflict_rename_rename_2to1(struct merge_options *o,
* again later for the non-recursive merge.
*/
remove_file(o, 0, path, 0);
- update_file(o, 0, mfi_c1.sha, mfi_c1.mode, a->path);
- update_file(o, 0, mfi_c2.sha, mfi_c2.mode, b->path);
+ ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, a->path);
+ if (!ret)
+ ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode,
+ b->path);
} else {
char *new_path1 = unique_path(o, path, ci->branch1);
char *new_path2 = unique_path(o, path, ci->branch2);
output(o, 1, _("Renaming %s to %s and %s to %s instead"),
a->path, new_path1, b->path, new_path2);
remove_file(o, 0, path, 0);
- update_file(o, 0, mfi_c1.sha, mfi_c1.mode, new_path1);
- update_file(o, 0, mfi_c2.sha, mfi_c2.mode, new_path2);
+ ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, new_path1);
+ if (!ret)
+ ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode,
+ new_path2);
free(new_path2);
free(new_path1);
}
+
+ return ret;
}
static int process_renames(struct merge_options *o,
@@ -1348,7 +1411,7 @@ static int process_renames(struct merge_options *o,
const char *ren2_dst = ren2->pair->two->path;
enum rename_type rename_type;
if (strcmp(ren1_src, ren2_src) != 0)
- die("ren1_src != ren2_src");
+ die("BUG: ren1_src != ren2_src");
ren2->dst_entry->processed = 1;
ren2->processed = 1;
if (strcmp(ren1_dst, ren2_dst) != 0) {
@@ -1382,7 +1445,7 @@ static int process_renames(struct merge_options *o,
ren2 = lookup->util;
ren2_dst = ren2->pair->two->path;
if (strcmp(ren1_dst, ren2_dst) != 0)
- die("ren1_dst != ren2_dst");
+ die("BUG: ren1_dst != ren2_dst");
clean_merge = 0;
ren2->processed = 1;
@@ -1426,13 +1489,15 @@ static int process_renames(struct merge_options *o,
remove_file(o, 1, ren1_src,
renamed_stage == 2 || !was_tracked(ren1_src));
- hashcpy(src_other.sha1, ren1->src_entry->stages[other_stage].sha);
+ oidcpy(&src_other.oid,
+ &ren1->src_entry->stages[other_stage].oid);
src_other.mode = ren1->src_entry->stages[other_stage].mode;
- hashcpy(dst_other.sha1, ren1->dst_entry->stages[other_stage].sha);
+ oidcpy(&dst_other.oid,
+ &ren1->dst_entry->stages[other_stage].oid);
dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
try_merge = 0;
- if (sha_eq(src_other.sha1, null_sha1)) {
+ if (oid_eq(&src_other.oid, &null_oid)) {
setup_rename_conflict_info(RENAME_DELETE,
ren1->pair,
NULL,
@@ -1444,7 +1509,7 @@ static int process_renames(struct merge_options *o,
NULL,
NULL);
} else if ((dst_other.mode == ren1->pair->two->mode) &&
- sha_eq(dst_other.sha1, ren1->pair->two->sha1)) {
+ oid_eq(&dst_other.oid, &ren1->pair->two->oid)) {
/*
* Added file on the other side identical to
* the file being renamed: clean merge.
@@ -1453,13 +1518,14 @@ static int process_renames(struct merge_options *o,
* update_file_flags() instead of
* update_file().
*/
- update_file_flags(o,
- ren1->pair->two->sha1,
- ren1->pair->two->mode,
- ren1_dst,
- 1, /* update_cache */
- 0 /* update_wd */);
- } else if (!sha_eq(dst_other.sha1, null_sha1)) {
+ if (update_file_flags(o,
+ &ren1->pair->two->oid,
+ ren1->pair->two->mode,
+ ren1_dst,
+ 1, /* update_cache */
+ 0 /* update_wd */))
+ clean_merge = -1;
+ } else if (!oid_eq(&dst_other.oid, &null_oid)) {
clean_merge = 0;
try_merge = 1;
output(o, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
@@ -1468,22 +1534,33 @@ static int process_renames(struct merge_options *o,
ren1_dst, branch2);
if (o->call_depth) {
struct merge_file_info mfi;
- mfi = merge_file_one(o, ren1_dst, null_sha1, 0,
- ren1->pair->two->sha1, ren1->pair->two->mode,
- dst_other.sha1, dst_other.mode,
- branch1, branch2);
+ if (merge_file_one(o, ren1_dst, &null_oid, 0,
+ &ren1->pair->two->oid,
+ ren1->pair->two->mode,
+ &dst_other.oid,
+ dst_other.mode,
+ branch1, branch2, &mfi)) {
+ clean_merge = -1;
+ goto cleanup_and_return;
+ }
output(o, 1, _("Adding merged %s"), ren1_dst);
- update_file(o, 0, mfi.sha, mfi.mode, ren1_dst);
+ if (update_file(o, 0, &mfi.oid,
+ mfi.mode, ren1_dst))
+ clean_merge = -1;
try_merge = 0;
} else {
char *new_path = unique_path(o, ren1_dst, branch2);
output(o, 1, _("Adding as %s instead"), new_path);
- update_file(o, 0, dst_other.sha1, dst_other.mode, new_path);
+ if (update_file(o, 0, &dst_other.oid,
+ dst_other.mode, new_path))
+ clean_merge = -1;
free(new_path);
}
} else
try_merge = 1;
+ if (clean_merge < 0)
+ goto cleanup_and_return;
if (try_merge) {
struct diff_filespec *one, *a, *b;
src_other.path = (char *)ren1_src;
@@ -1510,36 +1587,39 @@ static int process_renames(struct merge_options *o,
}
}
}
+cleanup_and_return:
string_list_clear(&a_by_dst, 0);
string_list_clear(&b_by_dst, 0);
return clean_merge;
}
-static unsigned char *stage_sha(const unsigned char *sha, unsigned mode)
+static struct object_id *stage_oid(const struct object_id *oid, unsigned mode)
{
- return (is_null_sha1(sha) || mode == 0) ? NULL: (unsigned char *)sha;
+ return (is_null_oid(oid) || mode == 0) ? NULL: (struct object_id *)oid;
}
-static int read_sha1_strbuf(const unsigned char *sha1, struct strbuf *dst)
+static int read_oid_strbuf(struct merge_options *o,
+ const struct object_id *oid, struct strbuf *dst)
{
void *buf;
enum object_type type;
unsigned long size;
- buf = read_sha1_file(sha1, &type, &size);
+ buf = read_sha1_file(oid->hash, &type, &size);
if (!buf)
- return error(_("cannot read object %s"), sha1_to_hex(sha1));
+ return err(o, _("cannot read object %s"), oid_to_hex(oid));
if (type != OBJ_BLOB) {
free(buf);
- return error(_("object %s is not a blob"), sha1_to_hex(sha1));
+ return err(o, _("object %s is not a blob"), oid_to_hex(oid));
}
strbuf_attach(dst, buf, size, size + 1);
return 0;
}
-static int blob_unchanged(const unsigned char *o_sha,
+static int blob_unchanged(struct merge_options *opt,
+ const struct object_id *o_oid,
unsigned o_mode,
- const unsigned char *a_sha,
+ const struct object_id *a_oid,
unsigned a_mode,
int renormalize, const char *path)
{
@@ -1549,13 +1629,13 @@ static int blob_unchanged(const unsigned char *o_sha,
if (a_mode != o_mode)
return 0;
- if (sha_eq(o_sha, a_sha))
+ if (oid_eq(o_oid, a_oid))
return 1;
if (!renormalize)
return 0;
- assert(o_sha && a_sha);
- if (read_sha1_strbuf(o_sha, &o) || read_sha1_strbuf(a_sha, &a))
+ assert(o_oid && a_oid);
+ if (read_oid_strbuf(opt, o_oid, &o) || read_oid_strbuf(opt, a_oid, &a))
goto error_return;
/*
* Note: binary | is used so that both renormalizations are
@@ -1572,25 +1652,25 @@ error_return:
return ret;
}
-static void handle_modify_delete(struct merge_options *o,
+static int handle_modify_delete(struct merge_options *o,
const char *path,
- unsigned char *o_sha, int o_mode,
- unsigned char *a_sha, int a_mode,
- unsigned char *b_sha, int b_mode)
+ struct object_id *o_oid, int o_mode,
+ struct object_id *a_oid, int a_mode,
+ struct object_id *b_oid, int b_mode)
{
- handle_change_delete(o,
- path,
- o_sha, o_mode,
- a_sha, a_mode,
- b_sha, b_mode,
- _("modify"), _("modified"));
+ return handle_change_delete(o,
+ path,
+ o_oid, o_mode,
+ a_oid, a_mode,
+ b_oid, b_mode,
+ _("modify"), _("modified"));
}
static int merge_content(struct merge_options *o,
const char *path,
- unsigned char *o_sha, int o_mode,
- unsigned char *a_sha, int a_mode,
- unsigned char *b_sha, int b_mode,
+ struct object_id *o_oid, int o_mode,
+ struct object_id *a_oid, int a_mode,
+ struct object_id *b_oid, int b_mode,
struct rename_conflict_info *rename_conflict_info)
{
const char *reason = _("content");
@@ -1599,16 +1679,16 @@ static int merge_content(struct merge_options *o,
struct diff_filespec one, a, b;
unsigned df_conflict_remains = 0;
- if (!o_sha) {
+ if (!o_oid) {
reason = _("add/add");
- o_sha = (unsigned char *)null_sha1;
+ o_oid = (struct object_id *)&null_oid;
}
one.path = a.path = b.path = (char *)path;
- hashcpy(one.sha1, o_sha);
+ oidcpy(&one.oid, o_oid);
one.mode = o_mode;
- hashcpy(a.sha1, a_sha);
+ oidcpy(&a.oid, a_oid);
a.mode = a_mode;
- hashcpy(b.sha1, b_sha);
+ oidcpy(&b.oid, b_oid);
b.mode = b_mode;
if (rename_conflict_info) {
@@ -1627,12 +1707,13 @@ static int merge_content(struct merge_options *o,
if (dir_in_way(path, !o->call_depth))
df_conflict_remains = 1;
}
- mfi = merge_file_special_markers(o, &one, &a, &b,
- o->branch1, path1,
- o->branch2, path2);
+ if (merge_file_special_markers(o, &one, &a, &b,
+ o->branch1, path1,
+ o->branch2, path2, &mfi))
+ return -1;
if (mfi.clean && !df_conflict_remains &&
- sha_eq(mfi.sha, a_sha) && mfi.mode == a_mode) {
+ oid_eq(&mfi.oid, a_oid) && mfi.mode == a_mode) {
int path_renamed_outside_HEAD;
output(o, 3, _("Skipped %s (merged same as existing)"), path);
/*
@@ -1643,7 +1724,7 @@ static int merge_content(struct merge_options *o,
*/
path_renamed_outside_HEAD = !path2 || !strcmp(path, path2);
if (!path_renamed_outside_HEAD) {
- add_cacheinfo(mfi.mode, mfi.sha, path,
+ add_cacheinfo(o, mfi.mode, &mfi.oid, path,
0, (!o->call_depth), 0);
return mfi.clean;
}
@@ -1656,7 +1737,8 @@ static int merge_content(struct merge_options *o,
output(o, 1, _("CONFLICT (%s): Merge conflict in %s"),
reason, path);
if (rename_conflict_info && !df_conflict_remains)
- update_stages(path, &one, &a, &b);
+ if (update_stages(o, path, &one, &a, &b))
+ return -1;
}
if (df_conflict_remains) {
@@ -1664,30 +1746,33 @@ static int merge_content(struct merge_options *o,
if (o->call_depth) {
remove_file_from_cache(path);
} else {
- if (!mfi.clean)
- update_stages(path, &one, &a, &b);
- else {
+ if (!mfi.clean) {
+ if (update_stages(o, path, &one, &a, &b))
+ return -1;
+ } else {
int file_from_stage2 = was_tracked(path);
struct diff_filespec merged;
- hashcpy(merged.sha1, mfi.sha);
+ oidcpy(&merged.oid, &mfi.oid);
merged.mode = mfi.mode;
- update_stages(path, NULL,
- file_from_stage2 ? &merged : NULL,
- file_from_stage2 ? NULL : &merged);
+ if (update_stages(o, path, NULL,
+ file_from_stage2 ? &merged : NULL,
+ file_from_stage2 ? NULL : &merged))
+ return -1;
}
}
new_path = unique_path(o, path, rename_conflict_info->branch1);
output(o, 1, _("Adding as %s instead"), new_path);
- update_file(o, 0, mfi.sha, mfi.mode, new_path);
+ if (update_file(o, 0, &mfi.oid, mfi.mode, new_path)) {
+ free(new_path);
+ return -1;
+ }
free(new_path);
mfi.clean = 0;
- } else {
- update_file(o, mfi.clean, mfi.sha, mfi.mode, path);
- }
+ } else if (update_file(o, mfi.clean, &mfi.oid, mfi.mode, path))
+ return -1;
return mfi.clean;
-
}
/* Per entry merge function */
@@ -1699,9 +1784,9 @@ static int process_entry(struct merge_options *o,
unsigned o_mode = entry->stages[1].mode;
unsigned a_mode = entry->stages[2].mode;
unsigned b_mode = entry->stages[3].mode;
- unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode);
- unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
- unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode);
+ struct object_id *o_oid = stage_oid(&entry->stages[1].oid, o_mode);
+ struct object_id *a_oid = stage_oid(&entry->stages[2].oid, a_mode);
+ struct object_id *b_oid = stage_oid(&entry->stages[3].oid, b_mode);
entry->processed = 1;
if (entry->rename_conflict_info) {
@@ -1710,66 +1795,71 @@ static int process_entry(struct merge_options *o,
case RENAME_NORMAL:
case RENAME_ONE_FILE_TO_ONE:
clean_merge = merge_content(o, path,
- o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
+ o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
conflict_info);
break;
case RENAME_DELETE:
clean_merge = 0;
- conflict_rename_delete(o, conflict_info->pair1,
- conflict_info->branch1,
- conflict_info->branch2);
+ if (conflict_rename_delete(o,
+ conflict_info->pair1,
+ conflict_info->branch1,
+ conflict_info->branch2))
+ clean_merge = -1;
break;
case RENAME_ONE_FILE_TO_TWO:
clean_merge = 0;
- conflict_rename_rename_1to2(o, conflict_info);
+ if (conflict_rename_rename_1to2(o, conflict_info))
+ clean_merge = -1;
break;
case RENAME_TWO_FILES_TO_ONE:
clean_merge = 0;
- conflict_rename_rename_2to1(o, conflict_info);
+ if (conflict_rename_rename_2to1(o, conflict_info))
+ clean_merge = -1;
break;
default:
entry->processed = 0;
break;
}
- } else if (o_sha && (!a_sha || !b_sha)) {
+ } else if (o_oid && (!a_oid || !b_oid)) {
/* Case A: Deleted in one */
- if ((!a_sha && !b_sha) ||
- (!b_sha && blob_unchanged(o_sha, o_mode, a_sha, a_mode, normalize, path)) ||
- (!a_sha && blob_unchanged(o_sha, o_mode, b_sha, b_mode, normalize, path))) {
+ if ((!a_oid && !b_oid) ||
+ (!b_oid && blob_unchanged(o, o_oid, o_mode, a_oid, a_mode, normalize, path)) ||
+ (!a_oid && blob_unchanged(o, o_oid, o_mode, b_oid, b_mode, normalize, path))) {
/* Deleted in both or deleted in one and
* unchanged in the other */
- if (a_sha)
+ if (a_oid)
output(o, 2, _("Removing %s"), path);
/* do not touch working file if it did not exist */
- remove_file(o, 1, path, !a_sha);
+ remove_file(o, 1, path, !a_oid);
} else {
/* Modify/delete; deleted side may have put a directory in the way */
clean_merge = 0;
- handle_modify_delete(o, path, o_sha, o_mode,
- a_sha, a_mode, b_sha, b_mode);
+ if (handle_modify_delete(o, path, o_oid, o_mode,
+ a_oid, a_mode, b_oid, b_mode))
+ clean_merge = -1;
}
- } else if ((!o_sha && a_sha && !b_sha) ||
- (!o_sha && !a_sha && b_sha)) {
+ } else if ((!o_oid && a_oid && !b_oid) ||
+ (!o_oid && !a_oid && b_oid)) {
/* Case B: Added in one. */
/* [nothing|directory] -> ([nothing|directory], file) */
const char *add_branch;
const char *other_branch;
unsigned mode;
- const unsigned char *sha;
+ const struct object_id *oid;
const char *conf;
- if (a_sha) {
+ if (a_oid) {
add_branch = o->branch1;
other_branch = o->branch2;
mode = a_mode;
- sha = a_sha;
+ oid = a_oid;
conf = _("file/directory");
} else {
add_branch = o->branch2;
other_branch = o->branch1;
mode = b_mode;
- sha = b_sha;
+ oid = b_oid;
conf = _("directory/file");
}
if (dir_in_way(path, !o->call_depth)) {
@@ -1778,29 +1868,31 @@ static int process_entry(struct merge_options *o,
output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
"Adding %s as %s"),
conf, path, other_branch, path, new_path);
- update_file(o, 0, sha, mode, new_path);
- if (o->call_depth)
+ if (update_file(o, 0, oid, mode, new_path))
+ clean_merge = -1;
+ else if (o->call_depth)
remove_file_from_cache(path);
free(new_path);
} else {
output(o, 2, _("Adding %s"), path);
/* do not overwrite file if already present */
- update_file_flags(o, sha, mode, path, 1, !a_sha);
+ if (update_file_flags(o, oid, mode, path, 1, !a_oid))
+ clean_merge = -1;
}
- } else if (a_sha && b_sha) {
+ } else if (a_oid && b_oid) {
/* Case C: Added in both (check for same permissions) and */
/* case D: Modified in both, but differently. */
clean_merge = merge_content(o, path,
- o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
+ o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
NULL);
- } else if (!o_sha && !a_sha && !b_sha) {
+ } else if (!o_oid && !a_oid && !b_oid) {
/*
* this entry was deleted altogether. a_mode == 0 means
* we had that path and want to actively remove it.
*/
remove_file(o, 1, path, !a_mode);
} else
- die(_("Fatal merge failure, shouldn't happen."));
+ die("BUG: fatal merge failure, shouldn't happen.");
return clean_merge;
}
@@ -1818,7 +1910,7 @@ int merge_trees(struct merge_options *o,
common = shift_tree_object(head, common, o->subtree_shift);
}
- if (sha_eq(common->object.oid.hash, merge->object.oid.hash)) {
+ if (oid_eq(&common->object.oid, &merge->object.oid)) {
output(o, 0, _("Already up-to-date!"));
*result = head;
return 1;
@@ -1828,11 +1920,10 @@ int merge_trees(struct merge_options *o,
if (code != 0) {
if (show(o, 4) || o->call_depth)
- die(_("merging of trees %s and %s failed"),
+ err(o, _("merging of trees %s and %s failed"),
oid_to_hex(&head->object.oid),
oid_to_hex(&merge->object.oid));
- else
- exit(128);
+ return -1;
}
if (unmerged_cache()) {
@@ -1848,17 +1939,23 @@ int merge_trees(struct merge_options *o,
re_head = get_renames(o, head, common, head, merge, entries);
re_merge = get_renames(o, merge, common, head, merge, entries);
clean = process_renames(o, re_head, re_merge);
+ if (clean < 0)
+ return clean;
for (i = entries->nr-1; 0 <= i; i--) {
const char *path = entries->items[i].string;
struct stage_data *e = entries->items[i].util;
- if (!e->processed
- && !process_entry(o, path, e))
- clean = 0;
+ if (!e->processed) {
+ int ret = process_entry(o, path, e);
+ if (!ret)
+ clean = 0;
+ else if (ret < 0)
+ return ret;
+ }
}
for (i = 0; i < entries->nr; i++) {
struct stage_data *e = entries->items[i].util;
if (!e->processed)
- die(_("Unprocessed path??? %s"),
+ die("BUG: unprocessed path??? %s",
entries->items[i].string);
}
@@ -1873,8 +1970,8 @@ int merge_trees(struct merge_options *o,
else
clean = 1;
- if (o->call_depth)
- *result = write_tree_from_memory(o);
+ if (o->call_depth && !(*result = write_tree_from_memory(o)))
+ return -1;
return clean;
}
@@ -1940,23 +2037,25 @@ int merge_recursive(struct merge_options *o,
/*
* When the merge fails, the result contains files
* with conflict markers. The cleanness flag is
- * ignored, it was never actually used, as result of
- * merge_trees has always overwritten it: the committed
- * "conflicts" were already resolved.
+ * ignored (unless indicating an error), it was never
+ * actually used, as result of merge_trees has always
+ * overwritten it: the committed "conflicts" were
+ * already resolved.
*/
discard_cache();
saved_b1 = o->branch1;
saved_b2 = o->branch2;
o->branch1 = "Temporary merge branch 1";
o->branch2 = "Temporary merge branch 2";
- merge_recursive(o, merged_common_ancestors, iter->item,
- NULL, &merged_common_ancestors);
+ if (merge_recursive(o, merged_common_ancestors, iter->item,
+ NULL, &merged_common_ancestors) < 0)
+ return -1;
o->branch1 = saved_b1;
o->branch2 = saved_b2;
o->call_depth--;
if (!merged_common_ancestors)
- die(_("merge returned no commit"));
+ return err(o, _("merge returned no commit"));
}
discard_cache();
@@ -1966,6 +2065,10 @@ int merge_recursive(struct merge_options *o,
o->ancestor = "merged common ancestors";
clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
&mrtree);
+ if (clean < 0) {
+ flush_output(o);
+ return clean;
+ }
if (o->call_depth) {
*result = make_virtual_commit(mrtree, "merged tree");
@@ -1973,17 +2076,19 @@ int merge_recursive(struct merge_options *o,
commit_list_insert(h2, &(*result)->parents->next);
}
flush_output(o);
+ if (!o->call_depth && o->buffer_output < 2)
+ strbuf_release(&o->obuf);
if (show(o, 2))
diff_warn_rename_limit("merge.renamelimit",
o->needed_rename_limit, 0);
return clean;
}
-static struct commit *get_ref(const unsigned char *sha1, const char *name)
+static struct commit *get_ref(const struct object_id *oid, const char *name)
{
struct object *object;
- object = deref_tag(parse_object(sha1), name, strlen(name));
+ object = deref_tag(parse_object(oid->hash), name, strlen(name));
if (!object)
return NULL;
if (object->type == OBJ_TREE)
@@ -1996,10 +2101,10 @@ static struct commit *get_ref(const unsigned char *sha1, const char *name)
}
int merge_recursive_generic(struct merge_options *o,
- const unsigned char *head,
- const unsigned char *merge,
+ const struct object_id *head,
+ const struct object_id *merge,
int num_base_list,
- const unsigned char **base_list,
+ const struct object_id **base_list,
struct commit **result)
{
int clean;
@@ -2012,9 +2117,9 @@ int merge_recursive_generic(struct merge_options *o,
int i;
for (i = 0; i < num_base_list; ++i) {
struct commit *base;
- if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i]))))
- return error(_("Could not parse object '%s'"),
- sha1_to_hex(base_list[i]));
+ if (!(base = get_ref(base_list[i], oid_to_hex(base_list[i]))))
+ return err(o, _("Could not parse object '%s'"),
+ oid_to_hex(base_list[i]));
commit_list_insert(base, &ca);
}
}
@@ -2022,9 +2127,12 @@ int merge_recursive_generic(struct merge_options *o,
hold_locked_index(lock, 1);
clean = merge_recursive(o, head_commit, next_commit, ca,
result);
+ if (clean < 0)
+ return clean;
+
if (active_cache_changed &&
write_locked_index(&the_index, lock, COMMIT_LOCK))
- return error(_("Unable to write index."));
+ return err(o, _("Unable to write index."));
return clean ? 0 : 1;
}
diff --git a/merge-recursive.h b/merge-recursive.h
index 52f0201..735343b 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -13,7 +13,7 @@ struct merge_options {
MERGE_RECURSIVE_THEIRS
} recursive_variant;
const char *subtree_shift;
- unsigned buffer_output : 1;
+ unsigned buffer_output; /* 1: output at end, 2: keep buffered */
unsigned renormalize : 1;
long xdl_opts;
int verbosity;
@@ -49,10 +49,10 @@ int merge_trees(struct merge_options *o,
* virtual commits and call merge_recursive() proper.
*/
int merge_recursive_generic(struct merge_options *o,
- const unsigned char *head,
- const unsigned char *merge,
+ const struct object_id *head,
+ const struct object_id *merge,
int num_ca,
- const unsigned char **ca,
+ const struct object_id **ca,
struct commit **result);
void init_merge_options(struct merge_options *o);
diff --git a/mru.c b/mru.c
new file mode 100644
index 0000000..9dedae0
--- /dev/null
+++ b/mru.c
@@ -0,0 +1,50 @@
+#include "cache.h"
+#include "mru.h"
+
+void mru_append(struct mru *mru, void *item)
+{
+ struct mru_entry *cur = xmalloc(sizeof(*cur));
+ cur->item = item;
+ cur->prev = mru->tail;
+ cur->next = NULL;
+
+ if (mru->tail)
+ mru->tail->next = cur;
+ else
+ mru->head = cur;
+ mru->tail = cur;
+}
+
+void mru_mark(struct mru *mru, struct mru_entry *entry)
+{
+ /* If we're already at the front of the list, nothing to do */
+ if (mru->head == entry)
+ return;
+
+ /* Otherwise, remove us from our current slot... */
+ if (entry->prev)
+ entry->prev->next = entry->next;
+ if (entry->next)
+ entry->next->prev = entry->prev;
+ else
+ mru->tail = entry->prev;
+
+ /* And insert us at the beginning. */
+ entry->prev = NULL;
+ entry->next = mru->head;
+ if (mru->head)
+ mru->head->prev = entry;
+ mru->head = entry;
+}
+
+void mru_clear(struct mru *mru)
+{
+ struct mru_entry *p = mru->head;
+
+ while (p) {
+ struct mru_entry *to_free = p;
+ p = p->next;
+ free(to_free);
+ }
+ mru->head = mru->tail = NULL;
+}
diff --git a/mru.h b/mru.h
new file mode 100644
index 0000000..42e4aea
--- /dev/null
+++ b/mru.h
@@ -0,0 +1,45 @@
+#ifndef MRU_H
+#define MRU_H
+
+/**
+ * A simple most-recently-used cache, backed by a doubly-linked list.
+ *
+ * Usage is roughly:
+ *
+ * // Create a list. Zero-initialization is required.
+ * static struct mru cache;
+ * mru_append(&cache, item);
+ * ...
+ *
+ * // Iterate in MRU order.
+ * struct mru_entry *p;
+ * for (p = cache.head; p; p = p->next) {
+ * if (matches(p->item))
+ * break;
+ * }
+ *
+ * // Mark an item as used, moving it to the front of the list.
+ * mru_mark(&cache, p);
+ *
+ * // Reset the list to empty, cleaning up all resources.
+ * mru_clear(&cache);
+ *
+ * Note that you SHOULD NOT call mru_mark() and then continue traversing the
+ * list; it reorders the marked item to the front of the list, and therefore
+ * you will begin traversing the whole list again.
+ */
+
+struct mru_entry {
+ void *item;
+ struct mru_entry *prev, *next;
+};
+
+struct mru {
+ struct mru_entry *head, *tail;
+};
+
+void mru_append(struct mru *mru, void *item);
+void mru_mark(struct mru *mru, struct mru_entry *entry);
+void mru_clear(struct mru *mru);
+
+#endif /* MRU_H */
diff --git a/notes-merge.c b/notes-merge.c
index f000595..97fc42f 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -41,14 +41,14 @@ static int verify_notes_filepair(struct diff_filepair *p, unsigned char *sha1)
switch (p->status) {
case DIFF_STATUS_MODIFIED:
assert(p->one->mode == p->two->mode);
- assert(!is_null_sha1(p->one->sha1));
- assert(!is_null_sha1(p->two->sha1));
+ assert(!is_null_oid(&p->one->oid));
+ assert(!is_null_oid(&p->two->oid));
break;
case DIFF_STATUS_ADDED:
- assert(is_null_sha1(p->one->sha1));
+ assert(is_null_oid(&p->one->oid));
break;
case DIFF_STATUS_DELETED:
- assert(is_null_sha1(p->two->sha1));
+ assert(is_null_oid(&p->two->oid));
break;
default:
return -1;
@@ -142,27 +142,27 @@ static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o,
if (verify_notes_filepair(p, obj)) {
trace_printf("\t\tCannot merge entry '%s' (%c): "
"%.7s -> %.7s. Skipping!\n", p->one->path,
- p->status, sha1_to_hex(p->one->sha1),
- sha1_to_hex(p->two->sha1));
+ p->status, oid_to_hex(&p->one->oid),
+ oid_to_hex(&p->two->oid));
continue;
}
mp = find_notes_merge_pair_pos(changes, len, obj, 1, &occupied);
if (occupied) {
/* We've found an addition/deletion pair */
assert(!hashcmp(mp->obj, obj));
- if (is_null_sha1(p->one->sha1)) { /* addition */
+ if (is_null_oid(&p->one->oid)) { /* addition */
assert(is_null_sha1(mp->remote));
- hashcpy(mp->remote, p->two->sha1);
- } else if (is_null_sha1(p->two->sha1)) { /* deletion */
+ hashcpy(mp->remote, p->two->oid.hash);
+ } else if (is_null_oid(&p->two->oid)) { /* deletion */
assert(is_null_sha1(mp->base));
- hashcpy(mp->base, p->one->sha1);
+ hashcpy(mp->base, p->one->oid.hash);
} else
assert(!"Invalid existing change recorded");
} else {
hashcpy(mp->obj, obj);
- hashcpy(mp->base, p->one->sha1);
+ hashcpy(mp->base, p->one->oid.hash);
hashcpy(mp->local, uninitialized);
- hashcpy(mp->remote, p->two->sha1);
+ hashcpy(mp->remote, p->two->oid.hash);
len++;
}
trace_printf("\t\tStored remote change for %s: %.7s -> %.7s\n",
@@ -170,7 +170,7 @@ static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o,
sha1_to_hex(mp->remote));
}
diff_flush(&opt);
- free_pathspec(&opt.pathspec);
+ clear_pathspec(&opt.pathspec);
*num_changes = len;
return changes;
@@ -203,21 +203,21 @@ static void diff_tree_local(struct notes_merge_options *o,
if (verify_notes_filepair(p, obj)) {
trace_printf("\t\tCannot merge entry '%s' (%c): "
"%.7s -> %.7s. Skipping!\n", p->one->path,
- p->status, sha1_to_hex(p->one->sha1),
- sha1_to_hex(p->two->sha1));
+ p->status, oid_to_hex(&p->one->oid),
+ oid_to_hex(&p->two->oid));
continue;
}
mp = find_notes_merge_pair_pos(changes, len, obj, 0, &match);
if (!match) {
trace_printf("\t\tIgnoring local-only change for %s: "
"%.7s -> %.7s\n", sha1_to_hex(obj),
- sha1_to_hex(p->one->sha1),
- sha1_to_hex(p->two->sha1));
+ oid_to_hex(&p->one->oid),
+ oid_to_hex(&p->two->oid));
continue;
}
assert(!hashcmp(mp->obj, obj));
- if (is_null_sha1(p->two->sha1)) { /* deletion */
+ if (is_null_oid(&p->two->oid)) { /* deletion */
/*
* Either this is a true deletion (1), or it is part
* of an A/D pair (2), or D/A pair (3):
@@ -229,7 +229,7 @@ static void diff_tree_local(struct notes_merge_options *o,
*/
if (!hashcmp(mp->local, uninitialized))
hashclr(mp->local);
- } else if (is_null_sha1(p->one->sha1)) { /* addition */
+ } else if (is_null_oid(&p->one->oid)) { /* addition */
/*
* Either this is a true addition (1), or it is part
* of an A/D pair (2), or D/A pair (3):
@@ -240,23 +240,23 @@ static void diff_tree_local(struct notes_merge_options *o,
*/
assert(is_null_sha1(mp->local) ||
!hashcmp(mp->local, uninitialized));
- hashcpy(mp->local, p->two->sha1);
+ hashcpy(mp->local, p->two->oid.hash);
} else { /* modification */
/*
* This is a true modification. p->one->sha1 shall
* match mp->base, and mp->local shall be uninitialized.
* Set mp->local to p->two->sha1.
*/
- assert(!hashcmp(p->one->sha1, mp->base));
+ assert(!hashcmp(p->one->oid.hash, mp->base));
assert(!hashcmp(mp->local, uninitialized));
- hashcpy(mp->local, p->two->sha1);
+ hashcpy(mp->local, p->two->oid.hash);
}
trace_printf("\t\tStored local change for %s: %.7s -> %.7s\n",
sha1_to_hex(mp->obj), sha1_to_hex(mp->base),
sha1_to_hex(mp->local));
}
diff_flush(&opt);
- free_pathspec(&opt.pathspec);
+ clear_pathspec(&opt.pathspec);
}
static void check_notes_merge_worktree(struct notes_merge_options *o)
diff --git a/notes.c b/notes.c
index e4e4854..df4660f 100644
--- a/notes.c
+++ b/notes.c
@@ -70,7 +70,7 @@ struct non_note {
struct notes_tree default_notes_tree;
-static struct string_list display_notes_refs;
+static struct string_list display_notes_refs = STRING_LIST_INIT_NODUP;
static struct notes_tree **display_notes_trees;
static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,
diff --git a/pack-check.c b/pack-check.c
index d123846..c5c7763 100644
--- a/pack-check.c
+++ b/pack-check.c
@@ -57,11 +57,8 @@ static int verify_packfile(struct packed_git *p,
int err = 0;
struct idx_entry *entries;
- /* Note that the pack header checks are actually performed by
- * use_pack when it first opens the pack file. If anything
- * goes wrong during those checks then the call will die out
- * immediately.
- */
+ if (!is_pack_valid(p))
+ return error("packfile %s cannot be accessed", p->pack_name);
git_SHA1_Init(&ctx);
do {
diff --git a/pack-revindex.c b/pack-revindex.c
index 96d51c3..6bc7c94 100644
--- a/pack-revindex.c
+++ b/pack-revindex.c
@@ -107,7 +107,7 @@ static void sort_revindex(struct revindex_entry *entries, unsigned n, off_t max)
* we have to move it back from the temporary storage.
*/
if (from != entries)
- memcpy(entries, tmp, n * sizeof(*entries));
+ COPY_ARRAY(entries, tmp, n);
free(tmp);
free(pos);
diff --git a/pack-write.c b/pack-write.c
index 33293ce..ea0b788 100644
--- a/pack-write.c
+++ b/pack-write.c
@@ -354,7 +354,6 @@ void finish_tmp_packfile(struct strbuf *name_buffer,
die_errno("unable to make temporary index file readable");
strbuf_addf(name_buffer, "%s.pack", sha1_to_hex(sha1));
- free_pack_by_name(name_buffer->buf);
if (rename(pack_tmp_name, name_buffer->buf))
die_errno("unable to rename temporary pack file");
diff --git a/pager.c b/pager.c
index 4bc0481..6470b81 100644
--- a/pager.c
+++ b/pager.c
@@ -63,14 +63,38 @@ const char *git_pager(int stdout_is_tty)
return pager;
}
+static void setup_pager_env(struct argv_array *env)
+{
+ const char **argv;
+ int i;
+ char *pager_env = xstrdup(PAGER_ENV);
+ int n = split_cmdline(pager_env, &argv);
+
+ if (n < 0)
+ die("malformed build-time PAGER_ENV: %s",
+ split_cmdline_strerror(n));
+
+ for (i = 0; i < n; i++) {
+ char *cp = strchr(argv[i], '=');
+
+ if (!cp)
+ die("malformed build-time PAGER_ENV");
+
+ *cp = '\0';
+ if (!getenv(argv[i])) {
+ *cp = '=';
+ argv_array_push(env, argv[i]);
+ }
+ }
+ free(pager_env);
+ free(argv);
+}
+
void prepare_pager_args(struct child_process *pager_process, const char *pager)
{
argv_array_push(&pager_process->args, pager);
pager_process->use_shell = 1;
- if (!getenv("LESS"))
- argv_array_push(&pager_process->env_array, "LESS=FRX");
- if (!getenv("LV"))
- argv_array_push(&pager_process->env_array, "LV=-c");
+ setup_pager_env(&pager_process->env_array);
}
void setup_pager(void)
diff --git a/parse-options-cb.c b/parse-options-cb.c
index 2d87520..1681883 100644
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -149,7 +149,7 @@ int parse_opt_string_list(const struct option *opt, const char *arg, int unset)
if (!arg)
return -1;
- string_list_append(v, xstrdup(arg));
+ string_list_append(v, arg);
return 0;
}
@@ -199,8 +199,7 @@ int parse_opt_passthru(const struct option *opt, const char *arg, int unset)
if (recreate_opt(&sb, opt, arg, unset) < 0)
return -1;
- if (*opt_value)
- free(*opt_value);
+ free(*opt_value);
*opt_value = strbuf_detach(&sb, NULL);
diff --git a/patch-ids.c b/patch-ids.c
index a4d0016..ce285c2 100644
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -4,102 +4,111 @@
#include "sha1-lookup.h"
#include "patch-ids.h"
+static int patch_id_defined(struct commit *commit)
+{
+ /* must be 0 or 1 parents */
+ return !commit->parents || !commit->parents->next;
+}
+
int commit_patch_id(struct commit *commit, struct diff_options *options,
- unsigned char *sha1)
+ unsigned char *sha1, int diff_header_only)
{
+ if (!patch_id_defined(commit))
+ return -1;
+
if (commit->parents)
diff_tree_sha1(commit->parents->item->object.oid.hash,
commit->object.oid.hash, "", options);
else
diff_root_tree_sha1(commit->object.oid.hash, "", options);
diffcore_std(options);
- return diff_flush_patch_id(options, sha1);
-}
-
-static const unsigned char *patch_id_access(size_t index, void *table)
-{
- struct patch_id **id_table = table;
- return id_table[index]->patch_id;
+ return diff_flush_patch_id(options, sha1, diff_header_only);
}
-static int patch_pos(struct patch_id **table, int nr, const unsigned char *id)
+/*
+ * When we cannot load the full patch-id for both commits for whatever
+ * reason, the function returns -1 (i.e. return error(...)). Despite
+ * the "cmp" in the name of this function, the caller only cares about
+ * the return value being zero (a and b are equivalent) or non-zero (a
+ * and b are different), and returning non-zero would keep both in the
+ * result, even if they actually were equivalent, in order to err on
+ * the side of safety. The actual value being negative does not have
+ * any significance; only that it is non-zero matters.
+ */
+static int patch_id_cmp(struct patch_id *a,
+ struct patch_id *b,
+ struct diff_options *opt)
{
- return sha1_pos(id, table, nr, patch_id_access);
+ if (is_null_sha1(a->patch_id) &&
+ commit_patch_id(a->commit, opt, a->patch_id, 0))
+ return error("Could not get patch ID for %s",
+ oid_to_hex(&a->commit->object.oid));
+ if (is_null_sha1(b->patch_id) &&
+ commit_patch_id(b->commit, opt, b->patch_id, 0))
+ return error("Could not get patch ID for %s",
+ oid_to_hex(&b->commit->object.oid));
+ return hashcmp(a->patch_id, b->patch_id);
}
-#define BUCKET_SIZE 190 /* 190 * 21 = 3990, with slop close enough to 4K */
-struct patch_id_bucket {
- struct patch_id_bucket *next;
- int nr;
- struct patch_id bucket[BUCKET_SIZE];
-};
-
int init_patch_ids(struct patch_ids *ids)
{
memset(ids, 0, sizeof(*ids));
diff_setup(&ids->diffopts);
+ ids->diffopts.detect_rename = 0;
DIFF_OPT_SET(&ids->diffopts, RECURSIVE);
diff_setup_done(&ids->diffopts);
+ hashmap_init(&ids->patches, (hashmap_cmp_fn)patch_id_cmp, 256);
return 0;
}
int free_patch_ids(struct patch_ids *ids)
{
- struct patch_id_bucket *next, *patches;
-
- free(ids->table);
- for (patches = ids->patches; patches; patches = next) {
- next = patches->next;
- free(patches);
- }
+ hashmap_free(&ids->patches, 1);
return 0;
}
-static struct patch_id *add_commit(struct commit *commit,
- struct patch_ids *ids,
- int no_add)
+static int init_patch_id_entry(struct patch_id *patch,
+ struct commit *commit,
+ struct patch_ids *ids)
{
- struct patch_id_bucket *bucket;
- struct patch_id *ent;
- unsigned char sha1[20];
- int pos;
-
- if (commit_patch_id(commit, &ids->diffopts, sha1))
- return NULL;
- pos = patch_pos(ids->table, ids->nr, sha1);
- if (0 <= pos)
- return ids->table[pos];
- if (no_add)
- return NULL;
+ unsigned char header_only_patch_id[GIT_SHA1_RAWSZ];
- pos = -1 - pos;
+ patch->commit = commit;
+ if (commit_patch_id(commit, &ids->diffopts, header_only_patch_id, 1))
+ return -1;
- bucket = ids->patches;
- if (!bucket || (BUCKET_SIZE <= bucket->nr)) {
- bucket = xcalloc(1, sizeof(*bucket));
- bucket->next = ids->patches;
- ids->patches = bucket;
- }
- ent = &bucket->bucket[bucket->nr++];
- hashcpy(ent->patch_id, sha1);
-
- ALLOC_GROW(ids->table, ids->nr + 1, ids->alloc);
- if (pos < ids->nr)
- memmove(ids->table + pos + 1, ids->table + pos,
- sizeof(ent) * (ids->nr - pos));
- ids->nr++;
- ids->table[pos] = ent;
- return ids->table[pos];
+ hashmap_entry_init(patch, sha1hash(header_only_patch_id));
+ return 0;
}
struct patch_id *has_commit_patch_id(struct commit *commit,
struct patch_ids *ids)
{
- return add_commit(commit, ids, 1);
+ struct patch_id patch;
+
+ if (!patch_id_defined(commit))
+ return NULL;
+
+ memset(&patch, 0, sizeof(patch));
+ if (init_patch_id_entry(&patch, commit, ids))
+ return NULL;
+
+ return hashmap_get(&ids->patches, &patch, &ids->diffopts);
}
struct patch_id *add_commit_patch_id(struct commit *commit,
struct patch_ids *ids)
{
- return add_commit(commit, ids, 0);
+ struct patch_id *key = xcalloc(1, sizeof(*key));
+
+ if (!patch_id_defined(commit))
+ return NULL;
+
+ if (init_patch_id_entry(key, commit, ids)) {
+ free(key);
+ return NULL;
+ }
+
+ hashmap_add(&ids->patches, key);
+ return key;
}
diff --git a/patch-ids.h b/patch-ids.h
index eeb56b3..0f34ea1 100644
--- a/patch-ids.h
+++ b/patch-ids.h
@@ -2,19 +2,18 @@
#define PATCH_IDS_H
struct patch_id {
- unsigned char patch_id[20];
- char seen;
+ struct hashmap_entry ent;
+ unsigned char patch_id[GIT_SHA1_RAWSZ];
+ struct commit *commit;
};
struct patch_ids {
+ struct hashmap patches;
struct diff_options diffopts;
- int nr, alloc;
- struct patch_id **table;
- struct patch_id_bucket *patches;
};
int commit_patch_id(struct commit *commit, struct diff_options *options,
- unsigned char *sha1);
+ unsigned char *sha1, int);
int init_patch_ids(struct patch_ids *);
int free_patch_ids(struct patch_ids *);
struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *);
diff --git a/path.c b/path.c
index 17551c4..9bfaeda 100644
--- a/path.c
+++ b/path.c
@@ -24,7 +24,8 @@ static struct strbuf *get_pathname(void)
STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT
};
static int index;
- struct strbuf *sb = &pathname_array[3 & ++index];
+ struct strbuf *sb = &pathname_array[index];
+ index = (index + 1) % ARRAY_SIZE(pathname_array);
strbuf_reset(sb);
return sb;
}
@@ -380,6 +381,8 @@ static void adjust_git_path(struct strbuf *buf, int git_dir_len)
get_index_file(), strlen(get_index_file()));
else if (git_db_env && dir_prefix(base, "objects"))
replace_dir(buf, git_dir_len + 7, get_object_directory());
+ else if (git_hooks_path && dir_prefix(base, "hooks"))
+ replace_dir(buf, git_dir_len + 5, git_hooks_path);
else if (git_common_dir_env)
update_common_dir(buf, git_dir_len, NULL);
}
diff --git a/pathspec.c b/pathspec.c
index c9e9b6c..49a5360 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -485,11 +485,10 @@ void copy_pathspec(struct pathspec *dst, const struct pathspec *src)
{
*dst = *src;
ALLOC_ARRAY(dst->items, dst->nr);
- memcpy(dst->items, src->items,
- sizeof(struct pathspec_item) * dst->nr);
+ COPY_ARRAY(dst->items, src->items, dst->nr);
}
-void free_pathspec(struct pathspec *pathspec)
+void clear_pathspec(struct pathspec *pathspec)
{
free(pathspec->items);
pathspec->items = NULL;
diff --git a/pathspec.h b/pathspec.h
index 0c11262..59809e4 100644
--- a/pathspec.h
+++ b/pathspec.h
@@ -19,7 +19,7 @@
#define PATHSPEC_ONESTAR 1 /* the pathspec pattern satisfies GFNM_ONESTAR */
struct pathspec {
- const char **_raw; /* get_pathspec() result, not freed by free_pathspec() */
+ const char **_raw; /* get_pathspec() result, not freed by clear_pathspec() */
int nr;
unsigned int has_wildcard:1;
unsigned int recursive:1;
@@ -74,7 +74,7 @@ extern void parse_pathspec(struct pathspec *pathspec,
const char *prefix,
const char **args);
extern void copy_pathspec(struct pathspec *dst, const struct pathspec *src);
-extern void free_pathspec(struct pathspec *);
+extern void clear_pathspec(struct pathspec *);
static inline int ps_strncmp(const struct pathspec_item *item,
const char *s1, const char *s2, size_t n)
@@ -96,7 +96,5 @@ static inline int ps_strcmp(const struct pathspec_item *item,
extern char *find_pathspecs_matching_against_index(const struct pathspec *pathspec);
extern void add_pathspec_matches_against_index(const struct pathspec *pathspec, char *seen);
-extern const char *check_path_for_gitlink(const char *path);
-extern void die_if_path_beyond_symlink(const char *path, const char *prefix);
#endif /* PATHSPEC_H */
diff --git a/perl/Git.pm b/perl/Git.pm
index ce7e4e8..864123f 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -871,6 +871,8 @@ Return an array of mailboxes extracted from a string.
=cut
+# Very close to Mail::Address's parser, but we still have minor
+# differences in some cases (see t9000 for examples).
sub parse_mailboxes {
my $re_comment = qr/\((?:[^)]*)\)/;
my $re_quote = qr/"(?:[^\"\\]|\\.)*"/;
@@ -879,6 +881,7 @@ sub parse_mailboxes {
# divide the string in tokens of the above form
my $re_token = qr/(?:$re_quote|$re_word|$re_comment|\S)/;
my @tokens = map { $_ =~ /\s*($re_token)\s*/g } @_;
+ my $end_of_addr_seen = 0;
# add a delimiter to simplify treatment for the last mailbox
push @tokens, ",";
@@ -888,10 +891,10 @@ sub parse_mailboxes {
if ($token =~ /^[,;]$/) {
# if buffer still contains undeterminated strings
# append it at the end of @address or @phrase
- if (@address) {
- push @address, @buffer;
- } else {
+ if ($end_of_addr_seen) {
push @phrase, @buffer;
+ } else {
+ push @address, @buffer;
}
my $str_phrase = join ' ', @phrase;
@@ -915,16 +918,16 @@ sub parse_mailboxes {
push @addr_list, $str_mailbox if ($str_mailbox);
@phrase = @address = @comment = @buffer = ();
+ $end_of_addr_seen = 0;
} elsif ($token =~ /^\(/) {
push @comment, $token;
} elsif ($token eq "<") {
push @phrase, (splice @address), (splice @buffer);
} elsif ($token eq ">") {
+ $end_of_addr_seen = 1;
push @address, (splice @buffer);
- } elsif ($token eq "@") {
+ } elsif ($token eq "@" && !$end_of_addr_seen) {
push @address, (splice @buffer), "@";
- } elsif ($token eq ".") {
- push @address, (splice @buffer), ".";
} else {
push @buffer, $token;
}
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index d94d01c..018beb8 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -97,8 +97,12 @@ sub resolve_local_globs {
"existing: $existing\n",
" globbed: $refname\n";
}
- my $u = (::cmt_metadata("$refname"))[0] or die
- "$refname: no associated commit metadata\n";
+ my $u = (::cmt_metadata("$refname"))[0];
+ if (!defined($u)) {
+ warn
+"W: $refname: no associated commit metadata from SVN, skipping\n";
+ next;
+ }
$u =~ s!^\Q$url\E(/|$)!! or die
"$refname: '$url' not found in '$u'\n";
if ($pathname ne $u) {
@@ -1905,15 +1909,22 @@ sub make_log_entry {
my @parents = @$parents;
my $props = $ed->{dir_prop}{$self->path};
- if ( $props->{"svk:merge"} ) {
- $self->find_extra_svk_parents($props->{"svk:merge"}, \@parents);
- }
- if ( $props->{"svn:mergeinfo"} ) {
- my $mi_changes = $self->mergeinfo_changes
- ($parent_path, $parent_rev,
- $self->path, $rev,
- $props->{"svn:mergeinfo"});
- $self->find_extra_svn_parents($mi_changes, \@parents);
+ if ($self->follow_parent) {
+ my $tickets = $props->{"svk:merge"};
+ if ($tickets) {
+ $self->find_extra_svk_parents($tickets, \@parents);
+ }
+
+ my $mergeinfo_prop = $props->{"svn:mergeinfo"};
+ if ($mergeinfo_prop) {
+ my $mi_changes = $self->mergeinfo_changes(
+ $parent_path,
+ $parent_rev,
+ $self->path,
+ $rev,
+ $mergeinfo_prop);
+ $self->find_extra_svn_parents($mi_changes, \@parents);
+ }
}
open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;
diff --git a/pkt-line.c b/pkt-line.c
index 62fdb37..30489c6 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -172,27 +172,8 @@ static int get_packet_data(int fd, char **src_buf, size_t *src_size,
static int packet_length(const char *linelen)
{
- int n;
- int len = 0;
-
- for (n = 0; n < 4; n++) {
- unsigned char c = linelen[n];
- len <<= 4;
- if (c >= '0' && c <= '9') {
- len += c - '0';
- continue;
- }
- if (c >= 'a' && c <= 'f') {
- len += c - 'a' + 10;
- continue;
- }
- if (c >= 'A' && c <= 'F') {
- len += c - 'A' + 10;
- continue;
- }
- return -1;
- }
- return len;
+ int val = hex2chr(linelen);
+ return (val < 0) ? val : (val << 8) | hex2chr(linelen + 2);
}
int packet_read(int fd, char **src_buf, size_t *src_len,
diff --git a/po/TEAMS b/po/TEAMS
index 56274ad..d3e63bc 100644
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -37,8 +37,9 @@ Repository: https://github.com/changwoo/git-l10n-ko/
Leader: Changwoo Ryu <cwryu@debian.org>
Language: pt_PT (Portuguese - Portugal)
-Repository: https://github.com/marcomsousa/git-l10n-pt_PT/
-Leader: Marco Sousa <marcomsousa AT gmail.com>
+Repository: https://github.com/vascool/git-po-pt/
+Leader: Vasco Almeida <vascomalmeida@sapo.pt>
+Members: Marco Sousa <marcomsousa AT gmail.com>
Language: ru (Russian)
Repository: https://github.com/DJm00n/git-po-ru/
diff --git a/po/ca.po b/po/ca.po
index 46000d7..30e00e2 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-16 00:16+0800\n"
-"PO-Revision-Date: 2016-03-19 23:51-0600\n"
+"POT-Creation-Date: 2016-08-27 23:21+0800\n"
+"PO-Revision-Date: 2016-08-28 10:32-0600\n"
"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"
"Language-Team: Catalan\n"
"Language: ca\n"
@@ -16,14 +16,39 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.8\n"
#: advice.c:55
#, c-format
msgid "hint: %.*s\n"
msgstr "pista: %.*s\n"
-#: advice.c:88
+#: advice.c:83
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr "Recollir cireres no és possible perquè teniu fitxers no fusionats."
+
+#: advice.c:85
+msgid "Committing is not possible because you have unmerged files."
+msgstr "Cometre no és possible perquè teniu fitxers no fusionats."
+
+#: advice.c:87
+msgid "Merging is not possible because you have unmerged files."
+msgstr "Fusionar no és possible perquè teniu fitxers no fusionats."
+
+#: advice.c:89
+msgid "Pulling is not possible because you have unmerged files."
+msgstr "Baixar no es possible perquè teniu fitxers no fusionats."
+
+#: advice.c:91
+msgid "Reverting is not possible because you have unmerged files."
+msgstr "Revertir no és possible perquè teniu fitxers no fusionats."
+
+#: advice.c:93
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
+msgstr "No es possible %s perquè teniu fitxers no fusionats."
+
+#: advice.c:101
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -32,17 +57,48 @@ msgstr ""
"'git add/rm <fitxer>' segons sigui apropiat per a marcar la\n"
"resolució i feu una comissió."
-#: advice.c:101 builtin/merge.c:1226
+#: advice.c:109
+msgid "Exiting because of an unresolved conflict."
+msgstr "S'està sortint a causa d'un conflicte no resolt."
+
+#: advice.c:114 builtin/merge.c:1181
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)."
-#: advice.c:103
+#: advice.c:116
msgid "Please, commit your changes before merging."
msgstr "Si us plau, cometeu els vostres canvis abans de fusionar."
-#: advice.c:104
+#: advice.c:117
msgid "Exiting because of unfinished merge."
-msgstr "Sortint a causa d'una fusió no terminada."
+msgstr "S'està sortint a causa d'una fusió no terminada."
+
+#: advice.c:123
+#, c-format
+msgid ""
+"Note: checking out '%s'.\n"
+"\n"
+"You are in 'detached HEAD' state. You can look around, make experimental\n"
+"changes and commit them, and you can discard any commits you make in this\n"
+"state without impacting any branches by performing another checkout.\n"
+"\n"
+"If you want to create a new branch to retain commits you create, you may\n"
+"do so (now or later) by using -b with the checkout command again. Example:\n"
+"\n"
+" git checkout -b <new-branch-name>\n"
+"\n"
+msgstr ""
+"Avís: s'està agafant '%s'.\n"
+"\n"
+"Esteu en un estat de 'HEAD separat'. Podeu mirar al voltant, fer canvis\n"
+"experimentals i cometre-los i podeu descartar qualsevulla comissió que feu\n"
+"en aquest estat sense impactar cap branca realitzant un altre agafament.\n"
+"\n"
+"Si voleu crear una branca nova per a conservar les comissions que creeu,\n"
+"poder fer així (ara o més tard) usant -b de nou amb l'ordre checkout.\n"
+"Exemple:\n"
+"\n"
+" git checkout -b <nom-de-branca-nova>\n"
#: archive.c:12
msgid "git archive [<options>] <tree-ish> [<path>...]"
@@ -63,7 +119,7 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list"
-#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "L'especificació de camí '%s' no ha coincidit amb cap fitxer"
@@ -76,7 +132,7 @@ msgstr "format"
msgid "archive format"
msgstr "format d'arxiu"
-#: archive.c:430 builtin/log.c:1232
+#: archive.c:430 builtin/log.c:1422
msgid "prefix"
msgstr "prefix"
@@ -84,10 +140,10 @@ msgstr "prefix"
msgid "prepend prefix to each pathname in the archive"
msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 builtin/blame.c:2548
-#: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:720 builtin/hash-object.c:100 builtin/ls-files.c:459
-#: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 builtin/blame.c:2554
+#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989
+#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:460
+#: builtin/ls-files.c:463 builtin/notes.c:399 builtin/notes.c:562
#: builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "fitxer"
@@ -120,7 +176,8 @@ msgstr "comprimeix millor"
msgid "list supported archive formats"
msgstr "allista els formats d'arxiu admesos"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:832
msgid "repo"
msgstr "dipòsit"
@@ -128,7 +185,7 @@ msgstr "dipòsit"
msgid "retrieve the archive from remote repository <repo>"
msgstr "recupera l'arxiu del dipòsit remot <dipòsit>"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
msgid "command"
msgstr "ordre"
@@ -136,6 +193,28 @@ msgstr "ordre"
msgid "path to the remote git-upload-archive command"
msgstr "camí a l'ordre git-upload-archive remota"
+#: archive.c:461
+msgid "Unexpected option --remote"
+msgstr "Opció inesperada --remote"
+
+#: archive.c:463
+msgid "Option --exec can only be used together with --remote"
+msgstr "L'opció --exec només es pot usar junt amb --remote"
+
+#: archive.c:465
+msgid "Unexpected option --output"
+msgstr "Opció inesperada --output"
+
+#: archive.c:487
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Format d'arxiu desconegut '%s'"
+
+#: archive.c:494
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Paràmetre no admet per al format '%s': -%d"
+
#: attr.c:263
msgid ""
"Negative patterns are ignored in git attributes\n"
@@ -144,6 +223,130 @@ msgstr ""
"Els patrons negatius s'ignoren en els atributs de git\n"
"Useu '\\!' per exclamació capdavantera literal."
+#: bisect.c:441
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "No s'ha pogut obrir el fitxer '%s'"
+
+#: bisect.c:446
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "Comentari amb cometes dolentes en el fitxer '%s': %s"
+
+#: bisect.c:655
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "No podem bisecar més!\n"
+
+#: bisect.c:708
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "No és un nom de comissió vàlid %s"
+
+#: bisect.c:732
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+"La base de fusió %s és dolenta.\n"
+"Això vol dir que el defecte s'ha arreglat entre %s i [%s].\n"
+
+#: bisect.c:737
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"La base de fusió %s és nova.\n"
+"La propietat s'ha canviat entre %s i [%s].\n"
+
+#: bisect.c:742
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"La base de fusió %s és %s.\n"
+"Això vol dir que la primera comissió '%s' és entre %s i [%s].\n"
+
+#: bisect.c:750
+#, c-format
+msgid ""
+"Some %s revs are not ancestor of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
+msgstr ""
+"Unes %s revisions no són els avantpassats de la revisió %s.\n"
+"git bisect no pot funcionar correctament en aquest cas.\n"
+"Potser heu confós les revisions %s i %s?\n"
+
+#: bisect.c:763
+#, c-format
+msgid ""
+"the merge base between %s and [%s] must be skipped.\n"
+"So we cannot be sure the first %s commit is between %s and %s.\n"
+"We continue anyway."
+msgstr ""
+"s'ha de saltar la base de fusió entre %s i [%s].\n"
+"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s i "
+"%s.\n"
+"Continuem de totes maneres."
+
+#: bisect.c:798
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "Bisecant: s'ha de provar una base de fusió\n"
+
+#: bisect.c:849
+#, c-format
+msgid "a %s revision is needed"
+msgstr "es necessita una revisió %s"
+
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#, c-format
+msgid "could not create file '%s'"
+msgstr "no s'ha pogut crear el fitxer '%s'"
+
+#: bisect.c:917
+#, c-format
+msgid "could not read file '%s'"
+msgstr "no s'ha pogut llegir el fitxer '%s'"
+
+#: bisect.c:947
+msgid "reading bisect refs failed"
+msgstr "la lectura de les referències de bisecció ha fallat"
+
+#: bisect.c:967
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr "%s era ambdós %s i %s\n"
+
+#: bisect.c:975
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+"No s'ha trobat cap comissió provable.\n"
+"Potser heu començat amb paràmetres de camí dolents?\n"
+
+#: bisect.c:994
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(aproximadament %d pas)"
+msgstr[1] "(aproximadament %d passos)"
+
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:998
+#, c-format
+msgid "Bisecting: %d revision left to test after this %s\n"
+msgid_plural "Bisecting: %d revisions left to test after this %s\n"
+msgstr[0] "Bisecant: manca %d revisió a provar després d'aquesta %s\n"
+msgstr[1] "Bisecant: manquen %d revisions a provar després d'aquesta %s\n"
+
#: branch.c:53
#, c-format
msgid ""
@@ -160,7 +363,7 @@ msgstr ""
#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
-msgstr "No establint la branca %s com a la seva pròpia font."
+msgstr "No s'està establint la branca %s com a la seva pròpia font."
#: branch.c:93
#, c-format
@@ -280,11 +483,16 @@ msgstr "Nom d'objecte ambigu: '%s'."
msgid "Not a valid branch point: '%s'."
msgstr "No és un punt de ramificació vàlid: '%s'."
-#: branch.c:344
+#: branch.c:345
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' ja s'ha agafat a '%s'"
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "La HEAD de l'arbre de treball %s no està actualitzat"
+
#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
@@ -295,7 +503,7 @@ msgstr "'%s' no sembla un fitxer de farcell v2"
msgid "unrecognized header: %s%s (%d)"
msgstr "capçalera no reconeguda: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:778
#, c-format
msgid "could not open '%s'"
msgstr "no s'ha pogut obrir '%s'"
@@ -304,10 +512,10 @@ msgstr "no s'ha pogut obrir '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "Al dipòsit li manquen aquestes comissions prerequisits:"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
-#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
-#: builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
+#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
+#: builtin/merge.c:356 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "la configuració del passeig per revisions ha fallat"
@@ -346,31 +554,31 @@ msgstr "El rev-list s'ha mort"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "les opcions de la llista de revisions exclouen la referència '%s'"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "paràmetre no reconegut: %s"
-#: bundle.c:449
+#: bundle.c:451
msgid "Refusing to create empty bundle."
-msgstr "Refusant crear un farcell buit."
+msgstr "S'està refusant crear un farcell buit."
-#: bundle.c:459
+#: bundle.c:463
#, c-format
msgid "cannot create '%s'"
msgstr "no es pot crear '%s'"
-#: bundle.c:480
+#: bundle.c:491
msgid "index-pack died"
msgstr "L'index-pack s'ha mort"
-#: color.c:275
+#: color.c:290
#, c-format
msgid "invalid color value: %.*s"
msgstr "valor de color no vàlid: %.*s"
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
-#: builtin/am.c:2135
+#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
+#: builtin/am.c:2119
#, c-format
msgid "could not parse %s"
msgstr "no s'ha pogut analitzar %s"
@@ -384,125 +592,195 @@ msgstr "%s %s no és una comissió!"
msgid "memory exhausted"
msgstr "memòria esgotada"
-#: config.c:475 config.c:477
+#: config.c:516
#, c-format
-msgid "bad config line %d in %s %s"
-msgstr "línia de fitxer de configuració dolenta %d en %s %s"
+msgid "bad config line %d in blob %s"
+msgstr "línia de configuració dolenta %d en el blob %s"
-#: config.c:593
+#: config.c:520
#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
-msgstr "valor de configuració numèrica dolent '%s' per '%s' en %s %s: %s"
+msgid "bad config line %d in file %s"
+msgstr "línia de configuració dolenta %d en el fitxer %s"
-#: config.c:595
+#: config.c:524
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "línia de configuració dolenta %d en l'entrada estàndard"
+
+#: config.c:528
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "línia de configuració dolenta %d en el blob de submòdul %s"
+
+#: config.c:532
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "línia de configuració dolenta %d en la línia d'ordres %s"
+
+#: config.c:536
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "línia de configuració dolenta %d en %s"
+
+#: config.c:655
+msgid "out of range"
+msgstr "fora de rang"
+
+#: config.c:655
+msgid "invalid unit"
+msgstr "unitat no vàlida"
+
+#: config.c:661
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "valor de configuració numèrica dolent '%s' per '%s': %s"
+msgstr "valor de configuració numèric dolent '%s' per '%s': %s"
+
+#: config.c:666
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "valor de configuració numèric dolent '%s' per '%s' en el blob %s: %s"
+
+#: config.c:669
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "valor de configuració numèric dolent '%s' per '%s' en el fitxer %s: %s"
+
+#: config.c:672
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr ""
+"valor de configuració numèric dolent '%s' per '%s' en l'entrada estàndard: %s"
+
+#: config.c:675
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr ""
+"valor de configuració numèric dolent '%s' per '%s' en el blob de submòdul "
+"%s: %s"
+
+#: config.c:678
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr ""
+"valor de configuració numèric dolent '%s' per '%s' en la línia d'ordres %s: "
+"%s"
+
+#: config.c:681
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "valor de configuració numèric dolent '%s' per '%s' en %s: %s"
-#: config.c:680
+#: config.c:768
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "s'ha fallat en expandir el directori d'usuari en '%s'"
-#: config.c:758 config.c:769
+#: config.c:849 config.c:860
#, c-format
msgid "bad zlib compression level %d"
msgstr "nivell de compressió de zlib dolent %d"
-#: config.c:891
+#: config.c:978
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode de creació d'objecte no vàlid: %s"
-#: config.c:1220
+#: config.c:1312
msgid "unable to parse command-line config"
msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
-#: config.c:1281
-msgid "unknown error occured while reading the configuration files"
-msgstr "ha ocorregut un error desconegut en llegir els fitxers de configuració"
+#: config.c:1362
+msgid "unknown error occurred while reading the configuration files"
+msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració"
-#: config.c:1629
+#: config.c:1716
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "no s'ha pogut analitzar '%s' de la configuració de la línia d'ordres"
-#: config.c:1631
+#: config.c:1718
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "variable de configuració dolenta '%s' en el fitxer '%s' a la línia %d"
-#: config.c:1690
+#: config.c:1777
#, c-format
msgid "%s has multiple values"
msgstr "%s té múltiples valors"
-#: config.c:2226
+#: config.c:2311
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "no s'ha pogut establir '%s' a '%s'"
+
+#: config.c:2313
#, c-format
-msgid "Could not set '%s' to '%s'"
-msgstr "No s'ha pogut establir '%s' com a '%s'"
+msgid "could not unset '%s'"
+msgstr "no s'ha pogut desestablir '%s'"
-#: connected.c:69
+#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr "S'està comprovant la connectivitat"
+
+#: connected.c:74
msgid "Could not run 'git rev-list'"
msgstr "No s'ha pogut executar 'git rev-list'"
-#: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "escriptura fallada al rev-list: %s"
+#: connected.c:94
+msgid "failed write to rev-list"
+msgstr "escriptura fallada a rev-list"
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "s'ha fallat en tancar l'stdin del rev-list: %s"
+#: connected.c:101
+msgid "failed to close rev-list's stdin"
+msgstr "s'ha fallat en tancar l'stdin del rev-list"
-#: date.c:95
+#: date.c:97
msgid "in the future"
msgstr "en el futur"
-#: date.c:101
+#: date.c:103
#, c-format
msgid "%lu second ago"
msgid_plural "%lu seconds ago"
msgstr[0] "fa %lu segon"
msgstr[1] "fa %lu segons"
-#: date.c:108
+#: date.c:110
#, c-format
msgid "%lu minute ago"
msgid_plural "%lu minutes ago"
msgstr[0] "fa %lu minut"
msgstr[1] "fa %lu minuts"
-#: date.c:115
+#: date.c:117
#, c-format
msgid "%lu hour ago"
msgid_plural "%lu hours ago"
msgstr[0] "fa %lu hora"
msgstr[1] "fa %lu hores"
-#: date.c:122
+#: date.c:124
#, c-format
msgid "%lu day ago"
msgid_plural "%lu days ago"
msgstr[0] "fa %lu dia"
msgstr[1] "fa %lu dies"
-#: date.c:128
+#: date.c:130
#, c-format
msgid "%lu week ago"
msgid_plural "%lu weeks ago"
msgstr[0] "fa %lu setmana"
msgstr[1] "fa %lu setmanes"
-#: date.c:135
+#: date.c:137
#, c-format
msgid "%lu month ago"
msgid_plural "%lu months ago"
msgstr[0] "fa %lu mes"
msgstr[1] "fa %lu mesos"
-#: date.c:146
+#: date.c:148
#, c-format
msgid "%lu year"
msgid_plural "%lu years"
@@ -510,14 +788,14 @@ msgstr[0] "%lu any"
msgstr[1] "%lu anys"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:149
+#: date.c:151
#, c-format
msgid "%s, %lu month ago"
msgid_plural "%s, %lu months ago"
msgstr[0] "fa %s i %lu mes"
msgstr[1] "fa %s i %lu mesos"
-#: date.c:154 date.c:159
+#: date.c:156 date.c:161
#, c-format
msgid "%lu year ago"
msgid_plural "%lu years ago"
@@ -529,45 +807,45 @@ msgstr[1] "fa %lu anys"
msgid "failed to read orderfile '%s'"
msgstr "s'ha fallat en llegir el fitxer d'ordres '%s'"
-#: diffcore-rename.c:536
+#: diffcore-rename.c:540
msgid "Performing inexact rename detection"
-msgstr "Realitzant detecció inexacta de canvis de nom"
+msgstr "S'està realitzant una detecció inexacta de canvis de nom"
-#: diff.c:115
+#: diff.c:116
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " S'ha fallat en analitzar el percentatge limitant de dirstat '%s'\n"
-#: diff.c:120
+#: diff.c:121
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paràmetre de dirstat desconegut '%s'\n"
-#: diff.c:215
+#: diff.c:225
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valor desconegut de la variable de configuració de 'diff.submodule': '%s'"
-#: diff.c:267
+#: diff.c:277
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-"Errors trobats en la variable de configuració 'diff.dirstat':\n"
+"S'han trobat errors en la variable de configuració 'diff.dirstat':\n"
"%s"
-#: diff.c:2997
+#: diff.c:3017
#, c-format
msgid "external diff died, stopping at %s"
-msgstr "El diff external s'ha mort, aturant a %s"
+msgstr "El diff external s'ha mort, s'està aturant a %s"
-#: diff.c:3393
+#: diff.c:3415
msgid "--follow requires exactly one pathspec"
msgstr "--follow requereix exactament una especificació de camí"
-#: diff.c:3556
+#: diff.c:3578
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -576,56 +854,47 @@ msgstr ""
"S'ha fallat en analitzar el paràmetre d'opció de --dirstat/-X:\n"
"%s"
-#: diff.c:3570
+#: diff.c:3592
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "S'ha fallat en analitzar el paràmetre d'opció de --submodule: %s"
-#: dir.c:2004
+#: dir.c:1823
msgid "failed to get kernel name and information"
msgstr "s'ha fallat en obtenir el nombre i la informació del nucli"
-#: dir.c:2123
+#: dir.c:1942
msgid "Untracked cache is disabled on this system or location."
msgstr ""
"La memòria cau no seguida està inhabilitada en aquest sistema o ubicació."
-#: gpg-interface.c:166 gpg-interface.c:237
-msgid "could not run gpg."
-msgstr "no s'ha pogut executar el gpg."
-
#: gpg-interface.c:178
-msgid "gpg did not accept the data"
-msgstr "El gpg no ha acceptat les dades"
-
-#: gpg-interface.c:189
msgid "gpg failed to sign the data"
-msgstr "gpg ha fallat en firmar les dades"
+msgstr "gpg ha fallat en signar les dades"
-#: gpg-interface.c:222
-#, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "no s'ha pogut crear el fitxer temporal '%s': %s"
+#: gpg-interface.c:208
+msgid "could not create temporary file"
+msgstr "no s'ha pogut crear el fitxer temporal"
-#: gpg-interface.c:225
+#: gpg-interface.c:210
#, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "s'ha fallat en escriure la firma separada a '%s': %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "s'ha fallat en escriure la signatura separada a '%s'"
-#: grep.c:1718
+#: grep.c:1792
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': no s'ha pogut llegir %s"
-#: grep.c:1735
+#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
#, c-format
-msgid "'%s': %s"
-msgstr "'%s': %s"
+msgid "failed to stat '%s'"
+msgstr "s'ha fallat en fer stat a '%s'"
-#: grep.c:1746
+#: grep.c:1820
#, c-format
-msgid "'%s': short read %s"
-msgstr "'%s': lectura curta %s"
+msgid "'%s': short read"
+msgstr "'%s': lectura curta"
#: help.c:205
#, c-format
@@ -659,8 +928,9 @@ msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
"Continuing under the assumption that you meant '%s'"
msgstr ""
-"AVÃS: Heu invocat una ordre de Git amb nom '%s', la qual no existeix.\n"
-"Continuant sota l'assumpció que volíeu dir '%s'"
+"ADVERTÈNCIA: Heu invocat una ordre de Git amb nom '%s', la qual no "
+"existeix.\n"
+"S'està continuant sota l'assumpció que volíeu dir '%s'"
#: help.c:393
#, c-format
@@ -672,7 +942,7 @@ msgstr "en %0.1f segons automàticament..."
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s' no és una ordre de git. Vegeu 'git --help'."
-#: help.c:404 help.c:464
+#: help.c:404 help.c:470
msgid ""
"\n"
"Did you mean this?"
@@ -686,92 +956,112 @@ msgstr[1] ""
"\n"
"Volíeu dir un d'aquests?"
-#: help.c:460
+#: help.c:466
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
+#: lockfile.c:152
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"No s'ha pogut crear '%s.lock': %s.\n"
+"\n"
+"Sembla que un altre procés de git s'està executant en aquest\n"
+"dipòsit, per exemple, un editor obert per 'git commit'. Si us\n"
+"plau, assegureu-vos que tots els processos s'hagin terminat i\n"
+"llavors trobeu de nou. Si encara falla, potser que un procés de\n"
+"git ha tingut una pana:\n"
+"elimineu el fitxer manualment per a continuar."
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "No es pot crear '%s.lock': %s"
+
#: merge.c:41
msgid "failed to read the cache"
msgstr "s'ha fallat en llegir la memòria cau"
-#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:730
+#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
+#: builtin/checkout.c:589 builtin/clone.c:732
msgid "unable to write new index file"
msgstr "no s'ha pogut escriure un fitxer d'índex nou"
-#: merge-recursive.c:189
-#, c-format
+#: merge-recursive.c:209
msgid "(bad commit)\n"
msgstr "(comissió dolenta)\n"
-#: merge-recursive.c:209
+#: merge-recursive.c:231
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "addinfo_cache ha fallat per al camí '%s'"
-#: merge-recursive.c:270
+#: merge-recursive.c:301
msgid "error building trees"
msgstr "error en construir arbres"
-#: merge-recursive.c:689
+#: merge-recursive.c:720
#, c-format
msgid "failed to create path '%s'%s"
msgstr "s'ha fallat en crear el camí '%s' %s"
-#: merge-recursive.c:700
+#: merge-recursive.c:731
#, c-format
msgid "Removing %s to make room for subdirectory\n"
-msgstr "Eliminant %s per a fer espai per al subdirectori\n"
+msgstr "S'està eliminant %s per a fer espai per al subdirectori\n"
-#: merge-recursive.c:714 merge-recursive.c:735
+#: merge-recursive.c:745 merge-recursive.c:764
msgid ": perhaps a D/F conflict?"
msgstr ": potser un conflicte D/F?"
-#: merge-recursive.c:725
+#: merge-recursive.c:754
#, c-format
msgid "refusing to lose untracked file at '%s'"
-msgstr "refusant perdre el fitxer no seguit a '%s'"
+msgstr "s'està refusant perdre el fitxer no seguit a '%s'"
-#: merge-recursive.c:765
+#: merge-recursive.c:796
#, c-format
msgid "cannot read object %s '%s'"
msgstr "no es pot llegir l'objecte %s '%s'"
-#: merge-recursive.c:767
+#: merge-recursive.c:798
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob esperat per a %s '%s'"
-#: merge-recursive.c:790 builtin/clone.c:374
+#: merge-recursive.c:822
#, c-format
-msgid "failed to open '%s'"
-msgstr "s'ha fallat en obrir '%s'"
+msgid "failed to open '%s': %s"
+msgstr "s'ha fallat en obrir '%s': %s"
-#: merge-recursive.c:798
+#: merge-recursive.c:833
#, c-format
-msgid "failed to symlink '%s'"
-msgstr "s'ha fallat en fer l'enllaç simbòlic '%s'"
+msgid "failed to symlink '%s': %s"
+msgstr "s'ha fallat en fer l'enllaç simbòlic '%s': %s"
-#: merge-recursive.c:801
+#: merge-recursive.c:838
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "no se sap què fer amb %06o %s '%s'"
-#: merge-recursive.c:939
+#: merge-recursive.c:978
msgid "Failed to execute internal merge"
msgstr "S'ha fallat en executar la fusió interna"
-#: merge-recursive.c:943
+#: merge-recursive.c:982
#, c-format
msgid "Unable to add %s to database"
msgstr "no s'ha pogut afegir %s a la base de dades"
-#: merge-recursive.c:959
-msgid "unsupported object type in the tree"
-msgstr "tipus d'objecte no compatible en l'arbre"
-
-#: merge-recursive.c:1034 merge-recursive.c:1048
+#: merge-recursive.c:1081 merge-recursive.c:1095
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -780,7 +1070,7 @@ msgstr ""
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
"s'ha deixat en l'arbre."
-#: merge-recursive.c:1040 merge-recursive.c:1053
+#: merge-recursive.c:1087 merge-recursive.c:1100
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -789,20 +1079,20 @@ msgstr ""
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
"s'ha deixat en l'arbre a %s."
-#: merge-recursive.c:1094
+#: merge-recursive.c:1143
msgid "rename"
msgstr "canvia de nom"
-#: merge-recursive.c:1094
+#: merge-recursive.c:1143
msgid "renamed"
msgstr "canviat de nom"
-#: merge-recursive.c:1150
+#: merge-recursive.c:1200
#, c-format
msgid "%s is a directory in %s adding as %s instead"
-msgstr "%s és un directori en %s; afegint com a %s en lloc"
+msgstr "%s és un directori en %s; s'està afegint com a %s en lloc d'això"
-#: merge-recursive.c:1172
+#: merge-recursive.c:1225
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -811,147 +1101,139 @@ msgstr ""
"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la "
"branca \"%s\" canvi de nom \"%s\"->\"%s\" en \"%s\"%s"
-#: merge-recursive.c:1177
+#: merge-recursive.c:1230
msgid " (left unresolved)"
msgstr " (deixat sense resolució)"
-#: merge-recursive.c:1231
+#: merge-recursive.c:1292
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de "
"nom %s->%s en %s"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1325
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
-msgstr "Canviant el nom de %s a %s i %s a %s en lloc d'això"
+msgstr "S'està canviant el nom de %s a %s i %s a %s en lloc d'això"
-#: merge-recursive.c:1460
+#: merge-recursive.c:1531
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en "
"%s"
-#: merge-recursive.c:1470
+#: merge-recursive.c:1546
#, c-format
msgid "Adding merged %s"
-msgstr "Afegint %s fusionat"
+msgstr "S'està afegint %s fusionat"
-#: merge-recursive.c:1475 merge-recursive.c:1677
+#: merge-recursive.c:1553 merge-recursive.c:1766
#, c-format
msgid "Adding as %s instead"
-msgstr "Afegint com a %s en lloc d'això"
+msgstr "S'està afegint com a %s en lloc d'això"
-#: merge-recursive.c:1526
+#: merge-recursive.c:1610
#, c-format
msgid "cannot read object %s"
msgstr "no es pot llegir l'objecte %s"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1613
#, c-format
msgid "object %s is not a blob"
msgstr "L'objecte %s no és un blob"
-#: merge-recursive.c:1581
+#: merge-recursive.c:1666
msgid "modify"
msgstr "modifica"
-#: merge-recursive.c:1581
+#: merge-recursive.c:1666
msgid "modified"
msgstr "modificat"
-#: merge-recursive.c:1591
+#: merge-recursive.c:1676
msgid "content"
msgstr "contingut"
-#: merge-recursive.c:1598
+#: merge-recursive.c:1683
msgid "add/add"
msgstr "afegiment/afegiment"
-#: merge-recursive.c:1632
+#: merge-recursive.c:1718
#, c-format
msgid "Skipped %s (merged same as existing)"
-msgstr "%s saltat (el fusionat és igual a l'existent)"
+msgstr "S'ha saltat %s (el fusionat és igual a l'existent)"
-#: merge-recursive.c:1646
+#: merge-recursive.c:1732
#, c-format
msgid "Auto-merging %s"
-msgstr "Autofusionant %s"
+msgstr "S'està autofusionant %s"
-#: merge-recursive.c:1650 git-submodule.sh:1048
+#: merge-recursive.c:1736 git-submodule.sh:919
msgid "submodule"
msgstr "submòdul"
-#: merge-recursive.c:1651
+#: merge-recursive.c:1737
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1831
#, c-format
msgid "Removing %s"
-msgstr "Eliminant %s"
+msgstr "S'està eliminant %s"
-#: merge-recursive.c:1762
+#: merge-recursive.c:1857
msgid "file/directory"
msgstr "fitxer/directori"
-#: merge-recursive.c:1768
+#: merge-recursive.c:1863
msgid "directory/file"
msgstr "directori/fitxer"
-#: merge-recursive.c:1773
+#: merge-recursive.c:1868
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. Afegint %s com a %s"
+"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a "
+"%s"
-#: merge-recursive.c:1783
+#: merge-recursive.c:1877
#, c-format
msgid "Adding %s"
-msgstr "Afegint %s"
+msgstr "S'està afegint %s"
-#: merge-recursive.c:1800
-msgid "Fatal merge failure, shouldn't happen."
-msgstr "Fallat de fusió fatal; això no ha de passar."
-
-#: merge-recursive.c:1819
+#: merge-recursive.c:1914
msgid "Already up-to-date!"
-msgstr "Ja al dia!"
+msgstr "Ja està al dia!"
-#: merge-recursive.c:1828
+#: merge-recursive.c:1923
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "la fusió dels arbres %s i %s ha fallat"
-#: merge-recursive.c:1858
-#, c-format
-msgid "Unprocessed path??? %s"
-msgstr "Camí no processat??? %s"
-
-#: merge-recursive.c:1906
+#: merge-recursive.c:2006
msgid "Merging:"
msgstr "Fusionant:"
-#: merge-recursive.c:1919
+#: merge-recursive.c:2019
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "s'ha trobat %u avantpassat:"
msgstr[1] "s'han trobat %u avantpassats:"
-#: merge-recursive.c:1956
+#: merge-recursive.c:2058
msgid "merge returned no commit"
msgstr "la fusió no ha retornat cap comissió"
-#: merge-recursive.c:2013
+#: merge-recursive.c:2121
#, c-format
msgid "Could not parse object '%s'"
msgstr "No s'ha pogut analitzar l'objecte '%s'"
-#: merge-recursive.c:2024 builtin/merge.c:646
+#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
msgid "Unable to write index."
msgstr "No s'ha pogut escriure l'índex."
@@ -967,7 +1249,7 @@ msgstr "Valor de notes.rewriteMode dolent: '%s'"
#: notes-utils.c:110
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "Refusant reescriure les notes en %s (fora de refs/notes/)"
+msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)"
#. TRANSLATORS: The first %s is the name of the
#. environment variable, the second %s is its value
@@ -981,28 +1263,28 @@ msgstr "Valor dolent de %s: '%s'"
msgid "unable to parse object: %s"
msgstr "no s'ha pogut analitzar l'objecte: %s"
-#: parse-options.c:570
+#: parse-options.c:572
msgid "..."
msgstr "..."
-#: parse-options.c:588
+#: parse-options.c:590
#, c-format
msgid "usage: %s"
msgstr "ús: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
#, c-format
msgid " or: %s"
msgstr " o: %s"
-#: parse-options.c:595
+#: parse-options.c:597
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:629
+#: parse-options.c:631
msgid "-NUM"
msgstr "-NUM"
@@ -1011,7 +1293,7 @@ msgstr "-NUM"
msgid "malformed object name '%s'"
msgstr "nom de camp mal format '%s'"
-#: path.c:752
+#: path.c:798
#, c-format
msgid "Could not make %s writable by group"
msgstr "No s'ha pogut fer %s escrivible pel grup"
@@ -1083,7 +1365,7 @@ msgstr ""
"No hi ha res a excloure per patrons :(exclusió).\n"
"Potser heu oblidat afegir o ':/' o '.' ?"
-#: pretty.c:969
+#: pretty.c:973
msgid "unable to parse --pretty format"
msgstr "no s'ha pogut analitzar el format --pretty"
@@ -1098,7 +1380,7 @@ msgid ""
"Using version %i"
msgstr ""
"index.version establert, però el valor no és vàlid.\n"
-"Usant la versió %i"
+"S'està usant la versió %i"
#: read-cache.c:1291
#, c-format
@@ -1107,25 +1389,24 @@ msgid ""
"Using version %i"
msgstr ""
"GIT_INDEX_VERSION establert, però el valor no és vàlid.\n"
-"Usant la versió %i"
+"S'està usant la versió %i"
-#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
-#: builtin/merge.c:984
+#: refs.c:551 builtin/merge.c:840
#, c-format
msgid "Could not open '%s' for writing"
msgstr "No s'ha pogut obrir '%s' per a escriptura"
-#: refs/files-backend.c:2374
+#: refs/files-backend.c:2534
#, c-format
msgid "could not delete reference %s: %s"
msgstr "no s'ha pogut suprimir la referència %s: %s"
-#: refs/files-backend.c:2377
+#: refs/files-backend.c:2537
#, c-format
msgid "could not delete references: %s"
msgstr "no s'ha pogut suprimir les referències: %s"
-#: refs/files-backend.c:2386
+#: refs/files-backend.c:2546
#, c-format
msgid "could not remove reference %s"
msgstr "no s'ha pogut eliminar la referència %s"
@@ -1247,12 +1528,12 @@ msgstr "objecte mal format a '%s'"
#: ref-filter.c:1373
#, c-format
msgid "ignoring ref with broken name %s"
-msgstr "ignorant la referència amb nom trencat %s"
+msgstr "s'està ignorant la referència amb nom trencat %s"
#: ref-filter.c:1378
#, c-format
msgid "ignoring broken ref %s"
-msgstr "ignorant la referència trencada %s"
+msgstr "s'està ignorant la referència trencada %s"
#: ref-filter.c:1651
#, c-format
@@ -1264,22 +1545,22 @@ msgstr "format: manca l'àtom %%(end)"
msgid "malformed object name %s"
msgstr "nom d'objecte %s mal format"
-#: remote.c:745
+#: remote.c:746
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "No es pot obtenir ambdós %s i %s a %s"
-#: remote.c:749
+#: remote.c:750
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s generalment segueix %s, no %s"
-#: remote.c:753
+#: remote.c:754
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s segueix ambdós %s i %s"
-#: remote.c:761
+#: remote.c:762
msgid "Internal error"
msgstr "Error intern"
@@ -1386,16 +1667,16 @@ msgstr[1] ""
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (useu \"git pull\" per a fusionar la branca remota a la vostra)\n"
-#: revision.c:2131
+#: revision.c:2132
msgid "your current branch appears to be broken"
msgstr "la vostra branca actual sembla trencada"
-#: revision.c:2134
+#: revision.c:2135
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "la vostra branca actual '%s' encara no té cap comissió"
-#: revision.c:2328
+#: revision.c:2329
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent és incompatible amb --bisect"
@@ -1408,26 +1689,30 @@ msgstr "s'ha fallat en obrir /dev/null"
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) ha fallat"
-#: send-pack.c:295
+#: send-pack.c:298
msgid "failed to sign the push certificate"
-msgstr "s'ha fallat en firmar el certificat de pujada"
+msgstr "s'ha fallat en signar el certificat de pujada"
-#: send-pack.c:404
+#: send-pack.c:411
msgid "the receiving end does not support --signed push"
msgstr "el destí receptor no admet pujar --signed"
-#: send-pack.c:406
+#: send-pack.c:413
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
-"no enviant una certificació de pujada perquè el destí receptor no admet "
-"pujar --signed"
+"no s'està enviant una certificació de pujada perquè el destí receptor no "
+"admet pujar --signed"
-#: send-pack.c:418
+#: send-pack.c:425
msgid "the receiving end does not support --atomic push"
msgstr "el destí receptor no admet pujar --atomic"
+#: send-pack.c:430
+msgid "the receiving end does not support push options"
+msgstr "el destí receptor no admet opcions de pujada"
+
#: sequencer.c:174
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
@@ -1446,15 +1731,15 @@ msgstr ""
"corregits amb 'git add <camins>' o 'git rm <camins>'\n"
"i cometeu el resultat amb 'git commit'"
-#: sequencer.c:190 sequencer.c:833 sequencer.c:913
+#: sequencer.c:190 sequencer.c:841 sequencer.c:924
#, c-format
msgid "Could not write to %s"
msgstr "No s'ha pogut escriure a %s"
-#: sequencer.c:193
+#: sequencer.c:193 sequencer.c:843 sequencer.c:928
#, c-format
-msgid "Error wrapping up %s"
-msgstr "Error en finalitzar %s"
+msgid "Error wrapping up %s."
+msgstr "Ha hagut un error en finalitzar %s."
#: sequencer.c:208
msgid "Your local changes would be overwritten by cherry-pick."
@@ -1468,45 +1753,50 @@ msgstr "Els vostres canvis locals se sobreescriurien per la reversió."
msgid "Commit your changes or stash them to proceed."
msgstr "Cometeu els vostres canvis o emmagatzemeu-los per a procedir."
+#: sequencer.c:228
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: avanç ràpid"
+
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:300
+#: sequencer.c:303
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
-#: sequencer.c:318
+#: sequencer.c:321
msgid "Could not resolve HEAD commit\n"
msgstr "No s'ha pogut resoldre la comissió HEAD\n"
-#: sequencer.c:338
+#: sequencer.c:341
msgid "Unable to update cache tree\n"
msgstr "No s'ha pogut actualitzar l'arbre cau\n"
-#: sequencer.c:390
+#: sequencer.c:393
#, c-format
msgid "Could not parse commit %s\n"
msgstr "No s'ha pogut analitzar la comissió %s\n"
-#: sequencer.c:395
+#: sequencer.c:398
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "No s'ha pogut analitzar la comissió mare %s\n"
-#: sequencer.c:460
+#: sequencer.c:463
msgid "Your index file is unmerged."
msgstr "El vostre fitxer d'índex està sense fusionar."
-#: sequencer.c:479
+#: sequencer.c:482
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "La comissió %s és una fusió però no s'ha donat cap opció -m."
-#: sequencer.c:487
+#: sequencer.c:490
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "La comissió %s no té mare %d"
-#: sequencer.c:491
+#: sequencer.c:494
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr ""
@@ -1514,172 +1804,253 @@ msgstr ""
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:504
+#: sequencer.c:507
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: no es pot analitzar la comissió mare %s"
-#: sequencer.c:508
+#: sequencer.c:511
#, c-format
msgid "Cannot get commit message for %s"
msgstr "No es pot obtenir el missatge de comissió de %s"
-#: sequencer.c:594
+#: sequencer.c:597
#, c-format
msgid "could not revert %s... %s"
msgstr "no s'ha pogut revertir %s...%s"
-#: sequencer.c:595
+#: sequencer.c:598
#, c-format
msgid "could not apply %s... %s"
msgstr "no s'ha pogut aplicar %s...%s"
-#: sequencer.c:630
+#: sequencer.c:633
msgid "empty commit set passed"
msgstr "conjunt de comissions buit passat"
-#: sequencer.c:638
+#: sequencer.c:641
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: s'ha fallat en llegir l'índex"
-#: sequencer.c:642
+#: sequencer.c:645
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: s'ha fallat en actualitzar l'índex"
-#: sequencer.c:702
-#, c-format
-msgid "Cannot %s during a %s"
-msgstr "No es pot %s durant un %s"
+#: sequencer.c:705
+msgid "Cannot revert during another revert."
+msgstr "No es pot revertir durant una altra reversió."
+
+#: sequencer.c:706
+msgid "Cannot revert during a cherry-pick."
+msgstr "No es pot revertir durant un recull de cireres."
+
+#: sequencer.c:709
+msgid "Cannot cherry-pick during a revert."
+msgstr "No es pot recollir cireres durant una reversió."
-#: sequencer.c:724
+#: sequencer.c:710
+msgid "Cannot cherry-pick during another cherry-pick."
+msgstr "No es pot recollir cireres durant altre recull de cireres."
+
+#: sequencer.c:732
#, c-format
msgid "Could not parse line %d."
msgstr "No s'ha pogut analitzar la línia %d."
-#: sequencer.c:729
+#: sequencer.c:737
msgid "No commits parsed."
-msgstr "Cap comissió analitzada."
+msgstr "No s'ha analitzat cap comissió."
-#: sequencer.c:741
+#: sequencer.c:749
#, c-format
msgid "Could not open %s"
msgstr "No s'ha pogut obrir %s"
-#: sequencer.c:745
+#: sequencer.c:753
#, c-format
msgid "Could not read %s."
msgstr "No s'ha pogut llegir %s."
-#: sequencer.c:752
+#: sequencer.c:760
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "Full d'instruccions inusable: %s"
-#: sequencer.c:782
+#: sequencer.c:790
#, c-format
msgid "Invalid key: %s"
msgstr "Clau no vàlida: %s"
-#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52
+#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Valor no vàlid per a %s: %s"
-#: sequencer.c:795
+#: sequencer.c:803
#, c-format
msgid "Malformed options sheet: %s"
msgstr "Full d'opcions mal format: %s"
-#: sequencer.c:814
+#: sequencer.c:822
msgid "a cherry-pick or revert is already in progress"
msgstr "un recull de cireres o una reversió ja està en curs"
-#: sequencer.c:815
+#: sequencer.c:823
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:819
+#: sequencer.c:827
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "No s'ha pogut crear el directori de seqüenciador %s"
-#: sequencer.c:835 sequencer.c:917
-#, c-format
-msgid "Error wrapping up %s."
-msgstr "Error en finalitzar %s."
-
-#: sequencer.c:854 sequencer.c:987
+#: sequencer.c:862 sequencer.c:998
msgid "no cherry-pick or revert in progress"
msgstr "ni hi ha cap recull de cireres ni cap reversió en curs"
-#: sequencer.c:856
+#: sequencer.c:864
msgid "cannot resolve HEAD"
msgstr "no es pot resoldre HEAD"
-#: sequencer.c:858
+#: sequencer.c:866 sequencer.c:900
msgid "cannot abort from a branch yet to be born"
msgstr "no es pot avortar des d'una branca que encara ha de nàixer"
-#: sequencer.c:878 builtin/apply.c:4287
+#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
#, c-format
-msgid "cannot open %s: %s"
-msgstr "no es pot obrir %s: %s"
+msgid "cannot open %s"
+msgstr "no es pot obrir %s"
-#: sequencer.c:881
+#: sequencer.c:888
#, c-format
msgid "cannot read %s: %s"
msgstr "no es pot llegir %s: %s"
-#: sequencer.c:882
+#: sequencer.c:889
msgid "unexpected end of file"
msgstr "final de fitxer inesperat"
-#: sequencer.c:888
+#: sequencer.c:895
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "el fitxer HEAD emmagatzemat abans del recull de cireres '%s' és malmès"
-#: sequencer.c:910
+#: sequencer.c:921
#, c-format
msgid "Could not format %s."
msgstr "No s'ha pogut formatar %s."
-#: sequencer.c:1055
+#: sequencer.c:1066
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: no es pot recollir com a cirera un %s"
-#: sequencer.c:1058
+#: sequencer.c:1069
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisió dolenta"
-#: sequencer.c:1092
+#: sequencer.c:1102
msgid "Can't revert as initial commit"
msgstr "No es pot revertir com a comissió inicial"
-#: sequencer.c:1093
-msgid "Can't cherry-pick into empty head"
-msgstr "No es pot recollir cireres en un cap buit"
+#: setup.c:160
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s: no hi ha tal camí en l'arbre de treball.\n"
+"Useu 'git <ordre> -- <camí>...' per a especificar camins que no existeixin "
+"localment."
-#: setup.c:246
+#: setup.c:173
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"paràmetre ambigu '%s': revisió no coneguda o camí no en l'arbre de treball.\n"
+"Useu '--' per a separar els camins de les revisions, com això:\n"
+"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
+
+#: setup.c:223
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"paràmetre ambigu '%s': ambdós una revisió i un nom de fitxer\n"
+"Useu '--' per a separar els camins de les revisions, com això:\n"
+"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
+
+#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
#, c-format
msgid "failed to read %s"
msgstr "s'ha fallat en llegir %s"
-#: sha1_file.c:1080
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "S'esperava una versió de dipòsit de git <= %d, s'ha trobat %d"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "s'han trobat extensions de dipòsit desconegudes:"
+
+#: setup.c:762
+#, c-format
+msgid "Not a git repository (or any of the parent directories): %s"
+msgstr "No un dipòsit de git (ni cap dels directoris pares): %s"
+
+#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+msgid "Cannot come back to cwd"
+msgstr "No es pot tornar al directori de treball actual"
+
+#: setup.c:845
+msgid "Unable to read current working directory"
+msgstr "No s'ha pogut llegir el directori de treball actual"
+
+#: setup.c:920
+#, c-format
+msgid ""
+"Not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgstr ""
+"No un dipòsit de git (ni cap pare fins el punt de muntatge %s)\n"
+"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
+"no està establert)."
+
+#: setup.c:927
+#, c-format
+msgid "Cannot change to '%s/..'"
+msgstr "No es pot canviar a '%s/..'"
+
+#: setup.c:989
+#, c-format
+msgid ""
+"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"Problema amb el valor de mode de fitxer core.sharedRepository (0%.3o).\n"
+"El propietari dels fitxers sempre ha de tenir permissions de lectura i "
+"escriptura."
+
+#: sha1_file.c:1046
msgid "offset before end of packfile (broken .idx?)"
msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
-#: sha1_file.c:2459
+#: sha1_file.c:2434
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"desplaçament abans d'inici d'índex de paquet per a %s (índex corromput?)"
-#: sha1_file.c:2463
+#: sha1_file.c:2438
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
@@ -1709,31 +2080,40 @@ msgstr ""
"suprimiu-les. Desactiveu aquest missatge executant\n"
"\"git config advice.objectNameWarning false\""
-#: submodule.c:62 submodule.c:96
+#: submodule.c:64 submodule.c:98
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"No es pot canviar un .gitmodules no fusionat, primer resoldreu els "
"conflictes de fusió"
-#: submodule.c:66 submodule.c:100
+#: submodule.c:68 submodule.c:102
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "No s'ha pogut trobar la secció en .gitmodules on path=%s"
-#: submodule.c:74
+#: submodule.c:76
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
-#: submodule.c:107
+#: submodule.c:109
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s"
-#: submodule.c:118
+#: submodule.c:120
msgid "staging updated .gitmodules failed"
msgstr "L'allistament del .gitmodules actualitzat ha fallat"
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "no es permeten els valors negatius a submodule.fetchJobs"
+
+#: submodule-config.c:358
+#, c-format
+msgid "invalid value for %s"
+msgstr "valor no vàlid per a %s"
+
#: trailer.c:237
#, c-format
msgid "running trailer command '%s' failed"
@@ -1788,18 +2168,298 @@ msgstr "no s'ha pogut obrir el fitxer temporal"
msgid "could not rename temporary file to %s"
msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s"
+#: transport.c:62
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Canviaria la font de '%s' a '%s' de '%s'\n"
+
+#: transport.c:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: opció de profunditat no vàlida '%s'"
+
+#: transport.c:771
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Els camins de submòdul següents contenen canvis que no\n"
+"es poden trobar en cap remot:\n"
+
+#: transport.c:775
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Si us plau, intenteu\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"o canviar de directori al camí i useu\n"
+"\n"
+"\tgit push\n"
+"\n"
+"per a pujar-los a un remot.\n"
+
+#: transport.c:783
+msgid "Aborting."
+msgstr "S'està avortant."
+
#: transport-helper.c:1041
#, c-format
msgid "Could not read ref %s"
msgstr "No s'ha pogut llegir la referència %s"
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you switch branches."
+msgstr ""
+"Els vostres canvis locals als fitxers següents se sobreescriurien per "
+"agafar:\n"
+"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de "
+"canviar de branca."
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Els vostres canvis locals als fitxers següents se sobreescriurien per "
+"agafar:\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
+msgstr ""
+"Els vostres canvis locals als fitxers següents se sobreescriurien per "
+"fusionar:\n"
+"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de "
+"fusionar."
+
+#: unpack-trees.c:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Els vostres canvis locals als fitxers següents se sobreescriurien per "
+"fusionar:\n"
+"%%s"
+
+#: unpack-trees.c:74
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
+msgstr ""
+"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
+"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de %s."
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
+"%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"Actualitzar els directoris següents perdria fitxers no seguits en el:\n"
+"%s"
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
+"agafar:\n"
+"%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca."
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
+"agafar:\n"
+"%%s"
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
+"fusionar:\n"
+"%%sSi us plau, moveu-los o elimineu-los abans de fusionar."
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
+"fusionar:\n"
+"%%s"
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
+"%%sSi us plau, moveu-los o elimineu-los abans de %s."
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
+"%%s"
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
+"agafar:\n"
+"%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca."
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
+"agafar:\n"
+"%%s"
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
+"fusionar:\n"
+"%%sSi us plau, moveu-los o elimineu-los abans de fusionar."
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
+"fusionar:\n"
+"%%s"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
+"%s:\n"
+"%%sSi us plau, moveu-los o elimineu-los abans de %s."
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
+"%s:\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "L'entrada '%s' encavalca amb '%s'. No es pot vincular."
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"No es pot actualitzar l'agafament parcial: les entrades següents no estan al "
+"dia:\n"
+"%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Els fitxers següents en l'arbre de treball se sobreescriurien per "
+"actualitzar l'agafament parcial:\n"
+"%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Els fitxers següents en l'arbre de treball s'eliminarien per actualitzar "
+"l'agafament parcial:\n"
+"%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "S'està avortant\n"
+
+#: unpack-trees.c:237
msgid "Checking out files"
-msgstr "Agafant fitxers"
+msgstr "S'està agafant fitxers"
#: urlmatch.c:120
msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "l'esquema d'URL no és vàlida o li manca el sufix '://'"
+msgstr "l'esquema d'URL no és vàlid o li manca el sufix '://'"
#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
#, c-format
@@ -1826,202 +2486,188 @@ msgstr "número de port no vàlid"
msgid "invalid '..' path segment"
msgstr "segment de camí '..' no vàlid"
-#: wrapper.c:222 wrapper.c:381
+#: worktree.c:282
+#, c-format
+msgid "failed to read '%s'"
+msgstr "s'ha fallat en llegir '%s'"
+
+#: wrapper.c:222 wrapper.c:392
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "no s'ha pogut obrir '%s' per a lectura i escriptura"
-#: wrapper.c:224 wrapper.c:383
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
#, c-format
msgid "could not open '%s' for writing"
msgstr "no s'ha pogut obrir '%s' per a escriptura"
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
-#: builtin/merge.c:1075 builtin/pull.c:387
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
+#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
+#: builtin/pull.c:407
#, c-format
msgid "could not open '%s' for reading"
msgstr "no s'ha pogut obrir '%s' per a lectura"
-#: wrapper.c:611
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "no s'ha pogut accedir a '%s': %s"
-
-#: wrapper.c:632
+#: wrapper.c:605 wrapper.c:626
#, c-format
msgid "unable to access '%s'"
msgstr "no s'ha pogut accedir a '%s'"
-#: wrapper.c:640
+#: wrapper.c:634
msgid "unable to get current working directory"
msgstr "no s'ha pogut obtenir el directori de treball actual"
-#: wrapper.c:667
-#, c-format
-msgid "could not open %s for writing"
-msgstr "no s'ha pogut obrir '%s' per a escriptura"
-
-#: wrapper.c:678 builtin/am.c:410
+#: wrapper.c:658
#, c-format
msgid "could not write to %s"
msgstr "no s'ha pogut escriure a %s"
-#: wrapper.c:684
+#: wrapper.c:660
#, c-format
msgid "could not close %s"
msgstr "no s'ha pogut tancar %s"
-#: wt-status.c:149
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "Camins sense fusionar:"
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (useu \"git reset %s <fitxer>...\" per a desallistar)"
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (useu \"git rm --cached <fitxer>...\" per a desallistar)"
-#: wt-status.c:182
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (useu \"git add <fitxer>...\" per a senyalar resolució)"
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (useu \"git add/rm <fitxer>...\" segons sigui apropiat per a senyalar "
"resolució)"
-#: wt-status.c:186
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (useu \"git rm <fitxer>...\" per a senyalar resolució)"
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:882
msgid "Changes to be committed:"
msgstr "Canvis a cometre:"
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:891
msgid "Changes not staged for commit:"
msgstr "Canvis no allistats per a cometre:"
-#: wt-status.c:219
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (useu \"git add <fitxer>...\" per a actualitzar què es cometrà)"
-#: wt-status.c:221
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " (useu \"git add/rm <fitxer>...\" per a actualitzar què es cometrà)"
-#: wt-status.c:222
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (useu \"git checkout -- <fitxer>...\" per a descartar els canvis en el "
"directori de treball)"
-#: wt-status.c:224
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (cometeu o descarteu el contingut modificat o no seguit en els submòduls)"
-#: wt-status.c:236
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " (useu \"git %s <fitxer>...\" per a incloure-ho en què es cometrà)"
-#: wt-status.c:251
+#: wt-status.c:252
msgid "both deleted:"
msgstr "suprimit per ambdós:"
-#: wt-status.c:253
+#: wt-status.c:254
msgid "added by us:"
msgstr "afegit per nosaltres:"
-#: wt-status.c:255
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "suprimit per ells:"
-#: wt-status.c:257
+#: wt-status.c:258
msgid "added by them:"
msgstr "afegit per ells:"
-#: wt-status.c:259
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "suprimit per nosaltres:"
-#: wt-status.c:261
+#: wt-status.c:262
msgid "both added:"
msgstr "afegit per ambdós:"
-#: wt-status.c:263
+#: wt-status.c:264
msgid "both modified:"
msgstr "modificat per ambdós:"
-#: wt-status.c:265
-#, c-format
-msgid "bug: unhandled unmerged status %x"
-msgstr "bug: estat no fusionat no gestionat %x"
-
-#: wt-status.c:273
+#: wt-status.c:274
msgid "new file:"
msgstr "fitxer nou:"
-#: wt-status.c:275
+#: wt-status.c:276
msgid "copied:"
msgstr "copiat:"
-#: wt-status.c:277
+#: wt-status.c:278
msgid "deleted:"
msgstr "suprimit:"
-#: wt-status.c:279
+#: wt-status.c:280
msgid "modified:"
msgstr "modificat:"
-#: wt-status.c:281
+#: wt-status.c:282
msgid "renamed:"
msgstr "canviat de nom:"
-#: wt-status.c:283
+#: wt-status.c:284
msgid "typechange:"
msgstr "canviat de tipus:"
-#: wt-status.c:285
+#: wt-status.c:286
msgid "unknown:"
msgstr "desconegut:"
-#: wt-status.c:287
+#: wt-status.c:288
msgid "unmerged:"
msgstr "sense fusionar:"
-#: wt-status.c:369
+#: wt-status.c:370
msgid "new commits, "
msgstr "comissions noves, "
-#: wt-status.c:371
+#: wt-status.c:372
msgid "modified content, "
msgstr "contingut modificat, "
-#: wt-status.c:373
+#: wt-status.c:374
msgid "untracked content, "
msgstr "contingut no seguit, "
-#: wt-status.c:390
-#, c-format
-msgid "bug: unhandled diff status %c"
-msgstr "bug: estat de diferència no gestionat %c"
-
-#: wt-status.c:754
+#: wt-status.c:756
msgid "Submodules changed but not updated:"
msgstr "Submòduls canviats però no actualitzats:"
-#: wt-status.c:756
+#: wt-status.c:758
msgid "Submodule changes to be committed:"
msgstr "Canvis de submòdul a cometre:"
-#: wt-status.c:837
+#: wt-status.c:839
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -2029,226 +2675,230 @@ msgstr ""
"No toqueu la línia de sobre.\n"
"Tot el que hi ha a sota s'eliminarà."
-#: wt-status.c:948
+#: wt-status.c:950
msgid "You have unmerged paths."
msgstr "Teniu camins sense fusionar."
-#: wt-status.c:951
+#: wt-status.c:953
msgid " (fix conflicts and run \"git commit\")"
msgstr " (arregleu els conflictes i executeu \"git commit\")"
-#: wt-status.c:954
+#: wt-status.c:955
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (useu \"git merge --abort\" per a avortar la fusió)"
+
+#: wt-status.c:960
msgid "All conflicts fixed but you are still merging."
msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
-#: wt-status.c:957
+#: wt-status.c:963
msgid " (use \"git commit\" to conclude merge)"
msgstr " (useu \"git commit\" per a concloure la fusió)"
-#: wt-status.c:967
+#: wt-status.c:973
msgid "You are in the middle of an am session."
msgstr "Esteu enmig d'una sessió am."
-#: wt-status.c:970
+#: wt-status.c:976
msgid "The current patch is empty."
msgstr "El pedaç actual està buit."
-#: wt-status.c:974
+#: wt-status.c:980
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (arregleu els conflictes i després executeu \"git am --continue\")"
-#: wt-status.c:976
+#: wt-status.c:982
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)"
-#: wt-status.c:978
+#: wt-status.c:984
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (useu \"git am --abort\" per a restaurar la branca original)"
-#: wt-status.c:1105
+#: wt-status.c:1109
msgid "No commands done."
msgstr "No s'ha fet cap ordre."
-#: wt-status.c:1108
+#: wt-status.c:1112
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "Última ordre fet (%d ordre feta):"
+msgstr[0] "Última ordre feta (%d ordre feta):"
msgstr[1] "Últimes ordres fetes (%d ordres fetes):"
-#: wt-status.c:1119
+#: wt-status.c:1123
#, c-format
msgid " (see more in file %s)"
msgstr " (vegeu més en el fitxer %s)"
-#: wt-status.c:1124
+#: wt-status.c:1128
msgid "No commands remaining."
msgstr "No manca cap ordre."
-#: wt-status.c:1127
+#: wt-status.c:1131
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Ordre següent a fer (manca %d ordre):"
msgstr[1] "Ordres següents a fer (manquen %d ordres):"
-#: wt-status.c:1135
+#: wt-status.c:1139
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (useu \"git rebase --edit-todo\" per a veure i editar)"
-#: wt-status.c:1148
+#: wt-status.c:1152
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Actualment esteu rebasant la branca '%s' en '%s'."
-#: wt-status.c:1153
+#: wt-status.c:1157
msgid "You are currently rebasing."
msgstr "Actualment esteu rebasant."
-#: wt-status.c:1167
+#: wt-status.c:1171
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
" (arregleu els conflictes i després executeu \"git rebase --continue\")"
-#: wt-status.c:1169
+#: wt-status.c:1173
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (useu \"git rebase --skip\" per a saltar aquest pedaç)"
-#: wt-status.c:1171
+#: wt-status.c:1175
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (useu \"git rebase --abort\" per a agafar la branca original)"
-#: wt-status.c:1177
+#: wt-status.c:1181
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (tots els conflictes arreglats: executeu \"git rebase --continue\")"
-#: wt-status.c:1181
+#: wt-status.c:1185
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Actualment esteu dividint una comissió mentre rebaseu la branca '%s' en '%s'."
-#: wt-status.c:1186
+#: wt-status.c:1190
msgid "You are currently splitting a commit during a rebase."
msgstr "Actualment esteu dividint una comissió durant un rebasament."
-#: wt-status.c:1189
+#: wt-status.c:1193
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Una vegada que el vostre directori de treball sigui net, executeu \"git "
"rebase --continue\")"
-#: wt-status.c:1193
+#: wt-status.c:1197
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Actualment esteu editant una comissió mentre rebaseu la branca '%s' en '%s'."
-#: wt-status.c:1198
+#: wt-status.c:1202
msgid "You are currently editing a commit during a rebase."
msgstr "Actualment esteu editant una comissió durant un rebasament."
-#: wt-status.c:1201
+#: wt-status.c:1205
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)"
-#: wt-status.c:1203
+#: wt-status.c:1207
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (useu \"git rebase --continue\" una vegada que esteu satisfet amb els "
"vostres canvis)"
-#: wt-status.c:1213
+#: wt-status.c:1217
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Actualment esteu recollint com a cirera la comissió %s."
-#: wt-status.c:1218
+#: wt-status.c:1222
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")"
-#: wt-status.c:1221
+#: wt-status.c:1225
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (tots els conflictes arreglats: executeu \"git cherry-pick --continue\")"
-#: wt-status.c:1223
+#: wt-status.c:1227
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de recull de "
"cireres)"
-#: wt-status.c:1232
+#: wt-status.c:1236
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Actualment esteu revertint la comissió %s."
-#: wt-status.c:1237
+#: wt-status.c:1241
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (arregleu els conflictes i executeu \"git revert --continue\")"
-#: wt-status.c:1240
+#: wt-status.c:1244
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (tots els conflictes estan arreglats: executeu \"git revert --continue\")"
-#: wt-status.c:1242
+#: wt-status.c:1246
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)"
-#: wt-status.c:1253
+#: wt-status.c:1257
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Actualment esteu bisecant, heu començat des de la branca '%s'."
-#: wt-status.c:1257
+#: wt-status.c:1261
msgid "You are currently bisecting."
msgstr "Actualment esteu bisecant."
-#: wt-status.c:1260
+#: wt-status.c:1264
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (useu \"git bisect reset\" per a tornar a la branca original)"
-#: wt-status.c:1438
+#: wt-status.c:1464
msgid "On branch "
msgstr "En la branca "
-#: wt-status.c:1444
+#: wt-status.c:1470
msgid "interactive rebase in progress; onto "
msgstr "rebasament interactiu en progrés; sobre "
-#: wt-status.c:1446
+#: wt-status.c:1472
msgid "rebase in progress; onto "
msgstr "rebasament en progrés; sobre "
-#: wt-status.c:1451
+#: wt-status.c:1477
msgid "HEAD detached at "
msgstr "HEAD separat a "
-#: wt-status.c:1453
+#: wt-status.c:1479
msgid "HEAD detached from "
msgstr "HEAD separat de "
-#: wt-status.c:1456
+#: wt-status.c:1482
msgid "Not currently on any branch."
-msgstr "Actualment no en cap branca."
+msgstr "Actualment no s'és en cap branca."
-#: wt-status.c:1474
+#: wt-status.c:1500
msgid "Initial commit"
msgstr "Comissió inicial"
-#: wt-status.c:1488
+#: wt-status.c:1514
msgid "Untracked files"
msgstr "Fitxers no seguits"
-#: wt-status.c:1490
+#: wt-status.c:1516
msgid "Ignored files"
msgstr "Fitxers ignorats"
-#: wt-status.c:1494
+#: wt-status.c:1520
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2260,31 +2910,31 @@ msgstr ""
"oblidar-vos d'afegir fitxers nous per vós mateix (vegeu\n"
"'git help status')."
-#: wt-status.c:1500
+#: wt-status.c:1526
#, c-format
msgid "Untracked files not listed%s"
msgstr "Els fitxers no seguits no estan llistats%s"
-#: wt-status.c:1502
+#: wt-status.c:1528
msgid " (use -u option to show untracked files)"
msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)"
-#: wt-status.c:1508
+#: wt-status.c:1534
msgid "No changes"
msgstr "Sense canvis"
-#: wt-status.c:1513
+#: wt-status.c:1539
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n"
-#: wt-status.c:1516
+#: wt-status.c:1542
#, c-format
msgid "no changes added to commit\n"
msgstr "no hi ha canvis afegits a cometre\n"
-#: wt-status.c:1519
+#: wt-status.c:1545
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -2293,55 +2943,55 @@ msgstr ""
"no hi ha res afegit a cometre però fitxers no seguits estan presents (useu "
"\"git add\" per a seguir-los)\n"
-#: wt-status.c:1522
+#: wt-status.c:1548
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "no hi ha res afegit a cometre però fitxers no seguits estan presents\n"
-#: wt-status.c:1525
+#: wt-status.c:1551
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-"
"los)\n"
-#: wt-status.c:1528 wt-status.c:1533
+#: wt-status.c:1554 wt-status.c:1559
#, c-format
msgid "nothing to commit\n"
msgstr "no hi ha res a cometre\n"
-#: wt-status.c:1531
+#: wt-status.c:1557
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"
-#: wt-status.c:1535
+#: wt-status.c:1561
#, c-format
-msgid "nothing to commit, working directory clean\n"
-msgstr "no hi ha res a cometre, directori de treball net\n"
+msgid "nothing to commit, working tree clean\n"
+msgstr "no hi ha res a cometre, l'arbre de treball està net\n"
-#: wt-status.c:1642
+#: wt-status.c:1668
msgid "Initial commit on "
msgstr "Comissió inicial en "
-#: wt-status.c:1646
+#: wt-status.c:1672
msgid "HEAD (no branch)"
msgstr "HEAD (sense branca)"
-#: wt-status.c:1675
+#: wt-status.c:1701
msgid "gone"
msgstr "no hi és"
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1703 wt-status.c:1711
msgid "behind "
msgstr "darrere "
-#: wt-status.c:1680 wt-status.c:1683
+#: wt-status.c:1706 wt-status.c:1709
msgid "ahead "
msgstr "davant per "
-#: compat/precompose_utf8.c:57 builtin/clone.c:413
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
#, c-format
msgid "failed to unlink '%s'"
msgstr "s'ha fallat en desenllaçar '%s'"
@@ -2355,206 +3005,210 @@ msgstr "git add [<opcions>] [--] <especificació-de-camí>..."
msgid "unexpected diff status %c"
msgstr "estat de diff inesperat %c"
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:71 builtin/commit.c:281
msgid "updating files failed"
msgstr "s'ha fallat en actualitzar els fitxers"
-#: builtin/add.c:80
+#: builtin/add.c:81
#, c-format
msgid "remove '%s'\n"
msgstr "elimina '%s'\n"
-#: builtin/add.c:134
+#: builtin/add.c:136
msgid "Unstaged changes after refreshing the index:"
msgstr "Canvis no allistats després d'actualitzar l'índex:"
-#: builtin/add.c:194 builtin/rev-parse.c:797
+#: builtin/add.c:196 builtin/rev-parse.c:811
msgid "Could not read the index"
msgstr "No s'ha pogut llegir l'índex"
-#: builtin/add.c:205
+#: builtin/add.c:207
#, c-format
msgid "Could not open '%s' for writing."
msgstr "No s'ha pogut obrir '%s' per a escriptura."
-#: builtin/add.c:209
+#: builtin/add.c:211
msgid "Could not write patch"
msgstr "No s'ha pogut escriure el pedaç"
-#: builtin/add.c:212
+#: builtin/add.c:214
msgid "editing patch failed"
msgstr "l'edició del pedaç ha fallat"
-#: builtin/add.c:215
+#: builtin/add.c:217
#, c-format
msgid "Could not stat '%s'"
msgstr "No s'ha pogut fer stat a '%s'"
-#: builtin/add.c:217
+#: builtin/add.c:219
msgid "Empty patch. Aborted."
-msgstr "El pedaç és buit. Avortat."
+msgstr "El pedaç és buit. S'ha avortat."
-#: builtin/add.c:222
+#: builtin/add.c:224
#, c-format
msgid "Could not apply '%s'"
msgstr "No s'ha pogut aplicar '%s'"
-#: builtin/add.c:232
+#: builtin/add.c:234
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
-#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
-#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
+#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "marxa en sec"
-#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
+#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
+#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
msgid "be verbose"
msgstr "sigues detallat"
-#: builtin/add.c:252
+#: builtin/add.c:256
msgid "interactive picking"
msgstr "recull interactiu"
-#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
+#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "selecciona els trossos interactivament"
-#: builtin/add.c:254
+#: builtin/add.c:258
msgid "edit current diff and apply"
msgstr "edita la diferència actual i aplica-la"
-#: builtin/add.c:255
+#: builtin/add.c:259
msgid "allow adding otherwise ignored files"
msgstr "permet afegir fitxers que d'altra manera s'ignoren"
-#: builtin/add.c:256
+#: builtin/add.c:260
msgid "update tracked files"
msgstr "actualitza els fitxers seguits"
-#: builtin/add.c:257
+#: builtin/add.c:261
msgid "record only the fact that the path will be added later"
msgstr "registra només el fet que el camí s'afegirà més tard"
-#: builtin/add.c:258
+#: builtin/add.c:262
msgid "add changes from all tracked and untracked files"
msgstr "afegeix els canvis de tots els fitxers seguits i no seguits"
-#: builtin/add.c:261
+#: builtin/add.c:265
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"ignora els camins eliminats en l'arbre de treball (el mateix que --no-all)"
-#: builtin/add.c:263
+#: builtin/add.c:267
msgid "don't add, only refresh the index"
msgstr "no afegeixis, només actualitza l'índex"
-#: builtin/add.c:264
+#: builtin/add.c:268
msgid "just skip files which cannot be added because of errors"
msgstr "només omet els fitxers que no es poden afegir a causa d'errors"
-#: builtin/add.c:265
+#: builtin/add.c:269
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec"
-#: builtin/add.c:287
+#: builtin/add.c:270 builtin/update-index.c:958
+msgid "(+/-)x"
+msgstr "(+/-)x"
+
+#: builtin/add.c:270 builtin/update-index.c:959
+msgid "override the executable bit of the listed files"
+msgstr "passa per alt el bit executable dels fitxers llistats"
+
+#: builtin/add.c:292
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Useu -f si realment els voleu afegir.\n"
-#: builtin/add.c:294
+#: builtin/add.c:300
msgid "adding files failed"
msgstr "l'afegiment de fitxers ha fallat"
-#: builtin/add.c:330
+#: builtin/add.c:336
msgid "-A and -u are mutually incompatible"
msgstr "-A i -u són mutualment incompatibles"
-#: builtin/add.c:337
+#: builtin/add.c:343
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "L'opció --ignore-missing només es pot usar junt amb --dry-run"
#: builtin/add.c:352
#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "el paràmetre --chmod '%s' ha de ser o -x o +x"
+
+#: builtin/add.c:367
+#, c-format
msgid "Nothing specified, nothing added.\n"
-msgstr "Res especificat, res afegit.\n"
+msgstr "No s'ha especificat res, no s'ha afegit res.\n"
-#: builtin/add.c:353
+#: builtin/add.c:368
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Potser volíeu dir 'git add .'?\n"
-#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:35
+#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
+#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
msgid "index file corrupt"
msgstr "fitxer d'índex malmès"
-#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
+#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
msgid "Unable to write new index file"
msgstr "no s'ha pogut escriure un fitxer d'índex nou"
-#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
+#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
#, c-format
msgid "could not read '%s'"
msgstr "no s'ha pogut llegir '%s'"
-#: builtin/am.c:430
+#: builtin/am.c:426
msgid "could not parse author script"
msgstr "no s'ha pogut analitzar l'script d'autor"
-#: builtin/am.c:507
+#: builtin/am.c:503
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr "s'ha suprimit '%s' per el ganxo applypatch-msg"
+msgstr "s'ha suprimit '%s' pel ganxo applypatch-msg"
-#: builtin/am.c:548 builtin/notes.c:300
+#: builtin/am.c:544 builtin/notes.c:301
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Línia d'entrada mal formada: '%s'."
-#: builtin/am.c:585 builtin/notes.c:315
+#: builtin/am.c:581 builtin/notes.c:316
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "S'ha fallat en copiar les notes de '%s' a '%s'"
-#: builtin/am.c:611
+#: builtin/am.c:607
msgid "fseek failed"
msgstr "fseek ha fallat"
-#: builtin/am.c:772 builtin/am.c:860
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr "no s'ha pogut obrir '%s' per a lectura: %s"
-
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "no s'ha pogut obrir '%s' per a escriptura: %s"
-
-#: builtin/am.c:788
+#: builtin/am.c:787
#, c-format
msgid "could not parse patch '%s'"
msgstr "no s'ha pogut analitzar el pedaç '%s'"
-#: builtin/am.c:853
+#: builtin/am.c:852
msgid "Only one StGIT patch series can be applied at once"
msgstr "només una sèrie de pedaços StGIT es pot aplicar a la vegada"
-#: builtin/am.c:901
+#: builtin/am.c:899
msgid "invalid timestamp"
msgstr "marca de temps no vàlida"
-#: builtin/am.c:904 builtin/am.c:912
+#: builtin/am.c:902 builtin/am.c:910
msgid "invalid Date line"
msgstr "línia Date no vàlida"
-#: builtin/am.c:909
+#: builtin/am.c:907
msgid "invalid timezone offset"
msgstr "desplaçament de zona de temps no vàlid"
@@ -2562,7 +3216,7 @@ msgstr "desplaçament de zona de temps no vàlid"
msgid "Patch format detection failed."
msgstr "La detecció de format de pedaç ha fallat."
-#: builtin/am.c:1001 builtin/clone.c:378
+#: builtin/am.c:1001 builtin/clone.c:380
#, c-format
msgid "failed to create directory '%s'"
msgstr "s'ha fallat en crear el directori '%s'"
@@ -2571,7 +3225,7 @@ msgstr "s'ha fallat en crear el directori '%s'"
msgid "Failed to split patches."
msgstr "S'ha fallat en dividir els pedaços."
-#: builtin/am.c:1137 builtin/commit.c:363
+#: builtin/am.c:1137 builtin/commit.c:366
msgid "unable to write index file"
msgstr "no s'ha pogut escriure el fitxer d'índex"
@@ -2583,7 +3237,8 @@ msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"."
#: builtin/am.c:1189
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr "Si preferiu saltar aquest pedaç, executeu \"%s --skip\" en lloc."
+msgstr ""
+"Si preferiu saltar aquest pedaç, executeu \"%s --skip\" en lloc d'això."
#: builtin/am.c:1190
#, c-format
@@ -2596,7 +3251,7 @@ msgstr ""
msgid "Patch is empty. Was it split wrong?"
msgstr "El pedaç és buit. S'ha dividit malament?"
-#: builtin/am.c:1402 builtin/log.c:1350
+#: builtin/am.c:1402 builtin/log.c:1543
#, c-format
msgid "invalid ident line: %s"
msgstr "línia d'identitat no vàlida: %s"
@@ -2606,17 +3261,17 @@ msgstr "línia d'identitat no vàlida: %s"
msgid "unable to parse commit %s"
msgstr "no s'ha pogut analitzar la comissió %s"
-#: builtin/am.c:1631
+#: builtin/am.c:1602
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 "
"vies."
-#: builtin/am.c:1633
+#: builtin/am.c:1604
msgid "Using index info to reconstruct a base tree..."
-msgstr "Usant la informació d'índex per a reconstruir un arbre base..."
+msgstr "S'està usant la informació d'índex per a reconstruir un arbre base..."
-#: builtin/am.c:1652
+#: builtin/am.c:1623
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2624,38 +3279,38 @@ msgstr ""
"Heu editat el vostre pedaç a mà?\n"
"No s'aplica als blobs recordats en el seu índex."
-#: builtin/am.c:1658
+#: builtin/am.c:1629
msgid "Falling back to patching base and 3-way merge..."
-msgstr "Retrocedint a apedaçar la base i fusionar de 3 vies..."
+msgstr "S'està retrocedint a apedaçar la base i fusionar de 3 vies..."
-#: builtin/am.c:1673
+#: builtin/am.c:1654
msgid "Failed to merge in the changes."
msgstr "S'ha fallat en fusionar els canvis."
-#: builtin/am.c:1697 builtin/merge.c:633
+#: builtin/am.c:1679 builtin/merge.c:628
msgid "git write-tree failed to write a tree"
msgstr "git write-tree ha fallat en escriure un arbre"
-#: builtin/am.c:1704
+#: builtin/am.c:1686
msgid "applying to an empty history"
-msgstr "aplicant a una història buida"
+msgstr "s'està aplicant a una història buida"
-#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
-#: builtin/merge.c:855
+#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
+#: builtin/merge.c:823
msgid "failed to write commit object"
msgstr "s'ha fallat en escriure l'objecte de comissió"
-#: builtin/am.c:1749 builtin/am.c:1753
+#: builtin/am.c:1731 builtin/am.c:1735
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "no es pot reprendre: %s no existeix."
-#: builtin/am.c:1769
+#: builtin/am.c:1751
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"no es pot ser interactiu sense que stdin sigui connectat a un terminal."
-#: builtin/am.c:1774
+#: builtin/am.c:1756
msgid "Commit Body is:"
msgstr "El cos de la comissió és:"
@@ -2663,37 +3318,37 @@ msgstr "El cos de la comissió és:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1784
+#: builtin/am.c:1766
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls "
"tots: "
-#: builtin/am.c:1834
+#: builtin/am.c:1816
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Ãndex brut: no es pot aplicar pedaços (bruts: %s)"
-#: builtin/am.c:1869 builtin/am.c:1941
+#: builtin/am.c:1853 builtin/am.c:1925
#, c-format
msgid "Applying: %.*s"
-msgstr "Aplicant: %.*s"
+msgstr "S'està aplicant: %.*s"
-#: builtin/am.c:1885
+#: builtin/am.c:1869
msgid "No changes -- Patch already applied."
msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
-#: builtin/am.c:1893
+#: builtin/am.c:1877
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El pedaç ha fallat a %s %.*s"
-#: builtin/am.c:1899
+#: builtin/am.c:1883
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "La còpia del pedaç que ha fallat es troba en: %s"
-#: builtin/am.c:1944
+#: builtin/am.c:1928
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2703,7 +3358,7 @@ msgstr ""
"Si no hi ha res a allistar, probablement alguna altra cosa\n"
"ja ha introduït els mateixos canvis; potser voleu ometre aquest pedaç."
-#: builtin/am.c:1951
+#: builtin/am.c:1935
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2711,17 +3366,17 @@ msgstr ""
"Encara teniu camins sense fusionar en el vostre índex.\n"
"Heu oblidat d'usar 'git add'?"
-#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
+#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "No s'ha pogut analitzar l'objecte '%s'."
-#: builtin/am.c:2111
+#: builtin/am.c:2095
msgid "failed to clean index"
msgstr "s'ha fallat en netejar l'índex"
-#: builtin/am.c:2145
+#: builtin/am.c:2129
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -2729,154 +3384,156 @@ msgstr ""
"Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n"
"No rebobinant a ORIG_HEAD"
-#: builtin/am.c:2206
+#: builtin/am.c:2192
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor no vàlid per a --patch-format: %s"
-#: builtin/am.c:2239
+#: builtin/am.c:2225
msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr "git am [<opcions>] [(<bústia>|<directori-de-correu>)...]"
-#: builtin/am.c:2240
+#: builtin/am.c:2226
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opcions>] (--continue | --skip | --abort)"
-#: builtin/am.c:2246
+#: builtin/am.c:2232
msgid "run interactively"
msgstr "executa interactivament"
-#: builtin/am.c:2248
+#: builtin/am.c:2234
msgid "historical option -- no-op"
msgstr "opció històrica -- no-op"
-#: builtin/am.c:2250
+#: builtin/am.c:2236
msgid "allow fall back on 3way merging if needed"
msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
-#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
-#: builtin/repack.c:171
+#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
+#: builtin/repack.c:172
msgid "be quiet"
msgstr "calla"
-#: builtin/am.c:2253
+#: builtin/am.c:2239
msgid "add a Signed-off-by line to the commit message"
msgstr "afegeix una línia Signed-off-by al missatge de comissió"
-#: builtin/am.c:2256
+#: builtin/am.c:2242
msgid "recode into utf8 (default)"
msgstr "recodifica en utf8 (per defecte)"
-#: builtin/am.c:2258
+#: builtin/am.c:2244
msgid "pass -k flag to git-mailinfo"
msgstr "passa la bandera -k al git-mailinfo"
-#: builtin/am.c:2260
+#: builtin/am.c:2246
msgid "pass -b flag to git-mailinfo"
msgstr "passa la bandera -b al git-mailinfo"
-#: builtin/am.c:2262
+#: builtin/am.c:2248
msgid "pass -m flag to git-mailinfo"
msgstr "passa la bandera -m al git-mailinfo"
-#: builtin/am.c:2264
+#: builtin/am.c:2250
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passa la bandera --keep-cr al git-mailsplit pel format mbox"
-#: builtin/am.c:2267
+#: builtin/am.c:2253
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"no passis la bandera --keep-cr al git-mailsplit independent de am.keepcr"
-#: builtin/am.c:2270
+#: builtin/am.c:2256
msgid "strip everything before a scissors line"
msgstr "despulla tot abans d'una línia de tissores"
-#: builtin/am.c:2271 builtin/apply.c:4544
+#: builtin/am.c:2257 builtin/apply.c:4837
msgid "action"
msgstr "acció"
-#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
-#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
-#: builtin/am.c:2299
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
+#: builtin/am.c:2285
msgid "pass it through git-apply"
msgstr "passa-ho a través del git-apply"
-#: builtin/am.c:2280 builtin/apply.c:4568
+#: builtin/am.c:2266 builtin/apply.c:4861
msgid "root"
msgstr "arrel"
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
-#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
-#: builtin/pull.c:171 builtin/submodule--helper.c:72
-#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
+#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
+#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:826
msgid "path"
msgstr "camí"
-#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 builtin/pull.c:185
-#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 builtin/pull.c:193
+#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:645
#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2292 builtin/apply.c:4512
+#: builtin/am.c:2278 builtin/apply.c:4805
msgid "num"
msgstr "número"
-#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "format"
-#: builtin/am.c:2296
+#: builtin/am.c:2282
msgid "format the patch(es) are in"
msgstr "el format en el qual estan els pedaços"
-#: builtin/am.c:2302
+#: builtin/am.c:2288
msgid "override error message when patch failure occurs"
msgstr ""
"passa per alt el missatge d'error quan s'ocorre una fallada en apedaçar"
-#: builtin/am.c:2304
+#: builtin/am.c:2290
msgid "continue applying patches after resolving a conflict"
msgstr "segueix aplicant pedaços després de resoldre un conflicte"
-#: builtin/am.c:2307
+#: builtin/am.c:2293
msgid "synonyms for --continue"
msgstr "sinònims de --continue"
-#: builtin/am.c:2310
+#: builtin/am.c:2296
msgid "skip the current patch"
msgstr "salta el pedaç actual"
-#: builtin/am.c:2313
+#: builtin/am.c:2299
msgid "restore the original branch and abort the patching operation."
msgstr "restaura la branca original i avorta l'operació d'apedaçament."
-#: builtin/am.c:2317
+#: builtin/am.c:2303
msgid "lie about committer date"
msgstr "menteix sobre la data del comitent"
-#: builtin/am.c:2319
+#: builtin/am.c:2305
msgid "use current timestamp for author date"
msgstr "usa el marc de temps actual per la data d'autor"
-#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "ID de clau"
-#: builtin/am.c:2322
+#: builtin/am.c:2308
msgid "GPG-sign commits"
-msgstr "firma les comissions amb GPG"
+msgstr "signa les comissions amb GPG"
-#: builtin/am.c:2325
+#: builtin/am.c:2311
msgid "(internal use for git-rebase)"
msgstr "(ús intern per al git-rebase)"
-#: builtin/am.c:2340
+#: builtin/am.c:2326
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -2884,18 +3541,18 @@ msgstr ""
"Fa molt que l'opció -b/--binary no ha fet res, i\n"
"s'eliminarà. Si us plau, no l'useu més."
-#: builtin/am.c:2347
+#: builtin/am.c:2333
msgid "failed to read the index"
msgstr "s'ha fallat en llegir l'índex"
-#: builtin/am.c:2362
+#: builtin/am.c:2348
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"un directori de rebasament anterior %s encara existeix però s'ha donat una "
"bústia."
-#: builtin/am.c:2386
+#: builtin/am.c:2372
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -2904,73 +3561,73 @@ msgstr ""
"Directori %s extraviat trobat.\n"
"Useu \"git am --abort\" per a eliminar-lo."
-#: builtin/am.c:2392
+#: builtin/am.c:2378
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Operació de resolució no en curs; no reprenem."
-#: builtin/apply.c:59
+#: builtin/apply.c:122
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<opcions>] [<pedaç>...]"
-#: builtin/apply.c:111
+#: builtin/apply.c:153
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "opció d'espai en blanc '%s' no reconeguda"
-#: builtin/apply.c:126
+#: builtin/apply.c:169
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "opció d'ignoral d'espai en blanc '%s' no reconeguda"
-#: builtin/apply.c:818
+#: builtin/apply.c:854
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "No es pot preparar l'expressió regular de marca de temps %s"
-#: builtin/apply.c:827
+#: builtin/apply.c:863
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec ha retornat %d per l'entrada: %s"
-#: builtin/apply.c:908
+#: builtin/apply.c:947
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "no s'ha pogut trobar el nom de fitxer en el pedaç a la línia %d"
-#: builtin/apply.c:940
+#: builtin/apply.c:984
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: git-diff dolent - /dev/null esperat, %s rebut en la línia %d"
-#: builtin/apply.c:944
+#: builtin/apply.c:989
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: git-diff dolent - nom de fitxer nou inconsistent en la línia %d"
-#: builtin/apply.c:945
+#: builtin/apply.c:990
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: git-diff dolent - nom de fitxer antic inconsistent en la línia %d"
-#: builtin/apply.c:952
+#: builtin/apply.c:995
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff dolent - /dev/null esperat en la línia %d"
-#: builtin/apply.c:1415
+#: builtin/apply.c:1489
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recompte: línia inesperada: %.*s"
-#: builtin/apply.c:1472
+#: builtin/apply.c:1550
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s"
-#: builtin/apply.c:1489
+#: builtin/apply.c:1567
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -2985,77 +3642,77 @@ msgstr[1] ""
"a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
"%d components de nom de camí inicial (línia %d)"
-#: builtin/apply.c:1655
+#: builtin/apply.c:1743
msgid "new file depends on old contents"
msgstr "el fitxer nou depèn dels continguts antics"
-#: builtin/apply.c:1657
+#: builtin/apply.c:1745
msgid "deleted file still has contents"
msgstr "el fitxer suprimit encara té continguts"
-#: builtin/apply.c:1683
+#: builtin/apply.c:1774
#, c-format
msgid "corrupt patch at line %d"
msgstr "el pedaç és malmès a la línia %d"
-#: builtin/apply.c:1719
+#: builtin/apply.c:1810
#, c-format
msgid "new file %s depends on old contents"
msgstr "el fitxer nou %s depèn dels continguts antics"
-#: builtin/apply.c:1721
+#: builtin/apply.c:1812
#, c-format
msgid "deleted file %s still has contents"
msgstr "el fitxer suprimit %s encara té continguts"
-#: builtin/apply.c:1724
+#: builtin/apply.c:1815
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "** avís: el fitxer %s queda buit però no se suprimeix"
+msgstr "** advertència: el fitxer %s queda buit però no se suprimeix"
-#: builtin/apply.c:1870
+#: builtin/apply.c:1962
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "pedaç binari malmès a la línia %d: %.*s"
-#: builtin/apply.c:1899
+#: builtin/apply.c:1999
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "pedaç binari no reconegut a la línia %d"
-#: builtin/apply.c:2050
+#: builtin/apply.c:2154
#, c-format
msgid "patch with only garbage at line %d"
msgstr "pedaç amb només escombraries a la línia %d"
-#: builtin/apply.c:2140
+#: builtin/apply.c:2244
#, c-format
msgid "unable to read symlink %s"
msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2248
#, c-format
msgid "unable to open or read %s"
msgstr "no s'ha pogut obrir o llegir %s"
-#: builtin/apply.c:2777
+#: builtin/apply.c:2901
#, c-format
msgid "invalid start of line: '%c'"
msgstr "inici de línia no vàlid: '%c'"
-#: builtin/apply.c:2896
+#: builtin/apply.c:3020
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "El tros #%d ha tingut èxit a %d (desplaçament %d línia)."
msgstr[1] "El tros #%d ha tingut èxit a %d (desplaçament %d línies)."
-#: builtin/apply.c:2908
+#: builtin/apply.c:3032
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d"
-#: builtin/apply.c:2914
+#: builtin/apply.c:3038
#, c-format
msgid ""
"while searching for:\n"
@@ -3064,336 +3721,341 @@ msgstr ""
"tot cercant:\n"
"%.*s"
-#: builtin/apply.c:2934
+#: builtin/apply.c:3060
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "manquen les dades de pedaç binari de '%s'"
-#: builtin/apply.c:3035
+#: builtin/apply.c:3163
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "el pedaç binari no s'aplica a '%s'"
-#: builtin/apply.c:3041
+#: builtin/apply.c:3169
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"el pedaç binari a '%s' crea un resultat incorrecte (esperant %s, %s rebut)"
-#: builtin/apply.c:3062
+#: builtin/apply.c:3190
#, c-format
msgid "patch failed: %s:%ld"
msgstr "el pedaç ha fallat: %s:%ld"
-#: builtin/apply.c:3186
+#: builtin/apply.c:3314
#, c-format
msgid "cannot checkout %s"
msgstr "no es pot agafar %s"
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
-#, c-format
-msgid "read of %s failed"
-msgstr "la lectura de %s ha fallat"
-
-#: builtin/apply.c:3239
+#: builtin/apply.c:3370
#, c-format
msgid "reading from '%s' beyond a symbolic link"
-msgstr "llegint de '%s' més enllà d'un enllaç simbòlic"
+msgstr "s'està llegint de '%s' més enllà d'un enllaç simbòlic"
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3399 builtin/apply.c:3630
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3482 builtin/apply.c:3644
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: no existeix en l'índex"
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3491 builtin/apply.c:3652
#, c-format
msgid "%s: does not match index"
msgstr "%s: no coincideix amb l'índex"
-#: builtin/apply.c:3459
+#: builtin/apply.c:3597
msgid "removal patch leaves file contents"
msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
-#: builtin/apply.c:3528
+#: builtin/apply.c:3669
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipus erroni"
-#: builtin/apply.c:3530
+#: builtin/apply.c:3671
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s és del tipus %o, s'esperava %o"
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3822 builtin/apply.c:3824
#, c-format
msgid "invalid path '%s'"
msgstr "camí no vàlid: %s"
-#: builtin/apply.c:3746
+#: builtin/apply.c:3879
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ja existeix en l'índex"
-#: builtin/apply.c:3749
+#: builtin/apply.c:3882
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ja existeix en el directori de treball"
-#: builtin/apply.c:3769
+#: builtin/apply.c:3902
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o)"
-#: builtin/apply.c:3774
+#: builtin/apply.c:3907
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o) de %s"
-#: builtin/apply.c:3794
+#: builtin/apply.c:3927
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "el fitxer afectat '%s' és més enllà d'un enllaç simbòlic"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3931
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: el pedaç no s'aplica"
-#: builtin/apply.c:3812
+#: builtin/apply.c:3945
#, c-format
msgid "Checking patch %s..."
-msgstr "Comprovant el pedaç %s..."
+msgstr "S'està comprovant el pedaç %s..."
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry ha fallat per al camí '%s'"
-#: builtin/apply.c:4048
+#: builtin/apply.c:4182
#, c-format
msgid "unable to remove %s from index"
msgstr "no s'ha pogut eliminar %s de l'índex"
-#: builtin/apply.c:4077
+#: builtin/apply.c:4215
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "pedaç malmès per al submòdul %s"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4219
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "no s'ha pogut fer stat al fitxer novament creat '%s'"
-#: builtin/apply.c:4086
+#: builtin/apply.c:4224
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat "
"%s"
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4227 builtin/apply.c:4340
#, c-format
msgid "unable to add cache entry for %s"
msgstr "no s'ha pogut afegir una entrada de cau per a %s"
-#: builtin/apply.c:4122
+#: builtin/apply.c:4260
#, c-format
msgid "closing file '%s'"
-msgstr "tancant el fitxer '%s'"
+msgstr "s'està tancant el fitxer '%s'"
-#: builtin/apply.c:4171
+#: builtin/apply.c:4313
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "no s'ha pogut escriure el fitxer '%s' mode %o"
-#: builtin/apply.c:4258
+#: builtin/apply.c:4403
#, c-format
msgid "Applied patch %s cleanly."
msgstr "El pedaç %s s'ha aplicat netament."
-#: builtin/apply.c:4266
+#: builtin/apply.c:4411
msgid "internal error"
msgstr "error intern"
-#: builtin/apply.c:4269
+#: builtin/apply.c:4414
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] "Aplicant el pedaç %%s amb %d rebuig"
-msgstr[1] "Aplicant el pedaç %%s amb %d rebuitjos"
+msgstr[0] "S'està aplicant el pedaç %%s amb %d rebuig..."
+msgstr[1] "S'està aplicant el pedaç %%s amb %d rebuitjos..."
-#: builtin/apply.c:4279
+#: builtin/apply.c:4424
#, c-format
msgid "truncating .rej filename to %.*s.rej"
-msgstr "truncant el nom del fitxer .rej a %.*s.rej"
+msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej"
-#: builtin/apply.c:4300
+#: builtin/apply.c:4432
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "no es pot obrir %s: %s"
+
+#: builtin/apply.c:4445
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "El tros #%d s'ha aplicat netament."
-#: builtin/apply.c:4303
+#: builtin/apply.c:4448
#, c-format
msgid "Rejected hunk #%d."
msgstr "S'ha rebutjat el tros #%d."
-#: builtin/apply.c:4393
+#: builtin/apply.c:4537
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "S'ha saltat el pedaç '%s'."
+
+#: builtin/apply.c:4545
msgid "unrecognized input"
msgstr "entrada no reconeguda"
-#: builtin/apply.c:4404
+#: builtin/apply.c:4556
msgid "unable to read index file"
msgstr "no es pot llegir el fitxer d'índex"
-#: builtin/apply.c:4507
+#: builtin/apply.c:4701
+msgid "--3way outside a repository"
+msgstr "--3way fora d'un dipòsit"
+
+#: builtin/apply.c:4709
+msgid "--index outside a repository"
+msgstr "--index fora d'un dipòsit"
+
+#: builtin/apply.c:4712
+msgid "--cached outside a repository"
+msgstr "--cached fora d'un dipòsit"
+
+#: builtin/apply.c:4745
+#, c-format
+msgid "can't open patch '%s'"
+msgstr "no es pot obrir el pedaç '%s'"
+
+#: builtin/apply.c:4760
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "s'ha omès %d error d'espai en blanc"
+msgstr[1] "s'han omès %d errors d'espai en blanc"
+
+#: builtin/apply.c:4766 builtin/apply.c:4776
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d línia afegeix errors d'espai en blanc."
+msgstr[1] "%d línies afegeixen errors d'espai en blanc."
+
+#: builtin/apply.c:4800
msgid "don't apply changes matching the given path"
msgstr "no apliquis els canvis que coincideixin amb el camí donat"
-#: builtin/apply.c:4510
+#: builtin/apply.c:4803
msgid "apply changes matching the given path"
msgstr "aplica els canvis que coincideixin amb el camí donat"
-#: builtin/apply.c:4513
+#: builtin/apply.c:4806
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"elimina <nombre> barres obliqües inicials dels camins de diferència "
"tradicionals"
-#: builtin/apply.c:4516
+#: builtin/apply.c:4809
msgid "ignore additions made by the patch"
msgstr "ignora afegiments fets pel pedaç"
-#: builtin/apply.c:4518
+#: builtin/apply.c:4811
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada"
-#: builtin/apply.c:4522
+#: builtin/apply.c:4815
msgid "show number of added and deleted lines in decimal notation"
msgstr "mostra el nombre de línies afegides i suprimides en notació decimal"
-#: builtin/apply.c:4524
+#: builtin/apply.c:4817
msgid "instead of applying the patch, output a summary for the input"
msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4819
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable"
-#: builtin/apply.c:4528
+#: builtin/apply.c:4821
msgid "make sure the patch is applicable to the current index"
msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
-#: builtin/apply.c:4530
+#: builtin/apply.c:4823
msgid "apply a patch without touching the working tree"
msgstr "aplica un pedaç sense tocar l'arbre de treball"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4825
msgid "accept a patch that touches outside the working area"
msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
-#: builtin/apply.c:4534
+#: builtin/apply.c:4827
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
-#: builtin/apply.c:4536
+#: builtin/apply.c:4829
msgid "attempt three-way merge if a patch does not apply"
msgstr "intenta una fusió de tres vies si el pedaç no s'aplica"
-#: builtin/apply.c:4538
+#: builtin/apply.c:4831
msgid "build a temporary index based on embedded index information"
msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
-#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
msgid "paths are separated with NUL character"
msgstr "els camins se separen amb el caràcter NUL"
-#: builtin/apply.c:4543
+#: builtin/apply.c:4836
msgid "ensure at least <n> lines of context match"
msgstr "assegura't que almenys <n> línies de context coincideixin"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4838
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"detecta les línies noves o modificades que tinguin errors d'espai en blanc"
-#: builtin/apply.c:4548 builtin/apply.c:4551
+#: builtin/apply.c:4841 builtin/apply.c:4844
msgid "ignore changes in whitespace when finding context"
msgstr "ignora els canvis d'espai en blanc en cercar context"
-#: builtin/apply.c:4554
+#: builtin/apply.c:4847
msgid "apply the patch in reverse"
msgstr "aplica el pedaç al revés"
-#: builtin/apply.c:4556
+#: builtin/apply.c:4849
msgid "don't expect at least one line of context"
msgstr "no esperis almenys una línia de context"
-#: builtin/apply.c:4558
+#: builtin/apply.c:4851
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "deixa els trossos rebutjats en fitxers *.reg coresspondents"
-#: builtin/apply.c:4560
+#: builtin/apply.c:4853
msgid "allow overlapping hunks"
msgstr "permet trossos encavalcants"
-#: builtin/apply.c:4563
+#: builtin/apply.c:4856
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolera una línia nova incorrectament detectada al final del fitxer"
-#: builtin/apply.c:4566
+#: builtin/apply.c:4859
msgid "do not trust the line counts in the hunk headers"
msgstr "no confiïs en els recomptes de línia en les capçaleres dels trossos"
-#: builtin/apply.c:4569
+#: builtin/apply.c:4862
msgid "prepend <root> to all filenames"
msgstr "anteposa <arrel> a tots els noms de fitxer"
-#: builtin/apply.c:4591
-msgid "--3way outside a repository"
-msgstr "--3way fora d'un dipòsit"
-
-#: builtin/apply.c:4599
-msgid "--index outside a repository"
-msgstr "--index fora d'un dipòsit"
-
-#: builtin/apply.c:4602
-msgid "--cached outside a repository"
-msgstr "--cached fora d'un dipòsit"
-
-#: builtin/apply.c:4621
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "no es pot obrir el pedaç '%s'"
-
-#: builtin/apply.c:4635
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] "%d error d'espai en blanc omès"
-msgstr[1] "%d errors d'espai en blanc omesos"
-
-#: builtin/apply.c:4641 builtin/apply.c:4651
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] "%d línia afegeix errors d'espai en blanc."
-msgstr[1] "%d línies afegeixen errors d'espai en blanc."
-
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
-msgstr "no es pot crear el fitxer d'arxiu '%s'"
+msgstr "no s'ha pogut crear el fitxer d'arxiu '%s'"
#: builtin/archive.c:20
msgid "could not redirect output"
@@ -3445,109 +4107,109 @@ msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)"
-#: builtin/blame.c:1782
+#: builtin/blame.c:1781
msgid "Blaming lines"
-msgstr "Culpant les línies"
+msgstr "S'estan culpant les línies"
-#: builtin/blame.c:2530
+#: builtin/blame.c:2536
msgid "Show blame entries as we find them, incrementally"
msgstr "Mostra les entrades de culpa mentre les trobem, incrementalment"
-#: builtin/blame.c:2531
+#: builtin/blame.c:2537
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
"Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: "
"desactivat)"
-#: builtin/blame.c:2532
+#: builtin/blame.c:2538
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"No tractis les comissions d'arrel com a límits (Per defecte: desactivat)"
-#: builtin/blame.c:2533
+#: builtin/blame.c:2539
msgid "Show work cost statistics"
msgstr "Mostra les estadístiques de preu de treball"
-#: builtin/blame.c:2534
+#: builtin/blame.c:2540
msgid "Force progress reporting"
msgstr "Força l'informe de progrés"
-#: builtin/blame.c:2535
+#: builtin/blame.c:2541
msgid "Show output score for blame entries"
msgstr "Mostra la puntuació de sortida de les entrades de culpa"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2542
msgid "Show original filename (Default: auto)"
msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2543
msgid "Show original linenumber (Default: off)"
msgstr "Mostra el número de línia original (Per defecte: desactivat)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2544
msgid "Show in a format designed for machine consumption"
msgstr "Presenta en un format dissenyat per consumpció per màquina"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2545
msgid "Show porcelain format with per-line commit information"
msgstr "Mostra el format de porcellana amb informació de comissió per línia"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2546
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2547
msgid "Show raw timestamp (Default: off)"
msgstr "Mostra la marca de temps crua (Per defecte: desactivat)"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2548
msgid "Show long commit SHA1 (Default: off)"
msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2549
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2550
msgid "Show author email instead of name (Default: off)"
msgstr ""
"Mostra l'adreça de correu electrònic de l'autor en lloc del nom (Per "
"defecte: desactivat)"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2551
msgid "Ignore whitespace differences"
msgstr "Ignora les diferències d'espai en blanc"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2552
msgid "Spend extra cycles to find better match"
msgstr "Gasta cicles extres per a trobar una coincidència millor"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2553
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2554
msgid "Use <file>'s contents as the final image"
msgstr "Usa els continguts de <fitxer> com a la imatge final"
-#: builtin/blame.c:2549 builtin/blame.c:2550
+#: builtin/blame.c:2555 builtin/blame.c:2556
msgid "score"
msgstr "puntuació"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2555
msgid "Find line copies within and across files"
msgstr "Troba còpies de línia dins i a través dels fitxers"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2556
msgid "Find line movements within and across files"
msgstr "Troba moviments de línia dins i a través dels fitxers"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2557
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2557
msgid "Process only line range n,m, counting from 1"
msgstr "Processa només el rang de línies n,m, comptant des d'1"
@@ -3557,56 +4219,56 @@ msgstr "Processa només el rang de línies n,m, comptant des d'1"
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2640
+#: builtin/blame.c:2649
msgid "4 years, 11 months ago"
msgstr "fa 4 anys i 11 mesos"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<opcions>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<opcions>] [-l] [-f] <nom-de-branca> [<punt-inicial>]"
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<opcions>] [-r] (-d | -D) <nom-de-branca>..."
-#: builtin/branch.c:28
+#: builtin/branch.c:29
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<opcions>] (-m | -M) [<branca-antiga>] <branca-nova>"
-#: builtin/branch.c:29
+#: builtin/branch.c:30
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<opcions>] [-r | -a] [--points-at]"
-#: builtin/branch.c:142
+#: builtin/branch.c:143
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
-"suprimint la branca '%s' que s'ha fusionat a\n"
-" '%s', però encara no s'ha fusionat\n"
-" a HEAD."
+"s'està suprimint la branca '%s' que s'ha\n"
+" fusionat a '%s', però encara no\n"
+" s'ha fusionat a HEAD."
-#: builtin/branch.c:146
+#: builtin/branch.c:147
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
-"no suprimint la branca '%s' que encara no s'ha\n"
-" fusionat a '%s', encara que està\n"
+"no s'està suprimint la branca '%s' que encara no\n"
+" s'ha fusionat a '%s', encara que està\n"
" fusionada a HEAD."
-#: builtin/branch.c:160
+#: builtin/branch.c:161
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "No s'ha pogut trobar l'objecte de comissió de '%s'"
-#: builtin/branch.c:164
+#: builtin/branch.c:165
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -3615,340 +4277,368 @@ msgstr ""
"La branca '%s' no està totalment fusionada.\n"
"Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'."
-#: builtin/branch.c:177
+#: builtin/branch.c:178
msgid "Update of config-file failed"
msgstr "L'actualització del fitxer de configuració ha fallat"
-#: builtin/branch.c:205
+#: builtin/branch.c:206
msgid "cannot use -a with -d"
msgstr "no es pot usar -a amb -d"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "Couldn't look up commit object for HEAD"
msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD"
-#: builtin/branch.c:219
+#: builtin/branch.c:226
#, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr "No es pot suprimir la branca '%s', en la qual sou actualment."
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "No es pot suprimir la branca '%s' agafada a '%s'"
-#: builtin/branch.c:235
+#: builtin/branch.c:241
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "no s'ha trobat la branca amb seguiment remot '%s'."
-#: builtin/branch.c:236
+#: builtin/branch.c:242
#, c-format
msgid "branch '%s' not found."
msgstr "no s'ha trobat la branca '%s'."
-#: builtin/branch.c:251
+#: builtin/branch.c:257
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Error en suprimir la branca amb seguiment remot '%s'"
-#: builtin/branch.c:252
+#: builtin/branch.c:258
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Error en suprimir la branca '%s'"
-#: builtin/branch.c:259
+#: builtin/branch.c:265
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "S'ha suprimit la branca amb seguiment remot %s (era %s).\n"
-#: builtin/branch.c:260
+#: builtin/branch.c:266
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "S'ha suprimit la branca %s (era %s).\n"
-#: builtin/branch.c:303
+#: builtin/branch.c:312
#, c-format
msgid "[%s: gone]"
msgstr "[%s: no hi és]"
-#: builtin/branch.c:308
+#: builtin/branch.c:317
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:313
+#: builtin/branch.c:322
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: darrere per %d]"
-#: builtin/branch.c:315
+#: builtin/branch.c:324
#, c-format
msgid "[behind %d]"
msgstr "[darrere de %d]"
-#: builtin/branch.c:319
+#: builtin/branch.c:328
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: davant per %d]"
-#: builtin/branch.c:321
+#: builtin/branch.c:330
#, c-format
msgid "[ahead %d]"
msgstr "[davant de %d]"
-#: builtin/branch.c:324
+#: builtin/branch.c:333
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: davant per %d, darrere per %d]"
-#: builtin/branch.c:327
+#: builtin/branch.c:336
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[davant %d, darrere %d]"
-#: builtin/branch.c:340
+#: builtin/branch.c:349
msgid " **** invalid ref ****"
msgstr " **** referència no vàlida ****"
-#: builtin/branch.c:366
+#: builtin/branch.c:375
#, c-format
msgid "(no branch, rebasing %s)"
-msgstr "(cap branca, rebasant %s)"
+msgstr "(cap branca, s'està rebasant %s)"
-#: builtin/branch.c:369
+#: builtin/branch.c:378
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(cap branca, bisecció començada en %s)"
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:384
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD separat a %s)"
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:389
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD separat de %s)"
-#: builtin/branch.c:382
+#: builtin/branch.c:393
msgid "(no branch)"
msgstr "(cap branca)"
-#: builtin/branch.c:524
+#: builtin/branch.c:544
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "La branca %s s'està rebasant a %s"
+
+#: builtin/branch.c:548
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "La branca %s s'està bisecant a %s"
+
+#: builtin/branch.c:563
msgid "cannot rename the current branch while not on any."
msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap."
-#: builtin/branch.c:534
+#: builtin/branch.c:573
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branca no vàlid: '%s'"
-#: builtin/branch.c:549
+#: builtin/branch.c:590
msgid "Branch rename failed"
msgstr "El canvi de nom de branca ha fallat"
-#: builtin/branch.c:553
+#: builtin/branch.c:594
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "S'ha canviat el nom de la branca malanomenada '%s'"
-#: builtin/branch.c:557
+#: builtin/branch.c:597
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "S'ha canviat el nom de la branca a %s, però HEAD no està actualitzat!"
-#: builtin/branch.c:564
+#: builtin/branch.c:604
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La branca està canviada de nom, però l'actualització del fitxer de "
"configuració ha fallat"
-#: builtin/branch.c:586
+#: builtin/branch.c:620
#, c-format
-msgid "could not write branch description template: %s"
-msgstr "no s'ha pogut escriure la plantilla de descripció de branca: %s"
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+"Si us plau, editeu la descripció de la branca\n"
+" %s\n"
+"Es despullaran les línies que comencin amb '%c'.\n"
-#: builtin/branch.c:615
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "Opcions genèriques"
-#: builtin/branch.c:617
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr "mostra el hash i l'assumpte, doneu dues vegades per la branca font"
-#: builtin/branch.c:618
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "omet els missatges informatius"
-#: builtin/branch.c:619
+#: builtin/branch.c:655
msgid "set up tracking mode (see git-pull(1))"
msgstr "configura el mode de seguiment (vegeu git-pull(1))"
-#: builtin/branch.c:621
+#: builtin/branch.c:657
msgid "change upstream info"
msgstr "canvia la informació de font"
-#: builtin/branch.c:625
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr "font"
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr "canvia la informació de font"
+
+#: builtin/branch.c:661
msgid "use colored output"
msgstr "usa sortida colorada"
-#: builtin/branch.c:626
+#: builtin/branch.c:662
msgid "act on remote-tracking branches"
msgstr "actua en branques amb seguiment remot"
-#: builtin/branch.c:628 builtin/branch.c:629
+#: builtin/branch.c:664 builtin/branch.c:665
msgid "print only branches that contain the commit"
msgstr "imprimeix només les branques que continguin la comissió"
-#: builtin/branch.c:632
+#: builtin/branch.c:668
msgid "Specific git-branch actions:"
msgstr "Accions de git-branch específiques:"
-#: builtin/branch.c:633
+#: builtin/branch.c:669
msgid "list both remote-tracking and local branches"
msgstr "llista les branques amb seguiment remot i les locals"
-#: builtin/branch.c:635
+#: builtin/branch.c:671
msgid "delete fully merged branch"
msgstr "suprimeix la branca si està completament fusionada"
-#: builtin/branch.c:636
+#: builtin/branch.c:672
msgid "delete branch (even if not merged)"
msgstr "suprimeix la branca (encara que no estigui fusionada)"
-#: builtin/branch.c:637
+#: builtin/branch.c:673
msgid "move/rename a branch and its reflog"
msgstr "mou/canvia de nom una branca i el seu registre de referència"
-#: builtin/branch.c:638
+#: builtin/branch.c:674
msgid "move/rename a branch, even if target exists"
msgstr "mou/canvia de nom una branca, encara que el destí existeixi"
-#: builtin/branch.c:639
+#: builtin/branch.c:675
msgid "list branch names"
msgstr "llista els noms de branca"
-#: builtin/branch.c:640
+#: builtin/branch.c:676
msgid "create the branch's reflog"
msgstr "crea el registre de referència de la branca"
-#: builtin/branch.c:642
+#: builtin/branch.c:678
msgid "edit the description for the branch"
msgstr "edita la descripció de la branca"
-#: builtin/branch.c:643
+#: builtin/branch.c:679
msgid "force creation, move/rename, deletion"
msgstr "força creació, moviment/canvi de nom, supressió"
-#: builtin/branch.c:644
+#: builtin/branch.c:680
msgid "print only branches that are merged"
msgstr "imprimeix només les branques que s'han fusionat"
-#: builtin/branch.c:645
+#: builtin/branch.c:681
msgid "print only branches that are not merged"
msgstr "imprimeix només les branques que no s'han fusionat"
-#: builtin/branch.c:646
+#: builtin/branch.c:682
msgid "list branches in columns"
msgstr "llista les branques en columnes"
-#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
msgid "key"
msgstr "clau"
-#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
msgid "field name to sort on"
msgstr "nom del camp en el qual ordenar"
-#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
-#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
+#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
#: builtin/tag.c:369
msgid "object"
msgstr "objecte"
-#: builtin/branch.c:651
+#: builtin/branch.c:687
msgid "print only branches of the object"
msgstr "imprimeix només les branques de l'objecte"
-#: builtin/branch.c:669
+#: builtin/branch.c:705
msgid "Failed to resolve HEAD as a valid ref."
msgstr "S'ha fallat en resoldre HEAD com a referència vàlida."
-#: builtin/branch.c:673 builtin/clone.c:705
+#: builtin/branch.c:709 builtin/clone.c:707
msgid "HEAD not found below refs/heads!"
msgstr "HEAD no trobat sota refs/heads!"
-#: builtin/branch.c:693
+#: builtin/branch.c:729
msgid "--column and --verbose are incompatible"
msgstr "--column i --verbose són incompatibles"
-#: builtin/branch.c:704 builtin/branch.c:746
+#: builtin/branch.c:740 builtin/branch.c:782
msgid "branch name required"
msgstr "cal el nom de branca"
-#: builtin/branch.c:722
+#: builtin/branch.c:758
msgid "Cannot give description to detached HEAD"
msgstr "No es pot donar descripció a un HEAD separat"
-#: builtin/branch.c:727
+#: builtin/branch.c:763
msgid "cannot edit description of more than one branch"
msgstr "no es pot editar la descripció de més d'una branca"
-#: builtin/branch.c:734
+#: builtin/branch.c:770
#, c-format
msgid "No commit on branch '%s' yet."
-msgstr "Encara no hi ha comissió en la branca '%s'."
+msgstr "Encara no hi ha cap comissió en la branca '%s'."
-#: builtin/branch.c:737
+#: builtin/branch.c:773
#, c-format
msgid "No branch named '%s'."
msgstr "No hi ha branca amb nom '%s'."
-#: builtin/branch.c:752
+#: builtin/branch.c:788
msgid "too many branches for a rename operation"
msgstr "hi ha massa branques per a una operació de canvi de nom"
-#: builtin/branch.c:757
+#: builtin/branch.c:793
msgid "too many branches to set new upstream"
msgstr "hi ha massa branques per a establir una nova font"
-#: builtin/branch.c:761
+#: builtin/branch.c:797
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
"no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca."
-#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
#, c-format
msgid "no such branch '%s'"
msgstr "no hi ha tal branca '%s'"
-#: builtin/branch.c:768
+#: builtin/branch.c:804
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branca '%s' no existeix"
-#: builtin/branch.c:780
+#: builtin/branch.c:816
msgid "too many branches to unset upstream"
msgstr "hi ha massa branques per a desestablir la font"
-#: builtin/branch.c:784
+#: builtin/branch.c:820
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"no s'ha pogut desestablir la font de HEAD perquè no assenyala cap branca."
-#: builtin/branch.c:790
+#: builtin/branch.c:826
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branca '%s' no té informació de font"
-#: builtin/branch.c:804
+#: builtin/branch.c:840
msgid "it does not make sense to create 'HEAD' manually"
msgstr "no té sentit crear 'HEAD' manualment"
-#: builtin/branch.c:810
+#: builtin/branch.c:846
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca"
-#: builtin/branch.c:813
+#: builtin/branch.c:849
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3957,7 +4647,7 @@ msgstr ""
"La bandera --set-upstream està desaprovada i s'eliminarà. Considereu usar --"
"track o --set-upstream-to\n"
-#: builtin/branch.c:830
+#: builtin/branch.c:866
#, c-format
msgid ""
"\n"
@@ -3968,16 +4658,6 @@ msgstr ""
"Si volíeu fer '%s' seguir '%s', feu això:\n"
"\n"
-#: builtin/branch.c:831
-#, c-format
-msgid " git branch -d %s\n"
-msgstr " git branch -d %s\n"
-
-#: builtin/branch.c:832
-#, c-format
-msgid " git branch --set-upstream-to %s\n"
-msgstr " git branch --set-upstream-to %s\n"
-
#: builtin/bundle.c:51
#, c-format
msgid "%s is okay\n"
@@ -3991,7 +4671,7 @@ msgstr "Cal un dipòsit per a fer un farcell."
msgid "Need a repository to unbundle."
msgstr "Cal un dipòsit per a desfer un farcell."
-#: builtin/cat-file.c:428
+#: builtin/cat-file.c:443
msgid ""
"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
"<type>|--textconv) <object>"
@@ -3999,57 +4679,57 @@ msgstr ""
"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
"<tipus>|--textconv) <objecte>"
-#: builtin/cat-file.c:429
+#: builtin/cat-file.c:444
msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-#: builtin/cat-file.c:466
+#: builtin/cat-file.c:481
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipus> pot ser un de: blob, tree, commit, tag"
-#: builtin/cat-file.c:467
+#: builtin/cat-file.c:482
msgid "show object type"
msgstr "mostra el tipus de l'objecte"
-#: builtin/cat-file.c:468
+#: builtin/cat-file.c:483
msgid "show object size"
msgstr "mostra la mida de l'objecte"
-#: builtin/cat-file.c:470
+#: builtin/cat-file.c:485
msgid "exit with zero when there's no error"
msgstr "surt amb zero quan no hi ha error"
-#: builtin/cat-file.c:471
+#: builtin/cat-file.c:486
msgid "pretty-print object's content"
msgstr "imprimeix bellament el contingut de l'objecte"
-#: builtin/cat-file.c:473
+#: builtin/cat-file.c:488
msgid "for blob objects, run textconv on object's content"
msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte"
-#: builtin/cat-file.c:475
+#: builtin/cat-file.c:490
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "permet que -s i -t funcionin amb objectes trencats/malmesos"
-#: builtin/cat-file.c:476
+#: builtin/cat-file.c:491
msgid "buffer --batch output"
msgstr "posa la sortida de --batch en memòria intermèdia"
-#: builtin/cat-file.c:478
+#: builtin/cat-file.c:493
msgid "show info and content of objects fed from the standard input"
msgstr ""
"mostra la informació i contingut dels objectes rebuts de l'entrada estàndard"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:496
msgid "show info about objects fed from the standard input"
msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard"
-#: builtin/cat-file.c:484
+#: builtin/cat-file.c:499
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)"
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:501
msgid "show all objects with --batch or --batch-check"
msgstr "mostra tots els objectes amb --batch o --batch-check"
@@ -4077,7 +4757,7 @@ msgstr "llegeix els noms de fitxer d'stdin"
msgid "terminate input and output records by a NUL character"
msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "omet el reportatge de progrés"
@@ -4148,7 +4828,7 @@ msgstr "força la sobreescriptura de fitxers existents"
#: builtin/checkout-index.c:163
msgid "no warning for existing files and files not in index"
-msgstr "cap avís per a fitxers existents i fitxers no en l'índex"
+msgstr "cap advertència per a fitxers existents i fitxers no en l'índex"
#: builtin/checkout-index.c:165
msgid "don't checkout new files"
@@ -4167,8 +4847,9 @@ msgid "write the content to temporary files"
msgstr "escriu el contingut a fitxers temporals"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
+#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
+#: builtin/submodule--helper.c:830 builtin/worktree.c:469
msgid "string"
msgstr "cadena"
@@ -4218,80 +4899,76 @@ msgstr "camí '%s': no es pot fusionar"
msgid "Unable to add merge result for '%s'"
msgstr "no s'ha pogut afegir el resultat de fusió per a '%s'"
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' no es pot usar amb actualització de camins"
-#: builtin/checkout.c:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' no es pot usar amb %s"
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"No es pot actualitzar els camins i canviar a la branca '%s' a la vegada."
-#: builtin/checkout.c:280 builtin/checkout.c:474
-msgid "corrupt index file"
-msgstr "fitxer d'índex malmès"
-
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
msgstr "el camí '%s' està sense fusionar"
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
msgid "you need to resolve your current index first"
-msgstr "heu de resoldre el vostre índex actual primer"
+msgstr "heu de primer resoldre el vostre índex actual"
-#: builtin/checkout.c:623
+#: builtin/checkout.c:625
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "No es pot fer reflog per a '%s': %s\n"
-#: builtin/checkout.c:661
+#: builtin/checkout.c:664
msgid "HEAD is now at"
msgstr "HEAD ara és a"
-#: builtin/checkout.c:665 builtin/clone.c:659
+#: builtin/checkout.c:668 builtin/clone.c:661
msgid "unable to update HEAD"
msgstr "no s'ha pogut actualitzar HEAD"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:672
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Restableix la branca '%s'\n"
-#: builtin/checkout.c:672
+#: builtin/checkout.c:675
#, c-format
msgid "Already on '%s'\n"
msgstr "Ja en '%s'\n"
-#: builtin/checkout.c:676
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "S'ha agafat i restablert la branca '%s'\n"
-#: builtin/checkout.c:678 builtin/checkout.c:1068
+#: builtin/checkout.c:681 builtin/checkout.c:1070
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "S'ha agafat la branca nova '%s'\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:683
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "S'ha agafat la branca '%s'\n"
-#: builtin/checkout.c:732
+#: builtin/checkout.c:734
#, c-format
msgid " ... and %d more.\n"
msgstr " ... i %d més.\n"
-#: builtin/checkout.c:738
+#: builtin/checkout.c:740
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4304,17 +4981,17 @@ msgid_plural ""
"\n"
"%s\n"
msgstr[0] ""
-"Avís: esteu deixant enrere %d comissió, no connectada a\n"
-"cap de les vostres branques:\n"
+"Advertència: esteu deixant enrere %d comissió, no\n"
+"connectada a cap de les vostres branques:\n"
"\n"
"%s\n"
msgstr[1] ""
-"Avís: esteu deixant enrere %d comissions, no connectades a\n"
-"cap de les vostres branques:\n"
+"Advertència: esteu deixant enrere %d comissions, no\n"
+"connectades a cap de les vostres branques:\n"
"\n"
"%s\n"
-#: builtin/checkout.c:757
+#: builtin/checkout.c:759
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4341,150 +5018,150 @@ msgstr[1] ""
" git branch <nom-de-branca-nova> %s\n"
"\n"
-#: builtin/checkout.c:793
+#: builtin/checkout.c:795
msgid "internal error in revision walk"
msgstr "error intern en el passeig per revisions"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:799
msgid "Previous HEAD position was"
msgstr "La posició de HEAD anterior era"
-#: builtin/checkout.c:824 builtin/checkout.c:1063
+#: builtin/checkout.c:826 builtin/checkout.c:1065
msgid "You are on a branch yet to be born"
msgstr "Sou en una branca que encara ha de nàixer"
-#: builtin/checkout.c:969
+#: builtin/checkout.c:971
#, c-format
msgid "only one reference expected, %d given."
-msgstr "només una referència esperada, %d donades."
+msgstr "s'esperava només una referència, s'han donat %d."
-#: builtin/checkout.c:1009 builtin/worktree.c:211
+#: builtin/checkout.c:1011 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "referència no vàlida: %s"
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1040
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referència no és un arbre: %s"
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1079
msgid "paths cannot be used with switching branches"
msgstr "els camins no es poden usar amb canvi de branca"
-#: builtin/checkout.c:1080 builtin/checkout.c:1084
+#: builtin/checkout.c:1082 builtin/checkout.c:1086
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' no es pot usar amb canvi de branca"
-#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
+#: builtin/checkout.c:1101
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' no es pot usar amb '%s'"
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1106
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "No es pot canviar la branca a la no comissió '%s'"
-#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
-#: builtin/worktree.c:320
+#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
+#: builtin/worktree.c:326
msgid "branch"
msgstr "branca"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1140
msgid "create and checkout a new branch"
msgstr "crea i agafa una branca nova"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1142
msgid "create/reset and checkout a branch"
msgstr "crea/restableix i agafa una branca"
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1143
msgid "create reflog for new branch"
msgstr "crea un registre de referència per a la branca nova"
-#: builtin/checkout.c:1142
-msgid "detach the HEAD at named commit"
-msgstr "separa el HEAD a la comissió anomenada"
+#: builtin/checkout.c:1144 builtin/worktree.c:328
+msgid "detach HEAD at named commit"
+msgstr "separa HEAD a la comissió anomenada"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1145
msgid "set upstream info for new branch"
msgstr "estableix la informació de font de la branca nova"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1147
msgid "new-branch"
msgstr "branca-nova"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1147
msgid "new unparented branch"
msgstr "branca òrfena nova"
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1148
msgid "checkout our version for unmerged files"
msgstr "agafa la versió nostra dels fitxers sense fusionar"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1150
msgid "checkout their version for unmerged files"
msgstr "agafa la versió seva dels fitxers sense fusionar"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1152
msgid "force checkout (throw away local modifications)"
msgstr "agafa a la força (descarta qualsevulla modificació local)"
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1153
msgid "perform a 3-way merge with the new branch"
msgstr "realitza una fusió de 3 vies amb la branca nova"
-#: builtin/checkout.c:1152 builtin/merge.c:227
+#: builtin/checkout.c:1154 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr "actualitza els fitxers ignorats (per defecte)"
-#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
+#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
msgid "style"
msgstr "estil"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1156
msgid "conflict style (merge or diff3)"
msgstr "estil de conflicte (fusió o diff3)"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1159
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitis les especificacions de camí només a entrades disperses"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1161
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "dubta 'git checkout <cap-branca-així>'"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1163
msgid "do not check if another worktree is holding the given ref"
msgstr "no comprovis si altre arbre de treball té la referència donada"
-#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
-#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
+#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117
+#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "força l'informe de progrés"
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1195
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B i --orphan són mutualment exclusius"
-#: builtin/checkout.c:1210
+#: builtin/checkout.c:1212
msgid "--track needs a branch name"
msgstr "--track necessita un nom de branca"
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1217
msgid "Missing branch name; try -b"
msgstr "Manca el nom de branca; proveu -b"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1253
msgid "invalid path specification"
msgstr "especificació de camí no vàlida"
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1260
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4493,12 +5170,12 @@ msgstr ""
"No es poden actualitzar els camins i canviar a la branca '%s' a la vegada.\n"
"Volíeu agafar '%s', la qual no es pot resoldre com a comissió?"
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1265
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach no accepta un paràmetre de camí '%s'"
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1269
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4515,7 +5192,7 @@ msgstr ""
#: builtin/clean.c:29
#, c-format
msgid "Removing %s\n"
-msgstr "Eliminant %s\n"
+msgstr "S'està eliminant %s\n"
#: builtin/clean.c:30
#, c-format
@@ -4525,7 +5202,7 @@ msgstr "Eliminaria %s\n"
#: builtin/clean.c:31
#, c-format
msgid "Skipping repository %s\n"
-msgstr "Saltant el dipòsit %s\n"
+msgstr "S'està saltant el dipòsit %s\n"
#: builtin/clean.c:32
#, c-format
@@ -4582,7 +5259,7 @@ msgstr "Introduïu els patrons a ignorar>> "
#: builtin/clean.c:690
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
-msgstr "AVÃS: No es pot trobar ítems que coincideixin amb: %s"
+msgstr "ADVERTÈNCIA: No es pot trobar ítems que coincideixin amb: %s"
#: builtin/clean.c:711
msgid "Select items to delete"
@@ -4632,7 +5309,7 @@ msgstr[1] "Eliminaria els ítems següents:"
#: builtin/clean.c:838
msgid "No more files to clean, exiting."
-msgstr "No hi ha més fitxers a netejar; sortint."
+msgstr "No hi ha més fitxers a netejar; s'està sortint."
#: builtin/clean.c:869
msgid "do not print names of files removed"
@@ -4650,8 +5327,8 @@ msgstr "neteja interactiva"
msgid "remove whole directories"
msgstr "elimina directoris sencers"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
-#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
msgid "pattern"
msgstr "patró"
@@ -4691,103 +5368,112 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]"
-#: builtin/clone.c:60
+#: builtin/clone.c:62
msgid "don't create a checkout"
msgstr "no facis cap agafament"
-#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
msgid "create a bare repository"
msgstr "crea un dipòsit nu"
-#: builtin/clone.c:65
+#: builtin/clone.c:67
msgid "create a mirror repository (implies bare)"
msgstr "crea un dipòsit reflectit (implica bare)"
-#: builtin/clone.c:67
+#: builtin/clone.c:69
msgid "to clone from a local repository"
msgstr "per a clonar des d'un dipòsit local"
-#: builtin/clone.c:69
+#: builtin/clone.c:71
msgid "don't use local hardlinks, always copy"
msgstr "no usis enllaços durs locals, sempre copia"
-#: builtin/clone.c:71
+#: builtin/clone.c:73
msgid "setup as shared repository"
msgstr "configura com a dipòsit compartit"
-#: builtin/clone.c:73 builtin/clone.c:75
+#: builtin/clone.c:75 builtin/clone.c:77
msgid "initialize submodules in the clone"
msgstr "inicialitza els submòduls en el clon"
-#: builtin/clone.c:76 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr "nombre de submòduls clonats en paral·lel"
+
+#: builtin/clone.c:80 builtin/init-db.c:473
msgid "template-directory"
msgstr "directori-de-plantilla"
-#: builtin/clone.c:77 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:474
msgid "directory from which templates will be used"
msgstr "directori del qual les plantilles s'usaran"
-#: builtin/clone.c:79 builtin/submodule--helper.c:173
+#: builtin/clone.c:83 builtin/submodule--helper.c:495
+#: builtin/submodule--helper.c:833
msgid "reference repository"
msgstr "dipòsit de referència"
-#: builtin/clone.c:81
+#: builtin/clone.c:85
msgid "use --reference only while cloning"
msgstr "usa --reference només en clonar"
-#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "nom"
-#: builtin/clone.c:83
+#: builtin/clone.c:87
msgid "use <name> instead of 'origin' to track upstream"
msgstr "usa <nom> en lloc de 'origin' per a seguir la font"
-#: builtin/clone.c:85
+#: builtin/clone.c:89
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "agafa <branca> en lloc del HEAD del remot"
-#: builtin/clone.c:87
+#: builtin/clone.c:91
msgid "path to git-upload-pack on the remote"
msgstr "camí a git-upload-pack en el remot"
-#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 builtin/pull.c:193
+#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 builtin/pull.c:201
msgid "depth"
msgstr "profunditat"
-#: builtin/clone.c:89
+#: builtin/clone.c:93
msgid "create a shallow clone of that depth"
msgstr "crea un clon superficial de tal profunditat"
-#: builtin/clone.c:91
+#: builtin/clone.c:95
msgid "clone only one branch, HEAD or --branch"
msgstr "clona només una branca, HEAD o --branch"
-#: builtin/clone.c:92 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr "qualsevol submòdul clonat serà superficial"
+
+#: builtin/clone.c:98 builtin/init-db.c:482
msgid "gitdir"
msgstr "directori de git"
-#: builtin/clone.c:93 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:483
msgid "separate git dir from working tree"
msgstr "separa el directori de git de l'arbre de treball"
-#: builtin/clone.c:94
+#: builtin/clone.c:100
msgid "key=value"
msgstr "clau=valor"
-#: builtin/clone.c:95
+#: builtin/clone.c:101
msgid "set config inside the new repository"
msgstr "estableix la configuració dins del dipòsit nou"
-#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "usa només les adreces IPv4"
-#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "usa només les adreces IPv6"
-#: builtin/clone.c:239
+#: builtin/clone.c:241
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -4795,190 +5481,185 @@ msgstr ""
"No s'ha pogut endevinar cap nom de directori.\n"
"Si us plau, especifiqueu un directori en la línia d'ordres"
-#: builtin/clone.c:305
+#: builtin/clone.c:307
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"Encara no se suporta el dipòsit de referència '%s' com a agafament enllaçat."
-#: builtin/clone.c:307
+#: builtin/clone.c:309
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "el dipòsit de referència '%s' no és un dipòsit local."
-#: builtin/clone.c:312
+#: builtin/clone.c:314
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "el dipòsit de referència '%s' és superficial"
-#: builtin/clone.c:315
+#: builtin/clone.c:317
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "el dipòsit de referència '%s' és empeltat"
-#: builtin/clone.c:380 builtin/diff.c:84
+#: builtin/clone.c:376
#, c-format
-msgid "failed to stat '%s'"
-msgstr "s'ha fallat en fer stat a '%s'"
+msgid "failed to open '%s'"
+msgstr "s'ha fallat en obrir '%s'"
-#: builtin/clone.c:382
+#: builtin/clone.c:384
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existeix i no és directori"
-#: builtin/clone.c:396
+#: builtin/clone.c:398
#, c-format
msgid "failed to stat %s\n"
msgstr "s'ha fallat en fer stat a '%s'\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:420
#, c-format
msgid "failed to create link '%s'"
msgstr "s'ha fallat en crear l'enllaç '%s'"
-#: builtin/clone.c:422
+#: builtin/clone.c:424
#, c-format
msgid "failed to copy file to '%s'"
msgstr "s'ha fallat en copiar el fitxer a '%s'"
-#: builtin/clone.c:447 builtin/clone.c:631
+#: builtin/clone.c:449
#, c-format
msgid "done.\n"
msgstr "fet.\n"
-#: builtin/clone.c:459
+#: builtin/clone.c:461
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr ""
-"La clonació ha tingut èxit, però l'agafament ha\n"
+"El clonatge ha tingut èxit, però l'agafament ha\n"
"fallat. Podeu inspeccionar què s'ha agafat amb\n"
"'git status' i tornar a intentar l'agafament amb\n"
"'git checkout -f HEAD'\n"
-#: builtin/clone.c:536
+#: builtin/clone.c:538
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "No s'ha pogut trobar la branca remota %s per a clonar."
-#: builtin/clone.c:626
-#, c-format
-msgid "Checking connectivity... "
-msgstr "Provant connectivitat... "
-
-#: builtin/clone.c:629
+#: builtin/clone.c:633
msgid "remote did not send all necessary objects"
msgstr "el remot no ha enviat tots els objectes necessaris"
-#: builtin/clone.c:647
+#: builtin/clone.c:649
#, c-format
msgid "unable to update %s"
-msgstr "no s'ha pogut actualizar %s"
+msgstr "no s'ha pogut actualitzar %s"
-#: builtin/clone.c:696
+#: builtin/clone.c:698
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"el HEAD remot es refereix a una referència que no existeix; no s'ha pogut "
"agafar.\n"
-#: builtin/clone.c:727
+#: builtin/clone.c:729
msgid "unable to checkout working tree"
msgstr "no s'ha pogut agafar l'arbre de treball"
-#: builtin/clone.c:753
+#: builtin/clone.c:766
msgid "unable to write parameters to config file"
-msgstr "no s'ha pogut escriure les paràmetres al fitxer de configuració"
+msgstr "no s'ha pogut escriure els paràmetres al fitxer de configuració"
-#: builtin/clone.c:816
+#: builtin/clone.c:829
msgid "cannot repack to clean up"
msgstr "no es pot reempaquetar per a netejar"
-#: builtin/clone.c:818
+#: builtin/clone.c:831
msgid "cannot unlink temporary alternates file"
msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
-#: builtin/clone.c:850
+#: builtin/clone.c:863 builtin/receive-pack.c:1855
msgid "Too many arguments."
msgstr "Hi ha massa paràmetres."
-#: builtin/clone.c:854
+#: builtin/clone.c:867
msgid "You must specify a repository to clone."
msgstr "Heu d'especificar un dipòsit per a clonar."
-#: builtin/clone.c:865
+#: builtin/clone.c:878
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les opcions --bare i --origin %s són incompatibles."
-#: builtin/clone.c:868
+#: builtin/clone.c:881
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare i --separate-git-dir són incompatibles."
-#: builtin/clone.c:881
+#: builtin/clone.c:894
#, c-format
msgid "repository '%s' does not exist"
msgstr "el dipòsit '%s' no existeix"
-#: builtin/clone.c:887 builtin/fetch.c:1174
+#: builtin/clone.c:900 builtin/fetch.c:1293
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profunditat %s no és nombre positiu"
-#: builtin/clone.c:897
+#: builtin/clone.c:910
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "el camí destí '%s' ja existeix i no és un directori buit."
-#: builtin/clone.c:907
+#: builtin/clone.c:920
#, c-format
msgid "working tree '%s' already exists."
msgstr "l'arbre de treball '%s' ja existeix."
-#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
-#: builtin/worktree.c:219 builtin/worktree.c:246
+#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no s'ha pogut crear els directoris inicials de '%s'"
-#: builtin/clone.c:925
+#: builtin/clone.c:938
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "no s'ha pogut crear el directori d'arbre de treball '%s'"
-#: builtin/clone.c:943
+#: builtin/clone.c:956
#, c-format
msgid "Cloning into bare repository '%s'...\n"
-msgstr "Clonant al dipòsit nu '%s'...\n"
+msgstr "S'està clonant al dipòsit nu '%s'...\n"
-#: builtin/clone.c:945
+#: builtin/clone.c:958
#, c-format
msgid "Cloning into '%s'...\n"
-msgstr "Clonant a '%s'...\n"
+msgstr "S'està clonant a '%s'...\n"
-#: builtin/clone.c:984
+#: builtin/clone.c:997
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això."
-#: builtin/clone.c:987
+#: builtin/clone.c:1000
msgid "source repository is shallow, ignoring --local"
-msgstr "el dipòsit font és superficial, ignorant --local"
+msgstr "el dipòsit font és superficial, s'està ignorant --local"
-#: builtin/clone.c:992
+#: builtin/clone.c:1005
msgid "--local is ignored"
msgstr "--local s'ignora"
-#: builtin/clone.c:996
+#: builtin/clone.c:1009
#, c-format
msgid "Don't know how to clone %s"
msgstr "No se sap com clonar %s"
-#: builtin/clone.c:1045 builtin/clone.c:1053
+#: builtin/clone.c:1058 builtin/clone.c:1066
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "La branca remota %s no es troba en la font %s"
-#: builtin/clone.c:1056
+#: builtin/clone.c:1069
msgid "You appear to have cloned an empty repository."
msgstr "Sembla que heu clonat un dipòsit buit."
@@ -5120,66 +5801,66 @@ msgstr ""
"Llavors \"git cherry-pick --continue\" reprendrà recollint\n"
"com a cireres les comissions restants.\n"
-#: builtin/commit.c:305
+#: builtin/commit.c:308
msgid "failed to unpack HEAD tree object"
msgstr "s'ha fallat en desempaquetar l'objecte d'arbre HEAD"
-#: builtin/commit.c:346
+#: builtin/commit.c:349
msgid "unable to create temporary index"
msgstr "no s'ha pogut crear un índex temporal"
-#: builtin/commit.c:352
+#: builtin/commit.c:355
msgid "interactive add failed"
msgstr "l'afegiment interactiu ha fallat"
-#: builtin/commit.c:365
+#: builtin/commit.c:368
msgid "unable to update temporary index"
msgstr "no s'ha pogut actualitzar l'índex temporal"
-#: builtin/commit.c:367
+#: builtin/commit.c:370
msgid "Failed to update main cache tree"
msgstr "S'ha fallat en actualitzar l'arbre principal de memòria cau"
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
msgid "unable to write new_index file"
msgstr "no s'ha pogut escriure el fitxer new_index"
-#: builtin/commit.c:445
+#: builtin/commit.c:448
msgid "cannot do a partial commit during a merge."
msgstr "no es pot fer una comissió parcial durant una fusió."
-#: builtin/commit.c:447
+#: builtin/commit.c:450
msgid "cannot do a partial commit during a cherry-pick."
msgstr "no es pot fer una comissió parcial durant un recull de cireres."
-#: builtin/commit.c:456
+#: builtin/commit.c:459
msgid "cannot read the index"
msgstr "no es pot llegir l'índex"
-#: builtin/commit.c:475
+#: builtin/commit.c:478
msgid "unable to write temporary index file"
msgstr "no s'ha pogut escriure un fitxer d'índex temporal"
-#: builtin/commit.c:580
+#: builtin/commit.c:583
#, c-format
msgid "commit '%s' lacks author header"
msgstr "a la comissió '%s' li manca la capçalera d'autor"
-#: builtin/commit.c:582
+#: builtin/commit.c:585
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "la comissió '%s' té una línia d'autor mal formada"
-#: builtin/commit.c:601
+#: builtin/commit.c:604
msgid "malformed --author parameter"
msgstr "paràmetre --author mal format"
-#: builtin/commit.c:609
+#: builtin/commit.c:612
#, c-format
msgid "invalid date format: %s"
msgstr "format de data no vàlid: %s"
-#: builtin/commit.c:653
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -5187,38 +5868,38 @@ msgstr ""
"no es pot seleccionar un caràcter de comentari que\n"
"no sigui usat en el missatge de comissió actual"
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
#, c-format
msgid "could not lookup commit %s"
msgstr "no s'ha pogut trobar la comissió %s"
-#: builtin/commit.c:702 builtin/shortlog.c:285
+#: builtin/commit.c:705 builtin/shortlog.c:286
#, c-format
msgid "(reading log message from standard input)\n"
-msgstr "(llegint el missatge de registre des de l'entrada estàndard)\n"
+msgstr "(s'està llegint el missatge de registre des de l'entrada estàndard)\n"
-#: builtin/commit.c:704
+#: builtin/commit.c:707
msgid "could not read log from standard input"
msgstr "no s'ha pogut llegir el registre des de l'entrada estàndard"
-#: builtin/commit.c:708
+#: builtin/commit.c:711
#, c-format
msgid "could not read log file '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre '%s'"
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "no s'ha pogut llegir MERGE_MSG"
-
-#: builtin/commit.c:734
+#: builtin/commit.c:738 builtin/commit.c:746
msgid "could not read SQUASH_MSG"
msgstr "no s'ha pogut llegir SQUASH_MSG"
-#: builtin/commit.c:785
+#: builtin/commit.c:743
+msgid "could not read MERGE_MSG"
+msgstr "no s'ha pogut llegir MERGE_MSG"
+
+#: builtin/commit.c:797
msgid "could not write commit template"
msgstr "no s'ha pogut escriure la plantilla de comissió"
-#: builtin/commit.c:803
+#: builtin/commit.c:815
#, c-format
msgid ""
"\n"
@@ -5233,7 +5914,7 @@ msgstr ""
"\t%s\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:808
+#: builtin/commit.c:820
#, c-format
msgid ""
"\n"
@@ -5244,11 +5925,11 @@ msgid ""
msgstr ""
"\n"
"Sembla que podeu estar cometent un recull de cireres.\n"
-"Si això no és correcte, si us plau elimineu el fitxer\n"
+"Si això no és correcte, si us plau, elimineu el fitxer\n"
"\t%s\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:821
+#: builtin/commit.c:833
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5258,7 +5939,7 @@ msgstr ""
"S'ignoraran les línies començant amb '%c', i un missatge de\n"
"comissió buit avorta la comissió.\n"
-#: builtin/commit.c:828
+#: builtin/commit.c:840
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5269,149 +5950,150 @@ msgstr ""
"Es retindran les línies començants amb '%c'; podeu eliminar-les per vós\n"
"mateix si voleu. Un missatge buit avorta la comissió.\n"
-#: builtin/commit.c:848
+#: builtin/commit.c:860
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:856
+#: builtin/commit.c:868
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:863
+#: builtin/commit.c:875
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sComitent: %.*s <%.*s>"
-#: builtin/commit.c:881
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "No es pot llegir l'índex"
-#: builtin/commit.c:938
+#: builtin/commit.c:950
msgid "Error building trees"
msgstr "Error en construir arbres"
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:965 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Si us plau, proveïu el missatge per usar o l'opció -m o l'opció -F.\n"
-#: builtin/commit.c:1055
+#: builtin/commit.c:1067
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' no és 'Nom <adreça-de-correu-electrònic>' i no coincideix amb\n"
"cap autor existent"
-#: builtin/commit.c:1070 builtin/commit.c:1310
+#: builtin/commit.c:1082 builtin/commit.c:1322
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fitxers no seguits no vàlid '%s'"
-#: builtin/commit.c:1107
+#: builtin/commit.c:1119
msgid "--long and -z are incompatible"
msgstr "--long i -z són incompatibles"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1149
msgid "Using both --reset-author and --author does not make sense"
msgstr "Usar ambdós --reset-author i --author no té sentit"
-#: builtin/commit.c:1146
+#: builtin/commit.c:1158
msgid "You have nothing to amend."
msgstr "No teniu res a esmenar."
-#: builtin/commit.c:1149
+#: builtin/commit.c:1161
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
-#: builtin/commit.c:1151
+#: builtin/commit.c:1163
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Esteu enmig d'un recull de cireres -- no es pot esmenar."
-#: builtin/commit.c:1154
+#: builtin/commit.c:1166
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les opcions --squash i --fixup no es poden usar juntes"
-#: builtin/commit.c:1164
+#: builtin/commit.c:1176
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Només un de -c/-C/-F/--fixup es pot usar."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1178
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "L'opció -m no es pot combinar amb -c/-C/-F/--fixup."
-#: builtin/commit.c:1174
+#: builtin/commit.c:1186
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author només es pot usar amb -C, -c o --amend."
-#: builtin/commit.c:1191
+#: builtin/commit.c:1203
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar."
-#: builtin/commit.c:1193
+#: builtin/commit.c:1205
msgid "No paths with --include/--only does not make sense."
msgstr "--include/--only no té sentit sense camí."
-#: builtin/commit.c:1195
+#: builtin/commit.c:1207
msgid "Clever... amending the last one with dirty index."
-msgstr "Intel·ligent... esmenant l'últim amb índex brut."
+msgstr "Intel·ligent... s'està esmenant l'últim amb índex brut."
-#: builtin/commit.c:1197
+#: builtin/commit.c:1209
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
-"S'han especificat camins explícits sense -i o -o; presumint camins --only..."
+"S'han especificat camins explícits sense -i o -o; s'està presumint camins --"
+"only..."
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1221 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de neteja no vàlid %s"
-#: builtin/commit.c:1214
+#: builtin/commit.c:1226
msgid "Paths with -a does not make sense."
msgstr "-a no té sentit amb camins."
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1336 builtin/commit.c:1622
msgid "show status concisely"
msgstr "mostra l'estat concisament"
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1338 builtin/commit.c:1624
msgid "show branch information"
msgstr "mostra la informació de branca"
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
-#: builtin/worktree.c:430
+#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "sortida llegible per màquina"
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1343 builtin/commit.c:1628
msgid "show status in long format (default)"
msgstr "mostra l'estat en format llarg (per defecte)"
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1346 builtin/commit.c:1631
msgid "terminate entries with NUL"
msgstr "acaba les entrades amb NUL"
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1349 builtin/commit.c:1634
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per "
"defecte: all)"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1352
msgid "show ignored files"
msgstr "mostra els fitxers ignorats"
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1353 parse-options.h:155
msgid "when"
msgstr "quan"
-#: builtin/commit.c:1342
+#: builtin/commit.c:1354
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -5419,202 +6101,202 @@ msgstr ""
"ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
"defecte: all)"
-#: builtin/commit.c:1344
+#: builtin/commit.c:1356
msgid "list untracked files in columns"
msgstr "mostra els fitxers no seguits en columnes"
-#: builtin/commit.c:1430
+#: builtin/commit.c:1442
msgid "couldn't look up newly created commit"
msgstr "no s'ha pogut trobar la comissió novament creada"
-#: builtin/commit.c:1432
+#: builtin/commit.c:1444
msgid "could not parse newly created commit"
msgstr "no s'ha pogut analitzar la comissió novament creada"
-#: builtin/commit.c:1477
+#: builtin/commit.c:1489
msgid "detached HEAD"
msgstr "HEAD separat"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1492
msgid " (root-commit)"
msgstr " (comissió d'arrel)"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1592
msgid "suppress summary after successful commit"
msgstr "omet el resum després d'una comissió reeixida"
-#: builtin/commit.c:1576
+#: builtin/commit.c:1593
msgid "show diff in commit message template"
msgstr "mostra la diferència en la plantilla de missatge de comissió"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1595
msgid "Commit message options"
msgstr "Opcions de missatge de comissió"
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1596 builtin/tag.c:351
msgid "read message from file"
msgstr "llegiu el missatge des d'un fitxer"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1597
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1597
msgid "override author for commit"
msgstr "autor corregit de la comissió"
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1598 builtin/gc.c:326
msgid "date"
msgstr "data"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1598
msgid "override date for commit"
msgstr "data corregida de la comissió"
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
-#: builtin/notes.c:558 builtin/tag.c:349
+#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
+#: builtin/notes.c:559 builtin/tag.c:349
msgid "message"
msgstr "missatge"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1599
msgid "commit message"
msgstr "missatge de comissió"
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
+#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
msgid "commit"
msgstr "comissió"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1600
msgid "reuse and edit message from specified commit"
msgstr "reusa i edita el missatge de la comissió especificada"
-#: builtin/commit.c:1584
+#: builtin/commit.c:1601
msgid "reuse message from specified commit"
msgstr "reusa el missatge de la comissió especificada"
-#: builtin/commit.c:1585
+#: builtin/commit.c:1602
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"usa el missatge formatat d'aixafada automàtica per a arreglar la comissió "
"especificada"
-#: builtin/commit.c:1586
+#: builtin/commit.c:1603
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"usa el missatge formatat d'aixafada automàtica per a aixafar la comissió "
"especificada"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1604
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)"
-#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
+#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "afegeix Signed-off-by:"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1606
msgid "use specified template file"
msgstr "usa el fitxer de plantilla especificat"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1607
msgid "force edit of commit"
msgstr "força l'edició de la comissió"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1608
msgid "default"
msgstr "per defecte"
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1608 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "com despullar els espais i #comentaris del missatge"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1609
msgid "include status in commit message template"
msgstr "inclou l'estat en la plantilla de missatge de comissió"
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
+#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
#: builtin/revert.c:93
msgid "GPG sign commit"
-msgstr "firma la comissió amb GPG"
+msgstr "signa la comissió amb GPG"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1614
msgid "Commit contents options"
msgstr "Opcions dels continguts de les comissions"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1615
msgid "commit all changed files"
msgstr "comet tots els fitxers canviats"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1616
msgid "add specified files to index for commit"
msgstr "afegeix els fitxers especificats a l'índex per a cometre"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1617
msgid "interactively add files"
msgstr "afegeix els fitxers interactivament"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1618
msgid "interactively add changes"
msgstr "afegeix els canvis interactivament"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1619
msgid "commit only specified files"
msgstr "comet només els fitxers especificats"
-#: builtin/commit.c:1603
-msgid "bypass pre-commit hook"
-msgstr "evita el ganxo de precomissió"
+#: builtin/commit.c:1620
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "evita els ganxos de precomissió i missatge de comissió"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1621
msgid "show what would be committed"
msgstr "mostra què es cometria"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1632
msgid "amend previous commit"
msgstr "esmena la comissió anterior"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1633
msgid "bypass post-rewrite hook"
msgstr "evita el ganxo de postreescriure"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1638
msgid "ok to record an empty change"
msgstr "està bé registrar un canvi buit"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1640
msgid "ok to record a change with an empty message"
msgstr "està bé registrar un canvi amb missatge buit"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1669
msgid "could not parse HEAD commit"
msgstr "no s'ha pogut analitzar la comissió HEAD"
-#: builtin/commit.c:1698
+#: builtin/commit.c:1719
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fitxer MERGE_HEAD malmès (%s)"
-#: builtin/commit.c:1705
+#: builtin/commit.c:1726
msgid "could not read MERGE_MODE"
msgstr "no s'ha pogut llegir MERGE_MODE"
-#: builtin/commit.c:1724
+#: builtin/commit.c:1745
#, c-format
msgid "could not read commit message: %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: builtin/commit.c:1735
+#: builtin/commit.c:1756
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
-msgstr "Avortant la comissió; no heu editat el missatge.\n"
+msgstr "S'està avortant la comissió; no heu editat el missatge.\n"
-#: builtin/commit.c:1740
+#: builtin/commit.c:1761
#, c-format
msgid "Aborting commit due to empty commit message.\n"
-msgstr "Avortant la comissió a causa d'un missatge de comissió buit.\n"
+msgstr "S'està avortant la comissió a causa d'un missatge de comissió buit.\n"
-#: builtin/commit.c:1788
+#: builtin/commit.c:1809
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5629,142 +6311,142 @@ msgstr ""
msgid "git config [<options>]"
msgstr "git config [<opcions>]"
-#: builtin/config.c:56
+#: builtin/config.c:55
msgid "Config file location"
msgstr "Ubicació del fitxer de configuració"
-#: builtin/config.c:57
+#: builtin/config.c:56
msgid "use global config file"
msgstr "usa el fitxer de configuració global"
-#: builtin/config.c:58
+#: builtin/config.c:57
msgid "use system config file"
msgstr "usa el fitxer de configuració del sistema"
-#: builtin/config.c:59
+#: builtin/config.c:58
msgid "use repository config file"
msgstr "usa el fitxer de configuració del dipòsit"
-#: builtin/config.c:60
+#: builtin/config.c:59
msgid "use given config file"
msgstr "usa el fitxer de configuració donat"
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "blob-id"
msgstr "ID de blob"
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "read config from given blob object"
msgstr "llegeix la configuració de l'objecte de blob donat"
-#: builtin/config.c:62
+#: builtin/config.c:61
msgid "Action"
msgstr "Acció"
-#: builtin/config.c:63
+#: builtin/config.c:62
msgid "get value: name [value-regex]"
msgstr "obtén valor: nom [regex-de-valors]"
-#: builtin/config.c:64
+#: builtin/config.c:63
msgid "get all values: key [value-regex]"
msgstr "obtén tots els valors: clau [regex-de-valors]"
-#: builtin/config.c:65
+#: builtin/config.c:64
msgid "get values for regexp: name-regex [value-regex]"
msgstr "obtén valors de regexp: regex-de-noms [regex-de-valors]"
-#: builtin/config.c:66
+#: builtin/config.c:65
msgid "get value specific for the URL: section[.var] URL"
msgstr "obtén el valor específic per a l'URL: secció[.variable] URL"
-#: builtin/config.c:67
+#: builtin/config.c:66
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
"reemplaça totes les variables que coincideixen: nom valor [regex_de_valors]"
-#: builtin/config.c:68
+#: builtin/config.c:67
msgid "add a new variable: name value"
msgstr "afegeix una variable nova: nom valor"
-#: builtin/config.c:69
+#: builtin/config.c:68
msgid "remove a variable: name [value-regex]"
msgstr "elimina una variable: nom [regex-de-valors]"
-#: builtin/config.c:70
+#: builtin/config.c:69
msgid "remove all matches: name [value-regex]"
msgstr "elimina totes les coincidències: nom [regex-de-valors]"
-#: builtin/config.c:71
+#: builtin/config.c:70
msgid "rename section: old-name new-name"
msgstr "canvia el nom de secció: nom-antic nom-nou"
-#: builtin/config.c:72
+#: builtin/config.c:71
msgid "remove a section: name"
msgstr "elimina una secció: nom"
-#: builtin/config.c:73
+#: builtin/config.c:72
msgid "list all"
msgstr "llista tots"
-#: builtin/config.c:74
+#: builtin/config.c:73
msgid "open an editor"
msgstr "obre un editor"
-#: builtin/config.c:75
+#: builtin/config.c:74
msgid "find the color configured: slot [default]"
msgstr "troba el color configurat: ranura [per defecte]"
-#: builtin/config.c:76
+#: builtin/config.c:75
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "troba l'ajust de color: ranura [stdout-és-tty]"
-#: builtin/config.c:77
+#: builtin/config.c:76
msgid "Type"
msgstr "Tipus"
-#: builtin/config.c:78
+#: builtin/config.c:77
msgid "value is \"true\" or \"false\""
msgstr "el valor és \"true\" o \"false\""
-#: builtin/config.c:79
+#: builtin/config.c:78
msgid "value is decimal number"
msgstr "el valor és un nombre decimal"
-#: builtin/config.c:80
+#: builtin/config.c:79
msgid "value is --bool or --int"
msgstr "el valor és --bool o --int"
-#: builtin/config.c:81
+#: builtin/config.c:80
msgid "value is a path (file or directory name)"
msgstr "el valor és un camí (nom de fitxer o directori)"
-#: builtin/config.c:82
+#: builtin/config.c:81
msgid "Other"
msgstr "Altre"
-#: builtin/config.c:83
+#: builtin/config.c:82
msgid "terminate values with NUL byte"
msgstr "acaba els valors amb un octet NUL"
-#: builtin/config.c:84
+#: builtin/config.c:83
msgid "show variable names only"
msgstr "mostra només els noms de variable"
-#: builtin/config.c:85
+#: builtin/config.c:84
msgid "respect include directives on lookup"
msgstr "respecta les directives d'inclusió en cercar"
-#: builtin/config.c:86
+#: builtin/config.c:85
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"mostra l'origen de la configuració (fitxer, entrada estàndar, blob, línia "
"d'ordres)"
-#: builtin/config.c:328
+#: builtin/config.c:327
msgid "unable to parse default color value"
msgstr "no s'ha pogut analitzar el valor de color per defecte"
-#: builtin/config.c:469
+#: builtin/config.c:471
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5779,7 +6461,7 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:611
+#: builtin/config.c:613
#, c-format
msgid "cannot create configuration file %s"
msgstr "no es pot crear el fitxer de configuració '%s'"
@@ -5815,7 +6497,7 @@ msgstr "l'etiqueta anotada %s no té nom incrustat"
msgid "tag '%s' is really '%s' here"
msgstr "l'etiqueta '%s' realment és '%s' aquí"
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:480
#, c-format
msgid "Not a valid object name %s"
msgstr "%s no és un nom d'objecte vàlid"
@@ -5833,7 +6515,7 @@ msgstr "cap etiqueta coincideix exactament amb '%s'"
#: builtin/describe.c:272
#, c-format
msgid "searching to describe %s\n"
-msgstr "cercant per a descriure %s\n"
+msgstr "s'està cercant per a descriure %s\n"
#: builtin/describe.c:319
#, c-format
@@ -5908,7 +6590,7 @@ msgstr "considera les <n> etiquetes més recents (per defecte: 10)"
msgid "only consider tags matching <pattern>"
msgstr "només considera les etiquetes que coincideixen amb <patró>"
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
msgid "show abbreviated commit object as fallback"
msgstr "mostra l'objecte de comissió abreviat com a retrocediment"
@@ -5926,7 +6608,7 @@ msgstr "--long és incompatible amb --abbrev=0"
#: builtin/describe.c:456
msgid "No names found, cannot describe anything."
-msgstr "Cap nom trobat, no es pot descriure res."
+msgstr "No s'ha trobat cap nom, no es pot descriure res."
#: builtin/describe.c:476
msgid "--dirty is incompatible with commit-ishes"
@@ -5942,21 +6624,21 @@ msgstr "'%s': no és ni fitxer regular ni enllaç simbòlic"
msgid "invalid option: %s"
msgstr "opció no vàlida: %s"
-#: builtin/diff.c:358
+#: builtin/diff.c:360
msgid "Not a git repository"
msgstr "No és un dipòsit de git"
-#: builtin/diff.c:401
+#: builtin/diff.c:403
#, c-format
msgid "invalid object '%s' given."
msgstr "s'ha donat un objecte no vàlid '%s'."
-#: builtin/diff.c:410
+#: builtin/diff.c:412
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "s'ha donat més de dos blobs: '%s"
-#: builtin/diff.c:417
+#: builtin/diff.c:419
#, c-format
msgid "unhandled object '%s' given."
msgstr "s'ha donat l'objecte no gestionat '%s'."
@@ -5971,7 +6653,7 @@ msgstr "mostra el progrés després de <n> objectes"
#: builtin/fast-export.c:982
msgid "select handling of signed tags"
-msgstr "selecciona la gestió de les etiquetes firmades"
+msgstr "selecciona la gestió de les etiquetes signades"
#: builtin/fast-export.c:985
msgid "select handling of tags that tag filtered objects"
@@ -6013,182 +6695,178 @@ msgstr "Aplica l'especificació de referència a les referències exportades"
msgid "anonymize output"
msgstr "anonimitza la sortida"
-#: builtin/fetch.c:20
+#: builtin/fetch.c:21
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
-#: builtin/fetch.c:21
+#: builtin/fetch.c:22
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<opcions>] <grup>"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<opcions>] [(<dipòsit> | <grup>)...]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opcions>]"
-#: builtin/fetch.c:92 builtin/pull.c:166
+#: builtin/fetch.c:93 builtin/pull.c:174
msgid "fetch from all remotes"
msgstr "obtén de tots els remots"
-#: builtin/fetch.c:94 builtin/pull.c:169
+#: builtin/fetch.c:95 builtin/pull.c:177
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure"
-#: builtin/fetch.c:96 builtin/pull.c:172
+#: builtin/fetch.c:97 builtin/pull.c:180
msgid "path to upload pack on remote end"
msgstr "camí al qual pujar el paquet al costat remot"
-#: builtin/fetch.c:97 builtin/pull.c:174
+#: builtin/fetch.c:98 builtin/pull.c:182
msgid "force overwrite of local branch"
msgstr "força la sobreescriptura de la branca local"
-#: builtin/fetch.c:99
+#: builtin/fetch.c:100
msgid "fetch from multiple remotes"
msgstr "obtén de múltiples remots"
-#: builtin/fetch.c:101 builtin/pull.c:176
+#: builtin/fetch.c:102 builtin/pull.c:184
msgid "fetch all tags and associated objects"
msgstr "obtén totes les etiquetes i tots els objectes associats"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:104
msgid "do not fetch all tags (--no-tags)"
msgstr "no obtinguis les etiquetes (--no-tags)"
-#: builtin/fetch.c:105
+#: builtin/fetch.c:106
msgid "number of submodules fetched in parallel"
msgstr "nombre de submòduls obtinguts en paral·lel"
-#: builtin/fetch.c:107 builtin/pull.c:179
+#: builtin/fetch.c:108 builtin/pull.c:187
msgid "prune remote-tracking branches no longer on remote"
msgstr "poda les branques amb seguiment remot que ja no estiguin en el remot"
-#: builtin/fetch.c:108 builtin/pull.c:182
+#: builtin/fetch.c:109 builtin/pull.c:190
msgid "on-demand"
msgstr "sota demanda"
-#: builtin/fetch.c:109 builtin/pull.c:183
+#: builtin/fetch.c:110 builtin/pull.c:191
msgid "control recursive fetching of submodules"
msgstr "controla l'obtenció recursiva de submòduls"
-#: builtin/fetch.c:113 builtin/pull.c:191
+#: builtin/fetch.c:114 builtin/pull.c:199
msgid "keep downloaded pack"
msgstr "retén el paquet baixat"
-#: builtin/fetch.c:115
+#: builtin/fetch.c:116
msgid "allow updating of HEAD ref"
msgstr "permet l'actualització de la referència HEAD"
-#: builtin/fetch.c:118 builtin/pull.c:194
+#: builtin/fetch.c:119 builtin/pull.c:202
msgid "deepen history of shallow clone"
msgstr "aprofundeix la història d'un clon superficial"
-#: builtin/fetch.c:120 builtin/pull.c:197
+#: builtin/fetch.c:121 builtin/pull.c:205
msgid "convert to a complete repository"
msgstr "converteix en un dipòsit complet"
-#: builtin/fetch.c:122 builtin/log.c:1236
+#: builtin/fetch.c:123 builtin/log.c:1426
msgid "dir"
msgstr "directori"
-#: builtin/fetch.c:123
+#: builtin/fetch.c:124
msgid "prepend this to submodule path output"
msgstr "anteposa això a la sortida de camí del submòdul"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:127
msgid "default mode for recursion"
msgstr "mode de recursivitat per defecte"
-#: builtin/fetch.c:128 builtin/pull.c:200
+#: builtin/fetch.c:129 builtin/pull.c:208
msgid "accept refs that update .git/shallow"
msgstr "accepta les referències que actualitzin .git/shallow"
-#: builtin/fetch.c:129 builtin/pull.c:202
+#: builtin/fetch.c:130 builtin/pull.c:210
msgid "refmap"
msgstr "mapa de referències"
-#: builtin/fetch.c:130 builtin/pull.c:203
+#: builtin/fetch.c:131 builtin/pull.c:211
msgid "specify fetch refmap"
msgstr "mostra el mapa de referències d'obtenció"
-#: builtin/fetch.c:386
+#: builtin/fetch.c:387
msgid "Couldn't find remote ref HEAD"
msgstr "No s'ha pogut trobar la referència HEAD remota"
-#: builtin/fetch.c:466
+#: builtin/fetch.c:503
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "la configuració fetch.output conté un valor no vàlid %s"
+
+#: builtin/fetch.c:592
#, c-format
msgid "object %s not found"
msgstr "objecte %s no trobat"
-#: builtin/fetch.c:471
+#: builtin/fetch.c:596
msgid "[up to date]"
msgstr "[al dia]"
-#: builtin/fetch.c:485
-#, c-format
-msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
-msgstr "! %-*s %-*s -> %s (no es pot obtenir en la branca actual)"
-
-#: builtin/fetch.c:486 builtin/fetch.c:574
+#: builtin/fetch.c:609 builtin/fetch.c:689
msgid "[rejected]"
msgstr "[rebutjat]"
-#: builtin/fetch.c:497
+#: builtin/fetch.c:610
+msgid "can't fetch in current branch"
+msgstr "no es pot obtenir en la branca actual"
+
+#: builtin/fetch.c:619
msgid "[tag update]"
msgstr "[actualització d'etiqueta]"
-#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
-msgid " (unable to update local ref)"
-msgstr " (no s'ha pogut actualitzar la referència local)"
+#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
+#: builtin/fetch.c:684
+msgid "unable to update local ref"
+msgstr "no s'ha pogut actualitzar la referència local"
-#: builtin/fetch.c:517
+#: builtin/fetch.c:639
msgid "[new tag]"
msgstr "[etiqueta nova]"
-#: builtin/fetch.c:520
+#: builtin/fetch.c:642
msgid "[new branch]"
msgstr "[branca nova]"
-#: builtin/fetch.c:523
+#: builtin/fetch.c:645
msgid "[new ref]"
msgstr "[referència nova]"
-#: builtin/fetch.c:569
-msgid "unable to update local ref"
-msgstr "no s'ha pogut actualitzar la referència local"
-
-#: builtin/fetch.c:569
+#: builtin/fetch.c:684
msgid "forced update"
msgstr "actualització forçada"
-#: builtin/fetch.c:576
-msgid "(non-fast-forward)"
-msgstr "(sense avanç ràpid)"
+#: builtin/fetch.c:689
+msgid "non-fast-forward"
+msgstr "sense avanç ràpid"
-#: builtin/fetch.c:610 builtin/fetch.c:851
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "no es pot obrir %s: %s\n"
-
-#: builtin/fetch.c:619
+#: builtin/fetch.c:733
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no ha enviat tots els objectes necessaris\n"
-#: builtin/fetch.c:637
+#: builtin/fetch.c:753
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"rebutja %s perquè no es permet que les arrels superficials s'actualitzin"
-#: builtin/fetch.c:724 builtin/fetch.c:816
+#: builtin/fetch.c:839 builtin/fetch.c:934
#, c-format
msgid "From %.*s\n"
msgstr "De %.*s\n"
-#: builtin/fetch.c:735
+#: builtin/fetch.c:850
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -6198,55 +6876,55 @@ msgstr ""
" intenteu executar 'git remote prune %s' per a eliminar\n"
" qualsevulla branca antiga o conflictiva"
-#: builtin/fetch.c:787
+#: builtin/fetch.c:904
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s es tornarà penjant)"
-#: builtin/fetch.c:788
+#: builtin/fetch.c:905
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s s'ha tornat penjant)"
-#: builtin/fetch.c:820
+#: builtin/fetch.c:937
msgid "[deleted]"
msgstr "[suprimit]"
-#: builtin/fetch.c:821 builtin/remote.c:1025
+#: builtin/fetch.c:938 builtin/remote.c:1020
msgid "(none)"
msgstr "(cap)"
-#: builtin/fetch.c:841
+#: builtin/fetch.c:960
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "Refusant obtenir en la branca actual %s d'un dipòsit no nu"
+msgstr "S'està refusant obtenir en la branca actual %s d'un dipòsit no nu"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:979
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "L'opció \"%s\" amb valor \"%s\" no és vàlida per a %s"
-#: builtin/fetch.c:863
+#: builtin/fetch.c:982
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "S'ignora l'opció \"%s\" per a %s\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1039
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "No se sap com obtenir de %s"
-#: builtin/fetch.c:1080
+#: builtin/fetch.c:1199
#, c-format
msgid "Fetching %s\n"
-msgstr "Obtenint %s\n"
+msgstr "S'està obtenint %s\n"
-#: builtin/fetch.c:1082 builtin/remote.c:96
+#: builtin/fetch.c:1201 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "No s'ha pogut obtenir %s"
-#: builtin/fetch.c:1100
+#: builtin/fetch.c:1219
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -6254,32 +6932,32 @@ msgstr ""
"Cap dipòsit remot especificat. Si us plau, especifiqueu o un URL o\n"
"un nom remot del qual es deuen obtenir les revisions noves."
-#: builtin/fetch.c:1123
+#: builtin/fetch.c:1242
msgid "You need to specify a tag name."
msgstr "Necessiteu especificar un nom d'etiqueta."
-#: builtin/fetch.c:1165
+#: builtin/fetch.c:1284
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth i --unshallow no es poden usar junts"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1286
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow en un dipòsit complet no té sentit"
-#: builtin/fetch.c:1187
+#: builtin/fetch.c:1306
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no accepta un paràmetre de dipòsit"
-#: builtin/fetch.c:1189
+#: builtin/fetch.c:1308
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no té sentit amb especificacions de referència"
-#: builtin/fetch.c:1200
+#: builtin/fetch.c:1319
#, c-format
msgid "No such remote or remote group: %s"
msgstr "No hi ha tal remot ni tal grup remot: %s"
-#: builtin/fetch.c:1208
+#: builtin/fetch.c:1327
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Obtenir un grup i especificar referències no té sentit"
@@ -6367,65 +7045,65 @@ msgstr "imprimeix només les referències que no s'han fusionat"
msgid "print only refs which contain the commit"
msgstr "imprimeix només les referències que continguin la comissió"
-#: builtin/fsck.c:156 builtin/prune.c:140
-msgid "Checking connectivity"
-msgstr "Comprovant connectivitat"
-
-#: builtin/fsck.c:486
+#: builtin/fsck.c:519
msgid "Checking object directories"
-msgstr "Comprovant els directoris d'objecte"
+msgstr "S'estan comprovant els directoris d'objecte"
-#: builtin/fsck.c:553
+#: builtin/fsck.c:588
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opcions>] [<objecte>...]"
-#: builtin/fsck.c:559
+#: builtin/fsck.c:594
msgid "show unreachable objects"
msgstr "mostra els objectes inabastables"
-#: builtin/fsck.c:560
+#: builtin/fsck.c:595
msgid "show dangling objects"
msgstr "mostra els objectes penjants"
-#: builtin/fsck.c:561
+#: builtin/fsck.c:596
msgid "report tags"
msgstr "informa de les etiquetes"
-#: builtin/fsck.c:562
+#: builtin/fsck.c:597
msgid "report root nodes"
msgstr "informa dels nodes d'arrel"
-#: builtin/fsck.c:563
+#: builtin/fsck.c:598
msgid "make index objects head nodes"
msgstr "fes els objectes d'índex nodes de cap"
-#: builtin/fsck.c:564
+#: builtin/fsck.c:599
msgid "make reflogs head nodes (default)"
msgstr "fes que els registres de referències siguin nodes de cap (per defecte)"
-#: builtin/fsck.c:565
+#: builtin/fsck.c:600
msgid "also consider packs and alternate objects"
msgstr "també considera els paquets i els objectes alternatius"
-#: builtin/fsck.c:566
+#: builtin/fsck.c:601
msgid "check only connectivity"
msgstr "comprova només la connectivitat"
-#: builtin/fsck.c:567
+#: builtin/fsck.c:602
msgid "enable more strict checking"
msgstr "habilita la comprovació més estricta"
-#: builtin/fsck.c:569
+#: builtin/fsck.c:604
msgid "write dangling objects in .git/lost-found"
msgstr "escriu objectes penjants a .git/lost-found"
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:605 builtin/prune.c:107
msgid "show progress"
msgstr "mostra el progrés"
-#: builtin/fsck.c:631
+#: builtin/fsck.c:606
+msgid "show verbose names for reachable objects"
+msgstr "mostra els noms detallats dels objectes abastables"
+
+#: builtin/fsck.c:671
msgid "Checking objects"
-msgstr "Comprovant els objectes"
+msgstr "S'estan comprovant els objectes"
#: builtin/gc.c:25
msgid "git gc [<options>]"
@@ -6476,12 +7154,13 @@ msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-"Empaquetant automàticament el dipòsit en el fons per rendiment òptim.\n"
+"S'està empaquetant el dipòsit automàticament en el fons per rendiment "
+"òptim.\n"
#: builtin/gc.c:375
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
-msgstr "Empaquetant automàticament el dipòsit per rendiment òptim.\n"
+msgstr "S'està empaquetant automàticament el dipòsit per rendiment òptim.\n"
#: builtin/gc.c:376
#, c-format
@@ -6493,7 +7172,7 @@ msgstr "Vegeu \"git help gc\" per neteja manual.\n"
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-"gc ja està executant en la màquina '%s' pid %<PRIuMAX> (useu --force si no)"
+"gc ja s'està executant en la màquina '%s' pid %<PRIuMAX> (useu --force si no)"
#: builtin/gc.c:441
msgid ""
@@ -6526,218 +7205,218 @@ msgstr "no s'ha pogut llegir l'arbre (%s)"
msgid "unable to grep from object of type %s"
msgstr "no es pot fer grep des d'un objecte de tipus %s"
-#: builtin/grep.c:558
+#: builtin/grep.c:560
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'opció `%c' espera un valor numèric"
-#: builtin/grep.c:575
+#: builtin/grep.c:577
#, c-format
msgid "cannot open '%s'"
msgstr "no es pot obrir '%s'"
-#: builtin/grep.c:644
+#: builtin/grep.c:646
msgid "search in index instead of in the work tree"
msgstr "cerca en l'índex en lloc de l'arbre de treball"
-#: builtin/grep.c:646
+#: builtin/grep.c:648
msgid "find in contents not managed by git"
msgstr "cerca en continguts no gestionats per git"
-#: builtin/grep.c:648
+#: builtin/grep.c:650
msgid "search in both tracked and untracked files"
msgstr "cerca tant en fitxers seguits com en no seguits"
-#: builtin/grep.c:650
+#: builtin/grep.c:652
msgid "ignore files specified via '.gitignore'"
msgstr "ignora els fitxers especificats mitjançant '.gitignore'"
-#: builtin/grep.c:653
+#: builtin/grep.c:655
msgid "show non-matching lines"
msgstr "mostra les línies no coincidents"
-#: builtin/grep.c:655
+#: builtin/grep.c:657
msgid "case insensitive matching"
msgstr "coincidència insensible a majúscula i minúscula"
-#: builtin/grep.c:657
+#: builtin/grep.c:659
msgid "match patterns only at word boundaries"
msgstr "coincideix amb els patrons només als límits de paraula"
-#: builtin/grep.c:659
+#: builtin/grep.c:661
msgid "process binary files as text"
msgstr "processa els fitxers binaris com a text"
-#: builtin/grep.c:661
+#: builtin/grep.c:663
msgid "don't match patterns in binary files"
msgstr "no coincideixis amb els patrons en els fitxers binaris"
-#: builtin/grep.c:664
+#: builtin/grep.c:666
msgid "process binary files with textconv filters"
msgstr "processa els fitxers binaris amb filtres de textconv"
-#: builtin/grep.c:666
+#: builtin/grep.c:668
msgid "descend at most <depth> levels"
msgstr "descendeix com a màxim <profunditat> nivells"
-#: builtin/grep.c:670
+#: builtin/grep.c:672
msgid "use extended POSIX regular expressions"
msgstr "usa les expressions regulars POSIX esteses"
-#: builtin/grep.c:673
+#: builtin/grep.c:675
msgid "use basic POSIX regular expressions (default)"
msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
-#: builtin/grep.c:676
+#: builtin/grep.c:678
msgid "interpret patterns as fixed strings"
msgstr "interpreta els patrons com a cadenes fixes"
-#: builtin/grep.c:679
+#: builtin/grep.c:681
msgid "use Perl-compatible regular expressions"
msgstr "usa les expressions regulars compatibles amb Perl"
-#: builtin/grep.c:682
+#: builtin/grep.c:684
msgid "show line numbers"
msgstr "mostra els números de línia"
-#: builtin/grep.c:683
+#: builtin/grep.c:685
msgid "don't show filenames"
msgstr "no mostris els noms de fitxer"
-#: builtin/grep.c:684
+#: builtin/grep.c:686
msgid "show filenames"
msgstr "mostra els noms de fitxer"
-#: builtin/grep.c:686
+#: builtin/grep.c:688
msgid "show filenames relative to top directory"
msgstr "mostra els noms de fitxer relatius al directori superior"
-#: builtin/grep.c:688
+#: builtin/grep.c:690
msgid "show only filenames instead of matching lines"
msgstr "mostra només els noms de fitxer en lloc de les línies coincidents"
-#: builtin/grep.c:690
+#: builtin/grep.c:692
msgid "synonym for --files-with-matches"
msgstr "sinònim de --files-with-matches"
-#: builtin/grep.c:693
+#: builtin/grep.c:695
msgid "show only the names of files without match"
msgstr "mostra només els noms dels fitxers sense coincidència"
-#: builtin/grep.c:695
+#: builtin/grep.c:697
msgid "print NUL after filenames"
msgstr "imprimeix NUL després dels noms de fitxer"
-#: builtin/grep.c:697
+#: builtin/grep.c:699
msgid "show the number of matches instead of matching lines"
msgstr "mostra el nombre de coincidències en lloc de les línies coincidents"
-#: builtin/grep.c:698
+#: builtin/grep.c:700
msgid "highlight matches"
msgstr "ressalta les coincidències"
-#: builtin/grep.c:700
+#: builtin/grep.c:702
msgid "print empty line between matches from different files"
msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
-#: builtin/grep.c:702
+#: builtin/grep.c:704
msgid "show filename only once above matches from same file"
msgstr ""
"mostra el nom de fitxer només una vegada a dalt de les coincidències del "
"mateix fitxer"
-#: builtin/grep.c:705
+#: builtin/grep.c:707
msgid "show <n> context lines before and after matches"
msgstr "mostra <n> línies de context abans i després d'una coincidència"
-#: builtin/grep.c:708
+#: builtin/grep.c:710
msgid "show <n> context lines before matches"
msgstr "mostra <n> línies de context abans d'una coincidència"
-#: builtin/grep.c:710
+#: builtin/grep.c:712
msgid "show <n> context lines after matches"
msgstr "mostra <n> línies de context després d'una coincidència"
-#: builtin/grep.c:712
+#: builtin/grep.c:714
msgid "use <n> worker threads"
msgstr "usa <n> fils obrers"
-#: builtin/grep.c:713
+#: builtin/grep.c:715
msgid "shortcut for -C NUM"
msgstr "drecera per -C NUM"
-#: builtin/grep.c:716
+#: builtin/grep.c:718
msgid "show a line with the function name before matches"
msgstr "mostra una línia amb el nom de funció abans de les coincidències"
-#: builtin/grep.c:718
+#: builtin/grep.c:720
msgid "show the surrounding function"
msgstr "mostra la funció circumdant"
-#: builtin/grep.c:721
+#: builtin/grep.c:723
msgid "read patterns from file"
msgstr "llegeix els patrons des d'un fitxer"
-#: builtin/grep.c:723
+#: builtin/grep.c:725
msgid "match <pattern>"
msgstr "coincideix amb <patró>"
-#: builtin/grep.c:725
+#: builtin/grep.c:727
msgid "combine patterns specified with -e"
msgstr "combina els patrons especificats amb -e"
-#: builtin/grep.c:737
+#: builtin/grep.c:739
msgid "indicate hit with exit status without output"
msgstr "indica coincidència amb estat de sortida sense sortida textual"
-#: builtin/grep.c:739
+#: builtin/grep.c:741
msgid "show only matches from files that match all patterns"
msgstr ""
"mostra només les coincidències dels fitxers que coincideixin amb tots els "
"patrons"
-#: builtin/grep.c:741
+#: builtin/grep.c:743
msgid "show parse tree for grep expression"
msgstr "mostra l'arbre d'anàlisis de l'expressió de grep"
-#: builtin/grep.c:745
+#: builtin/grep.c:747
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:745
+#: builtin/grep.c:747
msgid "show matching files in the pager"
msgstr "mostra els fitxers coincidents en el paginador"
-#: builtin/grep.c:748
+#: builtin/grep.c:750
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
-#: builtin/grep.c:811
+#: builtin/grep.c:813
msgid "no pattern given."
msgstr "cap patró donat."
-#: builtin/grep.c:843 builtin/index-pack.c:1475
+#: builtin/grep.c:845 builtin/index-pack.c:1479
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "s'ha especificat un nombre de fils no vàlid (%d)"
-#: builtin/grep.c:873
+#: builtin/grep.c:875
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager només funciona en l'arbre de treball"
-#: builtin/grep.c:899
+#: builtin/grep.c:901
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached o --untracked no es pot usar amb --no-index."
-#: builtin/grep.c:904
+#: builtin/grep.c:906
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index o --untracked no es pot usar amb revisions."
-#: builtin/grep.c:907
+#: builtin/grep.c:909
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits."
-#: builtin/grep.c:915
+#: builtin/grep.c:917
msgid "both --cached and trees are given."
msgstr "s'han donat ambdós --caches i arbres."
@@ -6828,8 +7507,8 @@ msgstr "la versió d'emacsclient '%d' és massa vella (< 22)."
#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
-msgid "failed to exec '%s': %s"
-msgstr "s'ha fallat en executar '%s': %s"
+msgid "failed to exec '%s'"
+msgstr "s'ha fallat en executar '%s'"
#: builtin/help.c:205
#, c-format
@@ -6852,7 +7531,7 @@ msgstr ""
#: builtin/help.c:334
#, c-format
msgid "'%s': unknown man viewer."
-msgstr "'%s': visualitzador de manuals desconegut"
+msgstr "'%s': visualitzador de manuals desconegut."
#: builtin/help.c:351
msgid "no man viewer handled the request"
@@ -6862,332 +7541,331 @@ msgstr "cap visualitzador de manuals ha gestionat la sol·licitud"
msgid "no info viewer handled the request"
msgstr "cap visualitzador d'informació ha gestionat la sol·licitud"
-#: builtin/help.c:408
+#: builtin/help.c:401
msgid "Defining attributes per path"
msgstr "La definició d'atributs per camí"
-#: builtin/help.c:409
+#: builtin/help.c:402
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git quotidià amb més o menys 20 ordres"
-#: builtin/help.c:410
+#: builtin/help.c:403
msgid "A Git glossary"
msgstr "Un glossari de Git"
-#: builtin/help.c:411
+#: builtin/help.c:404
msgid "Specifies intentionally untracked files to ignore"
msgstr "Especifica els fitxers intencionalment no seguits a ignorar"
-#: builtin/help.c:412
+#: builtin/help.c:405
msgid "Defining submodule properties"
msgstr "La definició de les propietats de submòduls"
-#: builtin/help.c:413
+#: builtin/help.c:406
msgid "Specifying revisions and ranges for Git"
msgstr "L'especificació de revisions i rangs per al Git"
-#: builtin/help.c:414
+#: builtin/help.c:407
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Una introducció tutorial al Git (per a la versió 1.5.1 o més nou)"
-#: builtin/help.c:415
+#: builtin/help.c:408
msgid "An overview of recommended workflows with Git"
msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git"
-#: builtin/help.c:427
+#: builtin/help.c:420
msgid "The common Git guides are:\n"
msgstr "Les guies de Git comunes són:\n"
-#: builtin/help.c:448 builtin/help.c:465
+#: builtin/help.c:441 builtin/help.c:458
#, c-format
msgid "usage: %s%s"
msgstr "ús: %s%s"
-#: builtin/help.c:481
+#: builtin/help.c:474
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s' és un àlies de `%s'"
-#: builtin/index-pack.c:152
+#: builtin/index-pack.c:153
#, c-format
msgid "unable to open %s"
msgstr "no s'ha pogut obrir %s"
-#: builtin/index-pack.c:202
+#: builtin/index-pack.c:203
#, c-format
msgid "object type mismatch at %s"
msgstr "hi ha una discordança de tipus d'objecte a %s"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:223
#, c-format
msgid "did not receive expected object %s"
msgstr "no s'ha rebut l'objecte esperat %s"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objecte %s: tipus %s esperat, %s trobat"
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:268
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "no es pot omplir %d octet"
msgstr[1] "no es pot omplir %d octets"
-#: builtin/index-pack.c:277
+#: builtin/index-pack.c:278
msgid "early EOF"
msgstr "EOF prematur"
-#: builtin/index-pack.c:278
+#: builtin/index-pack.c:279
msgid "read error on input"
msgstr "error de lectura d'entrada"
-#: builtin/index-pack.c:290
+#: builtin/index-pack.c:291
msgid "used more bytes than were available"
msgstr "s'han usat més octets que hi havia disponibles"
-#: builtin/index-pack.c:297
+#: builtin/index-pack.c:298
msgid "pack too large for current definition of off_t"
msgstr "paquet massa gran per a la definició actual d'off_t"
-#: builtin/index-pack.c:313
+#: builtin/index-pack.c:314
#, c-format
msgid "unable to create '%s'"
msgstr "no es pot crear '%s'"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "cannot open packfile '%s'"
msgstr "no es pot obrir el fitxer de paquet '%s'"
-#: builtin/index-pack.c:332
+#: builtin/index-pack.c:333
msgid "pack signature mismatch"
-msgstr "hi ha una discordança de firma de paquet"
+msgstr "hi ha una discordança de signatura de paquet"
-#: builtin/index-pack.c:334
+#: builtin/index-pack.c:335
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la versió de paquet %<PRIu32> no és compatible"
-#: builtin/index-pack.c:352
+#: builtin/index-pack.c:353
#, c-format
-msgid "pack has bad object at offset %lu: %s"
-msgstr "el paquet té un objecte dolent a la posició %lu: %s"
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "el paquet té un objecte dolent a la posició %<PRIuMAX>: %s"
-#: builtin/index-pack.c:473
+#: builtin/index-pack.c:475
#, c-format
msgid "inflate returned %d"
msgstr "la inflació ha retornat %d"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:524
msgid "offset value overflow for delta base object"
msgstr "desbordament de valor de desplaçament per a l'objecte base de delta"
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:532
msgid "delta base offset is out of bound"
msgstr "el desplaçament de base de delta està fora de límits"
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:540
#, c-format
msgid "unknown object type %d"
msgstr "tipus d'objecte desconegut %d"
-#: builtin/index-pack.c:569
+#: builtin/index-pack.c:571
msgid "cannot pread pack file"
msgstr "no es pot fer pread en el fitxer de paquet"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:573
#, c-format
-msgid "premature end of pack file, %lu byte missing"
-msgid_plural "premature end of pack file, %lu bytes missing"
-msgstr[0] "final prematur de fitxer de paquet, manca %lu octet"
-msgstr[1] "final prematur de fitxer de paquet, manquen %lu octets"
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+msgstr[0] "el final del fitxer de paquet és prematur, manca %<PRIuMAX> octet"
+msgstr[1] ""
+"el final del fitxer de paquet és prematur, manquen %<PRIuMAX> octets"
-#: builtin/index-pack.c:597
+#: builtin/index-pack.c:599
msgid "serious inflate inconsistency"
msgstr "hi ha una inconsistència seriosa d'inflació"
-#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
-#: builtin/index-pack.c:806 builtin/index-pack.c:815
+#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
+#: builtin/index-pack.c:808 builtin/index-pack.c:817
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !"
-#: builtin/index-pack.c:746 builtin/pack-objects.c:162
-#: builtin/pack-objects.c:254
+#: builtin/index-pack.c:748 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:256
#, c-format
msgid "unable to read %s"
msgstr "no s'ha pogut llegir %s"
-#: builtin/index-pack.c:812
+#: builtin/index-pack.c:814
#, c-format
msgid "cannot read existing object %s"
msgstr "no es pot llegir l'objecte existent %s"
-#: builtin/index-pack.c:826
+#: builtin/index-pack.c:828
#, c-format
msgid "invalid blob object %s"
msgstr "objecte de blob no vàlid %s"
-#: builtin/index-pack.c:840
+#: builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr "%s no vàlid"
-#: builtin/index-pack.c:843
+#: builtin/index-pack.c:845
msgid "Error in object"
msgstr "Error en objecte"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "No tots els objectes fills de %s són abastables"
-#: builtin/index-pack.c:917 builtin/index-pack.c:948
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "s'ha fallat en aplicar la delta"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1120
msgid "Receiving objects"
-msgstr "Rebent objectes"
+msgstr "S'estan rebent objectes"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1120
msgid "Indexing objects"
-msgstr "Indexant objectes"
+msgstr "S'estan indexant objectes"
-#: builtin/index-pack.c:1150
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "el paquet és malmès (discordança SHA1)"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "no es pot fer fstat en el fitxer de paquet"
-#: builtin/index-pack.c:1158
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "el paquet té brossa al seu final"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1171
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusió més enllà de la bogeria en parse_pack_objects()"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1196
msgid "Resolving deltas"
-msgstr "Resolent les deltes"
+msgstr "S'estan resolent les deltes"
-#: builtin/index-pack.c:1205
+#: builtin/index-pack.c:1207
#, c-format
msgid "unable to create thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: builtin/index-pack.c:1247
+#: builtin/index-pack.c:1249
msgid "confusion beyond insanity"
msgstr "confusió més enllà de la bogeria"
-#: builtin/index-pack.c:1253
+#: builtin/index-pack.c:1255
#, c-format
-msgid "completed with %d local objects"
-msgstr "s'ha completat amb %d objectes locals"
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "s'ha completat amb %d objecte local"
+msgstr[1] "s'ha completat amb %d objectes locals"
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1267
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Suma de verificació final no esperada per a %s (corrupció de disc?)"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1271
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "El paquet té %d delta no resolta"
msgstr[1] "El paquet té %d deltes no resoltes"
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1295
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1371
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objecte local %s és malmès"
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1395
msgid "error while closing pack file"
msgstr "error en tancar el fitxer de paquet"
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1408
#, c-format
msgid "cannot write keep file '%s'"
msgstr "no es pot escriure el fitxer a retenir '%s'"
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1416
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "no es pot tancar el fitxer escrit a retenir '%s'"
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1429
msgid "cannot store pack file"
msgstr "no es pot emmagatzemar el fitxer de paquet"
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1440
msgid "cannot store index file"
msgstr "no es pot emmagatzemar el fitxer d'índex"
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1473
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> dolent"
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
+#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
-msgstr "no hi ha suport de fils, ignorant %s"
+msgstr "no hi ha suport de fils, s'està ignorant %s"
-#: builtin/index-pack.c:1538
+#: builtin/index-pack.c:1542
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "No es pot obrir el fitxer de paquet existent '%s'"
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1544
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "No es pot obrir el fitxer d'índex de paquets existent de '%s'"
-#: builtin/index-pack.c:1587
+#: builtin/index-pack.c:1591
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "sense delta: %d objecte"
msgstr[1] "sense delta: %d objectes"
-#: builtin/index-pack.c:1594
+#: builtin/index-pack.c:1598
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "longitud de cadena = %d: %lu objecte"
msgstr[1] "longitud de cadena = %d: %lu objectes"
-#: builtin/index-pack.c:1624
-msgid "Cannot come back to cwd"
-msgstr "No es pot tornar al directori de treball actual"
+#: builtin/index-pack.c:1611
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "el nom del fitxer de paquet '%s' no acaba amb '.pack'"
-#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
-#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
+#: builtin/index-pack.c:1693 builtin/index-pack.c:1696
+#: builtin/index-pack.c:1712 builtin/index-pack.c:1716
#, c-format
msgid "bad %s"
msgstr "%s dolent"
-#: builtin/index-pack.c:1709
+#: builtin/index-pack.c:1730
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin no es pot usar sense --stdin"
-#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "el nom de fitxer de paquet '%s' no acaba amb '.pack'"
-
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1738
msgid "--verify with no packfile name given"
msgstr "s'ha donat --verify sense nom de fitxer de paquet"
@@ -7224,54 +7902,54 @@ msgstr "no es pot copiar '%s' a '%s'"
#: builtin/init-db.c:89
#, c-format
msgid "ignoring template %s"
-msgstr "ignorant la plantilla %s"
+msgstr "s'està ignorant la plantilla %s"
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
#, c-format
msgid "templates not found %s"
msgstr "no s'han trobat les plantilles %s"
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
#, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr "no copiant plantilles d'una versió de format errònia %d de '%s'"
+msgid "not copying templates from '%s': %s"
+msgstr "no s'està copiant plantilles de '%s': %s"
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
#, c-format
msgid "%s already exists"
msgstr "%s ja existeix"
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
#, c-format
msgid "unable to handle file type %d"
msgstr "no s'ha pogut gestionar el tipus de fitxer %d"
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
#, c-format
msgid "unable to move %s to %s"
msgstr "no s'ha pogut moure %s a %s"
-#. TRANSLATORS: The first '%s' is either "Reinitialized
-#. existing" or "Initialized empty", the second " shared" or
-#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:402
#, c-format
-msgid "%s%s Git repository in %s%s\n"
-msgstr "%s dipòsit de Git%s a %s%s\n"
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "S'ha reinicialitzat el dipòsit compartit existent del Git en %s%s\n"
-#: builtin/init-db.c:400
-msgid "Reinitialized existing"
-msgstr "S'ha reinicialitzat un existent"
+#: builtin/init-db.c:403
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "S'ha reinicialitzat el dipòsit existent del Git en %s%s\n"
-#: builtin/init-db.c:400
-msgid "Initialized empty"
-msgstr "S'ha inicialitzat un buit"
+#: builtin/init-db.c:407
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "S'ha inicialitzat un dipòsit compartit buit del Git en %s%s\n"
-#: builtin/init-db.c:401
-msgid " shared"
-msgstr " compartit"
+#: builtin/init-db.c:408
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "S'ha inicialitzat un dipòsit buit del Git en %s%s\n"
-#: builtin/init-db.c:448
+#: builtin/init-db.c:455
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7279,25 +7957,25 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--"
"shared[=<permisos>]] [<directori>]"
-#: builtin/init-db.c:471
+#: builtin/init-db.c:478
msgid "permissions"
msgstr "permisos"
-#: builtin/init-db.c:472
+#: builtin/init-db.c:479
msgid "specify that the git repository is to be shared amongst several users"
msgstr "especifica que el dipòsit de git es compartirà entre diversos usuaris"
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:513 builtin/init-db.c:518
#, c-format
msgid "cannot mkdir %s"
msgstr "no es pot mkdir %s"
-#: builtin/init-db.c:515
+#: builtin/init-db.c:522
#, c-format
msgid "cannot chdir to %s"
-msgstr "no es pot chdir a %s"
+msgstr "no es pot canviar de directori a %s"
-#: builtin/init-db.c:536
+#: builtin/init-db.c:543
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7306,7 +7984,7 @@ msgstr ""
"no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-"
"dir=<directori>)"
-#: builtin/init-db.c:564
+#: builtin/init-db.c:571
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "No es pot accedir a l'arbre de treball '%s'"
@@ -7339,278 +8017,330 @@ msgstr "remolcs a afegir"
msgid "no input file given for in-place editing"
msgstr "no s'ha donat cap fitxer d'entrada per a edició in situ"
-#: builtin/log.c:43
+#: builtin/log.c:44
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camí>...]"
-#: builtin/log.c:44
+#: builtin/log.c:45
msgid "git show [<options>] <object>..."
msgstr "git show [<opcions>] <objecte>..."
-#: builtin/log.c:83
+#: builtin/log.c:84
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opció --decorate no vàlida: %s"
-#: builtin/log.c:131
+#: builtin/log.c:139
msgid "suppress diff output"
msgstr "omet la sortida de diferències"
-#: builtin/log.c:132
+#: builtin/log.c:140
msgid "show source"
msgstr "mostra la font"
-#: builtin/log.c:133
+#: builtin/log.c:141
msgid "Use mail map file"
msgstr "Usa el fitxer de mapa de correu"
-#: builtin/log.c:134
+#: builtin/log.c:142
msgid "decorate options"
msgstr "opcions de decoració"
-#: builtin/log.c:137
+#: builtin/log.c:145
msgid "Process line range n,m in file, counting from 1"
msgstr "Processa el rang de línies n,m en el fitxer, comptant des d'1"
-#: builtin/log.c:233
+#: builtin/log.c:241
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortida final: %d %s\n"
-#: builtin/log.c:465
+#: builtin/log.c:486
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: fitxer dolent"
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:500 builtin/log.c:594
#, c-format
msgid "Could not read object %s"
msgstr "No es pot llegir l'objecte %s"
-#: builtin/log.c:596
+#: builtin/log.c:618
#, c-format
msgid "Unknown type: %d"
msgstr "Tipus desconegut: %d"
-#: builtin/log.c:715
+#: builtin/log.c:739
msgid "format.headers without value"
msgstr "format.headers sense valor"
-#: builtin/log.c:801
+#: builtin/log.c:839
msgid "name of output directory is too long"
msgstr "el nom del directori de sortida és massa llarg"
-#: builtin/log.c:816
+#: builtin/log.c:854
#, c-format
msgid "Cannot open patch file %s"
msgstr "No es pot obrir el fitxer de pedaç %s"
-#: builtin/log.c:830
+#: builtin/log.c:868
msgid "Need exactly one range."
msgstr "Cal exactament un rang."
-#: builtin/log.c:840
+#: builtin/log.c:878
msgid "Not a range."
msgstr "No és un rang."
-#: builtin/log.c:946
+#: builtin/log.c:984
msgid "Cover letter needs email format"
msgstr "La carta de presentació necessita el format de correu electrònic"
-#: builtin/log.c:1025
+#: builtin/log.c:1064
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to boig: %s"
-#: builtin/log.c:1053
+#: builtin/log.c:1092
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
-#: builtin/log.c:1098
+#: builtin/log.c:1137
msgid "Two output directories?"
-msgstr "Dos directoris de sortida?"
+msgstr "Hi ha dos directoris de sortida?"
-#: builtin/log.c:1214
+#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
+#, c-format
+msgid "Unknown commit %s"
+msgstr "Comissió desconeguda %s"
+
+#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
+#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
+#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
+#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "S'ha fallat en resoldre '%s' com a referència vàlida."
+
+#: builtin/log.c:1259
+msgid "Could not find exact merge base."
+msgstr "No s'ha pogut trobar la base exacta de fusió."
+
+#: builtin/log.c:1263
+msgid ""
+"Failed to get upstream, if you want to record base commit automatically,\n"
+"please use git branch --set-upstream-to to track a remote branch.\n"
+"Or you could specify base commit by --base=<base-commit-id> manually."
+msgstr ""
+"S'ha fallat en obtenir la font. Si voleu registrar la comissió base\n"
+"automàticament, si us plau, useu git branch --set-upstream-to per a\n"
+"seguir una branca remot. O podeu especificar la comissió base manualment\n"
+"amb --base=<id-de-comissió-base>."
+
+#: builtin/log.c:1283
+msgid "Failed to find exact merge base"
+msgstr "S'ha fallat en trobar la base exacta de fusió."
+
+#: builtin/log.c:1294
+msgid "base commit should be the ancestor of revision list"
+msgstr "la comissió base ha de ser l'avantpassat de la llista de revisions"
+
+#: builtin/log.c:1298
+msgid "base commit shouldn't be in revision list"
+msgstr "la comissió base no ha de ser en la llista de revisions"
+
+#: builtin/log.c:1347
+msgid "cannot get patch id"
+msgstr "no es pot obtenir l'id del pedaç"
+
+#: builtin/log.c:1404
msgid "use [PATCH n/m] even with a single patch"
msgstr "usa [PATCH n/m] fins i tot amb un sol pedaç"
-#: builtin/log.c:1217
+#: builtin/log.c:1407
msgid "use [PATCH] even with multiple patches"
msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
-#: builtin/log.c:1221
+#: builtin/log.c:1411
msgid "print patches to standard out"
msgstr "imprimeix els pedaços a la sortida estàndard"
-#: builtin/log.c:1223
+#: builtin/log.c:1413
msgid "generate a cover letter"
msgstr "genera una carta de presentació"
-#: builtin/log.c:1225
+#: builtin/log.c:1415
msgid "use simple number sequence for output file names"
msgstr "usa una seqüència de números per als noms dels fitxers de sortida"
-#: builtin/log.c:1226
+#: builtin/log.c:1416
msgid "sfx"
msgstr "sufix"
-#: builtin/log.c:1227
+#: builtin/log.c:1417
msgid "use <sfx> instead of '.patch'"
msgstr "usa <sufix> en lloc de '.patch'"
-#: builtin/log.c:1229
+#: builtin/log.c:1419
msgid "start numbering patches at <n> instead of 1"
msgstr "comença numerant els pedaços a <n> en lloc d'1"
-#: builtin/log.c:1231
+#: builtin/log.c:1421
msgid "mark the series as Nth re-roll"
msgstr "marca la sèrie com a l'enèsima llançada"
-#: builtin/log.c:1233
+#: builtin/log.c:1423
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Usa [<prefix>] en lloc de [PATCH]"
-#: builtin/log.c:1236
+#: builtin/log.c:1426
msgid "store resulting files in <dir>"
msgstr "emmagatzema els fitxers resultants a <directori>"
-#: builtin/log.c:1239
+#: builtin/log.c:1429
msgid "don't strip/add [PATCH]"
msgstr "no despullis/afegeixis [PATCH]"
-#: builtin/log.c:1242
+#: builtin/log.c:1432
msgid "don't output binary diffs"
msgstr "no emetis diferències binàries"
-#: builtin/log.c:1244
+#: builtin/log.c:1434
msgid "output all-zero hash in From header"
msgstr "emet un hash de tots zeros en la capçalera From"
-#: builtin/log.c:1246
+#: builtin/log.c:1436
msgid "don't include a patch matching a commit upstream"
msgstr "no incloguis pedaços que coincideixin amb comissions a la font"
-#: builtin/log.c:1248
+#: builtin/log.c:1438
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)"
-#: builtin/log.c:1250
+#: builtin/log.c:1440
msgid "Messaging"
msgstr "Missatgeria"
-#: builtin/log.c:1251
+#: builtin/log.c:1441
msgid "header"
msgstr "capçalera"
-#: builtin/log.c:1252
+#: builtin/log.c:1442
msgid "add email header"
msgstr "afegeix una capçalera de correu electrònic"
-#: builtin/log.c:1253 builtin/log.c:1255
+#: builtin/log.c:1443 builtin/log.c:1445
msgid "email"
msgstr "correu electrònic"
-#: builtin/log.c:1253
+#: builtin/log.c:1443
msgid "add To: header"
msgstr "afegeix la capçalera To:"
-#: builtin/log.c:1255
+#: builtin/log.c:1445
msgid "add Cc: header"
msgstr "afegeix la capçalera Cc:"
-#: builtin/log.c:1257
+#: builtin/log.c:1447
msgid "ident"
msgstr "identitat"
-#: builtin/log.c:1258
+#: builtin/log.c:1448
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"estableix l'adreça From a <identitat> (o la identitat del comitent si manca)"
-#: builtin/log.c:1260
+#: builtin/log.c:1450
msgid "message-id"
msgstr "ID de missatge"
-#: builtin/log.c:1261
+#: builtin/log.c:1451
msgid "make first mail a reply to <message-id>"
-msgstr "fes del primer missatge una resposta a <ID de missatge>"
+msgstr "fes que el primer missatge sigui una resposta a <ID de missatge>"
-#: builtin/log.c:1262 builtin/log.c:1265
+#: builtin/log.c:1452 builtin/log.c:1455
msgid "boundary"
msgstr "límit"
-#: builtin/log.c:1263
+#: builtin/log.c:1453
msgid "attach the patch"
msgstr "ajunta el pedaç"
-#: builtin/log.c:1266
+#: builtin/log.c:1456
msgid "inline the patch"
msgstr "posa el pedaç en el cos"
-#: builtin/log.c:1270
+#: builtin/log.c:1460
msgid "enable message threading, styles: shallow, deep"
msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
-#: builtin/log.c:1272
+#: builtin/log.c:1462
msgid "signature"
-msgstr "firma"
+msgstr "signatura"
-#: builtin/log.c:1273
+#: builtin/log.c:1463
msgid "add a signature"
-msgstr "afegeix una firma"
+msgstr "afegeix una signatura"
+
+#: builtin/log.c:1464
+msgid "base-commit"
+msgstr "comissió base"
+
+#: builtin/log.c:1465
+msgid "add prerequisite tree info to the patch series"
+msgstr "afegeix la informació d'arbre prerequerida a la sèrie de pedaços"
-#: builtin/log.c:1275
+#: builtin/log.c:1467
msgid "add a signature from a file"
-msgstr "afegeix una firma des d'un fitxer"
+msgstr "afegeix una signatura des d'un fitxer"
-#: builtin/log.c:1276
+#: builtin/log.c:1468
msgid "don't print the patch filenames"
msgstr "no imprimeixis els noms de fitxer del pedaç"
-#: builtin/log.c:1365
+#: builtin/log.c:1558
msgid "-n and -k are mutually exclusive."
msgstr "-n i -k són mutualment exclusius."
-#: builtin/log.c:1367
+#: builtin/log.c:1560
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix i -k són mutualment exclusius."
-#: builtin/log.c:1375
+#: builtin/log.c:1568
msgid "--name-only does not make sense"
msgstr "--name-only no té sentit"
-#: builtin/log.c:1377
+#: builtin/log.c:1570
msgid "--name-status does not make sense"
msgstr "--name-status no té sentit"
-#: builtin/log.c:1379
+#: builtin/log.c:1572
msgid "--check does not make sense"
msgstr "--check no té sentit"
-#: builtin/log.c:1407
+#: builtin/log.c:1602
msgid "standard output, or directory, which one?"
msgstr "sortida estàndard o directori, quin dels dos?"
-#: builtin/log.c:1409
+#: builtin/log.c:1604
#, c-format
msgid "Could not create directory '%s'"
msgstr "No s'ha pogut crear el directori '%s'"
-#: builtin/log.c:1506
+#: builtin/log.c:1698
#, c-format
msgid "unable to read signature file '%s'"
-msgstr "no s'ha pogut llegir el fitxer de firma '%s'"
+msgstr "no s'ha pogut llegir el fitxer de signatura '%s'"
-#: builtin/log.c:1569
+#: builtin/log.c:1769
msgid "Failed to create output files"
msgstr "S'ha fallat en crear els fitxers de sortida"
-#: builtin/log.c:1617
+#: builtin/log.c:1818
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
-#: builtin/log.c:1671
+#: builtin/log.c:1872
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7618,106 +8348,101 @@ msgstr ""
"No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu "
"<font> manualment.\n"
-#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
-#, c-format
-msgid "Unknown commit %s"
-msgstr "Comissió desconeguda %s"
-
-#: builtin/ls-files.c:378
+#: builtin/ls-files.c:379
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opcions>] [<fitxer>...]"
-#: builtin/ls-files.c:427
+#: builtin/ls-files.c:428
msgid "identify the file status with tags"
msgstr "identifica l'estat de fitxer amb etiquetes"
-#: builtin/ls-files.c:429
+#: builtin/ls-files.c:430
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "usa lletres minúscules per als fitxers 'assume unchanged'"
-#: builtin/ls-files.c:431
+#: builtin/ls-files.c:432
msgid "show cached files in the output (default)"
msgstr ""
"mostra en la sortida els fitxers desats en la memòria cau (per defecte)"
-#: builtin/ls-files.c:433
+#: builtin/ls-files.c:434
msgid "show deleted files in the output"
msgstr "mostra en la sortida els fitxers suprimits"
-#: builtin/ls-files.c:435
+#: builtin/ls-files.c:436
msgid "show modified files in the output"
msgstr "mostra en la sortida els fitxers modificats"
-#: builtin/ls-files.c:437
+#: builtin/ls-files.c:438
msgid "show other files in the output"
msgstr "mostra en la sortida els altres fitxers"
-#: builtin/ls-files.c:439
+#: builtin/ls-files.c:440
msgid "show ignored files in the output"
msgstr "mostra en la sortida els fitxers ignorats"
-#: builtin/ls-files.c:442
+#: builtin/ls-files.c:443
msgid "show staged contents' object name in the output"
msgstr "mostra en la sortida el nom d'objecte dels continguts allistats"
-#: builtin/ls-files.c:444
+#: builtin/ls-files.c:445
msgid "show files on the filesystem that need to be removed"
msgstr "mostra els fitxers en el sistema de fitxers que s'han d'eliminar"
-#: builtin/ls-files.c:446
+#: builtin/ls-files.c:447
msgid "show 'other' directories' names only"
msgstr "mostra només els noms dels directoris 'other'"
-#: builtin/ls-files.c:448
+#: builtin/ls-files.c:449
msgid "show line endings of files"
msgstr "mostra els terminis de línia dels fitxers"
-#: builtin/ls-files.c:450
+#: builtin/ls-files.c:451
msgid "don't show empty directories"
msgstr "no mostris els directoris buits"
-#: builtin/ls-files.c:453
+#: builtin/ls-files.c:454
msgid "show unmerged files in the output"
msgstr "mostra en la sortida els fitxers sense fusionar"
-#: builtin/ls-files.c:455
+#: builtin/ls-files.c:456
msgid "show resolve-undo information"
msgstr "mostra la informació de resolució de desfet"
-#: builtin/ls-files.c:457
+#: builtin/ls-files.c:458
msgid "skip files matching pattern"
msgstr "salta els fitxers coincidents amb el patró"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:461
msgid "exclude patterns are read from <file>"
msgstr "els patrons d'exclusió es llegeixen de <fitxer>"
-#: builtin/ls-files.c:463
+#: builtin/ls-files.c:464
msgid "read additional per-directory exclude patterns in <file>"
msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>"
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:466
msgid "add the standard git exclusions"
msgstr "afegeix les exclusions estàndards de git"
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:469
msgid "make the output relative to the project top directory"
msgstr "fes que la sortida sigui relativa al directori superior del projecte"
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:472
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si qualsevol <fitxer> no és en l'índex, tracta això com a error"
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:473
msgid "tree-ish"
msgstr "arbre"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:474
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"pretén que els camins eliminats després de <arbre> encara siguin presents"
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:476
msgid "show debugging data"
msgstr "mostra les dades de depuració"
@@ -7766,7 +8491,7 @@ msgstr "surt amb codi de sortida 2 si no es troba cap referència coincident"
#: builtin/ls-remote.c:64
msgid "show underlying ref in addition to the object pointed by it"
-msgstr "mostra la referència subjacent en adició a l'objecte que senyali"
+msgstr "mostra la referència subjacent a més de l'objecte que senyali"
#: builtin/ls-tree.c:28
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
@@ -7805,184 +8530,175 @@ msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
"llista l'arbre sencer; no només el directori actual (implica --full-name)"
-#: builtin/merge.c:45
+#: builtin/merge.c:46
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opcions>] [<comissió>...]"
-#: builtin/merge.c:46
+#: builtin/merge.c:47
msgid "git merge [<options>] <msg> HEAD <commit>"
msgstr "git merge [<opcions>] <missatge> HEAD <comissió>"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:100
+#: builtin/merge.c:102
msgid "switch `m' requires a value"
msgstr "l'opció `m' requereix un valor"
-#: builtin/merge.c:137
+#: builtin/merge.c:139
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "No s'ha pogut trobar l'estratègia de fusió '%s'.\n"
-#: builtin/merge.c:138
+#: builtin/merge.c:140
#, c-format
msgid "Available strategies are:"
msgstr "Les estratègies disponibles són:"
-#: builtin/merge.c:143
+#: builtin/merge.c:145
#, c-format
msgid "Available custom strategies are:"
msgstr "Les estratègies personalitzades disponibles són:"
-#: builtin/merge.c:193 builtin/pull.c:123
+#: builtin/merge.c:195 builtin/pull.c:126
msgid "do not show a diffstat at the end of the merge"
msgstr "no mostris les estadístiques de diferència al final de la fusió"
-#: builtin/merge.c:196 builtin/pull.c:126
+#: builtin/merge.c:198 builtin/pull.c:129
msgid "show a diffstat at the end of the merge"
msgstr "mostra les estadístiques de diferència al final de la fusió"
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:199 builtin/pull.c:132
msgid "(synonym to --stat)"
msgstr "(sinònim de --stat)"
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:201 builtin/pull.c:135
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió "
"de fusió"
-#: builtin/merge.c:202 builtin/pull.c:135
+#: builtin/merge.c:204 builtin/pull.c:138
msgid "create a single commit instead of doing a merge"
msgstr "crea una única comissió en lloc de fusionar"
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:206 builtin/pull.c:141
msgid "perform a commit if the merge succeeds (default)"
msgstr "realitza una comissió si la fusió té èxit (per defecte)"
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:208 builtin/pull.c:144
msgid "edit message before committing"
msgstr "edita el missatge abans de cometre"
-#: builtin/merge.c:207
+#: builtin/merge.c:209
msgid "allow fast-forward (default)"
msgstr "permet l'avanç ràpid (per defecte)"
-#: builtin/merge.c:209 builtin/pull.c:147
+#: builtin/merge.c:211 builtin/pull.c:150
msgid "abort if fast-forward is not possible"
msgstr "avorta si l'avanç ràpid no és possible"
-#: builtin/merge.c:213
-msgid "Verify that the named commit has a valid GPG signature"
-msgstr "Verifica que la comissió anomenada tingui una firma GPG vàlida"
+#: builtin/merge.c:215 builtin/pull.c:153
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "verifica que la comissió anomenada tingui una signatura GPG vàlida"
-#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
+#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157
#: builtin/revert.c:89
msgid "strategy"
msgstr "estratègia"
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:217 builtin/pull.c:158
msgid "merge strategy to use"
msgstr "estratègia de fusió a usar"
-#: builtin/merge.c:216 builtin/pull.c:156
+#: builtin/merge.c:218 builtin/pull.c:161
msgid "option=value"
msgstr "opció=valor"
-#: builtin/merge.c:217 builtin/pull.c:157
+#: builtin/merge.c:219 builtin/pull.c:162
msgid "option for selected merge strategy"
msgstr "opció per a l'estratègia de fusió seleccionada"
-#: builtin/merge.c:219
+#: builtin/merge.c:221
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "missatge de comissió de fusió (per a una fusió no d'avanç ràpid)"
-#: builtin/merge.c:223
+#: builtin/merge.c:225
msgid "abort the current in-progress merge"
msgstr "avorta la fusió en curs actual"
-#: builtin/merge.c:251
+#: builtin/merge.c:227 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr "permet fusionar històries no relacionades"
+
+#: builtin/merge.c:255
msgid "could not run stash."
msgstr "no s'ha pogut executar stash."
-#: builtin/merge.c:256
+#: builtin/merge.c:260
msgid "stash failed"
msgstr "l'emmagatzemament ha fallat"
-#: builtin/merge.c:261
+#: builtin/merge.c:265
#, c-format
msgid "not a valid object: %s"
msgstr "no és un objecte vàlid: %s"
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:284 builtin/merge.c:301
msgid "read-tree failed"
msgstr "read-tree ha fallat"
-#: builtin/merge.c:327
+#: builtin/merge.c:331
msgid " (nothing to squash)"
msgstr " (res a aixafar)"
-#: builtin/merge.c:340
+#: builtin/merge.c:342
#, c-format
msgid "Squash commit -- not updating HEAD\n"
-msgstr "Comissió d'aixafada -- no actualitzant HEAD\n"
-
-#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
-#: builtin/merge.c:989
-#, c-format
-msgid "Could not write to '%s'"
-msgstr "No s'ha pogut escriure al '%s'"
-
-#: builtin/merge.c:372
-msgid "Writing SQUASH_MSG"
-msgstr "Escrivint SQUASH_MSG"
-
-#: builtin/merge.c:374
-msgid "Finishing SQUASH_MSG"
-msgstr "Finalitzant SQUASH_MSG"
+msgstr "Comissió d'aixafada -- no s'està actualitzant HEAD\n"
-#: builtin/merge.c:397
+#: builtin/merge.c:392
#, c-format
msgid "No merge message -- not updating HEAD\n"
-msgstr "Cap missatge de fusió -- no actualitzant HEAD\n"
+msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n"
-#: builtin/merge.c:448
+#: builtin/merge.c:443
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' no assenyala una comissió"
-#: builtin/merge.c:538
+#: builtin/merge.c:533
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Cadena branch.%s.mergeoptions dolenta: %s"
-#: builtin/merge.c:657
+#: builtin/merge.c:652
msgid "Not handling anything other than two heads merge."
-msgstr "No gestionant res a part de la fusió de dos caps."
+msgstr "No s'està gestionant res a part de la fusió de dos caps."
-#: builtin/merge.c:671
+#: builtin/merge.c:666
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Opció desconeguda de merge-recursive: -X%s"
-#: builtin/merge.c:684
+#: builtin/merge.c:681
#, c-format
msgid "unable to write %s"
msgstr "no s'ha pogut escriure %s"
-#: builtin/merge.c:773
+#: builtin/merge.c:733
#, c-format
msgid "Could not read from '%s'"
msgstr "No s'ha pogut llegir de '%s'"
-#: builtin/merge.c:782
+#: builtin/merge.c:742
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr "No cometent la fusió; useu 'git commit' per a completar la fusió.\n"
+msgstr ""
+"No s'està cometent la fusió; useu 'git commit' per a completar la fusió.\n"
-#: builtin/merge.c:788
+#: builtin/merge.c:748
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -7998,54 +8714,68 @@ msgstr ""
"S'ignoraran les línies que comencin amb '%c', i un missatge buit\n"
"avorta la comissió.\n"
-#: builtin/merge.c:812
+#: builtin/merge.c:772
msgid "Empty commit message."
-msgstr "Missatge de comissió buit."
+msgstr "El missatge de comissió és buit."
-#: builtin/merge.c:824
+#: builtin/merge.c:792
#, c-format
msgid "Wonderful.\n"
msgstr "Meravellós.\n"
-#: builtin/merge.c:879
+#: builtin/merge.c:847
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el "
"resultat.\n"
-#: builtin/merge.c:895
+#: builtin/merge.c:863
#, c-format
msgid "'%s' is not a commit"
msgstr "'%s' no és una comissió"
-#: builtin/merge.c:936
+#: builtin/merge.c:904
msgid "No current branch."
-msgstr "Cap branca actual."
+msgstr "No hi ha cap branca actual."
-#: builtin/merge.c:938
+#: builtin/merge.c:906
msgid "No remote for the current branch."
msgstr "No hi ha cap remot per a la branca actual."
-#: builtin/merge.c:940
+#: builtin/merge.c:908
msgid "No default upstream defined for the current branch."
msgstr "No hi ha cap font per defecte definida per a la branca actual."
-#: builtin/merge.c:945
+#: builtin/merge.c:913
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "No hi ha cap branca amb seguiment remot per a %s de %s"
-#: builtin/merge.c:1080
+#: builtin/merge.c:960
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Valor dolent '%s' en l'entorn '%s'"
+
+#: builtin/merge.c:1034
#, c-format
msgid "could not close '%s'"
msgstr "no s'ha pogut tancar '%s'"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1061
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "no és cosa que puguem fusionar en %s: %s"
+
+#: builtin/merge.c:1095
+msgid "not something we can merge"
+msgstr "no és cosa que puguem fusionar"
+
+#: builtin/merge.c:1162
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
-#: builtin/merge.c:1223
+#: builtin/merge.c:1178
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8053,7 +8783,7 @@ msgstr ""
"No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n"
"Si us plau, cometeu els vostres canvis abans de fusionar."
-#: builtin/merge.c:1230
+#: builtin/merge.c:1185
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8061,108 +8791,120 @@ msgstr ""
"No heu conclòs el vostre recull de cireres (CHERRY_PICK_HEAD existeix).\n"
"Si us plau, cometeu els vostres canvis abans de fusionar."
-#: builtin/merge.c:1233
+#: builtin/merge.c:1188
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
"No heu conclòs el vostre recull de cireres (CHERRY_PICK_HEAD existeix)."
-#: builtin/merge.c:1242
+#: builtin/merge.c:1197
msgid "You cannot combine --squash with --no-ff."
msgstr "No podeu combinar --squash amb --no-ff."
-#: builtin/merge.c:1250
+#: builtin/merge.c:1205
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"No hi ha una comissió especificada i merge.defaultToUpstream no està "
"establert."
-#: builtin/merge.c:1267
+#: builtin/merge.c:1222
msgid "Squash commit into empty head not supported yet"
msgstr "Aixafar una comissió a un cap buit encara no es permet"
-#: builtin/merge.c:1269
+#: builtin/merge.c:1224
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Una comissió no d'avanç ràpid no té sentit a un cap buit"
-#: builtin/merge.c:1275
+#: builtin/merge.c:1229
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - no és una cosa que puguem fusionar"
-#: builtin/merge.c:1277
+#: builtin/merge.c:1231
msgid "Can merge only exactly one commit into empty head"
msgstr "Es pot fusionar no més d'exactament una comissió a un cap buit"
-#: builtin/merge.c:1332
+#: builtin/merge.c:1287
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr "La comissió %s té una firma GPG no fiable, suposadament de %s."
+msgstr "La comissió %s té una signatura GPG no fiable, suposadament de %s."
-#: builtin/merge.c:1335
+#: builtin/merge.c:1290
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr "La comissió %s té una firma GPG dolenta suposadament de %s."
+msgstr "La comissió %s té una signatura GPG dolenta suposadament de %s."
-#: builtin/merge.c:1338
+#: builtin/merge.c:1293
#, c-format
msgid "Commit %s does not have a GPG signature."
-msgstr "La comissió %s no té firma GPG."
+msgstr "La comissió %s no té signatura GPG."
-#: builtin/merge.c:1341
+#: builtin/merge.c:1296
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
-msgstr "La comissió %s té una firma GPG bona de %s\n"
+msgstr "La comissió %s té una signatura GPG bona de %s\n"
+
+#: builtin/merge.c:1358
+msgid "refusing to merge unrelated histories"
+msgstr "s'està refusant fusionar històries no relacionades"
-#: builtin/merge.c:1424
+#: builtin/merge.c:1367
+msgid "Already up-to-date."
+msgstr "Ja està al dia."
+
+#: builtin/merge.c:1382
#, c-format
msgid "Updating %s..%s\n"
-msgstr "Actualitzant %s..%s\n"
+msgstr "S'estan actualitzant %s..%s\n"
-#: builtin/merge.c:1461
+#: builtin/merge.c:1419
#, c-format
msgid "Trying really trivial in-index merge...\n"
-msgstr "Intentant una fusió molt trivial en l'índex...\n"
+msgstr "S'està intentant una fusió molt trivial en l'índex...\n"
-#: builtin/merge.c:1468
+#: builtin/merge.c:1426
#, c-format
msgid "Nope.\n"
msgstr "No.\n"
-#: builtin/merge.c:1500
+#: builtin/merge.c:1451
+msgid "Already up-to-date. Yeeah!"
+msgstr "Ja està al dia. Estupend!"
+
+#: builtin/merge.c:1457
msgid "Not possible to fast-forward, aborting."
-msgstr "No és possible avançar ràpidament, avortant."
+msgstr "No és possible avançar ràpidament, s'està avortant."
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/merge.c:1480 builtin/merge.c:1559
#, c-format
msgid "Rewinding the tree to pristine...\n"
-msgstr "Rebobinant l'arbre a la pristina...\n"
+msgstr "S'està rebobinant l'arbre a la pristina...\n"
-#: builtin/merge.c:1527
+#: builtin/merge.c:1484
#, c-format
msgid "Trying merge strategy %s...\n"
-msgstr "Intentant l'estratègia de fusió %s...\n"
+msgstr "S'està intentant l'estratègia de fusió %s...\n"
-#: builtin/merge.c:1593
+#: builtin/merge.c:1550
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
-#: builtin/merge.c:1595
+#: builtin/merge.c:1552
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "L'estratègia de fusió %s ha fallat.\n"
-#: builtin/merge.c:1604
+#: builtin/merge.c:1561
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "Usant el %s per a preparar la resolució a mà.\n"
+msgstr "S'està usant el %s per a preparar la resolució a mà.\n"
-#: builtin/merge.c:1616
+#: builtin/merge.c:1573
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
-"La fusió automàtica ha sortit bé; s'ha aturat abans de cometre tal i com "
-"s'havia demanat\n"
+"La fusió automàtica ha sortit bé; s'ha aturat abans de cometre com s'havia "
+"demanat\n"
#: builtin/merge-base.c:29
msgid "git merge-base [-a | --all] <commit> <commit>..."
@@ -8270,7 +9012,7 @@ msgstr "git mv [<opcions>] <font>... <destí>"
msgid "Directory %s is in index and no submodule?"
msgstr "El directori %s és en l'índex i no hi ha cap submòdul?"
-#: builtin/mv.c:72
+#: builtin/mv.c:72 builtin/rm.c:317
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Si us plau, allisteu els vostres canvis a .gitmodules o emmagatzemeu-los per "
@@ -8289,109 +9031,109 @@ msgstr "força el moviment / canvi de nom encara que el destí existeixi"
msgid "skip move/rename errors"
msgstr "omet els errors de moviment / canvi de nom"
-#: builtin/mv.c:152
+#: builtin/mv.c:155
#, c-format
msgid "destination '%s' is not a directory"
msgstr "el destí '%s' no és un directori"
-#: builtin/mv.c:163
+#: builtin/mv.c:166
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
-msgstr "Comprovant el canvi de nom de '%s' a '%s'\n"
+msgstr "S'està comprovant el canvi de nom de '%s' a '%s'\n"
-#: builtin/mv.c:167
+#: builtin/mv.c:170
msgid "bad source"
msgstr "font dolenta"
-#: builtin/mv.c:170
+#: builtin/mv.c:173
msgid "can not move directory into itself"
msgstr "no es pot moure un directori a dins d'ell mateix"
-#: builtin/mv.c:173
+#: builtin/mv.c:176
msgid "cannot move directory over file"
msgstr "no es pot moure un directori sobre un fitxer"
-#: builtin/mv.c:182
+#: builtin/mv.c:185
msgid "source directory is empty"
msgstr "el directori font està buit"
-#: builtin/mv.c:207
+#: builtin/mv.c:210
msgid "not under version control"
msgstr "no està sota control de versions"
-#: builtin/mv.c:210
+#: builtin/mv.c:213
msgid "destination exists"
msgstr "el destí existeix"
-#: builtin/mv.c:218
+#: builtin/mv.c:221
#, c-format
msgid "overwriting '%s'"
-msgstr "sobreescrivint '%s'"
+msgstr "s'està sobreescrivint '%s'"
-#: builtin/mv.c:221
+#: builtin/mv.c:224
msgid "Cannot overwrite"
msgstr "No es pot sobreescriure"
-#: builtin/mv.c:224
+#: builtin/mv.c:227
msgid "multiple sources for the same target"
msgstr "múltiples fonts per al mateix destí"
-#: builtin/mv.c:226
+#: builtin/mv.c:229
msgid "destination directory does not exist"
msgstr "el directori destí no existeix"
-#: builtin/mv.c:233
+#: builtin/mv.c:236
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, origen=%s, destí=%s"
-#: builtin/mv.c:254
+#: builtin/mv.c:257
#, c-format
msgid "Renaming %s to %s\n"
-msgstr "Canviant el nom de %s a %s\n"
+msgstr "S'està canviant el nom de %s a %s\n"
-#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
#, c-format
msgid "renaming '%s' failed"
msgstr "el canvi del nom de '%s' ha fallat"
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<opcions>] <comissió>..."
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<opcions>] --all"
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<opcions>] --stdin"
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
msgid "print only names (no SHA-1)"
msgstr "imprimeix només els noms (sense SHA-1)"
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
msgid "only use tags to name the commits"
msgstr "només usa les etiquetes per a anomenar les comissions"
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
msgid "only use refs matching <pattern>"
msgstr "només usa les referències que coincideixin amb <patró>"
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
msgid "list all commits reachable from all refs"
msgstr "llista totes les comissions abastables de totes les referències"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
msgid "read from stdin"
msgstr "llegeix d'stdin"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
msgid "allow to print `undefined` names (default)"
msgstr "permet imprimir els noms `undefined` (per defecte)"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
msgid "dereference tags in the input (internal use)"
msgstr "dereferencia les etiquetes en l'entrada (ús intern)"
@@ -8508,6 +9250,10 @@ msgstr "git notes prune [<opcions>]"
msgid "git notes get-ref"
msgstr "git notes get-ref"
+#: builtin/notes.c:94
+msgid "Write/edit the notes for the following object:"
+msgstr "Escriviu/editeu les notes de l'objecte següent:"
+
#: builtin/notes.c:147
#, c-format
msgid "unable to start 'show' for object '%s'"
@@ -8522,90 +9268,77 @@ msgstr "no s'ha pogut llegir la sortida de 'show'"
msgid "failed to finish 'show' for object '%s'"
msgstr "s'ha fallat en finalitzar 'show' per a l'objecte '%s'"
-#: builtin/notes.c:174 builtin/tag.c:248
-#, c-format
-msgid "could not create file '%s'"
-msgstr "no s'ha pogut crear el fitxer '%s'"
-
-#: builtin/notes.c:193
+#: builtin/notes.c:194
msgid "Please supply the note contents using either -m or -F option"
msgstr ""
"Si us plau, proveïu els continguts de la nota fent servir l'opció -m o "
"l'opció -F"
-#: builtin/notes.c:202
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "no s'ha pogut escriure l'objecte de nota"
-#: builtin/notes.c:204
+#: builtin/notes.c:205
#, c-format
msgid "The note contents have been left in %s"
msgstr "Els continguts de la nota s'han deixat en %s"
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:233 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr "no es pot llegir '%s'"
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:235 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr "no s'ha pogut obrir o llegir '%s'"
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
-#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
-#: builtin/notes.c:880 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "S'ha fallat en resoldre '%s' com a referència vàlida."
-
-#: builtin/notes.c:256
+#: builtin/notes.c:257
#, c-format
msgid "Failed to read object '%s'."
msgstr "S'ha fallat en llegir l'objecte '%s'."
-#: builtin/notes.c:260
+#: builtin/notes.c:261
#, c-format
msgid "Cannot read note data from non-blob object '%s'."
msgstr "No es pot llegir les dades de node de l'objecte no de blob '%s'."
-#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
-#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:945
+#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
+#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
+#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
msgid "too many parameters"
msgstr "massa paràmetres"
-#: builtin/notes.c:375 builtin/notes.c:662
+#: builtin/notes.c:376 builtin/notes.c:663
#, c-format
msgid "No note found for object %s."
msgstr "No s'ha trobat cap nota per a l'objecte %s."
-#: builtin/notes.c:396 builtin/notes.c:559
+#: builtin/notes.c:397 builtin/notes.c:560
msgid "note contents as a string"
msgstr "anota els continguts com a cadena"
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:400 builtin/notes.c:563
msgid "note contents in a file"
msgstr "anota els continguts en un fitxer"
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "reuse and edit specified note object"
msgstr "reusa i edita l'objecte de nota especificat"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "reuse specified note object"
msgstr "reusa l'objecte de nota especificat"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "allow storing empty note"
msgstr "permet l'emmagatzematge d'una nota buida"
-#: builtin/notes.c:409 builtin/notes.c:480
+#: builtin/notes.c:410 builtin/notes.c:481
msgid "replace existing notes"
msgstr "reemplaça les notes existents"
-#: builtin/notes.c:434
+#: builtin/notes.c:435
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -8614,30 +9347,30 @@ msgstr ""
"No es pot afegir les notes. S'han trobat notes existents de l'objecte %s. "
"Useu '-f' per a sobreescriure les notes existents."
-#: builtin/notes.c:449 builtin/notes.c:528
+#: builtin/notes.c:450 builtin/notes.c:529
#, c-format
msgid "Overwriting existing notes for object %s\n"
-msgstr "Sobreescrivint les notes existents de l'objecte %s\n"
+msgstr "S'estan sobreescrivint les notes existents de l'objecte %s\n"
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
+#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
#, c-format
msgid "Removing note for object %s\n"
-msgstr "Eliminant la nota de l'objecte %s\n"
+msgstr "S'està eliminant la nota de l'objecte %s\n"
-#: builtin/notes.c:481
+#: builtin/notes.c:482
msgid "read objects from stdin"
msgstr "llegeix els objectes des d'stdin"
-#: builtin/notes.c:483
+#: builtin/notes.c:484
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"carrega la configuració de reescriptura per a <ordre> (implica --stdin)"
-#: builtin/notes.c:501
+#: builtin/notes.c:502
msgid "too few parameters"
msgstr "hi ha massa pocs paràmetres"
-#: builtin/notes.c:522
+#: builtin/notes.c:523
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -8646,12 +9379,12 @@ msgstr ""
"No es pot copiar les notes. S'han trobat notes existents de l'objecte %s. "
"Useu '-f' per a sobreescriure les notes existents."
-#: builtin/notes.c:534
+#: builtin/notes.c:535
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr "Manquen notes a l'objecte font %s. No es pot copiar."
-#: builtin/notes.c:586
+#: builtin/notes.c:587
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -8660,15 +9393,20 @@ msgstr ""
"S'han desaprovat les opcions -m/-F/-c/-C en favor de la subordre 'edit'.\n"
"Si us plau, useu 'git notes add -f -m/-F/-c/-C' en lloc d'això.\n"
-#: builtin/notes.c:767
+#: builtin/notes.c:753
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "estratègia de fusió de notes desconeguda %s"
+
+#: builtin/notes.c:769
msgid "General options"
msgstr "Opcions generals"
-#: builtin/notes.c:769
+#: builtin/notes.c:771
msgid "Merge options"
msgstr "Opcions de fusió"
-#: builtin/notes.c:771
+#: builtin/notes.c:773
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -8676,49 +9414,87 @@ msgstr ""
"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/"
"union/cat_sort_uniq)"
-#: builtin/notes.c:773
+#: builtin/notes.c:775
msgid "Committing unmerged notes"
-msgstr "Cometent les notes sense fusionar"
+msgstr "S'estan cometent les notes sense fusionar"
-#: builtin/notes.c:775
+#: builtin/notes.c:777
msgid "finalize notes merge by committing unmerged notes"
msgstr "finalitza la fusió de notes cometent les notes sense fusionar"
-#: builtin/notes.c:777
+#: builtin/notes.c:779
msgid "Aborting notes merge resolution"
-msgstr "Avortant la resolució de fusió de notes"
+msgstr "S'està avortant la resolució de fusió de notes"
-#: builtin/notes.c:779
+#: builtin/notes.c:781
msgid "abort notes merge"
msgstr "avorta la fusió de notes"
-#: builtin/notes.c:856
+#: builtin/notes.c:792
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "no es pot combinar --commit, --abort i -s/--strategy"
+
+#: builtin/notes.c:797
+msgid "Must specify a notes ref to merge"
+msgstr "Cal especificar una referència de notes a fusionar"
+
+#: builtin/notes.c:821
+#, c-format
+msgid "Unknown -s/--strategy: %s"
+msgstr "-s/--strategy desconeguda: %s"
+
+#: builtin/notes.c:858
#, c-format
msgid "A notes merge into %s is already in-progress at %s"
msgstr "Una fusió de notes a %s ja està en curs a %s"
-#: builtin/notes.c:883
+#: builtin/notes.c:861
+#, c-format
+msgid "Failed to store link to current notes ref (%s)"
+msgstr ""
+"S'ha fallat en emmagatzemar l'enllaç a la referència de notes actual (%s)"
+
+#: builtin/notes.c:863
+#, c-format
+msgid ""
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
+msgstr ""
+"La fusió de notes automàtica ha fallat. Arregleu els conflictes en %s i "
+"cometeu el resultat amb 'git notes merge --commit', o avorteu la fusió amb "
+"'git notes merge --abort'.\n"
+
+#: builtin/notes.c:885
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objecte %s no té cap nota\n"
-#: builtin/notes.c:895
+#: builtin/notes.c:897
msgid "attempt to remove non-existent note is not an error"
msgstr "l'intent d'eliminar una nota no existent no és un error"
-#: builtin/notes.c:898
+#: builtin/notes.c:900
msgid "read object names from the standard input"
msgstr "llegeix els noms d'objecte des de l'entrada estàndard"
-#: builtin/notes.c:979
+#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+msgid "do not remove, show only"
+msgstr "no eliminis, només mostra"
+
+#: builtin/notes.c:939
+msgid "report pruned notes"
+msgstr "informa de notes podades"
+
+#: builtin/notes.c:981
msgid "notes-ref"
msgstr "referència de notes"
-#: builtin/notes.c:980
+#: builtin/notes.c:982
msgid "use notes from <notes-ref>"
msgstr "usa les notes de <referència-de-notes>"
-#: builtin/notes.c:1015 builtin/remote.c:1626
+#: builtin/notes.c:1017 builtin/remote.c:1623
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Subordre desconeguda: %s"
@@ -8737,183 +9513,193 @@ msgstr ""
"git pack-objects [<opcions>...] <nom-base> [< <llista-de-referències> | < "
"<llista-de-objectes>]"
-#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
+#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
#, c-format
msgid "deflate error (%d)"
msgstr "error de deflació (%d)"
-#: builtin/pack-objects.c:772
+#: builtin/pack-objects.c:766
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets "
+"a causa de pack.packSizeLimit"
+
+#: builtin/pack-objects.c:779
msgid "Writing objects"
-msgstr "Escrivint els objectes"
+msgstr "S'estan escrivint els objectes"
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1037
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-"inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no "
-"s'estan empaquetant"
+"s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no "
+"s'empaqueten"
-#: builtin/pack-objects.c:2172
+#: builtin/pack-objects.c:2197
msgid "Compressing objects"
-msgstr "Comprimint objectes"
+msgstr "S'estan comprimint objectes"
-#: builtin/pack-objects.c:2558
+#: builtin/pack-objects.c:2611
#, c-format
msgid "unsupported index version %s"
msgstr "versió d'índex no compatible %s"
-#: builtin/pack-objects.c:2562
+#: builtin/pack-objects.c:2615
#, c-format
msgid "bad index version '%s'"
msgstr "versió d'índex dolenta '%s'"
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2645
msgid "do not show progress meter"
msgstr "no mostris l'indicador de progrés"
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2647
msgid "show progress meter"
msgstr "mostra l'indicador de progrés"
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2649
msgid "show progress meter during object writing phase"
msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes"
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2652
msgid "similar to --all-progress when progress meter is shown"
msgstr "similar a --all-progress quan l'indicador de progrés es mostra"
-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2653
msgid "version[,offset]"
msgstr "versió[,desplaçament]"
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2654
msgid "write the pack index file in the specified idx format version"
msgstr ""
"escriu el fitxer d'índex de paquet en la versió de format d'índex "
"especificada"
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2657
msgid "maximum size of each output pack file"
msgstr "mida màxima de cada fitxer de paquet de sortida"
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2659
msgid "ignore borrowed objects from alternate object store"
msgstr ""
"ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu"
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2661
msgid "ignore packed objects"
msgstr "ignora els objectes empaquetats"
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2663
msgid "limit pack window by objects"
msgstr "limita la finestra d'empaquetament per objectes"
-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2665
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"limita la finestra d'empaquetament per memòria a més del límit d'objectes"
-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2667
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "longitud màxima de la cadena de deltes permesa en el paquet resultant"
-#: builtin/pack-objects.c:2616
+#: builtin/pack-objects.c:2669
msgid "reuse existing deltas"
msgstr "reusa les deltes existents"
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2671
msgid "reuse existing objects"
msgstr "reusa els objectes existents"
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2673
msgid "use OFS_DELTA objects"
msgstr "usa objectes OFS_DELTA"
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2675
msgid "use threads when searching for best delta matches"
msgstr "usa fils en cercar les millores coincidències de delta"
-#: builtin/pack-objects.c:2624
+#: builtin/pack-objects.c:2677
msgid "do not create an empty pack output"
msgstr "no creïs una emissió de paquet buida"
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2679
msgid "read revision arguments from standard input"
msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard"
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2681
msgid "limit the objects to those that are not yet packed"
msgstr "limita els objectes als quals encara no s'hagin empaquetat"
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2684
msgid "include objects reachable from any reference"
msgstr "inclou els objectes abastables de qualsevulla referència"
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2687
msgid "include objects referred by reflog entries"
msgstr ""
"inclou els objectes als quals facin referència les entrades del registre de "
"referències"
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2690
msgid "include objects referred to by the index"
msgstr "inclou els objectes als quals faci referència l'índex"
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2693
msgid "output pack to stdout"
msgstr "emet el paquet a stdout"
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2695
msgid "include tag objects that refer to objects to be packed"
msgstr ""
"inclou els objectes d'etiqueta que facin referència als objectes a empaquetar"
-#: builtin/pack-objects.c:2644
+#: builtin/pack-objects.c:2697
msgid "keep unreachable objects"
msgstr "retén els objectes inabastables"
-#: builtin/pack-objects.c:2645 parse-options.h:142
+#: builtin/pack-objects.c:2699
+msgid "pack loose unreachable objects"
+msgstr "empaqueta els objectes inabastables solts"
+
+#: builtin/pack-objects.c:2700 parse-options.h:142
msgid "time"
msgstr "hora"
-#: builtin/pack-objects.c:2646
+#: builtin/pack-objects.c:2701
msgid "unpack unreachable objects newer than <time>"
msgstr "desempaqueta els objectes inabastables més nous que <hora>"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2704
msgid "create thin packs"
msgstr "crea paquets prims"
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2706
msgid "create packs suitable for shallow fetches"
msgstr "crea paquets adequats per a les obtencions superficials"
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2708
msgid "ignore packs that have companion .keep file"
msgstr "ignora els paquets que tinguin un fitxer .keep corresponent"
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2710
msgid "pack compression level"
msgstr "nivell de compressió de paquet"
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2712
msgid "do not hide commits by grafts"
msgstr "no amaguis les comissions per empelt"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2714
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"usa un índex de mapa de bits, si està disponible, per a accelerar el "
"recompte d'objectes"
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2716
msgid "write a bitmap index together with the pack index"
msgstr "escriu un índex de mapa de bits junt amb l'índex de paquet"
-#: builtin/pack-objects.c:2752
+#: builtin/pack-objects.c:2829
msgid "Counting objects"
-msgstr "Comptant els objectes"
+msgstr "S'estan comptant els objectes"
#: builtin/pack-refs.c:6
msgid "git pack-refs [<options>]"
@@ -8933,75 +9719,71 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
#: builtin/prune-packed.c:40
msgid "Removing duplicate objects"
-msgstr "Eliminant objectes duplicats"
+msgstr "S'estan eliminant objectes duplicats"
#: builtin/prune.c:11
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <hora>] [--] [<cap>...]"
-#: builtin/prune.c:105 builtin/worktree.c:124
-msgid "do not remove, show only"
-msgstr "no eliminis, només mostra"
-
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:128
msgid "report pruned objects"
msgstr "informa d'objectes podats"
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:130
msgid "expire objects older than <time>"
msgstr "fes caducar els objectes més vells que <hora>"
#: builtin/prune.c:123
msgid "cannot prune in a precious-objects repo"
-msgstr "no es pot podar en un dipòsit d'objectes precioses"
+msgstr "no es pot podar en un dipòsit d'objectes preciosos"
#: builtin/pull.c:72
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [opcions] [<dipòsit> [<especificació-de-referència>...]]"
-#: builtin/pull.c:117
+#: builtin/pull.c:120
msgid "Options related to merging"
msgstr "Opcions relacionades amb fusionar"
-#: builtin/pull.c:120
+#: builtin/pull.c:123
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorpora els canvis per rebasar en lloc de fusionar"
-#: builtin/pull.c:144 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "permet l'avanç ràpid"
-#: builtin/pull.c:150
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "verifica que la comissió anomenada tingui una firma GPG vàlida"
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "automàticament emmagatzema/desempila abans i després de rebasament"
-#: builtin/pull.c:164
+#: builtin/pull.c:172
msgid "Options related to fetching"
msgstr "Opcions relacionades amb obtenir"
-#: builtin/pull.c:186
+#: builtin/pull.c:194
msgid "number of submodules pulled in parallel"
msgstr "nombre de submòduls baixats en paral·lel"
-#: builtin/pull.c:275
+#: builtin/pull.c:283
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valor no vàlid per a pull.ff: %s"
-#: builtin/pull.c:359
+#: builtin/pull.c:379 git-sh-setup.sh:226
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr "No es pot baixar amb rebasament: Teniu canvis no allistats."
-#: builtin/pull.c:365
+#: builtin/pull.c:385 git-sh-setup.sh:252
msgid "Additionally, your index contains uncommitted changes."
msgstr "Addicionalment, el vostre índex conté canvis sense cometre."
-#: builtin/pull.c:367
+#: builtin/pull.c:387 git-sh-setup.sh:245
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
"No es pot baixar amb rebasament: El vostre índex conté canvis sense cometre."
-#: builtin/pull.c:443
+#: builtin/pull.c:463
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -9009,13 +9791,13 @@ msgstr ""
"No hi ha cap candidat sobre el qual rebasar entre les referències que acabeu "
"d'obtenir."
-#: builtin/pull.c:445
+#: builtin/pull.c:465
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir."
-#: builtin/pull.c:446
+#: builtin/pull.c:466
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -9023,7 +9805,7 @@ msgstr ""
"Generalment això vol dir que heu proveït una especificació de\n"
"referència de comodí que no tenia cap coincidència en el costat remot."
-#: builtin/pull.c:449
+#: builtin/pull.c:469
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -9034,39 +9816,44 @@ msgstr ""
"Perquè aquest no és el remot configurat per defecte per a la vostra\n"
"branca actual, heu d'especificar una branca en la línia d'ordres."
-#: builtin/pull.c:454
+#: builtin/pull.c:474 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Actualment no sou en cap branca."
-#: builtin/pull.c:456 builtin/pull.c:471
+#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Si us plau, especifiqueu sobre què branca voleu rebasar."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Si us plau, especifiqueu amb què branca voleu fusionar."
-#: builtin/pull.c:459 builtin/pull.c:474
+#: builtin/pull.c:479 builtin/pull.c:494
msgid "See git-pull(1) for details."
msgstr "Vegeu git-pull(1) per detalls."
-#: builtin/pull.c:469
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<remot>"
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<branca>"
+
+#: builtin/pull.c:489 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "No hi ha cap informació de seguiment per a la branca actual."
-#: builtin/pull.c:478
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
msgid ""
-"If you wish to set tracking information for this branch you can do so with:\n"
-"\n"
-" git branch --set-upstream-to=%s/<branch> %s\n"
+"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho "
-"amb:\n"
-"\n"
-" git branch --set-upstream-to=%s/<branca> %s\n"
+"amb:"
-#: builtin/pull.c:483
+#: builtin/pull.c:503
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -9075,11 +9862,20 @@ msgstr ""
"La vostra configuració especifica fusionar amb la referència '%s'\n"
"del remot, però no s'ha obtingut tal referència."
-#: builtin/pull.c:841
+#: builtin/pull.c:820
+msgid "ignoring --verify-signatures for rebase"
+msgstr "s'està ignorant --verify-signatures per a rebasar"
+
+#: builtin/pull.c:867
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "l'opció --[no-]-autostash és vàlid només amb --rebase."
+
+#: builtin/pull.c:875
msgid "Updating an unborn branch with changes added to the index."
-msgstr "Actualitzant una branca no nascuda amb canvis afegits a l'índex."
+msgstr ""
+"S'està actualitzant una branca no nascuda amb canvis afegits a l'índex."
-#: builtin/pull.c:870
+#: builtin/pull.c:903
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -9087,10 +9883,10 @@ msgid ""
"commit %s."
msgstr ""
"l'obtenció ha actualitzat el cap de la branca actual.\n"
-"avançant ràpidament el vostre arbre de treball des de\n"
+"s'està avançant ràpidament el vostre arbre de treball des de\n"
"la comissió %s."
-#: builtin/pull.c:875
+#: builtin/pull.c:908
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -9101,18 +9897,18 @@ msgid ""
"to recover."
msgstr ""
"No es pot avançar ràpidament el vostre arbre de treball.\n"
-"Desprès d'assegurar que hàgiu desat qualsevulla cossa preciosa de la sortida "
+"Després d'assegurar que hàgiu desat qualsevulla cosa preciosa de la sortida "
"de\n"
"$ git diff %s\n"
"executeu\n"
"$ git reset --hard\n"
"per a recuperar."
-#: builtin/pull.c:890
+#: builtin/pull.c:923
msgid "Cannot merge multiple branches into empty head."
msgstr "No es pot fusionar múltiples branques a un cap buit."
-#: builtin/pull.c:894
+#: builtin/pull.c:927
msgid "Cannot rebase onto multiple branches."
msgstr "No es pot rebasar sobre múltiples branques."
@@ -9193,7 +9989,8 @@ msgstr ""
#: builtin/push.c:183
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
-msgstr "La branca actual %s té múltiples branques fonts, refusant pujar."
+msgstr ""
+"La branca actual %s té múltiples branques fonts, s'està refusant pujar."
#: builtin/push.c:186
#, c-format
@@ -9272,19 +10069,19 @@ msgstr ""
#: builtin/push.c:331
#, c-format
msgid "Pushing to %s\n"
-msgstr "Pujant a %s\n"
+msgstr "S'està pujant a %s\n"
#: builtin/push.c:335
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "s'ha fallat en pujar algunes referències a '%s'"
-#: builtin/push.c:365
+#: builtin/push.c:366
#, c-format
msgid "bad repository '%s'"
msgstr "dipòsit dolent '%s'"
-#: builtin/push.c:366
+#: builtin/push.c:367
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -9296,7 +10093,7 @@ msgid ""
"\n"
" git push <name>\n"
msgstr ""
-"Cap destí de pujada configurada.\n"
+"No hi ha cap destí de pujada configurat.\n"
"Especifiqueu l'URL des de la línia d'ordres o bé configureu un dipòsit remot "
"fent servir\n"
"\n"
@@ -9306,103 +10103,115 @@ msgstr ""
"\n"
" git push <nom>\n"
-#: builtin/push.c:381
+#: builtin/push.c:385
msgid "--all and --tags are incompatible"
msgstr "--all i --tags són incompatibles"
-#: builtin/push.c:382
+#: builtin/push.c:386
msgid "--all can't be combined with refspecs"
msgstr "--all no es pot combinar amb especificacions de referència"
-#: builtin/push.c:387
+#: builtin/push.c:391
msgid "--mirror and --tags are incompatible"
msgstr "--mirror i --tags són incompatibles"
-#: builtin/push.c:388
+#: builtin/push.c:392
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror no es pot combinar amb especificacions de referència"
-#: builtin/push.c:393
+#: builtin/push.c:397
msgid "--all and --mirror are incompatible"
msgstr "--all i --mirror són incompatibles"
-#: builtin/push.c:505
+#: builtin/push.c:515
msgid "repository"
msgstr "dipòsit"
-#: builtin/push.c:506 builtin/send-pack.c:161
+#: builtin/push.c:516 builtin/send-pack.c:161
msgid "push all refs"
msgstr "puja totes les referències"
-#: builtin/push.c:507 builtin/send-pack.c:163
+#: builtin/push.c:517 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "reflecteix totes les referències"
-#: builtin/push.c:509
+#: builtin/push.c:519
msgid "delete refs"
msgstr "suprimeix les referències"
-#: builtin/push.c:510
+#: builtin/push.c:520
msgid "push tags (can't be used with --all or --mirror)"
msgstr "puja les etiquetes (no es pot usar amb --all o --mirror)"
-#: builtin/push.c:513 builtin/send-pack.c:164
+#: builtin/push.c:523 builtin/send-pack.c:164
msgid "force updates"
msgstr "força les actualitzacions"
-#: builtin/push.c:515 builtin/send-pack.c:175
+#: builtin/push.c:525 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "nom-de-referència>:<esperat"
-#: builtin/push.c:516 builtin/send-pack.c:176
+#: builtin/push.c:526 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "requereix que el valor antic de la referència sigui d'aquest valor"
-#: builtin/push.c:519
+#: builtin/push.c:529
msgid "control recursive pushing of submodules"
msgstr "controla la pujada recursiva dels submòduls"
-#: builtin/push.c:521 builtin/send-pack.c:169
+#: builtin/push.c:531 builtin/send-pack.c:169
msgid "use thin pack"
msgstr "usa el paquet prim"
-#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
+#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "programa que rep els paquets"
-#: builtin/push.c:524
+#: builtin/push.c:534
msgid "set upstream for git pull/status"
msgstr "estableix la font per a git pull/status"
-#: builtin/push.c:527
+#: builtin/push.c:537
msgid "prune locally removed refs"
msgstr "poda les referències eliminades localment"
-#: builtin/push.c:529
+#: builtin/push.c:539
msgid "bypass pre-push hook"
msgstr "evita el ganxo de prepujada"
-#: builtin/push.c:530
+#: builtin/push.c:540
msgid "push missing but relevant tags"
msgstr "puja les etiquetes absents però rellevants"
-#: builtin/push.c:533 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "GPG sign the push"
-msgstr "firma la pujada amb GPG"
+msgstr "signa la pujada amb GPG"
-#: builtin/push.c:535 builtin/send-pack.c:170
+#: builtin/push.c:545 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "demana una transacció atòmica al costat remot"
-#: builtin/push.c:549
+#: builtin/push.c:546
+msgid "server-specific"
+msgstr "específic al servidor"
+
+#: builtin/push.c:546
+msgid "option to transmit"
+msgstr "opció a transmetre"
+
+#: builtin/push.c:560
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete és incompatible amb --all, --mirror i --tags"
-#: builtin/push.c:551
+#: builtin/push.c:562
msgid "--delete doesn't make sense without any refs"
msgstr "--delete no té sentit sense referències"
+#: builtin/push.c:579
+msgid "push options must not have new line characters"
+msgstr "les opcions de pujada no han de tenir caràcters de línia nova"
+
#: builtin/read-tree.c:37
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
@@ -9423,7 +10232,7 @@ msgstr "només buida l'índex"
#: builtin/read-tree.c:115
msgid "Merging"
-msgstr "Fusionant"
+msgstr "Fusión"
#: builtin/read-tree.c:117
msgid "perform a merge in addition to a read"
@@ -9471,12 +10280,24 @@ msgstr "no actualitzis l'índex ni l'arbre de treball"
#: builtin/read-tree.c:137
msgid "skip applying sparse checkout filter"
-msgstr "salta l'aplicació del filtre d'agafament dispers"
+msgstr "salta l'aplicació del filtre d'agafament parcial"
#: builtin/read-tree.c:139
msgid "debug unpack-trees"
msgstr "depura unpack-trees"
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <git-dir>"
+
+#: builtin/receive-pack.c:1843
+msgid "quiet"
+msgstr "callat"
+
+#: builtin/receive-pack.c:1857
+msgid "You must specify a directory."
+msgstr "Heu d'especificar un directori."
+
#: builtin/reflog.c:423
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
@@ -9572,7 +10393,7 @@ msgstr "git remote update [<opcions>] [<grup> | <remot>]..."
#: builtin/remote.c:94
#, c-format
msgid "Updating %s"
-msgstr "Actualitzant %s"
+msgstr "S'està actualitzant %s"
#: builtin/remote.c:126
msgid ""
@@ -9625,12 +10446,12 @@ msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
"especificar les branques a seguir té sentit només amb miralls d'obtenció"
-#: builtin/remote.c:190 builtin/remote.c:633
+#: builtin/remote.c:190 builtin/remote.c:629
#, c-format
msgid "remote %s already exists."
msgstr "el remot %s ja existeix."
-#: builtin/remote.c:194 builtin/remote.c:637
+#: builtin/remote.c:194 builtin/remote.c:633
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' no és un nom de remot vàlid"
@@ -9654,38 +10475,39 @@ msgstr "(coincident)"
msgid "(delete)"
msgstr "(suprimir)"
-#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
#, c-format
msgid "No such remote: %s"
msgstr "No hi ha tal remot: %s"
-#: builtin/remote.c:643
+#: builtin/remote.c:639
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "No s'ha pogut canviar el nom de la secció de configuració '%s' a '%s'"
-#: builtin/remote.c:663
+#: builtin/remote.c:659
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
-"No actualitzant l'especificació de referències d'obtenció no per defecte\n"
+"No s'està actualitzant l'especificació de referències d'obtenció no per "
+"defecte\n"
"\t%s\n"
"\tSi us plau, actualitzeu la configuració manualment si és necessari."
-#: builtin/remote.c:699
+#: builtin/remote.c:695
#, c-format
msgid "deleting '%s' failed"
msgstr "la supressió de '%s' ha fallat"
-#: builtin/remote.c:733
+#: builtin/remote.c:729
#, c-format
msgid "creating '%s' failed"
msgstr "la creació de '%s' ha fallat"
-#: builtin/remote.c:796
+#: builtin/remote.c:792
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -9700,283 +10522,295 @@ msgstr[1] ""
"eliminat;\n"
"per a suprimir-les, useu:"
-#: builtin/remote.c:810
+#: builtin/remote.c:806
#, c-format
msgid "Could not remove config section '%s'"
msgstr "No s'ha pogut eliminar la secció de configuració '%s'"
-#: builtin/remote.c:911
+#: builtin/remote.c:907
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)"
-#: builtin/remote.c:914
+#: builtin/remote.c:910
msgid " tracked"
msgstr " seguit"
-#: builtin/remote.c:916
+#: builtin/remote.c:912
msgid " stale (use 'git remote prune' to remove)"
msgstr " estancat (useu 'git remote prune' per a eliminar)"
-#: builtin/remote.c:918
+#: builtin/remote.c:914
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:959
+#: builtin/remote.c:955
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "branch.%s.merge no vàlid; no es pot rebasar sobre > 1 branca"
-#: builtin/remote.c:967
+#: builtin/remote.c:963
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "es rebasa interactivament sobre el remot %s"
-#: builtin/remote.c:971
+#: builtin/remote.c:964
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "es rebasa sobre el remot %s"
+
+#: builtin/remote.c:967
#, c-format
msgid " merges with remote %s"
msgstr "es fusiona amb el remot %s"
-#: builtin/remote.c:972
-msgid " and with remote"
-msgstr " i amb el remot"
-
-#: builtin/remote.c:974
+#: builtin/remote.c:970
#, c-format
msgid "merges with remote %s"
msgstr "es fusiona amb el remot %s"
-#: builtin/remote.c:975
-msgid " and with remote"
-msgstr " i amb el remot"
+#: builtin/remote.c:973
+#, c-format
+msgid "%-*s and with remote %s\n"
+msgstr "%-*s i amb el remot %s\n"
-#: builtin/remote.c:1021
+#: builtin/remote.c:1016
msgid "create"
msgstr "crea"
-#: builtin/remote.c:1024
+#: builtin/remote.c:1019
msgid "delete"
msgstr "suprimeix"
-#: builtin/remote.c:1028
+#: builtin/remote.c:1023
msgid "up to date"
msgstr "al dia"
-#: builtin/remote.c:1031
+#: builtin/remote.c:1026
msgid "fast-forwardable"
msgstr "avanç ràpid possible"
-#: builtin/remote.c:1034
+#: builtin/remote.c:1029
msgid "local out of date"
msgstr "local no actualitzat"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1036
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s força a %-*s (%s)"
-#: builtin/remote.c:1044
+#: builtin/remote.c:1039
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s puja a %-*s (%s)"
-#: builtin/remote.c:1048
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s força a %s"
-#: builtin/remote.c:1051
+#: builtin/remote.c:1046
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s puja a %s"
-#: builtin/remote.c:1119
+#: builtin/remote.c:1114
msgid "do not query remotes"
msgstr "no consultis els remots"
-#: builtin/remote.c:1146
+#: builtin/remote.c:1141
#, c-format
msgid "* remote %s"
msgstr "* remot %s"
-#: builtin/remote.c:1147
+#: builtin/remote.c:1142
#, c-format
msgid " Fetch URL: %s"
msgstr " URL d'obtenció: %s"
-#: builtin/remote.c:1148 builtin/remote.c:1299
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
msgid "(no URL)"
msgstr "(sense URL)"
-#: builtin/remote.c:1157 builtin/remote.c:1159
+#. TRANSLATORS: the colon ':' should align with
+#. the one in " Fetch URL: %s" translation
+#: builtin/remote.c:1154 builtin/remote.c:1156
#, c-format
msgid " Push URL: %s"
msgstr " URL de pujada: %s"
-#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
+#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
#, c-format
msgid " HEAD branch: %s"
msgstr " Branca de HEAD: %s"
-#: builtin/remote.c:1167
+#: builtin/remote.c:1158
+msgid "(not queried)"
+msgstr "(no consultat)"
+
+#: builtin/remote.c:1160
+msgid "(unknown)"
+msgstr "(desconegut)"
+
+#: builtin/remote.c:1164
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
" Branca de HEAD (el HEAD remot és ambigu, pot ser un dels següents):\n"
-#: builtin/remote.c:1179
+#: builtin/remote.c:1176
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branca remota:%s"
msgstr[1] " Branques remotes:%s"
-#: builtin/remote.c:1182 builtin/remote.c:1209
+#: builtin/remote.c:1179 builtin/remote.c:1206
msgid " (status not queried)"
msgstr " (estat no consultat)"
-#: builtin/remote.c:1191
+#: builtin/remote.c:1188
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Branca local configurada per a 'git pull':"
msgstr[1] " Branques locals configurades per a 'git pull':"
-#: builtin/remote.c:1199
+#: builtin/remote.c:1196
msgid " Local refs will be mirrored by 'git push'"
msgstr " 'git push' reflectirà les referències locals"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1203
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Referència local configurada per a 'git push'%s:"
msgstr[1] " Referències locals configurades per a 'git push'%s:"
-#: builtin/remote.c:1227
+#: builtin/remote.c:1224
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "estableix refs/remotes/<name>/HEAD segons el remot"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1226
msgid "delete refs/remotes/<name>/HEAD"
msgstr "suprimeix refs/remotes/<name>/HEAD"
-#: builtin/remote.c:1244
+#: builtin/remote.c:1241
msgid "Cannot determine remote HEAD"
msgstr "No es pot determinar el HEAD remot"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1243
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Múltiples branques de HEAD remotes. Si us plau, trieu-ne una explícitament "
"amb:"
-#: builtin/remote.c:1256
+#: builtin/remote.c:1253
#, c-format
msgid "Could not delete %s"
msgstr "No s'ha pogut suprimir %s"
-#: builtin/remote.c:1264
+#: builtin/remote.c:1261
#, c-format
msgid "Not a valid ref: %s"
msgstr "No és una referència vàlida: %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1263
#, c-format
msgid "Could not setup %s"
msgstr "No s'ha pogut configurar %s"
-#: builtin/remote.c:1284
+#: builtin/remote.c:1281
#, c-format
msgid " %s will become dangling!"
msgstr " %s es tornarà penjant!"
-#: builtin/remote.c:1285
+#: builtin/remote.c:1282
#, c-format
msgid " %s has become dangling!"
msgstr " %s s'ha tornat penjant!"
-#: builtin/remote.c:1295
+#: builtin/remote.c:1292
#, c-format
msgid "Pruning %s"
-msgstr "Podant %s"
+msgstr "S'està podant %s"
-#: builtin/remote.c:1296
+#: builtin/remote.c:1293
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1309
#, c-format
msgid " * [would prune] %s"
msgstr " * [podaria] %s"
-#: builtin/remote.c:1315
+#: builtin/remote.c:1312
#, c-format
msgid " * [pruned] %s"
msgstr " * [podat] %s"
-#: builtin/remote.c:1360
+#: builtin/remote.c:1357
msgid "prune remotes after fetching"
msgstr "poda els remots després d'obtenir-los"
-#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
+#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
#, c-format
msgid "No such remote '%s'"
msgstr "No hi ha tal remot '%s'"
-#: builtin/remote.c:1439
+#: builtin/remote.c:1436
msgid "add branch"
msgstr "afegeix branca"
-#: builtin/remote.c:1446
+#: builtin/remote.c:1443
msgid "no remote specified"
msgstr "cap remot especificat"
-#: builtin/remote.c:1463
+#: builtin/remote.c:1460
msgid "query push URLs rather than fetch URLs"
msgstr "consulta els URL de pujada en lloc dels URL d'obteniment"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1462
msgid "return all URLs"
msgstr "retorna tots els URL"
-#: builtin/remote.c:1493
+#: builtin/remote.c:1490
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "cap URL configurat per al remot '%s'"
-#: builtin/remote.c:1519
+#: builtin/remote.c:1516
msgid "manipulate push URLs"
msgstr "manipula els URL de pujada"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1518
msgid "add URL"
msgstr "afegeix URL"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1520
msgid "delete URLs"
msgstr "suprimeix URLs"
-#: builtin/remote.c:1530
+#: builtin/remote.c:1527
msgid "--add --delete doesn't make sense"
msgstr "--add --delete no té sentit"
-#: builtin/remote.c:1571
+#: builtin/remote.c:1568
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Patró d'URL antic no vàlid: %s"
-#: builtin/remote.c:1579
+#: builtin/remote.c:1576
#, c-format
msgid "No such URL found: %s"
msgstr "No s'ha trobat tal URL: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1578
msgid "Will not delete all non-push URLs"
msgstr "No se suprimiran tots els URL no de pujada"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1592
msgid "be verbose; must be placed before a subcommand"
msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
@@ -9984,80 +10818,88 @@ msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
msgid "git repack [<options>]"
msgstr "git repack [<opcions>]"
-#: builtin/repack.c:159
+#: builtin/repack.c:160
msgid "pack everything in a single pack"
msgstr "empaqueta-ho tot en un únic paquet"
-#: builtin/repack.c:161
+#: builtin/repack.c:162
msgid "same as -a, and turn unreachable objects loose"
msgstr "el mateix que -a, i solta els objectes inabastables"
-#: builtin/repack.c:164
+#: builtin/repack.c:165
msgid "remove redundant packs, and run git-prune-packed"
msgstr "elimina els paquets redundants, i executeu git-prune-packed"
-#: builtin/repack.c:166
+#: builtin/repack.c:167
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "passa --no-reuse-delta a git-pack-objects"
-#: builtin/repack.c:168
+#: builtin/repack.c:169
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "passa --no-reuse-object a git-pack-objects"
-#: builtin/repack.c:170
+#: builtin/repack.c:171
msgid "do not run git-update-server-info"
msgstr "no executis git-update-server-info"
-#: builtin/repack.c:173
+#: builtin/repack.c:174
msgid "pass --local to git-pack-objects"
msgstr "passa --local a git-pack-objects"
-#: builtin/repack.c:175
+#: builtin/repack.c:176
msgid "write bitmap index"
msgstr "escriu índex de mapa de bits"
-#: builtin/repack.c:176
+#: builtin/repack.c:177
msgid "approxidate"
msgstr "data aproximada"
-#: builtin/repack.c:177
+#: builtin/repack.c:178
msgid "with -A, do not loosen objects older than this"
msgstr "amb -A, no soltis els objectes més vells que aquest"
-#: builtin/repack.c:179
+#: builtin/repack.c:180
+msgid "with -a, repack unreachable objects"
+msgstr "amb -a, reempaqueta els objectes inabastables"
+
+#: builtin/repack.c:182
msgid "size of the window used for delta compression"
msgstr "mida de la finestra que s'usa per a compressió de deltes"
-#: builtin/repack.c:180 builtin/repack.c:184
+#: builtin/repack.c:183 builtin/repack.c:187
msgid "bytes"
msgstr "octets"
-#: builtin/repack.c:181
+#: builtin/repack.c:184
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"el mateix que l'anterior, però limita la mida de memòria en lloc del nombre "
"d'entrades"
-#: builtin/repack.c:183
+#: builtin/repack.c:186
msgid "limits the maximum delta depth"
msgstr "limita la profunditat màxima de les deltes"
-#: builtin/repack.c:185
+#: builtin/repack.c:188
msgid "maximum size of each packfile"
msgstr "mida màxima de cada fitxer de paquet"
-#: builtin/repack.c:187
+#: builtin/repack.c:190
msgid "repack objects in packs marked with .keep"
msgstr "reempaqueta els objectes en paquets marcats amb .keep"
-#: builtin/repack.c:197
+#: builtin/repack.c:200
msgid "cannot delete packs in a precious-objects repo"
-msgstr "no es pot suprimir paquets en un dipòsit d'objectes precioses"
+msgstr "no es pot suprimir paquets en un dipòsit d'objectes preciosos"
-#: builtin/repack.c:381
+#: builtin/repack.c:204
+msgid "--keep-unreachable and -A are incompatible"
+msgstr "--keep-unreachable i -A són incompatibles"
+
+#: builtin/repack.c:391 builtin/worktree.c:115
#, c-format
-msgid "removing '%s' failed"
-msgstr "l'eliminació de '%s' ha fallat"
+msgid "failed to remove '%s'"
+msgstr "s'ha fallat en eliminar '%s'"
#: builtin/replace.c:19
msgid "git replace [-f] <object> <replacement>"
@@ -10106,11 +10948,11 @@ msgstr ""
#: builtin/replace.c:401
#, c-format
msgid "the original commit '%s' has a gpg signature."
-msgstr "la comissió original '%s' té una firma gpg."
+msgstr "la comissió original '%s' té una signatura gpg."
#: builtin/replace.c:402
msgid "the signature will be removed in the replacement commit!"
-msgstr "la firma s'eliminarà en la comissió de reemplaçament!"
+msgstr "s'eliminarà la signatura en la comissió de reemplaçament!"
#: builtin/replace.c:408
#, c-format
@@ -10281,7 +11123,7 @@ msgstr "No s'ha pogut restablir el fitxer d'índex a la revisió '%s'."
msgid "Could not write new index file."
msgstr "No s'ha pogut escriure el fitxer d'índex nou."
-#: builtin/rev-list.c:350
+#: builtin/rev-list.c:362
msgid "rev-list does not support display of notes"
msgstr "el rev-list no permet mostrar notes"
@@ -10373,31 +11215,27 @@ msgstr "opció"
msgid "option for merge strategy"
msgstr "opció d'estratègia de fusió"
-#: builtin/revert.c:104
+#: builtin/revert.c:100
msgid "append commit name"
msgstr "nom de la comissió a annexar"
-#: builtin/revert.c:106
+#: builtin/revert.c:102
msgid "preserve initially empty commits"
msgstr "preserva les comissions inicialment buides"
-#: builtin/revert.c:107
+#: builtin/revert.c:103
msgid "allow commits with empty messages"
msgstr "permet les comissions amb missatges buits"
-#: builtin/revert.c:108
+#: builtin/revert.c:104
msgid "keep redundant, empty commits"
msgstr "retén les comissions redundants i buides"
-#: builtin/revert.c:112
-msgid "program error"
-msgstr "error de programa"
-
-#: builtin/revert.c:197
+#: builtin/revert.c:192
msgid "revert failed"
msgstr "la reversió ha fallat"
-#: builtin/revert.c:212
+#: builtin/revert.c:207
msgid "cherry-pick failed"
msgstr "el recull de cireres ha fallat"
@@ -10489,16 +11327,10 @@ msgstr "permet l'eliminació recursiva"
msgid "exit with a zero status even if nothing matched"
msgstr "surt amb estat zero encara que res hagi coincidit"
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-"Si us plau, allisteu els vostres canvis a .gitmodules o emmagatzemeu-los per "
-"a procedir"
-
#: builtin/rm.c:335
#, c-format
msgid "not removing '%s' recursively without -r"
-msgstr "no eliminant '%s' recursivament sense -r"
+msgstr "no s'està eliminant '%s' recursivament sense -r"
#: builtin/rm.c:374
#, c-format
@@ -10701,82 +11533,206 @@ msgstr ""
msgid "prepend comment character and space to each line"
msgstr "anteposa el caràcter de comentari i un espai a cada línia"
-#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923
+#, c-format
+msgid "No such ref: %s"
+msgstr "No hi ha tal referència: %s"
+
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "S'espera un nom de referència ple, s'ha rebut %s"
+
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "no es pot despullar un component de l'url '%s'"
+
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
+#: builtin/submodule--helper.c:483
msgid "alternative anchor for relative paths"
msgstr "àncora alternativa per als camins relatius"
-#: builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:283
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
-#: builtin/submodule--helper.c:108
+#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "No s'ha trobat cap url per al camí de submòdul '%s' a .gitmodules"
+
+#: builtin/submodule--helper.c:364
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "S'ha fallat en registrar l'url per al camí de submòdul '%s'"
+
+#: builtin/submodule--helper.c:368
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "S'ha registrat el submòdul '%s' (%s) per al camí '%s'\n"
+
+#: builtin/submodule--helper.c:378
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr ""
+"advertència: se suggereix el mode d'actualització per ordre per al submòdul "
+"'%s'\n"
+
+#: builtin/submodule--helper.c:385
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr ""
+"S'ha fallat en registrar el mode d'actualització per al camí de submòdul '%s'"
+
+#: builtin/submodule--helper.c:404
+msgid "Suppress output for initializing a submodule"
+msgstr "Omet la sortida d'inicialitzar un submòdul"
+
+#: builtin/submodule--helper.c:409
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [<camí>]"
+
+#: builtin/submodule--helper.c:430
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <camí>"
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:436
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí '%s'"
-#: builtin/submodule--helper.c:164
+#: builtin/submodule--helper.c:486
msgid "where the new submodule will be cloned to"
msgstr "a on es clonarà el submòdul nou"
-#: builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:489
msgid "name of the new submodule"
msgstr "nom del submòdul nou"
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:492
msgid "url where to clone the submodule from"
msgstr "url del qual clonar el submòdul"
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:498
msgid "depth for shallow clones"
msgstr "profunditat dels clons superficials"
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:504
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
"git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference "
-"<dipòsit>] [--name <nom>] [--url <url>][--depth <profunditat>] [--] "
-"[<camí>...]"
+"<dipòsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camí>"
-#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
-#: builtin/submodule--helper.c:210
+#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
#, c-format
msgid "could not create directory '%s'"
msgstr "no s'ha pogut crear el directori '%s'"
-#: builtin/submodule--helper.c:198
+#: builtin/submodule--helper.c:531
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "el clonatge de '%s' al camí de submòdul '%s' ha fallat"
-#: builtin/submodule--helper.c:221
+#: builtin/submodule--helper.c:547
#, c-format
msgid "cannot open file '%s'"
msgstr "no es pot obrir el fitxer '%s'"
-#: builtin/submodule--helper.c:226
+#: builtin/submodule--helper.c:552
#, c-format
msgid "could not close file %s"
msgstr "no s'ha pogut tancar el fitxer %s"
-#: builtin/submodule--helper.c:241
+#: builtin/submodule--helper.c:559
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "no s'ha pogut obtenir el directori de submòdul per a '%s'"
-#: builtin/submodule--helper.c:267
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
-msgstr "fatal: s'ha d'executar la subordre submodule--helper amb una subordre"
+#: builtin/submodule--helper.c:611
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "El camí de submòdul '%s' no està inicialitzat"
+
+#: builtin/submodule--helper.c:615
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Potser voleu usar 'update --init'?"
+
+#: builtin/submodule--helper.c:641
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "S'està saltant el submòdul no fusionat %s"
+
+#: builtin/submodule--helper.c:662
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "S'està saltant el submòdul '%s'"
+
+#: builtin/submodule--helper.c:792
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "S'ha fallat en clonar '%s'. S'ha programat un reintent"
+
+#: builtin/submodule--helper.c:803
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "S'ha fallat una segona vegada en clonar '%s', s'està avortant"
+
+#: builtin/submodule--helper.c:824
+msgid "path into the working tree"
+msgstr "camí a l'arbre de treball"
+
+#: builtin/submodule--helper.c:827
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "camí a l'arbre de treball, a través de fronteres de submòduls niats"
+
+#: builtin/submodule--helper.c:831
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout o none"
+
+#: builtin/submodule--helper.c:835
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr "Crea un clon superficial truncat al nombre de revisions especificat"
+
+#: builtin/submodule--helper.c:838
+msgid "parallel jobs"
+msgstr "tasques paral·leles"
+
+#: builtin/submodule--helper.c:840
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "si el clonatge inicial ha de seguir la recomanació de superficialitat"
+
+#: builtin/submodule--helper.c:841
+msgid "don't print cloning progress"
+msgstr "no imprimeixis el progrés del clonatge"
-#: builtin/submodule--helper.c:274
+#: builtin/submodule--helper.c:846
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=<camí>] [<camí>...]"
+
+#: builtin/submodule--helper.c:856
+msgid "bad value for update parameter"
+msgstr "valor dolent per al paràmetre update"
+
+#: builtin/submodule--helper.c:927
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+"La branca de submòdul (%s) està configurada per a heretar la branca del "
+"superprojecte, però el superprojecte no és en cap branca"
+
+#: builtin/submodule--helper.c:977
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "s'ha d'executar la subordre submodule--helper amb una subordre"
+
+#: builtin/submodule--helper.c:984
#, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
-msgstr "fatal: '%s' no és una subordre vàlida de submodule--helper"
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "'%s' no és una subordre vàlida de submodule--helper"
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -10831,27 +11787,22 @@ msgstr ""
msgid "git tag -v <tagname>..."
msgstr "git tag -v <nom-d'etiqueta>..."
-#: builtin/tag.c:80
+#: builtin/tag.c:81
#, c-format
msgid "tag name too long: %.*s..."
msgstr "nom d'etiqueta massa llarg: %.*s..."
-#: builtin/tag.c:85
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
-msgstr "etiqueta '%s' no trobada."
+msgstr "no s'ha trobat l'etiqueta '%s'."
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
-msgstr "L'etiqueta '%s' s'ha suprimit (era %s)\n"
+msgstr "S'ha suprimit l'etiqueta '%s' (era %s)\n"
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "no s'ha pogut verificar l'etiqueta '%s'"
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
#, c-format
msgid ""
"\n"
@@ -10864,7 +11815,7 @@ msgstr ""
" %s\n"
"Les línies que comencin amb '%c' s'ignoraran.\n"
-#: builtin/tag.c:126
+#: builtin/tag.c:121
#, c-format
msgid ""
"\n"
@@ -10881,7 +11832,7 @@ msgstr ""
#: builtin/tag.c:199
msgid "unable to sign the tag"
-msgstr "no s'ha pogut firmar l'etiqueta"
+msgstr "no s'ha pogut signar l'etiqueta"
#: builtin/tag.c:201
msgid "unable to write tag file"
@@ -10889,15 +11840,15 @@ msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
#: builtin/tag.c:226
msgid "bad object type."
-msgstr "tipus d'objecte dolent."
+msgstr "el tipus d'objecte és dolent."
#: builtin/tag.c:239
msgid "tag header too big."
-msgstr "capçalera d'etiqueta massa gran."
+msgstr "la capçalera d'etiqueta és massa gran."
#: builtin/tag.c:275
msgid "no tag message?"
-msgstr "cap missatge d'etiqueta?"
+msgstr "no hi ha cap missatge d'etiqueta?"
#: builtin/tag.c:281
#, c-format
@@ -10934,11 +11885,11 @@ msgstr "missatge d'etiqueta"
#: builtin/tag.c:352
msgid "annotated and GPG-signed tag"
-msgstr "etiqueta anotada i firmada per GPG"
+msgstr "etiqueta anotada i signada per GPG"
#: builtin/tag.c:356
msgid "use another key to sign the tag"
-msgstr "usa una altra clau per a firmar l'etiqueta"
+msgstr "usa una altra clau per a signar l'etiqueta"
#: builtin/tag.c:357
msgid "replace the tag if exists"
@@ -10996,28 +11947,28 @@ msgstr "es permeten les opcions --merged i --no-merged només amb -l"
msgid "only one -F or -m option is allowed."
msgstr "només es permet una opció -F o -m."
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "too many params"
msgstr "massa paràmetres"
-#: builtin/tag.c:459
+#: builtin/tag.c:458
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' no és un nom d'etiqueta vàlid."
-#: builtin/tag.c:464
+#: builtin/tag.c:463
#, c-format
msgid "tag '%s' already exists"
msgstr "l'etiqueta '%s' ja existeix"
-#: builtin/tag.c:489
+#: builtin/tag.c:491
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Etiqueta '%s' actualitzada (era %s)\n"
#: builtin/unpack-objects.c:490
msgid "Unpacking objects"
-msgstr "Desempaquetant objectes"
+msgstr "S'estan desempaquetant els objectes"
#: builtin/update-index.c:79
#, c-format
@@ -11047,7 +11998,7 @@ msgstr "s'ha fallat en suprimir el directori %s"
#: builtin/update-index.c:133
#, c-format
msgid "Testing mtime in '%s' "
-msgstr "Provant mtime en '%s'"
+msgstr "S'està provant mtime en '%s' "
#: builtin/update-index.c:145
msgid "directory stat info does not change after adding a new file"
@@ -11129,14 +12080,6 @@ msgstr "<mode>,<objecte>,<camí>"
msgid "add the specified entry to the index"
msgstr "afegeix l'entrada especificada a l'índex"
-#: builtin/update-index.c:958
-msgid "(+/-)x"
-msgstr "(+/-)x"
-
-#: builtin/update-index.c:959
-msgid "override the executable bit of the listed files"
-msgstr "passa per alt el bit executable dels fitxers llistats"
-
#: builtin/update-index.c:963
msgid "mark files as \"not changing\""
msgstr "marca els fitxers com a \"no canviant\""
@@ -11271,7 +12214,7 @@ msgstr "git verify-commit [-v | --verbose] <comissió>..."
msgid "print commit contents"
msgstr "imprimeix els continguts de la comissió"
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
msgid "print raw gpg status output"
msgstr "imprimeix la sortida crua de l'estat gpg"
@@ -11291,7 +12234,7 @@ msgstr "mostra només estadístiques"
msgid "git verify-tag [-v | --verbose] <tag>..."
msgstr "git verify-tag [-v | --verbose] <etiqueta>..."
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
msgid "print tag contents"
msgstr "imprimeix els continguts de l'etiqueta"
@@ -11300,80 +12243,111 @@ msgid "git worktree add [<options>] <path> [<branch>]"
msgstr "git worktree add [<opcions>] <camí> [<branca>]"
#: builtin/worktree.c:16
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<opcions>]"
+
+#: builtin/worktree.c:17
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<opcions>] <camí>"
+
+#: builtin/worktree.c:18
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<opcions>]"
-#: builtin/worktree.c:17
-msgid "git worktree list [<options>]"
-msgstr "git worktree list [<opcions>]"
+#: builtin/worktree.c:19
+msgid "git worktree unlock <path>"
+msgstr "git worktree unlock <camí>"
-#: builtin/worktree.c:39
+#: builtin/worktree.c:42
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Eliminació de worktrees/%s: no és un directori vàlid"
-#: builtin/worktree.c:45
+#: builtin/worktree.c:48
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:53
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)"
-#: builtin/worktree.c:61
+#: builtin/worktree.c:64
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid"
-#: builtin/worktree.c:77
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no "
"existent"
-#: builtin/worktree.c:112
-#, c-format
-msgid "failed to remove: %s"
-msgstr "s'ha fallat en eliminar: %s"
-
-#: builtin/worktree.c:201
+#: builtin/worktree.c:204
#, c-format
msgid "'%s' already exists"
msgstr "'%s' ja existeix"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:236
#, c-format
msgid "could not create directory of '%s'"
msgstr "no s'ha pogut crear directori de '%s'"
-#: builtin/worktree.c:269
+#: builtin/worktree.c:272
#, c-format
msgid "Preparing %s (identifier %s)"
-msgstr "Preparant %s (identificador %s)"
+msgstr "S'està preparant %s (identificador %s)"
-#: builtin/worktree.c:317
+#: builtin/worktree.c:323
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "agafa <branca> encara que sigui agafada en altre arbre de treball"
-#: builtin/worktree.c:319
+#: builtin/worktree.c:325
msgid "create a new branch"
msgstr "crea una branca nova"
-#: builtin/worktree.c:321
+#: builtin/worktree.c:327
msgid "create or reset a branch"
msgstr "crea o restableix una branca"
-#: builtin/worktree.c:322
-msgid "detach HEAD at named commit"
-msgstr "separa el HEAD a la comissió anomenada"
-
#: builtin/worktree.c:329
+msgid "populate the new working tree"
+msgstr "emplena l'arbre de treball nou"
+
+#: builtin/worktree.c:337
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B i --detach són mutualment exclusius"
+#: builtin/worktree.c:470
+msgid "reason for locking"
+msgstr "raó per bloquejar"
+
+#: builtin/worktree.c:482 builtin/worktree.c:515
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr "'%s' no és un arbre de treball"
+
+#: builtin/worktree.c:484 builtin/worktree.c:517
+msgid "The main working tree cannot be locked or unlocked"
+msgstr "No es pot bloquejar ni desbloquejar l'arbre de treball principal"
+
+#: builtin/worktree.c:489
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "'%s' ja està bloquejat, raó: '%s'"
+
+#: builtin/worktree.c:491
+#, c-format
+msgid "'%s' is already locked"
+msgstr "'%s' ja està bloquejat"
+
+#: builtin/worktree.c:519
+#, c-format
+msgid "'%s' is not locked"
+msgstr "'%s' no està bloquejat"
+
#: builtin/write-tree.c:13
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"
@@ -11390,7 +12364,28 @@ msgstr "escriu l'objecte d'arbre per a un subdirectori <prefix>"
msgid "only useful for debugging"
msgstr "només útil per a la depuració"
-#: credential-cache--daemon.c:262
+#: upload-pack.c:20
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<opcions>] <directori>"
+
+#: upload-pack.c:837
+msgid "quit after a single request/response exchange"
+msgstr "surt després d'un sol intercanvi de sol·licitud/resposta"
+
+#: upload-pack.c:839
+msgid "exit immediately after initial ref advertisement"
+msgstr "surt immediatament després del anunci inicial de referència"
+
+#: upload-pack.c:841
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr ""
+"no intentis <directori>/.git/ si <directori> no és cap directori del Git"
+
+#: upload-pack.c:843
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "interromp la transferència després de <n> segons d'inactivitat"
+
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "imprimeix els missatges de depuració a stderr"
@@ -11405,7 +12400,7 @@ msgstr ""
"'git help <concepte>' per a llegir sobre una subordre o concepte\n"
"específic."
-#: http.c:321
+#: http.c:323
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0"
@@ -11514,7 +12509,7 @@ msgstr "Mostra l'estat de l'arbre de treball"
#: common-cmds.h:37
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
-"Crea, llista, suprimeix o verifica un objecte d'etiqueta firmat amb GPG"
+"Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG"
#: parse-options.h:145
msgid "expiry-date"
@@ -11536,37 +12531,37 @@ msgstr "sigues més callat"
msgid "use <n> digits to display SHA-1s"
msgstr "usa <n> xifres per presentar els SHA-1"
-#: rerere.h:38
+#: rerere.h:40
msgid "update the index with reused conflict resolution if possible"
msgstr ""
"actualitza l'índex amb la resolució de conflicte reusada si és possible"
-#: git-bisect.sh:55
+#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "Cal començar per \"git bisect start\""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:61
+#: git-bisect.sh:60
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Voleu que ho faci per vós [Y/n]? "
-#: git-bisect.sh:122
+#: git-bisect.sh:121
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "opció no reconeguda: '$arg'"
-#: git-bisect.sh:126
+#: git-bisect.sh:125
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "'$arg' no sembla una revisió vàlida"
-#: git-bisect.sh:155
+#: git-bisect.sh:154
msgid "Bad HEAD - I need a HEAD"
msgstr "HEAD dolent - Cal un HEAD"
-#: git-bisect.sh:168
+#: git-bisect.sh:167
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
@@ -11574,27 +12569,28 @@ msgstr ""
"L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-"
"vàlida>'."
-#: git-bisect.sh:178
+#: git-bisect.sh:177
msgid "won't bisect on cg-seek'ed tree"
msgstr "no es bisecarà en un arbre en el qual s'ha fet cg-seek"
-#: git-bisect.sh:182
+#: git-bisect.sh:181
msgid "Bad HEAD - strange symbolic ref"
msgstr "HEAD dolent - referència simbòlica estranya"
-#: git-bisect.sh:234
+#: git-bisect.sh:233
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "Paràmetre bisect_write dolent: $state"
-#: git-bisect.sh:263
+#: git-bisect.sh:262
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Introducció de revisió dolenta: $arg"
-#: git-bisect.sh:278
-msgid "Please call 'bisect_state' with at least one argument."
-msgstr "Si us plau, invoqueu 'bisect_state' amb almenys un paràmetre."
+#: git-bisect.sh:281
+#, sh-format
+msgid "Bad rev input: $bisected_head"
+msgstr "Entrada de revisió dolenta: $bisected_head"
#: git-bisect.sh:290
#, sh-format
@@ -11609,7 +12605,7 @@ msgstr "'git bisect $TERM_BAD' pot acceptar només un paràmetre."
#: git-bisect.sh:322
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
-msgstr "Avís: bisecant amb només comissió $TERM_BAD."
+msgstr "Advertència: bisecant amb només comissió $TERM_BAD."
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
@@ -11672,7 +12668,7 @@ msgstr "?? de què parleu?"
#: git-bisect.sh:492
#, sh-format
msgid "running $command"
-msgstr "executant $command"
+msgstr "s'està executant $command"
#: git-bisect.sh:499
#, sh-format
@@ -11722,7 +12718,8 @@ msgstr "no es pot canviar el significat del terme '$term'"
#: git-bisect.sh:606
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr "Ordre no vàlida: actualment esteu en una bisecció $TERM_BAD/$TERM_GOOD"
+msgstr ""
+"Ordre no vàlida: actualment esteu en una bisecció $TERM_BAD/$TERM_GOOD."
#: git-bisect.sh:636
msgid "no terms defined"
@@ -11737,7 +12734,48 @@ msgstr ""
"paràmetre no vàlid $arg per a 'git bisect terms'.\n"
"Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new."
-#: git-rebase.sh:57
+#: git-merge-octopus.sh:46
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr ""
+"Error: Els vostres canvis locals als fitxers següents se sobreescriurien per "
+"fusionar"
+
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr "La fusió automàtica no ha funcionat."
+
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an Octopus."
+msgstr "No s'ha de fer un pop."
+
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "No s'ha pogut trobar cap comissió en comú amb $pretty_name"
+
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up-to-date with $pretty_name"
+msgstr "Ja al dia amb $pretty_name"
+
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "S'està avançant ràpidament a: $pretty_name"
+
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "S'està intentant una fusió simple amb $pretty_name"
+
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
+msgstr ""
+"La fusió simple no ha funcionat, s'està intentant una fusió automàtica."
+
+#: git-rebase.sh:56
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
@@ -11745,20 +12783,26 @@ msgid ""
"\"."
msgstr ""
"Quan hàgiu resolt aquest problema, executeu \"git rebase --continue\".\n"
-"Si preferiu saltar aquest pedaç, executeu \"git rebase --skip\" en lloc.\n"
+"Si preferiu saltar aquest pedaç, executeu \"git rebase --skip\" en lloc "
+"d'això.\n"
"Per a agafar la branca original i deixar de rebasar, executeu \"git rebase --"
"abort\"."
-#: git-rebase.sh:165
+#: git-rebase.sh:156 git-rebase.sh:395
+#, sh-format
+msgid "Could not move back to $head_name"
+msgstr "No s'ha pogut tornar a $head_name"
+
+#: git-rebase.sh:167
msgid "Applied autostash."
msgstr "S'ha aplicat el magatzem automàtic."
-#: git-rebase.sh:168
+#: git-rebase.sh:170
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "No es pot emmagatzemar $stash_sha1"
-#: git-rebase.sh:169
+#: git-rebase.sh:171
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
@@ -11768,32 +12812,28 @@ msgstr ""
"Els vostres canvis estan segurs en el magatzem.\n"
"Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n"
-#: git-rebase.sh:208
+#: git-rebase.sh:210
msgid "The pre-rebase hook refused to rebase."
msgstr "El ganxo de prerebasament ha refusat rebasar."
-#: git-rebase.sh:213
+#: git-rebase.sh:215
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Sembla que git-am està en curs. No es pot rebasar."
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr "L'opció --exec s'ha d'usar amb l'opció --interactive"
-
-#: git-rebase.sh:359
+#: git-rebase.sh:356
msgid "No rebase in progress?"
msgstr "No hi ha rebasament en curs?"
-#: git-rebase.sh:370
+#: git-rebase.sh:367
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"L'acció --edit-todo només es pot usar durant un rebasament interactiva."
-#: git-rebase.sh:377
+#: git-rebase.sh:374
msgid "Cannot read HEAD"
msgstr "No es pot llegir HEAD"
-#: git-rebase.sh:380
+#: git-rebase.sh:377
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -11801,12 +12841,7 @@ msgstr ""
"Heu d'editar tots els conflictes de fusió i després\n"
"marcar-los com a resolts fent servir git add"
-#: git-rebase.sh:398
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "No s'ha pogut tornar a $head_name"
-
-#: git-rebase.sh:417
+#: git-rebase.sh:414
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -11827,98 +12862,99 @@ msgstr ""
"i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
"de valor."
-#: git-rebase.sh:468
+#: git-rebase.sh:465
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "font no vàlida $upstream_name"
-#: git-rebase.sh:492
+#: git-rebase.sh:489
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: ja hi ha més d'una base de fusió"
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:492 git-rebase.sh:496
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: no hi ha cap base de fusió"
-#: git-rebase.sh:504
+#: git-rebase.sh:501
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "No assenyala una comissió vàlida: $onto_name"
-#: git-rebase.sh:527
+#: git-rebase.sh:524
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal: no hi ha tal branca: $branch_name"
-#: git-rebase.sh:560
+#: git-rebase.sh:557
msgid "Cannot autostash"
msgstr "No es pot emmagatzemar automàticament"
-#: git-rebase.sh:565
+#: git-rebase.sh:562
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "S'ha creat un magatzem automàtic: $stash_abbrev"
-#: git-rebase.sh:569
+#: git-rebase.sh:566
msgid "Please commit or stash them."
msgstr "Si us plau, cometeu-los o emmagatzemeu-los."
-#: git-rebase.sh:589
+#: git-rebase.sh:586
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "La branca actual $branch_name està al dia."
-#: git-rebase.sh:593
+#: git-rebase.sh:590
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "La branca actual $branch_name està al dia; rebasament forçada."
-#: git-rebase.sh:604
+#: git-rebase.sh:601
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Canvis de $mb a $onto:"
-#: git-rebase.sh:613
+#: git-rebase.sh:610
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-"Primer, rebobinant el cap per a reproduir el vostre treball al damunt..."
+"Primer, s'està rebobinant el cap per a reproduir el vostre treball al "
+"damunt..."
-#: git-rebase.sh:623
+#: git-rebase.sh:620
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr "S'ha avançat $branch_name ràpidament a $onto_name"
+msgstr "S'ha avançat $branch_name ràpidament a $onto_name."
-#: git-stash.sh:51
+#: git-stash.sh:50
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear amb paràmetres no està implementat"
-#: git-stash.sh:74
+#: git-stash.sh:73
msgid "You do not have the initial commit yet"
msgstr "Encara no teniu la comissió inicial"
-#: git-stash.sh:89
+#: git-stash.sh:88
msgid "Cannot save the current index state"
msgstr "No es pot desar l'estat d'índex actual"
-#: git-stash.sh:124 git-stash.sh:137
+#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "No es pot desar l'estat d'arbre de treball actual"
-#: git-stash.sh:141
+#: git-stash.sh:140
msgid "No changes selected"
msgstr "No hi ha canvis seleccionats"
-#: git-stash.sh:144
+#: git-stash.sh:143
msgid "Cannot remove temporary index (can't happen)"
msgstr "No es pot eliminar l'índex temporal (això no pot passar)"
-#: git-stash.sh:157
+#: git-stash.sh:156
msgid "Cannot record working tree state"
msgstr "No es pot registrar l'estat de l'arbre de treball"
-#: git-stash.sh:189
+#: git-stash.sh:188
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "No es pot actualitzar $ref_stash amb $w_commit"
@@ -11933,7 +12969,7 @@ msgstr "No es pot actualitzar $ref_stash amb $w_commit"
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:239
+#: git-stash.sh:238
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -11942,115 +12978,119 @@ msgstr ""
"error: opció desconeguda de 'stash save': $option\n"
" Per a proveir un missatge, useu git stash save -- '$option'"
-#: git-stash.sh:260
+#: git-stash.sh:259
msgid "No local changes to save"
msgstr "No hi ha canvis locals a desar"
-#: git-stash.sh:264
+#: git-stash.sh:263
msgid "Cannot initialize stash"
msgstr "No es pot inicialitzar el magatzem"
-#: git-stash.sh:268
+#: git-stash.sh:267
msgid "Cannot save the current status"
msgstr "No es pot desar l'estat actual"
-#: git-stash.sh:286
+#: git-stash.sh:268
+#, sh-format
+msgid "Saved working directory and index state $stash_msg"
+msgstr "S'han desat el directori de treball i l'estat d'ìndex $stash_msg"
+
+#: git-stash.sh:285
msgid "Cannot remove worktree changes"
msgstr "No es pot eliminar els canvis de l'arbre de treball"
-#: git-stash.sh:405
+#: git-stash.sh:404
#, sh-format
msgid "unknown option: $opt"
msgstr "opció desconeguda: $opt"
-#: git-stash.sh:415
+#: git-stash.sh:414
msgid "No stash found."
-msgstr "Cap magatzem trobat."
+msgstr "No s'ha trobat cap magatzem."
-#: git-stash.sh:422
+#: git-stash.sh:421
#, sh-format
msgid "Too many revisions specified: $REV"
-msgstr "Massa revisions especificades: $REV"
+msgstr "S'han especificat massa revisions: $REV"
-#: git-stash.sh:428
+#: git-stash.sh:427
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference no és una referència vàlida"
-#: git-stash.sh:456
+#: git-stash.sh:455
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' no és una comissió de tipus magatzem"
-#: git-stash.sh:467
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' no és una referència de magatzem"
-#: git-stash.sh:475
+#: git-stash.sh:474
msgid "unable to refresh index"
msgstr "no s'ha pogut actualitzar l'índex"
-#: git-stash.sh:479
+#: git-stash.sh:478
msgid "Cannot apply a stash in the middle of a merge"
msgstr "No es pot aplicar un magatzem enmig d'una fusió"
-#: git-stash.sh:487
+#: git-stash.sh:486
msgid "Conflicts in index. Try without --index."
msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
-#: git-stash.sh:489
+#: git-stash.sh:488
msgid "Could not save index tree"
msgstr "No s'ha pogut desar l'arbre d'índex"
-#: git-stash.sh:523
+#: git-stash.sh:522
msgid "Cannot unstage modified files"
msgstr "No es pot desallistar fitxers modificats"
-#: git-stash.sh:538
+#: git-stash.sh:537
msgid "Index was not unstashed."
msgstr "L'índex no estava sense emmagatzemar."
-#: git-stash.sh:561
+#: git-stash.sh:551
+msgid "The stash is kept in case you need it again."
+msgstr "Es conserva el magatzem en cas de que el necessiteu altra vegada."
+
+#: git-stash.sh:560
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} ($s) descartada"
-#: git-stash.sh:562
+#: git-stash.sh:561
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
-#: git-stash.sh:570
+#: git-stash.sh:569
msgid "No branch name specified"
msgstr "Cap nom de branca especificat"
-#: git-stash.sh:642
+#: git-stash.sh:641
msgid "(To restore them type \"git stash apply\")"
msgstr "(Per restaurar-les teclegeu \"git stash apply\")"
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "no es pot despullar un component de l'url '$remoteurl'"
-
-#: git-submodule.sh:281
+#: git-submodule.sh:183
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"El camí relatiu només es pot usar des del nivell superior de l'arbre de "
"treball"
-#: git-submodule.sh:291
+#: git-submodule.sh:193
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "URL de dipòsit: '$repo' ha de ser absolut o començar amb ./|../"
-#: git-submodule.sh:308
+#: git-submodule.sh:210
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' ja existeix en l'índex"
-#: git-submodule.sh:312
+#: git-submodule.sh:214
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -12061,118 +13101,91 @@ msgstr ""
"$sm_path\n"
"Useu -f si realment voleu afegir-lo."
-#: git-submodule.sh:330
+#: git-submodule.sh:232
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "Afegint el dipòsit existent a '$sm_path' a l'índex"
+msgstr "S'està afegint el dipòsit existent a '$sm_path' a l'índex"
-#: git-submodule.sh:332
+#: git-submodule.sh:234
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' ja existeix i no és un dipòsit de git vàlid"
-#: git-submodule.sh:340
+#: git-submodule.sh:242
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Es troba un directori de git per a '$sm_name' localment amb els remots:"
-#: git-submodule.sh:342
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from"
-msgstr ""
-"Si voleu tornar a usar aquest directori de git local en lloc de clonar de "
-"nou des de"
-
-#: git-submodule.sh:344
-#, sh-format
-msgid ""
-"use the '--force' option. If the local git directory is not the correct repo"
-msgstr ""
-"useu l'opció '--force'. Si el directori de git local no és el dipòsit "
-"correcte"
-
-#: git-submodule.sh:345
+#: git-submodule.sh:244
#, sh-format
msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+" $realrepo\n"
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr ""
-"o esteu insegur de què vol dir això, trieu un altre nom amb l'opció '--name'."
+"Si voleu reusar aquest directori de git local en lloc de clonar de nou de\n"
+" $realrepo\n"
+"useu l'opció '--force'. Si el directori de git local no és el dipòsit "
+"correcte\n"
+"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció '--"
+"name'."
-#: git-submodule.sh:347
+#: git-submodule.sh:250
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "Reactivant el directori de git local per al submòdul '$sm_name'."
+msgstr ""
+"S'està reactivant el directori de git local per al submòdul '$sm_name'."
-#: git-submodule.sh:359
+#: git-submodule.sh:262
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "no s'ha pogut agafar el submòdul '$sm_path'"
-#: git-submodule.sh:364
+#: git-submodule.sh:267
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "S'ha fallat en afegir el submòdul '$sm_path'"
-#: git-submodule.sh:373
+#: git-submodule.sh:276
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "S'ha fallat en registrar el submòdul '$sm_path'"
-#: git-submodule.sh:417
-#, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "Entrant a '$prefix$displaypath'"
-
-#: git-submodule.sh:437
+#: git-submodule.sh:323
#, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
-msgstr ""
-"Aturant a '$prefix$displaypath'; l'script ha retornat un estat no zero."
+msgid "Entering '$displaypath'"
+msgstr "S'està entrant '$displaypath'"
-#: git-submodule.sh:483
+#: git-submodule.sh:343
#, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
+msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
-"No s'ha trobat cap url per al camí de submòdul '$displaypath' a .gitmodules"
-
-#: git-submodule.sh:492
-#, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr "S'ha fallat en registrar l'url per al camí de submòdul '$displaypath'"
+"S'està aturant a '$displaypath'; l'script ha retornat un estat no zero."
-#: git-submodule.sh:494
+#: git-submodule.sh:414
#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr "S'ha registrat el submòdul '$name' ($url) per al camí '$displaypath'"
+msgid "pathspec and --all are incompatible"
+msgstr "--pathspec i --all són incompatibles"
-#: git-submodule.sh:511
+#: git-submodule.sh:419
#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr ""
-"S'ha fallat en registrar el mode d'actualització per al camí de submòdul "
-"'$displaypath'"
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "Useu '--all' si realment voleu desinicialitzar tots els submòduls"
-#: git-submodule.sh:549
-#, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr "Useu '.' si realment voleu desinicialitzar tots els submòduls"
-
-#: git-submodule.sh:566
-#, sh-format
-msgid "Submodule work tree '$displaypath' contains a .git directory"
-msgstr "L'arbre de treball de submòdul '$displaypath' conté un directori .git"
-
-#: git-submodule.sh:567
+#: git-submodule.sh:439
#, sh-format
msgid ""
+"Submodule work tree '$displaypath' contains a .git directory\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-"(useu 'rm -rf' si realment voleu eliminar-lo incloent tota la seva història)"
+"L'arbre de treball de submòdul '$displaypath' conté un directori .git\n"
+"(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva història)"
-#: git-submodule.sh:573
+#: git-submodule.sh:447
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -12181,133 +13194,609 @@ msgstr ""
"L'arbre de treball de submòdul '$displaypath' conté modificacions locals; "
"useu '-f' per a descartar-les"
-#: git-submodule.sh:576
+#: git-submodule.sh:450
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "S'ha netejat el directori '$displaypath'"
-#: git-submodule.sh:577
+#: git-submodule.sh:451
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "No s'ha pogut eliminar l'arbre de treball de submòdul '$displaypath'"
-#: git-submodule.sh:580
+#: git-submodule.sh:454
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "No s'ha pogut crear el directori de submòdul buit '$displaypath'"
-#: git-submodule.sh:589
+#: git-submodule.sh:463
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "Submòdul '$name' ($url) no registrat per al camí '$displaypath'"
-#: git-submodule.sh:723
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-"Camí de submòdul '$displaypath' no inicialitzat\n"
-"Potser voleu usar 'update --init'?"
-
-#: git-submodule.sh:736
+#: git-submodule.sh:612
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"No s'ha pogut trobar la revisió actual en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:745
+#: git-submodule.sh:622
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "No s'ha pogut obtenir en el camí de submòdul '$sm_path'"
-#: git-submodule.sh:768
+#: git-submodule.sh:627
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr ""
+"No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el "
+"camí de submòdul '$sm_path'"
+
+#: git-submodule.sh:645
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "No s'ha pogut obtenir en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:788
+#: git-submodule.sh:651
+#, sh-format
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr ""
+"S'ha obtingut en el camí de submòdul '$displaypath', però no contenia $sha1. "
+"L'obteniment directe d'aquella comissió ha fallat."
+
+#: git-submodule.sh:658
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "No s'ha pogut agafar '$sha1' en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:789
+#: git-submodule.sh:659
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'"
-#: git-submodule.sh:793
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "no s'ha pogut rebasar '$sha1' en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:794
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha rebasat en '$sha1'"
-#: git-submodule.sh:799
+#: git-submodule.sh:669
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "No s'ha pogut fusionar '$sha1' en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:800
+#: git-submodule.sh:670
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'"
-#: git-submodule.sh:805
+#: git-submodule.sh:675
#, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-"L'execució de '$command $sha1' ha fallat en el camí de submòdul '$prefix"
-"$sm_path'"
+"L'execució de '$command $sha1' ha fallat en el camí de submòdul "
+"'$displaypath'"
-#: git-submodule.sh:806
+#: git-submodule.sh:676
#, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "Camí de submòdul '$prefix$sm_path': '$command $sha1'"
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "Camí de submòdul '$displaypath': '$command $sha1'"
-#: git-submodule.sh:836
+#: git-submodule.sh:707
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "S'ha fallat en recursar al camí de submòdul '$displaypath'"
-#: git-submodule.sh:944
+#: git-submodule.sh:815
msgid "The --cached option cannot be used with the --files option"
msgstr "L'opció --cached no es pot usar amb l'opció --files"
-#: git-submodule.sh:996
+#: git-submodule.sh:867
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode inesperat $mod_dst"
-#: git-submodule.sh:1016
+#: git-submodule.sh:887
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Avís: $display_name no conté la comissió $sha1_src"
-#: git-submodule.sh:1019
+#: git-submodule.sh:890
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Avís: $display_name no conté la comissió $sha1_dst"
-#: git-submodule.sh:1022
+#: git-submodule.sh:893
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Avís: $display_name no conté les comissions $sha1_src i $sha1_dst"
-#: git-submodule.sh:1047
+#: git-submodule.sh:918
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:1165
+#: git-submodule.sh:1040
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "S'ha fallat en recursar al camí de submòdul '$sm_path'"
-#: git-submodule.sh:1229
+#: git-submodule.sh:1107
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
-msgstr "Sincronitzant l'url de submòdul per a '$displaypath'"
+msgstr "S'està sincronitzant l'url de submòdul per a '$displaypath'"
+
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "Vegeu git-${cmd}(1) per detalls."
+
+#: git-rebase--interactive.sh:131
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr "S'està rebasant ($new_count/$total)"
+
+#: git-rebase--interactive.sh:147
+msgid ""
+"\n"
+"Commands:\n"
+" p, pick = use commit\n"
+" r, reword = use commit, but edit the commit message\n"
+" e, edit = use commit, but stop for amending\n"
+" s, squash = use commit, but meld into previous commit\n"
+" f, fixup = like \"squash\", but discard this commit's log message\n"
+" x, exec = run command (the rest of the line) using shell\n"
+" d, drop = remove commit\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+"\n"
+"Ordres:\n"
+" p, pick = usa la comissió\n"
+" r, reword = usa la comissió, però edita el missatge de comissió\n"
+" e, edit = usa la commissió, però atura't per a esmenar\n"
+" s, squash = usa la comissió, però fusiona'l a la comissió prèvia\n"
+" f, fixup = com \"squash\", però descarta el missatge de registre d'aquesta "
+"comissió\n"
+" x, exec = executa l'ordre (el reste de la línia) usant l'intèrpret "
+"d'ordres\n"
+" d, drop = elimina la comissió\n"
+"\n"
+"Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
+
+#: git-rebase--interactive.sh:162
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"No elimineu cap línia. Useu 'drop' explícitament per a eliminar una "
+"comissió.\n"
+
+#: git-rebase--interactive.sh:166
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Si elimineu una línia aquí, ES PERDRÀ AQUELLA COMISSIÓ.\n"
+
+#: git-rebase--interactive.sh:202
+#, sh-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Podeu esmenar la comissió ara, amb\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Una vegada que estigueu satisfet amb els vostres canvis, executeu\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:227
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
+msgstr "$sha1: no és una comissió que es pugi escollir"
+
+#: git-rebase--interactive.sh:266
+#, sh-format
+msgid "Invalid commit name: $sha1"
+msgstr "Nom de comissió no vàlid: $sha1"
+
+#: git-rebase--interactive.sh:308
+msgid "Cannot write current commit's replacement sha1"
+msgstr "No es pot escriure el sha1 reemplaçant de la comissió actual"
+
+#: git-rebase--interactive.sh:360
+#, sh-format
+msgid "Fast-forward to $sha1"
+msgstr "Avanç ràpid a $sha1"
+
+#: git-rebase--interactive.sh:362
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
+msgstr "No es pot avançar ràpidament a $sha1"
+
+#: git-rebase--interactive.sh:371
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
+msgstr "No es pot moure HEAD a $first_parent"
+
+#: git-rebase--interactive.sh:376
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
+msgstr "S'està refusant aixafar una fusió: $sha1"
+
+#: git-rebase--interactive.sh:390
+#, sh-format
+msgid "Error redoing merge $sha1"
+msgstr "Error en refer la fusió $sha1"
+
+#: git-rebase--interactive.sh:398
+#, sh-format
+msgid "Could not pick $sha1"
+msgstr "No s'ha pogut escollir $sha1"
+
+#: git-rebase--interactive.sh:407
+#, sh-format
+msgid "This is the commit message #${n}:"
+msgstr "Aquest és el missatge de comissió núm. ${n}:"
+
+#: git-rebase--interactive.sh:412
+#, sh-format
+msgid "The commit message #${n} will be skipped:"
+msgstr "El missatge de comissió núm. ${n} se saltarà:"
+
+#: git-rebase--interactive.sh:423
+#, sh-format
+msgid "This is a combination of $count commit."
+msgid_plural "This is a combination of $count commits."
+msgstr[0] "Això és una combinació de $count comissió."
+msgstr[1] "Això és una combinació de $count comissions."
+
+#: git-rebase--interactive.sh:431
+#, sh-format
+msgid "Cannot write $fixup_msg"
+msgstr "No es pot escriure $fixup_msg"
+
+#: git-rebase--interactive.sh:434
+msgid "This is a combination of 2 commits."
+msgstr "Això és una combinació de 2 comissions."
+
+#: git-rebase--interactive.sh:435
+msgid "This is the 1st commit message:"
+msgstr "Aquest és el 1er missatge de comissió:"
+
+#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
+#: git-rebase--interactive.sh:521
+#, sh-format
+msgid "Could not apply $sha1... $rest"
+msgstr "No s'ha pogut aplicar $sha1... $rest"
+
+#: git-rebase--interactive.sh:549
+#, sh-format
+msgid ""
+"Could not amend commit after successfully picking $sha1... $rest\n"
+"This is most likely due to an empty commit message, or the pre-commit hook\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue "
+"before\n"
+"you are able to reword the commit."
+msgstr ""
+"No s'ha pogut esmenar la comissió després d'escollir amb èxit $sha1... "
+"$rest\n"
+"Això és probablement a causa d'un missatge de comissió buit, o el ganxo de\n"
+"precomissió ha fallat. Si el ganxo de precomissió ha fallat, potser que\n"
+"necessiteu resoldre el problema abans que pugueu canviar el missatge de\n"
+"comissió."
+
+#: git-rebase--interactive.sh:564
+#, sh-format
+msgid "Stopped at $sha1_abbrev... $rest"
+msgstr "S'ha aturat a $sha1_abbrev... $rest"
+
+#: git-rebase--interactive.sh:579
+#, sh-format
+msgid "Cannot '$squash_style' without a previous commit"
+msgstr "No es pot '$squash_style' sense una comissió prèvia"
+
+#: git-rebase--interactive.sh:621
+#, sh-format
+msgid "Executing: $rest"
+msgstr "S'està executant: $rest"
+
+#: git-rebase--interactive.sh:629
+#, sh-format
+msgid "Execution failed: $rest"
+msgstr "L'execució ha fallat: $rest"
+
+#: git-rebase--interactive.sh:631
+msgid "and made changes to the index and/or the working tree"
+msgstr "i ha fet canvis a l'índex o l'arbre de treball"
+
+#: git-rebase--interactive.sh:633
+msgid ""
+"You can fix the problem, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Podeu arreglar el problema, i llavors executeu\n"
+"\n"
+"\tgit rebase --continue"
+
+#. TRANSLATORS: after these lines is a command to be issued by the user
+#: git-rebase--interactive.sh:646
+#, sh-format
+msgid ""
+"Execution succeeded: $rest\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"L'execució ha tingut èxit: $rest\n"
+"però ha deixat canvis a l'índex o l'arbre de treball\n"
+"Cometeu o emmagatzemeu els vostres canvis, i llavors executeu\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:657
+#, sh-format
+msgid "Unknown command: $command $sha1 $rest"
+msgstr "Ordre desconeguda: $command $sha1 $rest"
+
+#: git-rebase--interactive.sh:658
+msgid "Please fix this using 'git rebase --edit-todo'."
+msgstr "Si us plau, arregleu això usant 'git rebase --edit-todo'."
+
+#: git-rebase--interactive.sh:693
+#, sh-format
+msgid "Successfully rebased and updated $head_name."
+msgstr "S'ha rebasat i actualitzat $head_name amb èxit."
+
+#: git-rebase--interactive.sh:740
+msgid "Could not skip unnecessary pick commands"
+msgstr "No s'ha pogut saltar ordres innecessaris d'elecció"
+
+#: git-rebase--interactive.sh:898
+#, sh-format
+msgid ""
+"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+" - $line"
+msgstr ""
+"Advertència: manca el SHA-1 o no és una comissió en la línia següent:\n"
+" - $line"
+
+#: git-rebase--interactive.sh:931
+#, sh-format
+msgid ""
+"Warning: the command isn't recognized in the following line:\n"
+" - $line"
+msgstr ""
+"Advertència: no es reconeix l'ordre en la línia següent:\n"
+" - $line"
+
+#: git-rebase--interactive.sh:970
+msgid "could not detach HEAD"
+msgstr "no s'ha pogut separar HEAD"
+
+#: git-rebase--interactive.sh:1008
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):"
+msgstr ""
+"Advertència: pot ser que algunes comissions s'hagin descartat "
+"accidentalment.\n"
+"Les comissions descartades (més nova a més vella):"
+
+#: git-rebase--interactive.sh:1016
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error."
+msgstr ""
+"Per a evitar aquest missatge, useu \"drop\" per a eliminar explícitament una "
+"comissió.\n"
+"\n"
+"Useu 'git config rebase.missingCommitsCheck' per a canviar el nivell "
+"d'advertències.\n"
+"Els comportaments possibles són: ignore, warn, error."
+
+#: git-rebase--interactive.sh:1027
+#, sh-format
+msgid ""
+"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
+"Ignoring."
+msgstr ""
+"No s'ha reconegut l'ajust $check_level per a l'opció rebase."
+"missingCommitsCheck. S'està ignorant."
+
+#: git-rebase--interactive.sh:1044
+msgid "You can fix this with 'git rebase --edit-todo'."
+msgstr "Podeu arreglar això amb 'git rebase --edit-todo'."
+
+#: git-rebase--interactive.sh:1045
+msgid "Or you can abort the rebase with 'git rebase --abort'."
+msgstr "O podeu avortar el rebasament amb 'git rebase --abort'."
+
+#: git-rebase--interactive.sh:1069
+msgid "Could not remove CHERRY_PICK_HEAD"
+msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
+
+#: git-rebase--interactive.sh:1074
+#, sh-format
+msgid ""
+"You have staged changes in your working tree.\n"
+"If these changes are meant to be\n"
+"squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In both case, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
+msgstr ""
+"Teniu canvis emmagatzemats en el vostre arbre de treball.\n"
+"Si aquests canvis són per a aixafar-se\n"
+"a la comissió prèvia, executeu:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Si són per a formar una comissió nova, executeu:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"En ambdós cassos, quan hàgiu terminat, continueu amb:\n"
+"\n"
+" git rebase --continue\n"
+
+#: git-rebase--interactive.sh:1091
+msgid "Error trying to find the author identity to amend commit"
+msgstr ""
+"Ha hagut un error en intentar trobar la identitat d'autor per a esmenar la "
+"comissió"
+
+#: git-rebase--interactive.sh:1096
+msgid ""
+"You have uncommitted changes in your working tree. Please commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"Teniu canvis no comessos en el vostre arbre de treball. Si us plau,\n"
+"primer cometeu-los i després executeu 'git rebase --continue' de nou."
+
+#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
+msgid "Could not commit staged changes."
+msgstr "No s'ha pogut cometre els canvis emmagatzemats."
+
+#: git-rebase--interactive.sh:1129
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Esteu editant el fitxer de cosses a fer d'un rebasament interactiu en "
+"marxa.\n"
+"Per a continuar el rebasament després d'editar, executeu:\n"
+" git rebase --continue\n"
+"\n"
+
+#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+msgid "Could not execute editor"
+msgstr "No s'ha pogut executar l'editor"
+
+#: git-rebase--interactive.sh:1145
+msgid "You need to set your committer info first"
+msgstr "Heu de primer establir la vostra informació de cometent"
+
+#: git-rebase--interactive.sh:1153
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr "No s'ha pogut agafar $switch_to"
+
+#: git-rebase--interactive.sh:1158
+msgid "No HEAD?"
+msgstr "No hi ha cap HEAD?"
+
+#: git-rebase--interactive.sh:1159
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr "No s'ha pogut crear el $state_dir temporal"
+
+#: git-rebase--interactive.sh:1161
+msgid "Could not mark as interactive"
+msgstr "No s'ha pogut marcar com a interactiu"
+
+#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+msgid "Could not init rewritten commits"
+msgstr "No s'ha pogut iniciar les comissions reescrites"
+
+#: git-rebase--interactive.sh:1276
+#, sh-format
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)"
+msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)"
+
+#: git-rebase--interactive.sh:1281
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"No obstant, si elimineu tot, s'avortarà el rebasament.\n"
+"\n"
+
+#: git-rebase--interactive.sh:1288
+msgid "Note that empty commits are commented out"
+msgstr "Nota que les comissions buides estan comentades"
+
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "ús: $dashless $USAGE"
+
+#: git-sh-setup.sh:190
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr ""
+"No es pot canviar de directori a $cdup, el nivell superior de l'arbre de "
+"treball"
+
+#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr "fatal: no es pot usar $program_name sense un arbre de treball."
+
+#: git-sh-setup.sh:220
+msgid "Cannot rebase: You have unstaged changes."
+msgstr "No es pot rebasar: Teniu canvis no allistats."
+
+#: git-sh-setup.sh:223
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr "No es pot reescriure branques: Teniu canvis no allistats."
+
+#: git-sh-setup.sh:229
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr "No es pot $action: Teniu canvis no allistats."
+
+#: git-sh-setup.sh:242
+msgid "Cannot rebase: Your index contains uncommitted changes."
+msgstr "No es pot rebasar: El vostre índex conté canvis sense cometre."
+
+#: git-sh-setup.sh:248
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr "No es pot $action: El vostre índex conté canvis sense cometre."
+
+#: git-sh-setup.sh:372
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr ""
+"Heu d'executar aquesta ordre des del nivell superior de l'arbre de treball"
+
+#: git-sh-setup.sh:377
+msgid "Unable to determine absolute path of git directory"
+msgstr "No s'ha pogut determinar el camí absolut del directori de git"
diff --git a/po/de.po b/po/de.po
index d50cb1b..0755cdf 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,13 +1,13 @@
# German translations for Git.
-# Copyright (C) 2010-2015 Ralf Thielow <ralf.thielow@gmail.com>
+# Copyright (C) 2010-2016 Ralf Thielow <ralf.thielow@gmail.com>
# This file is distributed under the same license as the Git package.
-# Ralf Thielow <ralf.thielow@gmail.com>, 2010-2015.
+# Ralf Thielow <ralf.thielow@gmail.com>, 2010-2016.
#
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-05-24 23:42+0800\n"
+"POT-Creation-Date: 2016-08-27 23:21+0800\n"
"PO-Revision-Date: 2015-01-21 15:01+0800\n"
"Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n"
"Language-Team: German <>\n"
@@ -22,7 +22,32 @@ msgstr ""
msgid "hint: %.*s\n"
msgstr "Hinweis: %.*s\n"
-#: advice.c:88
+#: advice.c:83
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr "Cherry-Picken ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
+
+#: advice.c:85
+msgid "Committing is not possible because you have unmerged files."
+msgstr "Committen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
+
+#: advice.c:87
+msgid "Merging is not possible because you have unmerged files."
+msgstr "Mergen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
+
+#: advice.c:89
+msgid "Pulling is not possible because you have unmerged files."
+msgstr "Pullen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
+
+#: advice.c:91
+msgid "Reverting is not possible because you have unmerged files."
+msgstr "Reverten ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
+
+#: advice.c:93
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
+msgstr "%s ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
+
+#: advice.c:101
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -31,18 +56,52 @@ msgstr ""
"dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n"
"und zu committen."
-#: advice.c:101 builtin/merge.c:1238
+#: advice.c:109
+msgid "Exiting because of an unresolved conflict."
+msgstr "Beende wegen unaufgelöstem Konflikt."
+
+#: advice.c:114 builtin/merge.c:1181
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)."
-#: advice.c:103
+#: advice.c:116
msgid "Please, commit your changes before merging."
msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie mergen."
-#: advice.c:104
+#: advice.c:117
msgid "Exiting because of unfinished merge."
msgstr "Beende wegen nicht abgeschlossenem Merge."
+#: advice.c:123
+#, c-format
+msgid ""
+"Note: checking out '%s'.\n"
+"\n"
+"You are in 'detached HEAD' state. You can look around, make experimental\n"
+"changes and commit them, and you can discard any commits you make in this\n"
+"state without impacting any branches by performing another checkout.\n"
+"\n"
+"If you want to create a new branch to retain commits you create, you may\n"
+"do so (now or later) by using -b with the checkout command again. Example:\n"
+"\n"
+" git checkout -b <new-branch-name>\n"
+"\n"
+msgstr ""
+"Hinweis: Checke '%s' aus.\n"
+"\n"
+"Sie befinden sich im Zustand eines 'lösgelösten HEAD'. Sie können sich\n"
+"umschauen, experimentelle Änderungen vornehmen und diese committen, und\n"
+"Sie können alle möglichen Commits, die Sie in diesem Zustand machen,\n"
+"ohne Auswirkungen auf irgendeinen Branch verwerfen, indem Sie einen\n"
+"weiteren Checkout durchführen.\n"
+"\n"
+"Wenn Sie einen neuen Branch erstellen möchten, um Ihre erstellten Commits\n"
+"zu behalten, können Sie das (jetzt oder später) durch einen weiteren Checkout\n"
+"mit der Option -b tun. Beispiel:\n"
+"\n"
+" git checkout -b <neuer-Branchname>\n"
+"\n"
+
#: archive.c:12
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<Optionen>] <Commit-Referenz> [<Pfad>...]"
@@ -62,7 +121,7 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <Repository> [--exec <Programm>] --list"
-#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
@@ -75,7 +134,7 @@ msgstr "Format"
msgid "archive format"
msgstr "Archivformat"
-#: archive.c:430 builtin/log.c:1395
+#: archive.c:430 builtin/log.c:1422
msgid "prefix"
msgstr "Präfix"
@@ -83,10 +142,10 @@ msgstr "Präfix"
msgid "prepend prefix to each pathname in the archive"
msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549
-#: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459
-#: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 builtin/blame.c:2554
+#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989
+#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:460
+#: builtin/ls-files.c:463 builtin/notes.c:399 builtin/notes.c:562
#: builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "Datei"
@@ -120,7 +179,7 @@ msgid "list supported archive formats"
msgstr "unterstützte Archivformate auflisten"
#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:776
+#: builtin/submodule--helper.c:832
msgid "repo"
msgstr "Repository"
@@ -128,7 +187,7 @@ msgstr "Repository"
msgid "retrieve the archive from remote repository <repo>"
msgstr "Archiv vom Remote-Repository <Repository> abrufen"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
msgid "command"
msgstr "Programm"
@@ -136,6 +195,28 @@ msgstr "Programm"
msgid "path to the remote git-upload-archive command"
msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
+#: archive.c:461
+msgid "Unexpected option --remote"
+msgstr "Unerwartete Option --remote"
+
+#: archive.c:463
+msgid "Option --exec can only be used together with --remote"
+msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden."
+
+#: archive.c:465
+msgid "Unexpected option --output"
+msgstr "Unerwartete Option --output"
+
+#: archive.c:487
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Unbekanntes Archivformat '%s'"
+
+#: archive.c:494
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argument für Format '%s' nicht unterstützt: -%d"
+
#: attr.c:263
msgid ""
"Negative patterns are ignored in git attributes\n"
@@ -144,6 +225,130 @@ msgstr ""
"Verneinende Muster werden in Git-Attributen ignoriert.\n"
"Benutzen Sie '\\!' für führende Ausrufezeichen."
+#: bisect.c:441
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Konnte Datei '%s' nicht öffnen"
+
+#: bisect.c:446
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "Ungültiger Inhalt bzgl. Anführungsstriche in Datei '%s': %s"
+
+#: bisect.c:655
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "Keine binäre Suche mehr möglich!\n"
+
+#: bisect.c:708
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "%s ist kein gültiger Commit-Name"
+
+#: bisect.c:732
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+"Die Merge-Basis %s ist fehlerhaft.\n"
+"Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n"
+
+#: bisect.c:737
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"Die Merge-Basis %s ist neu.\n"
+"Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n"
+
+#: bisect.c:742
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"Die Merge-Basis %s ist %s.\n"
+"Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s]\n"
+
+#: bisect.c:750
+#, c-format
+msgid ""
+"Some %s revs are not ancestor of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
+msgstr ""
+"Manche %s Commits sind keine Vorgänger des %s Commits.\n"
+"git bisect kann in diesem Fall nicht richtig arbeiten.\n"
+"Vielleicht verwechselten Sie %s und %s Commits?\n"
+
+#: bisect.c:763
+#, c-format
+msgid ""
+"the merge base between %s and [%s] must be skipped.\n"
+"So we cannot be sure the first %s commit is between %s and %s.\n"
+"We continue anyway."
+msgstr ""
+"Die Merge-Basis zwischen %s und [%s] muss ausgelassen werden.\n"
+"Es kann daher nicht sichergestellt werden, dass sich der\n"
+"erste %s Commit zwischen %s und %s befindet.\n"
+"Es wird dennoch fortgesetzt."
+
+#: bisect.c:798
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "binäre Suche: eine Merge-Basis muss geprüft werden\n"
+
+#: bisect.c:849
+#, c-format
+msgid "a %s revision is needed"
+msgstr "ein %s Commit wird benötigt"
+
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#, c-format
+msgid "could not create file '%s'"
+msgstr "konnte Datei '%s' nicht erstellen"
+
+#: bisect.c:917
+#, c-format
+msgid "could not read file '%s'"
+msgstr "Konnte Datei '%s' nicht lesen"
+
+#: bisect.c:947
+msgid "reading bisect refs failed"
+msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen"
+
+#: bisect.c:967
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr "%s war sowohl %s als auch %s\n"
+
+#: bisect.c:975
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+"Kein testbarer Commit gefunden.\n"
+"Vielleicht starteten Sie mit falschen Pfad-Parametern?\n"
+
+#: bisect.c:994
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(ungefähr %d Schritt)"
+msgstr[1] "(ungefähr %d Schritte)"
+
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:998
+#, c-format
+msgid "Bisecting: %d revision left to test after this %s\n"
+msgid_plural "Bisecting: %d revisions left to test after this %s\n"
+msgstr[0] "binäre Suche: danach noch %d Commit zum Testen übrig %s\n"
+msgstr[1] "binäre Suche: danach noch %d Commits zum Testen übrig %s\n"
+
#: branch.c:53
#, c-format
msgid ""
@@ -298,7 +503,7 @@ msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus"
msgid "unrecognized header: %s%s (%d)"
msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:777
+#: bundle.c:87 builtin/commit.c:778
#, c-format
msgid "could not open '%s'"
msgstr "Konnte '%s' nicht öffnen"
@@ -307,10 +512,10 @@ msgstr "Konnte '%s' nicht öffnen"
msgid "Repository lacks these prerequisite commits:"
msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
-#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
-#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
-#: builtin/merge.c:361 builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
+#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
+#: builtin/merge.c:356 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
@@ -349,7 +554,7 @@ msgstr "\"rev-list\" abgebrochen"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
-#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "nicht erkanntes Argument: %s"
@@ -367,13 +572,13 @@ msgstr "kann '%s' nicht erstellen"
msgid "index-pack died"
msgstr "Erstellung der Paketindexdatei abgebrochen"
-#: color.c:275
+#: color.c:290
#, c-format
msgid "invalid color value: %.*s"
msgstr "Ungültiger Farbwert: %.*s"
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
-#: builtin/am.c:2134
+#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
+#: builtin/am.c:2119
#, c-format
msgid "could not parse %s"
msgstr "konnte %s nicht parsen"
@@ -387,132 +592,194 @@ msgstr "%s %s ist kein Commit!"
msgid "memory exhausted"
msgstr "Speicher verbraucht"
-#: config.c:475 config.c:477
+#: config.c:516
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "Ungültige Konfigurationszeile %d in Blob %s"
+
+#: config.c:520
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "Ungültige Konfigurationszeile %d in Datei %s"
+
+#: config.c:524
#, c-format
-msgid "bad config line %d in %s %s"
-msgstr "Zeile %d in Konfiguration %s %s ist ungültig."
+msgid "bad config line %d in standard input"
+msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe"
-#: config.c:593
+#: config.c:528
#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
-msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in %s %s: %s"
+msgid "bad config line %d in submodule-blob %s"
+msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s"
-#: config.c:595
+#: config.c:532
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s"
+
+#: config.c:536
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "Ungültige Konfigurationszeile %d in %s"
+
+#: config.c:655
+msgid "out of range"
+msgstr "Außerhalb des Bereichs"
+
+#: config.c:655
+msgid "invalid unit"
+msgstr "Ungültige Einheit"
+
+#: config.c:661
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s"
-#: config.c:680
+#: config.c:666
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Blob %s: %s"
+
+#: config.c:669
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Datei %s: %s"
+
+#: config.c:672
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Standard-Eingabe: %s"
+
+#: config.c:675
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Submodul-Blob %s: %s"
+
+#: config.c:678
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Befehlszeile %s: %s"
+
+#: config.c:681
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in %s: %s"
+
+#: config.c:768
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'"
-#: config.c:761 config.c:772
+#: config.c:849 config.c:860
#, c-format
msgid "bad zlib compression level %d"
msgstr "ungültiger zlib Komprimierungsgrad %d"
-#: config.c:890
+#: config.c:978
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "Ungültiger Modus für Objekterstellung: %s"
-#: config.c:1228
+#: config.c:1312
msgid "unable to parse command-line config"
msgstr ""
"Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
-#: config.c:1284
-msgid "unknown error occured while reading the configuration files"
+#: config.c:1362
+msgid "unknown error occurred while reading the configuration files"
msgstr ""
"Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
-#: config.c:1629
+#: config.c:1716
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
"Konnte Wert '%s' aus der über die Befehlszeile angegebenen Konfiguration\n"
"nicht parsen."
-#: config.c:1631
+#: config.c:1718
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d"
-#: config.c:1690
+#: config.c:1777
#, c-format
msgid "%s has multiple values"
msgstr "%s hat mehrere Werte"
-#: config.c:2224
+#: config.c:2311
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "Konnte '%s' nicht zu '%s' setzen."
-#: config.c:2226
+#: config.c:2313
#, c-format
msgid "could not unset '%s'"
msgstr "Konnte '%s' nicht aufheben."
-#: connected.c:69
+#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr "Prüfe Konnektivität"
+
+#: connected.c:74
msgid "Could not run 'git rev-list'"
msgstr "Konnte 'git rev-list' nicht ausführen"
-#: connected.c:89
+#: connected.c:94
msgid "failed write to rev-list"
msgstr "Fehler beim Schreiben nach rev-list"
-#: connected.c:96
+#: connected.c:101
msgid "failed to close rev-list's stdin"
msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe"
-#: date.c:95
+#: date.c:97
msgid "in the future"
msgstr "in der Zukunft"
-#: date.c:101
+#: date.c:103
#, c-format
msgid "%lu second ago"
msgid_plural "%lu seconds ago"
msgstr[0] "vor %lu Sekunde"
msgstr[1] "vor %lu Sekunden"
-#: date.c:108
+#: date.c:110
#, c-format
msgid "%lu minute ago"
msgid_plural "%lu minutes ago"
msgstr[0] "vor %lu Minute"
msgstr[1] "vor %lu Minuten"
-#: date.c:115
+#: date.c:117
#, c-format
msgid "%lu hour ago"
msgid_plural "%lu hours ago"
msgstr[0] "vor %lu Stunde"
msgstr[1] "vor %lu Stunden"
-#: date.c:122
+#: date.c:124
#, c-format
msgid "%lu day ago"
msgid_plural "%lu days ago"
msgstr[0] "vor %lu Tag"
msgstr[1] "vor %lu Tagen"
-#: date.c:128
+#: date.c:130
#, c-format
msgid "%lu week ago"
msgid_plural "%lu weeks ago"
msgstr[0] "vor %lu Woche"
msgstr[1] "vor %lu Wochen"
-#: date.c:135
+#: date.c:137
#, c-format
msgid "%lu month ago"
msgid_plural "%lu months ago"
msgstr[0] "vor %lu Monat"
msgstr[1] "vor %lu Monaten"
-#: date.c:146
+#: date.c:148
#, c-format
msgid "%lu year"
msgid_plural "%lu years"
@@ -520,14 +787,14 @@ msgstr[0] "vor %lu Jahr"
msgstr[1] "vor %lu Jahren"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:149
+#: date.c:151
#, c-format
msgid "%s, %lu month ago"
msgid_plural "%s, %lu months ago"
msgstr[0] "%s, und %lu Monat"
msgstr[1] "%s, und %lu Monaten"
-#: date.c:154 date.c:159
+#: date.c:156 date.c:161
#, c-format
msgid "%lu year ago"
msgid_plural "%lu years ago"
@@ -539,7 +806,7 @@ msgstr[1] "vor %lu Jahren"
msgid "failed to read orderfile '%s'"
msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'."
-#: diffcore-rename.c:538
+#: diffcore-rename.c:540
msgid "Performing inexact rename detection"
msgstr "Führe Erkennung für ungenaue Umbenennung aus"
@@ -568,16 +835,16 @@ msgstr ""
"Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
"%s"
-#: diff.c:3007
+#: diff.c:3017
#, c-format
msgid "external diff died, stopping at %s"
msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
-#: diff.c:3405
+#: diff.c:3415
msgid "--follow requires exactly one pathspec"
msgstr "--follow erfordert genau eine Pfadspezifikation"
-#: diff.c:3568
+#: diff.c:3578
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -586,7 +853,7 @@ msgstr ""
"Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
"%s"
-#: diff.c:3582
+#: diff.c:3592
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
@@ -601,39 +868,30 @@ msgstr ""
"Cache für unversionierte Dateien ist auf diesem System oder\n"
"für dieses Verzeichnis deaktiviert."
-#: gpg-interface.c:166 gpg-interface.c:235
-msgid "could not run gpg."
-msgstr "konnte gpg nicht ausführen"
-
#: gpg-interface.c:178
-msgid "gpg did not accept the data"
-msgstr "gpg hat die Daten nicht akzeptiert"
-
-#: gpg-interface.c:189
msgid "gpg failed to sign the data"
msgstr "gpg beim Signieren der Daten fehlgeschlagen"
-#: gpg-interface.c:222
-#, c-format
-msgid "could not create temporary file '%s'"
-msgstr "konnte temporäre Datei '%s' nicht erstellen"
+#: gpg-interface.c:208
+msgid "could not create temporary file"
+msgstr "konnte temporäre Datei nicht erstellen"
-#: gpg-interface.c:224
+#: gpg-interface.c:210
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'"
-#: grep.c:1718
+#: grep.c:1792
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': konnte %s nicht lesen"
-#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
+#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
#, c-format
msgid "failed to stat '%s'"
msgstr "Konnte '%s' nicht lesen"
-#: grep.c:1746
+#: grep.c:1820
#, c-format
msgid "'%s': short read"
msgstr "'%s': read() zu kurz"
@@ -683,7 +941,7 @@ msgstr "Automatische Ausführung in %0.1f Sekunden ..."
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s' ist kein Git-Befehl. Siehe 'git --help'."
-#: help.c:404 help.c:464
+#: help.c:404 help.c:470
msgid ""
"\n"
"Did you mean this?"
@@ -697,7 +955,7 @@ msgstr[1] ""
"\n"
"Haben Sie eines von diesen gemeint?"
-#: help.c:460
+#: help.c:466
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
@@ -731,83 +989,78 @@ msgstr "Konnte '%s.lock' nicht erstellen: %s"
msgid "failed to read the cache"
msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
-#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
-#: builtin/checkout.c:586 builtin/clone.c:732
+#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
+#: builtin/checkout.c:589 builtin/clone.c:732
msgid "unable to write new index file"
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: merge-recursive.c:189
-#, c-format
+#: merge-recursive.c:209
msgid "(bad commit)\n"
msgstr "(ungültiger Commit)\n"
-#: merge-recursive.c:209
+#: merge-recursive.c:231
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "addinfo_cache für Pfad '%s' fehlgeschlagen"
-#: merge-recursive.c:270
+#: merge-recursive.c:301
msgid "error building trees"
msgstr "Fehler beim Erstellen der \"Tree\"-Objekte"
-#: merge-recursive.c:689
+#: merge-recursive.c:720
#, c-format
msgid "failed to create path '%s'%s"
msgstr "Fehler beim Erstellen des Pfades '%s'%s"
-#: merge-recursive.c:700
+#: merge-recursive.c:731
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Entferne %s, um Platz für Unterverzeichnis zu schaffen\n"
-#: merge-recursive.c:714 merge-recursive.c:735
+#: merge-recursive.c:745 merge-recursive.c:764
msgid ": perhaps a D/F conflict?"
msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?"
-#: merge-recursive.c:725
+#: merge-recursive.c:754
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden"
-#: merge-recursive.c:765
+#: merge-recursive.c:796
#, c-format
msgid "cannot read object %s '%s'"
msgstr "kann Objekt %s '%s' nicht lesen"
-#: merge-recursive.c:767
+#: merge-recursive.c:798
#, c-format
msgid "blob expected for %s '%s'"
msgstr "Blob erwartet für %s '%s'"
-#: merge-recursive.c:790 builtin/clone.c:376
+#: merge-recursive.c:822
#, c-format
-msgid "failed to open '%s'"
-msgstr "Fehler beim Öffnen von '%s'"
+msgid "failed to open '%s': %s"
+msgstr "Fehler beim Öffnen von '%s': %s"
-#: merge-recursive.c:798
+#: merge-recursive.c:833
#, c-format
-msgid "failed to symlink '%s'"
-msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s'"
+msgid "failed to symlink '%s': %s"
+msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s"
-#: merge-recursive.c:801
+#: merge-recursive.c:838
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "weiß nicht was mit %06o %s '%s' zu machen ist"
-#: merge-recursive.c:939
+#: merge-recursive.c:978
msgid "Failed to execute internal merge"
msgstr "Fehler bei Ausführung des internen Merges"
-#: merge-recursive.c:943
+#: merge-recursive.c:982
#, c-format
msgid "Unable to add %s to database"
msgstr "Konnte %s nicht zur Datenbank hinzufügen"
-#: merge-recursive.c:959
-msgid "unsupported object type in the tree"
-msgstr "nicht unterstützter Objekttyp im Verzeichnis"
-
-#: merge-recursive.c:1034 merge-recursive.c:1048
+#: merge-recursive.c:1081 merge-recursive.c:1095
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -816,7 +1069,7 @@ msgstr ""
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
"im Arbeitsbereich gelassen."
-#: merge-recursive.c:1040 merge-recursive.c:1053
+#: merge-recursive.c:1087 merge-recursive.c:1100
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -825,20 +1078,20 @@ msgstr ""
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
"im Arbeitsbereich bei %s gelassen."
-#: merge-recursive.c:1094
+#: merge-recursive.c:1143
msgid "rename"
msgstr "umbenennen"
-#: merge-recursive.c:1094
+#: merge-recursive.c:1143
msgid "renamed"
msgstr "umbenannt"
-#: merge-recursive.c:1150
+#: merge-recursive.c:1200
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu"
-#: merge-recursive.c:1172
+#: merge-recursive.c:1225
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -847,148 +1100,139 @@ msgstr ""
"KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" "
"und \"%s\"->\"%s\" in Branch \"%s\"%s"
-#: merge-recursive.c:1177
+#: merge-recursive.c:1230
msgid " (left unresolved)"
msgstr " (bleibt unaufgelöst)"
-#: merge-recursive.c:1231
+#: merge-recursive.c:1292
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s "
"in %s"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1325
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Benenne stattdessen %s nach %s und %s nach %s um"
-#: merge-recursive.c:1460
+#: merge-recursive.c:1531
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in "
"%s"
-#: merge-recursive.c:1470
+#: merge-recursive.c:1546
#, c-format
msgid "Adding merged %s"
msgstr "Füge zusammengeführte Datei %s hinzu"
-#: merge-recursive.c:1475 merge-recursive.c:1677
+#: merge-recursive.c:1553 merge-recursive.c:1766
#, c-format
msgid "Adding as %s instead"
msgstr "Füge stattdessen als %s hinzu"
-#: merge-recursive.c:1526
+#: merge-recursive.c:1610
#, c-format
msgid "cannot read object %s"
msgstr "kann Objekt %s nicht lesen"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1613
#, c-format
msgid "object %s is not a blob"
msgstr "Objekt %s ist kein Blob"
-#: merge-recursive.c:1581
+#: merge-recursive.c:1666
msgid "modify"
msgstr "ändern"
-#: merge-recursive.c:1581
+#: merge-recursive.c:1666
msgid "modified"
msgstr "geändert"
-#: merge-recursive.c:1591
+#: merge-recursive.c:1676
msgid "content"
msgstr "Inhalt"
-#: merge-recursive.c:1598
+#: merge-recursive.c:1683
msgid "add/add"
msgstr "hinzufügen/hinzufügen"
-#: merge-recursive.c:1632
+#: merge-recursive.c:1718
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
-#: merge-recursive.c:1646
+#: merge-recursive.c:1732
#, c-format
msgid "Auto-merging %s"
msgstr "automatischer Merge von %s"
-#: merge-recursive.c:1650 git-submodule.sh:941
+#: merge-recursive.c:1736 git-submodule.sh:919
msgid "submodule"
msgstr "Submodul"
-#: merge-recursive.c:1651
+#: merge-recursive.c:1737
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1831
#, c-format
msgid "Removing %s"
msgstr "Entferne %s"
-#: merge-recursive.c:1762
+#: merge-recursive.c:1857
msgid "file/directory"
msgstr "Datei/Verzeichnis"
-#: merge-recursive.c:1768
+#: merge-recursive.c:1863
msgid "directory/file"
msgstr "Verzeichnis/Datei"
-#: merge-recursive.c:1773
+#: merge-recursive.c:1868
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s "
"hinzu."
-#: merge-recursive.c:1781
+#: merge-recursive.c:1877
#, c-format
msgid "Adding %s"
msgstr "Füge %s hinzu"
-#: merge-recursive.c:1798
-msgid "Fatal merge failure, shouldn't happen."
-msgstr "Fataler Merge-Fehler. Sollte nicht passieren."
-
-#: merge-recursive.c:1817
+#: merge-recursive.c:1914
msgid "Already up-to-date!"
msgstr "Bereits aktuell!"
-#: merge-recursive.c:1826
+#: merge-recursive.c:1923
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
-#: merge-recursive.c:1856
-#, c-format
-msgid "Unprocessed path??? %s"
-msgstr "unverarbeiteter Pfad??? %s"
-
-#: merge-recursive.c:1904
+#: merge-recursive.c:2006
msgid "Merging:"
msgstr "Merge:"
-#: merge-recursive.c:1917
+#: merge-recursive.c:2019
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u gemeinsamen Vorgänger-Commit gefunden"
msgstr[1] "%u gemeinsame Vorgänger-Commits gefunden"
-#: merge-recursive.c:1954
+#: merge-recursive.c:2058
msgid "merge returned no commit"
msgstr "Merge hat keinen Commit zurückgegeben"
-#: merge-recursive.c:2011
+#: merge-recursive.c:2121
#, c-format
msgid "Could not parse object '%s'"
msgstr "Konnte Objekt '%s' nicht parsen."
-#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
+#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
msgid "Unable to write index."
msgstr "Konnte Index nicht schreiben."
@@ -1050,7 +1294,7 @@ msgstr "-NUM"
msgid "malformed object name '%s'"
msgstr "fehlerhafter Objekt-Name '%s'"
-#: path.c:796
+#: path.c:798
#, c-format
msgid "Could not make %s writable by group"
msgstr "Konnte Gruppenschreibrecht für %s nicht setzen."
@@ -1122,7 +1366,7 @@ msgstr ""
":(exclude) Muster, aber keine anderen Pfadspezifikationen angegeben.\n"
"Vielleicht haben Sie vergessen entweder ':/' oder '.' hinzuzufügen?"
-#: pretty.c:971
+#: pretty.c:973
msgid "unable to parse --pretty format"
msgstr "Konnte --pretty Format nicht parsen."
@@ -1148,23 +1392,22 @@ msgstr ""
"GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
"Verwende Version %i"
-#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
-#: builtin/merge.c:995
+#: refs.c:551 builtin/merge.c:840
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: refs/files-backend.c:2243
+#: refs/files-backend.c:2534
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Konnte Referenz %s nicht entfernen: %s"
-#: refs/files-backend.c:2246
+#: refs/files-backend.c:2537
#, c-format
msgid "could not delete references: %s"
msgstr "Konnte Referenzen nicht entfernen: %s"
-#: refs/files-backend.c:2255
+#: refs/files-backend.c:2546
#, c-format
msgid "could not remove reference %s"
msgstr "Konnte Referenz %s nicht löschen"
@@ -1322,77 +1565,77 @@ msgstr "%s folgt sowohl %s als auch %s"
msgid "Internal error"
msgstr "Interner Fehler"
-#: remote.c:1678 remote.c:1721
+#: remote.c:1677 remote.c:1720
msgid "HEAD does not point to a branch"
msgstr "HEAD zeigt auf keinen Branch"
-#: remote.c:1687
+#: remote.c:1686
#, c-format
msgid "no such branch: '%s'"
msgstr "Kein solcher Branch: '%s'"
-#: remote.c:1690
+#: remote.c:1689
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert."
-#: remote.c:1696
+#: remote.c:1695
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert"
-#: remote.c:1711
+#: remote.c:1710
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten "
"Branch"
-#: remote.c:1726
+#: remote.c:1725
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
-#: remote.c:1737
+#: remote.c:1736
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'"
-#: remote.c:1750
+#: remote.c:1749
msgid "push has no destination (push.default is 'nothing')"
msgstr "kein Ziel für \"push\" (push.default ist 'nothing')"
-#: remote.c:1772
+#: remote.c:1771
msgid "cannot resolve 'simple' push to a single destination"
msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen"
-#: remote.c:2074
+#: remote.c:2073
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
"Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n"
-#: remote.c:2078
+#: remote.c:2077
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
-#: remote.c:2081
+#: remote.c:2080
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Ihr Branch ist auf dem selben Stand wie '%s'.\n"
-#: remote.c:2085
+#: remote.c:2084
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Ihr Branch ist vor '%s' um %d Commit.\n"
msgstr[1] "Ihr Branch ist vor '%s' um %d Commits.\n"
-#: remote.c:2091
+#: remote.c:2090
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n"
-#: remote.c:2094
+#: remote.c:2093
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1402,12 +1645,12 @@ msgstr[0] ""
msgstr[1] ""
"Ihr Branch ist zu '%s' um %d Commits hinterher, und kann vorgespult werden.\n"
-#: remote.c:2102
+#: remote.c:2101
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
" (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n"
-#: remote.c:2105
+#: remote.c:2104
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1422,22 +1665,22 @@ msgstr[1] ""
"Ihr Branch und '%s' sind divergiert,\n"
"und haben jeweils %d und %d unterschiedliche Commits.\n"
-#: remote.c:2115
+#: remote.c:2114
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch "
"zusammenzuführen)\n"
-#: revision.c:2142
+#: revision.c:2132
msgid "your current branch appears to be broken"
msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
-#: revision.c:2145
+#: revision.c:2135
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
-#: revision.c:2339
+#: revision.c:2329
msgid "--first-parent is incompatible with --bisect"
msgstr "Die Optionen --first-parent und --bisect sind inkompatibel."
@@ -1450,16 +1693,16 @@ msgstr "Öffnen von /dev/null fehlgeschlagen"
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) fehlgeschlagen"
-#: send-pack.c:295
+#: send-pack.c:298
msgid "failed to sign the push certificate"
msgstr "Fehler beim Signieren des \"push\"-Zertifikates"
-#: send-pack.c:404
+#: send-pack.c:411
msgid "the receiving end does not support --signed push"
msgstr ""
"die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")"
-#: send-pack.c:406
+#: send-pack.c:413
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -1467,10 +1710,14 @@ msgstr ""
"kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n"
"Versand (\"--signed push\") unterstützt"
-#: send-pack.c:418
+#: send-pack.c:425
msgid "the receiving end does not support --atomic push"
msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")"
+#: send-pack.c:430
+msgid "the receiving end does not support push options"
+msgstr "die Gegenseite unterstützt keine Push-Optionen"
+
#: sequencer.c:174
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
@@ -1489,19 +1736,20 @@ msgstr ""
"mit 'git add <Pfade>' oder 'git rm <Pfade>'und tragen Sie das Ergebnis mit\n"
"'git commit' ein"
-#: sequencer.c:190 sequencer.c:833 sequencer.c:912
+#: sequencer.c:190 sequencer.c:841 sequencer.c:924
#, c-format
msgid "Could not write to %s"
msgstr "Konnte nicht nach %s schreiben"
-#: sequencer.c:193
+#: sequencer.c:193 sequencer.c:843 sequencer.c:928
#, c-format
-msgid "Error wrapping up %s"
-msgstr "Fehler bei Nachbereitung von %s"
+msgid "Error wrapping up %s."
+msgstr "Fehler beim Einpacken von %s."
#: sequencer.c:208
msgid "Your local changes would be overwritten by cherry-pick."
-msgstr "Ihre lokalen Änderungen würden durch den Cherry-Pick überschrieben werden."
+msgstr ""
+"Ihre lokalen Änderungen würden durch den Cherry-Pick überschrieben werden."
#: sequencer.c:210
msgid "Your local changes would be overwritten by revert."
@@ -1512,202 +1760,242 @@ msgid "Commit your changes or stash them to proceed."
msgstr ""
"Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren."
+#: sequencer.c:228
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: Vorspulen"
+
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:300
+#: sequencer.c:303
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Konnte neue Index-Datei nicht schreiben"
-#: sequencer.c:318
+#: sequencer.c:321
msgid "Could not resolve HEAD commit\n"
msgstr "Konnte Commit von HEAD nicht auflösen\n"
-#: sequencer.c:338
+#: sequencer.c:341
msgid "Unable to update cache tree\n"
msgstr "Konnte Cache-Verzeichnis nicht aktualisieren\n"
-#: sequencer.c:390
+#: sequencer.c:393
#, c-format
msgid "Could not parse commit %s\n"
msgstr "Konnte Commit %s nicht parsen\n"
-#: sequencer.c:395
+#: sequencer.c:398
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "Konnte Eltern-Commit %s nicht parsen\n"
-#: sequencer.c:460
+#: sequencer.c:463
msgid "Your index file is unmerged."
msgstr "Ihre Index-Datei ist nicht zusammengeführt."
-#: sequencer.c:479
+#: sequencer.c:482
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "Commit %s ist ein Merge, aber die Option -m wurde nicht angegeben."
-#: sequencer.c:487
+#: sequencer.c:490
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "Commit %s hat keinen Elternteil %d"
-#: sequencer.c:491
+#: sequencer.c:494
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr "Hauptlinie wurde spezifiziert, aber Commit %s ist kein Merge."
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:504
+#: sequencer.c:507
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kann Eltern-Commit %s nicht parsen"
-#: sequencer.c:508
+#: sequencer.c:511
#, c-format
msgid "Cannot get commit message for %s"
msgstr "Kann keine Commit-Beschreibung für %s bekommen"
-#: sequencer.c:594
+#: sequencer.c:597
#, c-format
msgid "could not revert %s... %s"
msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen"
-#: sequencer.c:595
+#: sequencer.c:598
#, c-format
msgid "could not apply %s... %s"
msgstr "Konnte %s... (%s) nicht anwenden"
-#: sequencer.c:630
+#: sequencer.c:633
msgid "empty commit set passed"
msgstr "leere Menge von Commits übergeben"
-#: sequencer.c:638
+#: sequencer.c:641
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: Fehler beim Lesen des Index"
-#: sequencer.c:642
+#: sequencer.c:645
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: Fehler beim Aktualisieren des Index"
-#: sequencer.c:702
-#, c-format
-msgid "Cannot %s during a %s"
-msgstr "Kann %s nicht während eines %s durchführen"
+#: sequencer.c:705
+msgid "Cannot revert during another revert."
+msgstr "Kann Revert nicht während eines anderen Reverts ausführen."
+
+#: sequencer.c:706
+msgid "Cannot revert during a cherry-pick."
+msgstr "Kann Revert nicht während eines Cherry-Picks ausführen."
+
+#: sequencer.c:709
+msgid "Cannot cherry-pick during a revert."
+msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen."
+
+#: sequencer.c:710
+msgid "Cannot cherry-pick during another cherry-pick."
+msgstr "Kann Cherry-Pick nicht während eines anderen Cherry-Picks ausführen."
-#: sequencer.c:724
+#: sequencer.c:732
#, c-format
msgid "Could not parse line %d."
msgstr "Konnte Zeile %d nicht parsen."
-#: sequencer.c:729
+#: sequencer.c:737
msgid "No commits parsed."
msgstr "Keine Commits geparst."
-#: sequencer.c:741
+#: sequencer.c:749
#, c-format
msgid "Could not open %s"
msgstr "Konnte %s nicht öffnen"
-#: sequencer.c:745
+#: sequencer.c:753
#, c-format
msgid "Could not read %s."
msgstr "Konnte %s nicht lesen."
-#: sequencer.c:752
+#: sequencer.c:760
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "Unbenutzbares Instruktionsblatt: %s"
-#: sequencer.c:782
+#: sequencer.c:790
#, c-format
msgid "Invalid key: %s"
msgstr "Ungültiger Schlüssel: %s"
-#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52
+#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Ungültiger Wert für %s: %s"
-#: sequencer.c:795
+#: sequencer.c:803
#, c-format
msgid "Malformed options sheet: %s"
msgstr "Fehlerhaftes Optionsblatt: %s"
-#: sequencer.c:814
+#: sequencer.c:822
msgid "a cherry-pick or revert is already in progress"
msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang"
-#: sequencer.c:815
+#: sequencer.c:823
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:819
+#: sequencer.c:827
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "Konnte \"sequencer\"-Verzeichnis %s nicht erstellen"
-#: sequencer.c:835 sequencer.c:916
-#, c-format
-msgid "Error wrapping up %s."
-msgstr "Fehler beim Einpacken von %s."
-
-#: sequencer.c:854 sequencer.c:986
+#: sequencer.c:862 sequencer.c:998
msgid "no cherry-pick or revert in progress"
msgstr "kein \"cherry-pick\" oder \"revert\" im Gang"
-#: sequencer.c:856
+#: sequencer.c:864
msgid "cannot resolve HEAD"
msgstr "kann HEAD nicht auflösen"
-#: sequencer.c:858
+#: sequencer.c:866 sequencer.c:900
msgid "cannot abort from a branch yet to be born"
msgstr "kann nicht abbrechen: bin auf einem Branch, der noch geboren wird"
-#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
+#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
#, c-format
msgid "cannot open %s"
msgstr "kann '%s' nicht öffnen"
-#: sequencer.c:880
+#: sequencer.c:888
#, c-format
msgid "cannot read %s: %s"
msgstr "Kann %s nicht lesen: %s"
-#: sequencer.c:881
+#: sequencer.c:889
msgid "unexpected end of file"
msgstr "Unerwartetes Dateiende"
-#: sequencer.c:887
+#: sequencer.c:895
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt"
-#: sequencer.c:909
+#: sequencer.c:921
#, c-format
msgid "Could not format %s."
msgstr "Konnte %s nicht formatieren."
-#: sequencer.c:1054
+#: sequencer.c:1066
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
-#: sequencer.c:1057
+#: sequencer.c:1069
#, c-format
msgid "%s: bad revision"
msgstr "%s: ungültiger Commit"
-#: sequencer.c:1091
+#: sequencer.c:1102
msgid "Can't revert as initial commit"
msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
-#: sequencer.c:1092
-msgid "Can't cherry-pick into empty head"
-msgstr "Kann nicht als allerersten Commit einen Cherry-Pick ausführen."
+#: setup.c:160
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s: kein solcher Pfad im Arbeitsverzeichnis.\n"
+"Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n"
+"nicht existieren."
+
+#: setup.c:173
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"mehrdeutiges Argument '%s': unbekannter Commit oder Pfad existiert nicht\n"
+"im Arbeitsverzeichnis\n"
+"Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
+"'git <Befehl> [<Commit>...] -- [<Datei>...]'"
+
+#: setup.c:223
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"mehrdeutiges Argument '%s': sowohl Commit als auch Dateiname\n"
+"Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
+"'git <Befehl> [<Commit>...] -- [<Datei>...]'"
-#: setup.c:248
+#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
#, c-format
msgid "failed to read %s"
msgstr "Fehler beim Lesen von %s"
@@ -1721,16 +2009,52 @@ msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
msgid "unknown repository extensions found:"
msgstr "Unbekannte Repository-Erweiterungen gefunden:"
-#: sha1_file.c:1080
+#: setup.c:762
+#, c-format
+msgid "Not a git repository (or any of the parent directories): %s"
+msgstr "Kein Git-Repository (oder irgendein Elternverzeichnis): %s"
+
+#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+msgid "Cannot come back to cwd"
+msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln"
+
+#: setup.c:845
+msgid "Unable to read current working directory"
+msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen."
+
+#: setup.c:920
+#, c-format
+msgid ""
+"Not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgstr ""
+"Kein Git-Repository (oder irgendein Elternverzeichnis bis zum Einhängepunkt %s)\n"
+"Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)."
+
+#: setup.c:927
+#, c-format
+msgid "Cannot change to '%s/..'"
+msgstr "Kann nicht in Verzeichnis '%s/..' wechseln"
+
+#: setup.c:989
+#, c-format
+msgid ""
+"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"Problem mit Wert für Dateimodus (0%.3o) von core.sharedRepository.\n"
+"Der Besitzer der Dateien muss immer Lese- und Schreibrechte haben."
+
+#: sha1_file.c:1046
msgid "offset before end of packfile (broken .idx?)"
msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
-#: sha1_file.c:2458
+#: sha1_file.c:2434
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "Offset vor Beginn des Pack-Index für %s (beschädigter Index?)"
-#: sha1_file.c:2462
+#: sha1_file.c:2438
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "Offset hinter Ende des Pack-Index für %s (abgeschnittener Index?)"
@@ -1789,7 +2113,7 @@ msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken"
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "Negative Werte für submodule.fetchJobs nicht erlaubt"
-#: submodule-config.c:355
+#: submodule-config.c:358
#, c-format
msgid "invalid value for %s"
msgstr "Ungültiger Wert für %s"
@@ -1848,6 +2172,56 @@ msgstr "konnte temporäre Datei '%s' nicht öffnen"
msgid "could not rename temporary file to %s"
msgstr "konnte temporäre Datei nicht zu %s umbenennen"
+#: transport.c:62
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Würde Upstream-Branch von '%s' zu '%s' von '%s' setzen\n"
+
+#: transport.c:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: ungültige --depth Option '%s'"
+
+#: transport.c:771
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n"
+"Remote-Repository gefunden wurden:\n"
+
+#: transport.c:775
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Bitte versuchen Sie\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"oder wechseln Sie in das Verzeichnis und benutzen Sie\n"
+"\n"
+"\tgit push\n"
+"\n"
+"zum Versenden zu einem Remote-Repository.\n"
+"\n"
+
+#: transport.c:783
+msgid "Aborting."
+msgstr "Abbruch."
+
#: transport-helper.c:1041
#, c-format
msgid "Could not read ref %s"
@@ -1857,11 +2231,12 @@ msgstr "Konnte Referenz %s nicht lesen."
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
-"%%sPlease commit your changes or stash them before you can switch branches."
+"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
"Ihre lokalen Änderungen in den folgenden Dateien würden beim Auschecken\n"
"überschrieben werden:\n"
-"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches wechseln."
+"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches\n"
+"wechseln."
#: unpack-trees.c:66
#, c-format
@@ -1877,7 +2252,7 @@ msgstr ""
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you can merge."
+"%%sPlease commit your changes or stash them before you merge."
msgstr ""
"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
"überschrieben werden:\n"
@@ -1897,7 +2272,7 @@ msgstr ""
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you can %s."
+"%%sPlease commit your changes or stash them before you %s."
msgstr ""
"Ihre lokalen Änderungen in den folgenden Dateien würden durch %s\n"
"überschrieben werden:\n"
@@ -1926,7 +2301,7 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you can switch branches."
+"%%sPlease move or remove them before you switch branches."
msgstr ""
"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
"den Checkout entfernt werden:\n"
@@ -1938,7 +2313,8 @@ msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch "
+"den\n"
"Checkout entfernt werden:\n"
"%%s"
@@ -1946,10 +2322,10 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you can merge."
+"%%sPlease move or remove them before you merge."
msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
-"Merge entfernt werden:\n"
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
+"den Merge entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen."
#: unpack-trees.c:92
@@ -1958,7 +2334,8 @@ msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch "
+"den\n"
"Merge entfernt werden:\n"
"%%s"
@@ -1966,10 +2343,10 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you can %s."
+"%%sPlease move or remove them before you %s."
msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
-"%s entfernt werden:\n"
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
+"den %s entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
#: unpack-trees.c:97
@@ -1978,8 +2355,8 @@ msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
-"%s entfernt werden:\n"
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
+"den %s entfernt werden:\n"
"%%s"
#: unpack-trees.c:102
@@ -1987,10 +2364,10 @@ msgstr ""
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
-"%%sPlease move or remove them before you can switch branches."
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
-"Checkout überschrieben werden:\n"
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
+"den Checkout überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
#: unpack-trees.c:104
@@ -2000,7 +2377,8 @@ msgid ""
"checkout:\n"
"%%s"
msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch "
+"den\n"
"Checkout überschrieben werden:\n"
"%%s"
@@ -2008,10 +2386,10 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you can merge."
+"%%sPlease move or remove them before you merge."
msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
-"Merge überschrieben werden:\n"
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
+"den Merge überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen."
#: unpack-trees.c:109
@@ -2020,18 +2398,18 @@ msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
-"Merge überschrieben werden:\n"
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
+"den Merge überschrieben werden:\n"
"%%s"
#: unpack-trees.c:112
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you can %s."
+"%%sPlease move or remove them before you %s."
msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
-"%s überschrieben werden:\n"
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
+"den %s überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
#: unpack-trees.c:114
@@ -2040,7 +2418,8 @@ msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
-"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch "
+"den\n"
"%s überschrieben werden:\n"
"%%s"
@@ -2055,7 +2434,8 @@ msgid ""
"Cannot update sparse checkout: the following entries are not up-to-date:\n"
"%s"
msgstr ""
-"Kann partiellen Checkout nicht aktualisieren: die folgenden Einträge sind nicht\n"
+"Kann partiellen Checkout nicht aktualisieren: die folgenden Einträge sind "
+"nicht\n"
"aktuell:\n"
"%s"
@@ -2119,43 +2499,43 @@ msgstr "ungültige Portnummer"
msgid "invalid '..' path segment"
msgstr "ungültiges '..' Pfadsegment"
-#: wrapper.c:222 wrapper.c:381
+#: worktree.c:282
+#, c-format
+msgid "failed to read '%s'"
+msgstr "Fehler beim Lesen von '%s'"
+
+#: wrapper.c:222 wrapper.c:392
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "Konnte '%s' nicht zum Lesen und Schreiben öffnen."
-#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
#, c-format
msgid "could not open '%s' for writing"
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
-#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
+#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
#: builtin/pull.c:407
#, c-format
msgid "could not open '%s' for reading"
msgstr "Konnte '%s' nicht zum Lesen öffnen."
-#: wrapper.c:594 wrapper.c:615
+#: wrapper.c:605 wrapper.c:626
#, c-format
msgid "unable to access '%s'"
msgstr "konnte nicht auf '%s' zugreifen"
-#: wrapper.c:623
+#: wrapper.c:634
msgid "unable to get current working directory"
msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen."
-#: wrapper.c:650
-#, c-format
-msgid "could not open %s for writing"
-msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-
-#: wrapper.c:661 builtin/am.c:410
+#: wrapper.c:658
#, c-format
msgid "could not write to %s"
msgstr "Konnte nicht nach '%s' schreiben."
-#: wrapper.c:667
+#: wrapper.c:660
#, c-format
msgid "could not close %s"
msgstr "Konnte '%s' nicht schließen."
@@ -2193,11 +2573,11 @@ msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
-#: wt-status.c:198 wt-status.c:881
+#: wt-status.c:198 wt-status.c:882
msgid "Changes to be committed:"
msgstr "zum Commit vorgemerkte Änderungen:"
-#: wt-status.c:216 wt-status.c:890
+#: wt-status.c:216 wt-status.c:891
msgid "Changes not staged for commit:"
msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
@@ -2261,11 +2641,6 @@ msgstr "von beiden hinzugefügt:"
msgid "both modified:"
msgstr "von beiden geändert:"
-#: wt-status.c:266
-#, c-format
-msgid "bug: unhandled unmerged status %x"
-msgstr "Bug: unbehandelter Unmerged-Status %x"
-
#: wt-status.c:274
msgid "new file:"
msgstr "neue Datei:"
@@ -2310,20 +2685,15 @@ msgstr "geänderter Inhalt, "
msgid "untracked content, "
msgstr "unversionierter Inhalt, "
-#: wt-status.c:391
-#, c-format
-msgid "bug: unhandled diff status %c"
-msgstr "Fehler: unbehandelter Differenz-Status %c"
-
-#: wt-status.c:755
+#: wt-status.c:756
msgid "Submodules changed but not updated:"
msgstr "Submodule geändert, aber nicht aktualisiert:"
-#: wt-status.c:757
+#: wt-status.c:758
msgid "Submodule changes to be committed:"
msgstr "Änderungen in Submodul zum Committen:"
-#: wt-status.c:838
+#: wt-status.c:839
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -2331,106 +2701,110 @@ msgstr ""
"Ändern Sie nicht die obige Zeile.\n"
"Alles unterhalb von ihr wird entfernt."
-#: wt-status.c:949
+#: wt-status.c:950
msgid "You have unmerged paths."
msgstr "Sie haben nicht zusammengeführte Pfade."
-#: wt-status.c:952
+#: wt-status.c:953
msgid " (fix conflicts and run \"git commit\")"
msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
-#: wt-status.c:956
+#: wt-status.c:955
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)"
+
+#: wt-status.c:960
msgid "All conflicts fixed but you are still merging."
msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge."
-#: wt-status.c:959
+#: wt-status.c:963
msgid " (use \"git commit\" to conclude merge)"
msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)"
-#: wt-status.c:969
+#: wt-status.c:973
msgid "You are in the middle of an am session."
msgstr "Eine \"am\"-Sitzung ist im Gange."
-#: wt-status.c:972
+#: wt-status.c:976
msgid "The current patch is empty."
msgstr "Der aktuelle Patch ist leer."
-#: wt-status.c:976
+#: wt-status.c:980
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git am --continue\" aus)"
-#: wt-status.c:978
+#: wt-status.c:982
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)"
-#: wt-status.c:980
+#: wt-status.c:984
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
" (benutzen Sie \"git am --abort\", um den ursprünglichen Branch "
"wiederherzustellen)"
-#: wt-status.c:1105
+#: wt-status.c:1109
msgid "No commands done."
msgstr "Keine Befehle ausgeführt."
-#: wt-status.c:1108
+#: wt-status.c:1112
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Zuletzt ausgeführter Befehl (%d Befehl ausgeführt):"
msgstr[1] "Zuletzt ausgeführte Befehle (%d Befehle ausgeführt):"
-#: wt-status.c:1119
+#: wt-status.c:1123
#, c-format
msgid " (see more in file %s)"
msgstr " (mehr Informationen in Datei %s)"
-#: wt-status.c:1124
+#: wt-status.c:1128
msgid "No commands remaining."
msgstr "Keine Befehle verbleibend."
-#: wt-status.c:1127
+#: wt-status.c:1131
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Nächster auszuführender Befehl (%d Befehle verbleibend):"
msgstr[1] "Nächste auszuführende Befehle (%d Befehle verbleibend):"
-#: wt-status.c:1135
+#: wt-status.c:1139
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)"
-#: wt-status.c:1148
+#: wt-status.c:1152
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'."
-#: wt-status.c:1153
+#: wt-status.c:1157
msgid "You are currently rebasing."
msgstr "Sie sind gerade beim Rebase."
-#: wt-status.c:1167
+#: wt-status.c:1171
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" "
"aus)"
-#: wt-status.c:1169
+#: wt-status.c:1173
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)"
-#: wt-status.c:1171
+#: wt-status.c:1175
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (benutzen Sie \"git rebase --abort\", um den ursprünglichen Branch "
"auszuchecken)"
-#: wt-status.c:1177
+#: wt-status.c:1181
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)"
-#: wt-status.c:1181
+#: wt-status.c:1185
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -2438,134 +2812,134 @@ msgstr ""
"Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf "
"'%s' im Gange ist."
-#: wt-status.c:1186
+#: wt-status.c:1190
msgid "You are currently splitting a commit during a rebase."
msgstr "Sie teilen gerade einen Commit während eines Rebase auf."
-#: wt-status.c:1189
+#: wt-status.c:1193
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Sobald Ihr Arbeitsverzeichnis unverändert ist, führen Sie \"git rebase --"
"continue\" aus)"
-#: wt-status.c:1193
+#: wt-status.c:1197
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Sie editieren gerade einen Commit während eines Rebase von Branch '%s' auf "
"'%s'."
-#: wt-status.c:1198
+#: wt-status.c:1202
msgid "You are currently editing a commit during a rebase."
msgstr "Sie editieren gerade einen Commit während eines Rebase."
-#: wt-status.c:1201
+#: wt-status.c:1205
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (benutzen Sie \"git commit --amend\", um den aktuellen Commit "
"nachzubessern)"
-#: wt-status.c:1203
+#: wt-status.c:1207
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen "
"abgeschlossen sind)"
-#: wt-status.c:1213
+#: wt-status.c:1217
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus."
-#: wt-status.c:1218
+#: wt-status.c:1222
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --continue"
"\" aus)"
-#: wt-status.c:1221
+#: wt-status.c:1225
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)"
-#: wt-status.c:1223
+#: wt-status.c:1227
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (benutzen Sie \"git cherry-pick --abort\", um die Cherry-Pick-Operation "
"abzubrechen)"
-#: wt-status.c:1232
+#: wt-status.c:1236
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Sie sind gerade an einem Revert von Commit '%s'."
-#: wt-status.c:1237
+#: wt-status.c:1241
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" "
"aus)"
-#: wt-status.c:1240
+#: wt-status.c:1244
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)"
-#: wt-status.c:1242
+#: wt-status.c:1246
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)"
-#: wt-status.c:1253
+#: wt-status.c:1257
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Sie sind gerade bei einer binären Suche, gestartet von Branch '%s'."
-#: wt-status.c:1257
+#: wt-status.c:1261
msgid "You are currently bisecting."
msgstr "Sie sind gerade bei einer binären Suche."
-#: wt-status.c:1260
+#: wt-status.c:1264
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch "
"zurückzukehren)"
-#: wt-status.c:1460
+#: wt-status.c:1464
msgid "On branch "
msgstr "Auf Branch "
-#: wt-status.c:1466
+#: wt-status.c:1470
msgid "interactive rebase in progress; onto "
msgstr "interaktives Rebase im Gange; auf "
-#: wt-status.c:1468
+#: wt-status.c:1472
msgid "rebase in progress; onto "
msgstr "Rebase im Gange; auf "
-#: wt-status.c:1473
+#: wt-status.c:1477
msgid "HEAD detached at "
msgstr "HEAD losgelöst bei "
-#: wt-status.c:1475
+#: wt-status.c:1479
msgid "HEAD detached from "
msgstr "HEAD losgelöst von "
-#: wt-status.c:1478
+#: wt-status.c:1482
msgid "Not currently on any branch."
msgstr "Im Moment auf keinem Branch."
-#: wt-status.c:1496
+#: wt-status.c:1500
msgid "Initial commit"
msgstr "Initialer Commit"
-#: wt-status.c:1510
+#: wt-status.c:1514
msgid "Untracked files"
msgstr "Unversionierte Dateien"
-#: wt-status.c:1512
+#: wt-status.c:1516
msgid "Ignored files"
msgstr "Ignorierte Dateien"
-#: wt-status.c:1516
+#: wt-status.c:1520
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2576,32 +2950,32 @@ msgstr ""
"'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n"
"neue Dateien selbstständig hinzuzufügen (siehe 'git help status')."
-#: wt-status.c:1522
+#: wt-status.c:1526
#, c-format
msgid "Untracked files not listed%s"
msgstr "Unversionierte Dateien nicht aufgelistet%s"
-#: wt-status.c:1524
+#: wt-status.c:1528
msgid " (use -u option to show untracked files)"
msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)"
-#: wt-status.c:1530
+#: wt-status.c:1534
msgid "No changes"
msgstr "Keine Änderungen"
-#: wt-status.c:1535
+#: wt-status.c:1539
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder "
"\"git commit -a\")\n"
-#: wt-status.c:1538
+#: wt-status.c:1542
#, c-format
msgid "no changes added to commit\n"
msgstr "keine Änderungen zum Commit vorgemerkt\n"
-#: wt-status.c:1541
+#: wt-status.c:1545
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -2610,52 +2984,52 @@ msgstr ""
"nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien (benutzen "
"Sie \"git add\" zum Versionieren)\n"
-#: wt-status.c:1544
+#: wt-status.c:1548
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
-#: wt-status.c:1547
+#: wt-status.c:1551
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"nichts zu committen (Erstellen/Kopieren Sie Dateien und benutzen Sie \"git "
"add\" zum Versionieren)\n"
-#: wt-status.c:1550 wt-status.c:1555
+#: wt-status.c:1554 wt-status.c:1559
#, c-format
msgid "nothing to commit\n"
msgstr "nichts zu committen\n"
-#: wt-status.c:1553
+#: wt-status.c:1557
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien "
"anzuzeigen)\n"
-#: wt-status.c:1557
+#: wt-status.c:1561
#, c-format
-msgid "nothing to commit, working directory clean\n"
+msgid "nothing to commit, working tree clean\n"
msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
-#: wt-status.c:1664
+#: wt-status.c:1668
msgid "Initial commit on "
msgstr "Initialer Commit auf "
-#: wt-status.c:1668
+#: wt-status.c:1672
msgid "HEAD (no branch)"
msgstr "HEAD (kein Branch)"
-#: wt-status.c:1697
+#: wt-status.c:1701
msgid "gone"
msgstr "entfernt"
-#: wt-status.c:1699 wt-status.c:1707
+#: wt-status.c:1703 wt-status.c:1711
msgid "behind "
msgstr "hinterher "
-#: wt-status.c:1702 wt-status.c:1705
+#: wt-status.c:1706 wt-status.c:1709
msgid "ahead "
msgstr "voraus "
@@ -2673,267 +3047,281 @@ msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
msgid "unexpected diff status %c"
msgstr "unerwarteter Differenz-Status %c"
-#: builtin/add.c:70 builtin/commit.c:280
+#: builtin/add.c:71 builtin/commit.c:281
msgid "updating files failed"
msgstr "Aktualisierung der Dateien fehlgeschlagen"
-#: builtin/add.c:80
+#: builtin/add.c:81
#, c-format
msgid "remove '%s'\n"
msgstr "lösche '%s'\n"
-#: builtin/add.c:134
+#: builtin/add.c:136
msgid "Unstaged changes after refreshing the index:"
msgstr ""
"Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
-#: builtin/add.c:194 builtin/rev-parse.c:811
+#: builtin/add.c:196 builtin/rev-parse.c:811
msgid "Could not read the index"
msgstr "Konnte den Index nicht lesen"
-#: builtin/add.c:205
+#: builtin/add.c:207
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: builtin/add.c:209
+#: builtin/add.c:211
msgid "Could not write patch"
msgstr "Konnte Patch nicht schreiben"
-#: builtin/add.c:212
+#: builtin/add.c:214
msgid "editing patch failed"
msgstr "Bearbeitung des Patches fehlgeschlagen"
-#: builtin/add.c:215
+#: builtin/add.c:217
#, c-format
msgid "Could not stat '%s'"
msgstr "Konnte Verzeichnis '%s' nicht lesen"
-#: builtin/add.c:217
+#: builtin/add.c:219
msgid "Empty patch. Aborted."
msgstr "Leerer Patch. Abgebrochen."
-#: builtin/add.c:222
+#: builtin/add.c:224
#, c-format
msgid "Could not apply '%s'"
msgstr "Konnte '%s' nicht anwenden."
-#: builtin/add.c:232
+#: builtin/add.c:234
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien "
"ignoriert:\n"
-#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
-#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
+#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "Probelauf"
-#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
-#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
-#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
+#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
+#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
msgid "be verbose"
msgstr "erweiterte Ausgaben"
-#: builtin/add.c:252
+#: builtin/add.c:256
msgid "interactive picking"
msgstr "interaktives Auswählen"
-#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
+#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "Blöcke interaktiv auswählen"
-#: builtin/add.c:254
+#: builtin/add.c:258
msgid "edit current diff and apply"
msgstr "aktuelle Unterschiede editieren und anwenden"
-#: builtin/add.c:255
+#: builtin/add.c:259
msgid "allow adding otherwise ignored files"
msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben"
-#: builtin/add.c:256
+#: builtin/add.c:260
msgid "update tracked files"
msgstr "versionierte Dateien aktualisieren"
-#: builtin/add.c:257
+#: builtin/add.c:261
msgid "record only the fact that the path will be added later"
msgstr "nur speichern, dass der Pfad später hinzugefügt werden soll"
-#: builtin/add.c:258
+#: builtin/add.c:262
msgid "add changes from all tracked and untracked files"
msgstr ""
"Änderungen von allen versionierten und unversionierten Dateien hinzufügen"
-#: builtin/add.c:261
+#: builtin/add.c:265
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "gelöschte Pfade im Arbeitsverzeichnis ignorieren (genau wie --no-all)"
-#: builtin/add.c:263
+#: builtin/add.c:267
msgid "don't add, only refresh the index"
msgstr "nichts hinzufügen, nur den Index aktualisieren"
-#: builtin/add.c:264
+#: builtin/add.c:268
msgid "just skip files which cannot be added because of errors"
msgstr ""
"Dateien überspringen, die aufgrund von Fehlern nicht hinzugefügt werden "
"konnten"
-#: builtin/add.c:265
+#: builtin/add.c:269
msgid "check if - even missing - files are ignored in dry run"
msgstr "prüfen ob - auch fehlende - Dateien im Probelauf ignoriert werden"
-#: builtin/add.c:287
+#: builtin/add.c:270 builtin/update-index.c:958
+msgid "(+/-)x"
+msgstr "(+/-)x"
+
+#: builtin/add.c:270 builtin/update-index.c:959
+msgid "override the executable bit of the listed files"
+msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben"
+
+#: builtin/add.c:292
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Verwenden Sie -f wenn Sie diese wirklich hinzufügen möchten.\n"
-#: builtin/add.c:294
+#: builtin/add.c:300
msgid "adding files failed"
msgstr "Hinzufügen von Dateien fehlgeschlagen"
-#: builtin/add.c:330
+#: builtin/add.c:336
msgid "-A and -u are mutually incompatible"
msgstr "Die Optionen -A und -u sind zueinander inkompatibel."
-#: builtin/add.c:337
+#: builtin/add.c:343
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
"Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden."
#: builtin/add.c:352
#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "--chmod Parameter '%s' muss entweder -x oder +x sein"
+
+#: builtin/add.c:367
+#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
-#: builtin/add.c:353
+#: builtin/add.c:368
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Meinten Sie vielleicht 'git add .'?\n"
-#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
+#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
#: builtin/submodule--helper.c:240
msgid "index file corrupt"
msgstr "Index-Datei beschädigt"
-#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
+#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
msgid "Unable to write new index file"
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
+#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
#, c-format
msgid "could not read '%s'"
msgstr "Konnte '%s' nicht lesen"
-#: builtin/am.c:430
+#: builtin/am.c:426
msgid "could not parse author script"
msgstr "konnte Autor-Skript nicht parsen"
-#: builtin/am.c:507
+#: builtin/am.c:503
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' wurde durch den applypatch-msg Hook entfernt"
-#: builtin/am.c:548 builtin/notes.c:300
+#: builtin/am.c:544 builtin/notes.c:301
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Fehlerhafte Eingabezeile: '%s'."
-#: builtin/am.c:585 builtin/notes.c:315
+#: builtin/am.c:581 builtin/notes.c:316
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
-#: builtin/am.c:611
+#: builtin/am.c:607
msgid "fseek failed"
msgstr "\"fseek\" fehlgeschlagen"
-#: builtin/am.c:788
+#: builtin/am.c:787
#, c-format
msgid "could not parse patch '%s'"
msgstr "konnte Patch '%s' nicht parsen"
-#: builtin/am.c:853
+#: builtin/am.c:852
msgid "Only one StGIT patch series can be applied at once"
msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden."
-#: builtin/am.c:900
+#: builtin/am.c:899
msgid "invalid timestamp"
msgstr "ungültiger Zeitstempel"
-#: builtin/am.c:903 builtin/am.c:911
+#: builtin/am.c:902 builtin/am.c:910
msgid "invalid Date line"
msgstr "Ungültige \"Date\"-Zeile"
-#: builtin/am.c:908
+#: builtin/am.c:907
msgid "invalid timezone offset"
msgstr "Ungültiger Offset in der Zeitzone"
-#: builtin/am.c:995
+#: builtin/am.c:996
msgid "Patch format detection failed."
msgstr "Patch-Formaterkennung fehlgeschlagen."
-#: builtin/am.c:1000 builtin/clone.c:380
+#: builtin/am.c:1001 builtin/clone.c:380
#, c-format
msgid "failed to create directory '%s'"
msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
-#: builtin/am.c:1004
+#: builtin/am.c:1005
msgid "Failed to split patches."
msgstr "Fehler beim Aufteilen der Patches."
-#: builtin/am.c:1136 builtin/commit.c:365
+#: builtin/am.c:1137 builtin/commit.c:366
msgid "unable to write index file"
msgstr "Konnte Index-Datei nicht schreiben."
-#: builtin/am.c:1187
+#: builtin/am.c:1188
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
"Wenn Sie das Problem aufgelöst haben, führen Sie \"%s --continue\" aus."
-#: builtin/am.c:1188
+#: builtin/am.c:1189
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
"Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --skip"
"\" aus."
-#: builtin/am.c:1189
+#: builtin/am.c:1190
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Um den ursprünglichen Branch wiederherzustellen und die Anwendung der "
"Patches abzubrechen, führen Sie \"%s --abort\" aus."
-#: builtin/am.c:1327
+#: builtin/am.c:1328
msgid "Patch is empty. Was it split wrong?"
msgstr "Patch ist leer. War dessen Aufteilung falsch?"
-#: builtin/am.c:1401 builtin/log.c:1516
+#: builtin/am.c:1402 builtin/log.c:1543
#, c-format
msgid "invalid ident line: %s"
msgstr "Ungültige Identifikationszeile: %s"
-#: builtin/am.c:1428
+#: builtin/am.c:1429
#, c-format
msgid "unable to parse commit %s"
msgstr "Konnte Commit '%s' nicht parsen."
-#: builtin/am.c:1630
+#: builtin/am.c:1602
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge "
"zurückzufallen."
-#: builtin/am.c:1632
+#: builtin/am.c:1604
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
"nachzustellen ..."
-#: builtin/am.c:1651
+#: builtin/am.c:1623
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2941,39 +3329,39 @@ msgstr ""
"Haben Sie den Patch per Hand editiert?\n"
"Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
-#: builtin/am.c:1657
+#: builtin/am.c:1629
msgid "Falling back to patching base and 3-way merge..."
msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..."
-#: builtin/am.c:1672
+#: builtin/am.c:1654
msgid "Failed to merge in the changes."
msgstr "Merge der Änderungen fehlgeschlagen."
-#: builtin/am.c:1696 builtin/merge.c:636
+#: builtin/am.c:1679 builtin/merge.c:628
msgid "git write-tree failed to write a tree"
msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
-#: builtin/am.c:1703
+#: builtin/am.c:1686
msgid "applying to an empty history"
msgstr "auf leere Historie anwenden"
-#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
-#: builtin/merge.c:866
+#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
+#: builtin/merge.c:823
msgid "failed to write commit object"
msgstr "Fehler beim Schreiben des Commit-Objektes."
-#: builtin/am.c:1748 builtin/am.c:1752
+#: builtin/am.c:1731 builtin/am.c:1735
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "Kann nicht fortsetzen: %s existiert nicht"
-#: builtin/am.c:1768
+#: builtin/am.c:1751
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem "
"Terminal verbunden ist."
-#: builtin/am.c:1773
+#: builtin/am.c:1756
msgid "Commit Body is:"
msgstr "Commit-Beschreibung ist:"
@@ -2981,35 +3369,35 @@ msgstr "Commit-Beschreibung ist:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1783
+#: builtin/am.c:1766
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-#: builtin/am.c:1833
+#: builtin/am.c:1816
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
-#: builtin/am.c:1868 builtin/am.c:1940
+#: builtin/am.c:1853 builtin/am.c:1925
#, c-format
msgid "Applying: %.*s"
msgstr "Wende an: %.*s"
-#: builtin/am.c:1884
+#: builtin/am.c:1869
msgid "No changes -- Patch already applied."
msgstr "Keine Änderungen -- Patches bereits angewendet."
-#: builtin/am.c:1892
+#: builtin/am.c:1877
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
-#: builtin/am.c:1898
+#: builtin/am.c:1883
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "Die Kopie des fehlgeschlagenen Patches befindet sich in: %s"
-#: builtin/am.c:1943
+#: builtin/am.c:1928
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -3020,7 +3408,7 @@ msgstr ""
"diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
"auslassen."
-#: builtin/am.c:1950
+#: builtin/am.c:1935
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -3028,17 +3416,17 @@ msgstr ""
"Sie haben immer noch nicht zusammengeführte Pfade im Index.\n"
"Haben Sie vergessen 'git add' zu benutzen?"
-#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
+#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Konnte Objekt '%s' nicht parsen."
-#: builtin/am.c:2110
+#: builtin/am.c:2095
msgid "failed to clean index"
msgstr "Fehler beim Bereinigen des Index"
-#: builtin/am.c:2144
+#: builtin/am.c:2129
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -3046,155 +3434,155 @@ msgstr ""
"Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
"Keine Zurücksetzung zu ORIG_HEAD."
-#: builtin/am.c:2205
+#: builtin/am.c:2192
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Ungültiger Wert für --patch-format: %s"
-#: builtin/am.c:2238
+#: builtin/am.c:2225
msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr "git am [<Optionen>] [(<mbox>|<E-Mail-Verzeichnis>)...]"
-#: builtin/am.c:2239
+#: builtin/am.c:2226
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
-#: builtin/am.c:2245
+#: builtin/am.c:2232
msgid "run interactively"
msgstr "interaktiv ausführen"
-#: builtin/am.c:2247
+#: builtin/am.c:2234
msgid "historical option -- no-op"
msgstr "historische Option -- kein Effekt"
-#: builtin/am.c:2249
+#: builtin/am.c:2236
msgid "allow fall back on 3way merging if needed"
msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
-#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
-#: builtin/repack.c:171
+#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
+#: builtin/repack.c:172
msgid "be quiet"
msgstr "weniger Ausgaben"
-#: builtin/am.c:2252
+#: builtin/am.c:2239
msgid "add a Signed-off-by line to the commit message"
msgstr "der Commit-Beschreibung eine Signed-off-by Zeile hinzufügen"
-#: builtin/am.c:2255
+#: builtin/am.c:2242
msgid "recode into utf8 (default)"
msgstr "nach UTF-8 umkodieren (Standard)"
-#: builtin/am.c:2257
+#: builtin/am.c:2244
msgid "pass -k flag to git-mailinfo"
msgstr "-k an git-mailinfo übergeben"
-#: builtin/am.c:2259
+#: builtin/am.c:2246
msgid "pass -b flag to git-mailinfo"
msgstr "-b an git-mailinfo übergeben"
-#: builtin/am.c:2261
+#: builtin/am.c:2248
msgid "pass -m flag to git-mailinfo"
msgstr "-m an git-mailinfo übergeben"
-#: builtin/am.c:2263
+#: builtin/am.c:2250
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "--keep-cr an git-mailsplit für mbox-Format übergeben"
-#: builtin/am.c:2266
+#: builtin/am.c:2253
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "kein --keep-cr an git-mailsplit übergeben, unabhängig von am.keepcr"
-#: builtin/am.c:2269
+#: builtin/am.c:2256
msgid "strip everything before a scissors line"
msgstr "alles vor einer Scheren-Zeile entfernen"
-#: builtin/am.c:2270 builtin/apply.c:4546
+#: builtin/am.c:2257 builtin/apply.c:4837
msgid "action"
msgstr "Aktion"
-#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
-#: builtin/am.c:2298
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
+#: builtin/am.c:2285
msgid "pass it through git-apply"
msgstr "an git-apply übergeben"
-#: builtin/am.c:2279 builtin/apply.c:4570
+#: builtin/am.c:2266 builtin/apply.c:4861
msgid "root"
msgstr "Wurzelverzeichnis"
-#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
-#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
+#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
-#: builtin/submodule--helper.c:770
+#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:826
msgid "path"
msgstr "Pfad"
-#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193
-#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 builtin/pull.c:193
+#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:645
#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "Anzahl"
-#: builtin/am.c:2291 builtin/apply.c:4514
+#: builtin/am.c:2278 builtin/apply.c:4805
msgid "num"
msgstr "Anzahl"
-#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "Format"
-#: builtin/am.c:2295
+#: builtin/am.c:2282
msgid "format the patch(es) are in"
msgstr "Patch-Format"
-#: builtin/am.c:2301
+#: builtin/am.c:2288
msgid "override error message when patch failure occurs"
msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
-#: builtin/am.c:2303
+#: builtin/am.c:2290
msgid "continue applying patches after resolving a conflict"
msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
-#: builtin/am.c:2306
+#: builtin/am.c:2293
msgid "synonyms for --continue"
msgstr "Synonyme für --continue"
-#: builtin/am.c:2309
+#: builtin/am.c:2296
msgid "skip the current patch"
msgstr "den aktuellen Patch auslassen"
-#: builtin/am.c:2312
+#: builtin/am.c:2299
msgid "restore the original branch and abort the patching operation."
msgstr ""
"ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
-#: builtin/am.c:2316
+#: builtin/am.c:2303
msgid "lie about committer date"
msgstr "Autor-Datum als Commit-Datum verwenden"
-#: builtin/am.c:2318
+#: builtin/am.c:2305
msgid "use current timestamp for author date"
msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
-#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "GPG-Schlüsselkennung"
-#: builtin/am.c:2321
+#: builtin/am.c:2308
msgid "GPG-sign commits"
msgstr "Commits mit GPG signieren"
-#: builtin/am.c:2324
+#: builtin/am.c:2311
msgid "(internal use for git-rebase)"
msgstr "(intern für git-rebase verwendet)"
-#: builtin/am.c:2339
+#: builtin/am.c:2326
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -3202,16 +3590,16 @@ msgstr ""
"Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
"entfernt. Bitte verwenden Sie diese nicht mehr."
-#: builtin/am.c:2346
+#: builtin/am.c:2333
msgid "failed to read the index"
msgstr "Fehler beim Lesen des Index"
-#: builtin/am.c:2361
+#: builtin/am.c:2348
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "Vorheriges Rebase-Verzeichnis %s existiert noch, aber mbox gegeben."
-#: builtin/am.c:2385
+#: builtin/am.c:2372
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -3220,74 +3608,74 @@ msgstr ""
"Stray %s Verzeichnis gefunden.\n"
"Benutzen Sie \"git am --abort\", um es zu entfernen."
-#: builtin/am.c:2391
+#: builtin/am.c:2378
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt."
-#: builtin/apply.c:59
+#: builtin/apply.c:122
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<Optionen>] [<Patch>...]"
-#: builtin/apply.c:111
+#: builtin/apply.c:153
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "nicht erkannte Whitespace-Option: '%s'"
-#: builtin/apply.c:126
+#: builtin/apply.c:169
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'"
-#: builtin/apply.c:818
+#: builtin/apply.c:854
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten"
-#: builtin/apply.c:827
+#: builtin/apply.c:863
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s"
-#: builtin/apply.c:908
+#: builtin/apply.c:947
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden."
-#: builtin/apply.c:937
+#: builtin/apply.c:984
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile "
"%d"
-#: builtin/apply.c:942
+#: builtin/apply.c:989
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d"
-#: builtin/apply.c:943
+#: builtin/apply.c:990
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d"
-#: builtin/apply.c:949
+#: builtin/apply.c:995
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d"
-#: builtin/apply.c:1406
+#: builtin/apply.c:1489
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: unerwartete Zeile: %.*s"
-#: builtin/apply.c:1463
+#: builtin/apply.c:1550
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s"
-#: builtin/apply.c:1480
+#: builtin/apply.c:1567
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -3302,65 +3690,65 @@ msgstr[1] ""
"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn "
"%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)"
-#: builtin/apply.c:1646
+#: builtin/apply.c:1743
msgid "new file depends on old contents"
msgstr "neue Datei hängt von alten Inhalten ab"
-#: builtin/apply.c:1648
+#: builtin/apply.c:1745
msgid "deleted file still has contents"
msgstr "entfernte Datei hat noch Inhalte"
-#: builtin/apply.c:1674
+#: builtin/apply.c:1774
#, c-format
msgid "corrupt patch at line %d"
msgstr "fehlerhafter Patch bei Zeile %d"
-#: builtin/apply.c:1710
+#: builtin/apply.c:1810
#, c-format
msgid "new file %s depends on old contents"
msgstr "neue Datei %s hängt von alten Inhalten ab"
-#: builtin/apply.c:1712
+#: builtin/apply.c:1812
#, c-format
msgid "deleted file %s still has contents"
msgstr "entfernte Datei %s hat noch Inhalte"
-#: builtin/apply.c:1715
+#: builtin/apply.c:1815
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt."
-#: builtin/apply.c:1861
+#: builtin/apply.c:1962
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s"
-#: builtin/apply.c:1895
+#: builtin/apply.c:1999
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "nicht erkannter Binär-Patch bei Zeile %d"
-#: builtin/apply.c:2048
+#: builtin/apply.c:2154
#, c-format
msgid "patch with only garbage at line %d"
msgstr "Patch mit nutzlosen Informationen bei Zeile %d"
-#: builtin/apply.c:2138
+#: builtin/apply.c:2244
#, c-format
msgid "unable to read symlink %s"
msgstr "konnte symbolische Verknüpfung %s nicht lesen"
-#: builtin/apply.c:2142
+#: builtin/apply.c:2248
#, c-format
msgid "unable to open or read %s"
msgstr "konnte %s nicht öffnen oder lesen"
-#: builtin/apply.c:2775
+#: builtin/apply.c:2901
#, c-format
msgid "invalid start of line: '%c'"
msgstr "Ungültiger Zeilenanfang: '%c'"
-#: builtin/apply.c:2894
+#: builtin/apply.c:3020
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -3368,12 +3756,12 @@ msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)"
msgstr[1] ""
"Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)"
-#: builtin/apply.c:2906
+#: builtin/apply.c:3032
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Kontext reduziert zu (%ld/%ld), um Patch-Bereich bei %d anzuwenden"
-#: builtin/apply.c:2912
+#: builtin/apply.c:3038
#, c-format
msgid ""
"while searching for:\n"
@@ -3382,353 +3770,348 @@ msgstr ""
"bei der Suche nach:\n"
"%.*s"
-#: builtin/apply.c:2932
+#: builtin/apply.c:3060
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "keine Daten in Binär-Patch für '%s'"
-#: builtin/apply.c:3033
+#: builtin/apply.c:3163
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "Konnte Binär-Patch nicht auf '%s' anwenden"
-#: builtin/apply.c:3039
+#: builtin/apply.c:3169
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"Binär-Patch für '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)"
-#: builtin/apply.c:3060
+#: builtin/apply.c:3190
#, c-format
msgid "patch failed: %s:%ld"
msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
-#: builtin/apply.c:3184
+#: builtin/apply.c:3314
#, c-format
msgid "cannot checkout %s"
msgstr "kann %s nicht auschecken"
-#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
-#, c-format
-msgid "read of %s failed"
-msgstr "Konnte %s nicht lesen"
-
-#: builtin/apply.c:3237
+#: builtin/apply.c:3370
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "'%s' ist hinter einer symbolischen Verknüpfung"
-#: builtin/apply.c:3265 builtin/apply.c:3487
+#: builtin/apply.c:3399 builtin/apply.c:3630
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "Pfad %s wurde umbenannt/gelöscht"
-#: builtin/apply.c:3346 builtin/apply.c:3501
+#: builtin/apply.c:3482 builtin/apply.c:3644
#, c-format
msgid "%s: does not exist in index"
msgstr "%s ist nicht im Index"
-#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
+#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3355 builtin/apply.c:3509
+#: builtin/apply.c:3491 builtin/apply.c:3652
#, c-format
msgid "%s: does not match index"
msgstr "%s entspricht nicht der Version im Index"
-#: builtin/apply.c:3457
+#: builtin/apply.c:3597
msgid "removal patch leaves file contents"
msgstr "Lösch-Patch hinterlässt Dateiinhalte"
-#: builtin/apply.c:3526
+#: builtin/apply.c:3669
#, c-format
msgid "%s: wrong type"
msgstr "%s: falscher Typ"
-#: builtin/apply.c:3528
+#: builtin/apply.c:3671
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s ist vom Typ %o, erwartete %o"
-#: builtin/apply.c:3687 builtin/apply.c:3689
+#: builtin/apply.c:3822 builtin/apply.c:3824
#, c-format
msgid "invalid path '%s'"
msgstr "Ungültiger Pfad '%s'"
-#: builtin/apply.c:3744
+#: builtin/apply.c:3879
#, c-format
msgid "%s: already exists in index"
msgstr "%s ist bereits bereitgestellt"
-#: builtin/apply.c:3747
+#: builtin/apply.c:3882
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s existiert bereits im Arbeitsverzeichnis"
-#: builtin/apply.c:3767
+#: builtin/apply.c:3902
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)"
-#: builtin/apply.c:3772
+#: builtin/apply.c:3907
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s"
-#: builtin/apply.c:3792
+#: builtin/apply.c:3927
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung"
-#: builtin/apply.c:3796
+#: builtin/apply.c:3931
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: Patch konnte nicht angewendet werden"
-#: builtin/apply.c:3810
+#: builtin/apply.c:3945
#, c-format
msgid "Checking patch %s..."
msgstr "Prüfe Patch %s ..."
-#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
-#: builtin/apply.c:4046
+#: builtin/apply.c:4182
#, c-format
msgid "unable to remove %s from index"
msgstr "konnte %s nicht aus dem Index entfernen"
-#: builtin/apply.c:4075
+#: builtin/apply.c:4215
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "fehlerhafter Patch für Submodul %s"
-#: builtin/apply.c:4079
+#: builtin/apply.c:4219
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "konnte neu erstellte Datei '%s' nicht lesen"
-#: builtin/apply.c:4084
+#: builtin/apply.c:4224
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "kann internen Speicher für eben erstellte Datei %s nicht erzeugen"
-#: builtin/apply.c:4087 builtin/apply.c:4195
+#: builtin/apply.c:4227 builtin/apply.c:4340
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen"
-#: builtin/apply.c:4120
+#: builtin/apply.c:4260
#, c-format
msgid "closing file '%s'"
msgstr "schließe Datei '%s'"
-#: builtin/apply.c:4169
+#: builtin/apply.c:4313
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
-#: builtin/apply.c:4256
+#: builtin/apply.c:4403
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s sauber angewendet"
-#: builtin/apply.c:4264
+#: builtin/apply.c:4411
msgid "internal error"
msgstr "interner Fehler"
-#: builtin/apply.c:4267
+#: builtin/apply.c:4414
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Wende Patch %%s mit %d Zurückweisung an..."
msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..."
-#: builtin/apply.c:4277
+#: builtin/apply.c:4424
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
-#: builtin/apply.c:4285
+#: builtin/apply.c:4432
#, c-format
msgid "cannot open %s: %s"
msgstr "Kann %s nicht öffnen: %s"
-#: builtin/apply.c:4298
+#: builtin/apply.c:4445
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Patch-Bereich #%d sauber angewendet."
-#: builtin/apply.c:4301
+#: builtin/apply.c:4448
#, c-format
msgid "Rejected hunk #%d."
msgstr "Patch-Block #%d zurückgewiesen."
-#: builtin/apply.c:4387
+#: builtin/apply.c:4537
#, c-format
msgid "Skipped patch '%s'."
msgstr "Patch '%s' ausgelassen."
-#: builtin/apply.c:4395
+#: builtin/apply.c:4545
msgid "unrecognized input"
msgstr "nicht erkannte Eingabe"
-#: builtin/apply.c:4406
+#: builtin/apply.c:4556
msgid "unable to read index file"
msgstr "Konnte Index-Datei nicht lesen"
-#: builtin/apply.c:4509
+#: builtin/apply.c:4701
+msgid "--3way outside a repository"
+msgstr ""
+"Die Option --3way kann nicht außerhalb eines Repositories verwendet werden."
+
+#: builtin/apply.c:4709
+msgid "--index outside a repository"
+msgstr ""
+"Die Option --index kann nicht außerhalb eines Repositories verwendet werden."
+
+#: builtin/apply.c:4712
+msgid "--cached outside a repository"
+msgstr ""
+"Die Option --cached kann nicht außerhalb eines Repositories verwendet werden."
+
+#: builtin/apply.c:4745
+#, c-format
+msgid "can't open patch '%s'"
+msgstr "kann Patch '%s' nicht öffnen"
+
+#: builtin/apply.c:4760
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "unterdrückte %d Whitespace-Fehler"
+msgstr[1] "unterdrückte %d Whitespace-Fehler"
+
+#: builtin/apply.c:4766 builtin/apply.c:4776
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d Zeile fügt Whitespace-Fehler hinzu."
+msgstr[1] "%d Zeilen fügen Whitespace-Fehler hinzu."
+
+#: builtin/apply.c:4800
msgid "don't apply changes matching the given path"
msgstr "keine Änderungen im angegebenen Pfad anwenden"
-#: builtin/apply.c:4512
+#: builtin/apply.c:4803
msgid "apply changes matching the given path"
msgstr "Änderungen nur im angegebenen Pfad anwenden"
-#: builtin/apply.c:4515
+#: builtin/apply.c:4806
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden "
"entfernen"
-#: builtin/apply.c:4518
+#: builtin/apply.c:4809
msgid "ignore additions made by the patch"
msgstr "hinzugefügte Zeilen des Patches ignorieren"
-#: builtin/apply.c:4520
+#: builtin/apply.c:4811
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe "
"ausgegeben"
-#: builtin/apply.c:4524
+#: builtin/apply.c:4815
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4817
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
"anstatt der Anwendung des Patches, eine Zusammenfassung für die Eingabe "
"ausgeben"
-#: builtin/apply.c:4528
+#: builtin/apply.c:4819
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
"anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann"
-#: builtin/apply.c:4530
+#: builtin/apply.c:4821
msgid "make sure the patch is applicable to the current index"
msgstr ""
"sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4823
msgid "apply a patch without touching the working tree"
msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen"
-#: builtin/apply.c:4534
+#: builtin/apply.c:4825
msgid "accept a patch that touches outside the working area"
msgstr ""
"Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt"
-#: builtin/apply.c:4536
+#: builtin/apply.c:4827
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
-#: builtin/apply.c:4538
+#: builtin/apply.c:4829
msgid "attempt three-way merge if a patch does not apply"
msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte"
-#: builtin/apply.c:4540
+#: builtin/apply.c:4831
msgid "build a temporary index based on embedded index information"
msgstr ""
"einen temporären Index, basierend auf den integrierten Index-Informationen, "
"erstellen"
-#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
msgid "paths are separated with NUL character"
msgstr "Pfade sind getrennt durch NUL Zeichen"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4836
msgid "ensure at least <n> lines of context match"
msgstr ""
"sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
-#: builtin/apply.c:4547
+#: builtin/apply.c:4838
msgid "detect new or modified lines that have whitespace errors"
msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln"
-#: builtin/apply.c:4550 builtin/apply.c:4553
+#: builtin/apply.c:4841 builtin/apply.c:4844
msgid "ignore changes in whitespace when finding context"
msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren"
-#: builtin/apply.c:4556
+#: builtin/apply.c:4847
msgid "apply the patch in reverse"
msgstr "den Patch in umgekehrter Reihenfolge anwenden"
-#: builtin/apply.c:4558
+#: builtin/apply.c:4849
msgid "don't expect at least one line of context"
msgstr "keinen Kontext erwarten"
-#: builtin/apply.c:4560
+#: builtin/apply.c:4851
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
"zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen"
-#: builtin/apply.c:4562
+#: builtin/apply.c:4853
msgid "allow overlapping hunks"
msgstr "sich überlappende Patch-Blöcke erlauben"
-#: builtin/apply.c:4565
+#: builtin/apply.c:4856
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren"
-#: builtin/apply.c:4568
+#: builtin/apply.c:4859
msgid "do not trust the line counts in the hunk headers"
msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
-#: builtin/apply.c:4571
+#: builtin/apply.c:4862
msgid "prepend <root> to all filenames"
msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen"
-#: builtin/apply.c:4593
-msgid "--3way outside a repository"
-msgstr ""
-"Die Option --3way kann nicht außerhalb eines Repositories verwendet werden."
-
-#: builtin/apply.c:4601
-msgid "--index outside a repository"
-msgstr ""
-"Die Option --index kann nicht außerhalb eines Repositories verwendet werden."
-
-#: builtin/apply.c:4604
-msgid "--cached outside a repository"
-msgstr ""
-"Die Option --cached kann nicht außerhalb eines Repositories verwendet werden."
-
-#: builtin/apply.c:4623
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "kann Patch '%s' nicht öffnen"
-
-#: builtin/apply.c:4637
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] "unterdrückte %d Whitespace-Fehler"
-msgstr[1] "unterdrückte %d Whitespace-Fehler"
-
-#: builtin/apply.c:4643 builtin/apply.c:4653
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] "%d Zeile fügt Whitespace-Fehler hinzu."
-msgstr[1] "%d Zeilen fügen Whitespace-Fehler hinzu."
-
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
@@ -3784,106 +4167,106 @@ msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)"
-#: builtin/blame.c:1782
+#: builtin/blame.c:1781
msgid "Blaming lines"
msgstr "Verarbeite Zeilen"
-#: builtin/blame.c:2531
+#: builtin/blame.c:2536
msgid "Show blame entries as we find them, incrementally"
msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren"
-#: builtin/blame.c:2532
+#: builtin/blame.c:2537
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)"
-#: builtin/blame.c:2533
+#: builtin/blame.c:2538
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Ursprungs-Commit nicht als Grenzen behandeln (Standard: aus)"
-#: builtin/blame.c:2534
+#: builtin/blame.c:2539
msgid "Show work cost statistics"
msgstr "Statistiken zum Arbeitsaufwand anzeigen"
-#: builtin/blame.c:2535
+#: builtin/blame.c:2540
msgid "Force progress reporting"
msgstr "Fortschrittsanzeige erzwingen"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2541
msgid "Show output score for blame entries"
msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2542
msgid "Show original filename (Default: auto)"
msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2543
msgid "Show original linenumber (Default: off)"
msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2544
msgid "Show in a format designed for machine consumption"
msgstr "Anzeige in einem Format für maschinelle Auswertung"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2545
msgid "Show porcelain format with per-line commit information"
msgstr ""
"Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2546
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2547
msgid "Show raw timestamp (Default: off)"
msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2548
msgid "Show long commit SHA1 (Default: off)"
msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2549
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2550
msgid "Show author email instead of name (Default: off)"
msgstr ""
"Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2551
msgid "Ignore whitespace differences"
msgstr "Unterschiede im Whitespace ignorieren"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2552
msgid "Spend extra cycles to find better match"
msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2553
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2554
msgid "Use <file>'s contents as the final image"
msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen"
-#: builtin/blame.c:2550 builtin/blame.c:2551
+#: builtin/blame.c:2555 builtin/blame.c:2556
msgid "score"
msgstr "Bewertung"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2555
msgid "Find line copies within and across files"
msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2556
msgid "Find line movements within and across files"
msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2557
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2557
msgid "Process only line range n,m, counting from 1"
msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1"
@@ -3893,7 +4276,7 @@ msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1"
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2641
+#: builtin/blame.c:2649
msgid "4 years, 11 months ago"
msgstr "vor 4 Jahren, und 11 Monaten"
@@ -3997,121 +4380,128 @@ msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n"
msgid "Deleted branch %s (was %s).\n"
msgstr "Branch %s entfernt (war %s).\n"
-#: builtin/branch.c:309
+#: builtin/branch.c:312
#, c-format
msgid "[%s: gone]"
msgstr "[%s: entfernt]"
-#: builtin/branch.c:314
+#: builtin/branch.c:317
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:319
+#: builtin/branch.c:322
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: %d hinterher]"
-#: builtin/branch.c:321
+#: builtin/branch.c:324
#, c-format
msgid "[behind %d]"
msgstr "[%d hinterher]"
-#: builtin/branch.c:325
+#: builtin/branch.c:328
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: %d voraus]"
-#: builtin/branch.c:327
+#: builtin/branch.c:330
#, c-format
msgid "[ahead %d]"
msgstr "[%d voraus]"
-#: builtin/branch.c:330
+#: builtin/branch.c:333
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: %d voraus, %d hinterher]"
-#: builtin/branch.c:333
+#: builtin/branch.c:336
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[%d voraus, %d hinterher]"
-#: builtin/branch.c:346
+#: builtin/branch.c:349
msgid " **** invalid ref ****"
msgstr " **** ungültige Referenz ****"
-#: builtin/branch.c:372
+#: builtin/branch.c:375
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(kein Branch, Rebase von Branch %s im Gange)"
-#: builtin/branch.c:375
+#: builtin/branch.c:378
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(kein Branch, binäre Suche begonnen bei %s)"
#. TRANSLATORS: make sure this matches
#. "HEAD detached at " in wt-status.c
-#: builtin/branch.c:381
+#: builtin/branch.c:384
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD losgelöst bei %s)"
#. TRANSLATORS: make sure this matches
#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:386
+#: builtin/branch.c:389
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD losgelöst von %s)"
-#: builtin/branch.c:390
+#: builtin/branch.c:393
msgid "(no branch)"
msgstr "(kein Branch)"
-#: builtin/branch.c:541
+#: builtin/branch.c:544
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Branch %s wird auf %s umgesetzt"
-#: builtin/branch.c:545
+#: builtin/branch.c:548
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Binäre Suche von Branch %s zu %s im Gange"
-#: builtin/branch.c:560
+#: builtin/branch.c:563
msgid "cannot rename the current branch while not on any."
msgstr ""
"Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden."
-#: builtin/branch.c:570
+#: builtin/branch.c:573
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Ungültiger Branchname: '%s'"
-#: builtin/branch.c:587
+#: builtin/branch.c:590
msgid "Branch rename failed"
msgstr "Umbenennung des Branches fehlgeschlagen"
-#: builtin/branch.c:591
+#: builtin/branch.c:594
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "falsch benannten Branch '%s' umbenannt"
-#: builtin/branch.c:594
+#: builtin/branch.c:597
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Branch umbenannt zu %s, aber HEAD ist nicht aktualisiert!"
-#: builtin/branch.c:601
+#: builtin/branch.c:604
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist "
"fehlgeschlagen."
-#: builtin/branch.c:623
-msgid "could not write branch description template"
-msgstr "Konnte Beschreibungsvorlage für Branch nicht schreiben."
+#: builtin/branch.c:620
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+"Bitte ändern Sie die Beschreibung für den Branch\n"
+" %s\n"
+"Zeilen, die mit '%c' beginnen, werden entfernt.\n"
#: builtin/branch.c:651
msgid "Generic options"
@@ -4214,8 +4604,8 @@ msgstr "Schüssel"
msgid "field name to sort on"
msgstr "sortiere nach diesem Feld"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
-#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
+#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
#: builtin/tag.c:369
msgid "object"
msgstr "Objekt"
@@ -4343,7 +4733,7 @@ msgstr "Um ein Paket zu erstellen wird ein Repository benötigt."
msgid "Need a repository to unbundle."
msgstr "Zum Entpacken wird ein Repository benötigt."
-#: builtin/cat-file.c:428
+#: builtin/cat-file.c:443
msgid ""
"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
"<type>|--textconv) <object>"
@@ -4351,60 +4741,60 @@ msgstr ""
"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
"<Art>|--textconv) <Objekt>"
-#: builtin/cat-file.c:429
+#: builtin/cat-file.c:444
msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-#: builtin/cat-file.c:466
+#: builtin/cat-file.c:481
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<Art> kann sein: blob, tree, commit, tag"
-#: builtin/cat-file.c:467
+#: builtin/cat-file.c:482
msgid "show object type"
msgstr "Objektart anzeigen"
-#: builtin/cat-file.c:468
+#: builtin/cat-file.c:483
msgid "show object size"
msgstr "Objektgröße anzeigen"
-#: builtin/cat-file.c:470
+#: builtin/cat-file.c:485
msgid "exit with zero when there's no error"
msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist"
-#: builtin/cat-file.c:471
+#: builtin/cat-file.c:486
msgid "pretty-print object's content"
msgstr "ansprechende Anzeige des Objektinhaltes"
-#: builtin/cat-file.c:473
+#: builtin/cat-file.c:488
msgid "for blob objects, run textconv on object's content"
msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausführen"
-#: builtin/cat-file.c:475
+#: builtin/cat-file.c:490
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "-s und -t mit beschädigten Objekten erlauben"
-#: builtin/cat-file.c:476
+#: builtin/cat-file.c:491
msgid "buffer --batch output"
msgstr "Ausgabe von --batch puffern"
-#: builtin/cat-file.c:478
+#: builtin/cat-file.c:493
msgid "show info and content of objects fed from the standard input"
msgstr ""
"Anzeige von Informationen und Inhalt von Objekten, gelesen von der Standard-"
"Eingabe"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:496
msgid "show info about objects fed from the standard input"
msgstr ""
"Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe"
-#: builtin/cat-file.c:484
+#: builtin/cat-file.c:499
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"symbolischen Verknüpfungen innerhalb des Repositories folgen (verwendet mit "
"--batch oder --batch-check)"
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:501
msgid "show all objects with --batch or --batch-check"
msgstr "alle Objekte mit --batch oder --batch-check anzeigen"
@@ -4432,7 +4822,7 @@ msgstr "Dateinamen von der Standard-Eingabe lesen"
msgid "terminate input and output records by a NUL character"
msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "Fortschrittsanzeige unterdrücken"
@@ -4525,9 +4915,9 @@ msgid "write the content to temporary files"
msgstr "den Inhalt in temporäre Dateien schreiben"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
-#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
-#: builtin/submodule--helper.c:774
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
+#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
+#: builtin/submodule--helper.c:830 builtin/worktree.c:469
msgid "string"
msgstr "Zeichenkette"
@@ -4595,10 +4985,6 @@ msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln"
-#: builtin/checkout.c:279 builtin/checkout.c:473
-msgid "corrupt index file"
-msgstr "beschädigte Index-Datei"
-
#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
@@ -4608,50 +4994,50 @@ msgstr "Pfad '%s' ist nicht zusammengeführt."
msgid "you need to resolve your current index first"
msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen."
-#: builtin/checkout.c:622
+#: builtin/checkout.c:625
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kann \"reflog\" für '%s' nicht durchführen: %s\n"
-#: builtin/checkout.c:660
+#: builtin/checkout.c:664
msgid "HEAD is now at"
msgstr "HEAD ist jetzt bei"
-#: builtin/checkout.c:664 builtin/clone.c:661
+#: builtin/checkout.c:668 builtin/clone.c:661
msgid "unable to update HEAD"
msgstr "Konnte HEAD nicht aktualisieren."
-#: builtin/checkout.c:668
+#: builtin/checkout.c:672
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Setze Branch '%s' neu\n"
-#: builtin/checkout.c:671
+#: builtin/checkout.c:675
#, c-format
msgid "Already on '%s'\n"
msgstr "Bereits auf '%s'\n"
-#: builtin/checkout.c:675
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:677 builtin/checkout.c:1067
+#: builtin/checkout.c:681 builtin/checkout.c:1070
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Zu neuem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:679
+#: builtin/checkout.c:683
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Zu Branch '%s' gewechselt\n"
-#: builtin/checkout.c:731
+#: builtin/checkout.c:734
#, c-format
msgid " ... and %d more.\n"
msgstr " ... und %d weitere.\n"
-#: builtin/checkout.c:737
+#: builtin/checkout.c:740
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4674,7 +5060,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:756
+#: builtin/checkout.c:759
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4701,152 +5087,152 @@ msgstr[1] ""
" git branch <neuer-Branchname> %s\n"
"\n"
-#: builtin/checkout.c:792
+#: builtin/checkout.c:795
msgid "internal error in revision walk"
msgstr "interner Fehler im Revisionsgang"
-#: builtin/checkout.c:796
+#: builtin/checkout.c:799
msgid "Previous HEAD position was"
msgstr "Vorherige Position von HEAD war"
-#: builtin/checkout.c:823 builtin/checkout.c:1062
+#: builtin/checkout.c:826 builtin/checkout.c:1065
msgid "You are on a branch yet to be born"
msgstr "Sie sind auf einem Branch, der noch geboren wird"
-#: builtin/checkout.c:968
+#: builtin/checkout.c:971
#, c-format
msgid "only one reference expected, %d given."
msgstr "nur eine Referenz erwartet, %d gegeben."
-#: builtin/checkout.c:1008 builtin/worktree.c:212
+#: builtin/checkout.c:1011 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "Ungültige Referenz: %s"
-#: builtin/checkout.c:1037
+#: builtin/checkout.c:1040
#, c-format
msgid "reference is not a tree: %s"
msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
-#: builtin/checkout.c:1076
+#: builtin/checkout.c:1079
msgid "paths cannot be used with switching branches"
msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1079 builtin/checkout.c:1083
+#: builtin/checkout.c:1082 builtin/checkout.c:1086
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
-#: builtin/checkout.c:1098
+#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
+#: builtin/checkout.c:1101
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1106
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
-#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
-#: builtin/worktree.c:325
+#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
+#: builtin/worktree.c:326
msgid "branch"
msgstr "Branch"
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1140
msgid "create and checkout a new branch"
msgstr "einen neuen Branch erzeugen und auschecken"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1142
msgid "create/reset and checkout a branch"
msgstr "einen Branch erstellen/umsetzen und auschecken"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1143
msgid "create reflog for new branch"
msgstr "das Reflog für den neuen Branch erzeugen"
-#: builtin/checkout.c:1141
-msgid "detach the HEAD at named commit"
-msgstr "HEAD zu benanntem Commit setzen"
+#: builtin/checkout.c:1144 builtin/worktree.c:328
+msgid "detach HEAD at named commit"
+msgstr "HEAD bei benanntem Commit loslösen"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1145
msgid "set upstream info for new branch"
msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1147
msgid "new-branch"
msgstr "neuer Branch"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1147
msgid "new unparented branch"
msgstr "neuer Branch ohne Eltern-Commit"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1148
msgid "checkout our version for unmerged files"
msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1150
msgid "checkout their version for unmerged files"
msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1152
msgid "force checkout (throw away local modifications)"
msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1153
msgid "perform a 3-way merge with the new branch"
msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
-#: builtin/checkout.c:1151 builtin/merge.c:230
+#: builtin/checkout.c:1154 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr "ignorierte Dateien aktualisieren (Standard)"
-#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
+#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
msgid "style"
msgstr "Stil"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1156
msgid "conflict style (merge or diff3)"
msgstr "Konfliktstil (merge oder diff3)"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1159
msgid "do not limit pathspecs to sparse entries only"
msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1161
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "second guess 'git checkout <no-such-branch>'"
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1163
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"Prüfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis "
"ausgecheckt wurde, deaktivieren"
-#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
-#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
+#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117
+#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "Fortschrittsanzeige erzwingen"
-#: builtin/checkout.c:1192
+#: builtin/checkout.c:1195
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus."
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1212
msgid "--track needs a branch name"
msgstr "Bei der Option --track muss ein Branchname angegeben werden."
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1217
msgid "Missing branch name; try -b"
msgstr "Vermisse Branchnamen; versuchen Sie -b"
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1253
msgid "invalid path specification"
msgstr "ungültige Pfadspezifikation"
-#: builtin/checkout.c:1257
+#: builtin/checkout.c:1260
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4856,12 +5242,12 @@ msgstr ""
"Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Commit aufgelöst "
"werden kann?"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1265
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'"
-#: builtin/checkout.c:1266
+#: builtin/checkout.c:1269
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -5014,7 +5400,7 @@ msgid "remove whole directories"
msgstr "ganze Verzeichnisse löschen"
#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
msgid "pattern"
msgstr "Muster"
@@ -5058,7 +5444,7 @@ msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
msgid "don't create a checkout"
msgstr "kein Auschecken"
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
msgid "create a bare repository"
msgstr "ein Bare-Repository erstellen"
@@ -5086,16 +5472,16 @@ msgstr "Submodule im Klon initialisieren"
msgid "number of submodules cloned in parallel"
msgstr "Anzahl der parallel zu klonenden Submodule"
-#: builtin/clone.c:80 builtin/init-db.c:470
+#: builtin/clone.c:80 builtin/init-db.c:473
msgid "template-directory"
msgstr "Vorlagenverzeichnis"
-#: builtin/clone.c:81 builtin/init-db.c:471
+#: builtin/clone.c:81 builtin/init-db.c:474
msgid "directory from which templates will be used"
msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
-#: builtin/clone.c:83 builtin/submodule--helper.c:498
-#: builtin/submodule--helper.c:777
+#: builtin/clone.c:83 builtin/submodule--helper.c:495
+#: builtin/submodule--helper.c:833
msgid "reference repository"
msgstr "Repository referenzieren"
@@ -5119,7 +5505,7 @@ msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories"
msgid "path to git-upload-pack on the remote"
msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
-#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201
+#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 builtin/pull.c:201
msgid "depth"
msgstr "Tiefe"
@@ -5136,11 +5522,11 @@ msgstr "nur einen Branch klonen, HEAD oder --branch"
msgid "any cloned submodules will be shallow"
msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)"
-#: builtin/clone.c:98 builtin/init-db.c:479
+#: builtin/clone.c:98 builtin/init-db.c:482
msgid "gitdir"
msgstr ".git-Verzeichnis"
-#: builtin/clone.c:99 builtin/init-db.c:480
+#: builtin/clone.c:99 builtin/init-db.c:483
msgid "separate git dir from working tree"
msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren"
@@ -5152,11 +5538,11 @@ msgstr "Schlüssel=Wert"
msgid "set config inside the new repository"
msgstr "Konfiguration innerhalb des neuen Repositories setzen"
-#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "nur IPv4-Adressen benutzen"
-#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "nur IPv6-Adressen benutzen"
@@ -5193,6 +5579,11 @@ msgstr ""
"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
"eingehängt."
+#: builtin/clone.c:376
+#, c-format
+msgid "failed to open '%s'"
+msgstr "Fehler beim Öffnen von '%s'"
+
#: builtin/clone.c:384
#, c-format
msgid "%s exists and is not a directory"
@@ -5213,7 +5604,7 @@ msgstr "Konnte Verweis '%s' nicht erstellen"
msgid "failed to copy file to '%s'"
msgstr "Konnte Datei nicht nach '%s' kopieren"
-#: builtin/clone.c:449 builtin/clone.c:633
+#: builtin/clone.c:449
#, c-format
msgid "done.\n"
msgstr "Fertig.\n"
@@ -5233,12 +5624,7 @@ msgstr ""
msgid "Could not find remote branch %s to clone."
msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
-#: builtin/clone.c:628
-#, c-format
-msgid "Checking connectivity... "
-msgstr "Prüfe Konnektivität ... "
-
-#: builtin/clone.c:631
+#: builtin/clone.c:633
msgid "remote did not send all necessary objects"
msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet."
@@ -5257,103 +5643,103 @@ msgstr ""
msgid "unable to checkout working tree"
msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
-#: builtin/clone.c:767
+#: builtin/clone.c:766
msgid "unable to write parameters to config file"
msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben"
-#: builtin/clone.c:830
+#: builtin/clone.c:829
msgid "cannot repack to clean up"
msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
-#: builtin/clone.c:832
+#: builtin/clone.c:831
msgid "cannot unlink temporary alternates file"
msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
-#: builtin/clone.c:864 builtin/receive-pack.c:1731
+#: builtin/clone.c:863 builtin/receive-pack.c:1855
msgid "Too many arguments."
msgstr "Zu viele Argumente."
-#: builtin/clone.c:868
+#: builtin/clone.c:867
msgid "You must specify a repository to clone."
msgstr "Sie müssen ein Repository zum Klonen angeben."
-#: builtin/clone.c:879
+#: builtin/clone.c:878
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
-#: builtin/clone.c:882
+#: builtin/clone.c:881
msgid "--bare and --separate-git-dir are incompatible."
msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
-#: builtin/clone.c:895
+#: builtin/clone.c:894
#, c-format
msgid "repository '%s' does not exist"
msgstr "Repository '%s' existiert nicht."
-#: builtin/clone.c:901 builtin/fetch.c:1174
+#: builtin/clone.c:900 builtin/fetch.c:1293
#, c-format
msgid "depth %s is not a positive number"
msgstr "Tiefe %s ist keine positive Zahl"
-#: builtin/clone.c:911
+#: builtin/clone.c:910
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis."
-#: builtin/clone.c:921
+#: builtin/clone.c:920
#, c-format
msgid "working tree '%s' already exists."
msgstr "Arbeitsverzeichnis '%s' existiert bereits."
-#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
-#: builtin/worktree.c:220 builtin/worktree.c:247
+#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
-#: builtin/clone.c:939
+#: builtin/clone.c:938
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
-#: builtin/clone.c:957
+#: builtin/clone.c:956
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klone in Bare-Repository '%s' ...\n"
-#: builtin/clone.c:959
+#: builtin/clone.c:958
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klone nach '%s' ...\n"
-#: builtin/clone.c:998
+#: builtin/clone.c:997
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie "
"stattdessen file://"
-#: builtin/clone.c:1001
+#: builtin/clone.c:1000
msgid "source repository is shallow, ignoring --local"
msgstr ""
"Quelle ist ein Repository mit unvollständiger Historie (shallow),ignoriere --"
"local"
-#: builtin/clone.c:1006
+#: builtin/clone.c:1005
msgid "--local is ignored"
msgstr "--local wird ignoriert"
-#: builtin/clone.c:1010
+#: builtin/clone.c:1009
#, c-format
msgid "Don't know how to clone %s"
msgstr "Weiß nicht wie %s zu klonen ist."
-#: builtin/clone.c:1059 builtin/clone.c:1067
+#: builtin/clone.c:1058 builtin/clone.c:1066
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
-#: builtin/clone.c:1070
+#: builtin/clone.c:1069
msgid "You appear to have cloned an empty repository."
msgstr "Sie scheinen ein leeres Repository geklont zu haben."
@@ -5496,67 +5882,67 @@ msgstr ""
"Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n"
"Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n"
-#: builtin/commit.c:307
+#: builtin/commit.c:308
msgid "failed to unpack HEAD tree object"
msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD."
-#: builtin/commit.c:348
+#: builtin/commit.c:349
msgid "unable to create temporary index"
msgstr "Konnte temporären Index nicht erstellen."
-#: builtin/commit.c:354
+#: builtin/commit.c:355
msgid "interactive add failed"
msgstr "interaktives Hinzufügen fehlgeschlagen"
-#: builtin/commit.c:367
+#: builtin/commit.c:368
msgid "unable to update temporary index"
msgstr "Konnte temporären Index nicht aktualisieren."
-#: builtin/commit.c:369
+#: builtin/commit.c:370
msgid "Failed to update main cache tree"
msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren"
-#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
+#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
msgid "unable to write new_index file"
msgstr "Konnte new_index Datei nicht schreiben"
-#: builtin/commit.c:447
+#: builtin/commit.c:448
msgid "cannot do a partial commit during a merge."
msgstr "Kann keinen Teil-Commit durchführen, während ein Merge im Gange ist."
-#: builtin/commit.c:449
+#: builtin/commit.c:450
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
"Kann keinen Teil-Commit durchführen, während \"cherry-pick\" im Gange ist."
-#: builtin/commit.c:458
+#: builtin/commit.c:459
msgid "cannot read the index"
msgstr "Kann Index nicht lesen"
-#: builtin/commit.c:477
+#: builtin/commit.c:478
msgid "unable to write temporary index file"
msgstr "Konnte temporäre Index-Datei nicht schreiben."
-#: builtin/commit.c:582
+#: builtin/commit.c:583
#, c-format
msgid "commit '%s' lacks author header"
msgstr "Commit '%s' fehlt Autor-Kopfbereich"
-#: builtin/commit.c:584
+#: builtin/commit.c:585
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "Commit '%s' hat fehlerhafte Autor-Zeile"
-#: builtin/commit.c:603
+#: builtin/commit.c:604
msgid "malformed --author parameter"
msgstr "Fehlerhafter --author Parameter"
-#: builtin/commit.c:611
+#: builtin/commit.c:612
#, c-format
msgid "invalid date format: %s"
msgstr "Ungültiges Datumsformat: %s"
-#: builtin/commit.c:655
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -5564,38 +5950,38 @@ msgstr ""
"Konnte kein Kommentar-Zeichen auswählen, das nicht in\n"
"der aktuellen Commit-Beschreibung verwendet wird."
-#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
+#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
#, c-format
msgid "could not lookup commit %s"
msgstr "Konnte Commit %s nicht nachschlagen"
-#: builtin/commit.c:704 builtin/shortlog.c:285
+#: builtin/commit.c:705 builtin/shortlog.c:286
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
-#: builtin/commit.c:706
+#: builtin/commit.c:707
msgid "could not read log from standard input"
msgstr "Konnte Log nicht von Standard-Eingabe lesen."
-#: builtin/commit.c:710
+#: builtin/commit.c:711
#, c-format
msgid "could not read log file '%s'"
msgstr "Konnte Log-Datei '%s' nicht lesen"
-#: builtin/commit.c:737 builtin/commit.c:745
+#: builtin/commit.c:738 builtin/commit.c:746
msgid "could not read SQUASH_MSG"
msgstr "Konnte SQUASH_MSG nicht lesen"
-#: builtin/commit.c:742
+#: builtin/commit.c:743
msgid "could not read MERGE_MSG"
msgstr "Konnte MERGE_MSG nicht lesen"
-#: builtin/commit.c:796
+#: builtin/commit.c:797
msgid "could not write commit template"
msgstr "Konnte Commit-Vorlage nicht schreiben"
-#: builtin/commit.c:814
+#: builtin/commit.c:815
#, c-format
msgid ""
"\n"
@@ -5610,7 +5996,7 @@ msgstr ""
"\t%s\n"
"und versuchen Sie es erneut.\n"
-#: builtin/commit.c:819
+#: builtin/commit.c:820
#, c-format
msgid ""
"\n"
@@ -5625,7 +6011,7 @@ msgstr ""
"\t%s\n"
"und versuchen Sie es erneut.\n"
-#: builtin/commit.c:832
+#: builtin/commit.c:833
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5635,7 +6021,7 @@ msgstr ""
"die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
"bricht den Commit ab.\n"
-#: builtin/commit.c:839
+#: builtin/commit.c:840
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5648,157 +6034,157 @@ msgstr ""
"entfernen.\n"
"Eine leere Beschreibung bricht den Commit ab.\n"
-#: builtin/commit.c:859
+#: builtin/commit.c:860
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:867
+#: builtin/commit.c:868
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:874
+#: builtin/commit.c:875
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommit-Ersteller: %.*s <%.*s>"
-#: builtin/commit.c:892
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "Kann Index nicht lesen"
-#: builtin/commit.c:949
+#: builtin/commit.c:950
msgid "Error building trees"
msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
-#: builtin/commit.c:964 builtin/tag.c:266
+#: builtin/commit.c:965 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
"Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n"
-#: builtin/commit.c:1066
+#: builtin/commit.c:1067
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' ist nicht im Format 'Name <E-Mail>' und stimmt mit keinem "
"vorhandenen Autor überein"
-#: builtin/commit.c:1081 builtin/commit.c:1321
+#: builtin/commit.c:1082 builtin/commit.c:1322
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ungültiger Modus '%s' für unversionierte Dateien"
-#: builtin/commit.c:1118
+#: builtin/commit.c:1119
msgid "--long and -z are incompatible"
msgstr "Die Optionen --long und -z sind inkompatibel."
-#: builtin/commit.c:1148
+#: builtin/commit.c:1149
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
"Die Optionen --reset-author und --author können nicht gemeinsam verwendet "
"werden."
-#: builtin/commit.c:1157
+#: builtin/commit.c:1158
msgid "You have nothing to amend."
msgstr "Sie haben nichts für \"--amend\"."
-#: builtin/commit.c:1160
+#: builtin/commit.c:1161
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Ein Merge ist im Gange -- kann \"--amend\" nicht ausführen."
-#: builtin/commit.c:1162
+#: builtin/commit.c:1163
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausführen."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1166
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
"Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden."
-#: builtin/commit.c:1175
+#: builtin/commit.c:1176
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden."
-#: builtin/commit.c:1177
+#: builtin/commit.c:1178
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Die Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden."
-#: builtin/commit.c:1185
+#: builtin/commit.c:1186
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden."
-#: builtin/commit.c:1202
+#: builtin/commit.c:1203
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Es kann nur eine Option von --include/--only/--all/--interactive/--patch "
"verwendet werden."
-#: builtin/commit.c:1204
+#: builtin/commit.c:1205
msgid "No paths with --include/--only does not make sense."
msgstr ""
"Die Optionen --include und --only können nur mit der Angabe von Pfaden "
"verwendet werden."
-#: builtin/commit.c:1206
+#: builtin/commit.c:1207
msgid "Clever... amending the last one with dirty index."
msgstr "Klug ... den letzten Commit mit einem geänderten Index nachbessern."
-#: builtin/commit.c:1208
+#: builtin/commit.c:1209
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Explizite Pfade ohne -i oder -o angegeben; nehme --only an"
-#: builtin/commit.c:1220 builtin/tag.c:474
+#: builtin/commit.c:1221 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Ungültiger \"cleanup\" Modus %s"
-#: builtin/commit.c:1225
+#: builtin/commit.c:1226
msgid "Paths with -a does not make sense."
msgstr "Die Option -a kann nicht mit der Angabe von Pfaden verwendet werden."
-#: builtin/commit.c:1335 builtin/commit.c:1621
+#: builtin/commit.c:1336 builtin/commit.c:1622
msgid "show status concisely"
msgstr "Status im Kurzformat anzeigen"
-#: builtin/commit.c:1337 builtin/commit.c:1623
+#: builtin/commit.c:1338 builtin/commit.c:1624
msgid "show branch information"
msgstr "Branchinformationen anzeigen"
-#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
-#: builtin/worktree.c:437
+#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "maschinenlesbare Ausgabe"
-#: builtin/commit.c:1342 builtin/commit.c:1627
+#: builtin/commit.c:1343 builtin/commit.c:1628
msgid "show status in long format (default)"
msgstr "Status im Langformat anzeigen (Standard)"
-#: builtin/commit.c:1345 builtin/commit.c:1630
+#: builtin/commit.c:1346 builtin/commit.c:1631
msgid "terminate entries with NUL"
msgstr "Einträge mit NUL-Zeichen abschließen"
-#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
+#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "Modus"
-#: builtin/commit.c:1348 builtin/commit.c:1633
+#: builtin/commit.c:1349 builtin/commit.c:1634
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: "
"all)"
-#: builtin/commit.c:1351
+#: builtin/commit.c:1352
msgid "show ignored files"
msgstr "ignorierte Dateien anzeigen"
-#: builtin/commit.c:1352 parse-options.h:155
+#: builtin/commit.c:1353 parse-options.h:155
msgid "when"
msgstr "wann"
-#: builtin/commit.c:1353
+#: builtin/commit.c:1354
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -5806,203 +6192,203 @@ msgstr ""
"Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
"(Standard: all)"
-#: builtin/commit.c:1355
+#: builtin/commit.c:1356
msgid "list untracked files in columns"
msgstr "unversionierte Dateien in Spalten auflisten"
-#: builtin/commit.c:1441
+#: builtin/commit.c:1442
msgid "couldn't look up newly created commit"
msgstr "Konnte neu erstellten Commit nicht nachschlagen."
-#: builtin/commit.c:1443
+#: builtin/commit.c:1444
msgid "could not parse newly created commit"
msgstr "Konnte neulich erstellten Commit nicht analysieren."
-#: builtin/commit.c:1488
+#: builtin/commit.c:1489
msgid "detached HEAD"
msgstr "losgelöster HEAD"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1492
msgid " (root-commit)"
msgstr " (Basis-Commit)"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1592
msgid "suppress summary after successful commit"
msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1593
msgid "show diff in commit message template"
msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1595
msgid "Commit message options"
msgstr "Optionen für Commit-Beschreibung"
-#: builtin/commit.c:1595 builtin/tag.c:351
+#: builtin/commit.c:1596 builtin/tag.c:351
msgid "read message from file"
msgstr "Beschreibung von Datei lesen"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1597
msgid "author"
msgstr "Autor"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1597
msgid "override author for commit"
msgstr "Autor eines Commits überschreiben"
-#: builtin/commit.c:1597 builtin/gc.c:326
+#: builtin/commit.c:1598 builtin/gc.c:326
msgid "date"
msgstr "Datum"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1598
msgid "override date for commit"
msgstr "Datum eines Commits überschreiben"
-#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
-#: builtin/notes.c:558 builtin/tag.c:349
+#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
+#: builtin/notes.c:559 builtin/tag.c:349
msgid "message"
msgstr "Beschreibung"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1599
msgid "commit message"
msgstr "Commit-Beschreibung"
-#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
-#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
+#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
msgid "commit"
msgstr "Commit"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1600
msgid "reuse and edit message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1601
msgid "reuse message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1602
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"eine automatisch zusammengesetzte Beschreibung zum Nachbessern des "
"angegebenen Commits verwenden"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1603
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"eine automatisch zusammengesetzte Beschreibung beim \"squash\" des "
"angegebenen Commits verwenden"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1604
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "Sie als Autor des Commits setzen (verwendet mit -C/-c/--amend)"
-#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
+#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "'Signed-off-by:'-Zeile hinzufügen"
-#: builtin/commit.c:1605
+#: builtin/commit.c:1606
msgid "use specified template file"
msgstr "angegebene Vorlagendatei verwenden"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1607
msgid "force edit of commit"
msgstr "Bearbeitung des Commits erzwingen"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1608
msgid "default"
msgstr "Standard"
-#: builtin/commit.c:1607 builtin/tag.c:354
+#: builtin/commit.c:1608 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr ""
"wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1609
msgid "include status in commit message template"
msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
-#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
+#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "Commit mit GPG signieren"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1614
msgid "Commit contents options"
msgstr "Optionen für Commit-Inhalt"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1615
msgid "commit all changed files"
msgstr "alle geänderten Dateien committen"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1616
msgid "add specified files to index for commit"
msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1617
msgid "interactively add files"
msgstr "interaktives Hinzufügen von Dateien"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1618
msgid "interactively add changes"
msgstr "interaktives Hinzufügen von Änderungen"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1619
msgid "commit only specified files"
msgstr "nur die angegebenen Dateien committen"
-#: builtin/commit.c:1619
-msgid "bypass pre-commit hook"
-msgstr "\"pre-commit hook\" umgehen"
-
#: builtin/commit.c:1620
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "Hooks pre-commit und commit-msg umgehen"
+
+#: builtin/commit.c:1621
msgid "show what would be committed"
msgstr "anzeigen, was committet werden würde"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1632
msgid "amend previous commit"
msgstr "vorherigen Commit ändern"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1633
msgid "bypass post-rewrite hook"
msgstr "\"post-rewrite hook\" umgehen"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1638
msgid "ok to record an empty change"
msgstr "Aufzeichnung einer leeren Änderung erlauben"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
msgid "ok to record a change with an empty message"
msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben"
-#: builtin/commit.c:1668
+#: builtin/commit.c:1669
msgid "could not parse HEAD commit"
msgstr "Konnte Commit von HEAD nicht analysieren."
-#: builtin/commit.c:1718
+#: builtin/commit.c:1719
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
-#: builtin/commit.c:1725
+#: builtin/commit.c:1726
msgid "could not read MERGE_MODE"
msgstr "Konnte MERGE_MODE nicht lesen"
-#: builtin/commit.c:1744
+#: builtin/commit.c:1745
#, c-format
msgid "could not read commit message: %s"
msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
-#: builtin/commit.c:1755
+#: builtin/commit.c:1756
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Commit abgebrochen; Sie haben die Beschreibung nicht editiert.\n"
-#: builtin/commit.c:1760
+#: builtin/commit.c:1761
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n"
-#: builtin/commit.c:1808
+#: builtin/commit.c:1809
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -6017,141 +6403,141 @@ msgstr ""
msgid "git config [<options>]"
msgstr "git config [<Optionen>]"
-#: builtin/config.c:56
+#: builtin/config.c:55
msgid "Config file location"
msgstr "Ort der Konfigurationsdatei"
-#: builtin/config.c:57
+#: builtin/config.c:56
msgid "use global config file"
msgstr "globale Konfigurationsdatei verwenden"
-#: builtin/config.c:58
+#: builtin/config.c:57
msgid "use system config file"
msgstr "systemweite Konfigurationsdatei verwenden"
-#: builtin/config.c:59
+#: builtin/config.c:58
msgid "use repository config file"
msgstr "Konfigurationsdatei des Repositories verwenden"
-#: builtin/config.c:60
+#: builtin/config.c:59
msgid "use given config file"
msgstr "die angegebene Konfigurationsdatei verwenden"
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "blob-id"
msgstr "Blob-Id"
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "read config from given blob object"
msgstr "Konfiguration von angegebenem Blob-Objekt lesen"
-#: builtin/config.c:62
+#: builtin/config.c:61
msgid "Action"
msgstr "Aktion"
-#: builtin/config.c:63
+#: builtin/config.c:62
msgid "get value: name [value-regex]"
msgstr "Wert zurückgeben: Name [Wert-regex]"
-#: builtin/config.c:64
+#: builtin/config.c:63
msgid "get all values: key [value-regex]"
msgstr "alle Werte zurückgeben: Schlüssel [Wert-regex]"
-#: builtin/config.c:65
+#: builtin/config.c:64
msgid "get values for regexp: name-regex [value-regex]"
msgstr "Werte für den regulären Ausdruck zurückgeben: Name-regex [Wert-regex]"
-#: builtin/config.c:66
+#: builtin/config.c:65
msgid "get value specific for the URL: section[.var] URL"
msgstr "Wert spezifisch für eine URL zurückgeben: section[.var] URL"
-#: builtin/config.c:67
+#: builtin/config.c:66
msgid "replace all matching variables: name value [value_regex]"
msgstr "alle passenden Variablen ersetzen: Name Wert [Wert-regex] "
-#: builtin/config.c:68
+#: builtin/config.c:67
msgid "add a new variable: name value"
msgstr "neue Variable hinzufügen: Name Wert"
-#: builtin/config.c:69
+#: builtin/config.c:68
msgid "remove a variable: name [value-regex]"
msgstr "eine Variable entfernen: Name [Wert-regex]"
-#: builtin/config.c:70
+#: builtin/config.c:69
msgid "remove all matches: name [value-regex]"
msgstr "alle Ãœbereinstimmungen entfernen: Name [Wert-regex]"
-#: builtin/config.c:71
+#: builtin/config.c:70
msgid "rename section: old-name new-name"
msgstr "eine Sektion umbenennen: alter-Name neuer-Name"
-#: builtin/config.c:72
+#: builtin/config.c:71
msgid "remove a section: name"
msgstr "eine Sektion entfernen: Name"
-#: builtin/config.c:73
+#: builtin/config.c:72
msgid "list all"
msgstr "alles auflisten"
-#: builtin/config.c:74
+#: builtin/config.c:73
msgid "open an editor"
msgstr "einen Editor öffnen"
-#: builtin/config.c:75
+#: builtin/config.c:74
msgid "find the color configured: slot [default]"
msgstr "die konfigurierte Farbe finden: Slot [Standard]"
-#: builtin/config.c:76
+#: builtin/config.c:75
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "die Farbeinstellung finden: Slot [Standard-Ausgabe-ist-Terminal]"
-#: builtin/config.c:77
+#: builtin/config.c:76
msgid "Type"
msgstr "Typ"
-#: builtin/config.c:78
+#: builtin/config.c:77
msgid "value is \"true\" or \"false\""
msgstr "Wert ist \"true\" oder \"false\""
-#: builtin/config.c:79
+#: builtin/config.c:78
msgid "value is decimal number"
msgstr "Wert ist eine Dezimalzahl"
-#: builtin/config.c:80
+#: builtin/config.c:79
msgid "value is --bool or --int"
msgstr "Wert ist --bool oder --int"
-#: builtin/config.c:81
+#: builtin/config.c:80
msgid "value is a path (file or directory name)"
msgstr "Wert ist ein Pfad (Datei oder Verzeichnisname)"
-#: builtin/config.c:82
+#: builtin/config.c:81
msgid "Other"
msgstr "Sonstiges"
-#: builtin/config.c:83
+#: builtin/config.c:82
msgid "terminate values with NUL byte"
msgstr "schließt Werte mit NUL-Byte ab"
-#: builtin/config.c:84
+#: builtin/config.c:83
msgid "show variable names only"
msgstr "nur Variablennamen anzeigen"
-#: builtin/config.c:85
+#: builtin/config.c:84
msgid "respect include directives on lookup"
msgstr "beachtet \"include\"-Direktiven beim Nachschlagen"
-#: builtin/config.c:86
+#: builtin/config.c:85
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"Ursprung der Konfiguration anzeigen (Datei, Standard-Eingabe, Blob, "
"Befehlszeile)"
-#: builtin/config.c:328
+#: builtin/config.c:327
msgid "unable to parse default color value"
msgstr "konnte Standard-Farbwert nicht parsen"
-#: builtin/config.c:472
+#: builtin/config.c:471
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -6166,7 +6552,7 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:614
+#: builtin/config.c:613
#, c-format
msgid "cannot create configuration file %s"
msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen."
@@ -6202,7 +6588,7 @@ msgstr "annotiertes Tag %s hat keinen eingebetteten Namen"
msgid "tag '%s' is really '%s' here"
msgstr "Tag '%s' ist eigentlich '%s' hier"
-#: builtin/describe.c:250 builtin/log.c:465
+#: builtin/describe.c:250 builtin/log.c:480
#, c-format
msgid "Not a valid object name %s"
msgstr "%s ist kein gültiger Objekt-Name"
@@ -6402,182 +6788,182 @@ msgstr "Refspec auf exportierte Referenzen anwenden"
msgid "anonymize output"
msgstr "Ausgabe anonymisieren"
-#: builtin/fetch.c:20
+#: builtin/fetch.c:21
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]"
-#: builtin/fetch.c:21
+#: builtin/fetch.c:22
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<Optionen>] <Gruppe>"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<Optionen>]"
-#: builtin/fetch.c:92 builtin/pull.c:174
+#: builtin/fetch.c:93 builtin/pull.c:174
msgid "fetch from all remotes"
msgstr "fordert von allen Remote-Repositories an"
-#: builtin/fetch.c:94 builtin/pull.c:177
+#: builtin/fetch.c:95 builtin/pull.c:177
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben"
-#: builtin/fetch.c:96 builtin/pull.c:180
+#: builtin/fetch.c:97 builtin/pull.c:180
msgid "path to upload pack on remote end"
msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite"
-#: builtin/fetch.c:97 builtin/pull.c:182
+#: builtin/fetch.c:98 builtin/pull.c:182
msgid "force overwrite of local branch"
msgstr "das Ãœberschreiben von lokalen Branches erzwingen"
-#: builtin/fetch.c:99
+#: builtin/fetch.c:100
msgid "fetch from multiple remotes"
msgstr "von mehreren Remote-Repositories anfordern"
-#: builtin/fetch.c:101 builtin/pull.c:184
+#: builtin/fetch.c:102 builtin/pull.c:184
msgid "fetch all tags and associated objects"
msgstr "alle Tags und verbundene Objekte anfordern"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:104
msgid "do not fetch all tags (--no-tags)"
msgstr "nicht alle Tags anfordern (--no-tags)"
-#: builtin/fetch.c:105
+#: builtin/fetch.c:106
msgid "number of submodules fetched in parallel"
msgstr "Anzahl der parallel anzufordernden Submodule"
-#: builtin/fetch.c:107 builtin/pull.c:187
+#: builtin/fetch.c:108 builtin/pull.c:187
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository "
"befinden"
-#: builtin/fetch.c:108 builtin/pull.c:190
+#: builtin/fetch.c:109 builtin/pull.c:190
msgid "on-demand"
msgstr "bei-Bedarf"
-#: builtin/fetch.c:109 builtin/pull.c:191
+#: builtin/fetch.c:110 builtin/pull.c:191
msgid "control recursive fetching of submodules"
msgstr "rekursive Anforderungen von Submodulen kontrollieren"
-#: builtin/fetch.c:113 builtin/pull.c:199
+#: builtin/fetch.c:114 builtin/pull.c:199
msgid "keep downloaded pack"
msgstr "heruntergeladenes Paket behalten"
-#: builtin/fetch.c:115
+#: builtin/fetch.c:116
msgid "allow updating of HEAD ref"
msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben"
-#: builtin/fetch.c:118 builtin/pull.c:202
+#: builtin/fetch.c:119 builtin/pull.c:202
msgid "deepen history of shallow clone"
msgstr ""
"die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen"
-#: builtin/fetch.c:120 builtin/pull.c:205
+#: builtin/fetch.c:121 builtin/pull.c:205
msgid "convert to a complete repository"
msgstr "zu einem vollständigen Repository konvertieren"
-#: builtin/fetch.c:122 builtin/log.c:1399
+#: builtin/fetch.c:123 builtin/log.c:1426
msgid "dir"
msgstr "Verzeichnis"
-#: builtin/fetch.c:123
+#: builtin/fetch.c:124
msgid "prepend this to submodule path output"
msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:127
msgid "default mode for recursion"
msgstr "Standard-Modus für Rekursion"
-#: builtin/fetch.c:128 builtin/pull.c:208
+#: builtin/fetch.c:129 builtin/pull.c:208
msgid "accept refs that update .git/shallow"
msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren"
-#: builtin/fetch.c:129 builtin/pull.c:210
+#: builtin/fetch.c:130 builtin/pull.c:210
msgid "refmap"
msgstr "Refmap"
-#: builtin/fetch.c:130 builtin/pull.c:211
+#: builtin/fetch.c:131 builtin/pull.c:211
msgid "specify fetch refmap"
msgstr "Refmap für 'fetch' angeben"
-#: builtin/fetch.c:386
+#: builtin/fetch.c:387
msgid "Couldn't find remote ref HEAD"
msgstr "Konnte Remote-Referenz von HEAD nicht finden."
-#: builtin/fetch.c:466
+#: builtin/fetch.c:503
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "Konfiguration fetch.output enthält ungültigen Wert %s"
+
+#: builtin/fetch.c:592
#, c-format
msgid "object %s not found"
msgstr "Objekt %s nicht gefunden"
-#: builtin/fetch.c:471
+#: builtin/fetch.c:596
msgid "[up to date]"
msgstr "[aktuell]"
-#: builtin/fetch.c:485
-#, c-format
-msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
-msgstr ""
-"! %-*s %-*s -> %s (kann \"fetch\" im aktuellen Branch nicht ausführen)"
-
-#: builtin/fetch.c:486 builtin/fetch.c:574
+#: builtin/fetch.c:609 builtin/fetch.c:689
msgid "[rejected]"
msgstr "[zurückgewiesen]"
-#: builtin/fetch.c:497
+#: builtin/fetch.c:610
+msgid "can't fetch in current branch"
+msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen"
+
+#: builtin/fetch.c:619
msgid "[tag update]"
msgstr "[Tag Aktualisierung]"
-#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
-msgid " (unable to update local ref)"
-msgstr " (kann lokale Referenz nicht aktualisieren)"
+#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
+#: builtin/fetch.c:684
+msgid "unable to update local ref"
+msgstr "kann lokale Referenz nicht aktualisieren"
-#: builtin/fetch.c:517
+#: builtin/fetch.c:639
msgid "[new tag]"
msgstr "[neues Tag]"
-#: builtin/fetch.c:520
+#: builtin/fetch.c:642
msgid "[new branch]"
msgstr "[neuer Branch]"
-#: builtin/fetch.c:523
+#: builtin/fetch.c:645
msgid "[new ref]"
msgstr "[neue Referenz]"
-#: builtin/fetch.c:569
-msgid "unable to update local ref"
-msgstr "kann lokale Referenz nicht aktualisieren"
-
-#: builtin/fetch.c:569
+#: builtin/fetch.c:684
msgid "forced update"
msgstr "Aktualisierung erzwungen"
-#: builtin/fetch.c:576
-msgid "(non-fast-forward)"
-msgstr "(kein Vorspulen)"
+#: builtin/fetch.c:689
+msgid "non-fast-forward"
+msgstr "kein Vorspulen"
-#: builtin/fetch.c:619
+#: builtin/fetch.c:733
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n"
-#: builtin/fetch.c:637
+#: builtin/fetch.c:753
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"%s wurde zurückgewiesen, da Ursprungs-Commits von Repositoriesmit "
"unvollständiger Historie (shallow) nicht aktualisiert werden dürfen."
-#: builtin/fetch.c:724 builtin/fetch.c:816
+#: builtin/fetch.c:839 builtin/fetch.c:934
#, c-format
msgid "From %.*s\n"
msgstr "Von %.*s\n"
-#: builtin/fetch.c:735
+#: builtin/fetch.c:850
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -6586,57 +6972,57 @@ msgstr ""
"Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n"
"'git remote prune %s', um jeden älteren, widersprüchlichen Branch zu löschen."
-#: builtin/fetch.c:787
+#: builtin/fetch.c:904
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s wird unreferenziert)"
-#: builtin/fetch.c:788
+#: builtin/fetch.c:905
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s wurde unreferenziert)"
-#: builtin/fetch.c:820
+#: builtin/fetch.c:937
msgid "[deleted]"
msgstr "[gelöscht]"
-#: builtin/fetch.c:821 builtin/remote.c:1025
+#: builtin/fetch.c:938 builtin/remote.c:1020
msgid "(none)"
msgstr "(nichts)"
-#: builtin/fetch.c:841
+#: builtin/fetch.c:960
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
"Der \"fetch\" in den aktuellen Branch %s von einem nicht-Bare-Repository "
"wurde verweigert."
-#: builtin/fetch.c:860
+#: builtin/fetch.c:979
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s"
-#: builtin/fetch.c:863
+#: builtin/fetch.c:982
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Option \"%s\" wird ignoriert für %s\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1039
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Weiß nicht wie von %s angefordert wird."
-#: builtin/fetch.c:1080
+#: builtin/fetch.c:1199
#, c-format
msgid "Fetching %s\n"
msgstr "Fordere an von %s\n"
-#: builtin/fetch.c:1082 builtin/remote.c:96
+#: builtin/fetch.c:1201 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "Konnte nicht von %s anfordern"
-#: builtin/fetch.c:1100
+#: builtin/fetch.c:1219
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -6645,35 +7031,35 @@ msgstr ""
"oder den Namen des Remote-Repositories an, von welchem neue\n"
"Commits angefordert werden sollen."
-#: builtin/fetch.c:1123
+#: builtin/fetch.c:1242
msgid "You need to specify a tag name."
msgstr "Sie müssen den Namen des Tags angeben."
-#: builtin/fetch.c:1165
+#: builtin/fetch.c:1284
msgid "--depth and --unshallow cannot be used together"
msgstr ""
"Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden."
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1286
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
"Die Option --unshallow kann nicht in einem Repository mit unvollständiger "
"Historie verwendet werden."
-#: builtin/fetch.c:1187
+#: builtin/fetch.c:1306
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all akzeptiert kein Repository als Argument"
-#: builtin/fetch.c:1189
+#: builtin/fetch.c:1308
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kann nicht mit Refspecs verwendet werden."
-#: builtin/fetch.c:1200
+#: builtin/fetch.c:1319
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s"
-#: builtin/fetch.c:1208
+#: builtin/fetch.c:1327
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
"Das Abholen einer Gruppe von Remote-Repositories kann nicht mit der Angabe\n"
@@ -6762,63 +7148,63 @@ msgstr "nur nicht zusammengeführte Referenzen ausgeben"
msgid "print only refs which contain the commit"
msgstr "nur Referenzen ausgeben, die diesen Commit enthalten"
-#: builtin/fsck.c:156 builtin/prune.c:140
-msgid "Checking connectivity"
-msgstr "Prüfe Konnektivität"
-
-#: builtin/fsck.c:486
+#: builtin/fsck.c:519
msgid "Checking object directories"
msgstr "Prüfe Objekt-Verzeichnisse"
-#: builtin/fsck.c:552
+#: builtin/fsck.c:588
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<Optionen>] [<Objekt>...]"
-#: builtin/fsck.c:558
+#: builtin/fsck.c:594
msgid "show unreachable objects"
msgstr "unerreichbare Objekte anzeigen"
-#: builtin/fsck.c:559
+#: builtin/fsck.c:595
msgid "show dangling objects"
msgstr "unreferenzierte Objekte anzeigen"
-#: builtin/fsck.c:560
+#: builtin/fsck.c:596
msgid "report tags"
msgstr "Tags melden"
-#: builtin/fsck.c:561
+#: builtin/fsck.c:597
msgid "report root nodes"
msgstr "Hauptwurzeln melden"
-#: builtin/fsck.c:562
+#: builtin/fsck.c:598
msgid "make index objects head nodes"
msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen"
-#: builtin/fsck.c:563
+#: builtin/fsck.c:599
msgid "make reflogs head nodes (default)"
msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)"
-#: builtin/fsck.c:564
+#: builtin/fsck.c:600
msgid "also consider packs and alternate objects"
msgstr "ebenso Pakete und alternative Objekte betrachten"
-#: builtin/fsck.c:565
+#: builtin/fsck.c:601
msgid "check only connectivity"
msgstr "nur Konnektivität prüfen"
-#: builtin/fsck.c:566
+#: builtin/fsck.c:602
msgid "enable more strict checking"
msgstr "genauere Prüfung aktivieren"
-#: builtin/fsck.c:568
+#: builtin/fsck.c:604
msgid "write dangling objects in .git/lost-found"
msgstr "unreferenzierte Objekte nach .git/lost-found schreiben"
-#: builtin/fsck.c:569 builtin/prune.c:107
+#: builtin/fsck.c:605 builtin/prune.c:107
msgid "show progress"
msgstr "Fortschrittsanzeige anzeigen"
-#: builtin/fsck.c:630
+#: builtin/fsck.c:606
+msgid "show verbose names for reachable objects"
+msgstr "ausführliche Namen für erreichbare Objekte anzeigen"
+
+#: builtin/fsck.c:671
msgid "Checking objects"
msgstr "Prüfe Objekte"
@@ -7118,7 +7504,7 @@ msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
msgid "no pattern given."
msgstr "keine Muster angegeben"
-#: builtin/grep.c:845 builtin/index-pack.c:1477
+#: builtin/grep.c:845 builtin/index-pack.c:1479
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "ungültige Anzahl von Threads angegeben (%d)"
@@ -7272,335 +7658,331 @@ msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen"
msgid "no info viewer handled the request"
msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen"
-#: builtin/help.c:408
+#: builtin/help.c:401
msgid "Defining attributes per path"
msgstr "Definition von Attributen pro Pfad"
-#: builtin/help.c:409
+#: builtin/help.c:402
msgid "Everyday Git With 20 Commands Or So"
msgstr "Tägliche Benutzung von Git mit ungefähr 20 Befehlen"
-#: builtin/help.c:410
+#: builtin/help.c:403
msgid "A Git glossary"
msgstr "Ein Git-Glossar"
-#: builtin/help.c:411
+#: builtin/help.c:404
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien"
-#: builtin/help.c:412
+#: builtin/help.c:405
msgid "Defining submodule properties"
msgstr "Definition von Submodul-Eigenschaften"
-#: builtin/help.c:413
+#: builtin/help.c:406
msgid "Specifying revisions and ranges for Git"
msgstr "Spezifikation von Commits und Bereichen für Git"
-#: builtin/help.c:414
+#: builtin/help.c:407
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Eine einführende Anleitung zu Git (für Version 1.5.1 oder neuer)"
-#: builtin/help.c:415
+#: builtin/help.c:408
msgid "An overview of recommended workflows with Git"
msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git"
-#: builtin/help.c:427
+#: builtin/help.c:420
msgid "The common Git guides are:\n"
msgstr "Die allgemein verwendeten Git-Anleitungen sind:\n"
-#: builtin/help.c:448 builtin/help.c:465
+#: builtin/help.c:441 builtin/help.c:458
#, c-format
msgid "usage: %s%s"
msgstr "Verwendung: %s%s"
-#: builtin/help.c:481
+#: builtin/help.c:474
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "für `git %s' wurde der Alias `%s' angelegt"
-#: builtin/index-pack.c:152
+#: builtin/index-pack.c:153
#, c-format
msgid "unable to open %s"
msgstr "kann %s nicht öffnen"
-#: builtin/index-pack.c:202
+#: builtin/index-pack.c:203
#, c-format
msgid "object type mismatch at %s"
msgstr "Objekt-Typen passen bei %s nicht zusammen"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:223
#, c-format
msgid "did not receive expected object %s"
msgstr "konnte erwartetes Objekt %s nicht empfangen"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "Objekt %s: erwarteter Typ %s, %s gefunden"
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:268
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "kann %d Byte nicht lesen"
msgstr[1] "kann %d Bytes nicht lesen"
-#: builtin/index-pack.c:277
+#: builtin/index-pack.c:278
msgid "early EOF"
msgstr "zu frühes Dateiende"
-#: builtin/index-pack.c:278
+#: builtin/index-pack.c:279
msgid "read error on input"
msgstr "Fehler beim Lesen der Eingabe"
-#: builtin/index-pack.c:290
+#: builtin/index-pack.c:291
msgid "used more bytes than were available"
msgstr "verwendete mehr Bytes als verfügbar waren"
-#: builtin/index-pack.c:297
+#: builtin/index-pack.c:298
msgid "pack too large for current definition of off_t"
msgstr "Paket ist zu groß für die aktuelle Definition von off_t"
-#: builtin/index-pack.c:313
+#: builtin/index-pack.c:314
#, c-format
msgid "unable to create '%s'"
msgstr "konnte '%s' nicht erstellen"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "cannot open packfile '%s'"
msgstr "Kann Paketdatei '%s' nicht öffnen"
-#: builtin/index-pack.c:332
+#: builtin/index-pack.c:333
msgid "pack signature mismatch"
msgstr "Paketsignatur stimmt nicht überein"
-#: builtin/index-pack.c:334
+#: builtin/index-pack.c:335
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "Paketversion %<PRIu32> nicht unterstützt"
-#: builtin/index-pack.c:352
+#: builtin/index-pack.c:353
#, c-format
-msgid "pack has bad object at offset %lu: %s"
-msgstr "Paket hat ein ungültiges Objekt bei Versatz %lu: %s"
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "Paket hat ein ungültiges Objekt bei Versatz %<PRIuMAX>: %s"
-#: builtin/index-pack.c:473
+#: builtin/index-pack.c:475
#, c-format
msgid "inflate returned %d"
msgstr "Dekomprimierung gab %d zurück"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:524
msgid "offset value overflow for delta base object"
msgstr "Wert für Versatz bei Differenzobjekt übergelaufen"
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:532
msgid "delta base offset is out of bound"
msgstr ""
"Wert für Versatz bei Differenzobjekt liegt außerhalb des gültigen Bereichs"
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:540
#, c-format
msgid "unknown object type %d"
msgstr "Unbekannter Objekt-Typ %d"
-#: builtin/index-pack.c:569
+#: builtin/index-pack.c:571
msgid "cannot pread pack file"
msgstr "Kann Paketdatei %s nicht lesen"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:573
#, c-format
-msgid "premature end of pack file, %lu byte missing"
-msgid_plural "premature end of pack file, %lu bytes missing"
-msgstr[0] "frühzeitiges Ende der Paketdatei, vermisse %lu Byte"
-msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %lu Bytes"
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+msgstr[0] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Byte"
+msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Bytes"
-#: builtin/index-pack.c:597
+#: builtin/index-pack.c:599
msgid "serious inflate inconsistency"
msgstr "ernsthafte Inkonsistenz nach Dekomprimierung"
-#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
-#: builtin/index-pack.c:806 builtin/index-pack.c:815
+#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
+#: builtin/index-pack.c:808 builtin/index-pack.c:817
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !"
-#: builtin/index-pack.c:746 builtin/pack-objects.c:162
-#: builtin/pack-objects.c:254
+#: builtin/index-pack.c:748 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:256
#, c-format
msgid "unable to read %s"
msgstr "kann %s nicht lesen"
-#: builtin/index-pack.c:812
+#: builtin/index-pack.c:814
#, c-format
msgid "cannot read existing object %s"
msgstr "Kann existierendes Objekt %s nicht lesen."
-#: builtin/index-pack.c:826
+#: builtin/index-pack.c:828
#, c-format
msgid "invalid blob object %s"
msgstr "ungültiges Blob-Objekt %s"
-#: builtin/index-pack.c:840
+#: builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr "Ungültiger Objekt-Typ %s"
-#: builtin/index-pack.c:843
+#: builtin/index-pack.c:845
msgid "Error in object"
msgstr "Fehler in Objekt"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Nicht alle Kind-Objekte von %s sind erreichbar"
-#: builtin/index-pack.c:917 builtin/index-pack.c:948
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "Konnte Dateiunterschied nicht anwenden"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1120
msgid "Receiving objects"
msgstr "Empfange Objekte"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1120
msgid "Indexing objects"
msgstr "Indiziere Objekte"
-#: builtin/index-pack.c:1150
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "Paket ist beschädigt (SHA1 unterschiedlich)"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "kann Paketdatei nicht lesen"
-#: builtin/index-pack.c:1158
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "Paketende enthält nicht verwendbaren Inhalt"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1171
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "Fehler beim Ausführen von \"parse_pack_objects()\""
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1196
msgid "Resolving deltas"
msgstr "Löse Unterschiede auf"
-#: builtin/index-pack.c:1205
+#: builtin/index-pack.c:1207
#, c-format
msgid "unable to create thread: %s"
msgstr "kann Thread nicht erzeugen: %s"
-#: builtin/index-pack.c:1247
+#: builtin/index-pack.c:1249
msgid "confusion beyond insanity"
msgstr "Fehler beim Auflösen der Unterschiede"
-#: builtin/index-pack.c:1253
+#: builtin/index-pack.c:1255
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "abgeschlossen mit %d lokalem Objekt"
msgstr[1] "abgeschlossen mit %d lokalen Objekten"
-#: builtin/index-pack.c:1265
+#: builtin/index-pack.c:1267
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)"
-#: builtin/index-pack.c:1269
+#: builtin/index-pack.c:1271
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "Paket hat %d unaufgelöste Unterschied"
msgstr[1] "Paket hat %d unaufgelöste Unterschiede"
-#: builtin/index-pack.c:1293
+#: builtin/index-pack.c:1295
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren"
-#: builtin/index-pack.c:1369
+#: builtin/index-pack.c:1371
#, c-format
msgid "local object %s is corrupt"
msgstr "lokales Objekt %s ist beschädigt"
-#: builtin/index-pack.c:1393
+#: builtin/index-pack.c:1395
msgid "error while closing pack file"
msgstr "Fehler beim Schließen der Paketdatei"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1408
#, c-format
msgid "cannot write keep file '%s'"
msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben"
-#: builtin/index-pack.c:1414
+#: builtin/index-pack.c:1416
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen"
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1429
msgid "cannot store pack file"
msgstr "Kann Paketdatei nicht speichern"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1440
msgid "cannot store index file"
msgstr "Kann Indexdatei nicht speichern"
-#: builtin/index-pack.c:1471
+#: builtin/index-pack.c:1473
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig"
-#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
+#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr "keine Unterstützung von Threads, '%s' wird ignoriert"
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kann existierende Paketdatei '%s' nicht öffnen"
-#: builtin/index-pack.c:1542
+#: builtin/index-pack.c:1544
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen"
-#: builtin/index-pack.c:1589
+#: builtin/index-pack.c:1591
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "kein Unterschied: %d Objekt"
msgstr[1] "kein Unterschied: %d Objekte"
-#: builtin/index-pack.c:1596
+#: builtin/index-pack.c:1598
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt"
msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte"
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1611
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'"
-#: builtin/index-pack.c:1638
-msgid "Cannot come back to cwd"
-msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln"
-
-#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
-#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
+#: builtin/index-pack.c:1693 builtin/index-pack.c:1696
+#: builtin/index-pack.c:1712 builtin/index-pack.c:1716
#, c-format
msgid "bad %s"
msgstr "%s ist ungültig"
-#: builtin/index-pack.c:1723
+#: builtin/index-pack.c:1730
msgid "--fix-thin cannot be used without --stdin"
msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden."
-#: builtin/index-pack.c:1731
+#: builtin/index-pack.c:1738
msgid "--verify with no packfile name given"
msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben."
@@ -7664,27 +8046,27 @@ msgstr "kann nicht mit Dateityp %d umgehen"
msgid "unable to move %s to %s"
msgstr "Konnte %s nicht nach %s verschieben"
-#. TRANSLATORS: The first '%s' is either "Reinitialized
-#. existing" or "Initialized empty", the second " shared" or
-#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:403
+#: builtin/init-db.c:402
#, c-format
-msgid "%s%s Git repository in %s%s\n"
-msgstr "%s%s Git-Repository in %s%s\n"
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "Bestehendes verteiltes Git-Repository in %s%s neuinitialisiert\n"
-#: builtin/init-db.c:404
-msgid "Reinitialized existing"
-msgstr "Reinitialisierte existierendes"
+#: builtin/init-db.c:403
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "Bestehendes Git-Repository in %s%s neuinitialisiert\n"
-#: builtin/init-db.c:404
-msgid "Initialized empty"
-msgstr "Initialisierte leeres"
+#: builtin/init-db.c:407
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "Leeres verteiltes Git-Repository in %s%s initialisiert\n"
-#: builtin/init-db.c:405
-msgid " shared"
-msgstr " gemeinsames"
+#: builtin/init-db.c:408
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "Leeres Git-Repository in %s%s initialisiert\n"
-#: builtin/init-db.c:452
+#: builtin/init-db.c:455
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7692,25 +8074,25 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--"
"shared[=<Berechtigungen>]] [<Verzeichnis>]"
-#: builtin/init-db.c:475
+#: builtin/init-db.c:478
msgid "permissions"
msgstr "Berechtigungen"
-#: builtin/init-db.c:476
+#: builtin/init-db.c:479
msgid "specify that the git repository is to be shared amongst several users"
msgstr "angeben, dass das Git-Repository mit mehreren Benutzern geteilt wird"
-#: builtin/init-db.c:510 builtin/init-db.c:515
+#: builtin/init-db.c:513 builtin/init-db.c:518
#, c-format
msgid "cannot mkdir %s"
msgstr "kann Verzeichnis %s nicht erstellen"
-#: builtin/init-db.c:519
+#: builtin/init-db.c:522
#, c-format
msgid "cannot chdir to %s"
msgstr "kann nicht in Verzeichnis %s wechseln"
-#: builtin/init-db.c:540
+#: builtin/init-db.c:543
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7719,7 +8101,7 @@ msgstr ""
"%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s "
"(oder --git-dir=<Verzeichnis>)"
-#: builtin/init-db.c:568
+#: builtin/init-db.c:571
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen."
@@ -7752,115 +8134,115 @@ msgstr "Anhang/Anhänge hinzufügen"
msgid "no input file given for in-place editing"
msgstr "keine Datei zur direkten Bearbeitung angegeben"
-#: builtin/log.c:43
+#: builtin/log.c:44
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]"
-#: builtin/log.c:44
+#: builtin/log.c:45
msgid "git show [<options>] <object>..."
msgstr "git show [<Optionen>] <Objekt>..."
-#: builtin/log.c:83
+#: builtin/log.c:84
#, c-format
msgid "invalid --decorate option: %s"
msgstr "Ungültige Option für --decorate: %s"
-#: builtin/log.c:137
+#: builtin/log.c:139
msgid "suppress diff output"
msgstr "Ausgabe der Unterschiede unterdrücken"
-#: builtin/log.c:138
+#: builtin/log.c:140
msgid "show source"
msgstr "Quelle anzeigen"
-#: builtin/log.c:139
+#: builtin/log.c:141
msgid "Use mail map file"
msgstr "\"mailmap\"-Datei verwenden"
-#: builtin/log.c:140
+#: builtin/log.c:142
msgid "decorate options"
msgstr "decorate-Optionen"
-#: builtin/log.c:143
+#: builtin/log.c:145
msgid "Process line range n,m in file, counting from 1"
msgstr "Verarbeitet nur Zeilen im Bereich n,m in der Datei, gezählt von 1"
-#: builtin/log.c:239
+#: builtin/log.c:241
#, c-format
msgid "Final output: %d %s\n"
msgstr "letzte Ausgabe: %d %s\n"
-#: builtin/log.c:471
+#: builtin/log.c:486
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: ungültige Datei"
-#: builtin/log.c:485 builtin/log.c:578
+#: builtin/log.c:500 builtin/log.c:594
#, c-format
msgid "Could not read object %s"
msgstr "Kann Objekt %s nicht lesen."
-#: builtin/log.c:602
+#: builtin/log.c:618
#, c-format
msgid "Unknown type: %d"
msgstr "Unbekannter Typ: %d"
-#: builtin/log.c:722
+#: builtin/log.c:739
msgid "format.headers without value"
msgstr "format.headers ohne Wert"
-#: builtin/log.c:812
+#: builtin/log.c:839
msgid "name of output directory is too long"
msgstr "Name des Ausgabeverzeichnisses ist zu lang."
-#: builtin/log.c:827
+#: builtin/log.c:854
#, c-format
msgid "Cannot open patch file %s"
msgstr "Kann Patch-Datei %s nicht öffnen"
-#: builtin/log.c:841
+#: builtin/log.c:868
msgid "Need exactly one range."
msgstr "Brauche genau einen Commit-Bereich."
-#: builtin/log.c:851
+#: builtin/log.c:878
msgid "Not a range."
msgstr "Kein Commit-Bereich."
-#: builtin/log.c:957
+#: builtin/log.c:984
msgid "Cover letter needs email format"
msgstr "Anschreiben benötigt E-Mail-Format"
-#: builtin/log.c:1036
+#: builtin/log.c:1064
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ungültiges in-reply-to: %s"
-#: builtin/log.c:1064
+#: builtin/log.c:1092
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
-#: builtin/log.c:1109
+#: builtin/log.c:1137
msgid "Two output directories?"
msgstr "Zwei Ausgabeverzeichnisse?"
-#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
#, c-format
msgid "Unknown commit %s"
msgstr "Unbekannter Commit %s"
-#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
-#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
-#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
-#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
+#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
+#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
+#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
-#: builtin/log.c:1231
+#: builtin/log.c:1259
msgid "Could not find exact merge base."
msgstr "Konnte keine exakte Merge-Basis finden."
-#: builtin/log.c:1235
+#: builtin/log.c:1263
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -7871,212 +8253,212 @@ msgstr ""
"'git branch --set-upstream-to', um einem Remote-Branch zu folgen.\n"
"Oder geben Sie den Basis-Commit mit '--base=<Basis-Commit-Id>' manuell an."
-#: builtin/log.c:1255
+#: builtin/log.c:1283
msgid "Failed to find exact merge base"
msgstr "Fehler beim Finden einer exakten Merge-Basis."
-#: builtin/log.c:1266
+#: builtin/log.c:1294
msgid "base commit should be the ancestor of revision list"
msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein."
-#: builtin/log.c:1270
+#: builtin/log.c:1298
msgid "base commit shouldn't be in revision list"
msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein."
-#: builtin/log.c:1319
+#: builtin/log.c:1347
msgid "cannot get patch id"
msgstr "kann Patch-Id nicht lesen"
-#: builtin/log.c:1377
+#: builtin/log.c:1404
msgid "use [PATCH n/m] even with a single patch"
msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden"
-#: builtin/log.c:1380
+#: builtin/log.c:1407
msgid "use [PATCH] even with multiple patches"
msgstr "[PATCH] auch mit mehreren Patches verwenden"
-#: builtin/log.c:1384
+#: builtin/log.c:1411
msgid "print patches to standard out"
msgstr "Ausgabe der Patches in Standard-Ausgabe"
-#: builtin/log.c:1386
+#: builtin/log.c:1413
msgid "generate a cover letter"
msgstr "ein Deckblatt erzeugen"
-#: builtin/log.c:1388
+#: builtin/log.c:1415
msgid "use simple number sequence for output file names"
msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden"
-#: builtin/log.c:1389
+#: builtin/log.c:1416
msgid "sfx"
msgstr "Dateiendung"
-#: builtin/log.c:1390
+#: builtin/log.c:1417
msgid "use <sfx> instead of '.patch'"
msgstr "<Dateiendung> anstatt '.patch' verwenden"
-#: builtin/log.c:1392
+#: builtin/log.c:1419
msgid "start numbering patches at <n> instead of 1"
msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen"
-#: builtin/log.c:1394
+#: builtin/log.c:1421
msgid "mark the series as Nth re-roll"
msgstr "die Serie als n-te Fassung kennzeichnen"
-#: builtin/log.c:1396
+#: builtin/log.c:1423
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "[<Präfix>] anstatt [PATCH] verwenden"
-#: builtin/log.c:1399
+#: builtin/log.c:1426
msgid "store resulting files in <dir>"
msgstr "erzeugte Dateien in <Verzeichnis> speichern"
-#: builtin/log.c:1402
+#: builtin/log.c:1429
msgid "don't strip/add [PATCH]"
msgstr "[PATCH] nicht entfernen/hinzufügen"
-#: builtin/log.c:1405
+#: builtin/log.c:1432
msgid "don't output binary diffs"
msgstr "keine binären Unterschiede ausgeben"
-#: builtin/log.c:1407
+#: builtin/log.c:1434
msgid "output all-zero hash in From header"
msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
-#: builtin/log.c:1409
+#: builtin/log.c:1436
msgid "don't include a patch matching a commit upstream"
msgstr ""
"keine Patches einschließen, die einem Commit im Upstream-Branch entsprechen"
-#: builtin/log.c:1411
+#: builtin/log.c:1438
msgid "show patch format instead of default (patch + stat)"
msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
-#: builtin/log.c:1413
+#: builtin/log.c:1440
msgid "Messaging"
msgstr "E-Mail-Einstellungen"
-#: builtin/log.c:1414
+#: builtin/log.c:1441
msgid "header"
msgstr "Header"
-#: builtin/log.c:1415
+#: builtin/log.c:1442
msgid "add email header"
msgstr "E-Mail-Header hinzufügen"
-#: builtin/log.c:1416 builtin/log.c:1418
+#: builtin/log.c:1443 builtin/log.c:1445
msgid "email"
msgstr "E-Mail"
-#: builtin/log.c:1416
+#: builtin/log.c:1443
msgid "add To: header"
msgstr "\"To:\"-Header hinzufügen"
-#: builtin/log.c:1418
+#: builtin/log.c:1445
msgid "add Cc: header"
msgstr "\"Cc:\"-Header hinzufügen"
-#: builtin/log.c:1420
+#: builtin/log.c:1447
msgid "ident"
msgstr "Ident"
-#: builtin/log.c:1421
+#: builtin/log.c:1448
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"\"From\"-Adresse auf <Ident> setzen (oder Ident des Commit-Erstellers, wenn "
"fehlend)"
-#: builtin/log.c:1423
+#: builtin/log.c:1450
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1424
+#: builtin/log.c:1451
msgid "make first mail a reply to <message-id>"
msgstr "aus erster E-Mail eine Antwort zu <message-id> machen"
-#: builtin/log.c:1425 builtin/log.c:1428
+#: builtin/log.c:1452 builtin/log.c:1455
msgid "boundary"
msgstr "Grenze"
-#: builtin/log.c:1426
+#: builtin/log.c:1453
msgid "attach the patch"
msgstr "den Patch anhängen"
-#: builtin/log.c:1429
+#: builtin/log.c:1456
msgid "inline the patch"
msgstr "den Patch direkt in die Nachricht einfügen"
-#: builtin/log.c:1433
+#: builtin/log.c:1460
msgid "enable message threading, styles: shallow, deep"
msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
-#: builtin/log.c:1435
+#: builtin/log.c:1462
msgid "signature"
msgstr "Signatur"
-#: builtin/log.c:1436
+#: builtin/log.c:1463
msgid "add a signature"
msgstr "eine Signatur hinzufügen"
-#: builtin/log.c:1437
+#: builtin/log.c:1464
msgid "base-commit"
msgstr "Basis-Commit"
-#: builtin/log.c:1438
+#: builtin/log.c:1465
msgid "add prerequisite tree info to the patch series"
msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen"
-#: builtin/log.c:1440
+#: builtin/log.c:1467
msgid "add a signature from a file"
msgstr "eine Signatur aus einer Datei hinzufügen"
-#: builtin/log.c:1441
+#: builtin/log.c:1468
msgid "don't print the patch filenames"
msgstr "keine Dateinamen der Patches anzeigen"
-#: builtin/log.c:1531
+#: builtin/log.c:1558
msgid "-n and -k are mutually exclusive."
msgstr "Die Optionen -n und -k schließen sich gegenseitig aus."
-#: builtin/log.c:1533
+#: builtin/log.c:1560
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "Die Optionen --subject-prefix und -k schließen sich gegenseitig aus."
-#: builtin/log.c:1541
+#: builtin/log.c:1568
msgid "--name-only does not make sense"
msgstr "Die Option --name-only kann nicht verwendet werden."
-#: builtin/log.c:1543
+#: builtin/log.c:1570
msgid "--name-status does not make sense"
msgstr "Die Option --name-status kann nicht verwendet werden."
-#: builtin/log.c:1545
+#: builtin/log.c:1572
msgid "--check does not make sense"
msgstr "Die Option --check kann nicht verwendet werden."
-#: builtin/log.c:1573
+#: builtin/log.c:1602
msgid "standard output, or directory, which one?"
msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?"
-#: builtin/log.c:1575
+#: builtin/log.c:1604
#, c-format
msgid "Could not create directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/log.c:1672
+#: builtin/log.c:1698
#, c-format
msgid "unable to read signature file '%s'"
msgstr "Konnte Signatur-Datei '%s' nicht lesen"
-#: builtin/log.c:1743
+#: builtin/log.c:1769
msgid "Failed to create output files"
msgstr "Fehler beim Erstellen der Ausgabedateien."
-#: builtin/log.c:1792
+#: builtin/log.c:1818
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
-#: builtin/log.c:1846
+#: builtin/log.c:1872
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -8084,104 +8466,104 @@ msgstr ""
"Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> "
"manuell an.\n"
-#: builtin/ls-files.c:378
+#: builtin/ls-files.c:379
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<Optionen>] [<Datei>...]"
-#: builtin/ls-files.c:427
+#: builtin/ls-files.c:428
msgid "identify the file status with tags"
msgstr "den Dateistatus mit Tags anzeigen"
-#: builtin/ls-files.c:429
+#: builtin/ls-files.c:430
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
"Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung verwenden"
-#: builtin/ls-files.c:431
+#: builtin/ls-files.c:432
msgid "show cached files in the output (default)"
msgstr "zwischengespeicherte Dateien in der Ausgabe anzeigen (Standard)"
-#: builtin/ls-files.c:433
+#: builtin/ls-files.c:434
msgid "show deleted files in the output"
msgstr "entfernte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:435
+#: builtin/ls-files.c:436
msgid "show modified files in the output"
msgstr "geänderte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:437
+#: builtin/ls-files.c:438
msgid "show other files in the output"
msgstr "sonstige Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:439
+#: builtin/ls-files.c:440
msgid "show ignored files in the output"
msgstr "ignorierte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:442
+#: builtin/ls-files.c:443
msgid "show staged contents' object name in the output"
msgstr ""
"Objektnamen von Inhalten, die zum Commit vorgemerkt sind, in der Ausgabe "
"anzeigen"
-#: builtin/ls-files.c:444
+#: builtin/ls-files.c:445
msgid "show files on the filesystem that need to be removed"
msgstr "Dateien im Dateisystem, die gelöscht werden müssen, anzeigen"
-#: builtin/ls-files.c:446
+#: builtin/ls-files.c:447
msgid "show 'other' directories' names only"
msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen"
-#: builtin/ls-files.c:448
+#: builtin/ls-files.c:449
msgid "show line endings of files"
msgstr "Zeilenenden von Dateien anzeigen"
-#: builtin/ls-files.c:450
+#: builtin/ls-files.c:451
msgid "don't show empty directories"
msgstr "keine leeren Verzeichnisse anzeigen"
-#: builtin/ls-files.c:453
+#: builtin/ls-files.c:454
msgid "show unmerged files in the output"
msgstr "nicht zusammengeführte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:455
+#: builtin/ls-files.c:456
msgid "show resolve-undo information"
msgstr "'resolve-undo' Informationen anzeigen"
-#: builtin/ls-files.c:457
+#: builtin/ls-files.c:458
msgid "skip files matching pattern"
msgstr "Dateien auslassen, die einem Muster entsprechen"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:461
msgid "exclude patterns are read from <file>"
msgstr "Muster, gelesen von <Datei>, ausschließen"
-#: builtin/ls-files.c:463
+#: builtin/ls-files.c:464
msgid "read additional per-directory exclude patterns in <file>"
msgstr "zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei> auslesen"
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:466
msgid "add the standard git exclusions"
msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen"
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:469
msgid "make the output relative to the project top directory"
msgstr "Ausgabe relativ zum Projektverzeichnis"
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:472
msgid "if any <file> is not in the index, treat this as an error"
msgstr "als Fehler behandeln, wenn sich eine <Datei> nicht im Index befindet"
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:473
msgid "tree-ish"
msgstr "Commit-Referenz"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:474
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"vorgeben, dass Pfade, die seit <Commit-Referenz> gelöscht wurden, immer noch "
"vorhanden sind"
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:476
msgid "show debugging data"
msgstr "Ausgaben zur Fehlersuche anzeigen"
@@ -8271,191 +8653,177 @@ msgstr ""
"das gesamte Verzeichnis auflisten; nicht nur das aktuelle Verzeichnis "
"(impliziert --full-name)"
-#: builtin/merge.c:45
+#: builtin/merge.c:46
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<Optionen>] [<Commit>...]"
-#: builtin/merge.c:46
+#: builtin/merge.c:47
msgid "git merge [<options>] <msg> HEAD <commit>"
msgstr "git merge [<Optionen>] <Beschreibung> HEAD <Commit>"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:101
+#: builtin/merge.c:102
msgid "switch `m' requires a value"
msgstr "Schalter 'm' erfordert einen Wert."
-#: builtin/merge.c:138
+#: builtin/merge.c:139
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
-#: builtin/merge.c:139
+#: builtin/merge.c:140
#, c-format
msgid "Available strategies are:"
msgstr "Verfügbare Strategien sind:"
-#: builtin/merge.c:144
+#: builtin/merge.c:145
#, c-format
msgid "Available custom strategies are:"
msgstr "Verfügbare benutzerdefinierte Strategien sind:"
-#: builtin/merge.c:194 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:126
msgid "do not show a diffstat at the end of the merge"
msgstr "keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:129
msgid "show a diffstat at the end of the merge"
msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
-#: builtin/merge.c:198 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:132
msgid "(synonym to --stat)"
msgstr "(Synonym für --stat)"
-#: builtin/merge.c:200 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:135
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"(höchstens <n>) Einträge von \"shortlog\" zur Beschreibung des Merge-Commits "
"hinzufügen"
-#: builtin/merge.c:203 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:138
msgid "create a single commit instead of doing a merge"
msgstr "einen einzelnen Commit anstatt eines Merges erzeugen"
-#: builtin/merge.c:205 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:141
msgid "perform a commit if the merge succeeds (default)"
msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)"
-#: builtin/merge.c:207 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:144
msgid "edit message before committing"
msgstr "Bearbeitung der Beschreibung vor dem Commit"
-#: builtin/merge.c:208
+#: builtin/merge.c:209
msgid "allow fast-forward (default)"
msgstr "Vorspulen erlauben (Standard)"
-#: builtin/merge.c:210 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:150
msgid "abort if fast-forward is not possible"
msgstr "abbrechen, wenn kein Vorspulen möglich ist"
-#: builtin/merge.c:214
-msgid "Verify that the named commit has a valid GPG signature"
+#: builtin/merge.c:215 builtin/pull.c:153
+msgid "verify that the named commit has a valid GPG signature"
msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen"
-#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157
#: builtin/revert.c:89
msgid "strategy"
msgstr "Strategie"
-#: builtin/merge.c:216 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:158
msgid "merge strategy to use"
msgstr "zu verwendende Merge-Strategie"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:161
msgid "option=value"
msgstr "Option=Wert"
-#: builtin/merge.c:218 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:162
msgid "option for selected merge strategy"
msgstr "Option für ausgewählte Merge-Strategie"
-#: builtin/merge.c:220
+#: builtin/merge.c:221
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"Commit-Beschreibung zusammenführen (für einen Merge, der kein Vorspulen war)"
-#: builtin/merge.c:224
+#: builtin/merge.c:225
msgid "abort the current in-progress merge"
msgstr "den sich im Gange befindlichen Merge abbrechen"
-#: builtin/merge.c:226 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:169
msgid "allow merging unrelated histories"
msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien"
-#: builtin/merge.c:254
+#: builtin/merge.c:255
msgid "could not run stash."
msgstr "Konnte \"stash\" nicht ausführen."
-#: builtin/merge.c:259
+#: builtin/merge.c:260
msgid "stash failed"
msgstr "\"stash\" fehlgeschlagen"
-#: builtin/merge.c:264
+#: builtin/merge.c:265
#, c-format
msgid "not a valid object: %s"
msgstr "kein gültiges Objekt: %s"
-#: builtin/merge.c:283 builtin/merge.c:300
+#: builtin/merge.c:284 builtin/merge.c:301
msgid "read-tree failed"
msgstr "read-tree fehlgeschlagen"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
msgid " (nothing to squash)"
msgstr " (nichts zu quetschen)"
-#: builtin/merge.c:343
+#: builtin/merge.c:342
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n"
-#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
-#: builtin/merge.c:1000
-#, c-format
-msgid "Could not write to '%s'"
-msgstr "Konnte nicht nach '%s' schreiben."
-
-#: builtin/merge.c:375
-msgid "Writing SQUASH_MSG"
-msgstr "Schreibe SQUASH_MSG"
-
-#: builtin/merge.c:377
-msgid "Finishing SQUASH_MSG"
-msgstr "Schließe SQUASH_MSG ab"
-
-#: builtin/merge.c:400
+#: builtin/merge.c:392
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n"
-#: builtin/merge.c:451
+#: builtin/merge.c:443
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' zeigt auf keinen Commit"
-#: builtin/merge.c:541
+#: builtin/merge.c:533
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Ungültiger branch.%s.mergeoptions String: %s"
-#: builtin/merge.c:660
+#: builtin/merge.c:652
msgid "Not handling anything other than two heads merge."
msgstr "Es wird nur der Merge von zwei Branches behandelt."
-#: builtin/merge.c:674
+#: builtin/merge.c:666
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Unbekannte Option für merge-recursive: -X%s"
-#: builtin/merge.c:687
+#: builtin/merge.c:681
#, c-format
msgid "unable to write %s"
msgstr "konnte %s nicht schreiben"
-#: builtin/merge.c:776
+#: builtin/merge.c:733
#, c-format
msgid "Could not read from '%s'"
msgstr "konnte nicht von '%s' lesen"
-#: builtin/merge.c:785
+#: builtin/merge.c:742
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Merge wurde nicht committet; benutzen Sie 'git commit', um den Merge "
"abzuschließen.\n"
-#: builtin/merge.c:791
+#: builtin/merge.c:748
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -8471,55 +8839,69 @@ msgstr ""
"Zeilen beginnend mit '%c' werden ignoriert, und eine leere Beschreibung\n"
"bricht den Commit ab.\n"
-#: builtin/merge.c:815
+#: builtin/merge.c:772
msgid "Empty commit message."
msgstr "Leere Commit-Beschreibung"
-#: builtin/merge.c:835
+#: builtin/merge.c:792
#, c-format
msgid "Wonderful.\n"
msgstr "Wunderbar.\n"
-#: builtin/merge.c:890
+#: builtin/merge.c:847
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen "
"Sie dann das Ergebnis.\n"
-#: builtin/merge.c:906
+#: builtin/merge.c:863
#, c-format
msgid "'%s' is not a commit"
msgstr "'%s' ist kein Commit"
-#: builtin/merge.c:947
+#: builtin/merge.c:904
msgid "No current branch."
msgstr "Sie befinden sich auf keinem Branch."
-#: builtin/merge.c:949
+#: builtin/merge.c:906
msgid "No remote for the current branch."
msgstr "Kein Remote-Repository für den aktuellen Branch."
-#: builtin/merge.c:951
+#: builtin/merge.c:908
msgid "No default upstream defined for the current branch."
msgstr ""
"Es ist kein Standard-Upstream-Branch für den aktuellen Branch definiert."
-#: builtin/merge.c:956
+#: builtin/merge.c:913
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Kein Remote-Tracking-Branch für %s von %s"
-#: builtin/merge.c:1091
+#: builtin/merge.c:960
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'"
+
+#: builtin/merge.c:1034
#, c-format
msgid "could not close '%s'"
msgstr "Konnte '%s' nicht schließen"
-#: builtin/merge.c:1219
+#: builtin/merge.c:1061
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "nichts was wir in %s zusammenführen können: %s"
+
+#: builtin/merge.c:1095
+msgid "not something we can merge"
+msgstr "nichts was wir zusammenführen können"
+
+#: builtin/merge.c:1162
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Es gibt keinen Merge zum Abbrechen (MERGE_HEAD fehlt)"
-#: builtin/merge.c:1235
+#: builtin/merge.c:1178
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8527,7 +8909,7 @@ msgstr ""
"Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n"
"Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
-#: builtin/merge.c:1242
+#: builtin/merge.c:1185
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8535,109 +8917,117 @@ msgstr ""
"Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n"
"Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
-#: builtin/merge.c:1245
+#: builtin/merge.c:1188
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
"Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)."
-#: builtin/merge.c:1254
+#: builtin/merge.c:1197
msgid "You cannot combine --squash with --no-ff."
msgstr "Sie können --squash nicht mit --no-ff kombinieren."
-#: builtin/merge.c:1262
+#: builtin/merge.c:1205
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
-#: builtin/merge.c:1279
+#: builtin/merge.c:1222
msgid "Squash commit into empty head not supported yet"
msgstr ""
"Bin auf einem Commit, der noch geboren wird; kann \"squash\" nicht ausführen."
-#: builtin/merge.c:1281
+#: builtin/merge.c:1224
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Nicht vorzuspulender Commit kann nicht in einem leeren Branch verwendet "
"werden."
-#: builtin/merge.c:1286
+#: builtin/merge.c:1229
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - nichts was wir zusammenführen können"
-#: builtin/merge.c:1288
+#: builtin/merge.c:1231
msgid "Can merge only exactly one commit into empty head"
msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen."
-#: builtin/merge.c:1344
+#: builtin/merge.c:1287
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Commit %s hat eine nicht vertrauenswürdige GPG-Signatur, angeblich von %s."
-#: builtin/merge.c:1347
+#: builtin/merge.c:1290
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Commit %s hat eine ungültige GPG-Signatur, angeblich von %s."
-#: builtin/merge.c:1350
+#: builtin/merge.c:1293
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Commit %s hat keine GPG-Signatur."
-#: builtin/merge.c:1353
+#: builtin/merge.c:1296
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Commit %s hat eine gültige GPG-Signatur von %s\n"
-#: builtin/merge.c:1415
+#: builtin/merge.c:1358
msgid "refusing to merge unrelated histories"
msgstr "Verweigere den Merge von nicht zusammenhängenden Historien."
-#: builtin/merge.c:1439
+#: builtin/merge.c:1367
+msgid "Already up-to-date."
+msgstr "Bereits aktuell."
+
+#: builtin/merge.c:1382
#, c-format
msgid "Updating %s..%s\n"
msgstr "Aktualisiere %s..%s\n"
-#: builtin/merge.c:1476
+#: builtin/merge.c:1419
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
-#: builtin/merge.c:1483
+#: builtin/merge.c:1426
#, c-format
msgid "Nope.\n"
msgstr "Nein.\n"
-#: builtin/merge.c:1515
+#: builtin/merge.c:1451
+msgid "Already up-to-date. Yeeah!"
+msgstr "Bereits aktuell."
+
+#: builtin/merge.c:1457
msgid "Not possible to fast-forward, aborting."
msgstr "Vorspulen nicht möglich, breche ab."
-#: builtin/merge.c:1538 builtin/merge.c:1617
+#: builtin/merge.c:1480 builtin/merge.c:1559
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n"
-#: builtin/merge.c:1542
+#: builtin/merge.c:1484
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Probiere Merge-Strategie %s ...\n"
-#: builtin/merge.c:1608
+#: builtin/merge.c:1550
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
-#: builtin/merge.c:1610
+#: builtin/merge.c:1552
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
-#: builtin/merge.c:1619
+#: builtin/merge.c:1561
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Benutzen Sie \"%s\", um die Auflösung per Hand vorzubereiten.\n"
-#: builtin/merge.c:1631
+#: builtin/merge.c:1573
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -8768,68 +9158,68 @@ msgstr "Verschieben/Umbenennen erzwingen, auch wenn das Ziel existiert"
msgid "skip move/rename errors"
msgstr "Fehler beim Verschieben oder Umbenennen überspringen"
-#: builtin/mv.c:152
+#: builtin/mv.c:155
#, c-format
msgid "destination '%s' is not a directory"
msgstr "Ziel '%s' ist kein Verzeichnis"
-#: builtin/mv.c:163
+#: builtin/mv.c:166
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Prüfe Umbenennung von '%s' nach '%s'\n"
-#: builtin/mv.c:167
+#: builtin/mv.c:170
msgid "bad source"
msgstr "ungültige Quelle"
-#: builtin/mv.c:170
+#: builtin/mv.c:173
msgid "can not move directory into itself"
msgstr "kann Verzeichnis nicht in sich selbst verschieben"
-#: builtin/mv.c:173
+#: builtin/mv.c:176
msgid "cannot move directory over file"
msgstr "kann Verzeichnis nicht über Datei verschieben"
-#: builtin/mv.c:182
+#: builtin/mv.c:185
msgid "source directory is empty"
msgstr "Quellverzeichnis ist leer"
-#: builtin/mv.c:207
+#: builtin/mv.c:210
msgid "not under version control"
msgstr "nicht unter Versionskontrolle"
-#: builtin/mv.c:210
+#: builtin/mv.c:213
msgid "destination exists"
msgstr "Ziel existiert bereits"
-#: builtin/mv.c:218
+#: builtin/mv.c:221
#, c-format
msgid "overwriting '%s'"
msgstr "überschreibe '%s'"
-#: builtin/mv.c:221
+#: builtin/mv.c:224
msgid "Cannot overwrite"
msgstr "Kann nicht überschreiben"
-#: builtin/mv.c:224
+#: builtin/mv.c:227
msgid "multiple sources for the same target"
msgstr "mehrere Quellen für das selbe Ziel"
-#: builtin/mv.c:226
+#: builtin/mv.c:229
msgid "destination directory does not exist"
msgstr "Zielverzeichnis existiert nicht"
-#: builtin/mv.c:233
+#: builtin/mv.c:236
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, Quelle=%s, Ziel=%s"
-#: builtin/mv.c:254
+#: builtin/mv.c:257
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Benenne %s nach %s um\n"
-#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
#, c-format
msgid "renaming '%s' failed"
msgstr "Umbenennung von '%s' fehlgeschlagen"
@@ -8986,6 +9376,10 @@ msgstr "git notes prune [<Optionen>]"
msgid "git notes get-ref"
msgstr "git notes get-ref"
+#: builtin/notes.c:94
+msgid "Write/edit the notes for the following object:"
+msgstr "Schreiben/Bearbeiten der Notizen für das folgende Objekt:"
+
#: builtin/notes.c:147
#, c-format
msgid "unable to start 'show' for object '%s'"
@@ -9000,81 +9394,76 @@ msgstr "Konnte Ausgabe von 'show' nicht lesen."
msgid "failed to finish 'show' for object '%s'"
msgstr "konnte 'show' für Objekt '%s' nicht abschließen"
-#: builtin/notes.c:174 builtin/tag.c:248
-#, c-format
-msgid "could not create file '%s'"
-msgstr "konnte Datei '%s' nicht erstellen"
-
-#: builtin/notes.c:193
+#: builtin/notes.c:194
msgid "Please supply the note contents using either -m or -F option"
msgstr ""
"Bitte liefern Sie den Notiz-Inhalt unter Verwendung der Option -m oder -F."
-#: builtin/notes.c:202
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "Konnte Notiz-Objekt nicht schreiben"
-#: builtin/notes.c:204
+#: builtin/notes.c:205
#, c-format
msgid "The note contents have been left in %s"
msgstr "Die Notiz-Inhalte wurden in %s belassen"
-#: builtin/notes.c:232 builtin/tag.c:439
+#: builtin/notes.c:233 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr "kann '%s' nicht lesen"
-#: builtin/notes.c:234 builtin/tag.c:442
+#: builtin/notes.c:235 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr "konnte '%s' nicht öffnen oder lesen"
-#: builtin/notes.c:256
+#: builtin/notes.c:257
#, c-format
msgid "Failed to read object '%s'."
msgstr "Fehler beim Lesen des Objektes '%s'."
-#: builtin/notes.c:260
+#: builtin/notes.c:261
#, c-format
msgid "Cannot read note data from non-blob object '%s'."
msgstr "Kann Notiz-Daten nicht von Nicht-Blob Objekt '%s' lesen."
-#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
-#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:946
+#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
+#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
+#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
msgid "too many parameters"
msgstr "zu viele Parameter"
-#: builtin/notes.c:375 builtin/notes.c:662
+#: builtin/notes.c:376 builtin/notes.c:663
#, c-format
msgid "No note found for object %s."
msgstr "Keine Notiz für Objekt %s gefunden."
-#: builtin/notes.c:396 builtin/notes.c:559
+#: builtin/notes.c:397 builtin/notes.c:560
msgid "note contents as a string"
msgstr "Notizinhalte als Zeichenkette"
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:400 builtin/notes.c:563
msgid "note contents in a file"
msgstr "Notizinhalte in einer Datei"
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "reuse and edit specified note object"
msgstr "Wiederverwendung und Bearbeitung des angegebenen Notiz-Objektes"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "reuse specified note object"
msgstr "Wiederverwendung des angegebenen Notiz-Objektes"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "allow storing empty note"
msgstr "Speichern leerer Notiz erlauben"
-#: builtin/notes.c:409 builtin/notes.c:480
+#: builtin/notes.c:410 builtin/notes.c:481
msgid "replace existing notes"
msgstr "existierende Notizen ersetzen"
-#: builtin/notes.c:434
+#: builtin/notes.c:435
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -9083,31 +9472,31 @@ msgstr ""
"Konnte Notizen nicht hinzufügen. Existierende Notizen für Objekt %s "
"gefunden. Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
-#: builtin/notes.c:449 builtin/notes.c:528
+#: builtin/notes.c:450 builtin/notes.c:529
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Überschreibe existierende Notizen für Objekt %s\n"
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
+#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
#, c-format
msgid "Removing note for object %s\n"
msgstr "Entferne Notiz für Objekt %s\n"
-#: builtin/notes.c:481
+#: builtin/notes.c:482
msgid "read objects from stdin"
msgstr "Objekte von der Standard-Eingabe lesen"
-#: builtin/notes.c:483
+#: builtin/notes.c:484
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"Konfiguration für <Befehl> zum Umschreiben von Commits laden (impliziert --"
"stdin)"
-#: builtin/notes.c:501
+#: builtin/notes.c:502
msgid "too few parameters"
msgstr "zu wenig Parameter"
-#: builtin/notes.c:522
+#: builtin/notes.c:523
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -9116,12 +9505,12 @@ msgstr ""
"Kann Notizen nicht kopieren. Existierende Notizen für Objekt %s gefunden. "
"Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
-#: builtin/notes.c:534
+#: builtin/notes.c:535
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr "Keine Notizen für Quell-Objekt %s. Kopie nicht möglich."
-#: builtin/notes.c:586
+#: builtin/notes.c:587
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -9130,15 +9519,20 @@ msgstr ""
"Die Optionen -m/-F/-c/-C sind für den Unterbefehl 'edit' veraltet.\n"
"Bitte benutzen Sie stattdessen 'git notes add -f -m/-F/-c/-C'.\n"
-#: builtin/notes.c:768
+#: builtin/notes.c:753
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "unbekannte Merge-Strategie '%s' für Notizen"
+
+#: builtin/notes.c:769
msgid "General options"
msgstr "Allgemeine Optionen"
-#: builtin/notes.c:770
+#: builtin/notes.c:771
msgid "Merge options"
msgstr "Merge-Optionen"
-#: builtin/notes.c:772
+#: builtin/notes.c:773
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -9146,51 +9540,88 @@ msgstr ""
"löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:774
+#: builtin/notes.c:775
msgid "Committing unmerged notes"
msgstr "nicht zusammengeführte Notizen eintragen"
-#: builtin/notes.c:776
+#: builtin/notes.c:777
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"Merge von Notizen abschließen, in dem nicht zusammengeführte Notizen "
"committet werden"
-#: builtin/notes.c:778
+#: builtin/notes.c:779
msgid "Aborting notes merge resolution"
msgstr "Konfliktauflösung beim Merge von Notizen abbrechen"
-#: builtin/notes.c:780
+#: builtin/notes.c:781
msgid "abort notes merge"
msgstr "Merge von Notizen abbrechen"
-#: builtin/notes.c:857
+#: builtin/notes.c:792
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "Kann --commit, --abort oder -s/--strategy nicht kombinieren."
+
+#: builtin/notes.c:797
+msgid "Must specify a notes ref to merge"
+msgstr "Sie müssen eine Notiz-Referenz zum Mergen angeben."
+
+#: builtin/notes.c:821
+#, c-format
+msgid "Unknown -s/--strategy: %s"
+msgstr "Unbekannter Wert für -s/--strategy: %s"
+
+#: builtin/notes.c:858
#, c-format
msgid "A notes merge into %s is already in-progress at %s"
msgstr "Ein Merge von Notizen nach %s ist bereits im Gange bei %s"
-#: builtin/notes.c:884
+#: builtin/notes.c:861
+#, c-format
+msgid "Failed to store link to current notes ref (%s)"
+msgstr "Fehler beim Speichern der Verknüpfung zur aktuellen Notes-Referenz (%s)"
+
+#: builtin/notes.c:863
+#, c-format
+msgid ""
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
+msgstr ""
+"Automatisches Zusammenführen der Notizen fehlgeschlagen. Beheben Sie die\n"
+"Konflikte in %s und committen Sie das Ergebnis mit 'git notes merge --commit',\n"
+"oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n"
+
+#: builtin/notes.c:885
#, c-format
msgid "Object %s has no note\n"
msgstr "Objekt %s hat keine Notiz\n"
-#: builtin/notes.c:896
+#: builtin/notes.c:897
msgid "attempt to remove non-existent note is not an error"
msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler"
-#: builtin/notes.c:899
+#: builtin/notes.c:900
msgid "read object names from the standard input"
msgstr "Objektnamen von der Standard-Eingabe lesen"
-#: builtin/notes.c:980
+#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+msgid "do not remove, show only"
+msgstr "nicht löschen, nur anzeigen"
+
+#: builtin/notes.c:939
+msgid "report pruned notes"
+msgstr "gelöschte Notizen melden"
+
+#: builtin/notes.c:981
msgid "notes-ref"
msgstr "Notiz-Referenz"
-#: builtin/notes.c:981
+#: builtin/notes.c:982
msgid "use notes from <notes-ref>"
msgstr "Notizen von <Notiz-Referenz> verwenden"
-#: builtin/notes.c:1016 builtin/remote.c:1628
+#: builtin/notes.c:1017 builtin/remote.c:1623
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Unbekannter Unterbefehl: %s"
@@ -9209,187 +9640,192 @@ msgstr ""
"git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < "
"<Objektliste>]"
-#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
+#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
#, c-format
msgid "deflate error (%d)"
msgstr "Fehler beim Komprimieren (%d)"
-#: builtin/pack-objects.c:763
+#: builtin/pack-objects.c:766
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"Deaktiviere Schreiben der Bitmap, Pakete wurden durch pack.packSizeLimit\n"
"aufgetrennt."
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:779
msgid "Writing objects"
msgstr "Schreibe Objekte"
-#: builtin/pack-objects.c:1017
+#: builtin/pack-objects.c:1037
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-"Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-Datei\n"
+"Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-"
+"Datei\n"
"geschrieben wurden."
-#: builtin/pack-objects.c:2177
+#: builtin/pack-objects.c:2197
msgid "Compressing objects"
msgstr "Komprimiere Objekte"
-#: builtin/pack-objects.c:2563
+#: builtin/pack-objects.c:2611
#, c-format
msgid "unsupported index version %s"
msgstr "Nicht unterstützte Index-Version %s"
-#: builtin/pack-objects.c:2567
+#: builtin/pack-objects.c:2615
#, c-format
msgid "bad index version '%s'"
msgstr "Ungültige Index-Version '%s'"
-#: builtin/pack-objects.c:2597
+#: builtin/pack-objects.c:2645
msgid "do not show progress meter"
msgstr "keine Fortschrittsanzeige anzeigen"
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2647
msgid "show progress meter"
msgstr "Fortschrittsanzeige anzeigen"
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2649
msgid "show progress meter during object writing phase"
msgstr ""
"Forschrittsanzeige während der Phase des Schreibens der Objekte anzeigen"
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2652
msgid "similar to --all-progress when progress meter is shown"
msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
-#: builtin/pack-objects.c:2605
+#: builtin/pack-objects.c:2653
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2654
msgid "write the pack index file in the specified idx format version"
msgstr ""
"die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben"
-#: builtin/pack-objects.c:2609
+#: builtin/pack-objects.c:2657
msgid "maximum size of each output pack file"
msgstr "maximale Größe für jede ausgegebene Paketdatei"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2659
msgid "ignore borrowed objects from alternate object store"
msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren"
-#: builtin/pack-objects.c:2613
+#: builtin/pack-objects.c:2661
msgid "ignore packed objects"
msgstr "gepackte Objekte ignorieren"
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2663
msgid "limit pack window by objects"
msgstr "Paketfenster durch Objekte begrenzen"
-#: builtin/pack-objects.c:2617
+#: builtin/pack-objects.c:2665
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen"
-#: builtin/pack-objects.c:2619
+#: builtin/pack-objects.c:2667
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"maximale Länge der erlaubten Differenzverkettung im resultierenden Paket"
-#: builtin/pack-objects.c:2621
+#: builtin/pack-objects.c:2669
msgid "reuse existing deltas"
msgstr "existierende Unterschiede wiederverwenden"
-#: builtin/pack-objects.c:2623
+#: builtin/pack-objects.c:2671
msgid "reuse existing objects"
msgstr "existierende Objekte wiederverwenden"
-#: builtin/pack-objects.c:2625
+#: builtin/pack-objects.c:2673
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA Objekte verwenden"
-#: builtin/pack-objects.c:2627
+#: builtin/pack-objects.c:2675
msgid "use threads when searching for best delta matches"
msgstr ""
"Threads bei der Suche nach den besten Ãœbereinstimmungen bei Unterschieden "
"verwenden"
-#: builtin/pack-objects.c:2629
+#: builtin/pack-objects.c:2677
msgid "do not create an empty pack output"
msgstr "keine leeren Pakete erzeugen"
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2679
msgid "read revision arguments from standard input"
msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen"
-#: builtin/pack-objects.c:2633
+#: builtin/pack-objects.c:2681
msgid "limit the objects to those that are not yet packed"
msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen"
-#: builtin/pack-objects.c:2636
+#: builtin/pack-objects.c:2684
msgid "include objects reachable from any reference"
msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind"
-#: builtin/pack-objects.c:2639
+#: builtin/pack-objects.c:2687
msgid "include objects referred by reflog entries"
msgstr ""
"Objekte einschließen, die von Einträgen des Reflogs referenziert werden"
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2690
msgid "include objects referred to by the index"
msgstr "Objekte einschließen, die vom Index referenziert werden"
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2693
msgid "output pack to stdout"
msgstr "Paket in die Standard-Ausgabe schreiben"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2695
msgid "include tag objects that refer to objects to be packed"
msgstr "Tag-Objekte einschließen, die auf gepackte Objekte referenzieren"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2697
msgid "keep unreachable objects"
msgstr "nicht erreichbare Objekte behalten"
-#: builtin/pack-objects.c:2650 parse-options.h:142
+#: builtin/pack-objects.c:2699
+msgid "pack loose unreachable objects"
+msgstr "nicht erreichbare lose Objekte packen"
+
+#: builtin/pack-objects.c:2700 parse-options.h:142
msgid "time"
msgstr "Zeit"
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2701
msgid "unpack unreachable objects newer than <time>"
msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2704
msgid "create thin packs"
msgstr "dünnere Pakete erzeugen"
-#: builtin/pack-objects.c:2656
+#: builtin/pack-objects.c:2706
msgid "create packs suitable for shallow fetches"
msgstr ""
"Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen"
-#: builtin/pack-objects.c:2658
+#: builtin/pack-objects.c:2708
msgid "ignore packs that have companion .keep file"
msgstr "Pakete ignorieren, die .keep Dateien haben"
-#: builtin/pack-objects.c:2660
+#: builtin/pack-objects.c:2710
msgid "pack compression level"
msgstr "Komprimierungsgrad für Paketierung"
-#: builtin/pack-objects.c:2662
+#: builtin/pack-objects.c:2712
msgid "do not hide commits by grafts"
msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen"
-#: builtin/pack-objects.c:2664
+#: builtin/pack-objects.c:2714
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung benutzen"
-#: builtin/pack-objects.c:2666
+#: builtin/pack-objects.c:2716
msgid "write a bitmap index together with the pack index"
msgstr "Bitmap-Index zusammen mit Pack-Index schreiben"
-#: builtin/pack-objects.c:2757
+#: builtin/pack-objects.c:2829
msgid "Counting objects"
msgstr "Zähle Objekte"
@@ -9417,15 +9853,11 @@ msgstr "Lösche doppelte Objekte"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <Zeit>] [--] [<head>...]"
-#: builtin/prune.c:105 builtin/worktree.c:125
-msgid "do not remove, show only"
-msgstr "nicht löschen, nur anzeigen"
-
-#: builtin/prune.c:106 builtin/worktree.c:126
+#: builtin/prune.c:106 builtin/worktree.c:128
msgid "report pruned objects"
msgstr "gelöschte Objekte melden"
-#: builtin/prune.c:109 builtin/worktree.c:128
+#: builtin/prune.c:109 builtin/worktree.c:130
msgid "expire objects older than <time>"
msgstr "Objekte älter als <Zeit> verfallen lassen"
@@ -9445,14 +9877,10 @@ msgstr "Optionen bezogen auf Merge"
msgid "incorporate changes by rebasing rather than merging"
msgstr "Integration von Änderungen durch Rebase statt Merge"
-#: builtin/pull.c:147 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "Vorspulen erlauben"
-#: builtin/pull.c:153
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen"
-
#: builtin/pull.c:156
msgid "automatically stash/stash pop before and after rebase"
msgstr "automatischer Stash/Stash-Pop vor und nach eines Rebase"
@@ -9470,17 +9898,17 @@ msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule"
msgid "Invalid value for pull.ff: %s"
msgstr "Ungültiger Wert für pull.ff: %s"
-#: builtin/pull.c:379
+#: builtin/pull.c:379 git-sh-setup.sh:226
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
"Kann \"pull\" mit \"rebase\" nicht ausführen: Sie haben Änderungen, die "
"nicht zum Commit vorgemerkt sind."
-#: builtin/pull.c:385
+#: builtin/pull.c:385 git-sh-setup.sh:252
msgid "Additionally, your index contains uncommitted changes."
msgstr "Zusätzlich beinhaltet die Staging-Area nicht committete Änderungen."
-#: builtin/pull.c:387
+#: builtin/pull.c:387 git-sh-setup.sh:245
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
"Kann \"pull\" mit \"rebase\" nicht ausführen: Die Staging-Area beinhaltet "
@@ -9544,7 +9972,7 @@ msgstr "Siehe git-pull(1) für weitere Details."
msgid "<remote>"
msgstr "<Remote-Repository>"
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<Branch>"
@@ -9557,7 +9985,8 @@ msgstr "Es gibt keine Tracking-Informationen für den aktuellen Branch."
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
-"Wenn Sie Tracking-Informationen für diesen Branch setzen möchten, können Sie\n"
+"Wenn Sie Tracking-Informationen für diesen Branch setzen möchten, können "
+"Sie\n"
"dies tun mit:"
#: builtin/pull.c:503
@@ -9570,17 +9999,21 @@ msgstr ""
"des Remote-Repositories durchzuführen, aber diese Referenz\n"
"wurde nicht angefordert."
-#: builtin/pull.c:864
+#: builtin/pull.c:820
+msgid "ignoring --verify-signatures for rebase"
+msgstr "Ignoriere --verify-signatures für Rebase"
+
+#: builtin/pull.c:867
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash ist nur mit --rebase zulässig."
-#: builtin/pull.c:872
+#: builtin/pull.c:875
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Aktualisiere einen ungeborenen Branch mit Änderungen, die zum Commit "
"vorgemerkt sind."
-#: builtin/pull.c:900
+#: builtin/pull.c:903
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -9590,7 +10023,7 @@ msgstr ""
"\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
"Spule Ihr Arbeitsverzeichnis von Commit %s vor."
-#: builtin/pull.c:905
+#: builtin/pull.c:908
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -9607,11 +10040,11 @@ msgstr ""
"$ git reset --hard\n"
"zur Wiederherstellung aus."
-#: builtin/pull.c:920
+#: builtin/pull.c:923
msgid "Cannot merge multiple branches into empty head."
msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen."
-#: builtin/pull.c:924
+#: builtin/pull.c:927
msgid "Cannot rebase onto multiple branches."
msgstr "Kann Rebase nicht auf mehrere Branches ausführen."
@@ -9788,12 +10221,12 @@ msgstr "Versende nach %s\n"
msgid "failed to push some refs to '%s'"
msgstr "Fehler beim Versenden einiger Referenzen nach '%s'"
-#: builtin/push.c:365
+#: builtin/push.c:366
#, c-format
msgid "bad repository '%s'"
msgstr "ungültiges Repository '%s'"
-#: builtin/push.c:366
+#: builtin/push.c:367
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -9815,103 +10248,115 @@ msgstr ""
"\n"
" git push <Name>\n"
-#: builtin/push.c:381
+#: builtin/push.c:385
msgid "--all and --tags are incompatible"
msgstr "Die Optionen --all und --tags sind inkompatibel."
-#: builtin/push.c:382
+#: builtin/push.c:386
msgid "--all can't be combined with refspecs"
msgstr "Die Option --all kann nicht mit Refspecs kombiniert werden."
-#: builtin/push.c:387
+#: builtin/push.c:391
msgid "--mirror and --tags are incompatible"
msgstr "Die Optionen --mirror und --tags sind inkompatibel."
-#: builtin/push.c:388
+#: builtin/push.c:392
msgid "--mirror can't be combined with refspecs"
msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden."
-#: builtin/push.c:393
+#: builtin/push.c:397
msgid "--all and --mirror are incompatible"
msgstr "Die Optionen --all und --mirror sind inkompatibel."
-#: builtin/push.c:505
+#: builtin/push.c:515
msgid "repository"
msgstr "Repository"
-#: builtin/push.c:506 builtin/send-pack.c:161
+#: builtin/push.c:516 builtin/send-pack.c:161
msgid "push all refs"
msgstr "alle Referenzen versenden"
-#: builtin/push.c:507 builtin/send-pack.c:163
+#: builtin/push.c:517 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "alle Referenzen spiegeln"
-#: builtin/push.c:509
+#: builtin/push.c:519
msgid "delete refs"
msgstr "Referenzen löschen"
-#: builtin/push.c:510
+#: builtin/push.c:520
msgid "push tags (can't be used with --all or --mirror)"
msgstr "Tags versenden (kann nicht mit --all oder --mirror verwendet werden)"
-#: builtin/push.c:513 builtin/send-pack.c:164
+#: builtin/push.c:523 builtin/send-pack.c:164
msgid "force updates"
msgstr "Aktualisierung erzwingen"
-#: builtin/push.c:515 builtin/send-pack.c:175
+#: builtin/push.c:525 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "Referenzname>:<Erwartungswert"
-#: builtin/push.c:516 builtin/send-pack.c:176
+#: builtin/push.c:526 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "Referenz muss sich auf dem angegebenen Wert befinden"
-#: builtin/push.c:519
+#: builtin/push.c:529
msgid "control recursive pushing of submodules"
msgstr "rekursiven \"push\" von Submodulen steuern"
-#: builtin/push.c:521 builtin/send-pack.c:169
+#: builtin/push.c:531 builtin/send-pack.c:169
msgid "use thin pack"
msgstr "kleinere Pakete verwenden"
-#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
+#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "'receive pack' Programm"
-#: builtin/push.c:524
+#: builtin/push.c:534
msgid "set upstream for git pull/status"
msgstr "Upstream für \"git pull/status\" setzen"
-#: builtin/push.c:527
+#: builtin/push.c:537
msgid "prune locally removed refs"
msgstr "lokal gelöschte Referenzen entfernen"
-#: builtin/push.c:529
+#: builtin/push.c:539
msgid "bypass pre-push hook"
msgstr "\"pre-push hook\" umgehen"
-#: builtin/push.c:530
+#: builtin/push.c:540
msgid "push missing but relevant tags"
msgstr "fehlende, aber relevante Tags versenden"
-#: builtin/push.c:533 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "signiert \"push\" mit GPG"
-#: builtin/push.c:535 builtin/send-pack.c:170
+#: builtin/push.c:545 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "Referenzen atomar versenden"
-#: builtin/push.c:549
+#: builtin/push.c:546
+msgid "server-specific"
+msgstr "serverspezifisch"
+
+#: builtin/push.c:546
+msgid "option to transmit"
+msgstr "Option übertragen"
+
+#: builtin/push.c:560
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags."
-#: builtin/push.c:551
+#: builtin/push.c:562
msgid "--delete doesn't make sense without any refs"
msgstr "Die Option --delete kann nur mit Referenzen verwendet werden."
+#: builtin/push.c:579
+msgid "push options must not have new line characters"
+msgstr "Push-Optionen dürfen keine Zeilenvorschubzeichen haben"
+
#: builtin/read-tree.c:37
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
@@ -9991,11 +10436,11 @@ msgstr "Entpacken der Bäume protokollieren"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <Git-Verzeichnis>"
-#: builtin/receive-pack.c:1719
+#: builtin/receive-pack.c:1843
msgid "quiet"
msgstr "weniger Ausgaben"
-#: builtin/receive-pack.c:1733
+#: builtin/receive-pack.c:1857
msgid "You must specify a directory."
msgstr "Sie müssen ein Repository angeben."
@@ -10151,12 +10596,12 @@ msgstr ""
"Die Angabe von zu folgenden Branches kann nur mit dem Anfordern von "
"Spiegelarchiven verwendet werden."
-#: builtin/remote.c:190 builtin/remote.c:633
+#: builtin/remote.c:190 builtin/remote.c:629
#, c-format
msgid "remote %s already exists."
msgstr "externes Repository %s existiert bereits"
-#: builtin/remote.c:194 builtin/remote.c:637
+#: builtin/remote.c:194 builtin/remote.c:633
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' ist kein gültiger Name für ein Remote-Repository"
@@ -10179,17 +10624,17 @@ msgstr "(übereinstimmend)"
msgid "(delete)"
msgstr "(lösche)"
-#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
#, c-format
msgid "No such remote: %s"
msgstr "Kein solches Remote-Repository: %s"
-#: builtin/remote.c:643
+#: builtin/remote.c:639
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen"
-#: builtin/remote.c:663
+#: builtin/remote.c:659
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -10200,17 +10645,17 @@ msgstr ""
"\t%s\n"
"\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell."
-#: builtin/remote.c:699
+#: builtin/remote.c:695
#, c-format
msgid "deleting '%s' failed"
msgstr "Konnte '%s' nicht löschen"
-#: builtin/remote.c:733
+#: builtin/remote.c:729
#, c-format
msgid "creating '%s' failed"
msgstr "Konnte '%s' nicht erstellen"
-#: builtin/remote.c:796
+#: builtin/remote.c:792
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -10226,127 +10671,137 @@ msgstr[1] ""
"entfernt;\n"
"um diese zu entfernen, benutzen Sie:"
-#: builtin/remote.c:810
+#: builtin/remote.c:806
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen"
-#: builtin/remote.c:911
+#: builtin/remote.c:907
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " neu (wird bei nächstem \"fetch\" in remotes/%s gespeichert)"
-#: builtin/remote.c:914
+#: builtin/remote.c:910
msgid " tracked"
msgstr " gefolgt"
-#: builtin/remote.c:916
+#: builtin/remote.c:912
msgid " stale (use 'git remote prune' to remove)"
msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)"
-#: builtin/remote.c:918
+#: builtin/remote.c:914
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:959
+#: builtin/remote.c:955
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "ungültiges branch.%s.merge; kann Rebase nicht auf > 1 Branch ausführen"
-#: builtin/remote.c:967
+#: builtin/remote.c:963
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "interaktiver Rebase auf Remote-Branch %s"
-#: builtin/remote.c:971
+#: builtin/remote.c:964
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "Rebase auf Remote-Branch %s"
+
+#: builtin/remote.c:967
#, c-format
msgid " merges with remote %s"
msgstr " führt mit Remote-Branch %s zusammen"
-#: builtin/remote.c:972
-msgid " and with remote"
-msgstr " und mit Remote-Branch"
-
-#: builtin/remote.c:974
+#: builtin/remote.c:970
#, c-format
msgid "merges with remote %s"
msgstr "führt mit Remote-Branch %s zusammen"
-#: builtin/remote.c:975
-msgid " and with remote"
-msgstr " und mit Remote-Branch"
+#: builtin/remote.c:973
+#, c-format
+msgid "%-*s and with remote %s\n"
+msgstr "%-*s und mit Remote-Branch %s\n"
-#: builtin/remote.c:1021
+#: builtin/remote.c:1016
msgid "create"
msgstr "erstellt"
-#: builtin/remote.c:1024
+#: builtin/remote.c:1019
msgid "delete"
msgstr "gelöscht"
-#: builtin/remote.c:1028
+#: builtin/remote.c:1023
msgid "up to date"
msgstr "aktuell"
-#: builtin/remote.c:1031
+#: builtin/remote.c:1026
msgid "fast-forwardable"
msgstr "vorspulbar"
-#: builtin/remote.c:1034
+#: builtin/remote.c:1029
msgid "local out of date"
msgstr "lokal nicht aktuell"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1036
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s erzwingt Versandt nach %-*s (%s)"
-#: builtin/remote.c:1044
+#: builtin/remote.c:1039
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s versendet nach %-*s (%s)"
-#: builtin/remote.c:1048
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s erzwingt Versand nach %s"
-#: builtin/remote.c:1051
+#: builtin/remote.c:1046
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s versendet nach %s"
-#: builtin/remote.c:1119
+#: builtin/remote.c:1114
msgid "do not query remotes"
msgstr "keine Abfrage von Remote-Repositories"
-#: builtin/remote.c:1146
+#: builtin/remote.c:1141
#, c-format
msgid "* remote %s"
msgstr "* Remote-Repository %s"
-#: builtin/remote.c:1147
+#: builtin/remote.c:1142
#, c-format
msgid " Fetch URL: %s"
msgstr " URL zum Abholen: %s"
-#: builtin/remote.c:1148 builtin/remote.c:1301
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
msgid "(no URL)"
msgstr "(keine URL)"
#. TRANSLATORS: the colon ':' should align with
#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1159 builtin/remote.c:1161
+#: builtin/remote.c:1154 builtin/remote.c:1156
#, c-format
msgid " Push URL: %s"
msgstr " URL zum Versenden: %s"
-#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
+#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
#, c-format
msgid " HEAD branch: %s"
msgstr " Hauptbranch: %s"
-#: builtin/remote.c:1169
+#: builtin/remote.c:1158
+msgid "(not queried)"
+msgstr "(nicht abgefragt)"
+
+#: builtin/remote.c:1160
+msgid "(unknown)"
+msgstr "(unbekannt)"
+
+#: builtin/remote.c:1164
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -10354,159 +10809,159 @@ msgstr ""
" Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden "
"sein):\n"
-#: builtin/remote.c:1181
+#: builtin/remote.c:1176
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Remote-Branch:%s"
msgstr[1] " Remote-Branches:%s"
-#: builtin/remote.c:1184 builtin/remote.c:1211
+#: builtin/remote.c:1179 builtin/remote.c:1206
msgid " (status not queried)"
msgstr " (Zustand nicht abgefragt)"
-#: builtin/remote.c:1193
+#: builtin/remote.c:1188
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Lokaler Branch konfiguriert für 'git pull':"
msgstr[1] " Lokale Branches konfiguriert für 'git pull':"
-#: builtin/remote.c:1201
+#: builtin/remote.c:1196
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokale Referenzen werden von 'git push' gespiegelt"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1203
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Lokale Referenz konfiguriert für 'git push'%s:"
msgstr[1] " Lokale Referenzen konfiguriert für 'git push'%s:"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1224
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1226
msgid "delete refs/remotes/<name>/HEAD"
msgstr "entfernt refs/remotes/<Name>/HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1241
msgid "Cannot determine remote HEAD"
msgstr "Kann HEAD des Remote-Repositories nicht bestimmen"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1243
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Mehrere Hauptbranches im Remote-Repository. Bitte wählen Sie explizit einen "
"aus mit:"
-#: builtin/remote.c:1258
+#: builtin/remote.c:1253
#, c-format
msgid "Could not delete %s"
msgstr "Konnte %s nicht entfernen"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1261
#, c-format
msgid "Not a valid ref: %s"
msgstr "keine gültige Referenz: %s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1263
#, c-format
msgid "Could not setup %s"
msgstr "Konnte %s nicht einrichten"
-#: builtin/remote.c:1286
+#: builtin/remote.c:1281
#, c-format
msgid " %s will become dangling!"
msgstr " %s wird unreferenziert!"
-#: builtin/remote.c:1287
+#: builtin/remote.c:1282
#, c-format
msgid " %s has become dangling!"
msgstr " %s wurde unreferenziert!"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1292
#, c-format
msgid "Pruning %s"
msgstr "entferne veraltete Branches von %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1293
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1309
#, c-format
msgid " * [would prune] %s"
msgstr " * [würde veralteten Branch entfernen] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1312
#, c-format
msgid " * [pruned] %s"
msgstr "* [veralteten Branch entfernt] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1357
msgid "prune remotes after fetching"
msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\""
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
#, c-format
msgid "No such remote '%s'"
msgstr "Kein solches Remote-Repository '%s'"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1436
msgid "add branch"
msgstr "Branch hinzufügen"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1443
msgid "no remote specified"
msgstr "kein Remote-Repository angegeben"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1460
msgid "query push URLs rather than fetch URLs"
msgstr "nur URLs für Push ausgeben"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1462
msgid "return all URLs"
msgstr "alle URLs ausgeben"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1490
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "Keine URLs für Remote-Repository '%s' konfiguriert."
-#: builtin/remote.c:1521
+#: builtin/remote.c:1516
msgid "manipulate push URLs"
msgstr "URLs für \"push\" manipulieren"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1518
msgid "add URL"
msgstr "URL hinzufügen"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1520
msgid "delete URLs"
msgstr "URLs löschen"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1527
msgid "--add --delete doesn't make sense"
msgstr ""
"Die Optionen --add und --delete können nicht gemeinsam verwendet werden."
-#: builtin/remote.c:1573
+#: builtin/remote.c:1568
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "ungültiges altes URL Format: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1576
#, c-format
msgid "No such URL found: %s"
msgstr "Keine solche URL gefunden: %s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1578
msgid "Will not delete all non-push URLs"
msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1592
msgid "be verbose; must be placed before a subcommand"
msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
@@ -10514,81 +10969,89 @@ msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
msgid "git repack [<options>]"
msgstr "git repack [<Optionen>]"
-#: builtin/repack.c:159
+#: builtin/repack.c:160
msgid "pack everything in a single pack"
msgstr "alles in eine einzige Pack-Datei packen"
-#: builtin/repack.c:161
+#: builtin/repack.c:162
msgid "same as -a, and turn unreachable objects loose"
msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelöscht"
-#: builtin/repack.c:164
+#: builtin/repack.c:165
msgid "remove redundant packs, and run git-prune-packed"
msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausführen"
-#: builtin/repack.c:166
+#: builtin/repack.c:167
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "--no-reuse-delta an git-pack-objects übergeben"
-#: builtin/repack.c:168
+#: builtin/repack.c:169
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "--no-reuse-object an git-pack-objects übergeben"
-#: builtin/repack.c:170
+#: builtin/repack.c:171
msgid "do not run git-update-server-info"
msgstr "git-update-server-info nicht ausführen"
-#: builtin/repack.c:173
+#: builtin/repack.c:174
msgid "pass --local to git-pack-objects"
msgstr "--local an git-pack-objects übergeben"
-#: builtin/repack.c:175
+#: builtin/repack.c:176
msgid "write bitmap index"
msgstr "Bitmap-Index schreiben"
-#: builtin/repack.c:176
+#: builtin/repack.c:177
msgid "approxidate"
msgstr "Datumsangabe"
-#: builtin/repack.c:177
+#: builtin/repack.c:178
msgid "with -A, do not loosen objects older than this"
msgstr "mit -A, keine Objekte älter als dieses Datum löschen"
-#: builtin/repack.c:179
+#: builtin/repack.c:180
+msgid "with -a, repack unreachable objects"
+msgstr "mit -a, nicht erreichbare Objekte neu packen"
+
+#: builtin/repack.c:182
msgid "size of the window used for delta compression"
msgstr "Größe des Fensters für die Delta-Kompression"
-#: builtin/repack.c:180 builtin/repack.c:184
+#: builtin/repack.c:183 builtin/repack.c:187
msgid "bytes"
msgstr "Bytes"
-#: builtin/repack.c:181
+#: builtin/repack.c:184
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"gleiches wie oben, aber die Speichergröße anstatt der\n"
"Anzahl der Einträge limitieren"
-#: builtin/repack.c:183
+#: builtin/repack.c:186
msgid "limits the maximum delta depth"
msgstr "die maximale Delta-Tiefe limitieren"
-#: builtin/repack.c:185
+#: builtin/repack.c:188
msgid "maximum size of each packfile"
msgstr "maximale Größe für jede Paketdatei"
-#: builtin/repack.c:187
+#: builtin/repack.c:190
msgid "repack objects in packs marked with .keep"
msgstr ""
"Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden"
-#: builtin/repack.c:197
+#: builtin/repack.c:200
msgid "cannot delete packs in a precious-objects repo"
msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen"
-#: builtin/repack.c:381
+#: builtin/repack.c:204
+msgid "--keep-unreachable and -A are incompatible"
+msgstr "--keep-unreachable und -A sind inkompatibel"
+
+#: builtin/repack.c:391 builtin/worktree.c:115
#, c-format
-msgid "removing '%s' failed"
-msgstr "Löschen von '%s' fehlgeschlagen"
+msgid "failed to remove '%s'"
+msgstr "Fehler beim Löschen von '%s'"
#: builtin/replace.c:19
msgid "git replace [-f] <object> <replacement>"
@@ -10812,7 +11275,7 @@ msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen."
msgid "Could not write new index file."
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: builtin/rev-list.c:350
+#: builtin/rev-list.c:362
msgid "rev-list does not support display of notes"
msgstr "rev-list unterstützt keine Anzeige von Notizen"
@@ -10905,31 +11368,27 @@ msgstr "Option"
msgid "option for merge strategy"
msgstr "Option für Merge-Strategie"
-#: builtin/revert.c:104
+#: builtin/revert.c:100
msgid "append commit name"
msgstr "Commit-Namen anhängen"
-#: builtin/revert.c:106
+#: builtin/revert.c:102
msgid "preserve initially empty commits"
msgstr "ursprüngliche, leere Commits erhalten"
-#: builtin/revert.c:107
+#: builtin/revert.c:103
msgid "allow commits with empty messages"
msgstr "Commits mit leerer Beschreibung erlauben"
-#: builtin/revert.c:108
+#: builtin/revert.c:104
msgid "keep redundant, empty commits"
msgstr "redundante, leere Commits behalten"
-#: builtin/revert.c:112
-msgid "program error"
-msgstr "Programmfehler"
-
-#: builtin/revert.c:197
+#: builtin/revert.c:192
msgid "revert failed"
msgstr "\"revert\" fehlgeschlagen"
-#: builtin/revert.c:212
+#: builtin/revert.c:207
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" fehlgeschlagen"
@@ -11234,12 +11693,12 @@ msgstr ""
msgid "prepend comment character and space to each line"
msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen"
-#: builtin/submodule--helper.c:24
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923
#, c-format
msgid "No such ref: %s"
msgstr "Referenz nicht gefunden: %s"
-#: builtin/submodule--helper.c:31
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Vollständiger Referenzname erwartet, %s erhalten"
@@ -11249,8 +11708,8 @@ msgstr "Vollständiger Referenzname erwartet, %s erhalten"
msgid "cannot strip one component off url '%s'"
msgstr "Kann eine Komponente von URL '%s' nicht extrahieren"
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
-#: builtin/submodule--helper.c:486
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
+#: builtin/submodule--helper.c:483
msgid "alternative anchor for relative paths"
msgstr "Alternativer Anker für relative Pfade"
@@ -11258,155 +11717,186 @@ msgstr "Alternativer Anker für relative Pfade"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]"
-#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Keine URL für Submodul-Pfad '%s' in .gitmodules gefunden"
-#: builtin/submodule--helper.c:366
+#: builtin/submodule--helper.c:364
#, c-format
msgid "Failed to register url for submodule path '%s'"
-msgstr "Fehler beim Eintragen der URL für Submodul-Pfad '%s' in die Konfiguration."
+msgstr ""
+"Fehler beim Eintragen der URL für Submodul-Pfad '%s' in die Konfiguration."
-#: builtin/submodule--helper.c:370
+#: builtin/submodule--helper.c:368
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submodul '%s' (%s) für Pfad '%s' in die Konfiguration eingetragen.\n"
-#: builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:378
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "Warnung: 'update'-Modus für Submodul '%s' vorgeschlagen\n"
-#: builtin/submodule--helper.c:387
+#: builtin/submodule--helper.c:385
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad '%s' in der\n"
"Konfiguration."
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:404
msgid "Suppress output for initializing a submodule"
msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken"
-#: builtin/submodule--helper.c:411
+#: builtin/submodule--helper.c:409
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<Pfad>]"
-#: builtin/submodule--helper.c:432
+#: builtin/submodule--helper.c:430
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <Pfad>"
-#: builtin/submodule--helper.c:438
+#: builtin/submodule--helper.c:436
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "Keine Submodul-Zuordnung in .gitmodules für Pfad '%s' gefunden"
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:486
msgid "where the new submodule will be cloned to"
msgstr "Pfad für neues Submodul"
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:489
msgid "name of the new submodule"
msgstr "Name des neuen Submoduls"
-#: builtin/submodule--helper.c:495
+#: builtin/submodule--helper.c:492
msgid "url where to clone the submodule from"
msgstr "URL von der das Submodul geklont wird"
-#: builtin/submodule--helper.c:501
+#: builtin/submodule--helper.c:498
msgid "depth for shallow clones"
msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)"
-#: builtin/submodule--helper.c:507
+#: builtin/submodule--helper.c:504
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
-msgstr "git submodule--helper clone [--prefix=<Pfad>] [--quiet] [--reference <Repository>] [--name <Name>] [--url <URL>] [--name <Name>] [--depth <Tiefe>] --url <URL> --path <Pfad>"
+msgstr ""
+"git submodule--helper clone [--prefix=<Pfad>] [--quiet] [--reference "
+"<Repository>] [--name <Name>] [--url <URL>] [--name <Name>] [--depth "
+"<Tiefe>] --url <URL> --path <Pfad>"
-#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
+#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
#, c-format
msgid "could not create directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/submodule--helper.c:534
+#: builtin/submodule--helper.c:531
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen"
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:547
#, c-format
msgid "cannot open file '%s'"
msgstr "Kann Datei '%s' nicht öffnen"
-#: builtin/submodule--helper.c:555
+#: builtin/submodule--helper.c:552
#, c-format
msgid "could not close file %s"
msgstr "Konnte Datei '%s' nicht schließen."
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:559
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
-#: builtin/submodule--helper.c:609
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Submodul-Pfad '%s' nicht initialisiert"
-#: builtin/submodule--helper.c:613
+#: builtin/submodule--helper.c:615
msgid "Maybe you want to use 'update --init'?"
msgstr "Meinten Sie vielleicht 'update --init'?"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:641
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Überspringe nicht zusammengeführtes Submodul %s"
-#: builtin/submodule--helper.c:660
+#: builtin/submodule--helper.c:662
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Ãœberspringe Submodul '%s'"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:792
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant"
+
+#: builtin/submodule--helper.c:803
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab."
+
+#: builtin/submodule--helper.c:824
msgid "path into the working tree"
msgstr "Pfad zum Arbeitsverzeichnis"
-#: builtin/submodule--helper.c:771
+#: builtin/submodule--helper.c:827
msgid "path into the working tree, across nested submodule boundaries"
-msgstr "Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg"
+msgstr ""
+"Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg"
-#: builtin/submodule--helper.c:775
+#: builtin/submodule--helper.c:831
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout oder none"
-#: builtin/submodule--helper.c:779
+#: builtin/submodule--helper.c:835
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-"Erstellung eines Klons mit unvollständiger Historie (shallow), abgeschnitten bei\n"
+"Erstellung eines Klons mit unvollständiger Historie (shallow), abgeschnitten "
+"bei\n"
"der angegebenen Anzahl von Commits."
-#: builtin/submodule--helper.c:782
+#: builtin/submodule--helper.c:838
msgid "parallel jobs"
msgstr "Parallele Ausführungen"
-#: builtin/submodule--helper.c:783
+#: builtin/submodule--helper.c:840
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr ""
+"ob das initiale Klonen den Empfehlungen für eine unvollständige\n"
+"Historie (shallow) folgen soll"
+
+#: builtin/submodule--helper.c:841
msgid "don't print cloning progress"
msgstr "keine Fortschrittsanzeige beim Klonen"
-#: builtin/submodule--helper.c:788
+#: builtin/submodule--helper.c:846
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<Pfad>] [<Pfad>...]"
-#: builtin/submodule--helper.c:798
+#: builtin/submodule--helper.c:856
msgid "bad value for update parameter"
msgstr "Fehlerhafter Wert für --update Parameter"
-#: builtin/submodule--helper.c:855
+#: builtin/submodule--helper.c:927
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+"Branch von Submodul (%s) ist konfiguriert, den Branch des Hauptprojektes\n"
+"zu erben, aber das Hauptprojekt befindet sich auf keinem Branch."
+
+#: builtin/submodule--helper.c:977
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "submodule--helper muss mit einem Unterbefehl aufgerufen werden"
-#: builtin/submodule--helper.c:862
+#: builtin/submodule--helper.c:984
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper"
@@ -11762,14 +12252,6 @@ msgstr "<Modus>,<Objekt>,<Pfad>"
msgid "add the specified entry to the index"
msgstr "den angegebenen Eintrag zum Commit vormerken"
-#: builtin/update-index.c:958
-msgid "(+/-)x"
-msgstr "(+/-)x"
-
-#: builtin/update-index.c:959
-msgid "override the executable bit of the listed files"
-msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben"
-
#: builtin/update-index.c:963
msgid "mark files as \"not changing\""
msgstr "diese Datei immer als unverändert betrachten"
@@ -11935,84 +12417,111 @@ msgid "git worktree add [<options>] <path> [<branch>]"
msgstr "git worktree add [<Optionen>] <Pfad> [<Branch>]"
#: builtin/worktree.c:16
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<Optionen>]"
+
+#: builtin/worktree.c:17
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<Optionen>] <Pfad>"
+
+#: builtin/worktree.c:18
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<Optionen>]"
-#: builtin/worktree.c:17
-msgid "git worktree list [<options>]"
-msgstr "git worktree list [<Optionen>]"
+#: builtin/worktree.c:19
+msgid "git worktree unlock <path>"
+msgstr "git worktree unlock <Pfad>"
-#: builtin/worktree.c:40
+#: builtin/worktree.c:42
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis"
-#: builtin/worktree.c:46
+#: builtin/worktree.c:48
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht"
-#: builtin/worktree.c:51
+#: builtin/worktree.c:53
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Lösche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen"
-#: builtin/worktree.c:62
+#: builtin/worktree.c:64
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Lösche worktrees/%s: ungültige gitdir-Datei"
-#: builtin/worktree.c:78
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Lösche worktrees/%s: gitdir-Datei verweist auf nicht existierenden Ort"
-#: builtin/worktree.c:113
-#, c-format
-msgid "failed to remove '%s'"
-msgstr "Fehler beim Löschen von '%s'"
-
-#: builtin/worktree.c:202
+#: builtin/worktree.c:204
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existiert bereits"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:236
#, c-format
msgid "could not create directory of '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/worktree.c:270
+#: builtin/worktree.c:272
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Bereite %s vor (Identifikation %s)"
-#: builtin/worktree.c:322
+#: builtin/worktree.c:323
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"<Branch> auschecken, auch wenn dieser bereits in einem anderen "
"Arbeitsverzeichnis ausgecheckt ist"
-#: builtin/worktree.c:324
+#: builtin/worktree.c:325
msgid "create a new branch"
msgstr "neuen Branch erstellen"
-#: builtin/worktree.c:326
+#: builtin/worktree.c:327
msgid "create or reset a branch"
msgstr "Branch erstellen oder umsetzen"
-#: builtin/worktree.c:327
-msgid "detach HEAD at named commit"
-msgstr "HEAD bei benanntem Commit loslösen"
-
-#: builtin/worktree.c:328
+#: builtin/worktree.c:329
msgid "populate the new working tree"
msgstr "das neue Arbeitsverzeichnis auschecken"
-#: builtin/worktree.c:336
+#: builtin/worktree.c:337
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B und --detach schließen sich gegenseitig aus"
+#: builtin/worktree.c:470
+msgid "reason for locking"
+msgstr "Sperrgrund"
+
+#: builtin/worktree.c:482 builtin/worktree.c:515
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr "'%s' ist kein Arbeitsverzeichnis"
+
+#: builtin/worktree.c:484 builtin/worktree.c:517
+msgid "The main working tree cannot be locked or unlocked"
+msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden."
+
+#: builtin/worktree.c:489
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "'%s' ist bereits gesperrt, Grund: %s"
+
+#: builtin/worktree.c:491
+#, c-format
+msgid "'%s' is already locked"
+msgstr "'%s' ist bereits gesperrt"
+
+#: builtin/worktree.c:519
+#, c-format
+msgid "'%s' is not locked"
+msgstr "'%s' ist nicht gesperrt"
+
#: builtin/write-tree.c:13
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<Präfix>/]"
@@ -12029,6 +12538,26 @@ msgstr "das \"Tree\"-Objekt für ein Unterverzeichnis <Präfix> schreiben"
msgid "only useful for debugging"
msgstr "nur nützlich für Fehlersuche"
+#: upload-pack.c:20
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<Optionen>] <Verzeichnis>"
+
+#: upload-pack.c:837
+msgid "quit after a single request/response exchange"
+msgstr "nach einem einzigen Request/Response-Austausch beenden"
+
+#: upload-pack.c:839
+msgid "exit immediately after initial ref advertisement"
+msgstr "direkt nach der initialen Angabe der Commits beenden"
+
+#: upload-pack.c:841
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "kein Versuch in <Verzeichnis>/.git/ wenn <Verzeichnis> kein Git-Verzeichnis ist"
+
+#: upload-pack.c:843
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "Übertragung nach <n> Sekunden Inaktivität unterbrechen"
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben"
@@ -12044,7 +12573,7 @@ msgstr ""
"oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n"
"Konzept zu erfahren."
-#: http.c:322
+#: http.c:323
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
"Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.44.0\n"
@@ -12189,32 +12718,32 @@ msgid "update the index with reused conflict resolution if possible"
msgstr ""
"Index, wenn möglich, mit wiederverwendeter Konfliktauflösung aktualisieren"
-#: git-bisect.sh:55
+#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "Sie müssen mit \"git bisect start\" beginnen."
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:61
+#: git-bisect.sh:60
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Wollen Sie, dass ich es für Sie mache [Y/n]? "
-#: git-bisect.sh:122
+#: git-bisect.sh:121
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "nicht erkannte Option: '$arg'"
-#: git-bisect.sh:126
+#: git-bisect.sh:125
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "'$arg' scheint kein gültiger Commit zu sein"
-#: git-bisect.sh:155
+#: git-bisect.sh:154
msgid "Bad HEAD - I need a HEAD"
msgstr "Ungültiger HEAD - HEAD wird benötigt"
-#: git-bisect.sh:168
+#: git-bisect.sh:167
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
@@ -12222,28 +12751,29 @@ msgstr ""
"Auschecken von '$start_head' fehlgeschlagen. Versuchen Sie 'git bisect reset "
"<gültiger-Branch>'."
-#: git-bisect.sh:178
+#: git-bisect.sh:177
msgid "won't bisect on cg-seek'ed tree"
msgstr ""
"binäre Suche auf einem durch 'cg-seek' geändertem Verzeichnis nicht möglich"
-#: git-bisect.sh:182
+#: git-bisect.sh:181
msgid "Bad HEAD - strange symbolic ref"
msgstr "Ungültiger HEAD - merkwürdige symbolische Referenz"
-#: git-bisect.sh:234
+#: git-bisect.sh:233
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "Ungültiges \"bisect_write\" Argument: $state"
-#: git-bisect.sh:263
+#: git-bisect.sh:262
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Ungültige Referenz-Eingabe: $arg"
-#: git-bisect.sh:278
-msgid "Please call 'bisect_state' with at least one argument."
-msgstr "Bitte rufen Sie 'bisect_state' mit mindestens einem Argument auf."
+#: git-bisect.sh:281
+#, sh-format
+msgid "Bad rev input: $bisected_head"
+msgstr "Ungültige Referenz-Eingabe: $bisected_head"
#: git-bisect.sh:290
#, sh-format
@@ -12392,7 +12922,47 @@ msgstr ""
"Ungültiges Argument $arg für 'git bisect terms'.\n"
"Unterstützte Optionen sind: --term-good|--term-old und --term-bad|--term-new."
-#: git-rebase.sh:57
+#: git-merge-octopus.sh:46
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr ""
+"Fehler Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
+"überschrieben werden"
+
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr "Automatischer Merge hat nicht funktioniert."
+
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an Octopus."
+msgstr "Sollte keinen Octopus-Merge ausführen."
+
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "Konnte keinen gemeinsamen Commit mit $pretty_name finden."
+
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up-to-date with $pretty_name"
+msgstr "Bereits aktuell mit $pretty_name"
+
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "Spule vor zu: $pretty_name"
+
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "Versuche einfachen Merge mit $pretty_name"
+
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
+msgstr "Einfacher Merge hat nicht funktioniert, versuche automatischen Merge."
+
+#: git-rebase.sh:56
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
@@ -12406,48 +12976,53 @@ msgstr ""
"Um den ursprünglichen Branch wiederherzustellen und den Rebase abzubrechen,\n"
"führen Sie \"git rebase --abort\" aus."
-#: git-rebase.sh:168
+#: git-rebase.sh:156 git-rebase.sh:395
+#, sh-format
+msgid "Could not move back to $head_name"
+msgstr "Konnte nicht zu $head_name zurückgehen"
+
+#: git-rebase.sh:167
msgid "Applied autostash."
-msgstr "\"autostash\" angewendet."
+msgstr "Automatischen Stash angewendet."
-#: git-rebase.sh:171
+#: git-rebase.sh:170
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Kann $stash_sha1 nicht speichern."
-#: git-rebase.sh:172
+#: git-rebase.sh:171
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-"Anwendung von \"autostash\" resultierte in Konflikten.\n"
+"Anwendung des automatischen Stash resultierte in Konflikten.\n"
"Ihre Änderungen sind im Stash sicher.\n"
"Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
-#: git-rebase.sh:211
+#: git-rebase.sh:210
msgid "The pre-rebase hook refused to rebase."
msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen."
-#: git-rebase.sh:216
+#: git-rebase.sh:215
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "\"git-am\" scheint im Gange zu sein. Kann Rebase nicht durchführen."
-#: git-rebase.sh:357
+#: git-rebase.sh:356
msgid "No rebase in progress?"
msgstr "Kein Rebase im Gange?"
-#: git-rebase.sh:368
+#: git-rebase.sh:367
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Die --edit-todo Aktion kann nur während eines interaktiven Rebase verwendet "
"werden."
-#: git-rebase.sh:375
+#: git-rebase.sh:374
msgid "Cannot read HEAD"
msgstr "Kann HEAD nicht lesen"
-#: git-rebase.sh:378
+#: git-rebase.sh:377
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -12455,12 +13030,7 @@ msgstr ""
"Sie müssen alle Merge-Konflikte editieren und diese dann\n"
"mittels \"git add\" als aufgelöst markieren"
-#: git-rebase.sh:396
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "Konnte nicht zu $head_name zurückgehen"
-
-#: git-rebase.sh:415
+#: git-rebase.sh:414
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -12481,100 +13051,100 @@ msgstr ""
"und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n"
"etwas Schützenswertes vorhanden ist."
-#: git-rebase.sh:466
+#: git-rebase.sh:465
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "ungültiger Upstream-Branch $upstream_name"
-#: git-rebase.sh:490
+#: git-rebase.sh:489
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: es gibt mehr als eine Merge-Basis"
-#: git-rebase.sh:493 git-rebase.sh:497
+#: git-rebase.sh:492 git-rebase.sh:496
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: es gibt keine Merge-Basis"
-#: git-rebase.sh:502
+#: git-rebase.sh:501
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "$onto_name zeigt auf keinen gültigen Commit"
-#: git-rebase.sh:525
+#: git-rebase.sh:524
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal: Branch $branch_name nicht gefunden"
-#: git-rebase.sh:558
+#: git-rebase.sh:557
msgid "Cannot autostash"
-msgstr "Kann \"autostash\" nicht ausführen."
+msgstr "Kann automatischen Stash nicht erzeugen."
-#: git-rebase.sh:563
+#: git-rebase.sh:562
#, sh-format
msgid "Created autostash: $stash_abbrev"
-msgstr "\"autostash\" erzeugt: $stash_abbrev"
+msgstr "Automatischen Stash erzeugt: $stash_abbrev"
-#: git-rebase.sh:567
+#: git-rebase.sh:566
msgid "Please commit or stash them."
msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
-#: git-rebase.sh:587
+#: git-rebase.sh:586
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Aktueller Branch $branch_name ist auf dem neuesten Stand."
-#: git-rebase.sh:591
+#: git-rebase.sh:590
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
"Aktueller Branch $branch_name ist auf dem neuesten Stand, Rebase erzwungen."
-#: git-rebase.sh:602
+#: git-rebase.sh:601
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Änderungen von $mb zu $onto:"
-#: git-rebase.sh:611
+#: git-rebase.sh:610
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Zunächst wird der Branch zurückgespult, um Ihre Änderungen\n"
"darauf neu anzuwenden ..."
-#: git-rebase.sh:621
+#: git-rebase.sh:620
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name zu $onto_name vorgespult."
-#: git-stash.sh:51
+#: git-stash.sh:50
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear mit Parametern ist nicht implementiert"
-#: git-stash.sh:74
+#: git-stash.sh:73
msgid "You do not have the initial commit yet"
msgstr "Sie haben bisher noch keinen initialen Commit"
-#: git-stash.sh:89
+#: git-stash.sh:88
msgid "Cannot save the current index state"
msgstr "Kann den aktuellen Zustand des Index nicht speichern"
-#: git-stash.sh:124 git-stash.sh:137
+#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern"
-#: git-stash.sh:141
+#: git-stash.sh:140
msgid "No changes selected"
msgstr "Keine Änderungen ausgewählt"
-#: git-stash.sh:144
+#: git-stash.sh:143
msgid "Cannot remove temporary index (can't happen)"
msgstr "Kann temporären Index nicht löschen (kann nicht passieren)"
-#: git-stash.sh:157
+#: git-stash.sh:156
msgid "Cannot record working tree state"
msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen"
-#: git-stash.sh:189
+#: git-stash.sh:188
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren."
@@ -12589,7 +13159,7 @@ msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren."
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:239
+#: git-stash.sh:238
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -12599,110 +13169,119 @@ msgstr ""
" Um eine Beschreibung anzugeben, benutzen Sie \"git stash save -- "
"'$option'\""
-#: git-stash.sh:260
+#: git-stash.sh:259
msgid "No local changes to save"
msgstr "Keine lokalen Änderungen zum Speichern"
-#: git-stash.sh:264
+#: git-stash.sh:263
msgid "Cannot initialize stash"
msgstr "Kann \"stash\" nicht initialisieren"
-#: git-stash.sh:268
+#: git-stash.sh:267
msgid "Cannot save the current status"
msgstr "Kann den aktuellen Status nicht speichern"
-#: git-stash.sh:286
+#: git-stash.sh:268
+#, sh-format
+msgid "Saved working directory and index state $stash_msg"
+msgstr "Speicherte Arbeitsverzeichnis und Index-Status $stash_msg"
+
+#: git-stash.sh:285
msgid "Cannot remove worktree changes"
msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
-#: git-stash.sh:405
+#: git-stash.sh:404
#, sh-format
msgid "unknown option: $opt"
msgstr "unbekannte Option: $opt"
-#: git-stash.sh:415
+#: git-stash.sh:414
msgid "No stash found."
msgstr "Kein Stash-Eintrag gefunden."
-#: git-stash.sh:422
+#: git-stash.sh:421
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Zu viele Commits angegeben: $REV"
-#: git-stash.sh:428
+#: git-stash.sh:427
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference ist keine gültige Referenz"
-#: git-stash.sh:456
+#: git-stash.sh:455
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' ist kein \"stash\"-artiger Commit"
-#: git-stash.sh:467
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' ist keine \"stash\"-Referenz"
-#: git-stash.sh:475
+#: git-stash.sh:474
msgid "unable to refresh index"
msgstr "Konnte den Index nicht aktualisieren."
-#: git-stash.sh:479
+#: git-stash.sh:478
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Kann \"stash\" nicht anwenden, solang ein Merge im Gange ist"
-#: git-stash.sh:487
+#: git-stash.sh:486
msgid "Conflicts in index. Try without --index."
msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
-#: git-stash.sh:489
+#: git-stash.sh:488
msgid "Could not save index tree"
msgstr "Konnte Index-Verzeichnis nicht speichern"
-#: git-stash.sh:523
+#: git-stash.sh:522
msgid "Cannot unstage modified files"
msgstr "Kann geänderte Dateien nicht aus dem Index entfernen"
-#: git-stash.sh:538
+#: git-stash.sh:537
msgid "Index was not unstashed."
msgstr "Index wurde nicht aus dem Stash zurückgeladen."
-#: git-stash.sh:561
+#: git-stash.sh:551
+msgid "The stash is kept in case you need it again."
+msgstr "Der Stash wird behalten, im Falle Sie benötigen diesen nochmal."
+
+#: git-stash.sh:560
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Gelöscht ${REV} ($s)"
-#: git-stash.sh:562
+#: git-stash.sh:561
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen"
-#: git-stash.sh:570
+#: git-stash.sh:569
msgid "No branch name specified"
msgstr "Kein Branchname spezifiziert"
-#: git-stash.sh:642
+#: git-stash.sh:641
msgid "(To restore them type \"git stash apply\")"
msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)"
-#: git-submodule.sh:219
+#: git-submodule.sh:183
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Relative Pfade können nur von der obersten Ebene des Arbeitsverzeichnisses "
"benutzt werden."
-#: git-submodule.sh:229
+#: git-submodule.sh:193
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "repo URL: '$repo' muss absolut sein oder mit ./|../ beginnen"
-#: git-submodule.sh:246
+#: git-submodule.sh:210
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' ist bereits zum Commit vorgemerkt"
-#: git-submodule.sh:250
+#: git-submodule.sh:214
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -12713,106 +13292,92 @@ msgstr ""
"$sm_path\n"
"Benutzen Sie -f wenn Sie diesen wirklich hinzufügen möchten."
-#: git-submodule.sh:268
+#: git-submodule.sh:232
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Füge existierendes Repository in '$sm_path' dem Index hinzu."
-#: git-submodule.sh:270
+#: git-submodule.sh:234
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' existiert bereits und ist kein gültiges Git-Repository"
-#: git-submodule.sh:278
+#: git-submodule.sh:242
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Ein Git-Verzeichnis für '$sm_name' wurde lokal gefunden mit den Remote-"
"Repositories:"
-#: git-submodule.sh:280
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from"
-msgstr ""
-"Wenn Sie dieses lokale Git-Verzeichnis wiederverwenden möchtest, anstatt "
-"erneut zu klonen"
-
-#: git-submodule.sh:282
-#, sh-format
-msgid ""
-"use the '--force' option. If the local git directory is not the correct repo"
-msgstr ""
-"benutzen Sie die Option '--force'. Wenn das lokale Git-Verzeichnis nicht das "
-"korrekte Repository ist"
-
-#: git-submodule.sh:283
+#: git-submodule.sh:244
#, sh-format
msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+" $realrepo\n"
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr ""
-"oder Sie sich unsicher sind, was das bedeutet, wählen Sie einen anderen "
-"Namen mit der Option '--name'."
+"Wenn Sie das lokale Git-Verzeichnis wiederverwenden wollen, anstatt erneut von\n"
+" $realrepo\n"
+"zu klonen, benutzen Sie die Option '--force'. Wenn das lokale Git-Verzeichnis\n"
+"nicht das korrekte Repository ist oder Sie unsicher sind, was das bedeutet,\n"
+"wählen Sie einen anderen Namen mit der Option '--name'."
-#: git-submodule.sh:285
+#: git-submodule.sh:250
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '$sm_name'."
-#: git-submodule.sh:297
+#: git-submodule.sh:262
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Kann Submodul '$sm_path' nicht auschecken"
-#: git-submodule.sh:302
+#: git-submodule.sh:267
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen"
-#: git-submodule.sh:311
+#: git-submodule.sh:276
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration."
-#: git-submodule.sh:355
+#: git-submodule.sh:323
#, sh-format
msgid "Entering '$displaypath'"
msgstr "Betrete '$displaypath'"
-#: git-submodule.sh:375
+#: git-submodule.sh:343
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr "Stoppe bei '$displaypath'; Skript gab nicht-Null Status zurück."
-#: git-submodule.sh:448
+#: git-submodule.sh:414
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "Pfadspezifikationen und --all sind inkompatibel."
-#: git-submodule.sh:453
+#: git-submodule.sh:419
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n"
"möchten."
-#: git-submodule.sh:470
-#, sh-format
-msgid "Submodule work tree '$displaypath' contains a .git directory"
-msgstr ""
-"Arbeitsverzeichnis des Submoduls in '$displaypath' enthält ein .git-"
-"Verzeichnis"
-
-#: git-submodule.sh:471
+#: git-submodule.sh:439
#, sh-format
msgid ""
+"Submodule work tree '$displaypath' contains a .git directory\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-"(benutzen Sie 'rm -rf' wenn Sie dieses Submodul wirklich mitsamt\n"
-"seiner Historie löschen möchten)"
+"Arbeitsverzeichnis von Submodul in '$displaypath' enthält ein .git-Verzeichnis\n"
+"(benutzen Sie 'rm -rf' wenn Sie dieses wirklich mitsamt seiner Historie löschen\n"
+"möchten)"
-#: git-submodule.sh:477
+#: git-submodule.sh:447
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -12821,126 +13386,146 @@ msgstr ""
"Arbeitsverzeichnis von Submodul in '$displaypath' enthält lokale Änderungen; "
"verwenden Sie '-f', um diese zu verwerfen"
-#: git-submodule.sh:480
+#: git-submodule.sh:450
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Verzeichnis '$displaypath' bereinigt."
-#: git-submodule.sh:481
+#: git-submodule.sh:451
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
"Konnte Arbeitsverzeichnis des Submoduls in '$displaypath' nicht löschen."
-#: git-submodule.sh:484
+#: git-submodule.sh:454
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr ""
"Konnte kein leeres Verzeichnis für Submodul in '$displaypath' erstellen."
-#: git-submodule.sh:493
+#: git-submodule.sh:463
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"Submodul '$name' ($url) für Pfad '$displaypath' wurde aus der Konfiguration "
"entfernt."
-#: git-submodule.sh:635
+#: git-submodule.sh:612
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden."
-#: git-submodule.sh:644
+#: git-submodule.sh:622
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausführen"
-#: git-submodule.sh:667
+#: git-submodule.sh:627
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr ""
+"Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n"
+"'$sm_path' nicht finden."
+
+#: git-submodule.sh:645
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen"
-#: git-submodule.sh:680
+#: git-submodule.sh:651
+#, sh-format
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr ""
+"\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n"
+"enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen."
+
+#: git-submodule.sh:658
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken."
-#: git-submodule.sh:681
+#: git-submodule.sh:659
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt"
-#: git-submodule.sh:685
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht möglich"
-#: git-submodule.sh:686
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'"
-#: git-submodule.sh:691
+#: git-submodule.sh:669
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
-#: git-submodule.sh:692
+#: git-submodule.sh:670
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'"
-#: git-submodule.sh:697
+#: git-submodule.sh:675
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr "Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
+msgstr ""
+"Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' "
+"fehlgeschlagen"
-#: git-submodule.sh:698
+#: git-submodule.sh:676
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Submodul-Pfad '$displaypath': '$command $sha1'"
-#: git-submodule.sh:729
+#: git-submodule.sh:707
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'"
-#: git-submodule.sh:837
+#: git-submodule.sh:815
msgid "The --cached option cannot be used with the --files option"
msgstr ""
"Die Optionen --cached und --files können nicht gemeinsam verwendet werden."
-#: git-submodule.sh:889
+#: git-submodule.sh:867
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "unerwarteter Modus $mod_dst"
-#: git-submodule.sh:909
+#: git-submodule.sh:887
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_src"
-#: git-submodule.sh:912
+#: git-submodule.sh:890
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_dst"
-#: git-submodule.sh:915
+#: git-submodule.sh:893
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Warnung: $display_name beinhaltet nicht die Commits $sha1_src und $sha1_dst"
-#: git-submodule.sh:940
+#: git-submodule.sh:918
msgid "blob"
msgstr "Blob"
-#: git-submodule.sh:1059
+#: git-submodule.sh:1040
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'"
-#: git-submodule.sh:1123
+#: git-submodule.sh:1107
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisiere Submodul-URL für '$displaypath'"
@@ -12950,654 +13535,465 @@ msgstr "Synchronisiere Submodul-URL für '$displaypath'"
msgid "See git-${cmd}(1) for details."
msgstr "Siehe git-${cmd}(1) für weitere Details."
-#~ msgid "'%s': %s"
-#~ msgstr "'%s': %s"
-
-#~ msgid "unable to access '%s': %s"
-#~ msgstr "konnte nicht auf '%s' zugreifen: %s"
-
-#~ msgid "could not open '%s' for reading: %s"
-#~ msgstr "Konnte '%s' nicht zum Lesen öffnen: %s"
-
-#~ msgid "could not open '%s' for writing: %s"
-#~ msgstr "Konnte '%s' nicht zum Schreiben öffnen: %s"
-
-#~ msgid " git branch -d %s\n"
-#~ msgstr " git branch -d %s\n"
-
-#~ msgid " git branch --set-upstream-to %s\n"
-#~ msgstr " git branch --set-upstream-to %s\n"
-
-#~ msgid "cannot open %s: %s\n"
-#~ msgstr "kann %s nicht öffnen: %s\n"
-
-#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-#~ msgstr ""
-#~ "Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder "
-#~ "benutzen\n"
-#~ "Sie \"stash\", um fortzufahren."
-
-#~ msgid "could not verify the tag '%s'"
-#~ msgstr "Konnte Tag '%s' nicht verifizieren"
-
-#~ msgid "failed to remove: %s"
-#~ msgstr "Fehler beim Löschen: %s"
-
-#~ msgid "The --exec option must be used with the --interactive option"
-#~ msgstr "Die Option --exec muss mit --interactive verwendet werden."
-
-#~ msgid ""
-#~ "Submodule path '$displaypath' not initialized\n"
-#~ "Maybe you want to use 'update --init'?"
-#~ msgstr ""
-#~ "Submodul-Pfad '$displaypath' ist nicht initialisiert.\n"
-#~ "Vielleicht möchten Sie 'update --init' benutzen?"
-
-#~ msgid "Forward-port local commits to the updated upstream head"
-#~ msgstr "lokale Commits auf einem aktuellerem Upstream-Branch neu aufbauen"
-
-#~ msgid "unable to parse format"
-#~ msgstr "Konnte Format nicht parsen."
-
-#~ msgid "improper format entered align:%s"
-#~ msgstr "Sie haben ein ungültiges Format eingegeben align:%s"
-
-#~ msgid "Could not set core.worktree in %s"
-#~ msgstr "Konnte core.worktree in '%s' nicht setzen."
-
-#~ msgid ""
-#~ "push.default is unset; its implicit value has changed in\n"
-#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
-#~ "and maintain the traditional behavior, use:\n"
-#~ "\n"
-#~ " git config --global push.default matching\n"
-#~ "\n"
-#~ "To squelch this message and adopt the new behavior now, use:\n"
-#~ "\n"
-#~ " git config --global push.default simple\n"
-#~ "\n"
-#~ "When push.default is set to 'matching', git will push local branches\n"
-#~ "to the remote branches that already exist with the same name.\n"
-#~ "\n"
-#~ "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
-#~ "behavior, which only pushes the current branch to the corresponding\n"
-#~ "remote branch that 'git pull' uses to update the current branch.\n"
-#~ "\n"
-#~ "See 'git help config' and search for 'push.default' for further "
-#~ "information.\n"
-#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
-#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
-#~ msgstr ""
-#~ "'push.default' ist nicht gesetzt; der implizit gesetzte Wert\n"
-#~ "wurde in Git 2.0 von 'matching' nach 'simple' geändert. Um diese Meldung "
-#~ "zu\n"
-#~ "unterdrücken und das aktuelle Verhalten nach Änderung des Standardwertes\n"
-#~ "beizubehalten, benutzen Sie:\n"
-#~ "\n"
-#~ " git config --global push.default matching\n"
-#~ "\n"
-#~ "Um diese Meldung zu unterdrücken und das neue Verhalten jetzt zu "
-#~ "übernehmen, benutzen Sie:\n"
-#~ "\n"
-#~ " git config --global push.default simple\n"
-#~ "\n"
-#~ "Wenn 'push.default' auf den Wert 'matching' gesetzt ist, werden lokale\n"
-#~ "Branches zu den Remote-Branches mit den selben Namen versendet.\n"
-#~ "\n"
-#~ "In Git 2.0 wurde das Standardverhalten zu 'simple' geändert. Hierbei "
-#~ "wird\n"
-#~ "der aktuelle Branch zu dem entsprechenden Remote-Branch versendet, den\n"
-#~ "'git pull' zur Aktualisierung des aktuellen Branches verwendet.\n"
-#~ "\n"
-#~ "Führen Sie 'git help config' aus und suchen Sie nach 'push.default' für\n"
-#~ "weitere Informationen.\n"
-#~ "(Der Modus 'simple' wurde in Git 1.7.11 eingeführt. Benutzen Sie den "
-#~ "ähnlichen\n"
-#~ "Modus 'current' anstatt 'simple', falls Sie gelegentlich ältere Versionen "
-#~ "von\n"
-#~ "Git benutzen.)"
-
-#~ msgid "check|on-demand|no"
-#~ msgstr "check|on-demand|no"
-
-#~ msgid "Could not append '%s'"
-#~ msgstr "Konnte '%s' nicht anhängen."
-
-#~ msgid "Missing author: %s"
-#~ msgstr "fehlender Autor: %s"
-
-#~ msgid "Testing "
-#~ msgstr "Prüfe "
-
-#~ msgid "unable to look up current user in the passwd file: %s"
-#~ msgstr "konnte aktuellen Benutzer nicht in Passwort-Datei finden: %s"
-
-#~ msgid "no such user"
-#~ msgstr "kein solcher Benutzer"
-
-#~ msgid "branch '%s' does not point at a commit"
-#~ msgstr "Branch '%s' zeigt auf keinen Commit"
-
-#~ msgid "object '%s' does not point to a commit"
-#~ msgstr "Objekt '%s' zeigt auf keinen Commit"
-
-#~ msgid "some refs could not be read"
-#~ msgstr "Konnte einige Referenzen nicht lesen"
-
-#~ msgid "print only merged branches"
-#~ msgstr "nur Branches ausgeben, die zusammengeführt sind"
-
-#~ msgid "--dissociate given, but there is no --reference"
-#~ msgstr "--dissociate ohne --reference angegeben"
-
-#~ msgid "show usage"
-#~ msgstr "Verwendung anzeigen"
-
-#~ msgid "insanely long template name %s"
-#~ msgstr "zu langer Vorlagen-Name %s"
-
-#~ msgid "insanely long symlink %s"
-#~ msgstr "zu lange symbolische Verknüpfung %s"
-
-#~ msgid "insanely long template path %s"
-#~ msgstr "zu langer Vorlagen-Pfad %s"
-
-#~ msgid "insane git directory %s"
-#~ msgstr "ungültiges Git-Verzeichnis %s"
-
-#~ msgid "unsupported sort specification '%s'"
-#~ msgstr "Nicht unterstützte Angabe für \"--sort\" '%s'"
-
-#~ msgid "unsupported sort specification '%s' in variable '%s'"
-#~ msgstr "Nicht unterstützte Angabe für \"--sort\" '%s' in Variable '%s'"
-
-#~ msgid "switch 'points-at' requires an object"
-#~ msgstr "Option 'points-at' erfordert ein Objekt"
-
-#~ msgid "sort tags"
-#~ msgstr "Tags sortieren"
-
-#~ msgid "--sort and -n are incompatible"
-#~ msgstr "--sort und -n sind inkompatibel"
-
-#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-#~ msgstr ""
-#~ "Git-Verzeichnis '$a' ist Teil des Submodul-Pfades '$b', oder umgekehrt"
-
-#~ msgid "false|true|preserve"
-#~ msgstr "false|true|preserve"
-
-#~ msgid "BUG: reopen a lockfile that is still open"
-#~ msgstr "FEHLER: Wiederöffnen einer bereits geöffneten Lock-Datei"
-
-#~ msgid "BUG: reopen a lockfile that has been committed"
-#~ msgstr "FEHLER: Wiederöffnen einer bereits committeten Lock-Datei"
-
-#~ msgid "option %s does not accept negative form"
-#~ msgstr "Option %s akzeptiert keine negative Form"
+#: git-rebase--interactive.sh:131
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr "Führe Rebase aus ($new_count/$total)"
-#~ msgid "unable to parse value '%s' for option %s"
-#~ msgstr "konnte Wert '%s' für Option %s nicht parsen"
+#: git-rebase--interactive.sh:147
+msgid ""
+"\n"
+"Commands:\n"
+" p, pick = use commit\n"
+" r, reword = use commit, but edit the commit message\n"
+" e, edit = use commit, but stop for amending\n"
+" s, squash = use commit, but meld into previous commit\n"
+" f, fixup = like \"squash\", but discard this commit's log message\n"
+" x, exec = run command (the rest of the line) using shell\n"
+" d, drop = remove commit\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+"\n"
+"Befehle:\n"
+" p, pick = Commit verwenden\n"
+" r, reword = Commit verwenden, aber Commit-Beschreibung bearbeiten\n"
+" e, edit = Commit verwenden, aber zum Nachbessern anhalten\n"
+" s, squash = Commit verwenden, aber mit vorherigem Commit vereinen\n"
+" f, fixup = wie \"squash\", aber diese Commit-Beschreibung verwerfen\n"
+" x, exec = Befehl (Rest der Zeile) mittels Shell ausführen\n"
+" d, drop = Commit entfernen\n"
+"\n"
+"Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n"
+"ausgeführt.\n"
-#~ msgid "-b and -B are mutually exclusive"
-#~ msgstr "-b und -B schließen sich gegenseitig aus"
+#: git-rebase--interactive.sh:162
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"Keine Zeile entfernen. Benutzen Sie 'drop', um explizit einen Commit zu\n"
+"entfernen.\n"
-#~ msgid "You need to set your committer info first"
-#~ msgstr "Sie müssen zuerst die Informationen zum Commit-Ersteller setzen."
+#: git-rebase--interactive.sh:166
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr "\nWenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n"
-#~ msgid ""
-#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
-#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
-#~ "To restore the original branch and stop patching, run \"$cmdline --abort"
-#~ "\"."
-#~ msgstr ""
-#~ "Wenn Sie das Problem gelöst haben, führen Sie \"$cmdline --continue\" "
-#~ "aus.\n"
-#~ "Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen\n"
-#~ "\"$cmdline --skip\" aus.\n"
-#~ "Um den ursprünglichen Branch wiederherzustellen und die Anwendung der\n"
-#~ "Patches abzubrechen, führen Sie \"$cmdline --abort\" aus."
+#: git-rebase--interactive.sh:202
+#, sh-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Sie können den Commit nun nachbessern mit:\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Sobald Sie mit Ihren Änderungen zufrieden sind, führen Sie aus:\n"
+"\n"
+"\tgit rebase --continue"
-#~ msgid "Patch format $patch_format is not supported."
-#~ msgstr "Patch-Format $patch_format wird nicht unterstützt."
+#: git-rebase--interactive.sh:227
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
+msgstr "$sha1: kein Commit der gepickt werden kann"
-#~ msgid "Please make up your mind. --skip or --abort?"
-#~ msgstr "Bitte werden Sie sich klar. --skip oder --abort?"
+#: git-rebase--interactive.sh:266
+#, sh-format
+msgid "Invalid commit name: $sha1"
+msgstr "Ungültiger Commit-Name: $sha1"
-#~ msgid ""
-#~ "Patch is empty. Was it split wrong?\n"
-#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
-#~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
-#~ msgstr ""
-#~ "Patch ist leer. Wurde er falsch aufgeteilt?\n"
-#~ "Wenn Sie diesen Patch auslassen möchten, führen Sie stattdessen\n"
-#~ "\"$cmdline --skip\" aus.\n"
-#~ "Um den ursprünglichen Branch wiederherzustellen und die Anwendung der "
-#~ "Patches\n"
-#~ "abzubrechen, führen Sie \"$cmdline --abort\" aus."
+#: git-rebase--interactive.sh:308
+msgid "Cannot write current commit's replacement sha1"
+msgstr "Kann ersetzenden SHA-1 des aktuellen Commits nicht schreiben"
-#~ msgid "Patch does not have a valid e-mail address."
-#~ msgstr "Patch enthält keine gültige E-Mail-Adresse."
+#: git-rebase--interactive.sh:360
+#, sh-format
+msgid "Fast-forward to $sha1"
+msgstr "Spule vor zu $sha1"
-#~ msgid "Applying: $FIRSTLINE"
-#~ msgstr "Wende an: $FIRSTLINE"
+#: git-rebase--interactive.sh:362
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
+msgstr "Kann nicht zu $sha1 vorspulen"
-#~ msgid "Patch failed at $msgnum $FIRSTLINE"
-#~ msgstr "Anwendung des Patches fehlgeschlagen bei $msgnum $FIRSTLINE"
+#: git-rebase--interactive.sh:371
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
+msgstr "Kann HEAD nicht auf $first_parent setzen"
+
+#: git-rebase--interactive.sh:376
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
+msgstr "\"squash\" eines Merges ($sha1) zurückgewiesen."
-#~ msgid ""
-#~ "Pull is not possible because you have unmerged files.\n"
-#~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
-#~ "as appropriate to mark resolution and make a commit."
-#~ msgstr ""
-#~ "\"pull\" ist nicht möglich, weil Sie nicht zusammengeführte Dateien "
-#~ "haben.\n"
-#~ "Bitte korrigieren Sie dies im Arbeitsverzeichnis und benutzen Sie dann\n"
-#~ "'git add/rm <Datei>', um die Auflösung entsprechend zu markieren und zu\n"
-#~ "committen."
+#: git-rebase--interactive.sh:390
+#, sh-format
+msgid "Error redoing merge $sha1"
+msgstr "Fehler beim Wiederholen des Merges von $sha1"
-#~ msgid "Pull is not possible because you have unmerged files."
-#~ msgstr ""
-#~ "\"pull\" ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
+#: git-rebase--interactive.sh:398
+#, sh-format
+msgid "Could not pick $sha1"
+msgstr "Konnte $sha1 nicht picken"
-#~ msgid "no branch specified"
-#~ msgstr "Kein Branch spezifiziert"
+#: git-rebase--interactive.sh:407
+#, sh-format
+msgid "This is the commit message #${n}:"
+msgstr "Das ist Commit-Beschreibung #${n}:"
-#~ msgid "check a branch out in a separate working directory"
-#~ msgstr "Branch in separatem Arbeitsverzeichnis auschecken"
+#: git-rebase--interactive.sh:412
+#, sh-format
+msgid "The commit message #${n} will be skipped:"
+msgstr "Commit-Beschreibung #${n} wird ausgelassen:"
-#~ msgid "prune .git/worktrees"
-#~ msgstr ""
-#~ "Informationen zu nicht mehr existierenden Arbeitsverzeichnissen in .git/"
-#~ "worktrees entfernen"
+#: git-rebase--interactive.sh:423
+#, sh-format
+msgid "This is a combination of $count commit."
+msgid_plural "This is a combination of $count commits."
+msgstr[0] "Das ist eine Kombination aus $count Commit."
+msgstr[1] "Das ist eine Kombination aus $count Commits."
-#~ msgid "The most commonly used git commands are:"
-#~ msgstr "Die allgemein verwendeten Git-Kommandos sind:"
+#: git-rebase--interactive.sh:431
+#, sh-format
+msgid "Cannot write $fixup_msg"
+msgstr "Kann $fixup_msg nicht schreiben"
-#~ msgid "No such branch: '%s'"
-#~ msgstr "Kein solcher Branch '%s'"
+#: git-rebase--interactive.sh:434
+msgid "This is a combination of 2 commits."
+msgstr "Das ist eine Kombination aus 2 Commits."
-#~ msgid "Could not create git link %s"
-#~ msgstr "Konnte git-Verweis %s nicht erstellen"
+#: git-rebase--interactive.sh:435
+msgid "This is the 1st commit message:"
+msgstr "Das ist die erste Commit-Beschreibung:"
-#~ msgid "Invalid gc.pruneexpire: '%s'"
-#~ msgstr "Ungültiges Wert für \"gc.pruneexpire\": '%s'"
+#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
+#: git-rebase--interactive.sh:521
+#, sh-format
+msgid "Could not apply $sha1... $rest"
+msgstr "Konnte $sha1... ($rest) nicht anwenden"
+
+#: git-rebase--interactive.sh:549
+#, sh-format
+msgid ""
+"Could not amend commit after successfully picking $sha1... $rest\n"
+"This is most likely due to an empty commit message, or the pre-commit hook\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue "
+"before\n"
+"you are able to reword the commit."
+msgstr ""
+"Konnte Commit nicht nachbessern, nachdem dieser verwendet wurde: $sha1... $rest\n"
+"Das passierte sehr wahrscheinlich wegen einer leeren Commit-Beschreibung, oder\n"
+"weil der pre-commit Hook fehlschlug. Falls der pre-commit Hook fehlschlug,\n"
+"sollten Sie das Problem beheben, bevor Sie die Commit-Beschreibung ändern können."
+
+#: git-rebase--interactive.sh:564
+#, sh-format
+msgid "Stopped at $sha1_abbrev... $rest"
+msgstr "Angehalten bei $sha1_abbrev... $rest"
+
+#: git-rebase--interactive.sh:579
+#, sh-format
+msgid "Cannot '$squash_style' without a previous commit"
+msgstr "Kann nicht '$squash_style' ohne vorherigen Commit"
+
+#: git-rebase--interactive.sh:621
+#, sh-format
+msgid "Executing: $rest"
+msgstr "Führe aus: $rest"
+
+#: git-rebase--interactive.sh:629
+#, sh-format
+msgid "Execution failed: $rest"
+msgstr "Ausführung fehlgeschlagen: $rest"
+
+#: git-rebase--interactive.sh:631
+msgid "and made changes to the index and/or the working tree"
+msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert."
+
+#: git-rebase--interactive.sh:633
+msgid ""
+"You can fix the problem, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Sie können das Problem beheben, und dann\n"
+"\n"
+"\tgit rebase --continue\n"
+"\n"
+"ausführen."
+
+#. TRANSLATORS: after these lines is a command to be issued by the user
+#: git-rebase--interactive.sh:646
+#, sh-format
+msgid ""
+"Execution succeeded: $rest\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Ausführung erfolgreich: $rest\n"
+"Aber Änderungen in Index oder Arbeitsverzeichnis verblieben.\n"
+"Committen Sie Ihre Änderungen oder benutzen Sie \"stash\".\n"
+"Führen Sie dann aus:\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:657
+#, sh-format
+msgid "Unknown command: $command $sha1 $rest"
+msgstr "Unbekannter Befehl: $command $sha1 $rest"
-#~ msgid "(detached from %s)"
-#~ msgstr "(losgelöst von %s)"
+#: git-rebase--interactive.sh:658
+msgid "Please fix this using 'git rebase --edit-todo'."
+msgstr "Bitte beheben Sie das, indem Sie 'git rebase --edit-todo' ausführen."
-#~ msgid "search also in ignored files"
-#~ msgstr "auch in ignorierten Dateien suchen"
+#: git-rebase--interactive.sh:693
+#, sh-format
+msgid "Successfully rebased and updated $head_name."
+msgstr "Erfolgreich Rebase ausgeführt und $head_name aktualisiert."
-#~ msgid "No existing author found with '%s'"
-#~ msgstr "Kein existierender Autor mit '%s' gefunden."
-
-#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
-#~ msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)"
-
-#~ msgid "no files added"
-#~ msgstr "keine Dateien hinzugefügt"
-
-#~ msgid "force creation (when already exists)"
-#~ msgstr "Branch auch erzeugen, wenn dieser bereits existiert"
-
-#~ msgid "slot"
-#~ msgstr "Slot"
-
-#~ msgid "check"
-#~ msgstr "check|on-demand"
-
-#~ msgid "Failed to lock ref for update"
-#~ msgstr "Fehler beim Sperren der Referenz zur Aktualisierung."
-
-#~ msgid "Failed to write ref"
-#~ msgstr "Fehler beim Schreiben der Referenz."
-
-#~ msgid "Failed to lock HEAD during fast_forward_to"
-#~ msgstr "Fehler beim Sperren von HEAD während fast_forward_to"
-
-#~ msgid "invalid commit: %s"
-#~ msgstr "Ungültiger Commit: %s"
-
-#~ msgid "cannot lock HEAD ref"
-#~ msgstr "Kann Referenz von HEAD nicht sperren."
-
-#~ msgid "cannot update HEAD ref"
-#~ msgstr "Kann Referenz von HEAD nicht aktualisieren."
-
-#~ msgid "cannot tell cwd"
-#~ msgstr "kann aktuelles Arbeitsverzeichnis nicht ermitteln"
-
-#~ msgid "%s: cannot lock the ref"
-#~ msgstr "%s: kann Referenz nicht sperren"
-
-#~ msgid "%s: cannot update the ref"
-#~ msgstr "%s: kann Referenz nicht aktualisieren"
-
-#~ msgid "commit has empty message"
-#~ msgstr "Commit hat eine leere Beschreibung"
-
-#~ msgid "Failed to chdir: %s"
-#~ msgstr "Fehler beim Verzeichniswechsel: %s"
-
-#~ msgid "key id"
-#~ msgstr "Schlüssel-ID"
-
-#~ msgid "Tracking not set up: name too long: %s"
-#~ msgstr ""
-#~ "Konfiguration zum Folgen von Branch nicht eingerichtet. Name zu lang: %s"
-
-#~ msgid "bug"
-#~ msgstr "Fehler"
-
-#~ msgid ", behind "
-#~ msgstr ", hinterher "
-
-#~ msgid "could not find .gitmodules in index"
-#~ msgstr "Konnte .gitmodules nicht in der Staging-Area finden"
-
-#~ msgid "reading updated .gitmodules failed"
-#~ msgstr "Lesen der aktualisierten .gitmodules-Datei fehlgeschlagen"
-
-#~ msgid "unable to stat updated .gitmodules"
-#~ msgstr "Konnte aktualisierte .gitmodules-Datei nicht lesen"
-
-#~ msgid "unable to remove .gitmodules from index"
-#~ msgstr "Konnte .gitmodules nicht aus der Staging-Area entfernen"
-
-#~ msgid "adding updated .gitmodules failed"
-#~ msgstr "Konnte aktualisierte .gitmodules-Datei nicht hinzufügen"
-
-#~ msgid ""
-#~ "The behavior of 'git add %s (or %s)' with no path argument from a\n"
-#~ "subdirectory of the tree will change in Git 2.0 and should not be used "
-#~ "anymore.\n"
-#~ "To add content for the whole tree, run:\n"
-#~ "\n"
-#~ " git add %s :/\n"
-#~ " (or git add %s :/)\n"
-#~ "\n"
-#~ "To restrict the command to the current directory, run:\n"
-#~ "\n"
-#~ " git add %s .\n"
-#~ " (or git add %s .)\n"
-#~ "\n"
-#~ "With the current Git version, the command is restricted to the current "
-#~ "directory.\n"
-#~ msgstr ""
-#~ "Das Verhalten von 'git add %s (oder %s)' ohne ein Pfad-Argument von\n"
-#~ "einem Unterverzeichnis aus wird in Git 2.0 geändert und sollte nicht\n"
-#~ "mehr verwendet werden.\n"
-#~ "Um Dateien des gesamten Projektverzeichnisses hinzuzufügen, führen Sie "
-#~ "aus:\n"
-#~ "\n"
-#~ " git add %s :/\n"
-#~ " (oder git add %s :/)\n"
-#~ "\n"
-#~ "Zur Einschränkung auf das aktuelle Verzeichnis führen Sie aus:\n"
-#~ "\n"
-#~ " git add %s .\n"
-#~ " (oder git add %s .)\n"
-#~ "\n"
-#~ "Mit der aktuellen Version von Git ist das Kommando auf das aktuelle\n"
-#~ "Verzeichnis beschränkt.\n"
-
-#~ msgid ""
-#~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
-#~ "whose behaviour will change in Git 2.0 with respect to paths you "
-#~ "removed.\n"
-#~ "Paths like '%s' that are\n"
-#~ "removed from your working tree are ignored with this version of Git.\n"
-#~ "\n"
-#~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
-#~ " ignores paths you removed from your working tree.\n"
-#~ "\n"
-#~ "* 'git add --all <pathspec>' will let you also record the removals.\n"
-#~ "\n"
-#~ "Run 'git status' to check the paths you removed from your working tree.\n"
-#~ msgstr ""
-#~ "Sie haben 'git add' weder mit '-A (--all)' noch mit '--ignore-removal'\n"
-#~ "ausgeführt. Das Verhalten des Kommandos ändert sich in Git 2.0 durch\n"
-#~ "Berücksichtigung der gelöschten Pfade.\n"
-#~ "Pfade wie '%s', die im Arbeitsverzeichnis gelöscht wurden, werden in\n"
-#~ "dieser Version von Git ignoriert.\n"
-#~ "\n"
-#~ "* 'git add --ignore-removal <Pfadspezifikation>', was der aktuelle\n"
-#~ " Standardwert ist, ignoriert gelöschte Pfade im Arbeitsverzeichnis.\n"
-#~ "* 'git add --all <Pfadspezifikation>' berücksichtigt ebenfalls gelöschte\n"
-#~ " Pfade.\n"
-#~ "Führen Sie 'git status' aus, um die gelöschten Pfade zu überprüfen.\n"
-
-#~ msgid ""
-#~ "Auto packing the repository for optimum performance. You may also\n"
-#~ "run \"git gc\" manually. See \"git help gc\" for more information.\n"
-#~ msgstr ""
-#~ "Die Datenbank des Repositories wird für eine optimale Performance\n"
-#~ "komprimiert. Sie können auch \"git gc\" manuell ausführen.\n"
-#~ "Siehe \"git help gc\" für weitere Informationen.\n"
-
-#~ msgid ""
-#~ "Updates were rejected because a pushed branch tip is behind its remote\n"
-#~ "counterpart. If you did not intend to push that branch, you may want to\n"
-#~ "specify branches to push or set the 'push.default' configuration "
-#~ "variable\n"
-#~ "to 'simple', 'current' or 'upstream' to push only the current branch."
-#~ msgstr ""
-#~ "Aktualisierungen wurden zurückgewiesen, weil die Spitze eines "
-#~ "versendeten\n"
-#~ "Branches hinter seinem externen Gegenstück zurückgefallen ist. Wenn Sie "
-#~ "nicht\n"
-#~ "beabsichtigt haben, diesen Branch zu versenden, können Sie auch den zu "
-#~ "versendenden\n"
-#~ "Branch spezifizieren oder die Konfigurationsvariable 'push.default' zu "
-#~ "'simple', 'current'\n"
-#~ "oder 'upstream' setzen, um nur den aktuellen Branch zu versenden."
-
-#~ msgid "copied: %s -> %s"
-#~ msgstr "kopiert: %s -> %s"
-
-#~ msgid "deleted: %s"
-#~ msgstr "gelöscht: %s"
-
-#~ msgid "modified: %s"
-#~ msgstr "geändert: %s"
-
-#~ msgid "renamed: %s -> %s"
-#~ msgstr "umbenannt: %s -> %s"
-
-#~ msgid "unmerged: %s"
-#~ msgstr "nicht zusammengeführt: %s"
-
-#~ msgid "input paths are terminated by a null character"
-#~ msgstr "Eingabepfade sind durch ein NUL Zeichen abgeschlossen"
-
-#~ msgid ""
-#~ "Aborting. Consider using either the --force or --include-untracked option."
-#~ msgstr ""
-#~ "Abgebrochen. Benutzen Sie entweder die Option --force oder --include-"
-#~ "untracked."
-
-#~ msgid " (fix conflicts and then run \"git am --resolved\")"
-#~ msgstr ""
-#~ " (beheben Sie die Konflikte und führen Sie dann \"git am --resolved\" "
-#~ "aus)"
-
-#~ msgid " (all conflicts fixed: run \"git commit\")"
-#~ msgstr " (alle Konflikte behoben: führen Sie \"git commit\" aus)"
-
-#~ msgid "more than %d trees given: '%s'"
-#~ msgstr "Mehr als %d \"Tree\"-Objekte angegeben: '%s'"
-
-#~ msgid "You cannot combine --no-ff with --ff-only."
-#~ msgstr "Sie können --no-ff nicht mit --ff--only kombinieren."
-
-#~ msgid ""
-#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "Submodul '%s' (oder ein geschachteltes Submodul hiervon) verwendet\n"
-#~ "ein .git-Verzeichnis (benutzen Sie 'rm -rf' wenn Sie dieses wirklich "
-#~ "mitsamt\n"
-#~ "seiner Historie löschen möchten)"
-
-#~ msgid ""
-#~ "'%s' has changes staged in the index\n"
-#~ "(use --cached to keep the file, or -f to force removal)"
-#~ msgstr ""
-#~ "'%s' hat zum Commit vorgemerkte Änderungen\n"
-#~ "(benutzen Sie --cached um die Datei zu behalten, oder -f um die "
-#~ "Entfernung zu erzwingen)"
-
-#~ msgid "show commits where no parent comes before its children"
-#~ msgstr ""
-#~ "zeigt Commits, bei denen kein Eltern-Commit vor seinem Kind-Commit kommt"
-
-#~ msgid "show the HEAD reference"
-#~ msgstr "zeigt Referenz von HEAD"
-
-#~ msgid "Unable to fetch in submodule path '$prefix$sm_path'"
-#~ msgstr "Konnte \"fetch\" in Submodul-Pfad '$prefix$sm_path' nicht ausführen"
-
-#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'"
-#~ msgstr "Fehler bei Rekursion in Submodul-Pfad '$prefix$sm_path'"
-
-#~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
-#~ msgstr ""
-#~ "Es dauerte %.2f Sekunden die unbeobachteten Dateien zu bestimmen.'status -"
-#~ "uno'"
-
-#~ msgid "may speed it up, but you have to be careful not to forget to add"
-#~ msgstr "könnte das beschleunigen, aber Sie müssen darauf achten, neue"
-
-#~ msgid "new files yourself (see 'git help status')."
-#~ msgstr "Dateien selbstständig hinzuzufügen (siehe 'git help status')."
+#: git-rebase--interactive.sh:740
+msgid "Could not skip unnecessary pick commands"
+msgstr "Fehler beim Auslassen von nicht erforderlichen \"pick\"-Befehlen."
-#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
-#~ msgstr ""
-#~ "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] "
-#~ "[<Versionsidentifikation>... ]"
+#: git-rebase--interactive.sh:898
+#, sh-format
+msgid ""
+"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+" - $line"
+msgstr ""
+"Warnung: Der SHA-1 in der folgenden Zeile fehlt oder ist kein Commit:\n"
+" - $line"
-#~ msgid "See 'git help <command>' for more information on a specific command."
-#~ msgstr ""
-#~ "Siehe 'git help <Kommando>' für weitere Informationen zu einem "
-#~ "spezifischen Kommando"
+#: git-rebase--interactive.sh:931
+#, sh-format
+msgid ""
+"Warning: the command isn't recognized in the following line:\n"
+" - $line"
+msgstr ""
+"Warnung: Das Kommando in der folgenden Zeile wurde nicht erkannt:\n"
+" - $line"
-#~ msgid "use any ref in .git/refs"
-#~ msgstr "verwendet alle Referenzen in .git/refs"
+#: git-rebase--interactive.sh:970
+msgid "could not detach HEAD"
+msgstr "Konnte HEAD nicht loslösen"
-#~ msgid "use any tag in .git/refs/tags"
-#~ msgstr "verwendet alle Markierungen in .git/refs/tags"
+#: git-rebase--interactive.sh:1008
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):"
+msgstr ""
+"Warnung: Einige Commits könnten aus Versehen entfernt worden sein.\n"
+"Entfernte Commits (neu zu alt):"
-#~ msgid "bad object %s"
-#~ msgstr "ungültiges Objekt %s"
+#: git-rebase--interactive.sh:1016
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error."
+msgstr ""
+"Um diese Meldung zu vermeiden, benutzen Sie \"drop\", um exlizit Commits zu\n"
+"entfernen.\n"
+"\n"
+"Benutzen Sie 'git config rebase.missingCommitsCheck', um die Stufe der Warnungen\n"
+"zu ändern.\n"
+"Die möglichen Verhaltensweisen sind: ignore, warn, error."
-#~ msgid "bogus committer info %s"
-#~ msgstr "unechte Einreicher-Informationen %s"
+#: git-rebase--interactive.sh:1027
+#, sh-format
+msgid ""
+"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
+"Ignoring."
+msgstr ""
+"Nicht erkannte Einstellung $check_level für Option rebase.missingCommitsCheck.\n"
+"Ignoriere."
-#~ msgid "can't fdopen 'show' output fd"
-#~ msgstr "konnte Datei-Deskriptor für Ausgabe von 'show' nicht öffnen"
+#: git-rebase--interactive.sh:1044
+msgid "You can fix this with 'git rebase --edit-todo'."
+msgstr "Sie können das mit 'git rebase --edit-todo' beheben."
-#~ msgid "failed to close pipe to 'show' for object '%s'"
-#~ msgstr ""
-#~ "Schließen der Verbindung zu 'show' ist für Objekt '%s' fehlgeschlagen."
+#: git-rebase--interactive.sh:1045
+msgid "Or you can abort the rebase with 'git rebase --abort'."
+msgstr "Oder Sie können den Rebase mit 'git rebase --abort' abbrechen."
-#~ msgid "You do not have a valid HEAD"
-#~ msgstr "Sie haben keine gültige Zweigspitze (HEAD)"
+#: git-rebase--interactive.sh:1069
+msgid "Could not remove CHERRY_PICK_HEAD"
+msgstr "Konnte CHERRY_PICK_HEAD nicht löschen"
-#~ msgid "oops"
-#~ msgstr "Ups"
+#: git-rebase--interactive.sh:1074
+#, sh-format
+msgid ""
+"You have staged changes in your working tree.\n"
+"If these changes are meant to be\n"
+"squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In both case, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
+msgstr ""
+"Es befinden sich zum Commit vorgemerkte Änderungen in Ihrem Arbeitsverzeichnis.\n"
+"Wenn diese Änderungen in den vorherigen Commit aufgenommen werden sollen,\n"
+"führen Sie aus:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Wenn daraus ein neuer Commit erzeugt werden soll, führen Sie aus:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"Im Anschluss führen Sie zum Fortfahren aus:\n"
+"\n"
+" git rebase --continue\n"
-#~ msgid "Would not remove %s\n"
-#~ msgstr "Würde '%s' nicht löschen\n"
+#: git-rebase--interactive.sh:1091
+msgid "Error trying to find the author identity to amend commit"
+msgstr ""
+"Fehler beim Versuch die Identität des Authors zum Verbessern des Commits zu\n"
+"finden"
-#~ msgid "Not removing %s\n"
-#~ msgstr "Entferne nicht %s\n"
+#: git-rebase--interactive.sh:1096
+msgid ""
+"You have uncommitted changes in your working tree. Please commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"Sie haben nicht committete Änderungen in Ihrem Arbeitsverzeichnis. Bitte\n"
+"committen Sie diese zuerst und führen Sie dann 'git rebase --continue' erneut\n"
+"aus."
-#~ msgid "Could not read index"
-#~ msgstr "Konnte Bereitstellung nicht lesen"
+#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
+msgid "Could not commit staged changes."
+msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
-#~ msgid " 0 files changed"
-#~ msgstr " 0 Dateien geändert"
+#: git-rebase--interactive.sh:1129
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Sie bearbeiten gerade die TODO-Datei eines laufenden interaktiven Rebase.\n"
+"Um den Rebase nach dem Editieren fortzusetzen, führen Sie aus:\n"
+" git rebase --continue\n"
+"\n"
-#~ msgid " %d file changed"
-#~ msgid_plural " %d files changed"
-#~ msgstr[0] " %d Datei geändert"
-#~ msgstr[1] " %d Dateien geändert"
+#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+msgid "Could not execute editor"
+msgstr "Konnte Editor nicht ausführen."
-#~ msgid ", %d insertion(+)"
-#~ msgid_plural ", %d insertions(+)"
-#~ msgstr[0] ", %d Zeile hinzugefügt(+)"
-#~ msgstr[1] ", %d Zeilen hinzugefügt(+)"
+#: git-rebase--interactive.sh:1145
+msgid "You need to set your committer info first"
+msgstr "Sie müssen zuerst die Informationen zum Commit-Ersteller setzen."
-#~ msgid ", %d deletion(-)"
-#~ msgid_plural ", %d deletions(-)"
-#~ msgstr[0] ", %d Zeile entfernt(-)"
-#~ msgstr[1] ", %d Zeilen entfernt(-)"
+#: git-rebase--interactive.sh:1153
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr "Konnte $switch_to nicht auschecken."
-#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
-#~ msgstr "git remote set-head <Name> (-a | -d | <Zweig>])"
+#: git-rebase--interactive.sh:1158
+msgid "No HEAD?"
+msgstr "Kein HEAD?"
-#~ msgid " (use \"git add\" to track)"
-#~ msgstr " (benutze \"git add\" zum Beobachten)"
+#: git-rebase--interactive.sh:1159
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr "Konnte temporäres Verzeichnis $state_dir nicht erstellen."
-#~ msgid "--detach cannot be used with -b/-B/--orphan"
-#~ msgstr "--detach kann nicht mit -b/-B/--orphan benutzt werden"
+#: git-rebase--interactive.sh:1161
+msgid "Could not mark as interactive"
+msgstr "Konnte nicht als interaktiven Rebase markieren."
-#~ msgid "--detach cannot be used with -t"
-#~ msgstr "--detach kann nicht mit -t benutzt werden"
+#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+msgid "Could not init rewritten commits"
+msgstr "Konnte neu geschriebene Commits nicht initialisieren."
-#~ msgid "--orphan and -b|-B are mutually exclusive"
-#~ msgstr "--orphan und -b|-B sind gegenseitig exklusiv"
+#: git-rebase--interactive.sh:1276
+#, sh-format
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] "Rebase von $shortrevisions auf $shortonto ($todocount Kommando)"
+msgstr[1] "Rebase von $shortrevisions auf $shortonto ($todocount Kommandos)"
-#~ msgid "--orphan cannot be used with -t"
-#~ msgstr "--orphan kann nicht mit -t benutzt werden"
+#: git-rebase--interactive.sh:1281
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr "\nWenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n\n"
-#~ msgid "git checkout: -f and -m are incompatible"
-#~ msgstr "git checkout: -f und -m sind inkompatibel"
+#: git-rebase--interactive.sh:1288
+msgid "Note that empty commits are commented out"
+msgstr "Leere Commits sind auskommentiert."
-#~ msgid ""
-#~ "git checkout: updating paths is incompatible with switching branches."
-#~ msgstr ""
-#~ "git checkout: Die Aktualisierung von Pfaden ist inkompatibel mit dem "
-#~ "Wechsel von Zweigen."
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "Verwendung: $dashless $USAGE"
-#~ msgid "diff setup failed"
-#~ msgstr "diff_setup_done fehlgeschlagen"
+#: git-sh-setup.sh:190
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr ""
+"Konnte nicht in Verzeichnis $cdup wechseln, der obersten Ebene des\n"
+"Arbeitsverzeichnisses."
-#~ msgid "merge-recursive: disk full?"
-#~ msgstr "merge-recursive: Festplatte voll?"
+#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr "fatal: $program_name kann ohne ein Arbeitsverzeichnis nicht verwendet werden."
-#~ msgid "diff_setup_done failed"
-#~ msgstr "diff_setup_done fehlgeschlagen"
+#: git-sh-setup.sh:220
+msgid "Cannot rebase: You have unstaged changes."
+msgstr "Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt sind."
-#~ msgid "-d option is no longer supported. Do not use."
-#~ msgstr "-d Option wird nicht länger unterstützt. Nicht benutzen."
+#: git-sh-setup.sh:223
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr ""
+"Kann Branches nicht neu schreiben: Sie haben Änderungen, die nicht zum Commit\n"
+"vorgemerkt sind."
-#~ msgid "%s: has been deleted/renamed"
-#~ msgstr "%s wurde gelöscht/umbenannt"
+#: git-sh-setup.sh:229
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr ""
+"Kann $action nicht ausführen: Sie haben Änderungen, die nicht zum Commit\n"
+"vorgemerkt sind."
-#~ msgid "'%s': not a documentation directory."
-#~ msgstr "'%s' ist kein Dokumentationsverzeichnis"
+#: git-sh-setup.sh:242
+msgid "Cannot rebase: Your index contains uncommitted changes."
+msgstr "Rebase nicht möglich: Die Staging-Area beinhaltet nicht committete Änderungen."
-#~ msgid "--"
-#~ msgstr "--"
+#: git-sh-setup.sh:248
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr ""
+"Kann $action nicht ausführen: Die Staging-Area beinhaltet nicht committete\n"
+"Änderungen."
-#~ msgid "Could not extract email from committer identity."
-#~ msgstr "Konnte E-Mail-Adresse des Einreichers nicht extrahieren."
+#: git-sh-setup.sh:372
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr "Sie müssen den Befehl von der obersten Ebene des Arbeitsverzeichnisses ausführen."
-#~ msgid "cherry-pick"
-#~ msgstr "cherry-pick"
+#: git-sh-setup.sh:377
+msgid "Unable to determine absolute path of git directory"
+msgstr "Konnte absoluten Pfad des Git-Verzeichnisses nicht bestimmen."
-#~ msgid ""
-#~ "To prevent you from losing history, non-fast-forward updates were "
-#~ "rejected\n"
-#~ "Merge the remote changes (e.g. 'git pull') before pushing again. See "
-#~ "the\n"
-#~ "'Note about fast-forwards' section of 'git push --help' for details.\n"
-#~ msgstr ""
-#~ "Um dich vor Verlust von Historie zu bewahren, wurden nicht vorzuspulende "
-#~ "Aktualisierungen zurückgewiesen.\n"
-#~ "Führe die externen Änderungen zusammen (z.B. 'git pull') bevor du erneut "
-#~ "versendest. Siehe auch die 'Note about fast-forwards' Sektion von \n"
-#~ "'git push --help' für weitere Details.\n"
diff --git a/po/fr.po b/po/fr.po
index b18d57f..aeb4155 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
# French translations for Git.
# Copyright (C) 2015 Jean-Noël Avila <jn.avila@free.fr>
# This file is distributed under the same license as the Git package.
-# Jean-Noël Avila <jn.avila@free.fr>, 2015.
+# Jean-Noël Avila <jn.avila@free.fr>, 2016.
# Sébastien Helleu <flashcode@flashtux.org>, 2013.
#
# French translations of common Git words used in this file:
@@ -73,8 +73,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-05-24 23:42+0800\n"
-"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"POT-Creation-Date: 2016-08-27 23:21+0800\n"
+"PO-Revision-Date: 2016-08-28 11:26+0200\n"
"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n"
@@ -88,7 +88,32 @@ msgstr ""
msgid "hint: %.*s\n"
msgstr "astuce: %.*s\n"
-#: advice.c:88
+#: advice.c:83
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr "Impossible de picorer car vous avez des fichiers non fusionnés."
+
+#: advice.c:85
+msgid "Committing is not possible because you have unmerged files."
+msgstr "Impossible de valider car vous avez des fichiers non fusionnés."
+
+#: advice.c:87
+msgid "Merging is not possible because you have unmerged files."
+msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés."
+
+#: advice.c:89
+msgid "Pulling is not possible because you have unmerged files."
+msgstr "Impossible de tirer car vous avez des fichiers non fusionnés."
+
+#: advice.c:91
+msgid "Reverting is not possible because you have unmerged files."
+msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés."
+
+#: advice.c:93
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
+msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés."
+
+#: advice.c:101
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -96,18 +121,54 @@ msgstr ""
"Corrigez-les puis lancez 'git add/rm <fichier>'\n"
"si nécessaire pour marquer la résolution et valider."
-#: advice.c:101 builtin/merge.c:1238
+#: advice.c:109
+msgid "Exiting because of an unresolved conflict."
+msgstr "Abandon à cause de conflit non résolu."
+
+#: advice.c:114 builtin/merge.c:1181
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
-#: advice.c:103
+#: advice.c:116
msgid "Please, commit your changes before merging."
msgstr "Veuillez valider vos changements avant de fusionner."
-#: advice.c:104
+#: advice.c:117
msgid "Exiting because of unfinished merge."
msgstr "Abandon à cause d'une fusion non terminée."
+#: advice.c:123
+#, c-format
+msgid ""
+"Note: checking out '%s'.\n"
+"\n"
+"You are in 'detached HEAD' state. You can look around, make experimental\n"
+"changes and commit them, and you can discard any commits you make in this\n"
+"state without impacting any branches by performing another checkout.\n"
+"\n"
+"If you want to create a new branch to retain commits you create, you may\n"
+"do so (now or later) by using -b with the checkout command again. Example:\n"
+"\n"
+" git checkout -b <new-branch-name>\n"
+"\n"
+msgstr ""
+"Note : extraction de '%s'.\n"
+"\n"
+"Vous êtes dans l'état « HEAD détachée ». Vous pouvez visiter, faire des "
+"modifications\n"
+"expérimentales et les valider. Il vous suffit de faire une autre extraction "
+"pour\n"
+"abandonner les commits que vous faites dans cet état sans impacter les "
+"autres branches\n"
+"\n"
+"Si vous voulez créer une nouvelle branche pour conserver les commits que "
+"vous créez,\n"
+"il vous suffit d'utiliser « checkout -b » (maintenant ou plus tard) comme "
+"ceci :\n"
+"\n"
+" git checkout -b <nom-de-la-nouvelle-branche>\n"
+"\n"
+
#: archive.c:12
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"
@@ -127,7 +188,7 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
-#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "le chemin '%s' ne correspond à aucun fichier"
@@ -140,7 +201,7 @@ msgstr "fmt"
msgid "archive format"
msgstr "format d'archive"
-#: archive.c:430 builtin/log.c:1395
+#: archive.c:430 builtin/log.c:1422
msgid "prefix"
msgstr "préfixe"
@@ -148,10 +209,10 @@ msgstr "préfixe"
msgid "prepend prefix to each pathname in the archive"
msgstr "préfixer chaque chemin de fichier dans l'archive"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549
-#: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459
-#: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 builtin/blame.c:2554
+#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989
+#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:460
+#: builtin/ls-files.c:463 builtin/notes.c:399 builtin/notes.c:562
#: builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "fichier"
@@ -185,7 +246,7 @@ msgid "list supported archive formats"
msgstr "afficher les formats d'archive supportés"
#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:776
+#: builtin/submodule--helper.c:832
msgid "repo"
msgstr "dépôt"
@@ -193,7 +254,7 @@ msgstr "dépôt"
msgid "retrieve the archive from remote repository <repo>"
msgstr "récupérer l'archive depuis le dépôt distant <dépôt>"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
msgid "command"
msgstr "commande"
@@ -201,6 +262,28 @@ msgstr "commande"
msgid "path to the remote git-upload-archive command"
msgstr "chemin vers la commande distante git-upload-archive"
+#: archive.c:461
+msgid "Unexpected option --remote"
+msgstr "Option --remote inattendue"
+
+#: archive.c:463
+msgid "Option --exec can only be used together with --remote"
+msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote"
+
+#: archive.c:465
+msgid "Unexpected option --output"
+msgstr "Option --output inattendue"
+
+#: archive.c:487
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Format d'archive inconnu '%s'"
+
+#: archive.c:494
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argument non supporté pour le format '%s' : -%d"
+
#: attr.c:263
msgid ""
"Negative patterns are ignored in git attributes\n"
@@ -209,6 +292,130 @@ msgstr ""
"Les motifs de négation sont ignorés dans les attributs git\n"
"Utilisez '\\!' pour un point d'exclamation littéral."
+#: bisect.c:441
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "impossible d'ouvrir le fichier '%s'"
+
+#: bisect.c:446
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "Contenu mal cité dans le fichier '%s' : %s"
+
+#: bisect.c:655
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "Impossible de pousser la bissection plus loin !\n"
+
+#: bisect.c:708
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "%s n'est pas un nom de commit valide"
+
+#: bisect.c:732
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+"La base de fusion %s est mauvaise.\n"
+"Cela signifie que le bogue été corrigé entre %s et [%s].\n"
+
+#: bisect.c:737
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"La base de fusion %s est nouvelle.\n"
+"La propriété a changé entre %s et [%s].\n"
+
+#: bisect.c:742
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"La base de fusion %s est %s.\n"
+"Ceci signifie que le premier commit '%s' est entre %s et [%s].\n"
+
+#: bisect.c:750
+#, c-format
+msgid ""
+"Some %s revs are not ancestor of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
+msgstr ""
+"Certaines révision %s ne sont pas ancêtres de la révision %s.\n"
+"git bisect ne peut pas fonctionner correctement dans ce cas.\n"
+"Peut-être avez-vous inversé les révisions %s et %s ?\n"
+
+#: bisect.c:763
+#, c-format
+msgid ""
+"the merge base between %s and [%s] must be skipped.\n"
+"So we cannot be sure the first %s commit is between %s and %s.\n"
+"We continue anyway."
+msgstr ""
+"La base de fusion entre %s et [%s] doit être évitée.\n"
+"On ne peut donc pas être certain que le premier commit %s se trouve entre %s "
+"et %s.\n"
+"On continue tout de même."
+
+#: bisect.c:798
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "Bissection : une base de fusion doit être testée\n"
+
+#: bisect.c:849
+#, c-format
+msgid "a %s revision is needed"
+msgstr "une révision %s est nécessaire"
+
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#, c-format
+msgid "could not create file '%s'"
+msgstr "impossible de créer le fichier '%s'"
+
+#: bisect.c:917
+#, c-format
+msgid "could not read file '%s'"
+msgstr "impossible de lire le fichier '%s'"
+
+#: bisect.c:947
+msgid "reading bisect refs failed"
+msgstr "impossible de lire les références de bissection"
+
+#: bisect.c:967
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr "%s était à la fois %s et %s\n"
+
+#: bisect.c:975
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+"Aucun commit testable n'a été trouvé\n"
+"Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n"
+
+#: bisect.c:994
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(à peu près %d étape)"
+msgstr[1] "(à peu près %d étapes)"
+
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:998
+#, c-format
+msgid "Bisecting: %d revision left to test after this %s\n"
+msgid_plural "Bisecting: %d revisions left to test after this %s\n"
+msgstr[0] "Bissection : %d révision à tester après cette %s\n"
+msgstr[1] "Bissection : %d révisions à tester après cette %s\n"
+
#: branch.c:53
#, c-format
msgid ""
@@ -364,7 +571,7 @@ msgstr "'%s' ne semble pas être un fichier bundle v2"
msgid "unrecognized header: %s%s (%d)"
msgstr "en-tête non reconnu : %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:777
+#: bundle.c:87 builtin/commit.c:778
#, c-format
msgid "could not open '%s'"
msgstr "impossible d'ouvrir '%s'"
@@ -373,10 +580,10 @@ msgstr "impossible d'ouvrir '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
-#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
-#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
-#: builtin/merge.c:361 builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
+#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
+#: builtin/merge.c:356 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "échec de la préparation du parcours des révisions"
@@ -415,7 +622,7 @@ msgstr "rev-list a disparu"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "la référence '%s' est exclue par les options de rev-list"
-#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
@@ -433,13 +640,13 @@ msgstr "impossible de créer '%s'"
msgid "index-pack died"
msgstr "l'index de groupe a disparu"
-#: color.c:275
+#: color.c:290
#, c-format
msgid "invalid color value: %.*s"
msgstr "Valeur invalide de couleur : %.*s"
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
-#: builtin/am.c:2134
+#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
+#: builtin/am.c:2119
#, c-format
msgid "could not parse %s"
msgstr "impossible d'analyser %s"
@@ -453,131 +660,203 @@ msgstr "%s %s n'est pas un commit !"
msgid "memory exhausted"
msgstr "plus de mémoire"
-#: config.c:475 config.c:477
+#: config.c:516
#, c-format
-msgid "bad config line %d in %s %s"
-msgstr "ligne %d de fichier de config incorrecte dans %s %s"
+msgid "bad config line %d in blob %s"
+msgstr "ligne %d de config incorrecte dans le blob %s"
-#: config.c:593
+#: config.c:520
#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
-msgstr ""
-"valeur numérique de configuration incorrecte '%s' pour '%s' dans %s %s : %s"
+msgid "bad config line %d in file %s"
+msgstr "ligne %d de config incorrecte dans le fichier %s"
+
+#: config.c:524
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "ligne %d de config incorrecte dans l'entrée standard"
+
+#: config.c:528
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "ligne %d de config incorrecte dans le blob de sous-module %s"
-#: config.c:595
+#: config.c:532
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "ligne %d de config incorrecte dans la ligne de commande %s"
+
+#: config.c:536
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "ligne %d de config incorrecte dans %s"
+
+#: config.c:655
+msgid "out of range"
+msgstr "hors plage"
+
+#: config.c:655
+msgid "invalid unit"
+msgstr "unité invalide"
+
+#: config.c:661
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
+msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
+
+#: config.c:666
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr ""
+"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob "
+"%s : %s"
+
+#: config.c:669
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr ""
+"valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier "
+"%s : %s"
+
+#: config.c:672
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr ""
+"valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée "
+"standard : %s"
+
+#: config.c:675
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr ""
+"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de "
+"sous-module %s : %s"
-#: config.c:680
+#: config.c:678
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr ""
+"valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de "
+"commande %s : %s"
+
+#: config.c:681
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr ""
+"valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"
+
+#: config.c:768
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
-#: config.c:761 config.c:772
+#: config.c:849 config.c:860
#, c-format
msgid "bad zlib compression level %d"
msgstr "niveau de compression zlib incorrect %d"
-#: config.c:890
+#: config.c:978
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode invalide pour la création d'objet : %s"
-#: config.c:1228
+#: config.c:1312
msgid "unable to parse command-line config"
msgstr "lecture de la configuration de ligne de commande impossible"
-#: config.c:1284
-msgid "unknown error occured while reading the configuration files"
+#: config.c:1362
+msgid "unknown error occurred while reading the configuration files"
msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
-#: config.c:1629
+#: config.c:1716
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
"impossible d'analyser '%s' depuis le configuration en ligne de commande"
-#: config.c:1631
+#: config.c:1718
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
"variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"
-#: config.c:1690
+#: config.c:1777
#, c-format
msgid "%s has multiple values"
msgstr "%s a des valeurs multiples"
-#: config.c:2224
+#: config.c:2311
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "impossible de régler '%s' à '%s'"
-#: config.c:2226
+#: config.c:2313
#, c-format
msgid "could not unset '%s'"
msgstr "impossible de désinitialiser '%s'"
-#: connected.c:69
+#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr "Vérification de la connectivité"
+
+#: connected.c:74
msgid "Could not run 'git rev-list'"
msgstr "Impossible de lancer 'git rev-list'"
-#: connected.c:89
+#: connected.c:94
msgid "failed write to rev-list"
msgstr "impossible d'écrire dans la rev-list"
-#: connected.c:96
+#: connected.c:101
msgid "failed to close rev-list's stdin"
msgstr "impossible de fermer l'entrée standard du rev-list"
-#: date.c:95
+#: date.c:97
msgid "in the future"
msgstr "dans le futur"
-#: date.c:101
+#: date.c:103
#, c-format
msgid "%lu second ago"
msgid_plural "%lu seconds ago"
msgstr[0] "il y a %lu seconde"
msgstr[1] "il y a %lu secondes"
-#: date.c:108
+#: date.c:110
#, c-format
msgid "%lu minute ago"
msgid_plural "%lu minutes ago"
msgstr[0] "il y a %lu minute"
msgstr[1] "il y a %lu minutes"
-#: date.c:115
+#: date.c:117
#, c-format
msgid "%lu hour ago"
msgid_plural "%lu hours ago"
msgstr[0] "il y a %lu heure"
msgstr[1] "il y a %lu heures"
-#: date.c:122
+#: date.c:124
#, c-format
msgid "%lu day ago"
msgid_plural "%lu days ago"
msgstr[0] "il y a %lu jour"
msgstr[1] "il y a %lu jours"
-#: date.c:128
+#: date.c:130
#, c-format
msgid "%lu week ago"
msgid_plural "%lu weeks ago"
msgstr[0] "il y a %lu semaine"
msgstr[1] "il y a %lu semaines"
-#: date.c:135
+#: date.c:137
#, c-format
msgid "%lu month ago"
msgid_plural "%lu months ago"
msgstr[0] "il y a %lu mois"
msgstr[1] "il y a %lu mois"
-#: date.c:146
+#: date.c:148
#, c-format
msgid "%lu year"
msgid_plural "%lu years"
@@ -585,14 +864,14 @@ msgstr[0] "%lu an"
msgstr[1] "%lu ans"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:149
+#: date.c:151
#, c-format
msgid "%s, %lu month ago"
msgid_plural "%s, %lu months ago"
msgstr[0] "il y a %s et %lu mois"
msgstr[1] "il y a %s et %lu mois"
-#: date.c:154 date.c:159
+#: date.c:156 date.c:161
#, c-format
msgid "%lu year ago"
msgid_plural "%lu years ago"
@@ -604,7 +883,7 @@ msgstr[1] "il y a %lu ans"
msgid "failed to read orderfile '%s'"
msgstr "impossible de lire le fichier de commande '%s'"
-#: diffcore-rename.c:538
+#: diffcore-rename.c:540
msgid "Performing inexact rename detection"
msgstr "Détection de renommage inexact en cours"
@@ -634,16 +913,16 @@ msgstr ""
"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
"%s"
-#: diff.c:3007
+#: diff.c:3017
#, c-format
msgid "external diff died, stopping at %s"
msgstr "l'application de diff externe a disparu, arrêt à %s"
-#: diff.c:3405
+#: diff.c:3415
msgid "--follow requires exactly one pathspec"
msgstr "--follow a besoin d'une spécification de chemin unique"
-#: diff.c:3568
+#: diff.c:3578
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -652,7 +931,7 @@ msgstr ""
"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
"%s"
-#: diff.c:3582
+#: diff.c:3592
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
@@ -665,39 +944,30 @@ msgstr "echec de l'obtention d'information de kernel"
msgid "Untracked cache is disabled on this system or location."
msgstr "Le cache non suivi est désactivé sur ce système ou sur cet endroit."
-#: gpg-interface.c:166 gpg-interface.c:235
-msgid "could not run gpg."
-msgstr "impossible de lancer gpg."
-
#: gpg-interface.c:178
-msgid "gpg did not accept the data"
-msgstr "gpg n'a pas accepté les données"
-
-#: gpg-interface.c:189
msgid "gpg failed to sign the data"
msgstr "gpg n'a pas pu signer les données"
-#: gpg-interface.c:222
-#, c-format
-msgid "could not create temporary file '%s'"
-msgstr "impossible de créer un fichier temporaire '%s'"
+#: gpg-interface.c:208
+msgid "could not create temporary file"
+msgstr "impossible de créer un fichier temporaire"
-#: gpg-interface.c:224
+#: gpg-interface.c:210
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "impossible d'écrire la signature détachée dans '%s'"
-#: grep.c:1718
+#: grep.c:1792
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s' : lecture de %s impossible"
-#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
+#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
#, c-format
msgid "failed to stat '%s'"
msgstr "échec du stat de '%s'"
-#: grep.c:1746
+#: grep.c:1820
#, c-format
msgid "'%s': short read"
msgstr "'%s' : lecture tronquée"
@@ -748,7 +1018,7 @@ msgstr "dans %0.1f secondes automatiquement..."
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'."
-#: help.c:404 help.c:464
+#: help.c:404 help.c:470
msgid ""
"\n"
"Did you mean this?"
@@ -762,7 +1032,7 @@ msgstr[1] ""
"\n"
"Vouliez-vous dire un de ceux-là ?"
-#: help.c:460
+#: help.c:466
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
@@ -795,83 +1065,78 @@ msgstr "Impossible de créer '%s.lock' : %s"
msgid "failed to read the cache"
msgstr "impossible de lire le cache"
-#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
-#: builtin/checkout.c:586 builtin/clone.c:732
+#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
+#: builtin/checkout.c:589 builtin/clone.c:732
msgid "unable to write new index file"
msgstr "impossible d'écrire le nouveau fichier d'index"
-#: merge-recursive.c:189
-#, c-format
+#: merge-recursive.c:209
msgid "(bad commit)\n"
msgstr "(mauvais commit)\n"
-#: merge-recursive.c:209
+#: merge-recursive.c:231
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "échec de addinfo_cache pour le chemin '%s'"
-#: merge-recursive.c:270
+#: merge-recursive.c:301
msgid "error building trees"
msgstr "erreur de construction des arbres"
-#: merge-recursive.c:689
+#: merge-recursive.c:720
#, c-format
msgid "failed to create path '%s'%s"
msgstr "impossible de créer le chemin '%s' %s"
-#: merge-recursive.c:700
+#: merge-recursive.c:731
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n"
-#: merge-recursive.c:714 merge-recursive.c:735
+#: merge-recursive.c:745 merge-recursive.c:764
msgid ": perhaps a D/F conflict?"
msgstr ": peut-être un conflit D/F ?"
-#: merge-recursive.c:725
+#: merge-recursive.c:754
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "refus de perdre le fichier non suivi '%s'"
-#: merge-recursive.c:765
+#: merge-recursive.c:796
#, c-format
msgid "cannot read object %s '%s'"
msgstr "impossible de lire l'objet %s '%s'"
-#: merge-recursive.c:767
+#: merge-recursive.c:798
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob attendu pour %s '%s'"
-#: merge-recursive.c:790 builtin/clone.c:376
+#: merge-recursive.c:822
#, c-format
-msgid "failed to open '%s'"
-msgstr "échec à l'ouverture de '%s'"
+msgid "failed to open '%s': %s"
+msgstr "échec à l'ouverture de '%s' : %s"
-#: merge-recursive.c:798
+#: merge-recursive.c:833
#, c-format
-msgid "failed to symlink '%s'"
-msgstr "échec à la création du lien symbolique '%s'"
+msgid "failed to symlink '%s': %s"
+msgstr "échec à la création du lien symbolique '%s' : %s"
-#: merge-recursive.c:801
+#: merge-recursive.c:838
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "ne sait pas traiter %06o %s '%s'"
-#: merge-recursive.c:939
+#: merge-recursive.c:978
msgid "Failed to execute internal merge"
msgstr "Échec à l'exécution de la fusion interne"
-#: merge-recursive.c:943
+#: merge-recursive.c:982
#, c-format
msgid "Unable to add %s to database"
msgstr "Impossible d'ajouter %s à la base de données"
-#: merge-recursive.c:959
-msgid "unsupported object type in the tree"
-msgstr "type d'objet non supporté dans l'arbre"
-
-#: merge-recursive.c:1034 merge-recursive.c:1048
+#: merge-recursive.c:1081 merge-recursive.c:1095
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -880,7 +1145,7 @@ msgstr ""
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
"%s laissée dans l'arbre."
-#: merge-recursive.c:1040 merge-recursive.c:1053
+#: merge-recursive.c:1087 merge-recursive.c:1100
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -889,20 +1154,20 @@ msgstr ""
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
"%s laissée dans l'arbre dans le fichier %s."
-#: merge-recursive.c:1094
+#: merge-recursive.c:1143
msgid "rename"
msgstr "renommage"
-#: merge-recursive.c:1094
+#: merge-recursive.c:1143
msgid "renamed"
msgstr "renommé"
-#: merge-recursive.c:1150
+#: merge-recursive.c:1200
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s est un répertoire dans %s ajouté plutôt comme %s"
-#: merge-recursive.c:1172
+#: merge-recursive.c:1225
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -911,146 +1176,137 @@ msgstr ""
"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
-#: merge-recursive.c:1177
+#: merge-recursive.c:1230
msgid " (left unresolved)"
msgstr " (laissé non résolu)"
-#: merge-recursive.c:1231
+#: merge-recursive.c:1292
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"
">'%s' dans %s"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1325
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Renommage de %s en %s et de %s en %s à la place"
-#: merge-recursive.c:1460
+#: merge-recursive.c:1531
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
-#: merge-recursive.c:1470
+#: merge-recursive.c:1546
#, c-format
msgid "Adding merged %s"
msgstr "Ajout de %s fusionné"
-#: merge-recursive.c:1475 merge-recursive.c:1677
+#: merge-recursive.c:1553 merge-recursive.c:1766
#, c-format
msgid "Adding as %s instead"
msgstr "Ajout plutôt comme %s"
-#: merge-recursive.c:1526
+#: merge-recursive.c:1610
#, c-format
msgid "cannot read object %s"
msgstr "impossible de lire l'objet %s"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1613
#, c-format
msgid "object %s is not a blob"
msgstr "l'objet %s n'est pas un blob"
-#: merge-recursive.c:1581
+#: merge-recursive.c:1666
msgid "modify"
msgstr "modification"
-#: merge-recursive.c:1581
+#: merge-recursive.c:1666
msgid "modified"
msgstr "modifié"
-#: merge-recursive.c:1591
+#: merge-recursive.c:1676
msgid "content"
msgstr "contenu"
-#: merge-recursive.c:1598
+#: merge-recursive.c:1683
msgid "add/add"
msgstr "ajout/ajout"
-#: merge-recursive.c:1632
+#: merge-recursive.c:1718
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s sauté (fusion identique à l'existant)"
-#: merge-recursive.c:1646
+#: merge-recursive.c:1732
#, c-format
msgid "Auto-merging %s"
msgstr "Fusion automatique de %s"
-#: merge-recursive.c:1650 git-submodule.sh:941
+#: merge-recursive.c:1736 git-submodule.sh:919
msgid "submodule"
msgstr "sous-module"
-#: merge-recursive.c:1651
+#: merge-recursive.c:1737
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1831
#, c-format
msgid "Removing %s"
msgstr "Suppression de %s"
-#: merge-recursive.c:1762
+#: merge-recursive.c:1857
msgid "file/directory"
msgstr "fichier/répertoire"
-#: merge-recursive.c:1768
+#: merge-recursive.c:1863
msgid "directory/file"
msgstr "répertoire/fichier"
-#: merge-recursive.c:1773
+#: merge-recursive.c:1868
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"
-#: merge-recursive.c:1781
+#: merge-recursive.c:1877
#, c-format
msgid "Adding %s"
msgstr "Ajout de %s"
-#: merge-recursive.c:1798
-msgid "Fatal merge failure, shouldn't happen."
-msgstr "Échec fatal de fusion, qui ne devrait jamais arriver."
-
-#: merge-recursive.c:1817
+#: merge-recursive.c:1914
msgid "Already up-to-date!"
msgstr "Déjà à jour !"
-#: merge-recursive.c:1826
+#: merge-recursive.c:1923
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "échec de fusion des arbres %s et %s"
-#: merge-recursive.c:1856
-#, c-format
-msgid "Unprocessed path??? %s"
-msgstr "Chemin non traité ??? %s"
-
-#: merge-recursive.c:1904
+#: merge-recursive.c:2006
msgid "Merging:"
msgstr "Fusion :"
-#: merge-recursive.c:1917
+#: merge-recursive.c:2019
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u ancêtre commun trouvé :"
msgstr[1] "%u ancêtres communs trouvés :"
-#: merge-recursive.c:1954
+#: merge-recursive.c:2058
msgid "merge returned no commit"
msgstr "la fusion n'a pas retourné de commit"
-#: merge-recursive.c:2011
+#: merge-recursive.c:2121
#, c-format
msgid "Could not parse object '%s'"
msgstr "Impossible d'analyser l'objet '%s'"
-#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
+#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
msgid "Unable to write index."
msgstr "Impossible d'écrire l'index."
@@ -1110,7 +1366,7 @@ msgstr "-NUM"
msgid "malformed object name '%s'"
msgstr "nom d'objet malformé '%s'"
-#: path.c:796
+#: path.c:798
#, c-format
msgid "Could not make %s writable by group"
msgstr "Impossible de rendre %s inscriptible pour le groupe"
@@ -1183,7 +1439,7 @@ msgstr ""
"Il n'y a rien dont il faut exclure par des motifs :(exclure).\n"
"Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?"
-#: pretty.c:971
+#: pretty.c:973
msgid "unable to parse --pretty format"
msgstr "impossible d'analyser le format --pretty"
@@ -1209,23 +1465,22 @@ msgstr ""
"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
-#: builtin/merge.c:995
+#: refs.c:551 builtin/merge.c:840
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Impossible d'ouvrir '%s' en écriture"
-#: refs/files-backend.c:2243
+#: refs/files-backend.c:2534
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Impossible de supprimer la référence %s : %s"
-#: refs/files-backend.c:2246
+#: refs/files-backend.c:2537
#, c-format
msgid "could not delete references: %s"
msgstr "impossible de supprimer les références : %s"
-#: refs/files-backend.c:2255
+#: refs/files-backend.c:2546
#, c-format
msgid "could not remove reference %s"
msgstr "impossible de supprimer la référence %s"
@@ -1383,77 +1638,77 @@ msgstr "%s suit à la fois %s et %s"
msgid "Internal error"
msgstr "Erreur interne"
-#: remote.c:1678 remote.c:1721
+#: remote.c:1677 remote.c:1720
msgid "HEAD does not point to a branch"
msgstr "HEAD ne pointe pas sur une branche"
-#: remote.c:1687
+#: remote.c:1686
#, c-format
msgid "no such branch: '%s'"
msgstr "pas de branche '%s'"
-#: remote.c:1690
+#: remote.c:1689
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "aucune branche amont configurée pour la branche '%s'"
-#: remote.c:1696
+#: remote.c:1695
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi"
-#: remote.c:1711
+#: remote.c:1710
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "
"branche locale de suivi"
-#: remote.c:1726
+#: remote.c:1725
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "la branche '%s' n'a aucune branche distante de poussée"
-#: remote.c:1737
+#: remote.c:1736
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "les références de spec pour '%s' n'incluent pas '%s'"
-#: remote.c:1750
+#: remote.c:1749
msgid "push has no destination (push.default is 'nothing')"
msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
-#: remote.c:1772
+#: remote.c:1771
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
"impossible de résoudre une poussée 'simple' pour une destination unique"
-#: remote.c:2074
+#: remote.c:2073
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"
-#: remote.c:2078
+#: remote.c:2077
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"
-#: remote.c:2081
+#: remote.c:2080
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Votre branche est à jour avec '%s'.\n"
-#: remote.c:2085
+#: remote.c:2084
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"
msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"
-#: remote.c:2091
+#: remote.c:2090
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"
-#: remote.c:2094
+#: remote.c:2093
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1465,11 +1720,11 @@ msgstr[1] ""
"Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
"en avance rapide.\n"
-#: remote.c:2102
+#: remote.c:2101
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
-#: remote.c:2105
+#: remote.c:2104
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1484,21 +1739,21 @@ msgstr[1] ""
"Votre branche et '%s' ont divergé,\n"
"et ont %d et %d commits différents chacune respectivement.\n"
-#: remote.c:2115
+#: remote.c:2114
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"
-#: revision.c:2142
+#: revision.c:2132
msgid "your current branch appears to be broken"
msgstr "votre branche actuelle semble cassée"
-#: revision.c:2145
+#: revision.c:2135
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "votre branche actuelle '%s' ne contient encore aucun commit"
-#: revision.c:2339
+#: revision.c:2329
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent est incompatible avec --bisect"
@@ -1511,15 +1766,15 @@ msgstr "échec de l'ouverture de /dev/null"
msgid "dup2(%d,%d) failed"
msgstr "échec de dup2(%d,%d)"
-#: send-pack.c:295
+#: send-pack.c:298
msgid "failed to sign the push certificate"
msgstr "impossible de signer le certificat de poussée"
-#: send-pack.c:404
+#: send-pack.c:411
msgid "the receiving end does not support --signed push"
msgstr "Le receveur ne gère pas les poussées avec --signed"
-#: send-pack.c:406
+#: send-pack.c:413
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -1527,10 +1782,14 @@ msgstr ""
"pas d'envoi de certificat de poussée car le receveur ne gère pas les "
"poussées avec --signed"
-#: send-pack.c:418
+#: send-pack.c:425
msgid "the receiving end does not support --atomic push"
msgstr "Le receveur ne gère pas les poussées avec --atomic"
+#: send-pack.c:430
+msgid "the receiving end does not support push options"
+msgstr "Le receveur ne gère pas les options de poussées"
+
#: sequencer.c:174
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
@@ -1549,15 +1808,15 @@ msgstr ""
"avec 'git add <chemins>' ou 'git rm <chemins>'\n"
"puis validez le résultat avec 'git commit'"
-#: sequencer.c:190 sequencer.c:833 sequencer.c:912
+#: sequencer.c:190 sequencer.c:841 sequencer.c:924
#, c-format
msgid "Could not write to %s"
msgstr "Impossible d'écrire dans %s"
-#: sequencer.c:193
+#: sequencer.c:193 sequencer.c:843 sequencer.c:928
#, c-format
-msgid "Error wrapping up %s"
-msgstr "Erreur à l'emballage de %s"
+msgid "Error wrapping up %s."
+msgstr "Erreur lors de l'emballage de %s."
#: sequencer.c:208
msgid "Your local changes would be overwritten by cherry-pick."
@@ -1571,45 +1830,50 @@ msgstr "Vos modifications locales seraient écrasées par revert."
msgid "Commit your changes or stash them to proceed."
msgstr "Validez vos modifications ou les remiser pour continuer."
+#: sequencer.c:228
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s : avance rapide"
+
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:300
+#: sequencer.c:303
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Impossible d'écrire le nouveau fichier index"
-#: sequencer.c:318
+#: sequencer.c:321
msgid "Could not resolve HEAD commit\n"
msgstr "Impossible de résoudre le commit HEAD\n"
-#: sequencer.c:338
+#: sequencer.c:341
msgid "Unable to update cache tree\n"
msgstr "Impossible de mettre à jour l'arbre de cache\n"
-#: sequencer.c:390
+#: sequencer.c:393
#, c-format
msgid "Could not parse commit %s\n"
msgstr "Impossible d'analyser le commit %s\n"
-#: sequencer.c:395
+#: sequencer.c:398
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "Impossible d'analyser le commit parent %s\n"
-#: sequencer.c:460
+#: sequencer.c:463
msgid "Your index file is unmerged."
msgstr "Votre fichier d'index n'est pas fusionné."
-#: sequencer.c:479
+#: sequencer.c:482
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "Le commit %s est une fusion mais l'option -m n'a pas été spécifiée."
-#: sequencer.c:487
+#: sequencer.c:490
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "Le commit %s n'a pas le parent %d"
-#: sequencer.c:491
+#: sequencer.c:494
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr ""
@@ -1618,157 +1882,191 @@ msgstr ""
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:504
+#: sequencer.c:507
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s : impossible d'analyser le commit parent %s"
-#: sequencer.c:508
+#: sequencer.c:511
#, c-format
msgid "Cannot get commit message for %s"
msgstr "Impossible d'obtenir un message de validation pour %s"
-#: sequencer.c:594
+#: sequencer.c:597
#, c-format
msgid "could not revert %s... %s"
msgstr "impossible d'annuler %s... %s"
-#: sequencer.c:595
+#: sequencer.c:598
#, c-format
msgid "could not apply %s... %s"
msgstr "impossible d'appliquer %s... %s"
-#: sequencer.c:630
+#: sequencer.c:633
msgid "empty commit set passed"
msgstr "l'ensemble de commits spécifié est vide"
-#: sequencer.c:638
+#: sequencer.c:641
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s : échec à la lecture de l'index"
-#: sequencer.c:642
+#: sequencer.c:645
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s : échec du rafraîchissement de l'index"
-#: sequencer.c:702
-#, c-format
-msgid "Cannot %s during a %s"
-msgstr "Impossible de %s pendant un %s"
+#: sequencer.c:705
+msgid "Cannot revert during another revert."
+msgstr "Impossible d'annuler un commit pendant l'annulation d'un commit."
-#: sequencer.c:724
+#: sequencer.c:706
+msgid "Cannot revert during a cherry-pick."
+msgstr "Impossible d'annuler un commit pendant un picorage."
+
+#: sequencer.c:709
+msgid "Cannot cherry-pick during a revert."
+msgstr "Impossible de picorer pendant l'annulation d'un commit."
+
+#: sequencer.c:710
+msgid "Cannot cherry-pick during another cherry-pick."
+msgstr "Impossible de picorer pendant un autre picorage."
+
+#: sequencer.c:732
#, c-format
msgid "Could not parse line %d."
msgstr "Impossible d'analyser la ligne %d."
-#: sequencer.c:729
+#: sequencer.c:737
msgid "No commits parsed."
msgstr "Aucun commit analysé."
-#: sequencer.c:741
+#: sequencer.c:749
#, c-format
msgid "Could not open %s"
msgstr "Impossible d'ouvrir %s"
-#: sequencer.c:745
+#: sequencer.c:753
#, c-format
msgid "Could not read %s."
msgstr "Impossible de lire %s."
-#: sequencer.c:752
+#: sequencer.c:760
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "Feuille d'instruction inutilisable : %s"
-#: sequencer.c:782
+#: sequencer.c:790
#, c-format
msgid "Invalid key: %s"
msgstr "Clé invalide: %s"
-#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52
+#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Valeur invalide pour %s : %s"
-#: sequencer.c:795
+#: sequencer.c:803
#, c-format
msgid "Malformed options sheet: %s"
msgstr "Feuille d'options malformée : %s"
-#: sequencer.c:814
+#: sequencer.c:822
msgid "a cherry-pick or revert is already in progress"
msgstr "un picorage ou un retour est déjà en cours"
-#: sequencer.c:815
+#: sequencer.c:823
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""
-#: sequencer.c:819
+#: sequencer.c:827
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "Impossible de créer le répertoire de séquenceur %s"
-#: sequencer.c:835 sequencer.c:916
-#, c-format
-msgid "Error wrapping up %s."
-msgstr "Erreur lors de l'emballage de %s."
-
-#: sequencer.c:854 sequencer.c:986
+#: sequencer.c:862 sequencer.c:998
msgid "no cherry-pick or revert in progress"
msgstr "aucun picorage ou retour en cours"
-#: sequencer.c:856
+#: sequencer.c:864
msgid "cannot resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: sequencer.c:858
+#: sequencer.c:866 sequencer.c:900
msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée"
-#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
+#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
#, c-format
msgid "cannot open %s"
msgstr "impossible d'ouvrir %s"
-#: sequencer.c:880
+#: sequencer.c:888
#, c-format
msgid "cannot read %s: %s"
msgstr "impossible de lire %s : %s"
-#: sequencer.c:881
+#: sequencer.c:889
msgid "unexpected end of file"
msgstr "fin de fichier inattendue"
-#: sequencer.c:887
+#: sequencer.c:895
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"
-#: sequencer.c:909
+#: sequencer.c:921
#, c-format
msgid "Could not format %s."
msgstr "Impossible de formater %s."
-#: sequencer.c:1054
+#: sequencer.c:1066
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s : impossible de picorer un %s"
-#: sequencer.c:1057
+#: sequencer.c:1069
#, c-format
msgid "%s: bad revision"
msgstr "%s : mauvaise révision"
-#: sequencer.c:1091
+#: sequencer.c:1102
msgid "Can't revert as initial commit"
msgstr "Impossible d'annuler en tant que commit initial"
-#: sequencer.c:1092
-msgid "Can't cherry-pick into empty head"
-msgstr "Impossible de picorer vers une HEAD vide"
+#: setup.c:160
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s : ce chemin n'existe pas dans la copie de travail.\n"
+"Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui "
+"n'existent pas localement."
+
+#: setup.c:173
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"argument '%s' ambigu : révision inconnue ou chemin inexistant.\n"
+"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
+"'git <commande> [<révision>...] -- [<chemin>...]'"
-#: setup.c:248
+#: setup.c:223
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"argument '%s' ambigu : révision et chemin spécifiés.\n"
+"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
+"'git <commande> [<révision>...] -- [<chemin>...]'"
+
+#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
#, c-format
msgid "failed to read %s"
msgstr "échec de la lecture de %s"
@@ -1782,16 +2080,55 @@ msgstr "Version attendue du dépôt git <= %d, %d trouvée"
msgid "unknown repository extensions found:"
msgstr "extensions de dépôt inconnues trouvées :"
-#: sha1_file.c:1080
+#: setup.c:762
+#, c-format
+msgid "Not a git repository (or any of the parent directories): %s"
+msgstr "Ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"
+
+#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+msgid "Cannot come back to cwd"
+msgstr "Impossible de revenir au répertoire de travail courant"
+
+#: setup.c:845
+msgid "Unable to read current working directory"
+msgstr "Impossible d'accéder au répertoire de travail courant"
+
+#: setup.c:920
+#, c-format
+msgid ""
+"Not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgstr ""
+"Ni ceci ni aucun de ses répertoires parents (jusqu'au point de montage %s) "
+"n'est un dépôt git\n"
+"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
+"n'est pas activé)."
+
+#: setup.c:927
+#, c-format
+msgid "Cannot change to '%s/..'"
+msgstr "Impossible de se déplacer vers le répertoire '%s/..'"
+
+#: setup.c:989
+#, c-format
+msgid ""
+"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"Problème avec la valeur de core.sharedRepository (0%.3o).\n"
+"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
+"écriture."
+
+#: sha1_file.c:1046
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
-#: sha1_file.c:2458
+#: sha1_file.c:2434
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"
-#: sha1_file.c:2462
+#: sha1_file.c:2438
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
@@ -1852,7 +2189,7 @@ msgstr "échec de la mise en index du .gitmodules mis à jour"
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
-#: submodule-config.c:355
+#: submodule-config.c:358
#, c-format
msgid "invalid value for %s"
msgstr "Valeur invalide pour %s"
@@ -1911,6 +2248,56 @@ msgstr "impossible de créer un fichier temporaire"
msgid "could not rename temporary file to %s"
msgstr "impossible de renommer un fichier temporaire en %s"
+#: transport.c:62
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"
+
+#: transport.c:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport : option de profondeur invalide '%s'"
+
+#: transport.c:771
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Les chemins suivant de sous-module contiennent des modifications\n"
+"qui ne peuvent être trouvées sur aucun distant :\n"
+
+#: transport.c:775
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Veuillez essayer\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"ou bien changez de répertoire et utilisez\n"
+"\n"
+"\tgit push\n"
+"\n"
+"pour les pousser vers un serveur distant.\n"
+"\n"
+
+#: transport.c:783
+msgid "Aborting."
+msgstr "Abandon."
+
#: transport-helper.c:1041
#, c-format
msgid "Could not read ref %s"
@@ -1920,10 +2307,12 @@ msgstr "impossible de lire la réf %s"
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
-"%%sPlease commit your changes or stash them before you can switch branches."
+"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n"
-"%%sVeuillez valider ou remiser vos modifications avant de basculer de branche."
+"Vos modifications locales aux fichiers suivants seraient écrasées par "
+"l'extraction :\n"
+"%%sVeuillez valider ou remiser vos modifications avant de basculer de "
+"branche."
#: unpack-trees.c:66
#, c-format
@@ -1931,16 +2320,18 @@ msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n"
+"Vos modifications locales aux fichiers suivants seraient écrasées par "
+"l'extraction :\n"
"%%s"
#: unpack-trees.c:69
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you can merge."
+"%%sPlease commit your changes or stash them before you merge."
msgstr ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n"
+"Vos modifications locales aux fichiers suivants seraient écrasées par la "
+"fusion :\n"
"%%sVeuillez valider ou remiser vos modifications avant la fusion."
#: unpack-trees.c:71
@@ -1949,14 +2340,15 @@ msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n"
+"Vos modifications locales aux fichiers suivants seraient écrasées par la "
+"fusion :\n"
"%%s"
#: unpack-trees.c:74
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you can %s."
+"%%sPlease commit your changes or stash them before you %s."
msgstr ""
"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
"%%sVeuillez valider ou remiser vos modifications avant %s."
@@ -1976,16 +2368,18 @@ msgid ""
"Updating the following directories would lose untracked files in it:\n"
"%s"
msgstr ""
-"La mise à jour des répertoires suivants effacerait les fichiers non suivis contenus :\n"
+"La mise à jour des répertoires suivants effacerait les fichiers non suivis "
+"contenus :\n"
"%s"
#: unpack-trees.c:85
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you can switch branches."
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-"Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
+"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
+"l'extraction :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
#: unpack-trees.c:87
@@ -2001,9 +2395,10 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you can merge."
+"%%sPlease move or remove them before you merge."
msgstr ""
-"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
+"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
+"la fusion :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
#: unpack-trees.c:92
@@ -2019,9 +2414,10 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you can %s."
+"%%sPlease move or remove them before you %s."
msgstr ""
-"Les fichiers suivants non suivis seraient effacés par %s :\n"
+"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
+"%s :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
#: unpack-trees.c:97
@@ -2038,9 +2434,10 @@ msgstr ""
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
-"%%sPlease move or remove them before you can switch branches."
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
+"Les fichiers suivants non suivis de la copie de travail seraient écrasés par "
+"l'extraction :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
#: unpack-trees.c:104
@@ -2057,9 +2454,10 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you can merge."
+"%%sPlease move or remove them before you merge."
msgstr ""
-"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
+"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
+"la fusion :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
#: unpack-trees.c:109
@@ -2075,9 +2473,10 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you can %s."
+"%%sPlease move or remove them before you %s."
msgstr ""
-"Les fichiers suivants non suivis seraient écrasés par %s :\n"
+"Les fichiers suivants non suivis de la copie de travail seraient écrasés par "
+"%s :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
#: unpack-trees.c:114
@@ -2100,7 +2499,8 @@ msgid ""
"Cannot update sparse checkout: the following entries are not up-to-date:\n"
"%s"
msgstr ""
-"Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont pas à jour :\n"
+"Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont "
+"pas à jour :\n"
"%s"
#: unpack-trees.c:126
@@ -2110,7 +2510,8 @@ msgid ""
"update:\n"
"%s"
msgstr ""
-"Les fichiers suivants de la copie de travail seraient écrasés par la mise à jour par extraction creuse :\n"
+"Les fichiers suivants de la copie de travail seraient écrasés par la mise à "
+"jour par extraction creuse :\n"
"%s"
#: unpack-trees.c:128
@@ -2120,7 +2521,8 @@ msgid ""
"update:\n"
"%s"
msgstr ""
-"Les fichiers suivants de la copie de travail seraient supprimés par la mise à jour par extraction creuse :\n"
+"Les fichiers suivants de la copie de travail seraient supprimés par la mise "
+"à jour par extraction creuse :\n"
"%s"
#: unpack-trees.c:205
@@ -2161,43 +2563,43 @@ msgstr "numéro de port invalide"
msgid "invalid '..' path segment"
msgstr "segment de chemin '..' invalide"
-#: wrapper.c:222 wrapper.c:381
+#: worktree.c:282
+#, c-format
+msgid "failed to read '%s'"
+msgstr "échec de la lecture de '%s'"
+
+#: wrapper.c:222 wrapper.c:392
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "impossible d'ouvrir '%s' en lecture/écriture"
-#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
#, c-format
msgid "could not open '%s' for writing"
msgstr "impossible d'ouvrir '%s' en écriture"
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
-#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
+#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
#: builtin/pull.c:407
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
-#: wrapper.c:594 wrapper.c:615
+#: wrapper.c:605 wrapper.c:626
#, c-format
msgid "unable to access '%s'"
msgstr "impossible d'accéder à '%s'"
-#: wrapper.c:623
+#: wrapper.c:634
msgid "unable to get current working directory"
msgstr "impossible d'accéder au répertoire de travail courant"
-#: wrapper.c:650
-#, c-format
-msgid "could not open %s for writing"
-msgstr "Impossible d'ouvrir '%s' en écriture"
-
-#: wrapper.c:661 builtin/am.c:410
+#: wrapper.c:658
#, c-format
msgid "could not write to %s"
msgstr "Impossible d'écrire dans %s"
-#: wrapper.c:667
+#: wrapper.c:660
#, c-format
msgid "could not close %s"
msgstr "impossible de fermer %s"
@@ -2229,11 +2631,11 @@ msgstr ""
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
-#: wt-status.c:198 wt-status.c:881
+#: wt-status.c:198 wt-status.c:882
msgid "Changes to be committed:"
msgstr "Modifications qui seront validées :"
-#: wt-status.c:216 wt-status.c:890
+#: wt-status.c:216 wt-status.c:891
msgid "Changes not staged for commit:"
msgstr "Modifications qui ne seront pas validées :"
@@ -2294,11 +2696,6 @@ msgstr "ajouté de deux côtés :"
msgid "both modified:"
msgstr "modifié des deux côtés :"
-#: wt-status.c:266
-#, c-format
-msgid "bug: unhandled unmerged status %x"
-msgstr "bogue : état de non-fusion non géré %x"
-
#: wt-status.c:274
msgid "new file:"
msgstr "nouveau fichier :"
@@ -2343,20 +2740,15 @@ msgstr "contenu modifié, "
msgid "untracked content, "
msgstr "contenu non suivi, "
-#: wt-status.c:391
-#, c-format
-msgid "bug: unhandled diff status %c"
-msgstr "bogue : état de diff non géré %c"
-
-#: wt-status.c:755
+#: wt-status.c:756
msgid "Submodules changed but not updated:"
msgstr "Sous-modules modifiés mais non mis à jour :"
-#: wt-status.c:757
+#: wt-status.c:758
msgid "Submodule changes to be committed:"
msgstr "Changements du sous-module à valider :"
-#: wt-status.c:838
+#: wt-status.c:839
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -2364,99 +2756,103 @@ msgstr ""
"Ne touchez pas à la ligne ci-dessus\n"
"Tout ce qui suit sera éliminé."
-#: wt-status.c:949
+#: wt-status.c:950
msgid "You have unmerged paths."
msgstr "Vous avez des chemins non fusionnés."
-#: wt-status.c:952
+#: wt-status.c:953
msgid " (fix conflicts and run \"git commit\")"
msgstr " (réglez les conflits puis lancez \"git commit\")"
-#: wt-status.c:956
+#: wt-status.c:955
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"
+
+#: wt-status.c:960
msgid "All conflicts fixed but you are still merging."
msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée."
-#: wt-status.c:959
+#: wt-status.c:963
msgid " (use \"git commit\" to conclude merge)"
msgstr " (utilisez \"git commit\" pour terminer la fusion)"
-#: wt-status.c:969
+#: wt-status.c:973
msgid "You are in the middle of an am session."
msgstr "Vous êtes au milieu d'une session am."
-#: wt-status.c:972
+#: wt-status.c:976
msgid "The current patch is empty."
msgstr "Le patch actuel est vide."
-#: wt-status.c:976
+#: wt-status.c:980
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (réglez les conflits puis lancez \"git am --continue\")"
-#: wt-status.c:978
+#: wt-status.c:982
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"
-#: wt-status.c:980
+#: wt-status.c:984
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
-#: wt-status.c:1105
+#: wt-status.c:1109
msgid "No commands done."
msgstr "Aucune commande réalisée."
-#: wt-status.c:1108
+#: wt-status.c:1112
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Dernière commande effectuée (%d commande effectuée) :"
msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :"
-#: wt-status.c:1119
+#: wt-status.c:1123
#, c-format
msgid " (see more in file %s)"
msgstr " (voir plus dans le fichier %s)"
-#: wt-status.c:1124
+#: wt-status.c:1128
msgid "No commands remaining."
msgstr "Aucune commande restante."
-#: wt-status.c:1127
+#: wt-status.c:1131
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Prochaine commande à effectuer (%d commande restante) :"
msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"
-#: wt-status.c:1135
+#: wt-status.c:1139
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)"
-#: wt-status.c:1148
+#: wt-status.c:1152
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."
-#: wt-status.c:1153
+#: wt-status.c:1157
msgid "You are currently rebasing."
msgstr "Vous êtes en train de rebaser."
-#: wt-status.c:1167
+#: wt-status.c:1171
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"
-#: wt-status.c:1169
+#: wt-status.c:1173
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"
-#: wt-status.c:1171
+#: wt-status.c:1175
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"
-#: wt-status.c:1177
+#: wt-status.c:1181
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"
-#: wt-status.c:1181
+#: wt-status.c:1185
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -2464,124 +2860,124 @@ msgstr ""
"Vous êtes actuellement en train de fractionner un commit pendant un rebasage "
"de la branche '%s' sur '%s'."
-#: wt-status.c:1186
+#: wt-status.c:1190
msgid "You are currently splitting a commit during a rebase."
msgstr ""
"Vous êtes actuellement en train de fractionner un commit pendant un rebasage."
-#: wt-status.c:1189
+#: wt-status.c:1193
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"
-#: wt-status.c:1193
+#: wt-status.c:1197
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "
"branche '%s' sur '%s'."
-#: wt-status.c:1198
+#: wt-status.c:1202
msgid "You are currently editing a commit during a rebase."
msgstr ""
"Vous êtes actuellement en train d'éditer un commit pendant un rebasage."
-#: wt-status.c:1201
+#: wt-status.c:1205
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"
-#: wt-status.c:1203
+#: wt-status.c:1207
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos "
"modifications)"
-#: wt-status.c:1213
+#: wt-status.c:1217
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Vous êtes actuellement en train de picorer le commit %s."
-#: wt-status.c:1218
+#: wt-status.c:1222
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"
-#: wt-status.c:1221
+#: wt-status.c:1225
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"
-#: wt-status.c:1223
+#: wt-status.c:1227
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"
-#: wt-status.c:1232
+#: wt-status.c:1236
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Vous êtes actuellement en train de rétablir le commit %s."
-#: wt-status.c:1237
+#: wt-status.c:1241
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (réglez les conflits puis lancez \"git revert --continue\")"
-#: wt-status.c:1240
+#: wt-status.c:1244
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"
-#: wt-status.c:1242
+#: wt-status.c:1246
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"
-#: wt-status.c:1253
+#: wt-status.c:1257
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."
-#: wt-status.c:1257
+#: wt-status.c:1261
msgid "You are currently bisecting."
msgstr "Vous êtes en cours de bissection."
-#: wt-status.c:1260
+#: wt-status.c:1264
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"
-#: wt-status.c:1460
+#: wt-status.c:1464
msgid "On branch "
msgstr "Sur la branche "
-#: wt-status.c:1466
+#: wt-status.c:1470
msgid "interactive rebase in progress; onto "
msgstr "rebasage interactif en cours ; sur "
-#: wt-status.c:1468
+#: wt-status.c:1472
msgid "rebase in progress; onto "
msgstr "rebasage en cours ; sur "
-#: wt-status.c:1473
+#: wt-status.c:1477
msgid "HEAD detached at "
msgstr "HEAD détachée sur "
-#: wt-status.c:1475
+#: wt-status.c:1479
msgid "HEAD detached from "
msgstr "HEAD détachée depuis "
-#: wt-status.c:1478
+#: wt-status.c:1482
msgid "Not currently on any branch."
msgstr "Actuellement sur aucun branche."
-#: wt-status.c:1496
+#: wt-status.c:1500
msgid "Initial commit"
msgstr "Validation initiale"
-#: wt-status.c:1510
+#: wt-status.c:1514
msgid "Untracked files"
msgstr "Fichiers non suivis"
-#: wt-status.c:1512
+#: wt-status.c:1516
msgid "Ignored files"
msgstr "Fichiers ignorés"
-#: wt-status.c:1516
+#: wt-status.c:1520
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2593,32 +2989,32 @@ msgstr ""
"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
"status')."
-#: wt-status.c:1522
+#: wt-status.c:1526
#, c-format
msgid "Untracked files not listed%s"
msgstr "Fichiers non suivis non affichés%s"
-#: wt-status.c:1524
+#: wt-status.c:1528
msgid " (use -u option to show untracked files)"
msgstr " (utilisez -u pour afficher les fichiers non suivis)"
-#: wt-status.c:1530
+#: wt-status.c:1534
msgid "No changes"
msgstr "Aucune modification"
-#: wt-status.c:1535
+#: wt-status.c:1539
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "
"\"git commit -a\")\n"
-#: wt-status.c:1538
+#: wt-status.c:1542
#, c-format
msgid "no changes added to commit\n"
msgstr "aucune modification ajoutée à la validation\n"
-#: wt-status.c:1541
+#: wt-status.c:1545
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -2627,53 +3023,53 @@ msgstr ""
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents (utilisez \"git add\" pour les suivre)\n"
-#: wt-status.c:1544
+#: wt-status.c:1548
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents\n"
-#: wt-status.c:1547
+#: wt-status.c:1551
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "
"suivre)\n"
-#: wt-status.c:1550 wt-status.c:1555
+#: wt-status.c:1554 wt-status.c:1559
#, c-format
msgid "nothing to commit\n"
msgstr "rien à valider\n"
-#: wt-status.c:1553
+#: wt-status.c:1557
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"
-#: wt-status.c:1557
+#: wt-status.c:1561
#, c-format
-msgid "nothing to commit, working directory clean\n"
+msgid "nothing to commit, working tree clean\n"
msgstr "rien à valider, la copie de travail est propre\n"
-#: wt-status.c:1664
+#: wt-status.c:1668
msgid "Initial commit on "
msgstr "Validation initiale sur "
-#: wt-status.c:1668
+#: wt-status.c:1672
msgid "HEAD (no branch)"
msgstr "HEAD (aucune branche)"
# à priori on parle d'une branche ici
-#: wt-status.c:1697
+#: wt-status.c:1701
msgid "gone"
msgstr "disparue"
-#: wt-status.c:1699 wt-status.c:1707
+#: wt-status.c:1703 wt-status.c:1711
msgid "behind "
msgstr "derrière "
-#: wt-status.c:1702 wt-status.c:1705
+#: wt-status.c:1706 wt-status.c:1709
msgid "ahead "
msgstr "devant "
@@ -2691,261 +3087,275 @@ msgstr "git add [<options>] [--] <chemin>..."
msgid "unexpected diff status %c"
msgstr "status de diff inattendu %c"
-#: builtin/add.c:70 builtin/commit.c:280
+#: builtin/add.c:71 builtin/commit.c:281
msgid "updating files failed"
msgstr "échec de la mise à jour des fichiers"
-#: builtin/add.c:80
+#: builtin/add.c:81
#, c-format
msgid "remove '%s'\n"
msgstr "suppression de '%s'\n"
-#: builtin/add.c:134
+#: builtin/add.c:136
msgid "Unstaged changes after refreshing the index:"
msgstr "Modifications non indexées après rafraîchissement de l'index :"
-#: builtin/add.c:194 builtin/rev-parse.c:811
+#: builtin/add.c:196 builtin/rev-parse.c:811
msgid "Could not read the index"
msgstr "Impossible de lire l'index"
-#: builtin/add.c:205
+#: builtin/add.c:207
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Impossible d'ouvrir '%s' en écriture."
-#: builtin/add.c:209
+#: builtin/add.c:211
msgid "Could not write patch"
msgstr "Impossible d'écrire le patch"
-#: builtin/add.c:212
+#: builtin/add.c:214
msgid "editing patch failed"
msgstr "échec de l'édition du patch"
-#: builtin/add.c:215
+#: builtin/add.c:217
#, c-format
msgid "Could not stat '%s'"
msgstr "Stat de '%s' impossible"
-#: builtin/add.c:217
+#: builtin/add.c:219
msgid "Empty patch. Aborted."
msgstr "Patch vide. Abandon."
-#: builtin/add.c:222
+#: builtin/add.c:224
#, c-format
msgid "Could not apply '%s'"
msgstr "Impossible d'appliquer '%s'"
-#: builtin/add.c:232
+#: builtin/add.c:234
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
-#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
-#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
+#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "simuler l'action"
-#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
-#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
-#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
+#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
+#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
msgid "be verbose"
msgstr "mode verbeux"
-#: builtin/add.c:252
+#: builtin/add.c:256
msgid "interactive picking"
msgstr "sélection interactive"
-#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
+#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "sélection interactive des sections"
-#: builtin/add.c:254
+#: builtin/add.c:258
msgid "edit current diff and apply"
msgstr "édition du diff actuel et application"
-#: builtin/add.c:255
+#: builtin/add.c:259
msgid "allow adding otherwise ignored files"
msgstr "permettre l'ajout de fichiers ignorés"
-#: builtin/add.c:256
+#: builtin/add.c:260
msgid "update tracked files"
msgstr "mettre à jour les fichiers suivis"
-#: builtin/add.c:257
+#: builtin/add.c:261
msgid "record only the fact that the path will be added later"
msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard"
-#: builtin/add.c:258
+#: builtin/add.c:262
msgid "add changes from all tracked and untracked files"
msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
-#: builtin/add.c:261
+#: builtin/add.c:265
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"ignorer les chemins effacés dans la copie de travail (identique à --no-all)"
-#: builtin/add.c:263
+#: builtin/add.c:267
msgid "don't add, only refresh the index"
msgstr "ne pas ajouter, juste rafraîchir l'index"
-#: builtin/add.c:264
+#: builtin/add.c:268
msgid "just skip files which cannot be added because of errors"
msgstr ""
"sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait "
"d'erreurs"
-#: builtin/add.c:265
+#: builtin/add.c:269
msgid "check if - even missing - files are ignored in dry run"
msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide"
-#: builtin/add.c:287
+#: builtin/add.c:270 builtin/update-index.c:958
+msgid "(+/-)x"
+msgstr "(+/-)x"
+
+#: builtin/add.c:270 builtin/update-index.c:959
+msgid "override the executable bit of the listed files"
+msgstr "outrepasser le bit exécutable pour les fichiers listés"
+
+#: builtin/add.c:292
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Utilisez -f si vous voulez réellement les ajouter.\n"
-#: builtin/add.c:294
+#: builtin/add.c:300
msgid "adding files failed"
msgstr "échec de l'ajout de fichiers"
-#: builtin/add.c:330
+#: builtin/add.c:336
msgid "-A and -u are mutually incompatible"
msgstr "-A et -u sont mutuellement incompatibles"
-#: builtin/add.c:337
+#: builtin/add.c:343
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
"L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"
#: builtin/add.c:352
#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"
+
+#: builtin/add.c:367
+#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Rien de spécifié, rien n'a été ajouté.\n"
-#: builtin/add.c:353
+#: builtin/add.c:368
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
-#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
+#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
#: builtin/submodule--helper.c:240
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
-#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
+#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
msgid "Unable to write new index file"
msgstr "Impossible d'écrire le nouveau fichier d'index"
-#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
+#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
#, c-format
msgid "could not read '%s'"
msgstr "impossible de lire '%s'"
-#: builtin/am.c:430
+#: builtin/am.c:426
msgid "could not parse author script"
msgstr "impossible d'analyser le script author"
-#: builtin/am.c:507
+#: builtin/am.c:503
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' a été effacé par le crochet applypatch-msg"
-#: builtin/am.c:548 builtin/notes.c:300
+#: builtin/am.c:544 builtin/notes.c:301
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Ligne en entrée malformée : '%s'."
-#: builtin/am.c:585 builtin/notes.c:315
+#: builtin/am.c:581 builtin/notes.c:316
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Impossible de copier les notes de '%s' vers '%s'"
-#: builtin/am.c:611
+#: builtin/am.c:607
msgid "fseek failed"
msgstr "échec de fseek"
-#: builtin/am.c:788
+#: builtin/am.c:787
#, c-format
msgid "could not parse patch '%s'"
msgstr "impossible d'analyser le patch '%s'"
-#: builtin/am.c:853
+#: builtin/am.c:852
msgid "Only one StGIT patch series can be applied at once"
msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"
-#: builtin/am.c:900
+#: builtin/am.c:899
msgid "invalid timestamp"
msgstr "horodatage invalide"
-#: builtin/am.c:903 builtin/am.c:911
+#: builtin/am.c:902 builtin/am.c:910
msgid "invalid Date line"
msgstr "ligne de Date invalide"
-#: builtin/am.c:908
+#: builtin/am.c:907
msgid "invalid timezone offset"
msgstr "décalage horaire invalide"
-#: builtin/am.c:995
+#: builtin/am.c:996
msgid "Patch format detection failed."
msgstr "Échec de détection du format du patch."
-#: builtin/am.c:1000 builtin/clone.c:380
+#: builtin/am.c:1001 builtin/clone.c:380
#, c-format
msgid "failed to create directory '%s'"
msgstr "échec de la création du répertoire '%s'"
-#: builtin/am.c:1004
+#: builtin/am.c:1005
msgid "Failed to split patches."
msgstr "Échec de découpage des patchs."
-#: builtin/am.c:1136 builtin/commit.c:365
+#: builtin/am.c:1137 builtin/commit.c:366
msgid "unable to write index file"
msgstr "impossible d'écrire le fichier d'index"
-#: builtin/am.c:1187
+#: builtin/am.c:1188
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."
-#: builtin/am.c:1188
+#: builtin/am.c:1189
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."
-#: builtin/am.c:1189
+#: builtin/am.c:1190
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"
"abort\"."
-#: builtin/am.c:1327
+#: builtin/am.c:1328
msgid "Patch is empty. Was it split wrong?"
msgstr "Le patch est vide. Le découpage était-il bon ?"
-#: builtin/am.c:1401 builtin/log.c:1516
+#: builtin/am.c:1402 builtin/log.c:1543
#, c-format
msgid "invalid ident line: %s"
msgstr "ligne d'identification invalide : %s"
-#: builtin/am.c:1428
+#: builtin/am.c:1429
#, c-format
msgid "unable to parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: builtin/am.c:1630
+#: builtin/am.c:1602
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
"points."
-#: builtin/am.c:1632
+#: builtin/am.c:1604
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Utilisation de l'information de l'index pour reconstruire un arbre de base..."
-#: builtin/am.c:1651
+#: builtin/am.c:1623
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2953,38 +3363,38 @@ msgstr ""
"Avez-vous édité le patch à la main ?\n"
"Il ne s'applique pas aux blobs enregistrés dans son index."
-#: builtin/am.c:1657
+#: builtin/am.c:1629
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retour à un patch de la base et fusion à 3 points..."
-#: builtin/am.c:1672
+#: builtin/am.c:1654
msgid "Failed to merge in the changes."
msgstr "Échec d'intégration des modifications."
-#: builtin/am.c:1696 builtin/merge.c:636
+#: builtin/am.c:1679 builtin/merge.c:628
msgid "git write-tree failed to write a tree"
msgstr "git write-tree a échoué à écrire un arbre"
-#: builtin/am.c:1703
+#: builtin/am.c:1686
msgid "applying to an empty history"
msgstr "application à un historique vide"
-#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
-#: builtin/merge.c:866
+#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
+#: builtin/merge.c:823
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
-#: builtin/am.c:1748 builtin/am.c:1752
+#: builtin/am.c:1731 builtin/am.c:1735
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "impossible de continuer : %s n'existe pas."
-#: builtin/am.c:1768
+#: builtin/am.c:1751
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"impossible d'être interactif sans entrée standard connectée à un terminal."
-#: builtin/am.c:1773
+#: builtin/am.c:1756
msgid "Commit Body is:"
msgstr "Le corps de la validation est :"
@@ -2992,35 +3402,35 @@ msgstr "Le corps de la validation est :"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1783
+#: builtin/am.c:1766
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "
-#: builtin/am.c:1833
+#: builtin/am.c:1816
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
-#: builtin/am.c:1868 builtin/am.c:1940
+#: builtin/am.c:1853 builtin/am.c:1925
#, c-format
msgid "Applying: %.*s"
msgstr "Application de %.*s"
-#: builtin/am.c:1884
+#: builtin/am.c:1869
msgid "No changes -- Patch already applied."
msgstr "Pas de changement -- Patch déjà appliqué."
-#: builtin/am.c:1892
+#: builtin/am.c:1877
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "le patch a échoué à %s %.*s"
-#: builtin/am.c:1898
+#: builtin/am.c:1883
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "La copie du patch qui a échoué se trouve dans : %s"
-#: builtin/am.c:1943
+#: builtin/am.c:1928
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -3031,7 +3441,7 @@ msgstr ""
"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
"patch."
-#: builtin/am.c:1950
+#: builtin/am.c:1935
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -3039,17 +3449,17 @@ msgstr ""
"Vous avez toujours des chemins non fusionnés dans votre index\n"
"Auriez-vous oublié de faire 'git add' ?"
-#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
+#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossible d'analyser l'objet '%s'."
-#: builtin/am.c:2110
+#: builtin/am.c:2095
msgid "failed to clean index"
msgstr "échec du nettoyage de l'index"
-#: builtin/am.c:2144
+#: builtin/am.c:2129
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -3057,156 +3467,156 @@ msgstr ""
"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
"Pas de retour à ORIG_HEAD"
-#: builtin/am.c:2205
+#: builtin/am.c:2192
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valeur invalide pour --patch-format : %s"
-#: builtin/am.c:2238
+#: builtin/am.c:2225
msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr "git am [<options>] [(<mbox>|<Maildir>)...]"
-#: builtin/am.c:2239
+#: builtin/am.c:2226
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<options>] (--continue | --quit | --abort)"
-#: builtin/am.c:2245
+#: builtin/am.c:2232
msgid "run interactively"
msgstr "exécution interactive"
-#: builtin/am.c:2247
+#: builtin/am.c:2234
msgid "historical option -- no-op"
msgstr "option historique -- no-op"
-#: builtin/am.c:2249
+#: builtin/am.c:2236
msgid "allow fall back on 3way merging if needed"
msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
-#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
-#: builtin/repack.c:171
+#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
+#: builtin/repack.c:172
msgid "be quiet"
msgstr "être silencieux"
-#: builtin/am.c:2252
+#: builtin/am.c:2239
msgid "add a Signed-off-by line to the commit message"
msgstr "ajouter une ligne Signed-off-by au message de validation"
-#: builtin/am.c:2255
+#: builtin/am.c:2242
msgid "recode into utf8 (default)"
msgstr "recoder en utf-8 (par défaut)"
-#: builtin/am.c:2257
+#: builtin/am.c:2244
msgid "pass -k flag to git-mailinfo"
msgstr "passer l'option -k à git-mailinfo"
-#: builtin/am.c:2259
+#: builtin/am.c:2246
msgid "pass -b flag to git-mailinfo"
msgstr "passer l'option -b à git-mailinfo"
-#: builtin/am.c:2261
+#: builtin/am.c:2248
msgid "pass -m flag to git-mailinfo"
msgstr "passer l'option -m à git-mailinfo"
-#: builtin/am.c:2263
+#: builtin/am.c:2250
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"
-#: builtin/am.c:2266
+#: builtin/am.c:2253
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"
-#: builtin/am.c:2269
+#: builtin/am.c:2256
msgid "strip everything before a scissors line"
msgstr "retirer tout le contenu avant la ligne des ciseaux"
-#: builtin/am.c:2270 builtin/apply.c:4546
+#: builtin/am.c:2257 builtin/apply.c:4837
msgid "action"
msgstr "action"
-#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
-#: builtin/am.c:2298
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
+#: builtin/am.c:2285
msgid "pass it through git-apply"
msgstr "le passer jusqu'à git-apply"
-#: builtin/am.c:2279 builtin/apply.c:4570
+#: builtin/am.c:2266 builtin/apply.c:4861
msgid "root"
msgstr "racine"
-#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
-#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
+#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
-#: builtin/submodule--helper.c:770
+#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:826
msgid "path"
msgstr "chemin"
-#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193
-#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 builtin/pull.c:193
+#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:645
#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2291 builtin/apply.c:4514
+#: builtin/am.c:2278 builtin/apply.c:4805
msgid "num"
msgstr "num"
-#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "format"
-#: builtin/am.c:2295
+#: builtin/am.c:2282
msgid "format the patch(es) are in"
msgstr "format de présentation des patchs"
-#: builtin/am.c:2301
+#: builtin/am.c:2288
msgid "override error message when patch failure occurs"
msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"
-#: builtin/am.c:2303
+#: builtin/am.c:2290
msgid "continue applying patches after resolving a conflict"
msgstr "continuer à appliquer les patchs après résolution d'un conflit"
-#: builtin/am.c:2306
+#: builtin/am.c:2293
msgid "synonyms for --continue"
msgstr "synonymes de --continue"
-#: builtin/am.c:2309
+#: builtin/am.c:2296
msgid "skip the current patch"
msgstr "sauter le patch courant"
-#: builtin/am.c:2312
+#: builtin/am.c:2299
msgid "restore the original branch and abort the patching operation."
msgstr ""
"restaurer la branche originale et abandonner les applications de patch."
-#: builtin/am.c:2316
+#: builtin/am.c:2303
msgid "lie about committer date"
msgstr "mentir sur la date de validation"
-#: builtin/am.c:2318
+#: builtin/am.c:2305
msgid "use current timestamp for author date"
msgstr "utiliser l'horodatage actuel pour la date d'auteur"
-#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "id-clé"
-#: builtin/am.c:2321
+#: builtin/am.c:2308
msgid "GPG-sign commits"
msgstr "signer les commits avec GPG"
-#: builtin/am.c:2324
+#: builtin/am.c:2311
msgid "(internal use for git-rebase)"
msgstr "(utilisation interne pour git-rebase)"
-#: builtin/am.c:2339
+#: builtin/am.c:2326
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -3214,17 +3624,17 @@ msgstr ""
"L'option -b/--binary ne fait plus rien depuis longtemps,\n"
"et elle sera supprimée. Veuillez ne plus l'utiliser."
-#: builtin/am.c:2346
+#: builtin/am.c:2333
msgid "failed to read the index"
msgstr "échec à la lecture de l'index"
-#: builtin/am.c:2361
+#: builtin/am.c:2348
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"le répertoire précédent de rebasage %s existe toujours mais mbox donnée."
-#: builtin/am.c:2385
+#: builtin/am.c:2372
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -3233,79 +3643,79 @@ msgstr ""
"Répertoire abandonné %s trouvé.\n"
"Utilisez \"git am --abort\" pour le supprimer."
-#: builtin/am.c:2391
+#: builtin/am.c:2378
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
"Pas de résolution de l'opération en cours, nous ne sommes pas dans une "
"reprise."
-#: builtin/apply.c:59
+#: builtin/apply.c:122
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<options>] [<patch>...]"
-#: builtin/apply.c:111
+#: builtin/apply.c:153
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "option d'espace non reconnue '%s'"
-#: builtin/apply.c:126
+#: builtin/apply.c:169
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "option d'ignorance d'espace non reconnue '%s'"
-#: builtin/apply.c:818
+#: builtin/apply.c:854
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Impossible de préparer la regexp d'horodatage %s"
-#: builtin/apply.c:827
+#: builtin/apply.c:863
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec a retourné %d pour l'entrée : %s"
-#: builtin/apply.c:908
+#: builtin/apply.c:947
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "nom de fichier du patch introuvable à la ligne %d"
-#: builtin/apply.c:937
+#: builtin/apply.c:984
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la "
"ligne %d"
-#: builtin/apply.c:942
+#: builtin/apply.c:989
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant "
"à la ligne %d"
-#: builtin/apply.c:943
+#: builtin/apply.c:990
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply : mauvais format de git-diff - ancien nom de fichier inconsistant "
"à la ligne %d"
-#: builtin/apply.c:949
+#: builtin/apply.c:995
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
"git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d"
-#: builtin/apply.c:1406
+#: builtin/apply.c:1489
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recomptage : ligne inattendue : %.*s"
-#: builtin/apply.c:1463
+#: builtin/apply.c:1550
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"
-#: builtin/apply.c:1480
+#: builtin/apply.c:1567
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -3320,77 +3730,77 @@ msgstr[1] ""
"information de nom de fichier manquante dans l'en-tête de git diff lors de "
"la suppression de %d composants de préfixe de chemin (ligne %d)"
-#: builtin/apply.c:1646
+#: builtin/apply.c:1743
msgid "new file depends on old contents"
msgstr "le nouveau fichier dépend de contenus anciens"
-#: builtin/apply.c:1648
+#: builtin/apply.c:1745
msgid "deleted file still has contents"
msgstr "le fichier supprimé a encore du contenu"
-#: builtin/apply.c:1674
+#: builtin/apply.c:1774
#, c-format
msgid "corrupt patch at line %d"
msgstr "patch corrompu à la ligne %d"
-#: builtin/apply.c:1710
+#: builtin/apply.c:1810
#, c-format
msgid "new file %s depends on old contents"
msgstr "le nouveau fichier %s dépend de contenus anciens"
-#: builtin/apply.c:1712
+#: builtin/apply.c:1812
#, c-format
msgid "deleted file %s still has contents"
msgstr "le fichier supprimé %s a encore du contenu"
-#: builtin/apply.c:1715
+#: builtin/apply.c:1815
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"
-#: builtin/apply.c:1861
+#: builtin/apply.c:1962
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "patch binaire corrompu à la ligne %d : %.*s"
-#: builtin/apply.c:1895
+#: builtin/apply.c:1999
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "patch binaire non reconnu à la ligne %d"
-#: builtin/apply.c:2048
+#: builtin/apply.c:2154
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch totalement incompréhensible à la ligne %d"
-#: builtin/apply.c:2138
+#: builtin/apply.c:2244
#, c-format
msgid "unable to read symlink %s"
msgstr "lecture du lien symbolique %s impossible"
-#: builtin/apply.c:2142
+#: builtin/apply.c:2248
#, c-format
msgid "unable to open or read %s"
msgstr "ouverture ou lecture de %s impossible"
-#: builtin/apply.c:2775
+#: builtin/apply.c:2901
#, c-format
msgid "invalid start of line: '%c'"
msgstr "début de ligne invalide : '%c'"
-#: builtin/apply.c:2894
+#: builtin/apply.c:3020
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)."
msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)."
-#: builtin/apply.c:2906
+#: builtin/apply.c:3032
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d"
-#: builtin/apply.c:2912
+#: builtin/apply.c:3038
#, c-format
msgid ""
"while searching for:\n"
@@ -3399,346 +3809,341 @@ msgstr ""
"pendant la recherche de :\n"
"%.*s"
-#: builtin/apply.c:2932
+#: builtin/apply.c:3060
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "données de patch binaire manquantes pour '%s'"
-#: builtin/apply.c:3033
+#: builtin/apply.c:3163
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "le patch binaire ne s'applique par correctement à '%s'"
-#: builtin/apply.c:3039
+#: builtin/apply.c:3169
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s "
"trouvé)"
-#: builtin/apply.c:3060
+#: builtin/apply.c:3190
#, c-format
msgid "patch failed: %s:%ld"
msgstr "le patch a échoué : %s:%ld"
-#: builtin/apply.c:3184
+#: builtin/apply.c:3314
#, c-format
msgid "cannot checkout %s"
msgstr "extraction de %s impossible"
-#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
-#, c-format
-msgid "read of %s failed"
-msgstr "échec de la lecture de %s"
-
-#: builtin/apply.c:3237
+#: builtin/apply.c:3370
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
-#: builtin/apply.c:3265 builtin/apply.c:3487
+#: builtin/apply.c:3399 builtin/apply.c:3630
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "le chemin %s a été renommé/supprimé"
-#: builtin/apply.c:3346 builtin/apply.c:3501
+#: builtin/apply.c:3482 builtin/apply.c:3644
#, c-format
msgid "%s: does not exist in index"
msgstr "%s : n'existe pas dans l'index"
-#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
+#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
#, c-format
msgid "%s: %s"
msgstr "%s : %s"
-#: builtin/apply.c:3355 builtin/apply.c:3509
+#: builtin/apply.c:3491 builtin/apply.c:3652
#, c-format
msgid "%s: does not match index"
msgstr "%s : ne correspond pas à l'index"
-#: builtin/apply.c:3457
+#: builtin/apply.c:3597
msgid "removal patch leaves file contents"
msgstr "le patch de suppression laisse un contenu dans le fichier"
-#: builtin/apply.c:3526
+#: builtin/apply.c:3669
#, c-format
msgid "%s: wrong type"
msgstr "%s : type erroné"
-#: builtin/apply.c:3528
+#: builtin/apply.c:3671
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s est de type %o, mais %o attendu"
-#: builtin/apply.c:3687 builtin/apply.c:3689
+#: builtin/apply.c:3822 builtin/apply.c:3824
#, c-format
msgid "invalid path '%s'"
msgstr "chemin invalide '%s'"
-#: builtin/apply.c:3744
+#: builtin/apply.c:3879
#, c-format
msgid "%s: already exists in index"
msgstr "%s : existe déjà dans l'index"
-#: builtin/apply.c:3747
+#: builtin/apply.c:3882
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s : existe déjà dans la copie de travail"
-#: builtin/apply.c:3767
+#: builtin/apply.c:3902
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)"
-#: builtin/apply.c:3772
+#: builtin/apply.c:3907
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"
-#: builtin/apply.c:3792
+#: builtin/apply.c:3927
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"
-#: builtin/apply.c:3796
+#: builtin/apply.c:3931
#, c-format
msgid "%s: patch does not apply"
msgstr "%s : le patch ne s'applique pas"
-#: builtin/apply.c:3810
+#: builtin/apply.c:3945
#, c-format
msgid "Checking patch %s..."
msgstr "Vérification du patch %s..."
-#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "échec de make_cache_entry pour le chemin '%s'"
-#: builtin/apply.c:4046
+#: builtin/apply.c:4182
#, c-format
msgid "unable to remove %s from index"
msgstr "suppression de %s dans l'index impossible"
-#: builtin/apply.c:4075
+#: builtin/apply.c:4215
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "patch corrompu pour le sous-module %s"
-#: builtin/apply.c:4079
+#: builtin/apply.c:4219
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "stat du fichier nouvellement créé '%s' impossible"
-#: builtin/apply.c:4084
+#: builtin/apply.c:4224
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"création du magasin de stockage pour le fichier nouvellement créé %s "
"impossible"
-#: builtin/apply.c:4087 builtin/apply.c:4195
+#: builtin/apply.c:4227 builtin/apply.c:4340
#, c-format
msgid "unable to add cache entry for %s"
msgstr "ajout de l'élément de cache %s impossible"
-#: builtin/apply.c:4120
+#: builtin/apply.c:4260
#, c-format
msgid "closing file '%s'"
msgstr "fermeture du fichier '%s'"
-#: builtin/apply.c:4169
+#: builtin/apply.c:4313
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "écriture du fichier '%s' mode %o impossible"
-#: builtin/apply.c:4256
+#: builtin/apply.c:4403
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s appliqué proprement."
-#: builtin/apply.c:4264
+#: builtin/apply.c:4411
msgid "internal error"
msgstr "erreur interne"
-#: builtin/apply.c:4267
+#: builtin/apply.c:4414
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Application du patch %%s avec %d rejet..."
msgstr[1] "Application du patch %%s avec %d rejets..."
-#: builtin/apply.c:4277
+#: builtin/apply.c:4424
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "troncature du nom de fichier .rej en %.*s.rej"
-#: builtin/apply.c:4285
+#: builtin/apply.c:4432
#, c-format
msgid "cannot open %s: %s"
msgstr "impossible d'ouvrir %s : %s"
-#: builtin/apply.c:4298
+#: builtin/apply.c:4445
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Section n°%d appliquée proprement."
-#: builtin/apply.c:4301
+#: builtin/apply.c:4448
#, c-format
msgid "Rejected hunk #%d."
msgstr "Section n°%d rejetée."
-#: builtin/apply.c:4387
+#: builtin/apply.c:4537
#, c-format
msgid "Skipped patch '%s'."
msgstr "Chemin '%s' non traité."
-#: builtin/apply.c:4395
+#: builtin/apply.c:4545
msgid "unrecognized input"
msgstr "entrée non reconnue"
-#: builtin/apply.c:4406
+#: builtin/apply.c:4556
msgid "unable to read index file"
msgstr "lecture du fichier d'index impossible"
-#: builtin/apply.c:4509
+#: builtin/apply.c:4701
+msgid "--3way outside a repository"
+msgstr "--3way hors d'un dépôt"
+
+#: builtin/apply.c:4709
+msgid "--index outside a repository"
+msgstr "--index hors d'un dépôt"
+
+#: builtin/apply.c:4712
+msgid "--cached outside a repository"
+msgstr "--cached hors d'un dépôt"
+
+#: builtin/apply.c:4745
+#, c-format
+msgid "can't open patch '%s'"
+msgstr "ouverture impossible du patch '%s'"
+
+#: builtin/apply.c:4760
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "%d erreur d'espace ignorée"
+msgstr[1] "%d erreurs d'espace ignorées"
+
+#: builtin/apply.c:4766 builtin/apply.c:4776
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d ligne a ajouté des erreurs d'espace."
+msgstr[1] "%d lignes ont ajouté des erreurs d'espace."
+
+#: builtin/apply.c:4800
msgid "don't apply changes matching the given path"
msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
-#: builtin/apply.c:4512
+#: builtin/apply.c:4803
msgid "apply changes matching the given path"
msgstr "appliquer les modifications qui correspondent au chemin donné"
-#: builtin/apply.c:4515
+#: builtin/apply.c:4806
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
-#: builtin/apply.c:4518
+#: builtin/apply.c:4809
msgid "ignore additions made by the patch"
msgstr "ignorer les additions réalisées par le patch"
-#: builtin/apply.c:4520
+#: builtin/apply.c:4811
msgid "instead of applying the patch, output diffstat for the input"
msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée"
-#: builtin/apply.c:4524
+#: builtin/apply.c:4815
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"afficher le nombre de lignes ajoutées et supprimées en notation décimale"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4817
msgid "instead of applying the patch, output a summary for the input"
msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée"
-#: builtin/apply.c:4528
+#: builtin/apply.c:4819
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "au lieu d'appliquer le patch, voir si le patch est applicable"
-#: builtin/apply.c:4530
+#: builtin/apply.c:4821
msgid "make sure the patch is applicable to the current index"
msgstr "s'assurer que le patch est applicable sur l'index actuel"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4823
msgid "apply a patch without touching the working tree"
msgstr "appliquer les patch sans toucher à la copie de travail"
-#: builtin/apply.c:4534
+#: builtin/apply.c:4825
msgid "accept a patch that touches outside the working area"
msgstr "accepter un patch qui touche hors de la copie de travail"
-#: builtin/apply.c:4536
+#: builtin/apply.c:4827
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"
-#: builtin/apply.c:4538
+#: builtin/apply.c:4829
msgid "attempt three-way merge if a patch does not apply"
msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement"
-#: builtin/apply.c:4540
+#: builtin/apply.c:4831
msgid "build a temporary index based on embedded index information"
msgstr ""
"construire un index temporaire fondé sur l'information de l'index embarqué"
-#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
msgid "paths are separated with NUL character"
msgstr "les chemins sont séparés par un caractère NUL"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4836
msgid "ensure at least <n> lines of context match"
msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
-#: builtin/apply.c:4547
+#: builtin/apply.c:4838
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "
"d'espace"
-#: builtin/apply.c:4550 builtin/apply.c:4553
+#: builtin/apply.c:4841 builtin/apply.c:4844
msgid "ignore changes in whitespace when finding context"
msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
-#: builtin/apply.c:4556
+#: builtin/apply.c:4847
msgid "apply the patch in reverse"
msgstr "appliquer le patch en sens inverse"
-#: builtin/apply.c:4558
+#: builtin/apply.c:4849
msgid "don't expect at least one line of context"
msgstr "ne pas s'attendre à au moins une ligne de contexte"
-#: builtin/apply.c:4560
+#: builtin/apply.c:4851
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
-#: builtin/apply.c:4562
+#: builtin/apply.c:4853
msgid "allow overlapping hunks"
msgstr "accepter les recouvrements de sections"
-#: builtin/apply.c:4565
+#: builtin/apply.c:4856
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"tolérer des erreurs de détection de retours chariot manquants en fin de "
"fichier"
-#: builtin/apply.c:4568
+#: builtin/apply.c:4859
msgid "do not trust the line counts in the hunk headers"
msgstr "ne pas se fier au compte de lignes dans les en-têtes de section"
-#: builtin/apply.c:4571
+#: builtin/apply.c:4862
msgid "prepend <root> to all filenames"
msgstr "préfixer tous les noms de fichier avec <root>"
-#: builtin/apply.c:4593
-msgid "--3way outside a repository"
-msgstr "--3way hors d'un dépôt"
-
-#: builtin/apply.c:4601
-msgid "--index outside a repository"
-msgstr "--index hors d'un dépôt"
-
-#: builtin/apply.c:4604
-msgid "--cached outside a repository"
-msgstr "--cached hors d'un dépôt"
-
-#: builtin/apply.c:4623
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "ouverture impossible du patch '%s'"
-
-#: builtin/apply.c:4637
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] "%d erreur d'espace ignorée"
-msgstr[1] "%d erreurs d'espace ignorées"
-
-#: builtin/apply.c:4643 builtin/apply.c:4653
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] "%d ligne a ajouté des erreurs d'espace."
-msgstr[1] "%d lignes ont ajouté des erreurs d'espace."
-
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
@@ -3794,108 +4199,108 @@ msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] <fichier>"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<options-de-révision> sont documentés dans git-rev-list(1)"
-#: builtin/blame.c:1782
+#: builtin/blame.c:1781
msgid "Blaming lines"
msgstr "Assignation de blâme au lignes"
-#: builtin/blame.c:2531
+#: builtin/blame.c:2536
msgid "Show blame entries as we find them, incrementally"
msgstr ""
"Montrer les éléments de blâme au fur et à mesure de leur découverte, de "
"manière incrémentale"
-#: builtin/blame.c:2532
+#: builtin/blame.c:2537
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)"
-#: builtin/blame.c:2533
+#: builtin/blame.c:2538
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"Ne pas traiter les commits racine comme des limites (Défaut : désactivé)"
-#: builtin/blame.c:2534
+#: builtin/blame.c:2539
msgid "Show work cost statistics"
msgstr "Montrer les statistiques de coût d'activité"
-#: builtin/blame.c:2535
+#: builtin/blame.c:2540
msgid "Force progress reporting"
msgstr "Forcer l'affichage de l'état d'avancement"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2541
msgid "Show output score for blame entries"
msgstr "Montrer le score de sortie pour les éléments de blâme"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2542
msgid "Show original filename (Default: auto)"
msgstr "Montrer les noms de fichier originaux (Défaut : auto)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2543
msgid "Show original linenumber (Default: off)"
msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2544
msgid "Show in a format designed for machine consumption"
msgstr "Afficher dans un format propice à la consommation par machine"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2545
msgid "Show porcelain format with per-line commit information"
msgstr "Afficher en format porcelaine avec l'information de commit par ligne"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2546
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2547
msgid "Show raw timestamp (Default: off)"
msgstr "Afficher les horodatages bruts (Défaut : désactivé)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2548
msgid "Show long commit SHA1 (Default: off)"
msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2549
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2550
msgid "Show author email instead of name (Default: off)"
msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2551
msgid "Ignore whitespace differences"
msgstr "Ignorer les différences d'espace"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2552
msgid "Spend extra cycles to find better match"
msgstr ""
"Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2553
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
"Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2554
msgid "Use <file>'s contents as the final image"
msgstr "Utiliser le contenu de <fichier> comme image finale"
-#: builtin/blame.c:2550 builtin/blame.c:2551
+#: builtin/blame.c:2555 builtin/blame.c:2556
msgid "score"
msgstr "score"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2555
msgid "Find line copies within and across files"
msgstr "Trouver les copies de ligne dans et entre les fichiers"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2556
msgid "Find line movements within and across files"
msgstr "Trouver les mouvements de ligne dans et entre les fichiers"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2557
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2557
msgid "Process only line range n,m, counting from 1"
msgstr ""
"Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1"
@@ -3906,7 +4311,7 @@ msgstr ""
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2641
+#: builtin/blame.c:2649
msgid "4 years, 11 months ago"
msgstr "il y a 10 ans et 11 mois"
@@ -4011,120 +4416,127 @@ msgid "Deleted branch %s (was %s).\n"
msgstr "Branche %s supprimée (précédemment %s).\n"
# féminin pour une branche
-#: builtin/branch.c:309
+#: builtin/branch.c:312
#, c-format
msgid "[%s: gone]"
msgstr "[%s: disparue]"
-#: builtin/branch.c:314
+#: builtin/branch.c:317
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:319
+#: builtin/branch.c:322
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: en retard de %d]"
-#: builtin/branch.c:321
+#: builtin/branch.c:324
#, c-format
msgid "[behind %d]"
msgstr "[en retard de %d]"
-#: builtin/branch.c:325
+#: builtin/branch.c:328
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s : en avance de %d]"
-#: builtin/branch.c:327
+#: builtin/branch.c:330
#, c-format
msgid "[ahead %d]"
msgstr "[en avance de %d]"
-#: builtin/branch.c:330
+#: builtin/branch.c:333
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s : en avance de %d, en retard de %d]"
-#: builtin/branch.c:333
+#: builtin/branch.c:336
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[en avance de %d, en retard de %d]"
-#: builtin/branch.c:346
+#: builtin/branch.c:349
msgid " **** invalid ref ****"
msgstr " **** référence invalide ****"
-#: builtin/branch.c:372
+#: builtin/branch.c:375
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(aucune branche, rebasage de %s)"
-#: builtin/branch.c:375
+#: builtin/branch.c:378
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(aucune branche, bisect a démarré sur %s)"
#. TRANSLATORS: make sure this matches
#. "HEAD detached at " in wt-status.c
-#: builtin/branch.c:381
+#: builtin/branch.c:384
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD détachée sur %s)"
#. TRANSLATORS: make sure this matches
#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:386
+#: builtin/branch.c:389
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD détachée depuis %s)"
-#: builtin/branch.c:390
+#: builtin/branch.c:393
msgid "(no branch)"
msgstr "(aucune branche)"
-#: builtin/branch.c:541
+#: builtin/branch.c:544
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "La branche %s est en cours de rebasage sur %s"
-#: builtin/branch.c:545
+#: builtin/branch.c:548
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "La branche %s est en cours de bissection sur %s"
-#: builtin/branch.c:560
+#: builtin/branch.c:563
msgid "cannot rename the current branch while not on any."
msgstr "impossible de renommer la branche actuelle, il n'y en a pas."
-#: builtin/branch.c:570
+#: builtin/branch.c:573
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branche invalide : '%s'"
-#: builtin/branch.c:587
+#: builtin/branch.c:590
msgid "Branch rename failed"
msgstr "Échec de renommage de la branche"
-#: builtin/branch.c:591
+#: builtin/branch.c:594
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Renommage d'un branche mal nommée '%s'"
-#: builtin/branch.c:594
+#: builtin/branch.c:597
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"
-#: builtin/branch.c:601
+#: builtin/branch.c:604
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La branche est renommée, mais la mise à jour du fichier de configuration a "
"échoué"
-#: builtin/branch.c:623
-msgid "could not write branch description template"
-msgstr "impossible d'écrire le modèle de description de branche"
+#: builtin/branch.c:620
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+"Veuillez éditer la description de la branche\n"
+" %s\n"
+"Les lignes commençant par '%c' seront ignorées.\n"
#: builtin/branch.c:651
msgid "Generic options"
@@ -4226,8 +4638,8 @@ msgstr "clé"
msgid "field name to sort on"
msgstr "nom du champ servant à trier"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
-#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
+#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
#: builtin/tag.c:369
msgid "object"
msgstr "objet"
@@ -4353,7 +4765,7 @@ msgstr "La création d'un colis requiert un dépôt."
msgid "Need a repository to unbundle."
msgstr "Le dépaquetage d'un colis requiert un dépôt."
-#: builtin/cat-file.c:428
+#: builtin/cat-file.c:443
msgid ""
"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
"<type>|--textconv) <object>"
@@ -4361,58 +4773,58 @@ msgstr ""
"git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "
"| <type> | --textconv) <objet>"
-#: builtin/cat-file.c:429
+#: builtin/cat-file.c:444
msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-#: builtin/cat-file.c:466
+#: builtin/cat-file.c:481
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<type> peut être : blob, tree, commit ou tag"
-#: builtin/cat-file.c:467
+#: builtin/cat-file.c:482
msgid "show object type"
msgstr "afficher le type de l'objet"
-#: builtin/cat-file.c:468
+#: builtin/cat-file.c:483
msgid "show object size"
msgstr "afficher la taille de l'objet"
-#: builtin/cat-file.c:470
+#: builtin/cat-file.c:485
msgid "exit with zero when there's no error"
msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur"
-#: builtin/cat-file.c:471
+#: builtin/cat-file.c:486
msgid "pretty-print object's content"
msgstr "afficher avec mise en forme le contenu de l'objet"
-#: builtin/cat-file.c:473
+#: builtin/cat-file.c:488
msgid "for blob objects, run textconv on object's content"
msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet"
-#: builtin/cat-file.c:475
+#: builtin/cat-file.c:490
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus"
-#: builtin/cat-file.c:476
+#: builtin/cat-file.c:491
msgid "buffer --batch output"
msgstr "bufferiser la sortie de --batch"
-#: builtin/cat-file.c:478
+#: builtin/cat-file.c:493
msgid "show info and content of objects fed from the standard input"
msgstr ""
"afficher l'information et le contenu des objets passés en entrée standard"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:496
msgid "show info about objects fed from the standard input"
msgstr "afficher l'information des objets passés en entrée standard"
-#: builtin/cat-file.c:484
+#: builtin/cat-file.c:499
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"suivre les liens symbolique internes à la copie de travail (utilisé avec --"
"batch ou --batch-check)"
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:501
msgid "show all objects with --batch or --batch-check"
msgstr "montrer tous les objets avec --batch ou --batch-check"
@@ -4441,7 +4853,7 @@ msgid "terminate input and output records by a NUL character"
msgstr ""
"terminer les enregistrements en entrée et en sortie par un caractère NUL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "supprimer l'état d'avancement"
@@ -4533,9 +4945,9 @@ msgid "write the content to temporary files"
msgstr "écrire le contenu dans des fichiers temporaires"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
-#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
-#: builtin/submodule--helper.c:774
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
+#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
+#: builtin/submodule--helper.c:830 builtin/worktree.c:469
msgid "string"
msgstr "chaîne"
@@ -4603,10 +5015,6 @@ msgstr ""
"Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "
"même temps."
-#: builtin/checkout.c:279 builtin/checkout.c:473
-msgid "corrupt index file"
-msgstr "fichier d'index corrompu"
-
#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
@@ -4616,50 +5024,50 @@ msgstr "le chemin '%s' n'est pas fusionné"
msgid "you need to resolve your current index first"
msgstr "vous devez d'abord résoudre votre index courant"
-#: builtin/checkout.c:622
+#: builtin/checkout.c:625
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Impossible de faire un reflog pour '%s' : %s\n"
-#: builtin/checkout.c:660
+#: builtin/checkout.c:664
msgid "HEAD is now at"
msgstr "HEAD est maintenant sur"
-#: builtin/checkout.c:664 builtin/clone.c:661
+#: builtin/checkout.c:668 builtin/clone.c:661
msgid "unable to update HEAD"
msgstr "impossible de mettre à jour HEAD"
-#: builtin/checkout.c:668
+#: builtin/checkout.c:672
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:671
+#: builtin/checkout.c:675
#, c-format
msgid "Already on '%s'\n"
msgstr "Déjà sur '%s'\n"
-#: builtin/checkout.c:675
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Basculement et remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:677 builtin/checkout.c:1067
+#: builtin/checkout.c:681 builtin/checkout.c:1070
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Basculement sur la nouvelle branche '%s'\n"
-#: builtin/checkout.c:679
+#: builtin/checkout.c:683
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Basculement sur la branche '%s'\n"
-#: builtin/checkout.c:731
+#: builtin/checkout.c:734
#, c-format
msgid " ... and %d more.\n"
msgstr " ... et %d en plus.\n"
-#: builtin/checkout.c:737
+#: builtin/checkout.c:740
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4682,7 +5090,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:756
+#: builtin/checkout.c:759
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4711,151 +5119,151 @@ msgstr[1] ""
"git branch <nouvelle-branche> %s\n"
"\n"
-#: builtin/checkout.c:792
+#: builtin/checkout.c:795
msgid "internal error in revision walk"
msgstr "erreur interne lors du parcours des révisions"
-#: builtin/checkout.c:796
+#: builtin/checkout.c:799
msgid "Previous HEAD position was"
msgstr "La position précédente de HEAD était sur"
-#: builtin/checkout.c:823 builtin/checkout.c:1062
+#: builtin/checkout.c:826 builtin/checkout.c:1065
msgid "You are on a branch yet to be born"
msgstr "Vous êtes sur une branche qui doit encore naître"
-#: builtin/checkout.c:968
+#: builtin/checkout.c:971
#, c-format
msgid "only one reference expected, %d given."
msgstr "une seule référence attendue, %d fournies."
-#: builtin/checkout.c:1008 builtin/worktree.c:212
+#: builtin/checkout.c:1011 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "référence invalide : %s"
-#: builtin/checkout.c:1037
+#: builtin/checkout.c:1040
#, c-format
msgid "reference is not a tree: %s"
msgstr "la référence n'est pas un arbre : %s"
-#: builtin/checkout.c:1076
+#: builtin/checkout.c:1079
msgid "paths cannot be used with switching branches"
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
-#: builtin/checkout.c:1079 builtin/checkout.c:1083
+#: builtin/checkout.c:1082 builtin/checkout.c:1086
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"
-#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
-#: builtin/checkout.c:1098
+#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
+#: builtin/checkout.c:1101
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ne peut pas être utilisé avec '%s'"
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1106
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"
-#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
-#: builtin/worktree.c:325
+#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
+#: builtin/worktree.c:326
msgid "branch"
msgstr "branche"
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1140
msgid "create and checkout a new branch"
msgstr "créer et extraire une nouvelle branche"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1142
msgid "create/reset and checkout a branch"
msgstr "créer/réinitialiser et extraire une branche"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1143
msgid "create reflog for new branch"
msgstr "créer un reflog pour une nouvelle branche"
-#: builtin/checkout.c:1141
-msgid "detach the HEAD at named commit"
-msgstr "détacher la HEAD à la validation nommée"
+#: builtin/checkout.c:1144 builtin/worktree.c:328
+msgid "detach HEAD at named commit"
+msgstr "détacher la HEAD au commit nommé"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1145
msgid "set upstream info for new branch"
msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1147
msgid "new-branch"
msgstr "nouvelle branche"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1147
msgid "new unparented branch"
msgstr "nouvelle branche sans parent"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1148
msgid "checkout our version for unmerged files"
msgstr "extraire notre version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1150
msgid "checkout their version for unmerged files"
msgstr "extraire leur version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1152
msgid "force checkout (throw away local modifications)"
msgstr "forcer l'extraction (laisser tomber les modifications locales)"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1153
msgid "perform a 3-way merge with the new branch"
msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
-#: builtin/checkout.c:1151 builtin/merge.c:230
+#: builtin/checkout.c:1154 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr "mettre à jour les fichiers ignorés (par défaut)"
-#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
+#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
msgid "style"
msgstr "style"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1156
msgid "conflict style (merge or diff3)"
msgstr "style de conflit (merge (fusion) ou diff3)"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1159
msgid "do not limit pathspecs to sparse entries only"
msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1161
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1163
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"ne pas vérifier si une autre copie de travail contient le référence fournie"
-#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
-#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
+#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117
+#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "forcer l'affichage de l'état d'avancement"
-#: builtin/checkout.c:1192
+#: builtin/checkout.c:1195
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B et --orphan sont mutuellement exclusifs"
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1212
msgid "--track needs a branch name"
msgstr "--track requiert un nom de branche"
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1217
msgid "Missing branch name; try -b"
msgstr "Nom de branche manquant ; essayez -b"
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1253
msgid "invalid path specification"
msgstr "spécification de chemin invalide"
-#: builtin/checkout.c:1257
+#: builtin/checkout.c:1260
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4865,12 +5273,12 @@ msgstr ""
"en même temps.\n"
"Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1265
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"
-#: builtin/checkout.c:1266
+#: builtin/checkout.c:1269
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -5023,7 +5431,7 @@ msgid "remove whole directories"
msgstr "supprimer les répertoires entiers"
#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
msgid "pattern"
msgstr "motif"
@@ -5067,7 +5475,7 @@ msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"
msgid "don't create a checkout"
msgstr "ne pas créer d'extraction"
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
msgid "create a bare repository"
msgstr "créer un dépôt nu"
@@ -5095,16 +5503,16 @@ msgstr "initialiser les sous-modules dans le clone"
msgid "number of submodules cloned in parallel"
msgstr "nombre de sous-modules clonés en parallèle"
-#: builtin/clone.c:80 builtin/init-db.c:470
+#: builtin/clone.c:80 builtin/init-db.c:473
msgid "template-directory"
msgstr "répertoire-modèle"
-#: builtin/clone.c:81 builtin/init-db.c:471
+#: builtin/clone.c:81 builtin/init-db.c:474
msgid "directory from which templates will be used"
msgstr "répertoire depuis lequel les modèles vont être utilisés"
-#: builtin/clone.c:83 builtin/submodule--helper.c:498
-#: builtin/submodule--helper.c:777
+#: builtin/clone.c:83 builtin/submodule--helper.c:495
+#: builtin/submodule--helper.c:833
msgid "reference repository"
msgstr "dépôt de référence"
@@ -5128,7 +5536,7 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
msgid "path to git-upload-pack on the remote"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201
+#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 builtin/pull.c:201
msgid "depth"
msgstr "profondeur"
@@ -5144,11 +5552,11 @@ msgstr "cloner seulement une branche, HEAD ou --branch"
msgid "any cloned submodules will be shallow"
msgstr "tous les sous-modules clonés seront superficiels"
-#: builtin/clone.c:98 builtin/init-db.c:479
+#: builtin/clone.c:98 builtin/init-db.c:482
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:99 builtin/init-db.c:480
+#: builtin/clone.c:99 builtin/init-db.c:483
msgid "separate git dir from working tree"
msgstr "séparer le répertoire git de la copie de travail"
@@ -5160,11 +5568,11 @@ msgstr "clé=valeur"
msgid "set config inside the new repository"
msgstr "régler la configuration dans le nouveau dépôt"
-#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "n'utiliser que des adresses IPv4"
-#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "n'utiliser que des adresses IPv6"
@@ -5198,6 +5606,11 @@ msgstr "le dépôt de référence '%s' est superficiel"
msgid "reference repository '%s' is grafted"
msgstr "le dépôt de référence '%s' est greffé"
+#: builtin/clone.c:376
+#, c-format
+msgid "failed to open '%s'"
+msgstr "échec à l'ouverture de '%s'"
+
#: builtin/clone.c:384
#, c-format
msgid "%s exists and is not a directory"
@@ -5218,7 +5631,7 @@ msgstr "échec de la création du lien '%s'"
msgid "failed to copy file to '%s'"
msgstr "échec de la copie vers '%s'"
-#: builtin/clone.c:449 builtin/clone.c:633
+#: builtin/clone.c:449
#, c-format
msgid "done.\n"
msgstr "fait.\n"
@@ -5238,12 +5651,7 @@ msgstr ""
msgid "Could not find remote branch %s to clone."
msgstr "Impossible de trouver la branche distante '%s' à cloner."
-#: builtin/clone.c:628
-#, c-format
-msgid "Checking connectivity... "
-msgstr "Vérification de la connectivité... "
-
-#: builtin/clone.c:631
+#: builtin/clone.c:633
msgid "remote did not send all necessary objects"
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
@@ -5262,101 +5670,101 @@ msgstr ""
msgid "unable to checkout working tree"
msgstr "impossible d'extraire la copie de travail"
-#: builtin/clone.c:767
+#: builtin/clone.c:766
msgid "unable to write parameters to config file"
msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
-#: builtin/clone.c:830
+#: builtin/clone.c:829
msgid "cannot repack to clean up"
msgstr "impossible de remballer pour nettoyer"
-#: builtin/clone.c:832
+#: builtin/clone.c:831
msgid "cannot unlink temporary alternates file"
msgstr "impossible de unlinker le fichier temporaire alternates"
-#: builtin/clone.c:864 builtin/receive-pack.c:1731
+#: builtin/clone.c:863 builtin/receive-pack.c:1855
msgid "Too many arguments."
msgstr "Trop d'arguments."
-#: builtin/clone.c:868
+#: builtin/clone.c:867
msgid "You must specify a repository to clone."
msgstr "Vous devez spécifier un dépôt à cloner."
-#: builtin/clone.c:879
+#: builtin/clone.c:878
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les options --bare et --origin %s sont incompatibles."
-#: builtin/clone.c:882
+#: builtin/clone.c:881
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare et --separate-git-dir sont incompatibles."
-#: builtin/clone.c:895
+#: builtin/clone.c:894
#, c-format
msgid "repository '%s' does not exist"
msgstr "le dépôt '%s' n'existe pas"
-#: builtin/clone.c:901 builtin/fetch.c:1174
+#: builtin/clone.c:900 builtin/fetch.c:1293
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profondeur %s n'est pas un entier positif"
-#: builtin/clone.c:911
+#: builtin/clone.c:910
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
"le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."
-#: builtin/clone.c:921
+#: builtin/clone.c:920
#, c-format
msgid "working tree '%s' already exists."
msgstr "la copie de travail '%s' existe déjà."
-#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
-#: builtin/worktree.c:220 builtin/worktree.c:247
+#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "impossible de créer les répertoires de premier niveau dans '%s'"
-#: builtin/clone.c:939
+#: builtin/clone.c:938
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "impossible de créer le répertoire de la copie de travail '%s'"
-#: builtin/clone.c:957
+#: builtin/clone.c:956
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonage dans le dépôt nu '%s'\n"
-#: builtin/clone.c:959
+#: builtin/clone.c:958
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonage dans '%s'...\n"
-#: builtin/clone.c:998
+#: builtin/clone.c:997
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."
-#: builtin/clone.c:1001
+#: builtin/clone.c:1000
msgid "source repository is shallow, ignoring --local"
msgstr "le dépôt source est superficiel, option --local ignorée"
-#: builtin/clone.c:1006
+#: builtin/clone.c:1005
msgid "--local is ignored"
msgstr "--local est ignoré"
-#: builtin/clone.c:1010
+#: builtin/clone.c:1009
#, c-format
msgid "Don't know how to clone %s"
msgstr "Je ne sais pas cloner %s"
-#: builtin/clone.c:1059 builtin/clone.c:1067
+#: builtin/clone.c:1058 builtin/clone.c:1066
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"
-#: builtin/clone.c:1070
+#: builtin/clone.c:1069
msgid "You appear to have cloned an empty repository."
msgstr "Vous semblez avoir cloné un dépôt vide."
@@ -5499,66 +5907,66 @@ msgstr ""
"Puis \"git cherry-pick --continue\" continuera le picorage \n"
"des commits restants.\n"
-#: builtin/commit.c:307
+#: builtin/commit.c:308
msgid "failed to unpack HEAD tree object"
msgstr "échec du dépaquetage de l'objet arbre HEAD"
-#: builtin/commit.c:348
+#: builtin/commit.c:349
msgid "unable to create temporary index"
msgstr "impossible de créer l'index temporaire"
-#: builtin/commit.c:354
+#: builtin/commit.c:355
msgid "interactive add failed"
msgstr "échec de l'ajout interactif"
-#: builtin/commit.c:367
+#: builtin/commit.c:368
msgid "unable to update temporary index"
msgstr "impossible de mettre à jour l'index temporaire"
-#: builtin/commit.c:369
+#: builtin/commit.c:370
msgid "Failed to update main cache tree"
msgstr "Impossible de mettre à jour l'arbre de cache principal"
-#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
+#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
msgid "unable to write new_index file"
msgstr "impossible d'écrire le fichier new_index"
-#: builtin/commit.c:447
+#: builtin/commit.c:448
msgid "cannot do a partial commit during a merge."
msgstr "impossible de faire une validation partielle pendant une fusion."
-#: builtin/commit.c:449
+#: builtin/commit.c:450
msgid "cannot do a partial commit during a cherry-pick."
msgstr "impossible de faire une validation partielle pendant un picorage."
-#: builtin/commit.c:458
+#: builtin/commit.c:459
msgid "cannot read the index"
msgstr "impossible de lire l'index"
-#: builtin/commit.c:477
+#: builtin/commit.c:478
msgid "unable to write temporary index file"
msgstr "impossible d'écrire le fichier d'index temporaire"
-#: builtin/commit.c:582
+#: builtin/commit.c:583
#, c-format
msgid "commit '%s' lacks author header"
msgstr "entête d'auteur manquant dans le commit '%s'"
-#: builtin/commit.c:584
+#: builtin/commit.c:585
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "le commit '%s' a une ligne d'auteur malformée"
-#: builtin/commit.c:603
+#: builtin/commit.c:604
msgid "malformed --author parameter"
msgstr "paramètre --author mal formé"
-#: builtin/commit.c:611
+#: builtin/commit.c:612
#, c-format
msgid "invalid date format: %s"
msgstr "format de date invalide : %s"
-#: builtin/commit.c:655
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -5566,38 +5974,38 @@ msgstr ""
"impossible de sélectionner un caractère de commentaire\n"
"qui n'est pas utilisé dans le message de validation actuel"
-#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
+#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
#, c-format
msgid "could not lookup commit %s"
msgstr "impossible de rechercher le commit %s"
-#: builtin/commit.c:704 builtin/shortlog.c:285
+#: builtin/commit.c:705 builtin/shortlog.c:286
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lecture du message de journal depuis l'entrée standard)\n"
-#: builtin/commit.c:706
+#: builtin/commit.c:707
msgid "could not read log from standard input"
msgstr "impossible de lire le journal depuis l'entrée standard"
-#: builtin/commit.c:710
+#: builtin/commit.c:711
#, c-format
msgid "could not read log file '%s'"
msgstr "impossible de lire le fichier de journal '%s'"
-#: builtin/commit.c:737 builtin/commit.c:745
+#: builtin/commit.c:738 builtin/commit.c:746
msgid "could not read SQUASH_MSG"
msgstr "impossible de lire SQUASH_MSG"
-#: builtin/commit.c:742
+#: builtin/commit.c:743
msgid "could not read MERGE_MSG"
msgstr "impossible de lire MERGE_MSG"
-#: builtin/commit.c:796
+#: builtin/commit.c:797
msgid "could not write commit template"
msgstr "impossible d'écrire le modèle de commit"
-#: builtin/commit.c:814
+#: builtin/commit.c:815
#, c-format
msgid ""
"\n"
@@ -5612,7 +6020,7 @@ msgstr ""
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:819
+#: builtin/commit.c:820
#, c-format
msgid ""
"\n"
@@ -5627,7 +6035,7 @@ msgstr ""
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:832
+#: builtin/commit.c:833
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5637,7 +6045,7 @@ msgstr ""
"commençant par '%c' seront ignorées, et un message vide abandonne la "
"validation.\n"
-#: builtin/commit.c:839
+#: builtin/commit.c:840
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5648,150 +6056,150 @@ msgstr ""
"commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"
"si vous le souhaitez. Un message vide abandonne la validation.\n"
-#: builtin/commit.c:859
+#: builtin/commit.c:860
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAuteur : %.*s <%.*s>"
-#: builtin/commit.c:867
+#: builtin/commit.c:868
#, c-format
msgid "%sDate: %s"
msgstr "%sDate : %s"
-#: builtin/commit.c:874
+#: builtin/commit.c:875
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sValidateur : %.*s <%.*s>"
-#: builtin/commit.c:892
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "Impossible de lire l'index"
-#: builtin/commit.c:949
+#: builtin/commit.c:950
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
-#: builtin/commit.c:964 builtin/tag.c:266
+#: builtin/commit.c:965 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"
-#: builtin/commit.c:1066
+#: builtin/commit.c:1067
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "
"auteur existant"
-#: builtin/commit.c:1081 builtin/commit.c:1321
+#: builtin/commit.c:1082 builtin/commit.c:1322
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fichier non suivi invalide '%s'"
-#: builtin/commit.c:1118
+#: builtin/commit.c:1119
msgid "--long and -z are incompatible"
msgstr "--long et -z sont incompatibles"
-#: builtin/commit.c:1148
+#: builtin/commit.c:1149
msgid "Using both --reset-author and --author does not make sense"
msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"
-#: builtin/commit.c:1157
+#: builtin/commit.c:1158
msgid "You have nothing to amend."
msgstr "Il n'y a rien à corriger."
-#: builtin/commit.c:1160
+#: builtin/commit.c:1161
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
-#: builtin/commit.c:1162
+#: builtin/commit.c:1163
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1166
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"
-#: builtin/commit.c:1175
+#: builtin/commit.c:1176
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."
-#: builtin/commit.c:1177
+#: builtin/commit.c:1178
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."
-#: builtin/commit.c:1185
+#: builtin/commit.c:1186
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."
-#: builtin/commit.c:1202
+#: builtin/commit.c:1203
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Une seule option parmi --include/--only/--all/--interactive/--patch peut "
"être utilisée."
-#: builtin/commit.c:1204
+#: builtin/commit.c:1205
msgid "No paths with --include/--only does not make sense."
msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."
-#: builtin/commit.c:1206
+#: builtin/commit.c:1207
msgid "Clever... amending the last one with dirty index."
msgstr "Malin... correction du dernier avec un index sale."
-#: builtin/commit.c:1208
+#: builtin/commit.c:1209
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."
-#: builtin/commit.c:1220 builtin/tag.c:474
+#: builtin/commit.c:1221 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de nettoyage invalide %s"
-#: builtin/commit.c:1225
+#: builtin/commit.c:1226
msgid "Paths with -a does not make sense."
msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."
-#: builtin/commit.c:1335 builtin/commit.c:1621
+#: builtin/commit.c:1336 builtin/commit.c:1622
msgid "show status concisely"
msgstr "afficher le statut avec concision"
-#: builtin/commit.c:1337 builtin/commit.c:1623
+#: builtin/commit.c:1338 builtin/commit.c:1624
msgid "show branch information"
msgstr "afficher l'information de branche"
-#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
-#: builtin/worktree.c:437
+#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
-#: builtin/commit.c:1342 builtin/commit.c:1627
+#: builtin/commit.c:1343 builtin/commit.c:1628
msgid "show status in long format (default)"
msgstr "afficher le statut en format long (par défaut)"
-#: builtin/commit.c:1345 builtin/commit.c:1630
+#: builtin/commit.c:1346 builtin/commit.c:1631
msgid "terminate entries with NUL"
msgstr "terminer les éléments par NUL"
-#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
+#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1348 builtin/commit.c:1633
+#: builtin/commit.c:1349 builtin/commit.c:1634
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "
"no. (Défaut : all)"
-#: builtin/commit.c:1351
+#: builtin/commit.c:1352
msgid "show ignored files"
msgstr "afficher les fichiers ignorés"
-#: builtin/commit.c:1352 parse-options.h:155
+#: builtin/commit.c:1353 parse-options.h:155
msgid "when"
msgstr "quand"
-#: builtin/commit.c:1353
+#: builtin/commit.c:1354
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -5799,201 +6207,201 @@ msgstr ""
"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
-#: builtin/commit.c:1355
+#: builtin/commit.c:1356
msgid "list untracked files in columns"
msgstr "afficher les fichiers non suivis en colonnes"
-#: builtin/commit.c:1441
+#: builtin/commit.c:1442
msgid "couldn't look up newly created commit"
msgstr "impossible de retrouver le commit nouvellement créé"
-#: builtin/commit.c:1443
+#: builtin/commit.c:1444
msgid "could not parse newly created commit"
msgstr "impossible d'analyser le commit nouvellement créé"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1489
msgid "detached HEAD"
msgstr "HEAD détachée"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1492
msgid " (root-commit)"
msgstr " (commit racine)"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1592
msgid "suppress summary after successful commit"
msgstr "supprimer le résumé après une validation réussie"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1593
msgid "show diff in commit message template"
msgstr "afficher les diff dans le modèle de message de validation"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1595
msgid "Commit message options"
msgstr "Options du message de validation"
-#: builtin/commit.c:1595 builtin/tag.c:351
+#: builtin/commit.c:1596 builtin/tag.c:351
msgid "read message from file"
msgstr "lire le message depuis un fichier"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1597
msgid "author"
msgstr "auteur"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1597
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:1597 builtin/gc.c:326
+#: builtin/commit.c:1598 builtin/gc.c:326
msgid "date"
msgstr "date"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1598
msgid "override date for commit"
msgstr "remplacer la date pour la validation"
-#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
-#: builtin/notes.c:558 builtin/tag.c:349
+#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
+#: builtin/notes.c:559 builtin/tag.c:349
msgid "message"
msgstr "message"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1599
msgid "commit message"
msgstr "message de validation"
-#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
-#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
+#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1600
msgid "reuse and edit message from specified commit"
msgstr "réutiliser et éditer le message du commit spécifié"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1601
msgid "reuse message from specified commit"
msgstr "réutiliser le message du commit spécifié"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1602
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"utiliser un message au format autosquash pour corriger le commit spécifié"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1603
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"utiliser un message au format autosquash pour compresser le commit spécifié"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1604
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"
-#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
+#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "ajouter une entrée Signed-off-by :"
-#: builtin/commit.c:1605
+#: builtin/commit.c:1606
msgid "use specified template file"
msgstr "utiliser le fichier de modèle spécifié"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1607
msgid "force edit of commit"
msgstr "forcer l'édition du commit"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1608
msgid "default"
msgstr "défaut"
-#: builtin/commit.c:1607 builtin/tag.c:354
+#: builtin/commit.c:1608 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "comment éliminer les espaces et les commentaires # du message"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1609
msgid "include status in commit message template"
msgstr "inclure le statut dans le modèle de message de validation"
-#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
+#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "signer la validation avec GPG"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1614
msgid "Commit contents options"
msgstr "Valider les options des contenus"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1615
msgid "commit all changed files"
msgstr "valider tous les fichiers modifiés"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1616
msgid "add specified files to index for commit"
msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1617
msgid "interactively add files"
msgstr "ajouter des fichiers en mode interactif"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1618
msgid "interactively add changes"
msgstr "ajouter les modifications en mode interactif"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1619
msgid "commit only specified files"
msgstr "valider seulement les fichiers spécifiés"
-#: builtin/commit.c:1619
-msgid "bypass pre-commit hook"
-msgstr "éviter d'utiliser le crochet pre-commit"
-
#: builtin/commit.c:1620
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "éviter d'utiliser les crochets pre-commit et commit-msg"
+
+#: builtin/commit.c:1621
msgid "show what would be committed"
msgstr "afficher ce qui serait validé"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1632
msgid "amend previous commit"
msgstr "corriger la validation précédente"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1633
msgid "bypass post-rewrite hook"
msgstr "éviter d'utiliser le crochet post-rewrite"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1638
msgid "ok to record an empty change"
msgstr "accepter d'enregistrer une modification vide"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
msgid "ok to record a change with an empty message"
msgstr "accepter d'enregistrer une modification avec un message vide"
-#: builtin/commit.c:1668
+#: builtin/commit.c:1669
msgid "could not parse HEAD commit"
msgstr "impossible d'analyser le commit HEAD"
-#: builtin/commit.c:1718
+#: builtin/commit.c:1719
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fichier MERGE_HEAD corrompu (%s)"
-#: builtin/commit.c:1725
+#: builtin/commit.c:1726
msgid "could not read MERGE_MODE"
msgstr "impossible de lire MERGE_MODE"
-#: builtin/commit.c:1744
+#: builtin/commit.c:1745
#, c-format
msgid "could not read commit message: %s"
msgstr "impossible de lire le message de validation : %s"
-#: builtin/commit.c:1755
+#: builtin/commit.c:1756
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"
-#: builtin/commit.c:1760
+#: builtin/commit.c:1761
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Abandon de la validation du à un message de validation vide\n"
-#: builtin/commit.c:1808
+#: builtin/commit.c:1809
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -6007,142 +6415,142 @@ msgstr ""
msgid "git config [<options>]"
msgstr "git config [<options>]"
-#: builtin/config.c:56
+#: builtin/config.c:55
msgid "Config file location"
msgstr "Emplacement du fichier de configuration"
-#: builtin/config.c:57
+#: builtin/config.c:56
msgid "use global config file"
msgstr "utiliser les fichier de configuration global"
-#: builtin/config.c:58
+#: builtin/config.c:57
msgid "use system config file"
msgstr "utiliser le fichier de configuration du système"
-#: builtin/config.c:59
+#: builtin/config.c:58
msgid "use repository config file"
msgstr "utiliser le fichier de configuration du dépôt"
-#: builtin/config.c:60
+#: builtin/config.c:59
msgid "use given config file"
msgstr "utiliser le fichier de configuration spécifié"
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "read config from given blob object"
msgstr "lire la configuration depuis l'objet blob fourni"
-#: builtin/config.c:62
+#: builtin/config.c:61
msgid "Action"
msgstr "Action"
-#: builtin/config.c:63
+#: builtin/config.c:62
msgid "get value: name [value-regex]"
msgstr "obtenir la valeur : nom [regex-de-valeur]"
-#: builtin/config.c:64
+#: builtin/config.c:63
msgid "get all values: key [value-regex]"
msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]"
-#: builtin/config.c:65
+#: builtin/config.c:64
msgid "get values for regexp: name-regex [value-regex]"
msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]"
-#: builtin/config.c:66
+#: builtin/config.c:65
msgid "get value specific for the URL: section[.var] URL"
msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL"
-#: builtin/config.c:67
+#: builtin/config.c:66
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
"remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]"
-#: builtin/config.c:68
+#: builtin/config.c:67
msgid "add a new variable: name value"
msgstr "ajouter une nouvelle variable : nom valeur"
-#: builtin/config.c:69
+#: builtin/config.c:68
msgid "remove a variable: name [value-regex]"
msgstr "supprimer une variable : nom [regex-de-valeur]"
-#: builtin/config.c:70
+#: builtin/config.c:69
msgid "remove all matches: name [value-regex]"
msgstr "supprimer toutes les correspondances nom [regex-de-valeur]"
-#: builtin/config.c:71
+#: builtin/config.c:70
msgid "rename section: old-name new-name"
msgstr "renommer une section : ancien-nom nouveau-nom"
-#: builtin/config.c:72
+#: builtin/config.c:71
msgid "remove a section: name"
msgstr "supprimer une section : nom"
-#: builtin/config.c:73
+#: builtin/config.c:72
msgid "list all"
msgstr "afficher tout"
-#: builtin/config.c:74
+#: builtin/config.c:73
msgid "open an editor"
msgstr "ouvrir un éditeur"
-#: builtin/config.c:75
+#: builtin/config.c:74
msgid "find the color configured: slot [default]"
msgstr "trouver la couleur configurée : slot [par défaut]"
-#: builtin/config.c:76
+#: builtin/config.c:75
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]"
-#: builtin/config.c:77
+#: builtin/config.c:76
msgid "Type"
msgstr "Type"
-#: builtin/config.c:78
+#: builtin/config.c:77
msgid "value is \"true\" or \"false\""
msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)"
-#: builtin/config.c:79
+#: builtin/config.c:78
msgid "value is decimal number"
msgstr "la valeur est un nombre décimal"
-#: builtin/config.c:80
+#: builtin/config.c:79
msgid "value is --bool or --int"
msgstr "la valeur est --bool ou --int"
-#: builtin/config.c:81
+#: builtin/config.c:80
msgid "value is a path (file or directory name)"
msgstr "la valeur est un chemin (vers un fichier ou un répertoire)"
-#: builtin/config.c:82
+#: builtin/config.c:81
msgid "Other"
msgstr "Autre"
-#: builtin/config.c:83
+#: builtin/config.c:82
msgid "terminate values with NUL byte"
msgstr "terminer les valeurs avec un caractère NUL"
-#: builtin/config.c:84
+#: builtin/config.c:83
msgid "show variable names only"
msgstr "n'afficher que les noms de variable"
-#: builtin/config.c:85
+#: builtin/config.c:84
msgid "respect include directives on lookup"
msgstr "respecter les directives d'inclusion lors de la recherche"
-#: builtin/config.c:86
+#: builtin/config.c:85
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"afficher l'origine de la configuration (fichier, entrée standard, blob, "
"ligne de commande)"
-#: builtin/config.c:328
+#: builtin/config.c:327
msgid "unable to parse default color value"
msgstr "impossible de lire la valeur de couleur par défaut"
-#: builtin/config.c:472
+#: builtin/config.c:471
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -6157,7 +6565,7 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:614
+#: builtin/config.c:613
#, c-format
msgid "cannot create configuration file %s"
msgstr "création impossible du fichier de configuration '%s'"
@@ -6193,7 +6601,7 @@ msgstr "l'étiquette annotée %s n'a pas de nom embarqué"
msgid "tag '%s' is really '%s' here"
msgstr "l'étiquette '%s' est en fait '%s'"
-#: builtin/describe.c:250 builtin/log.c:465
+#: builtin/describe.c:250 builtin/log.c:480
#, c-format
msgid "Not a valid object name %s"
msgstr "%s n'est pas un nom d'objet valide"
@@ -6394,179 +6802,181 @@ msgstr "Appliquer le spécificateur de référence aux références exportées"
msgid "anonymize output"
msgstr "anonymise la sortie"
-#: builtin/fetch.c:20
+#: builtin/fetch.c:21
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/fetch.c:21
+#: builtin/fetch.c:22
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<options>] <groupe>"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<options>]"
-#: builtin/fetch.c:92 builtin/pull.c:174
+#: builtin/fetch.c:93 builtin/pull.c:174
msgid "fetch from all remotes"
msgstr "récupérer depuis tous les dépôts distants"
-#: builtin/fetch.c:94 builtin/pull.c:177
+#: builtin/fetch.c:95 builtin/pull.c:177
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
-#: builtin/fetch.c:96 builtin/pull.c:180
+#: builtin/fetch.c:97 builtin/pull.c:180
msgid "path to upload pack on remote end"
msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
-#: builtin/fetch.c:97 builtin/pull.c:182
+#: builtin/fetch.c:98 builtin/pull.c:182
msgid "force overwrite of local branch"
msgstr "forcer l'écrasement de la branche locale"
-#: builtin/fetch.c:99
+#: builtin/fetch.c:100
msgid "fetch from multiple remotes"
msgstr "récupérer depuis plusieurs dépôts distants"
-#: builtin/fetch.c:101 builtin/pull.c:184
+#: builtin/fetch.c:102 builtin/pull.c:184
msgid "fetch all tags and associated objects"
msgstr "récupérer toutes les étiquettes et leurs objets associés"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:104
msgid "do not fetch all tags (--no-tags)"
msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
-#: builtin/fetch.c:105
+#: builtin/fetch.c:106
msgid "number of submodules fetched in parallel"
msgstr "nombre de sous-modules récupérés en parallèle"
-#: builtin/fetch.c:107 builtin/pull.c:187
+#: builtin/fetch.c:108 builtin/pull.c:187
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"éliminer les branches de suivi distant si la branche n'existe plus dans le "
"dépôt distant"
-#: builtin/fetch.c:108 builtin/pull.c:190
+#: builtin/fetch.c:109 builtin/pull.c:190
msgid "on-demand"
msgstr "à la demande"
-#: builtin/fetch.c:109 builtin/pull.c:191
+#: builtin/fetch.c:110 builtin/pull.c:191
msgid "control recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/fetch.c:113 builtin/pull.c:199
+#: builtin/fetch.c:114 builtin/pull.c:199
msgid "keep downloaded pack"
msgstr "conserver le paquet téléchargé"
-#: builtin/fetch.c:115
+#: builtin/fetch.c:116
msgid "allow updating of HEAD ref"
msgstr "permettre la mise à jour de la référence HEAD"
-#: builtin/fetch.c:118 builtin/pull.c:202
+#: builtin/fetch.c:119 builtin/pull.c:202
msgid "deepen history of shallow clone"
msgstr "approfondir l'historique d'un clone superficiel"
-#: builtin/fetch.c:120 builtin/pull.c:205
+#: builtin/fetch.c:121 builtin/pull.c:205
msgid "convert to a complete repository"
msgstr "convertir en un dépôt complet"
-#: builtin/fetch.c:122 builtin/log.c:1399
+#: builtin/fetch.c:123 builtin/log.c:1426
msgid "dir"
msgstr "répertoire"
-#: builtin/fetch.c:123
+#: builtin/fetch.c:124
msgid "prepend this to submodule path output"
msgstr "préfixer ceci à la sortie du chemin du sous-module"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:127
msgid "default mode for recursion"
msgstr "mode par défaut pour la récursion"
-#: builtin/fetch.c:128 builtin/pull.c:208
+#: builtin/fetch.c:129 builtin/pull.c:208
msgid "accept refs that update .git/shallow"
msgstr "accepter les références qui mettent à jour .git/shallow"
-#: builtin/fetch.c:129 builtin/pull.c:210
+#: builtin/fetch.c:130 builtin/pull.c:210
msgid "refmap"
msgstr "correspondance de référence"
-#: builtin/fetch.c:130 builtin/pull.c:211
+#: builtin/fetch.c:131 builtin/pull.c:211
msgid "specify fetch refmap"
msgstr "spécifier une correspondance de référence pour la récupération"
-#: builtin/fetch.c:386
+#: builtin/fetch.c:387
msgid "Couldn't find remote ref HEAD"
msgstr "impossible de trouver la référence HEAD distante"
-#: builtin/fetch.c:466
+#: builtin/fetch.c:503
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr ""
+"le paramètre de configuration fetch.output contient une valeur invalide %s"
+
+#: builtin/fetch.c:592
#, c-format
msgid "object %s not found"
msgstr "objet %s non trouvé"
-#: builtin/fetch.c:471
+#: builtin/fetch.c:596
msgid "[up to date]"
msgstr "[à jour]"
-#: builtin/fetch.c:485
-#, c-format
-msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
-msgstr "! %-*s %-*s -> %s (impossible de récupérer la branche actuelle)"
-
-#: builtin/fetch.c:486 builtin/fetch.c:574
+#: builtin/fetch.c:609 builtin/fetch.c:689
msgid "[rejected]"
msgstr "[rejeté]"
-#: builtin/fetch.c:497
+#: builtin/fetch.c:610
+msgid "can't fetch in current branch"
+msgstr "impossible de récupérer dans la branche actuelle"
+
+#: builtin/fetch.c:619
msgid "[tag update]"
msgstr "[mise à jour de l'étiquette]"
-#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
-msgid " (unable to update local ref)"
-msgstr " (impossible de mettre à jour la référence locale)"
+#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
+#: builtin/fetch.c:684
+msgid "unable to update local ref"
+msgstr "impossible de mettre à jour la référence locale"
-#: builtin/fetch.c:517
+#: builtin/fetch.c:639
msgid "[new tag]"
msgstr "[nouvelle étiquette]"
-#: builtin/fetch.c:520
+#: builtin/fetch.c:642
msgid "[new branch]"
msgstr "[nouvelle branche]"
-#: builtin/fetch.c:523
+#: builtin/fetch.c:645
msgid "[new ref]"
msgstr "[nouvelle référence]"
-#: builtin/fetch.c:569
-msgid "unable to update local ref"
-msgstr "impossible de mettre à jour la référence locale"
-
-#: builtin/fetch.c:569
+#: builtin/fetch.c:684
msgid "forced update"
msgstr "mise à jour forcée"
-#: builtin/fetch.c:576
-msgid "(non-fast-forward)"
-msgstr "(pas d'avance rapide)"
+#: builtin/fetch.c:689
+msgid "non-fast-forward"
+msgstr "pas en avance rapide"
-#: builtin/fetch.c:619
+#: builtin/fetch.c:733
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s n'a pas envoyé tous les objets nécessaires\n"
-#: builtin/fetch.c:637
+#: builtin/fetch.c:753
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"%s rejeté parce que les racines superficielles ne sont pas mises à jour"
-#: builtin/fetch.c:724 builtin/fetch.c:816
+#: builtin/fetch.c:839 builtin/fetch.c:934
#, c-format
msgid "From %.*s\n"
msgstr "Depuis %.*s\n"
-#: builtin/fetch.c:735
+#: builtin/fetch.c:850
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -6575,55 +6985,55 @@ msgstr ""
"des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"
" 'git remote prune %s' pour supprimer des branches anciennes en conflit"
-#: builtin/fetch.c:787
+#: builtin/fetch.c:904
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sera en suspens)"
-#: builtin/fetch.c:788
+#: builtin/fetch.c:905
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s est devenu en suspens)"
-#: builtin/fetch.c:820
+#: builtin/fetch.c:937
msgid "[deleted]"
msgstr "[supprimé]"
-#: builtin/fetch.c:821 builtin/remote.c:1025
+#: builtin/fetch.c:938 builtin/remote.c:1020
msgid "(none)"
msgstr "(aucun(e))"
-#: builtin/fetch.c:841
+#: builtin/fetch.c:960
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:979
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"
-#: builtin/fetch.c:863
+#: builtin/fetch.c:982
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "L'option \"%s\" est ignorée pour %s\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1039
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Je ne sais pas récupérer depuis %s"
-#: builtin/fetch.c:1080
+#: builtin/fetch.c:1199
#, c-format
msgid "Fetching %s\n"
msgstr "Récupération de %s\n"
-#: builtin/fetch.c:1082 builtin/remote.c:96
+#: builtin/fetch.c:1201 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "Impossible de récupérer %s"
-#: builtin/fetch.c:1100
+#: builtin/fetch.c:1219
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -6631,32 +7041,32 @@ msgstr ""
"Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"
"distant depuis lesquels les nouvelles révisions devraient être récupérées."
-#: builtin/fetch.c:1123
+#: builtin/fetch.c:1242
msgid "You need to specify a tag name."
msgstr "Vous devez spécifier un nom d'étiquette."
-#: builtin/fetch.c:1165
+#: builtin/fetch.c:1284
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1286
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow sur un dépôt complet n'a pas de sens"
-#: builtin/fetch.c:1187
+#: builtin/fetch.c:1306
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all n'accepte pas d'argument de dépôt"
-#: builtin/fetch.c:1189
+#: builtin/fetch.c:1308
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all n'a pas de sens avec des spécifications de référence"
-#: builtin/fetch.c:1200
+#: builtin/fetch.c:1319
#, c-format
msgid "No such remote or remote group: %s"
msgstr "distant ou groupe distant inexistant : %s"
-#: builtin/fetch.c:1208
+#: builtin/fetch.c:1327
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
"La récupération d'un groupe et les spécifications de référence n'ont pas de "
@@ -6744,64 +7154,64 @@ msgstr "afficher seulement les références qui ne sont pas fusionnées"
msgid "print only refs which contain the commit"
msgstr "afficher seulement les références qui contiennent le commit"
-#: builtin/fsck.c:156 builtin/prune.c:140
-msgid "Checking connectivity"
-msgstr "Vérification de la connectivité"
-
-#: builtin/fsck.c:486
+#: builtin/fsck.c:519
msgid "Checking object directories"
msgstr "Vérification des répertoires d'objet"
-#: builtin/fsck.c:552
+#: builtin/fsck.c:588
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<options>] [<objet>...]"
-#: builtin/fsck.c:558
+#: builtin/fsck.c:594
msgid "show unreachable objects"
msgstr "afficher les objets inaccessibles"
-#: builtin/fsck.c:559
+#: builtin/fsck.c:595
msgid "show dangling objects"
msgstr "afficher les objets en suspens"
-#: builtin/fsck.c:560
+#: builtin/fsck.c:596
msgid "report tags"
msgstr "afficher les étiquettes"
-#: builtin/fsck.c:561
+#: builtin/fsck.c:597
msgid "report root nodes"
msgstr "signaler les nœuds racines"
-#: builtin/fsck.c:562
+#: builtin/fsck.c:598
msgid "make index objects head nodes"
msgstr "considérer les objets de l'index comme nœuds tête"
# translated from man page
-#: builtin/fsck.c:563
+#: builtin/fsck.c:599
msgid "make reflogs head nodes (default)"
msgstr "considérer les reflogs comme nœuds tête (par défaut)"
-#: builtin/fsck.c:564
+#: builtin/fsck.c:600
msgid "also consider packs and alternate objects"
msgstr "inspecter aussi les objets pack et alternatifs"
-#: builtin/fsck.c:565
+#: builtin/fsck.c:601
msgid "check only connectivity"
msgstr "ne vérifier que la connectivité"
-#: builtin/fsck.c:566
+#: builtin/fsck.c:602
msgid "enable more strict checking"
msgstr "activer une vérification plus strict"
-#: builtin/fsck.c:568
+#: builtin/fsck.c:604
msgid "write dangling objects in .git/lost-found"
msgstr "écrire les objets en suspens dans .git/lost-found"
-#: builtin/fsck.c:569 builtin/prune.c:107
+#: builtin/fsck.c:605 builtin/prune.c:107
msgid "show progress"
msgstr "afficher la progression"
-#: builtin/fsck.c:630
+#: builtin/fsck.c:606
+msgid "show verbose names for reachable objects"
+msgstr "afficher les noms étendus pour les objets inaccessibles"
+
+#: builtin/fsck.c:671
msgid "Checking objects"
msgstr "Vérification des objets"
@@ -7102,7 +7512,7 @@ msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
msgid "no pattern given."
msgstr "aucun motif fourni."
-#: builtin/grep.c:845 builtin/index-pack.c:1477
+#: builtin/grep.c:845 builtin/index-pack.c:1479
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "nombre de fils spécifié invalide (%d)"
@@ -7250,336 +7660,332 @@ msgstr "aucun visualiseur de manuel n'a pris en charge la demande"
msgid "no info viewer handled the request"
msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"
-#: builtin/help.c:408
+#: builtin/help.c:401
msgid "Defining attributes per path"
msgstr "Définition des attributs par chemin"
-#: builtin/help.c:409
+#: builtin/help.c:402
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git de tous les jours avec à peu près 20 commandes"
-#: builtin/help.c:410
+#: builtin/help.c:403
msgid "A Git glossary"
msgstr "Un glossaire Git"
-#: builtin/help.c:411
+#: builtin/help.c:404
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"
-#: builtin/help.c:412
+#: builtin/help.c:405
msgid "Defining submodule properties"
msgstr "Définition des propriétés de sous-module"
-#: builtin/help.c:413
+#: builtin/help.c:406
msgid "Specifying revisions and ranges for Git"
msgstr "Spécification des révisions et portées pour Git"
-#: builtin/help.c:414
+#: builtin/help.c:407
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr ""
"Une introduction pratique à Git (pour les versions 1.5.1 et supérieures)"
-#: builtin/help.c:415
+#: builtin/help.c:408
msgid "An overview of recommended workflows with Git"
msgstr "Un aperçu des flux de travail recommandés avec Git"
-#: builtin/help.c:427
+#: builtin/help.c:420
msgid "The common Git guides are:\n"
msgstr "Les guides Git populaires sont : \n"
-#: builtin/help.c:448 builtin/help.c:465
+#: builtin/help.c:441 builtin/help.c:458
#, c-format
msgid "usage: %s%s"
msgstr "usage : %s%s"
-#: builtin/help.c:481
+#: builtin/help.c:474
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s\" est un alias de `%s'"
-#: builtin/index-pack.c:152
+#: builtin/index-pack.c:153
#, c-format
msgid "unable to open %s"
msgstr "impossible d'ouvrir %s"
-#: builtin/index-pack.c:202
+#: builtin/index-pack.c:203
#, c-format
msgid "object type mismatch at %s"
msgstr "type d'objet non correspondant à %s"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:223
#, c-format
msgid "did not receive expected object %s"
msgstr "objet attendu non reçu %s"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objet %s : type attendu %s, reçu %s"
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:268
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "impossible de remplir %d octet"
msgstr[1] "impossible de remplir %d octets"
-#: builtin/index-pack.c:277
+#: builtin/index-pack.c:278
msgid "early EOF"
msgstr "fin de fichier prématurée"
-#: builtin/index-pack.c:278
+#: builtin/index-pack.c:279
msgid "read error on input"
msgstr "erreur de lecture sur l'entrée"
-#: builtin/index-pack.c:290
+#: builtin/index-pack.c:291
msgid "used more bytes than were available"
msgstr "plus d'octets utilisés que disponibles"
-#: builtin/index-pack.c:297
+#: builtin/index-pack.c:298
msgid "pack too large for current definition of off_t"
msgstr "le paquet est trop grand pour la définition actuelle de off_t"
-#: builtin/index-pack.c:313
+#: builtin/index-pack.c:314
#, c-format
msgid "unable to create '%s'"
msgstr "impossible de créer '%s'"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "cannot open packfile '%s'"
msgstr "impossible d'ouvrir le fichier paquet '%s'"
-#: builtin/index-pack.c:332
+#: builtin/index-pack.c:333
msgid "pack signature mismatch"
msgstr "la signature du paquet ne correspond pas"
-#: builtin/index-pack.c:334
+#: builtin/index-pack.c:335
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la version de paquet %<PRIu32> non supportée"
-#: builtin/index-pack.c:352
+#: builtin/index-pack.c:353
#, c-format
-msgid "pack has bad object at offset %lu: %s"
-msgstr "le paquet a un mauvais objet à l'offset %lu: %s"
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "le paquet a un mauvais objet à l'offset %<PRIuMAX> : %s"
-#: builtin/index-pack.c:473
+#: builtin/index-pack.c:475
#, c-format
msgid "inflate returned %d"
msgstr "la décompression (inflate) a retourné %d"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:524
msgid "offset value overflow for delta base object"
msgstr "dépassement de la valeur d'offset pour l'objet delta de base"
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:532
msgid "delta base offset is out of bound"
msgstr "l'objet delta de base est hors limite"
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:540
#, c-format
msgid "unknown object type %d"
msgstr "type d'objet inconnu %d"
-#: builtin/index-pack.c:569
+#: builtin/index-pack.c:571
msgid "cannot pread pack file"
msgstr "impossible de lire (pread) le fichier paquet"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:573
#, c-format
-msgid "premature end of pack file, %lu byte missing"
-msgid_plural "premature end of pack file, %lu bytes missing"
-msgstr[0] "fin prématurée du fichier paquet, %lu octet lu"
-msgstr[1] "fin prématurée du fichier paquet, %lu octets lus"
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+msgstr[0] "fin prématurée du fichier paquet, %<PRIuMAX> octet lu"
+msgstr[1] "fin prématurée du fichier paquet, %<PRIuMAX> octets lus"
-#: builtin/index-pack.c:597
+#: builtin/index-pack.c:599
msgid "serious inflate inconsistency"
msgstr "grave incohérence dans la décompression (inflate)"
-#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
-#: builtin/index-pack.c:806 builtin/index-pack.c:815
+#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
+#: builtin/index-pack.c:808 builtin/index-pack.c:817
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"
-#: builtin/index-pack.c:746 builtin/pack-objects.c:162
-#: builtin/pack-objects.c:254
+#: builtin/index-pack.c:748 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:256
#, c-format
msgid "unable to read %s"
msgstr "impossible de lire %s"
-#: builtin/index-pack.c:812
+#: builtin/index-pack.c:814
#, c-format
msgid "cannot read existing object %s"
msgstr "impossible de lire l'objet existant %s"
-#: builtin/index-pack.c:826
+#: builtin/index-pack.c:828
#, c-format
msgid "invalid blob object %s"
msgstr "objet blob invalide %s"
-#: builtin/index-pack.c:840
+#: builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr "%s invalide"
-#: builtin/index-pack.c:843
+#: builtin/index-pack.c:845
msgid "Error in object"
msgstr "Erreur dans l'objet"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Tous les objets enfants de %s ne sont pas accessibles"
-#: builtin/index-pack.c:917 builtin/index-pack.c:948
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "échec d'application du delta"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1120
msgid "Receiving objects"
msgstr "Réception d'objets"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1120
msgid "Indexing objects"
msgstr "Indexation d'objets"
-#: builtin/index-pack.c:1150
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
-#: builtin/index-pack.c:1158
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "le paquet est invalide à la fin"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1171
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusion extrême dans parse_pack_objects()"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1196
msgid "Resolving deltas"
msgstr "Résolution des deltas"
-#: builtin/index-pack.c:1205
+#: builtin/index-pack.c:1207
#, c-format
msgid "unable to create thread: %s"
msgstr "impossible de créer le fil : %s"
-#: builtin/index-pack.c:1247
+#: builtin/index-pack.c:1249
msgid "confusion beyond insanity"
msgstr "confusion extrême"
-#: builtin/index-pack.c:1253
+#: builtin/index-pack.c:1255
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "complété avec %d objet local"
msgstr[1] "complété avec %d objets locaux"
-#: builtin/index-pack.c:1265
+#: builtin/index-pack.c:1267
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
"Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)"
-#: builtin/index-pack.c:1269
+#: builtin/index-pack.c:1271
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "le paquet a %d delta non résolu"
msgstr[1] "le paquet a %d deltas non résolus"
-#: builtin/index-pack.c:1293
+#: builtin/index-pack.c:1295
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "impossible de compresser l'objet ajouté (%d)"
-#: builtin/index-pack.c:1369
+#: builtin/index-pack.c:1371
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objet local %s est corrompu"
-#: builtin/index-pack.c:1393
+#: builtin/index-pack.c:1395
msgid "error while closing pack file"
msgstr "erreur en fermeture du fichier paquet"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1408
#, c-format
msgid "cannot write keep file '%s'"
msgstr "impossible d'écrire le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1414
+#: builtin/index-pack.c:1416
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "impossible de fermer le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1429
msgid "cannot store pack file"
msgstr "impossible de stocker le fichier paquet"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1440
msgid "cannot store index file"
msgstr "impossible de stocker le fichier d'index"
-#: builtin/index-pack.c:1471
+#: builtin/index-pack.c:1473
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mauvais pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
+#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr "pas de support des fils, ignore %s"
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
-#: builtin/index-pack.c:1542
+#: builtin/index-pack.c:1544
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'"
-#: builtin/index-pack.c:1589
+#: builtin/index-pack.c:1591
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "pas un delta : %d objet"
msgstr[1] "pas un delta : %d objets"
-#: builtin/index-pack.c:1596
+#: builtin/index-pack.c:1598
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "longueur chaînée = %d : %lu objet"
msgstr[1] "longueur chaînée = %d : %lu objets"
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1611
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"
-#: builtin/index-pack.c:1638
-msgid "Cannot come back to cwd"
-msgstr "Impossible de revenir au répertoire de travail courant"
-
-#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
-#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
+#: builtin/index-pack.c:1693 builtin/index-pack.c:1696
+#: builtin/index-pack.c:1712 builtin/index-pack.c:1716
#, c-format
msgid "bad %s"
msgstr "mauvais %s"
-#: builtin/index-pack.c:1723
+#: builtin/index-pack.c:1730
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
-#: builtin/index-pack.c:1731
+#: builtin/index-pack.c:1738
msgid "--verify with no packfile name given"
msgstr "--verify sans nom de fichier paquet donné"
@@ -7643,27 +8049,27 @@ msgstr "impossible de traiter le fichier de type %d"
msgid "unable to move %s to %s"
msgstr "impossible de déplacer %s vers %s"
-#. TRANSLATORS: The first '%s' is either "Reinitialized
-#. existing" or "Initialized empty", the second " shared" or
-#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:403
+#: builtin/init-db.c:402
#, c-format
-msgid "%s%s Git repository in %s%s\n"
-msgstr "Dépôt Git%2$s %1$s dans %3$s%4$s\n"
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "Dépôt Git existant partagé réinitialisé dans %s%s\n"
-#: builtin/init-db.c:404
-msgid "Reinitialized existing"
-msgstr "existant réinitialisé"
+#: builtin/init-db.c:403
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "Dépôt Git existant réinitialisé dans %s%s\n"
-#: builtin/init-db.c:404
-msgid "Initialized empty"
-msgstr "vide initialisé"
+#: builtin/init-db.c:407
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "Dépôt Git vide partagé initialisé dans %s%s\n"
-#: builtin/init-db.c:405
-msgid " shared"
-msgstr " partagé"
+#: builtin/init-db.c:408
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "Dépôt Git vide initialisé dans %s%s\n"
-#: builtin/init-db.c:452
+#: builtin/init-db.c:455
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7671,25 +8077,25 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--"
"shared[=<permissions>]] [<répertoire>]"
-#: builtin/init-db.c:475
+#: builtin/init-db.c:478
msgid "permissions"
msgstr "permissions"
-#: builtin/init-db.c:476
+#: builtin/init-db.c:479
msgid "specify that the git repository is to be shared amongst several users"
msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs"
-#: builtin/init-db.c:510 builtin/init-db.c:515
+#: builtin/init-db.c:513 builtin/init-db.c:518
#, c-format
msgid "cannot mkdir %s"
msgstr "impossible de créer le répertoire (mkdir) %s"
-#: builtin/init-db.c:519
+#: builtin/init-db.c:522
#, c-format
msgid "cannot chdir to %s"
msgstr "impossible de se déplacer vers le répertoire (chdir) %s"
-#: builtin/init-db.c:540
+#: builtin/init-db.c:543
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7698,7 +8104,7 @@ msgstr ""
"%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --"
"git-dir=<répertoire>)"
-#: builtin/init-db.c:568
+#: builtin/init-db.c:571
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Impossible d'accéder à l'arbre de travail '%s'"
@@ -7731,332 +8137,335 @@ msgstr "ligne(s) de fin à ajouter"
msgid "no input file given for in-place editing"
msgstr "aucun fichier en entrée pour l'éditon sur place"
-#: builtin/log.c:43
+#: builtin/log.c:44
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]"
-#: builtin/log.c:44
+#: builtin/log.c:45
msgid "git show [<options>] <object>..."
msgstr "git show [<options>] <objet>..."
-#: builtin/log.c:83
+#: builtin/log.c:84
#, c-format
msgid "invalid --decorate option: %s"
msgstr "option --decorate invalide : %s"
-#: builtin/log.c:137
+#: builtin/log.c:139
msgid "suppress diff output"
msgstr "supprimer la sortie des différences"
-#: builtin/log.c:138
+#: builtin/log.c:140
msgid "show source"
msgstr "afficher la source"
-#: builtin/log.c:139
+#: builtin/log.c:141
msgid "Use mail map file"
msgstr "Utiliser le fichier de correspondance de mail"
-#: builtin/log.c:140
+#: builtin/log.c:142
msgid "decorate options"
msgstr "décorer les options"
-#: builtin/log.c:143
+#: builtin/log.c:145
msgid "Process line range n,m in file, counting from 1"
msgstr ""
"Traiter seulement l'intervalle de lignes n,m du fichier en commençant le "
"compte à 1"
-#: builtin/log.c:239
+#: builtin/log.c:241
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortie finale : %d %s\n"
-#: builtin/log.c:471
+#: builtin/log.c:486
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s : fichier incorrect"
-#: builtin/log.c:485 builtin/log.c:578
+#: builtin/log.c:500 builtin/log.c:594
#, c-format
msgid "Could not read object %s"
msgstr "Impossible de lire l'objet %s"
-#: builtin/log.c:602
+#: builtin/log.c:618
#, c-format
msgid "Unknown type: %d"
msgstr "Type inconnu : %d"
-#: builtin/log.c:722
+#: builtin/log.c:739
msgid "format.headers without value"
msgstr "format.headers sans valeur"
-#: builtin/log.c:812
+#: builtin/log.c:839
msgid "name of output directory is too long"
msgstr "le nom du répertoire de sortie est trop long"
-#: builtin/log.c:827
+#: builtin/log.c:854
#, c-format
msgid "Cannot open patch file %s"
msgstr "Impossible d'ouvrir le fichier correctif %s"
-#: builtin/log.c:841
+#: builtin/log.c:868
msgid "Need exactly one range."
msgstr "Exactement une plage nécessaire."
-#: builtin/log.c:851
+#: builtin/log.c:878
msgid "Not a range."
msgstr "Ceci n'est pas une plage."
-#: builtin/log.c:957
+#: builtin/log.c:984
msgid "Cover letter needs email format"
msgstr "La lettre de motivation doit être au format e-mail"
-#: builtin/log.c:1036
+#: builtin/log.c:1064
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to aberrant : %s"
-#: builtin/log.c:1064
+#: builtin/log.c:1092
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
-#: builtin/log.c:1109
+#: builtin/log.c:1137
msgid "Two output directories?"
msgstr "Deux répertoires de sortie ?"
-#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
#, c-format
msgid "Unknown commit %s"
msgstr "Commit inconnu %s"
-#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
-#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
-#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
-#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
+#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
+#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
+#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Impossible de résoudre '%s' comme une référence valide."
-#: builtin/log.c:1231
+#: builtin/log.c:1259
msgid "Could not find exact merge base."
msgstr "Impossible de trouver la base de fusion exacte."
-#: builtin/log.c:1235
+#: builtin/log.c:1263
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually."
msgstr ""
-"Impossible de récupérer l'amont, si vous voulez enregistrer le commit de base automatiquement,\n"
-"veuillez utiliser git branch --set-upstream-to pour suivre une branche distante\n"
-"ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> manuellement."
+"Impossible de récupérer l'amont, si vous voulez enregistrer le commit de "
+"base automatiquement,\n"
+"veuillez utiliser git branch --set-upstream-to pour suivre une branche "
+"distante\n"
+"ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
+"manuellement."
-#: builtin/log.c:1255
+#: builtin/log.c:1283
msgid "Failed to find exact merge base"
msgstr "Impossible de trouver la base de fusion exacte"
-#: builtin/log.c:1266
+#: builtin/log.c:1294
msgid "base commit should be the ancestor of revision list"
msgstr "le commit de base devrait être l'ancêtre de la liste de révisions"
-#: builtin/log.c:1270
+#: builtin/log.c:1298
msgid "base commit shouldn't be in revision list"
msgstr "le commit de base ne devrait pas faire partie de la liste de révisions"
-#: builtin/log.c:1319
+#: builtin/log.c:1347
msgid "cannot get patch id"
msgstr "impossible d'obtenir l'id du patch"
-#: builtin/log.c:1377
+#: builtin/log.c:1404
msgid "use [PATCH n/m] even with a single patch"
msgstr "utiliser [PATCH n/m] même avec un patch unique"
-#: builtin/log.c:1380
+#: builtin/log.c:1407
msgid "use [PATCH] even with multiple patches"
msgstr "utiliser [PATCH] même avec des patchs multiples"
-#: builtin/log.c:1384
+#: builtin/log.c:1411
msgid "print patches to standard out"
msgstr "afficher les patchs sur la sortie standard"
-#: builtin/log.c:1386
+#: builtin/log.c:1413
msgid "generate a cover letter"
msgstr "générer une lettre de motivation"
-#: builtin/log.c:1388
+#: builtin/log.c:1415
msgid "use simple number sequence for output file names"
msgstr ""
"utiliser une séquence simple de nombres pour les nom des fichiers de sortie"
-#: builtin/log.c:1389
+#: builtin/log.c:1416
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1390
+#: builtin/log.c:1417
msgid "use <sfx> instead of '.patch'"
msgstr "utiliser <sfx> au lieu de '.patch'"
-#: builtin/log.c:1392
+#: builtin/log.c:1419
msgid "start numbering patches at <n> instead of 1"
msgstr "démarrer la numérotation des patchs à <n> au lieu de 1"
-#: builtin/log.c:1394
+#: builtin/log.c:1421
msgid "mark the series as Nth re-roll"
msgstr "marquer la série comme une Nième réédition"
-#: builtin/log.c:1396
+#: builtin/log.c:1423
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
-#: builtin/log.c:1399
+#: builtin/log.c:1426
msgid "store resulting files in <dir>"
msgstr "stocker les fichiers résultats dans <répertoire>"
-#: builtin/log.c:1402
+#: builtin/log.c:1429
msgid "don't strip/add [PATCH]"
msgstr "ne pas retirer/ajouter [PATCH]"
-#: builtin/log.c:1405
+#: builtin/log.c:1432
msgid "don't output binary diffs"
msgstr "ne pas imprimer les diffs binaires"
-#: builtin/log.c:1407
+#: builtin/log.c:1434
msgid "output all-zero hash in From header"
msgstr "écrire une empreinte à zéro dans l'entête From"
-#: builtin/log.c:1409
+#: builtin/log.c:1436
msgid "don't include a patch matching a commit upstream"
msgstr "ne pas inclure un patch correspondant à un commit amont"
-#: builtin/log.c:1411
+#: builtin/log.c:1438
msgid "show patch format instead of default (patch + stat)"
msgstr "afficher le format du patch au lieu du défaut (patch + stat)"
-#: builtin/log.c:1413
+#: builtin/log.c:1440
msgid "Messaging"
msgstr "Communication"
-#: builtin/log.c:1414
+#: builtin/log.c:1441
msgid "header"
msgstr "en-tête"
-#: builtin/log.c:1415
+#: builtin/log.c:1442
msgid "add email header"
msgstr "ajouter l'en-tête d'e-mail"
-#: builtin/log.c:1416 builtin/log.c:1418
+#: builtin/log.c:1443 builtin/log.c:1445
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1416
+#: builtin/log.c:1443
msgid "add To: header"
msgstr "ajouter l'en-tête \"To:\""
-#: builtin/log.c:1418
+#: builtin/log.c:1445
msgid "add Cc: header"
msgstr "ajouter l'en-tête \"Cc:\""
-#: builtin/log.c:1420
+#: builtin/log.c:1447
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1421
+#: builtin/log.c:1448
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"
-#: builtin/log.c:1423
+#: builtin/log.c:1450
msgid "message-id"
msgstr "id-message"
-#: builtin/log.c:1424
+#: builtin/log.c:1451
msgid "make first mail a reply to <message-id>"
msgstr "répondre dans le premier message à <id-message>"
-#: builtin/log.c:1425 builtin/log.c:1428
+#: builtin/log.c:1452 builtin/log.c:1455
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1426
+#: builtin/log.c:1453
msgid "attach the patch"
msgstr "attacher le patch"
-#: builtin/log.c:1429
+#: builtin/log.c:1456
msgid "inline the patch"
msgstr "patch à l'intérieur"
-#: builtin/log.c:1433
+#: builtin/log.c:1460
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
-#: builtin/log.c:1435
+#: builtin/log.c:1462
msgid "signature"
msgstr "signature"
-#: builtin/log.c:1436
+#: builtin/log.c:1463
msgid "add a signature"
msgstr "ajouter une signature"
-#: builtin/log.c:1437
+#: builtin/log.c:1464
msgid "base-commit"
msgstr "commit-de-base"
-#: builtin/log.c:1438
+#: builtin/log.c:1465
msgid "add prerequisite tree info to the patch series"
msgstr "Ajouter un arbre prérequis à la série de patchs"
-#: builtin/log.c:1440
+#: builtin/log.c:1467
msgid "add a signature from a file"
msgstr "ajouter une signature depuis un fichier"
-#: builtin/log.c:1441
+#: builtin/log.c:1468
msgid "don't print the patch filenames"
msgstr "ne pas afficher les noms de fichiers des patchs"
-#: builtin/log.c:1531
+#: builtin/log.c:1558
msgid "-n and -k are mutually exclusive."
msgstr "-n et -k sont mutuellement exclusifs."
-#: builtin/log.c:1533
+#: builtin/log.c:1560
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix et -k sont mutuellement exclusifs."
-#: builtin/log.c:1541
+#: builtin/log.c:1568
msgid "--name-only does not make sense"
msgstr "--name-only n'a pas de sens"
-#: builtin/log.c:1543
+#: builtin/log.c:1570
msgid "--name-status does not make sense"
msgstr "--name-status n'a pas de sens"
-#: builtin/log.c:1545
+#: builtin/log.c:1572
msgid "--check does not make sense"
msgstr "--check n'a pas de sens"
-#: builtin/log.c:1573
+#: builtin/log.c:1602
msgid "standard output, or directory, which one?"
msgstr "sortie standard, ou répertoire, lequel ?"
-#: builtin/log.c:1575
+#: builtin/log.c:1604
#, c-format
msgid "Could not create directory '%s'"
msgstr "Impossible de créer le répertoire '%s'"
-#: builtin/log.c:1672
+#: builtin/log.c:1698
#, c-format
msgid "unable to read signature file '%s'"
msgstr "lecture du fichier de signature '%s' impossible"
-#: builtin/log.c:1743
+#: builtin/log.c:1769
msgid "Failed to create output files"
msgstr "Échec de création des fichiers en sortie"
-#: builtin/log.c:1792
+#: builtin/log.c:1818
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
-#: builtin/log.c:1846
+#: builtin/log.c:1872
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -8064,102 +8473,102 @@ msgstr ""
"Impossible de trouver une branche distante suivie, merci de spécifier "
"<branche_amont> manuellement.\n"
-#: builtin/ls-files.c:378
+#: builtin/ls-files.c:379
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<options>] [<fichier>...]"
-#: builtin/ls-files.c:427
+#: builtin/ls-files.c:428
msgid "identify the file status with tags"
msgstr "identifier le statut de fichier avec les étiquettes"
-#: builtin/ls-files.c:429
+#: builtin/ls-files.c:430
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'"
-#: builtin/ls-files.c:431
+#: builtin/ls-files.c:432
msgid "show cached files in the output (default)"
msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"
-#: builtin/ls-files.c:433
+#: builtin/ls-files.c:434
msgid "show deleted files in the output"
msgstr "afficher les fichiers supprimés dans la sortie"
-#: builtin/ls-files.c:435
+#: builtin/ls-files.c:436
msgid "show modified files in the output"
msgstr "afficher les fichiers modifiés dans la sortie"
-#: builtin/ls-files.c:437
+#: builtin/ls-files.c:438
msgid "show other files in the output"
msgstr "afficher les autres fichiers dans la sortie"
-#: builtin/ls-files.c:439
+#: builtin/ls-files.c:440
msgid "show ignored files in the output"
msgstr "afficher les fichiers ignorés dans la sortie"
-#: builtin/ls-files.c:442
+#: builtin/ls-files.c:443
msgid "show staged contents' object name in the output"
msgstr "afficher les nom des objets indexés dans la sortie"
-#: builtin/ls-files.c:444
+#: builtin/ls-files.c:445
msgid "show files on the filesystem that need to be removed"
msgstr ""
"afficher les fichiers du système de fichiers qui ont besoin d'être supprimés"
-#: builtin/ls-files.c:446
+#: builtin/ls-files.c:447
msgid "show 'other' directories' names only"
msgstr "afficher seulement les noms des répertoires 'other'"
-#: builtin/ls-files.c:448
+#: builtin/ls-files.c:449
msgid "show line endings of files"
msgstr "afficher les fins de lignes des fichiers"
-#: builtin/ls-files.c:450
+#: builtin/ls-files.c:451
msgid "don't show empty directories"
msgstr "ne pas afficher les répertoires vides"
-#: builtin/ls-files.c:453
+#: builtin/ls-files.c:454
msgid "show unmerged files in the output"
msgstr "afficher les fichiers non fusionnés dans la sortie"
-#: builtin/ls-files.c:455
+#: builtin/ls-files.c:456
msgid "show resolve-undo information"
msgstr "afficher l'information resolv-undo"
-#: builtin/ls-files.c:457
+#: builtin/ls-files.c:458
msgid "skip files matching pattern"
msgstr "sauter les fichiers correspondant au motif"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:461
msgid "exclude patterns are read from <file>"
msgstr "les motifs d'exclusion sont lus depuis <fichier>"
-#: builtin/ls-files.c:463
+#: builtin/ls-files.c:464
msgid "read additional per-directory exclude patterns in <file>"
msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>"
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:466
msgid "add the standard git exclusions"
msgstr "ajouter les exclusions git standard"
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:469
msgid "make the output relative to the project top directory"
msgstr "afficher en relatif par rapport au répertoire racine du projet"
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:472
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur"
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:473
msgid "tree-ish"
msgstr "arbre ou apparenté"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:474
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"considérer que les chemins supprimés depuis <arbre ou apparenté> sont "
"toujours présents"
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:476
msgid "show debugging data"
msgstr "afficher les données de débogage"
@@ -8249,191 +8658,177 @@ msgstr ""
"afficher l'arbre entier ; pas seulement le répertoire courant (implique --"
"full-name)"
-#: builtin/merge.c:45
+#: builtin/merge.c:46
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<options>] [<commit>...]"
-#: builtin/merge.c:46
+#: builtin/merge.c:47
msgid "git merge [<options>] <msg> HEAD <commit>"
msgstr "git merge [<options>] <message> HEAD <commit>"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:101
+#: builtin/merge.c:102
msgid "switch `m' requires a value"
msgstr "le commutateur `m' a besoin d'une valeur"
-#: builtin/merge.c:138
+#: builtin/merge.c:139
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
-#: builtin/merge.c:139
+#: builtin/merge.c:140
#, c-format
msgid "Available strategies are:"
msgstr "Les stratégies disponibles sont :"
-#: builtin/merge.c:144
+#: builtin/merge.c:145
#, c-format
msgid "Available custom strategies are:"
msgstr "Les stratégies personnalisées sont :"
-#: builtin/merge.c:194 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:126
msgid "do not show a diffstat at the end of the merge"
msgstr "ne pas afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:129
msgid "show a diffstat at the end of the merge"
msgstr "afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:198 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:132
msgid "(synonym to --stat)"
msgstr "(synonyme de --stat)"
-#: builtin/merge.c:200 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:135
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"ajouter (au plus <n>) éléments du journal court au message de validation de "
"la fusion"
-#: builtin/merge.c:203 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:138
msgid "create a single commit instead of doing a merge"
msgstr "créer une validation unique au lieu de faire une fusion"
-#: builtin/merge.c:205 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:141
msgid "perform a commit if the merge succeeds (default)"
msgstr "effectuer une validation si la fusion réussit (défaut)"
-#: builtin/merge.c:207 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:144
msgid "edit message before committing"
msgstr "éditer le message avant la validation"
-#: builtin/merge.c:208
+#: builtin/merge.c:209
msgid "allow fast-forward (default)"
msgstr "autoriser l'avance rapide (défaut)"
-#: builtin/merge.c:210 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:150
msgid "abort if fast-forward is not possible"
msgstr "abandonner si l'avance rapide n'est pas possible"
-#: builtin/merge.c:214
-msgid "Verify that the named commit has a valid GPG signature"
-msgstr "Vérifier que la validation a une signature GPG valide"
+#: builtin/merge.c:215 builtin/pull.c:153
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "vérifier que le commit nommé a une signature GPG valide"
-#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157
#: builtin/revert.c:89
msgid "strategy"
msgstr "stratégie"
-#: builtin/merge.c:216 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:158
msgid "merge strategy to use"
msgstr "stratégie de fusion à utiliser"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:161
msgid "option=value"
msgstr "option=valeur"
-#: builtin/merge.c:218 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:162
msgid "option for selected merge strategy"
msgstr "option pour la stratégie de fusion sélectionnée"
-#: builtin/merge.c:220
+#: builtin/merge.c:221
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"message de validation de la fusion (pour une fusion sans avance rapide)"
-#: builtin/merge.c:224
+#: builtin/merge.c:225
msgid "abort the current in-progress merge"
msgstr "abandonner la fusion en cours"
-#: builtin/merge.c:226 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:169
msgid "allow merging unrelated histories"
msgstr "permettre la fusion d'historiques sans rapport"
-#: builtin/merge.c:254
+#: builtin/merge.c:255
msgid "could not run stash."
msgstr "impossible de lancer le remisage."
-#: builtin/merge.c:259
+#: builtin/merge.c:260
msgid "stash failed"
msgstr "échec du remisage"
-#: builtin/merge.c:264
+#: builtin/merge.c:265
#, c-format
msgid "not a valid object: %s"
msgstr "pas un objet valide : %s"
-#: builtin/merge.c:283 builtin/merge.c:300
+#: builtin/merge.c:284 builtin/merge.c:301
msgid "read-tree failed"
msgstr "read-tree a échoué"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
msgid " (nothing to squash)"
msgstr " (rien à compresser)"
-#: builtin/merge.c:343
+#: builtin/merge.c:342
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Validation compressée -- HEAD non mise à jour\n"
-#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
-#: builtin/merge.c:1000
-#, c-format
-msgid "Could not write to '%s'"
-msgstr "Impossible d'écrire dans '%s'"
-
-#: builtin/merge.c:375
-msgid "Writing SQUASH_MSG"
-msgstr "Écriture de SQUASH_MSG"
-
-#: builtin/merge.c:377
-msgid "Finishing SQUASH_MSG"
-msgstr "Finition de SQUASH_MSG"
-
-#: builtin/merge.c:400
+#: builtin/merge.c:392
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n"
-#: builtin/merge.c:451
+#: builtin/merge.c:443
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' ne pointe pas sur un commit"
-#: builtin/merge.c:541
+#: builtin/merge.c:533
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
-#: builtin/merge.c:660
+#: builtin/merge.c:652
msgid "Not handling anything other than two heads merge."
msgstr "Impossible de gérer autre chose que la fusion de deux têtes."
-#: builtin/merge.c:674
+#: builtin/merge.c:666
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Options inconnue pour merge-recursive : -X%s"
-#: builtin/merge.c:687
+#: builtin/merge.c:681
#, c-format
msgid "unable to write %s"
msgstr "impossible d'écrire %s"
-#: builtin/merge.c:776
+#: builtin/merge.c:733
#, c-format
msgid "Could not read from '%s'"
msgstr "Impossible de lire depuis '%s'"
-#: builtin/merge.c:785
+#: builtin/merge.c:742
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Pas de validation de la fusion ; utilisez 'git commit' pour terminer la "
"fusion.\n"
-#: builtin/merge.c:791
+#: builtin/merge.c:748
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -8450,54 +8845,68 @@ msgstr ""
"Les lignes commençant par '%c' seront ignorées, et un message vide\n"
"abandonne la validation.\n"
-#: builtin/merge.c:815
+#: builtin/merge.c:772
msgid "Empty commit message."
msgstr "Message de validation vide."
-#: builtin/merge.c:835
+#: builtin/merge.c:792
#, c-format
msgid "Wonderful.\n"
msgstr "Merveilleux.\n"
-#: builtin/merge.c:890
+#: builtin/merge.c:847
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"La fusion automatique a échoué ; réglez les conflits et validez le "
"résultat.\n"
-#: builtin/merge.c:906
+#: builtin/merge.c:863
#, c-format
msgid "'%s' is not a commit"
msgstr "'%s' n'est pas une validation"
-#: builtin/merge.c:947
+#: builtin/merge.c:904
msgid "No current branch."
msgstr "Pas de branche courante."
-#: builtin/merge.c:949
+#: builtin/merge.c:906
msgid "No remote for the current branch."
msgstr "Pas de branche distante pour la branche courante."
-#: builtin/merge.c:951
+#: builtin/merge.c:908
msgid "No default upstream defined for the current branch."
msgstr "Pas de branche amont par défaut définie pour la branche courante."
-#: builtin/merge.c:956
+#: builtin/merge.c:913
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Pas de branche de suivi pour %s depuis %s"
-#: builtin/merge.c:1091
+#: builtin/merge.c:960
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
+
+#: builtin/merge.c:1034
#, c-format
msgid "could not close '%s'"
msgstr "impossible de fermer '%s'"
-#: builtin/merge.c:1219
+#: builtin/merge.c:1061
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "pas possible de fusionner ceci dans %s : %s"
+
+#: builtin/merge.c:1095
+msgid "not something we can merge"
+msgstr "pas possible de fusionner ceci"
+
+#: builtin/merge.c:1162
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)."
-#: builtin/merge.c:1235
+#: builtin/merge.c:1178
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8505,7 +8914,7 @@ msgstr ""
"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1242
+#: builtin/merge.c:1185
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8513,106 +8922,114 @@ msgstr ""
"Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1245
+#: builtin/merge.c:1188
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)."
-#: builtin/merge.c:1254
+#: builtin/merge.c:1197
msgid "You cannot combine --squash with --no-ff."
msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
-#: builtin/merge.c:1262
+#: builtin/merge.c:1205
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini."
-#: builtin/merge.c:1279
+#: builtin/merge.c:1222
msgid "Squash commit into empty head not supported yet"
msgstr "La validation compressée vers une tête vide n'est pas encore supportée"
-#: builtin/merge.c:1281
+#: builtin/merge.c:1224
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide"
-#: builtin/merge.c:1286
+#: builtin/merge.c:1229
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - pas possible de fusionner ceci"
-#: builtin/merge.c:1288
+#: builtin/merge.c:1231
msgid "Can merge only exactly one commit into empty head"
msgstr ""
"Possible de fusionner exactement une seule validation dans une tête vide"
-#: builtin/merge.c:1344
+#: builtin/merge.c:1287
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "La validation %s a une signature GPG non fiable, prétendument par %s."
-#: builtin/merge.c:1347
+#: builtin/merge.c:1290
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "La validation %s a une mauvaise signature GPG prétendument par %s."
-#: builtin/merge.c:1350
+#: builtin/merge.c:1293
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La validation %s n'a pas de signature GPG."
-#: builtin/merge.c:1353
+#: builtin/merge.c:1296
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "La validation %s a une signature GPG correcte par %s\n"
-#: builtin/merge.c:1415
+#: builtin/merge.c:1358
msgid "refusing to merge unrelated histories"
msgstr "refus de fusionner des historiques sans relation"
-#: builtin/merge.c:1439
+#: builtin/merge.c:1367
+msgid "Already up-to-date."
+msgstr "Déjà à jour."
+
+#: builtin/merge.c:1382
#, c-format
msgid "Updating %s..%s\n"
msgstr "Mise à jour %s..%s\n"
-#: builtin/merge.c:1476
+#: builtin/merge.c:1419
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Essai de fusion vraiment triviale dans l'index...\n"
-#: builtin/merge.c:1483
+#: builtin/merge.c:1426
#, c-format
msgid "Nope.\n"
msgstr "Non.\n"
-#: builtin/merge.c:1515
+#: builtin/merge.c:1451
+msgid "Already up-to-date. Yeeah!"
+msgstr "Déjà à jour. Ouais !"
+
+#: builtin/merge.c:1457
msgid "Not possible to fast-forward, aborting."
msgstr "Pas possible d'avancer rapidement, abandon."
-#: builtin/merge.c:1538 builtin/merge.c:1617
+#: builtin/merge.c:1480 builtin/merge.c:1559
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Retour de l'arbre à l'original...\n"
-#: builtin/merge.c:1542
+#: builtin/merge.c:1484
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Essai de la stratégie de fusion %s...\n"
-#: builtin/merge.c:1608
+#: builtin/merge.c:1550
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n"
-#: builtin/merge.c:1610
+#: builtin/merge.c:1552
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "La fusion avec la stratégie %s a échoué.\n"
-#: builtin/merge.c:1619
+#: builtin/merge.c:1561
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Utilisation de %s pour préparer la résolution à la main.\n"
-#: builtin/merge.c:1631
+#: builtin/merge.c:1573
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -8742,68 +9159,68 @@ msgstr "forcer le déplacement/renommage même si la cible existe"
msgid "skip move/rename errors"
msgstr "sauter les erreurs de déplacement/renommage"
-#: builtin/mv.c:152
+#: builtin/mv.c:155
#, c-format
msgid "destination '%s' is not a directory"
msgstr "la destination '%s' n'est pas un répertoire"
-#: builtin/mv.c:163
+#: builtin/mv.c:166
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Vérification du renommage de '%s' en '%s'\n"
-#: builtin/mv.c:167
+#: builtin/mv.c:170
msgid "bad source"
msgstr "mauvaise source"
-#: builtin/mv.c:170
+#: builtin/mv.c:173
msgid "can not move directory into itself"
msgstr "impossible de déplacer un répertoire dans lui-même"
-#: builtin/mv.c:173
+#: builtin/mv.c:176
msgid "cannot move directory over file"
msgstr "impossible de déplacer un répertoire sur un fichier"
-#: builtin/mv.c:182
+#: builtin/mv.c:185
msgid "source directory is empty"
msgstr "le répertoire source est vide"
-#: builtin/mv.c:207
+#: builtin/mv.c:210
msgid "not under version control"
msgstr "pas sous le contrôle de version"
-#: builtin/mv.c:210
+#: builtin/mv.c:213
msgid "destination exists"
msgstr "la destination existe"
-#: builtin/mv.c:218
+#: builtin/mv.c:221
#, c-format
msgid "overwriting '%s'"
msgstr "écrasement de '%s'"
-#: builtin/mv.c:221
+#: builtin/mv.c:224
msgid "Cannot overwrite"
msgstr "Impossible d'écraser"
-#: builtin/mv.c:224
+#: builtin/mv.c:227
msgid "multiple sources for the same target"
msgstr "multiples sources pour la même destination"
-#: builtin/mv.c:226
+#: builtin/mv.c:229
msgid "destination directory does not exist"
msgstr "le répertoire de destination n'existe pas"
-#: builtin/mv.c:233
+#: builtin/mv.c:236
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, source=%s, destination=%s"
-#: builtin/mv.c:254
+#: builtin/mv.c:257
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Renommage de %s en %s\n"
-#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
#, c-format
msgid "renaming '%s' failed"
msgstr "le renommage de '%s' a échoué"
@@ -8961,6 +9378,10 @@ msgstr "git notes prune [<options>]"
msgid "git notes get-ref"
msgstr "git notes get-ref"
+#: builtin/notes.c:94
+msgid "Write/edit the notes for the following object:"
+msgstr "Écrire/éditer les notes pour l'objet suivant :"
+
#: builtin/notes.c:147
#, c-format
msgid "unable to start 'show' for object '%s'"
@@ -8975,80 +9396,75 @@ msgstr "impossible de lire la sortie de 'show'"
msgid "failed to finish 'show' for object '%s'"
msgstr "impossible de finir 'show' pour l'objet '%s'"
-#: builtin/notes.c:174 builtin/tag.c:248
-#, c-format
-msgid "could not create file '%s'"
-msgstr "impossible de créer le fichier '%s'"
-
-#: builtin/notes.c:193
+#: builtin/notes.c:194
msgid "Please supply the note contents using either -m or -F option"
msgstr "Veuillez fournir le contenu de la note en utilisant l'option -m ou -F"
-#: builtin/notes.c:202
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "impossible d'écrire l'objet note"
-#: builtin/notes.c:204
+#: builtin/notes.c:205
#, c-format
msgid "The note contents have been left in %s"
msgstr "Le contenu de la note a été laissé dans %s"
-#: builtin/notes.c:232 builtin/tag.c:439
+#: builtin/notes.c:233 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr "impossible de lire '%s'"
-#: builtin/notes.c:234 builtin/tag.c:442
+#: builtin/notes.c:235 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr "impossible d'ouvrir ou lire '%s'"
-#: builtin/notes.c:256
+#: builtin/notes.c:257
#, c-format
msgid "Failed to read object '%s'."
msgstr "Impossible de lire l'objet '%s'."
-#: builtin/notes.c:260
+#: builtin/notes.c:261
#, c-format
msgid "Cannot read note data from non-blob object '%s'."
msgstr "Impossible de lire les informations de note d'un objet non-blob '%s'."
-#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
-#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:946
+#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
+#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
+#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
msgid "too many parameters"
msgstr "trop de paramètres"
-#: builtin/notes.c:375 builtin/notes.c:662
+#: builtin/notes.c:376 builtin/notes.c:663
#, c-format
msgid "No note found for object %s."
msgstr "Pas de note trouvée pour l'objet %s."
-#: builtin/notes.c:396 builtin/notes.c:559
+#: builtin/notes.c:397 builtin/notes.c:560
msgid "note contents as a string"
msgstr "contenu de la note sous forme de chaîne"
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:400 builtin/notes.c:563
msgid "note contents in a file"
msgstr "contenu de la note dans un fichier"
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "reuse and edit specified note object"
msgstr "réutiliser et éditer l'objet de note spécifié"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "reuse specified note object"
msgstr "réutiliser l'objet de note spécifié"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "allow storing empty note"
msgstr "permettre de stocker une note vide"
-#: builtin/notes.c:409 builtin/notes.c:480
+#: builtin/notes.c:410 builtin/notes.c:481
msgid "replace existing notes"
msgstr "remplacer les notes existantes"
-#: builtin/notes.c:434
+#: builtin/notes.c:435
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -9057,30 +9473,30 @@ msgstr ""
"Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. "
"Utilisez '-f' pour écraser les notes existantes"
-#: builtin/notes.c:449 builtin/notes.c:528
+#: builtin/notes.c:450 builtin/notes.c:529
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Écrasement des notes existantes pour l'objet %s\n"
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
+#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
#, c-format
msgid "Removing note for object %s\n"
msgstr "Suppression de la note pour l'objet %s\n"
-#: builtin/notes.c:481
+#: builtin/notes.c:482
msgid "read objects from stdin"
msgstr "lire les objets depuis l'entrée standard"
-#: builtin/notes.c:483
+#: builtin/notes.c:484
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"charger la configuration de réécriture pour <commande> (implique --stdin)"
-#: builtin/notes.c:501
+#: builtin/notes.c:502
msgid "too few parameters"
msgstr "pas assez de paramètres"
-#: builtin/notes.c:522
+#: builtin/notes.c:523
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -9089,12 +9505,12 @@ msgstr ""
"Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. "
"Utilisez '-f' pour écraser les notes existantes"
-#: builtin/notes.c:534
+#: builtin/notes.c:535
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr "Notes manquantes sur l'objet source %s. Impossible de copier."
-#: builtin/notes.c:586
+#: builtin/notes.c:587
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -9103,15 +9519,20 @@ msgstr ""
"Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n"
"Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n"
-#: builtin/notes.c:768
+#: builtin/notes.c:753
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "stratégie de fusion de notes inconnue %s"
+
+#: builtin/notes.c:769
msgid "General options"
msgstr "Options générales"
-#: builtin/notes.c:770
+#: builtin/notes.c:771
msgid "Merge options"
msgstr "Options de fusion"
-#: builtin/notes.c:772
+#: builtin/notes.c:773
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -9119,50 +9540,88 @@ msgstr ""
"résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:774
+#: builtin/notes.c:775
msgid "Committing unmerged notes"
msgstr "Validation des notes non fusionnées"
-#: builtin/notes.c:776
+#: builtin/notes.c:777
msgid "finalize notes merge by committing unmerged notes"
msgstr "finaliser la fusion de notes en validant les notes non fusionnées"
-#: builtin/notes.c:778
+#: builtin/notes.c:779
msgid "Aborting notes merge resolution"
msgstr "Abandon de la résolution de fusion des notes"
-#: builtin/notes.c:780
+#: builtin/notes.c:781
msgid "abort notes merge"
msgstr "abandonner la fusion de notes"
-#: builtin/notes.c:857
+#: builtin/notes.c:792
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "--commit, --abort et -s/--strategy sont mutuellement incompatibles"
+
+#: builtin/notes.c:797
+msgid "Must specify a notes ref to merge"
+msgstr "Vous devez spécifier une référence de notes à fusionner"
+
+#: builtin/notes.c:821
+#, c-format
+msgid "Unknown -s/--strategy: %s"
+msgstr "-s/--strategy inconnu : %s"
+
+#: builtin/notes.c:858
#, c-format
msgid "A notes merge into %s is already in-progress at %s"
msgstr "Une fusion de notes dans %s est déjà en cours avec %s"
-#: builtin/notes.c:884
+#: builtin/notes.c:861
+#, c-format
+msgid "Failed to store link to current notes ref (%s)"
+msgstr ""
+"Impossible de stocker le lien vers la référence actuelle aux notes (%s)"
+
+#: builtin/notes.c:863
+#, c-format
+msgid ""
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
+msgstr ""
+"La fusion automatique des notes a échoué. Corrigez les conflits dans %s et "
+"valide le résultat avec 'git notes merges --commit', ou abandonnez la fusion "
+"avec 'git notes merge --abort'.\n"
+
+#: builtin/notes.c:885
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objet %s n'a pas de note\n"
-#: builtin/notes.c:896
+#: builtin/notes.c:897
msgid "attempt to remove non-existent note is not an error"
msgstr ""
"la tentative de suppression d'une note non existante n'est pas une erreur"
-#: builtin/notes.c:899
+#: builtin/notes.c:900
msgid "read object names from the standard input"
msgstr "lire les noms d'objet depuis l'entrée standard"
-#: builtin/notes.c:980
+#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+msgid "do not remove, show only"
+msgstr "ne pas supprimer, afficher seulement"
+
+#: builtin/notes.c:939
+msgid "report pruned notes"
+msgstr "afficher les notes éliminées"
+
+#: builtin/notes.c:981
msgid "notes-ref"
msgstr "références-notes"
-#: builtin/notes.c:981
+#: builtin/notes.c:982
msgid "use notes from <notes-ref>"
msgstr "utiliser les notes depuis <références-notes>"
-#: builtin/notes.c:1016 builtin/remote.c:1628
+#: builtin/notes.c:1017 builtin/remote.c:1623
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Sous-commande inconnue : %s"
@@ -9181,184 +9640,190 @@ msgstr ""
"git pack-objects [options...] base-name [< <liste-références> | < <liste-"
"objets>]"
-#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
+#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
#, c-format
msgid "deflate error (%d)"
msgstr "erreur de compression (%d)"
-#: builtin/pack-objects.c:763
+#: builtin/pack-objects.c:766
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
-msgstr "désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à cause de pack.packSizeLimit"
+msgstr ""
+"désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à "
+"cause de pack.packSizeLimit"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:779
msgid "Writing objects"
msgstr "Écriture des objets"
-#: builtin/pack-objects.c:1017
+#: builtin/pack-objects.c:1037
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"désactivation de l'écriture en bitmap car certains objets ne sont pas "
"compressés"
-#: builtin/pack-objects.c:2177
+#: builtin/pack-objects.c:2197
msgid "Compressing objects"
msgstr "Compression des objets"
-#: builtin/pack-objects.c:2563
+#: builtin/pack-objects.c:2611
#, c-format
msgid "unsupported index version %s"
msgstr "version d'index non supportée %s"
-#: builtin/pack-objects.c:2567
+#: builtin/pack-objects.c:2615
#, c-format
msgid "bad index version '%s'"
msgstr "mauvaise version d'index '%s'"
-#: builtin/pack-objects.c:2597
+#: builtin/pack-objects.c:2645
msgid "do not show progress meter"
msgstr "ne pas afficher la barre de progression"
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2647
msgid "show progress meter"
msgstr "afficher la barre de progression"
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2649
msgid "show progress meter during object writing phase"
msgstr "afficher la barre de progression durant la phase d'écrite des objets"
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2652
msgid "similar to --all-progress when progress meter is shown"
msgstr "similaire à --all-progress quand la barre de progression est affichée"
-#: builtin/pack-objects.c:2605
+#: builtin/pack-objects.c:2653
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2654
msgid "write the pack index file in the specified idx format version"
msgstr ""
"écrire le fichier d'index du paquet dans le format d'index de version "
"spécifié"
-#: builtin/pack-objects.c:2609
+#: builtin/pack-objects.c:2657
msgid "maximum size of each output pack file"
msgstr "taille maximum de chaque fichier paquet en sortie"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2659
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorer les objets empruntés à un autre magasin d'objets"
-#: builtin/pack-objects.c:2613
+#: builtin/pack-objects.c:2661
msgid "ignore packed objects"
msgstr "ignorer les objets empaquetés"
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2663
msgid "limit pack window by objects"
msgstr "limiter la fenêtre d'empaquetage par objets"
-#: builtin/pack-objects.c:2617
+#: builtin/pack-objects.c:2665
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets"
-#: builtin/pack-objects.c:2619
+#: builtin/pack-objects.c:2667
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"longueur maximum de la chaîne de delta autorisée dans le paquet résultant"
-#: builtin/pack-objects.c:2621
+#: builtin/pack-objects.c:2669
msgid "reuse existing deltas"
msgstr "réutiliser les deltas existants"
-#: builtin/pack-objects.c:2623
+#: builtin/pack-objects.c:2671
msgid "reuse existing objects"
msgstr "réutiliser les objets existants"
-#: builtin/pack-objects.c:2625
+#: builtin/pack-objects.c:2673
msgid "use OFS_DELTA objects"
msgstr "utiliser les objets OFS_DELTA"
-#: builtin/pack-objects.c:2627
+#: builtin/pack-objects.c:2675
msgid "use threads when searching for best delta matches"
msgstr ""
"utiliser des fils lors de la recherche pour une meilleurs correspondance des "
"deltas"
-#: builtin/pack-objects.c:2629
+#: builtin/pack-objects.c:2677
msgid "do not create an empty pack output"
msgstr "ne pas créer un paquet vide"
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2679
msgid "read revision arguments from standard input"
msgstr "lire les paramètres de révision depuis l'entrée standard"
-#: builtin/pack-objects.c:2633
+#: builtin/pack-objects.c:2681
msgid "limit the objects to those that are not yet packed"
msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés"
-#: builtin/pack-objects.c:2636
+#: builtin/pack-objects.c:2684
msgid "include objects reachable from any reference"
msgstr "inclure les objets accessibles depuis toute référence"
-#: builtin/pack-objects.c:2639
+#: builtin/pack-objects.c:2687
msgid "include objects referred by reflog entries"
msgstr "inclure les objets référencés par les éléments de reflog"
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2690
msgid "include objects referred to by the index"
msgstr "inclure les objets référencés par l'index"
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2693
msgid "output pack to stdout"
msgstr "afficher l'empaquetage sur la sortie standard"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2695
msgid "include tag objects that refer to objects to be packed"
msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2697
msgid "keep unreachable objects"
msgstr "garder les objets inaccessibles"
-#: builtin/pack-objects.c:2650 parse-options.h:142
+#: builtin/pack-objects.c:2699
+msgid "pack loose unreachable objects"
+msgstr "empaqueter les objets inaccessibles détachés"
+
+#: builtin/pack-objects.c:2700 parse-options.h:142
msgid "time"
msgstr "heure"
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2701
msgid "unpack unreachable objects newer than <time>"
msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2704
msgid "create thin packs"
msgstr "créer des paquets légers"
-#: builtin/pack-objects.c:2656
+#: builtin/pack-objects.c:2706
msgid "create packs suitable for shallow fetches"
msgstr "créer des paquets permettant des récupérations superficielles"
-#: builtin/pack-objects.c:2658
+#: builtin/pack-objects.c:2708
msgid "ignore packs that have companion .keep file"
msgstr "ignorer les paquets qui ont un fichier .keep"
-#: builtin/pack-objects.c:2660
+#: builtin/pack-objects.c:2710
msgid "pack compression level"
msgstr "niveau de compression du paquet"
-#: builtin/pack-objects.c:2662
+#: builtin/pack-objects.c:2712
msgid "do not hide commits by grafts"
msgstr "ne pas cacher les validations par greffes"
-#: builtin/pack-objects.c:2664
+#: builtin/pack-objects.c:2714
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"utiliser un index en bitmap si disponible pour accélerer le décompte des "
"objets"
-#: builtin/pack-objects.c:2666
+#: builtin/pack-objects.c:2716
msgid "write a bitmap index together with the pack index"
msgstr "écrire un index en bitmap associé à l'index de paquet"
-#: builtin/pack-objects.c:2757
+#: builtin/pack-objects.c:2829
msgid "Counting objects"
msgstr "Décompte des objets"
@@ -9386,15 +9851,11 @@ msgstr "Suppression des objets dupliqués"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <heure>] [--] [<head>...]"
-#: builtin/prune.c:105 builtin/worktree.c:125
-msgid "do not remove, show only"
-msgstr "ne pas supprimer, afficher seulement"
-
-#: builtin/prune.c:106 builtin/worktree.c:126
+#: builtin/prune.c:106 builtin/worktree.c:128
msgid "report pruned objects"
msgstr "afficher les objets éliminés"
-#: builtin/prune.c:109 builtin/worktree.c:128
+#: builtin/prune.c:109 builtin/worktree.c:130
msgid "expire objects older than <time>"
msgstr "faire expirer les objets plus vieux que <heure>"
@@ -9414,14 +9875,10 @@ msgstr "Options relatives à la fusion"
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"
-#: builtin/pull.c:147 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "autoriser l'avance rapide"
-#: builtin/pull.c:153
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "vérifier que le commit nommé a une signature GPG valide"
-
#: builtin/pull.c:156
msgid "automatically stash/stash pop before and after rebase"
msgstr "remiser avant et réappliquer après le rebasage automatiquement"
@@ -9439,16 +9896,16 @@ msgstr "nombre de sous-modules tirés en parallèle"
msgid "Invalid value for pull.ff: %s"
msgstr "Valeur invalide pour pull.ff : %s"
-#: builtin/pull.c:379
+#: builtin/pull.c:379 git-sh-setup.sh:226
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
"impossible de tirer avec rebasage. Vous avez des modifications non indexées."
-#: builtin/pull.c:385
+#: builtin/pull.c:385 git-sh-setup.sh:252
msgid "Additionally, your index contains uncommitted changes."
msgstr "De plus, votre index contient des modifications non validées."
-#: builtin/pull.c:387
+#: builtin/pull.c:387 git-sh-setup.sh:245
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
"impossible de tirer avec rebasage : votre index contient des modifications "
@@ -9510,7 +9967,7 @@ msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
msgid "<remote>"
msgstr "<distant>"
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branche>"
@@ -9522,7 +9979,9 @@ msgstr "Pas d'information de suivi distant pour la branche actuelle."
#: builtin/pull.c:498 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
-msgstr "Si vous souhaitez indiquer l'information de suivi distant pour cette branche, vous pouvez le faire avec :"
+msgstr ""
+"Si vous souhaitez indiquer l'information de suivi distant pour cette "
+"branche, vous pouvez le faire avec :"
#: builtin/pull.c:503
#, c-format
@@ -9534,17 +9993,21 @@ msgstr ""
"'%s'\n"
"du serveur distant, mais cette référence n'a pas été récupérée."
-#: builtin/pull.c:864
+#: builtin/pull.c:820
+msgid "ignoring --verify-signatures for rebase"
+msgstr "--verify-signatures est ignoré pour un rebasage"
+
+#: builtin/pull.c:867
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase."
-#: builtin/pull.c:872
+#: builtin/pull.c:875
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Mise à jour d'une branche non encore créée avec les changements ajoutés dans "
"l'index."
-#: builtin/pull.c:900
+#: builtin/pull.c:903
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -9555,7 +10018,7 @@ msgstr ""
"avance rapide de votre copie de travail\n"
"depuis le commit %s."
-#: builtin/pull.c:905
+#: builtin/pull.c:908
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -9573,11 +10036,11 @@ msgstr ""
"$ git reset --hard\n"
"pour régénérer."
-#: builtin/pull.c:920
+#: builtin/pull.c:923
msgid "Cannot merge multiple branches into empty head."
msgstr "Impossible de fusionner de multiples branches sur une tête vide."
-#: builtin/pull.c:924
+#: builtin/pull.c:927
msgid "Cannot rebase onto multiple branches."
msgstr "Impossible de rebaser sur de multiples branches."
@@ -9756,12 +10219,12 @@ msgstr "Poussée vers %s\n"
msgid "failed to push some refs to '%s'"
msgstr "impossible de pousser des références vers '%s'"
-#: builtin/push.c:365
+#: builtin/push.c:366
#, c-format
msgid "bad repository '%s'"
msgstr "mauvais dépôt '%s'"
-#: builtin/push.c:366
+#: builtin/push.c:367
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -9783,104 +10246,118 @@ msgstr ""
"\n"
" git push <nom>\n"
-#: builtin/push.c:381
+#: builtin/push.c:385
msgid "--all and --tags are incompatible"
msgstr "--all et --tags sont incompatibles"
-#: builtin/push.c:382
+#: builtin/push.c:386
msgid "--all can't be combined with refspecs"
msgstr "--all ne peut pas être combiné avec des spécifications de référence"
-#: builtin/push.c:387
+#: builtin/push.c:391
msgid "--mirror and --tags are incompatible"
msgstr "--mirror et --tags sont incompatibles"
-#: builtin/push.c:388
+#: builtin/push.c:392
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror ne peut pas être combiné avec des spécifications de référence"
-#: builtin/push.c:393
+#: builtin/push.c:397
msgid "--all and --mirror are incompatible"
msgstr "--all et --mirror sont incompatibles"
-#: builtin/push.c:505
+#: builtin/push.c:515
msgid "repository"
msgstr "dépôt"
-#: builtin/push.c:506 builtin/send-pack.c:161
+#: builtin/push.c:516 builtin/send-pack.c:161
msgid "push all refs"
msgstr "pousser toutes les références"
-#: builtin/push.c:507 builtin/send-pack.c:163
+#: builtin/push.c:517 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "refléter toutes les références"
-#: builtin/push.c:509
+#: builtin/push.c:519
msgid "delete refs"
msgstr "supprimer les références"
-#: builtin/push.c:510
+#: builtin/push.c:520
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
"pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)"
-#: builtin/push.c:513 builtin/send-pack.c:164
+#: builtin/push.c:523 builtin/send-pack.c:164
msgid "force updates"
msgstr "forcer les mises à jour"
-#: builtin/push.c:515 builtin/send-pack.c:175
+#: builtin/push.c:525 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "nom de référence>:<attendu"
-#: builtin/push.c:516 builtin/send-pack.c:176
+#: builtin/push.c:526 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur"
-#: builtin/push.c:519
+#: builtin/push.c:529
msgid "control recursive pushing of submodules"
msgstr "contrôler la poussée récursive des sous-modules"
-#: builtin/push.c:521 builtin/send-pack.c:169
+#: builtin/push.c:531 builtin/send-pack.c:169
msgid "use thin pack"
msgstr "utiliser un empaquetage léger"
-#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
+#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "recevoir le programme d'empaquetage"
-#: builtin/push.c:524
+#: builtin/push.c:534
msgid "set upstream for git pull/status"
msgstr "définir la branche amont pour git pull/status"
-#: builtin/push.c:527
+#: builtin/push.c:537
msgid "prune locally removed refs"
msgstr "éliminer les références locales supprimées"
-#: builtin/push.c:529
+#: builtin/push.c:539
msgid "bypass pre-push hook"
msgstr "éviter d'utiliser le crochet pre-push"
-#: builtin/push.c:530
+#: builtin/push.c:540
msgid "push missing but relevant tags"
msgstr "pousser les étiquettes manquantes mais pertinentes"
-#: builtin/push.c:533 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "signer la poussée avec GPG"
-#: builtin/push.c:535 builtin/send-pack.c:170
+#: builtin/push.c:545 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "demande une transaction atomique sur le serveur distant"
-#: builtin/push.c:549
+#: builtin/push.c:546
+msgid "server-specific"
+msgstr "spécifique au serveur"
+
+#: builtin/push.c:546
+msgid "option to transmit"
+msgstr "option à transmettre"
+
+#: builtin/push.c:560
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete est incompatible avec --all, --mirror et --tags"
-#: builtin/push.c:551
+#: builtin/push.c:562
msgid "--delete doesn't make sense without any refs"
msgstr "--delete n'a pas de sens sans aucune référence"
+#: builtin/push.c:579
+msgid "push options must not have new line characters"
+msgstr ""
+"les options de poussée ne peuvent pas contenir de caractères de nouvelle "
+"ligne"
+
#: builtin/read-tree.c:37
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
@@ -9960,11 +10437,11 @@ msgstr "déboguer unpack-trees"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <répertoire-git>"
-#: builtin/receive-pack.c:1719
+#: builtin/receive-pack.c:1843
msgid "quiet"
msgstr "quiet"
-#: builtin/receive-pack.c:1733
+#: builtin/receive-pack.c:1857
msgid "You must specify a directory."
msgstr "Vous devez spécifier un répertoire."
@@ -10119,12 +10596,12 @@ msgstr ""
"spécifier les branches à suivre n'a de sens qu'avec des miroirs de "
"rapatriement"
-#: builtin/remote.c:190 builtin/remote.c:633
+#: builtin/remote.c:190 builtin/remote.c:629
#, c-format
msgid "remote %s already exists."
msgstr "la distante %s existe déjà."
-#: builtin/remote.c:194 builtin/remote.c:637
+#: builtin/remote.c:194 builtin/remote.c:633
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' n'est pas un nom valide de distante"
@@ -10149,17 +10626,17 @@ msgstr "(correspond)"
msgid "(delete)"
msgstr "(supprimer)"
-#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
#, c-format
msgid "No such remote: %s"
msgstr "Distante inconnue : %s"
-#: builtin/remote.c:643
+#: builtin/remote.c:639
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Impossible de renommer la section de configuration '%s' en '%s'"
-#: builtin/remote.c:663
+#: builtin/remote.c:659
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -10170,17 +10647,17 @@ msgstr ""
"\t%s\n"
"\tVeuillez mettre à jour la configuration manuellement si nécessaire."
-#: builtin/remote.c:699
+#: builtin/remote.c:695
#, c-format
msgid "deleting '%s' failed"
msgstr "échec de suppression de '%s'"
-#: builtin/remote.c:733
+#: builtin/remote.c:729
#, c-format
msgid "creating '%s' failed"
msgstr "échec de création de '%s'"
-#: builtin/remote.c:796
+#: builtin/remote.c:792
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -10195,127 +10672,137 @@ msgstr[1] ""
"supprimées ;\n"
"pour les supprimer, utilisez :"
-#: builtin/remote.c:810
+#: builtin/remote.c:806
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Impossible de supprimer la section de configuration '%s'"
-#: builtin/remote.c:911
+#: builtin/remote.c:907
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)"
-#: builtin/remote.c:914
+#: builtin/remote.c:910
msgid " tracked"
msgstr " suivi"
-#: builtin/remote.c:916
+#: builtin/remote.c:912
msgid " stale (use 'git remote prune' to remove)"
msgstr " dépassé (utilisez 'git remote prune' pour supprimer)"
-#: builtin/remote.c:918
+#: builtin/remote.c:914
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:959
+#: builtin/remote.c:955
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "branch.%s.merge invalide ; ne peut pas rebaser sur plus d'une branche"
-#: builtin/remote.c:967
+#: builtin/remote.c:963
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "rebase de manière interactive sur la distante %s"
-#: builtin/remote.c:971
+#: builtin/remote.c:964
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "rebase sur la distante %s"
+
+#: builtin/remote.c:967
#, c-format
msgid " merges with remote %s"
msgstr " fusionne avec la distante %s"
-#: builtin/remote.c:972
-msgid " and with remote"
-msgstr " et avec la distante"
-
-#: builtin/remote.c:974
+#: builtin/remote.c:970
#, c-format
msgid "merges with remote %s"
msgstr "fusionne avec la distante %s"
-#: builtin/remote.c:975
-msgid " and with remote"
-msgstr " et avec la distante"
+#: builtin/remote.c:973
+#, c-format
+msgid "%-*s and with remote %s\n"
+msgstr "%-*s et avec la distante %s\n"
-#: builtin/remote.c:1021
+#: builtin/remote.c:1016
msgid "create"
msgstr "créer"
-#: builtin/remote.c:1024
+#: builtin/remote.c:1019
msgid "delete"
msgstr "supprimer"
-#: builtin/remote.c:1028
+#: builtin/remote.c:1023
msgid "up to date"
msgstr "à jour"
-#: builtin/remote.c:1031
+#: builtin/remote.c:1026
msgid "fast-forwardable"
msgstr "peut être mis à jour en avance rapide"
-#: builtin/remote.c:1034
+#: builtin/remote.c:1029
msgid "local out of date"
msgstr "le local n'est pas à jour"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1036
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s force vers %-*s (%s)"
-#: builtin/remote.c:1044
+#: builtin/remote.c:1039
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s pousse vers %-*s (%s)"
-#: builtin/remote.c:1048
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s force vers %s"
-#: builtin/remote.c:1051
+#: builtin/remote.c:1046
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s pousse vers %s"
-#: builtin/remote.c:1119
+#: builtin/remote.c:1114
msgid "do not query remotes"
msgstr "ne pas interroger les distantes"
-#: builtin/remote.c:1146
+#: builtin/remote.c:1141
#, c-format
msgid "* remote %s"
msgstr "* distante %s"
-#: builtin/remote.c:1147
+#: builtin/remote.c:1142
#, c-format
msgid " Fetch URL: %s"
msgstr " URL de rapatriement : %s"
-#: builtin/remote.c:1148 builtin/remote.c:1301
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
msgid "(no URL)"
msgstr "(pas d'URL)"
#. TRANSLATORS: the colon ':' should align with
#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1159 builtin/remote.c:1161
+#: builtin/remote.c:1154 builtin/remote.c:1156
#, c-format
msgid " Push URL: %s"
msgstr " URL push : %s"
-#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
+#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
#, c-format
msgid " HEAD branch: %s"
msgstr " Branche HEAD : %s"
-#: builtin/remote.c:1169
+#: builtin/remote.c:1158
+msgid "(not queried)"
+msgstr "(non demandé)"
+
+#: builtin/remote.c:1160
+msgid "(unknown)"
+msgstr "(inconnu)"
+
+#: builtin/remote.c:1164
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -10323,158 +10810,158 @@ msgstr ""
" Branche HEAD (la HEAD distante est ambiguë, peut être l'une des "
"suivantes) :\n"
-#: builtin/remote.c:1181
+#: builtin/remote.c:1176
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branche distante :%s"
msgstr[1] " Branches distantes :%s"
-#: builtin/remote.c:1184 builtin/remote.c:1211
+#: builtin/remote.c:1179 builtin/remote.c:1206
msgid " (status not queried)"
msgstr " (statut non demandé)"
-#: builtin/remote.c:1193
+#: builtin/remote.c:1188
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Branche locale configurée pour 'git pull' :"
msgstr[1] " Branches locales configurées pour 'git pull' :"
-#: builtin/remote.c:1201
+#: builtin/remote.c:1196
msgid " Local refs will be mirrored by 'git push'"
msgstr " Les références locales seront reflétées par 'git push'"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1203
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Référence locale configurée pour 'git push'%s :"
msgstr[1] " Références locales configurées pour 'git push'%s :"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1224
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1226
msgid "delete refs/remotes/<name>/HEAD"
msgstr "supprimer refs/remotes/<nom>/HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1241
msgid "Cannot determine remote HEAD"
msgstr "Impossible de déterminer la HEAD distante"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1243
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Il y a de multiples branches HEAD distantes. Veuillez en choisir une "
"explicitement avec :"
-#: builtin/remote.c:1258
+#: builtin/remote.c:1253
#, c-format
msgid "Could not delete %s"
msgstr "Impossible de supprimer %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1261
#, c-format
msgid "Not a valid ref: %s"
msgstr "Référence non valide : %s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1263
#, c-format
msgid "Could not setup %s"
msgstr "Impossible de paramétrer %s"
-#: builtin/remote.c:1286
+#: builtin/remote.c:1281
#, c-format
msgid " %s will become dangling!"
msgstr " %s se retrouvera en suspens !"
-#: builtin/remote.c:1287
+#: builtin/remote.c:1282
#, c-format
msgid " %s has become dangling!"
msgstr " %s se retrouve en suspens !"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1292
#, c-format
msgid "Pruning %s"
msgstr "Élimination de %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1293
#, c-format
msgid "URL: %s"
msgstr "URL : %s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1309
#, c-format
msgid " * [would prune] %s"
msgstr " * [serait éliminé] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1312
#, c-format
msgid " * [pruned] %s"
msgstr " * [éliminé] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1357
msgid "prune remotes after fetching"
msgstr "éliminer les distants après le rapatriement"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
#, c-format
msgid "No such remote '%s'"
msgstr "Pas de serveur remote '%s'"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1436
msgid "add branch"
msgstr "ajouter une branche"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1443
msgid "no remote specified"
msgstr "pas de serveur distant spécifié"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1460
msgid "query push URLs rather than fetch URLs"
msgstr "interroger les URLs de poussée plutôt que les URLs de récupération"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1462
msgid "return all URLs"
msgstr "retourner toutes les URLs"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1490
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "aucune URL configurée pour le dépôt distant '%s'"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1516
msgid "manipulate push URLs"
msgstr "manipuler les URLs push"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1518
msgid "add URL"
msgstr "ajouter une URL"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1520
msgid "delete URLs"
msgstr "supprimer des URLs"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1527
msgid "--add --delete doesn't make sense"
msgstr "--add --delete n'a aucun sens"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1568
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Motif d'URL ancien invalide : %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1576
#, c-format
msgid "No such URL found: %s"
msgstr "Pas d'URL trouvée : %s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1578
msgid "Will not delete all non-push URLs"
msgstr "Pas de suppression de toutes les URLs non-push"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1592
msgid "be verbose; must be placed before a subcommand"
msgstr "être verbeux : doit être placé avant une sous-commande"
@@ -10482,79 +10969,87 @@ msgstr "être verbeux : doit être placé avant une sous-commande"
msgid "git repack [<options>]"
msgstr "git repack [<options>]"
-#: builtin/repack.c:159
+#: builtin/repack.c:160
msgid "pack everything in a single pack"
msgstr "empaqueter tout dans un seul paquet"
-#: builtin/repack.c:161
+#: builtin/repack.c:162
msgid "same as -a, and turn unreachable objects loose"
msgstr "identique à -a et transformer les objets inaccessibles en suspens"
-#: builtin/repack.c:164
+#: builtin/repack.c:165
msgid "remove redundant packs, and run git-prune-packed"
msgstr "supprimer les paquets redondants et lancer git-prune-packed"
-#: builtin/repack.c:166
+#: builtin/repack.c:167
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "passer --no-reuse-delta à git-pack-objects"
-#: builtin/repack.c:168
+#: builtin/repack.c:169
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "passer --no-reuse-object à git-pack-objects"
-#: builtin/repack.c:170
+#: builtin/repack.c:171
msgid "do not run git-update-server-info"
msgstr "ne pas lancer git update-server-info"
-#: builtin/repack.c:173
+#: builtin/repack.c:174
msgid "pass --local to git-pack-objects"
msgstr "passer --local à git-pack-objects"
-#: builtin/repack.c:175
+#: builtin/repack.c:176
msgid "write bitmap index"
msgstr "écrire un index en bitmap"
-#: builtin/repack.c:176
+#: builtin/repack.c:177
msgid "approxidate"
msgstr "date approximative"
-#: builtin/repack.c:177
+#: builtin/repack.c:178
msgid "with -A, do not loosen objects older than this"
msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci"
-#: builtin/repack.c:179
+#: builtin/repack.c:180
+msgid "with -a, repack unreachable objects"
+msgstr "avec -a, repaquétiser les objets inaccessibles"
+
+#: builtin/repack.c:182
msgid "size of the window used for delta compression"
msgstr "taille de la fenêtre utilisée pour la compression des deltas"
-#: builtin/repack.c:180 builtin/repack.c:184
+#: builtin/repack.c:183 builtin/repack.c:187
msgid "bytes"
msgstr "octets"
-#: builtin/repack.c:181
+#: builtin/repack.c:184
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments"
-#: builtin/repack.c:183
+#: builtin/repack.c:186
msgid "limits the maximum delta depth"
msgstr "limite la profondeur maximale des deltas"
-#: builtin/repack.c:185
+#: builtin/repack.c:188
msgid "maximum size of each packfile"
msgstr "taille maximum de chaque fichier paquet"
-#: builtin/repack.c:187
+#: builtin/repack.c:190
msgid "repack objects in packs marked with .keep"
msgstr "réempaqueter les objets dans des paquets marqués avec .keep"
-#: builtin/repack.c:197
+#: builtin/repack.c:200
msgid "cannot delete packs in a precious-objects repo"
msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux"
-#: builtin/repack.c:381
+#: builtin/repack.c:204
+msgid "--keep-unreachable and -A are incompatible"
+msgstr "--keep-unreachable et -A sont incompatibles"
+
+#: builtin/repack.c:391 builtin/worktree.c:115
#, c-format
-msgid "removing '%s' failed"
-msgstr "la suppression de '%s' a échoué"
+msgid "failed to remove '%s'"
+msgstr "échec de la suppression de '%s'"
#: builtin/replace.c:19
msgid "git replace [-f] <object> <replacement>"
@@ -10781,7 +11276,7 @@ msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'."
msgid "Could not write new index file."
msgstr "Impossible d'écrire le nouveau fichier d'index."
-#: builtin/rev-list.c:350
+#: builtin/rev-list.c:362
msgid "rev-list does not support display of notes"
msgstr "rev-list ne supporte l'affichage des notes"
@@ -10873,31 +11368,27 @@ msgstr "option"
msgid "option for merge strategy"
msgstr "option pour la stratégie de fusion"
-#: builtin/revert.c:104
+#: builtin/revert.c:100
msgid "append commit name"
msgstr "ajouter le nom de validation"
-#: builtin/revert.c:106
+#: builtin/revert.c:102
msgid "preserve initially empty commits"
msgstr "préserver les validations vides initialement"
-#: builtin/revert.c:107
+#: builtin/revert.c:103
msgid "allow commits with empty messages"
msgstr "autoriser les validations avec des messages vides"
-#: builtin/revert.c:108
+#: builtin/revert.c:104
msgid "keep redundant, empty commits"
msgstr "garder les validations redondantes, vides"
-#: builtin/revert.c:112
-msgid "program error"
-msgstr "erreur du programme"
-
-#: builtin/revert.c:197
+#: builtin/revert.c:192
msgid "revert failed"
msgstr "revert a échoué"
-#: builtin/revert.c:212
+#: builtin/revert.c:207
msgid "cherry-pick failed"
msgstr "le picorage a échoué"
@@ -11204,12 +11695,12 @@ msgstr ""
msgid "prepend comment character and space to each line"
msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace"
-#: builtin/submodule--helper.c:24
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923
#, c-format
msgid "No such ref: %s"
msgstr "Référence inexistante : %s"
-#: builtin/submodule--helper.c:31
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Nom de référence complet attendu, %s obtenu"
@@ -11219,8 +11710,8 @@ msgstr "Nom de référence complet attendu, %s obtenu"
msgid "cannot strip one component off url '%s'"
msgstr "impossible de supprimer un composant de l'URL '%s'"
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
-#: builtin/submodule--helper.c:486
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
+#: builtin/submodule--helper.c:483
msgid "alternative anchor for relative paths"
msgstr "ancre alternative pour les chemins relatifs"
@@ -11228,153 +11719,184 @@ msgstr "ancre alternative pour les chemins relatifs"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules"
-#: builtin/submodule--helper.c:366
+#: builtin/submodule--helper.c:364
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:370
+#: builtin/submodule--helper.c:368
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n"
-#: builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:378
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
-msgstr "attention : nous vous suggérons de spécifier une commande de mode de mise à jour pour le sous-module '%s'\n"
+msgstr ""
+"attention : nous vous suggérons de spécifier une commande de mode de mise à "
+"jour pour le sous-module '%s'\n"
-#: builtin/submodule--helper.c:387
+#: builtin/submodule--helper.c:385
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
-msgstr "Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module '%s'"
+msgstr ""
+"Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module "
+"'%s'"
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:404
msgid "Suppress output for initializing a submodule"
msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module"
-#: builtin/submodule--helper.c:411
+#: builtin/submodule--helper.c:409
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<chemin>]"
-#: builtin/submodule--helper.c:432
+#: builtin/submodule--helper.c:430
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper <nom> <chemin>"
-#: builtin/submodule--helper.c:438
+#: builtin/submodule--helper.c:436
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le "
"chemin '%s'"
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:486
msgid "where the new submodule will be cloned to"
msgstr "emplacement où le sous-module sera cloné"
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:489
msgid "name of the new submodule"
msgstr "nom du nouveau sous-module"
-#: builtin/submodule--helper.c:495
+#: builtin/submodule--helper.c:492
msgid "url where to clone the submodule from"
msgstr "URL depuis laquelle cloner le sous-module"
-#: builtin/submodule--helper.c:501
+#: builtin/submodule--helper.c:498
msgid "depth for shallow clones"
msgstr "profondeur de l'historique des clones superficiels"
-#: builtin/submodule--helper.c:507
+#: builtin/submodule--helper.c:504
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
-msgstr "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference <dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>"
+msgstr ""
+"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
+"<dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>"
-#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
+#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
#, c-format
msgid "could not create directory '%s'"
msgstr "impossible de créer le répertoire '%s'"
-#: builtin/submodule--helper.c:534
+#: builtin/submodule--helper.c:531
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Le clonage de '%s' dans le chemin de sous-module '%s' a échoué"
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:547
#, c-format
msgid "cannot open file '%s'"
msgstr "impossible d'ouvrir le fichier '%s'"
-#: builtin/submodule--helper.c:555
+#: builtin/submodule--helper.c:552
#, c-format
msgid "could not close file %s"
msgstr "impossible de fermer le fichier %s"
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:559
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "impossible de créer le répertoire de sous-module pour '%s'"
-#: builtin/submodule--helper.c:609
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
-#: builtin/submodule--helper.c:613
+#: builtin/submodule--helper.c:615
msgid "Maybe you want to use 'update --init'?"
msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:641
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Sous-module non fusionné %s non traité"
-#: builtin/submodule--helper.c:660
+#: builtin/submodule--helper.c:662
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Sous-module '%s' non traité"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:792
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "Impossible de cloner '%s'. Réessai prévu"
+
+#: builtin/submodule--helper.c:803
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "Impossible de cloner '%s' pour la seconde fois, abandon"
+
+#: builtin/submodule--helper.c:824
msgid "path into the working tree"
msgstr "chemin dans la copie de travail"
-#: builtin/submodule--helper.c:771
+#: builtin/submodule--helper.c:827
msgid "path into the working tree, across nested submodule boundaries"
-msgstr "chemin dans la copie de travail, traversant les frontières de sous-modules"
+msgstr ""
+"chemin dans la copie de travail, traversant les frontières de sous-modules"
-#: builtin/submodule--helper.c:775
+#: builtin/submodule--helper.c:831
msgid "rebase, merge, checkout or none"
msgstr "valeurs possibles : rebase, merge, checkout ou none"
-#: builtin/submodule--helper.c:779
+#: builtin/submodule--helper.c:835
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Créer un clone superficiel tronqué au nombre de révisions spécifié"
-#: builtin/submodule--helper.c:782
+#: builtin/submodule--helper.c:838
msgid "parallel jobs"
msgstr "jobs parallèles"
-#: builtin/submodule--helper.c:783
+#: builtin/submodule--helper.c:840
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "spécifie si le clonage initial doit être aussi superficiel"
+
+#: builtin/submodule--helper.c:841
msgid "don't print cloning progress"
msgstr "ne pas afficher la progression du clonage"
-#: builtin/submodule--helper.c:788
+#: builtin/submodule--helper.c:846
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:798
+#: builtin/submodule--helper.c:856
msgid "bad value for update parameter"
msgstr "valeur invalide pour la mise à jour du paramètre"
-#: builtin/submodule--helper.c:855
+#: builtin/submodule--helper.c:927
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+"la branche du sous-module %s est configurée pour hériter de la branche du "
+"superprojet, mais le superprojet n'est sur aucune branche"
+
+#: builtin/submodule--helper.c:977
msgid "submodule--helper subcommand must be called with a subcommand"
-msgstr "la sous-commande submodule--helper doit être appelée avec une sous-commande"
+msgstr ""
+"la sous-commande submodule--helper doit être appelée avec une sous-commande"
-#: builtin/submodule--helper.c:862
+#: builtin/submodule--helper.c:984
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
@@ -11726,14 +12248,6 @@ msgstr "<mode>, <objet>, <chemin>"
msgid "add the specified entry to the index"
msgstr "ajouter l'élément spécifié dans l'index"
-#: builtin/update-index.c:958
-msgid "(+/-)x"
-msgstr "(+/-)x"
-
-#: builtin/update-index.c:959
-msgid "override the executable bit of the listed files"
-msgstr "outrepasser le bit exécutable pour les fichiers listés"
-
#: builtin/update-index.c:963
msgid "mark files as \"not changing\""
msgstr "marquer les fichiers comme \"non changeants\""
@@ -11898,87 +12412,115 @@ msgid "git worktree add [<options>] <path> [<branch>]"
msgstr "git worktree add [<options>] <chemin> [<branche>]"
#: builtin/worktree.c:16
-msgid "git worktree prune [<options>]"
+msgid "git worktree list [<options>]"
msgstr "git worktree prune [<options>]"
#: builtin/worktree.c:17
-msgid "git worktree list [<options>]"
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<options>] <chemin>"
+
+#: builtin/worktree.c:18
+msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<options>]"
-#: builtin/worktree.c:40
+#: builtin/worktree.c:19
+msgid "git worktree unlock <path>"
+msgstr "git worktree unlock <chemin>"
+
+#: builtin/worktree.c:42
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Suppression de worktrees/%s : répertoire invalide"
-#: builtin/worktree.c:46
+#: builtin/worktree.c:48
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas"
-#: builtin/worktree.c:51
+#: builtin/worktree.c:53
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
"Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)"
-#: builtin/worktree.c:62
+#: builtin/worktree.c:64
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Suppression de worktrees/%s : fichier gitdir invalide"
-#: builtin/worktree.c:78
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"Suppression de worktrees/%s : le fichier gitdir point sur un endroit "
"inexistant"
-#: builtin/worktree.c:113
-#, c-format
-msgid "failed to remove '%s'"
-msgstr "échec de la suppression de '%s'"
-
-#: builtin/worktree.c:202
+#: builtin/worktree.c:204
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existe déjà"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:236
#, c-format
msgid "could not create directory of '%s'"
msgstr "impossible de créer le répertoire de '%s'"
-#: builtin/worktree.c:270
+#: builtin/worktree.c:272
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Préparation de %s (identifiant %s)"
-#: builtin/worktree.c:322
+#: builtin/worktree.c:323
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"extraire la <branche> même si elle est déjà extraite dans une autre copie de "
"travail"
-#: builtin/worktree.c:324
+#: builtin/worktree.c:325
msgid "create a new branch"
msgstr "créer une nouvelle branche"
-#: builtin/worktree.c:326
+#: builtin/worktree.c:327
msgid "create or reset a branch"
msgstr "créer ou réinitialiser une branche"
-#: builtin/worktree.c:327
-msgid "detach HEAD at named commit"
-msgstr "détacher la HEAD au commit nommé"
-
-#: builtin/worktree.c:328
+#: builtin/worktree.c:329
msgid "populate the new working tree"
msgstr "remplissage de la nouvelle copie de travail"
-#: builtin/worktree.c:336
+#: builtin/worktree.c:337
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B et --detach sont mutuellement exclusifs"
+#: builtin/worktree.c:470
+msgid "reason for locking"
+msgstr "raison du vérouillage"
+
+#: builtin/worktree.c:482 builtin/worktree.c:515
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr "'%s' n'est pas une copie de travail"
+
+#: builtin/worktree.c:484 builtin/worktree.c:517
+msgid "The main working tree cannot be locked or unlocked"
+msgstr ""
+"La copie de travail principale ne peut pas être vérouillée ou dévérouillée"
+
+#: builtin/worktree.c:489
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "'%s' est déjà verrouillé, car '%s'"
+
+#: builtin/worktree.c:491
+#, c-format
+msgid "'%s' is already locked"
+msgstr "'%s' est déjà verrouillé"
+
+#: builtin/worktree.c:519
+#, c-format
+msgid "'%s' is not locked"
+msgstr "'%s' n'est pas verrouillé"
+
#: builtin/write-tree.c:13
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<préfixe>/]"
@@ -11995,6 +12537,28 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>"
msgid "only useful for debugging"
msgstr "seulement utile pour le débogage"
+#: upload-pack.c:20
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<options>] <répertoire>"
+
+#: upload-pack.c:837
+msgid "quit after a single request/response exchange"
+msgstr "quitter après un unique échange requête/réponse"
+
+#: upload-pack.c:839
+msgid "exit immediately after initial ref advertisement"
+msgstr "Sortir immédiatement après l'annonce initiale des références"
+
+#: upload-pack.c:841
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr ""
+"nes pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire "
+"Git"
+
+#: upload-pack.c:843
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "interrompre le transfer après <n> secondes d'inactivité"
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "afficher les messages de debug sur stderr"
@@ -12009,7 +12573,7 @@ msgstr ""
"quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n"
"pour en lire plus à propos d'une commande spécifique ou d'un concept."
-#: http.c:322
+#: http.c:323
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0"
@@ -12146,32 +12710,32 @@ msgid "update the index with reused conflict resolution if possible"
msgstr ""
"met à jour l'index avec les résolutions de conflit réutilisées si possible"
-#: git-bisect.sh:55
+#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "Vous devez démarrer avec \"git bisect start\""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:61
+#: git-bisect.sh:60
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Souhaitez-vous que je le fasse pour vous [Y/n] ? "
-#: git-bisect.sh:122
+#: git-bisect.sh:121
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "option inconnue : '$arg'"
-#: git-bisect.sh:126
+#: git-bisect.sh:125
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "'$arg' ne semble être une révision valide"
-#: git-bisect.sh:155
+#: git-bisect.sh:154
msgid "Bad HEAD - I need a HEAD"
msgstr "Mauvaise HEAD - j'ai besoin d'une HEAD"
-#: git-bisect.sh:168
+#: git-bisect.sh:167
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
@@ -12179,27 +12743,28 @@ msgstr ""
"L'extraction de '$start_head' a échoué. Essayez 'git bisect reset <branche-"
"valide>'."
-#: git-bisect.sh:178
+#: git-bisect.sh:177
msgid "won't bisect on cg-seek'ed tree"
msgstr "refus de bissecter sur un arbre 'cg-seeked'"
-#: git-bisect.sh:182
+#: git-bisect.sh:181
msgid "Bad HEAD - strange symbolic ref"
msgstr "Mauvaise HEAD - référence symbolique douteuse"
-#: git-bisect.sh:234
+#: git-bisect.sh:233
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "Mauvais argument pour bisect_write : $state"
-#: git-bisect.sh:263
+#: git-bisect.sh:262
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Mauvaise révision en entrée : $arg"
-#: git-bisect.sh:278
-msgid "Please call 'bisect_state' with at least one argument."
-msgstr "Veuillez appeler 'bisect_state' avec au moins un argument."
+#: git-bisect.sh:281
+#, sh-format
+msgid "Bad rev input: $bisected_head"
+msgstr "Mauvaise révision en entrée : $bisected_head"
#: git-bisect.sh:290
#, sh-format
@@ -12349,7 +12914,47 @@ msgstr ""
"Les options supportées sont : --term-good|--term-old et --term-bad|--term-"
"new."
-#: git-rebase.sh:57
+#: git-merge-octopus.sh:46
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr ""
+"Erreur : vos modifications locales aux fichiers suivants seraient écrasées "
+"par la fusion"
+
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr "La fusion automatique a échoué."
+
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an Octopus."
+msgstr "L'Octopus ne devrait pas arriver."
+
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "Impossible de trouver un commit commun avec $pretty_name"
+
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up-to-date with $pretty_name"
+msgstr "Déjà à jour avec $pretty_name"
+
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "Mise à jour en avance rapide sur $pretty_name"
+
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "Essai de fusion simple avec $pretty_name"
+
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
+msgstr "La fusion simple a échoué, essai avec la fusion automatique."
+
+#: git-rebase.sh:56
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
@@ -12361,16 +12966,21 @@ msgstr ""
"Pour extraire la branche d'origine et stopper le rebasage, lancez \"git "
"rebase --abort\"."
-#: git-rebase.sh:168
+#: git-rebase.sh:156 git-rebase.sh:395
+#, sh-format
+msgid "Could not move back to $head_name"
+msgstr "Impossible de revenir à $head_name"
+
+#: git-rebase.sh:167
msgid "Applied autostash."
msgstr "Autoremisage appliqué."
-#: git-rebase.sh:171
+#: git-rebase.sh:170
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Impossible de stocker $stash_sha1"
-#: git-rebase.sh:172
+#: git-rebase.sh:171
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
@@ -12380,29 +12990,29 @@ msgstr ""
"Vos modifications sont à l'abri dans la remise.\n"
"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
-#: git-rebase.sh:211
+#: git-rebase.sh:210
msgid "The pre-rebase hook refused to rebase."
msgstr "Le crochet pre-rebase a refusé de rebaser."
-#: git-rebase.sh:216
+#: git-rebase.sh:215
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Il semble que git-am soit en cours. Impossible de rebaser."
-#: git-rebase.sh:357
+#: git-rebase.sh:356
msgid "No rebase in progress?"
msgstr "Pas de rebasage en cours ?"
-#: git-rebase.sh:368
+#: git-rebase.sh:367
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"L'action --edit-todo peut seulement être utilisée lors d'un rebasage "
"interactif."
-#: git-rebase.sh:375
+#: git-rebase.sh:374
msgid "Cannot read HEAD"
msgstr "Impossible de lire HEAD"
-#: git-rebase.sh:378
+#: git-rebase.sh:377
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -12410,12 +13020,7 @@ msgstr ""
"Vous devez éditer tous les conflits de fusion et\n"
"les marquer comme résolus avec git add"
-#: git-rebase.sh:396
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "Impossible de revenir à $head_name"
-
-#: git-rebase.sh:415
+#: git-rebase.sh:414
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -12437,98 +13042,98 @@ msgstr ""
"chose\n"
"d'important ici."
-#: git-rebase.sh:466
+#: git-rebase.sh:465
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "invalide $upstream_name en amont"
-#: git-rebase.sh:490
+#: git-rebase.sh:489
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name : il y a plus d'une base de fusion"
-#: git-rebase.sh:493 git-rebase.sh:497
+#: git-rebase.sh:492 git-rebase.sh:496
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name : il n'y a pas de base de fusion"
-#: git-rebase.sh:502
+#: git-rebase.sh:501
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Ne pointe pas sur une validation valide : $onto_name"
-#: git-rebase.sh:525
+#: git-rebase.sh:524
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal : pas de branche : $branch_name"
-#: git-rebase.sh:558
+#: git-rebase.sh:557
msgid "Cannot autostash"
msgstr "Autoremisage impossible"
-#: git-rebase.sh:563
+#: git-rebase.sh:562
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Autoremisage créé : $stash_abbrev"
-#: git-rebase.sh:567
+#: git-rebase.sh:566
msgid "Please commit or stash them."
msgstr "Veuillez les valider ou les remiser."
-#: git-rebase.sh:587
+#: git-rebase.sh:586
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "La branche courante $branch_name est à jour."
-#: git-rebase.sh:591
+#: git-rebase.sh:590
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "La branche courante $branch_name est à jour, rebasage forcé."
-#: git-rebase.sh:602
+#: git-rebase.sh:601
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Changements de $mb sur $onto :"
-#: git-rebase.sh:611
+#: git-rebase.sh:610
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Premièrement, rembobinons head pour rejouer votre travail par-dessus..."
-#: git-rebase.sh:621
+#: git-rebase.sh:620
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name mise à jour en avance rapide sur $onto_name."
-#: git-stash.sh:51
+#: git-stash.sh:50
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear avec des paramètres n'est pas implémenté"
-#: git-stash.sh:74
+#: git-stash.sh:73
msgid "You do not have the initial commit yet"
msgstr "Vous n'avez pas encore la validation initiale"
-#: git-stash.sh:89
+#: git-stash.sh:88
msgid "Cannot save the current index state"
msgstr "Impossible de sauver l'état courant de l'index"
-#: git-stash.sh:124 git-stash.sh:137
+#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "Impossible de sauver l'état courant de la copie de travail"
-#: git-stash.sh:141
+#: git-stash.sh:140
msgid "No changes selected"
msgstr "Aucun changement sélectionné"
-#: git-stash.sh:144
+#: git-stash.sh:143
msgid "Cannot remove temporary index (can't happen)"
msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)"
-#: git-stash.sh:157
+#: git-stash.sh:156
msgid "Cannot record working tree state"
msgstr "Impossible d'enregistrer l'état de la copie de travail"
-#: git-stash.sh:189
+#: git-stash.sh:188
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Impossible de mettre à jour $ref_stash avec $w_commit"
@@ -12543,7 +13148,7 @@ msgstr "Impossible de mettre à jour $ref_stash avec $w_commit"
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:239
+#: git-stash.sh:238
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -12552,110 +13157,119 @@ msgstr ""
"erreur: option inconnue pour 'stash save': $option\n"
" Pour fournir un message, utilisez git stash save -- '$option'"
-#: git-stash.sh:260
+#: git-stash.sh:259
msgid "No local changes to save"
msgstr "Pas de modifications locales à sauver"
-#: git-stash.sh:264
+#: git-stash.sh:263
msgid "Cannot initialize stash"
msgstr "Impossible d'initialiser le remisage"
-#: git-stash.sh:268
+#: git-stash.sh:267
msgid "Cannot save the current status"
msgstr "Impossible de sauver le statut courant"
-#: git-stash.sh:286
+#: git-stash.sh:268
+#, sh-format
+msgid "Saved working directory and index state $stash_msg"
+msgstr "Copie de travail et état de l'index sauvegardés dans $stash_msg"
+
+#: git-stash.sh:285
msgid "Cannot remove worktree changes"
msgstr "Impossible de supprimer les changements de la copie de travail"
-#: git-stash.sh:405
+#: git-stash.sh:404
#, sh-format
msgid "unknown option: $opt"
msgstr "option inconnue : $opt"
-#: git-stash.sh:415
+#: git-stash.sh:414
msgid "No stash found."
msgstr "Pas de remisage trouvé."
-#: git-stash.sh:422
+#: git-stash.sh:421
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Trop de révisions spécifiées : $REV"
-#: git-stash.sh:428
+#: git-stash.sh:427
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference n'est pas une référence valide"
-#: git-stash.sh:456
+#: git-stash.sh:455
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' n'est pas une validation de type remisage"
-#: git-stash.sh:467
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' n'est pas une référence de remisage"
-#: git-stash.sh:475
+#: git-stash.sh:474
msgid "unable to refresh index"
msgstr "impossible de rafraîchir l'index"
-#: git-stash.sh:479
+#: git-stash.sh:478
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Impossible d'appliquer un remisage en cours de fusion"
-#: git-stash.sh:487
+#: git-stash.sh:486
msgid "Conflicts in index. Try without --index."
msgstr "Conflits dans l'index. Essayez sans --index."
-#: git-stash.sh:489
+#: git-stash.sh:488
msgid "Could not save index tree"
msgstr "Impossible de sauvegarder l'arbre d'index"
-#: git-stash.sh:523
+#: git-stash.sh:522
msgid "Cannot unstage modified files"
msgstr "Impossible de désindexer les fichiers modifiés"
-#: git-stash.sh:538
+#: git-stash.sh:537
msgid "Index was not unstashed."
msgstr "L'index n'a pas été sorti de remise."
-#: git-stash.sh:561
+#: git-stash.sh:551
+msgid "The stash is kept in case you need it again."
+msgstr "Le remisage est conservé au cas où vous en auriez encore besoin."
+
+#: git-stash.sh:560
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} supprimé ($s)"
-#: git-stash.sh:562
+#: git-stash.sh:561
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Impossible de supprimer l'élément de stash"
-#: git-stash.sh:570
+#: git-stash.sh:569
msgid "No branch name specified"
msgstr "Aucune branche spécifiée"
-#: git-stash.sh:642
+#: git-stash.sh:641
msgid "(To restore them type \"git stash apply\")"
msgstr "(Pour les restaurer tapez \"git stash apply\")"
-#: git-submodule.sh:219
+#: git-submodule.sh:183
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Un chemin relatif ne peut être utilisé que depuis la racine de la copie de "
"travail"
-#: git-submodule.sh:229
+#: git-submodule.sh:193
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "L'URL de dépôt '$repo' doit être absolu ou commencer par ./|../"
-#: git-submodule.sh:246
+#: git-submodule.sh:210
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' existe déjà dans l'index"
-#: git-submodule.sh:250
+#: git-submodule.sh:214
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -12666,103 +13280,93 @@ msgstr ""
"$sm_path\n"
"Utilisez -f si vous voulez vraiment l'ajouter."
-#: git-submodule.sh:268
+#: git-submodule.sh:232
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Ajout du dépôt existant à '$sm_path' dans l'index"
-#: git-submodule.sh:270
+#: git-submodule.sh:234
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide"
-#: git-submodule.sh:278
+#: git-submodule.sh:242
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) "
"distant(s) :"
-#: git-submodule.sh:280
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from"
-msgstr ""
-"Si vous voulez réutiliser ce répertoire git local au lieu de cloner à "
-"nouveau depuis"
-
-#: git-submodule.sh:282
-#, sh-format
-msgid ""
-"use the '--force' option. If the local git directory is not the correct repo"
-msgstr ""
-"utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt "
-"correct"
-
-#: git-submodule.sh:283
+#: git-submodule.sh:244
#, sh-format
msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+" $realrepo\n"
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr ""
-"ou vous ne savez pas ce que cela signifie de choisir un autre nom avec "
-"l'option '--name'."
+"Si vous voulez réutiliser ce répertoire local git au lieu de le recloner "
+"depuis\n"
+" $realrepo\n"
+"utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt "
+"correct\n"
+"ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'."
-#: git-submodule.sh:285
+#: git-submodule.sh:250
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'."
-#: git-submodule.sh:297
+#: git-submodule.sh:262
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Impossible d'extraire le sous-module '$sm_path'"
-#: git-submodule.sh:302
+#: git-submodule.sh:267
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Échec d'ajout du sous-module '$sm_path'"
-#: git-submodule.sh:311
+#: git-submodule.sh:276
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Échec d'enregistrement du sous-module '$sm_path'"
-#: git-submodule.sh:355
+#: git-submodule.sh:323
#, sh-format
msgid "Entering '$displaypath'"
msgstr "Entrée dans '$displaypath'"
-#: git-submodule.sh:375
+#: git-submodule.sh:343
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr "Arrêt sur '$displaypath' ; le script a retourné un statut non nul."
-#: git-submodule.sh:448
+#: git-submodule.sh:414
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "un spécificateur de chemin et --all sont incompatibles"
-#: git-submodule.sh:453
+#: git-submodule.sh:419
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr "Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
-
-#: git-submodule.sh:470
-#, sh-format
-msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr ""
-"La copie de travail du sous-module '$displaypath' contient un répertoire .git"
+"Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
-#: git-submodule.sh:471
+#: git-submodule.sh:439
#, sh-format
msgid ""
+"Submodule work tree '$displaypath' contains a .git directory\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
+"La copie de travail du sous-module '$displaypath' contient un répertoire ."
+"git\n"
"(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
"historique)"
-#: git-submodule.sh:477
+#: git-submodule.sh:447
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -12771,130 +13375,150 @@ msgstr ""
"La copie de travail du sous-module '$displaypath' contient des modifications "
"locales ; utilisez '-f' pour les annuler"
-#: git-submodule.sh:480
+#: git-submodule.sh:450
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Répertoire '$displaypath' nettoyé"
-#: git-submodule.sh:481
+#: git-submodule.sh:451
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
"Impossible de supprimer la copie de travail du sous-module '$displaypath'"
-#: git-submodule.sh:484
+#: git-submodule.sh:454
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Impossible de créer le répertoire vide du sous-module '$displaypath'"
-#: git-submodule.sh:493
+#: git-submodule.sh:463
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"Le sous-module '$name' ($url) n'est pas enregistré pour le chemin "
"'$displaypath'"
-#: git-submodule.sh:635
+#: git-submodule.sh:612
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"Impossible de trouver la révision courante dans le chemin de sous-module "
"'$displaypath'"
-#: git-submodule.sh:644
+#: git-submodule.sh:622
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'"
-#: git-submodule.sh:667
+#: git-submodule.sh:627
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr ""
+"Impossible de trouver la révision courante ${remote_name}/${branch} dans le "
+"chemin de sous-module '$sm_path'"
+
+#: git-submodule.sh:645
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:680
+#: git-submodule.sh:651
+#, sh-format
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr ""
+"Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas "
+"$sha1. La récupération directe de ce commit a échoué."
+
+#: git-submodule.sh:658
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:681
+#: git-submodule.sh:659
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
-#: git-submodule.sh:685
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:686
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
-#: git-submodule.sh:691
+#: git-submodule.sh:669
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:692
+#: git-submodule.sh:670
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
-#: git-submodule.sh:697
+#: git-submodule.sh:675
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr "L'exécution de '$command $sha1' a échoué dans le chemin de sous-module '$displaypath'"
+msgstr ""
+"L'exécution de '$command $sha1' a échoué dans le chemin de sous-module "
+"'$displaypath'"
-#: git-submodule.sh:698
+#: git-submodule.sh:676
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
-#: git-submodule.sh:729
+#: git-submodule.sh:707
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
-#: git-submodule.sh:837
+#: git-submodule.sh:815
msgid "The --cached option cannot be used with the --files option"
msgstr "L'option --cached ne peut pas être utilisée avec l'option --files"
-#: git-submodule.sh:889
+#: git-submodule.sh:867
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode $mod_dst inattendu"
-#: git-submodule.sh:909
+#: git-submodule.sh:887
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Attention : $display_name ne contient pas la validation $sha1_src"
-#: git-submodule.sh:912
+#: git-submodule.sh:890
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Attention : $display_name ne contient pas la validation $sha1_dst"
-#: git-submodule.sh:915
+#: git-submodule.sh:893
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Attention : $display_name ne contient pas les validations $sha1_src et "
"$sha1_dst"
-#: git-submodule.sh:940
+#: git-submodule.sh:918
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:1059
+#: git-submodule.sh:1040
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"
-#: git-submodule.sh:1123
+#: git-submodule.sh:1107
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
@@ -12904,6 +13528,668 @@ msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
msgid "See git-${cmd}(1) for details."
msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails."
+#: git-rebase--interactive.sh:131
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr "Rebasage ($new_count/$total)"
+
+#: git-rebase--interactive.sh:147
+msgid ""
+"\n"
+"Commands:\n"
+" p, pick = use commit\n"
+" r, reword = use commit, but edit the commit message\n"
+" e, edit = use commit, but stop for amending\n"
+" s, squash = use commit, but meld into previous commit\n"
+" f, fixup = like \"squash\", but discard this commit's log message\n"
+" x, exec = run command (the rest of the line) using shell\n"
+" d, drop = remove commit\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+"\n"
+"Commandes :\n"
+" p, pick = picorer le commit\n"
+" r, reword = picorer le commit, mais reformuler son message\n"
+" e, edit = picorer le commit, mais s'arrêter pour le modifier\n"
+" s, squash = prendre le commit, mais le fusionner avec le précédent\n"
+" f, fixup = comme \"squash\", mais en éliminant son message\n"
+" x, exec = lancer la commande (reste de la ligne) dans un shell\n"
+" d, drop = supprimer le commit\n"
+"\n"
+"Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n"
+
+#: git-rebase--interactive.sh:162
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un "
+"commit.\n"
+
+#: git-rebase--interactive.sh:166
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n"
+
+#: git-rebase--interactive.sh:202
+#, sh-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Vous pouvez corriger le commit maintenant, avec\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"après avoir réalisé vos modifications, lancez\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:227
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
+msgstr "$sha1 n'est pas un commit qui peut être picorer"
+
+#: git-rebase--interactive.sh:266
+#, sh-format
+msgid "Invalid commit name: $sha1"
+msgstr "Nom de commit invalide : $sha1"
+
+#: git-rebase--interactive.sh:308
+msgid "Cannot write current commit's replacement sha1"
+msgstr "Impossible de sauver le sha1 du remplaçant du commit en cours"
+
+#: git-rebase--interactive.sh:360
+#, sh-format
+msgid "Fast-forward to $sha1"
+msgstr "Avance rapide sur $sha1"
+
+#: git-rebase--interactive.sh:362
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
+msgstr "Avance rapide impossible sur $sha1"
+
+#: git-rebase--interactive.sh:371
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
+msgstr "Impossible de déplacer HEAD sur $first_parent"
+
+#: git-rebase--interactive.sh:376
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
+msgstr "Refus d'écraser un commit de fusion: $sha1"
+
+#: git-rebase--interactive.sh:390
+#, sh-format
+msgid "Error redoing merge $sha1"
+msgstr "Erreur lors de la réapplication de la fusion $sha1"
+
+#: git-rebase--interactive.sh:398
+#, sh-format
+msgid "Could not pick $sha1"
+msgstr "Impossible de picorer $sha1"
+
+#: git-rebase--interactive.sh:407
+#, sh-format
+msgid "This is the commit message #${n}:"
+msgstr "Ceci est le ${n}ième message de validation :"
+
+#: git-rebase--interactive.sh:412
+#, sh-format
+msgid "The commit message #${n} will be skipped:"
+msgstr "Le message de validation ${n} sera ignoré :"
+
+#: git-rebase--interactive.sh:423
+#, sh-format
+msgid "This is a combination of $count commit."
+msgid_plural "This is a combination of $count commits."
+msgstr[0] "Ceci est la combinaison de $count commit."
+msgstr[1] "Ceci est la combinaison de $count commits."
+
+#: git-rebase--interactive.sh:431
+#, sh-format
+msgid "Cannot write $fixup_msg"
+msgstr "Impossible d'écrire $fixup_msg"
+
+#: git-rebase--interactive.sh:434
+msgid "This is a combination of 2 commits."
+msgstr "Ceci est la combinaison de 2 commits."
+
+#: git-rebase--interactive.sh:435
+msgid "This is the 1st commit message:"
+msgstr "Ceci est le premier message de validation :"
+
+#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
+#: git-rebase--interactive.sh:521
+#, sh-format
+msgid "Could not apply $sha1... $rest"
+msgstr "Impossible d'appliquer $sha1... $rest"
+
+#: git-rebase--interactive.sh:549
+#, sh-format
+msgid ""
+"Could not amend commit after successfully picking $sha1... $rest\n"
+"This is most likely due to an empty commit message, or the pre-commit hook\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue "
+"before\n"
+"you are able to reword the commit."
+msgstr ""
+"Impossible de corriger le commit après avoir réussi à picorer $sha1... "
+"$rest\n"
+"C'est probablement du à un message de validation vide ou le crochet pre-"
+"commit\n"
+"a échoué. Si le crochet pre-commit a échoué, vous devez peut-être résoudre "
+"le\n"
+"problème avant de pouvoir reformuler le message du commit."
+
+#: git-rebase--interactive.sh:564
+#, sh-format
+msgid "Stopped at $sha1_abbrev... $rest"
+msgstr "Arrêté à $sha1_abbrev... $rest"
+
+#: git-rebase--interactive.sh:579
+#, sh-format
+msgid "Cannot '$squash_style' without a previous commit"
+msgstr "'$squash_style' impossible avec le commit précédent"
+
+#: git-rebase--interactive.sh:621
+#, sh-format
+msgid "Executing: $rest"
+msgstr "Exécution : $rest"
+
+#: git-rebase--interactive.sh:629
+#, sh-format
+msgid "Execution failed: $rest"
+msgstr "L'exécution a échoué : $rest"
+
+#: git-rebase--interactive.sh:631
+msgid "and made changes to the index and/or the working tree"
+msgstr "et a mis à jour l'index ou la copie de travail"
+
+#: git-rebase--interactive.sh:633
+msgid ""
+"You can fix the problem, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Vous pouvez corriger le problème, puis lancer\n"
+"\n"
+"git rebase --continue"
+
+#. TRANSLATORS: after these lines is a command to be issued by the user
+#: git-rebase--interactive.sh:646
+#, sh-format
+msgid ""
+"Execution succeeded: $rest\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"L'exécution a réussi : $rest\n"
+"mais a laissé des modifications dans l'index ou la copie de travail\n"
+"Validez ou remisez vos modification, puis lancez\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:657
+#, sh-format
+msgid "Unknown command: $command $sha1 $rest"
+msgstr "Commande inconnue : $command $sha1 $rest"
+
+#: git-rebase--interactive.sh:658
+msgid "Please fix this using 'git rebase --edit-todo'."
+msgstr "Veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
+
+#: git-rebase--interactive.sh:693
+#, sh-format
+msgid "Successfully rebased and updated $head_name."
+msgstr "Rebasage et mise à jour de $head_name avec succès."
+
+#: git-rebase--interactive.sh:740
+msgid "Could not skip unnecessary pick commands"
+msgstr "Impossible d'éviter les commandes de picorage non nécessaires"
+
+#: git-rebase--interactive.sh:898
+#, sh-format
+msgid ""
+"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+" - $line"
+msgstr ""
+"Attention : le SHA-1 manque ou n'est pas un commit dans la ligne suivante :\n"
+" - $line"
+
+#: git-rebase--interactive.sh:931
+#, sh-format
+msgid ""
+"Warning: the command isn't recognized in the following line:\n"
+" - $line"
+msgstr ""
+"Attention : la commande n'est pas reconnue dans le ligne suivante :\n"
+" - $line"
+
+#: git-rebase--interactive.sh:970
+msgid "could not detach HEAD"
+msgstr "Impossible de détacher HEAD"
+
+#: git-rebase--interactive.sh:1008
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):"
+msgstr ""
+"Attention : certains commits ont pu être accidentellement supprimés.\n"
+"Commits supprimés (du plus jeune au plus vieux) :"
+
+#: git-rebase--interactive.sh:1016
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error."
+msgstr ""
+"Pour éviter ce message, utilisez \"drop\" pour supprimer explicitement un "
+"commit.\n"
+"\n"
+"Utilisez 'git config rebase.missingCommitsCheck' pour changer le niveau "
+"d'avertissements.\n"
+"Les comportements disponibles sont : ignore, warn, error."
+
+#: git-rebase--interactive.sh:1027
+#, sh-format
+msgid ""
+"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
+"Ignoring."
+msgstr ""
+"Paramètre non reconnu $check_level pour l'option rebase.missingCommitsCheck. "
+"Ignoré."
+
+#: git-rebase--interactive.sh:1044
+msgid "You can fix this with 'git rebase --edit-todo'."
+msgstr "Vous pouvez corriger ceci avec 'git rebase --edit-todo'."
+
+#: git-rebase--interactive.sh:1045
+msgid "Or you can abort the rebase with 'git rebase --abort'."
+msgstr "Ou bien vous pouvez abandonner le rebasage avec 'git rebase --abort'."
+
+#: git-rebase--interactive.sh:1069
+msgid "Could not remove CHERRY_PICK_HEAD"
+msgstr "Impossible de supprimer CHERRY_PICK_HEAD"
+
+#: git-rebase--interactive.sh:1074
+#, sh-format
+msgid ""
+"You have staged changes in your working tree.\n"
+"If these changes are meant to be\n"
+"squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In both case, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
+msgstr ""
+"Vous avez des modifications indexées dans votre copie de travail.\n"
+"Si ces modifications devaient être ajoutées\n"
+"dans le commit précédent, lancez :\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Si elles devaient aller dans un nouveau commit, lancez :\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"Dans les deux cas, une fois fini, continuez avec :\n"
+"\n"
+" git rebase --continue\n"
+
+#: git-rebase--interactive.sh:1091
+msgid "Error trying to find the author identity to amend commit"
+msgstr ""
+"Erreur lors de la recherche de l'identité de l'auteur pour corriger le commit"
+
+#: git-rebase--interactive.sh:1096
+msgid ""
+"You have uncommitted changes in your working tree. Please commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"Vous avez des modifications non validées dans votre copie de travail.\n"
+"Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
+
+#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
+msgid "Could not commit staged changes."
+msgstr "impossible de valider les modifications indexées."
+
+#: git-rebase--interactive.sh:1129
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Vous êtes en train d'éditer le fichier todo d'un rebasage interactif en "
+"cours.\n"
+"Pour continuer le rebasage après édition, lancez :\n"
+" git rebase --continue\n"
+"\n"
+
+#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+msgid "Could not execute editor"
+msgstr "Impossible de lancer l'éditeur"
+
+#: git-rebase--interactive.sh:1145
+msgid "You need to set your committer info first"
+msgstr "Vous devez d'abord définir vos informations de validateur"
+
+#: git-rebase--interactive.sh:1153
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr "Impossible d'extraire $switch_to"
+
+#: git-rebase--interactive.sh:1158
+msgid "No HEAD?"
+msgstr "Pas de HEAD ?"
+
+#: git-rebase--interactive.sh:1159
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr "Impossible de créer un répertoire temporaire $state_dir"
+
+#: git-rebase--interactive.sh:1161
+msgid "Could not mark as interactive"
+msgstr "Impossible de marquer comme interactif"
+
+#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+msgid "Could not init rewritten commits"
+msgstr "Impossible d'initialiser les commits réécrits"
+
+#: git-rebase--interactive.sh:1276
+#, sh-format
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)"
+msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)"
+
+#: git-rebase--interactive.sh:1281
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"Cependant, si vous effacez tout, le rebasage sera annulé.\n"
+"\n"
+
+#: git-rebase--interactive.sh:1288
+msgid "Note that empty commits are commented out"
+msgstr "Veuillez noter que les commits vides sont en commentaire"
+
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "usage : $dashless $USAGE"
+
+#: git-sh-setup.sh:190
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr ""
+"Impossible de se placer dans le répertoire $cdup, la racine de la copie de "
+"travail"
+
+#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr "fatal : $program_name ne peut pas être utilisé sans copie de travail."
+
+#: git-sh-setup.sh:220
+msgid "Cannot rebase: You have unstaged changes."
+msgstr "Impossible de rebaser : vous avez des modifications non indexées."
+
+#: git-sh-setup.sh:223
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr ""
+"Impossible de réécrire les branches : vous avez des modifications non "
+"indexées."
+
+#: git-sh-setup.sh:229
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr "$action est impossible : vous avez des modifications non indexées."
+
+#: git-sh-setup.sh:242
+msgid "Cannot rebase: Your index contains uncommitted changes."
+msgstr ""
+"Impossible de rebaser : votre index contient des modifications non validées."
+
+#: git-sh-setup.sh:248
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr ""
+"$action est impossible : votre index contient des modifications non validées."
+
+#: git-sh-setup.sh:372
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr ""
+"Vous devez lancer cette commande depuis la racine de votre copie de travail."
+
+#: git-sh-setup.sh:377
+msgid "Unable to determine absolute path of git directory"
+msgstr "Impossible de déterminer le chemin absolu du répertoire git"
+
+#~ msgid "This is the 2nd commit message:"
+#~ msgstr "Ceci est le deuxième message de validation :"
+
+#~ msgid "This is the 3rd commit message:"
+#~ msgstr "Ceci est le troisième message de validation :"
+
+#~ msgid "This is the 4th commit message:"
+#~ msgstr "Ceci est le quatrième message de validation :"
+
+#~ msgid "This is the 5th commit message:"
+#~ msgstr "Ceci est le cinquième message de validation :"
+
+#~ msgid "This is the 6th commit message:"
+#~ msgstr "Ceci est le sixième message de validation :"
+
+#~ msgid "This is the 7th commit message:"
+#~ msgstr "Ceci est le septième message de validation :"
+
+#~ msgid "This is the 8th commit message:"
+#~ msgstr "Ceci est le huitième message de validation :"
+
+#~ msgid "This is the 9th commit message:"
+#~ msgstr "Ceci est le neuvième message de validation :"
+
+#~ msgid "This is the 10th commit message:"
+#~ msgstr "Ceci est le dixième message de validation :"
+
+#~ msgid "This is the ${n}th commit message:"
+#~ msgstr "Ceci est le ${n}ième message de validation :"
+
+#~ msgid "This is the ${n}st commit message:"
+#~ msgstr "Ceci est le ${n}ième message de validation :"
+
+#~ msgid "This is the ${n}nd commit message:"
+#~ msgstr "Ceci est le ${n}ième message de validation :"
+
+#~ msgid "This is the ${n}rd commit message:"
+#~ msgstr "Ceci est le ${n}ième message de validation :"
+
+#~ msgid "The 1st commit message will be skipped:"
+#~ msgstr "Le premier message de validation sera ignoré :"
+
+#~ msgid "The 2nd commit message will be skipped:"
+#~ msgstr "Le deuxième message de validation sera ignoré :"
+
+#~ msgid "The 3rd commit message will be skipped:"
+#~ msgstr "Le troisième message de validation sera ignoré :"
+
+#~ msgid "The 4th commit message will be skipped:"
+#~ msgstr "Le quatrième message de validation sera ignoré :"
+
+#~ msgid "The 5th commit message will be skipped:"
+#~ msgstr "Le cinquième message de validation sera ignoré :"
+
+#~ msgid "The 6th commit message will be skipped:"
+#~ msgstr "Le sixième message de validation sera ignoré :"
+
+#~ msgid "The 7th commit message will be skipped:"
+#~ msgstr "Le septième message de validation sera ignoré :"
+
+#~ msgid "The 8th commit message will be skipped:"
+#~ msgstr "Le huitième message de validation sera ignoré :"
+
+#~ msgid "The 9th commit message will be skipped:"
+#~ msgstr "Le neuvième message de validation sera ignoré :"
+
+#~ msgid "The 10th commit message will be skipped:"
+#~ msgstr "Le dixième message de validation sera ignoré :"
+
+#~ msgid "The ${n}th commit message will be skipped:"
+#~ msgstr "le ${n}ième message de validation sera ignoré :"
+
+#~ msgid "The ${n}st commit message will be skipped:"
+#~ msgstr "Le message de validation ${n} sera ignoré :"
+
+#~ msgid "The ${n}nd commit message will be skipped:"
+#~ msgstr "Le message de validation ${n} sera ignoré :"
+
+#~ msgid "The ${n}rd commit message will be skipped:"
+#~ msgstr "Le message de validation ${n} sera ignoré :"
+
+#~ msgid "could not run gpg."
+#~ msgstr "impossible de lancer gpg."
+
+#~ msgid "gpg did not accept the data"
+#~ msgstr "gpg n'a pas accepté les données"
+
+#~ msgid "unsupported object type in the tree"
+#~ msgstr "type d'objet non supporté dans l'arbre"
+
+#~ msgid "Fatal merge failure, shouldn't happen."
+#~ msgstr "Échec fatal de fusion, qui ne devrait jamais arriver."
+
+#~ msgid "Unprocessed path??? %s"
+#~ msgstr "Chemin non traité ??? %s"
+
+#~ msgid "Error wrapping up %s"
+#~ msgstr "Erreur à l'emballage de %s"
+
+#~ msgid "Cannot %s during a %s"
+#~ msgstr "Impossible de %s pendant un %s"
+
+#~ msgid "Can't cherry-pick into empty head"
+#~ msgstr "Impossible de picorer vers une HEAD vide"
+
+#~ msgid "could not open %s for writing"
+#~ msgstr "Impossible d'ouvrir '%s' en écriture"
+
+#~ msgid "bug: unhandled unmerged status %x"
+#~ msgstr "bogue : état de non-fusion non géré %x"
+
+#~ msgid "bug: unhandled diff status %c"
+#~ msgstr "bogue : état de diff non géré %c"
+
+#~ msgid "read of %s failed"
+#~ msgstr "échec de la lecture de %s"
+
+#~ msgid "could not write branch description template"
+#~ msgstr "impossible d'écrire le modèle de description de branche"
+
+#~ msgid "corrupt index file"
+#~ msgstr "fichier d'index corrompu"
+
+#~ msgid "detach the HEAD at named commit"
+#~ msgstr "détacher la HEAD à la validation nommée"
+
+#~ msgid "Checking connectivity... "
+#~ msgstr "Vérification de la connectivité... "
+
+#~ msgid " (unable to update local ref)"
+#~ msgstr " (impossible de mettre à jour la référence locale)"
+
+#~ msgid "Reinitialized existing"
+#~ msgstr "existant réinitialisé"
+
+#~ msgid "Initialized empty"
+#~ msgstr "vide initialisé"
+
+#~ msgid " shared"
+#~ msgstr " partagé"
+
+#~ msgid "Verify that the named commit has a valid GPG signature"
+#~ msgstr "Vérifier que la validation a une signature GPG valide"
+
+#~ msgid "Could not write to '%s'"
+#~ msgstr "Impossible d'écrire dans '%s'"
+
+#~ msgid "Writing SQUASH_MSG"
+#~ msgstr "Écriture de SQUASH_MSG"
+
+#~ msgid "Finishing SQUASH_MSG"
+#~ msgstr "Finition de SQUASH_MSG"
+
+#~ msgid " and with remote"
+#~ msgstr " et avec la distante"
+
+#~ msgid "removing '%s' failed"
+#~ msgstr "la suppression de '%s' a échoué"
+
+#~ msgid "program error"
+#~ msgstr "erreur du programme"
+
+#~ msgid "Please call 'bisect_state' with at least one argument."
+#~ msgstr "Veuillez appeler 'bisect_state' avec au moins un argument."
+
+#~ msgid ""
+#~ "If you want to reuse this local git directory instead of cloning again "
+#~ "from"
+#~ msgstr ""
+#~ "Si vous voulez réutiliser ce répertoire git local au lieu de cloner à "
+#~ "nouveau depuis"
+
+#~ msgid ""
+#~ "use the '--force' option. If the local git directory is not the correct "
+#~ "repo"
+#~ msgstr ""
+#~ "utilisez l'option '--force'. Si le répertoire local git n'est pas le "
+#~ "dépôt correct"
+
+#~ msgid ""
+#~ "or you are unsure what this means choose another name with the '--name' "
+#~ "option."
+#~ msgstr ""
+#~ "ou vous ne savez pas ce que cela signifie de choisir un autre nom avec "
+#~ "l'option '--name'."
+
+#~ msgid "Submodule work tree '$displaypath' contains a .git directory"
+#~ msgstr ""
+#~ "La copie de travail du sous-module '$displaypath' contient un répertoire ."
+#~ "git"
+
+#~ msgid ""
+#~ "(use 'rm -rf' if you really want to remove it including all of its "
+#~ "history)"
+#~ msgstr ""
+#~ "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout "
+#~ "son historique)"
+
#~ msgid "'%s': %s"
#~ msgstr "'%s' : %s"
@@ -13100,9 +14386,6 @@ msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails."
#~ msgid "-b and -B are mutually exclusive"
#~ msgstr "-b et -B sont mutuellement exclusifs"
-#~ msgid "You need to set your committer info first"
-#~ msgstr "Vous devez d'abord définir vos informations de validateur"
-
#~ msgid ""
#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
@@ -13149,10 +14432,6 @@ msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails."
#~ "add/rm <fichier>'\n"
#~ "si nécessaire pour marquer comme résolu et valider."
-#~ msgid "Pull is not possible because you have unmerged files."
-#~ msgstr ""
-#~ "Le pull n'est pas possible car vous avez des fichiers non fusionnés."
-
#~ msgid "no branch specified"
#~ msgstr "aucune branche spécifiée"
@@ -13204,9 +14483,6 @@ msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails."
#~ msgid "Failed to lock HEAD during fast_forward_to"
#~ msgstr "Échec du verrouillage de HEAD pendant l'avance rapide"
-#~ msgid "invalid commit: %s"
-#~ msgstr "commit invalide : %s"
-
#~ msgid "cannot lock HEAD ref"
#~ msgstr "impossible de verrouiller la référence HEAD"
diff --git a/po/git.pot b/po/git.pot
index c9be5df..fed61cf 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-05-24 23:42+0800\n"
+"POT-Creation-Date: 2016-08-27 23:21+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,24 +23,69 @@ msgstr ""
msgid "hint: %.*s\n"
msgstr ""
-#: advice.c:88
+#: advice.c:83
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr ""
+
+#: advice.c:85
+msgid "Committing is not possible because you have unmerged files."
+msgstr ""
+
+#: advice.c:87
+msgid "Merging is not possible because you have unmerged files."
+msgstr ""
+
+#: advice.c:89
+msgid "Pulling is not possible because you have unmerged files."
+msgstr ""
+
+#: advice.c:91
+msgid "Reverting is not possible because you have unmerged files."
+msgstr ""
+
+#: advice.c:93
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
+msgstr ""
+
+#: advice.c:101
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
-#: advice.c:101 builtin/merge.c:1238
+#: advice.c:109
+msgid "Exiting because of an unresolved conflict."
+msgstr ""
+
+#: advice.c:114 builtin/merge.c:1181
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:103
+#: advice.c:116
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:104
+#: advice.c:117
msgid "Exiting because of unfinished merge."
msgstr ""
+#: advice.c:123
+#, c-format
+msgid ""
+"Note: checking out '%s'.\n"
+"\n"
+"You are in 'detached HEAD' state. You can look around, make experimental\n"
+"changes and commit them, and you can discard any commits you make in this\n"
+"state without impacting any branches by performing another checkout.\n"
+"\n"
+"If you want to create a new branch to retain commits you create, you may\n"
+"do so (now or later) by using -b with the checkout command again. Example:\n"
+"\n"
+" git checkout -b <new-branch-name>\n"
+"\n"
+msgstr ""
+
#: archive.c:12
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr ""
@@ -58,7 +103,7 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
@@ -71,7 +116,7 @@ msgstr ""
msgid "archive format"
msgstr ""
-#: archive.c:430 builtin/log.c:1395
+#: archive.c:430 builtin/log.c:1422
msgid "prefix"
msgstr ""
@@ -79,11 +124,11 @@ msgstr ""
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548
-#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553
+#: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987
#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
-#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
+#: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399
+#: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr ""
@@ -116,7 +161,7 @@ msgid "list supported archive formats"
msgstr ""
#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:776
+#: builtin/submodule--helper.c:832
msgid "repo"
msgstr ""
@@ -124,7 +169,7 @@ msgstr ""
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
msgid "command"
msgstr ""
@@ -132,12 +177,143 @@ msgstr ""
msgid "path to the remote git-upload-archive command"
msgstr ""
+#: archive.c:461
+msgid "Unexpected option --remote"
+msgstr ""
+
+#: archive.c:463
+msgid "Option --exec can only be used together with --remote"
+msgstr ""
+
+#: archive.c:465
+msgid "Unexpected option --output"
+msgstr ""
+
+#: archive.c:487
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr ""
+
+#: archive.c:494
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr ""
+
#: attr.c:263
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
+#: bisect.c:441
+#, c-format
+msgid "Could not open file '%s'"
+msgstr ""
+
+#: bisect.c:446
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr ""
+
+#: bisect.c:655
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr ""
+
+#: bisect.c:708
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr ""
+
+#: bisect.c:732
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+
+#: bisect.c:737
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+
+#: bisect.c:742
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+
+#: bisect.c:750
+#, c-format
+msgid ""
+"Some %s revs are not ancestor of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
+msgstr ""
+
+#: bisect.c:763
+#, c-format
+msgid ""
+"the merge base between %s and [%s] must be skipped.\n"
+"So we cannot be sure the first %s commit is between %s and %s.\n"
+"We continue anyway."
+msgstr ""
+
+#: bisect.c:798
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr ""
+
+#: bisect.c:849
+#, c-format
+msgid "a %s revision is needed"
+msgstr ""
+
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#, c-format
+msgid "could not create file '%s'"
+msgstr ""
+
+#: bisect.c:917
+#, c-format
+msgid "could not read file '%s'"
+msgstr ""
+
+#: bisect.c:947
+msgid "reading bisect refs failed"
+msgstr ""
+
+#: bisect.c:967
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr ""
+
+#: bisect.c:975
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+
+#: bisect.c:994
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:998
+#, c-format
+msgid "Bisecting: %d revision left to test after this %s\n"
+msgid_plural "Bisecting: %d revisions left to test after this %s\n"
+msgstr[0] ""
+msgstr[1] ""
+
#: branch.c:53
#, c-format
msgid ""
@@ -272,7 +448,7 @@ msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:87 builtin/commit.c:777
+#: bundle.c:87 builtin/commit.c:778
#, c-format
msgid "could not open '%s'"
msgstr ""
@@ -281,10 +457,10 @@ msgstr ""
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
-#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
-#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
-#: builtin/merge.c:361 builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
+#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
+#: builtin/merge.c:356 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr ""
@@ -323,7 +499,7 @@ msgstr ""
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
@@ -341,13 +517,13 @@ msgstr ""
msgid "index-pack died"
msgstr ""
-#: color.c:275
+#: color.c:290
#, c-format
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
-#: builtin/am.c:2134
+#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
+#: builtin/am.c:2119
#, c-format
msgid "could not parse %s"
msgstr ""
@@ -361,128 +537,190 @@ msgstr ""
msgid "memory exhausted"
msgstr ""
-#: config.c:475 config.c:477
+#: config.c:516
#, c-format
-msgid "bad config line %d in %s %s"
+msgid "bad config line %d in blob %s"
msgstr ""
-#: config.c:593
+#: config.c:520
#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
+msgid "bad config line %d in file %s"
msgstr ""
-#: config.c:595
+#: config.c:524
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr ""
+
+#: config.c:528
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr ""
+
+#: config.c:532
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr ""
+
+#: config.c:536
+#, c-format
+msgid "bad config line %d in %s"
+msgstr ""
+
+#: config.c:655
+msgid "out of range"
+msgstr ""
+
+#: config.c:655
+msgid "invalid unit"
+msgstr ""
+
+#: config.c:661
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr ""
-#: config.c:680
+#: config.c:666
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr ""
+
+#: config.c:669
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr ""
+
+#: config.c:672
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr ""
+
+#: config.c:675
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr ""
+
+#: config.c:678
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr ""
+
+#: config.c:681
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr ""
+
+#: config.c:768
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: config.c:761 config.c:772
+#: config.c:849 config.c:860
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
-#: config.c:890
+#: config.c:978
#, c-format
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1228
+#: config.c:1312
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:1284
-msgid "unknown error occured while reading the configuration files"
+#: config.c:1362
+msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: config.c:1629
+#: config.c:1716
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:1631
+#: config.c:1718
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:1690
+#: config.c:1777
#, c-format
msgid "%s has multiple values"
msgstr ""
-#: config.c:2224
+#: config.c:2311
#, c-format
msgid "could not set '%s' to '%s'"
msgstr ""
-#: config.c:2226
+#: config.c:2313
#, c-format
msgid "could not unset '%s'"
msgstr ""
-#: connected.c:69
+#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr ""
+
+#: connected.c:74
msgid "Could not run 'git rev-list'"
msgstr ""
-#: connected.c:89
+#: connected.c:94
msgid "failed write to rev-list"
msgstr ""
-#: connected.c:96
+#: connected.c:101
msgid "failed to close rev-list's stdin"
msgstr ""
-#: date.c:95
+#: date.c:97
msgid "in the future"
msgstr ""
-#: date.c:101
+#: date.c:103
#, c-format
msgid "%lu second ago"
msgid_plural "%lu seconds ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:108
+#: date.c:110
#, c-format
msgid "%lu minute ago"
msgid_plural "%lu minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:115
+#: date.c:117
#, c-format
msgid "%lu hour ago"
msgid_plural "%lu hours ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:122
+#: date.c:124
#, c-format
msgid "%lu day ago"
msgid_plural "%lu days ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:128
+#: date.c:130
#, c-format
msgid "%lu week ago"
msgid_plural "%lu weeks ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:135
+#: date.c:137
#, c-format
msgid "%lu month ago"
msgid_plural "%lu months ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:146
+#: date.c:148
#, c-format
msgid "%lu year"
msgid_plural "%lu years"
@@ -490,14 +728,14 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:149
+#: date.c:151
#, c-format
msgid "%s, %lu month ago"
msgid_plural "%s, %lu months ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:154 date.c:159
+#: date.c:156 date.c:161
#, c-format
msgid "%lu year ago"
msgid_plural "%lu years ago"
@@ -509,7 +747,7 @@ msgstr[1] ""
msgid "failed to read orderfile '%s'"
msgstr ""
-#: diffcore-rename.c:538
+#: diffcore-rename.c:540
msgid "Performing inexact rename detection"
msgstr ""
@@ -535,23 +773,23 @@ msgid ""
"%s"
msgstr ""
-#: diff.c:3007
+#: diff.c:3017
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:3405
+#: diff.c:3415
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:3568
+#: diff.c:3578
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:3582
+#: diff.c:3592
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
@@ -564,39 +802,30 @@ msgstr ""
msgid "Untracked cache is disabled on this system or location."
msgstr ""
-#: gpg-interface.c:166 gpg-interface.c:235
-msgid "could not run gpg."
-msgstr ""
-
#: gpg-interface.c:178
-msgid "gpg did not accept the data"
-msgstr ""
-
-#: gpg-interface.c:189
msgid "gpg failed to sign the data"
msgstr ""
-#: gpg-interface.c:222
-#, c-format
-msgid "could not create temporary file '%s'"
+#: gpg-interface.c:208
+msgid "could not create temporary file"
msgstr ""
-#: gpg-interface.c:224
+#: gpg-interface.c:210
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr ""
-#: grep.c:1718
+#: grep.c:1792
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
+#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: grep.c:1746
+#: grep.c:1820
#, c-format
msgid "'%s': short read"
msgstr ""
@@ -642,7 +871,7 @@ msgstr ""
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: help.c:404 help.c:464
+#: help.c:404 help.c:470
msgid ""
"\n"
"Did you mean this?"
@@ -652,7 +881,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: help.c:460
+#: help.c:466
#, c-format
msgid "%s: %s - %s"
msgstr ""
@@ -678,252 +907,238 @@ msgstr ""
msgid "failed to read the cache"
msgstr ""
-#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
-#: builtin/checkout.c:586 builtin/clone.c:732
+#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
+#: builtin/checkout.c:589 builtin/clone.c:732
msgid "unable to write new index file"
msgstr ""
-#: merge-recursive.c:189
-#, c-format
+#: merge-recursive.c:209
msgid "(bad commit)\n"
msgstr ""
-#: merge-recursive.c:209
+#: merge-recursive.c:231
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr ""
-#: merge-recursive.c:270
+#: merge-recursive.c:301
msgid "error building trees"
msgstr ""
-#: merge-recursive.c:689
+#: merge-recursive.c:720
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
-#: merge-recursive.c:700
+#: merge-recursive.c:731
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: merge-recursive.c:714 merge-recursive.c:735
+#: merge-recursive.c:745 merge-recursive.c:764
msgid ": perhaps a D/F conflict?"
msgstr ""
-#: merge-recursive.c:725
+#: merge-recursive.c:754
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:765
+#: merge-recursive.c:796
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
-#: merge-recursive.c:767
+#: merge-recursive.c:798
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:790 builtin/clone.c:376
+#: merge-recursive.c:822
#, c-format
-msgid "failed to open '%s'"
+msgid "failed to open '%s': %s"
msgstr ""
-#: merge-recursive.c:798
+#: merge-recursive.c:833
#, c-format
-msgid "failed to symlink '%s'"
+msgid "failed to symlink '%s': %s"
msgstr ""
-#: merge-recursive.c:801
+#: merge-recursive.c:838
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:939
+#: merge-recursive.c:978
msgid "Failed to execute internal merge"
msgstr ""
-#: merge-recursive.c:943
+#: merge-recursive.c:982
#, c-format
msgid "Unable to add %s to database"
msgstr ""
-#: merge-recursive.c:959
-msgid "unsupported object type in the tree"
-msgstr ""
-
-#: merge-recursive.c:1034 merge-recursive.c:1048
+#: merge-recursive.c:1081 merge-recursive.c:1095
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
-#: merge-recursive.c:1040 merge-recursive.c:1053
+#: merge-recursive.c:1087 merge-recursive.c:1100
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
-#: merge-recursive.c:1094
+#: merge-recursive.c:1143
msgid "rename"
msgstr ""
-#: merge-recursive.c:1094
+#: merge-recursive.c:1143
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1150
+#: merge-recursive.c:1200
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1172
+#: merge-recursive.c:1225
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: merge-recursive.c:1177
+#: merge-recursive.c:1230
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1231
+#: merge-recursive.c:1292
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:1261
+#: merge-recursive.c:1325
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr ""
-#: merge-recursive.c:1460
+#: merge-recursive.c:1531
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
-#: merge-recursive.c:1470
+#: merge-recursive.c:1546
#, c-format
msgid "Adding merged %s"
msgstr ""
-#: merge-recursive.c:1475 merge-recursive.c:1677
+#: merge-recursive.c:1553 merge-recursive.c:1766
#, c-format
msgid "Adding as %s instead"
msgstr ""
-#: merge-recursive.c:1526
+#: merge-recursive.c:1610
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-recursive.c:1529
+#: merge-recursive.c:1613
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-recursive.c:1581
+#: merge-recursive.c:1666
msgid "modify"
msgstr ""
-#: merge-recursive.c:1581
+#: merge-recursive.c:1666
msgid "modified"
msgstr ""
-#: merge-recursive.c:1591
+#: merge-recursive.c:1676
msgid "content"
msgstr ""
-#: merge-recursive.c:1598
+#: merge-recursive.c:1683
msgid "add/add"
msgstr ""
-#: merge-recursive.c:1632
+#: merge-recursive.c:1718
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:1646
+#: merge-recursive.c:1732
#, c-format
msgid "Auto-merging %s"
msgstr ""
-#: merge-recursive.c:1650 git-submodule.sh:941
+#: merge-recursive.c:1736 git-submodule.sh:919
msgid "submodule"
msgstr ""
-#: merge-recursive.c:1651
+#: merge-recursive.c:1737
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:1737
+#: merge-recursive.c:1831
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:1762
+#: merge-recursive.c:1857
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:1768
+#: merge-recursive.c:1863
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:1773
+#: merge-recursive.c:1868
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: merge-recursive.c:1781
+#: merge-recursive.c:1877
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:1798
-msgid "Fatal merge failure, shouldn't happen."
-msgstr ""
-
-#: merge-recursive.c:1817
+#: merge-recursive.c:1914
msgid "Already up-to-date!"
msgstr ""
-#: merge-recursive.c:1826
+#: merge-recursive.c:1923
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:1856
-#, c-format
-msgid "Unprocessed path??? %s"
-msgstr ""
-
-#: merge-recursive.c:1904
+#: merge-recursive.c:2006
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:1917
+#: merge-recursive.c:2019
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:1954
+#: merge-recursive.c:2058
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:2011
+#: merge-recursive.c:2121
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
+#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
msgid "Unable to write index."
msgstr ""
@@ -983,7 +1198,7 @@ msgstr ""
msgid "malformed object name '%s'"
msgstr ""
-#: path.c:796
+#: path.c:798
#, c-format
msgid "Could not make %s writable by group"
msgstr ""
@@ -1048,7 +1263,7 @@ msgid ""
"Perhaps you forgot to add either ':/' or '.' ?"
msgstr ""
-#: pretty.c:971
+#: pretty.c:973
msgid "unable to parse --pretty format"
msgstr ""
@@ -1070,23 +1285,22 @@ msgid ""
"Using version %i"
msgstr ""
-#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
-#: builtin/merge.c:995
+#: refs.c:551 builtin/merge.c:840
#, c-format
msgid "Could not open '%s' for writing"
msgstr ""
-#: refs/files-backend.c:2243
+#: refs/files-backend.c:2534
#, c-format
msgid "could not delete reference %s: %s"
msgstr ""
-#: refs/files-backend.c:2246
+#: refs/files-backend.c:2537
#, c-format
msgid "could not delete references: %s"
msgstr ""
-#: refs/files-backend.c:2255
+#: refs/files-backend.c:2546
#, c-format
msgid "could not remove reference %s"
msgstr ""
@@ -1244,74 +1458,74 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: remote.c:1678 remote.c:1721
+#: remote.c:1677 remote.c:1720
msgid "HEAD does not point to a branch"
msgstr ""
-#: remote.c:1687
+#: remote.c:1686
#, c-format
msgid "no such branch: '%s'"
msgstr ""
-#: remote.c:1690
+#: remote.c:1689
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr ""
-#: remote.c:1696
+#: remote.c:1695
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: remote.c:1711
+#: remote.c:1710
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: remote.c:1726
+#: remote.c:1725
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: remote.c:1737
+#: remote.c:1736
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: remote.c:1750
+#: remote.c:1749
msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: remote.c:1772
+#: remote.c:1771
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: remote.c:2074
+#: remote.c:2073
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: remote.c:2078
+#: remote.c:2077
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: remote.c:2081
+#: remote.c:2080
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr ""
-#: remote.c:2085
+#: remote.c:2084
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2091
+#: remote.c:2090
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: remote.c:2094
+#: remote.c:2093
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1319,11 +1533,11 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2102
+#: remote.c:2101
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: remote.c:2105
+#: remote.c:2104
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1334,20 +1548,20 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2115
+#: remote.c:2114
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: revision.c:2142
+#: revision.c:2132
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2145
+#: revision.c:2135
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2339
+#: revision.c:2329
msgid "--first-parent is incompatible with --bisect"
msgstr ""
@@ -1360,24 +1574,28 @@ msgstr ""
msgid "dup2(%d,%d) failed"
msgstr ""
-#: send-pack.c:295
+#: send-pack.c:298
msgid "failed to sign the push certificate"
msgstr ""
-#: send-pack.c:404
+#: send-pack.c:411
msgid "the receiving end does not support --signed push"
msgstr ""
-#: send-pack.c:406
+#: send-pack.c:413
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
-#: send-pack.c:418
+#: send-pack.c:425
msgid "the receiving end does not support --atomic push"
msgstr ""
+#: send-pack.c:430
+msgid "the receiving end does not support push options"
+msgstr ""
+
#: sequencer.c:174
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
@@ -1391,14 +1609,14 @@ msgid ""
"and commit the result with 'git commit'"
msgstr ""
-#: sequencer.c:190 sequencer.c:833 sequencer.c:912
+#: sequencer.c:190 sequencer.c:841 sequencer.c:924
#, c-format
msgid "Could not write to %s"
msgstr ""
-#: sequencer.c:193
+#: sequencer.c:193 sequencer.c:843 sequencer.c:928
#, c-format
-msgid "Error wrapping up %s"
+msgid "Error wrapping up %s."
msgstr ""
#: sequencer.c:208
@@ -1413,202 +1631,232 @@ msgstr ""
msgid "Commit your changes or stash them to proceed."
msgstr ""
+#: sequencer.c:228
+#, c-format
+msgid "%s: fast-forward"
+msgstr ""
+
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:300
+#: sequencer.c:303
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:318
+#: sequencer.c:321
msgid "Could not resolve HEAD commit\n"
msgstr ""
-#: sequencer.c:338
+#: sequencer.c:341
msgid "Unable to update cache tree\n"
msgstr ""
-#: sequencer.c:390
+#: sequencer.c:393
#, c-format
msgid "Could not parse commit %s\n"
msgstr ""
-#: sequencer.c:395
+#: sequencer.c:398
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr ""
-#: sequencer.c:460
+#: sequencer.c:463
msgid "Your index file is unmerged."
msgstr ""
-#: sequencer.c:479
+#: sequencer.c:482
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:487
+#: sequencer.c:490
#, c-format
msgid "Commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:491
+#: sequencer.c:494
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr ""
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:504
+#: sequencer.c:507
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:508
+#: sequencer.c:511
#, c-format
msgid "Cannot get commit message for %s"
msgstr ""
-#: sequencer.c:594
+#: sequencer.c:597
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:595
+#: sequencer.c:598
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:630
+#: sequencer.c:633
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:638
+#: sequencer.c:641
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:642
+#: sequencer.c:645
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:702
-#, c-format
-msgid "Cannot %s during a %s"
+#: sequencer.c:705
+msgid "Cannot revert during another revert."
+msgstr ""
+
+#: sequencer.c:706
+msgid "Cannot revert during a cherry-pick."
+msgstr ""
+
+#: sequencer.c:709
+msgid "Cannot cherry-pick during a revert."
+msgstr ""
+
+#: sequencer.c:710
+msgid "Cannot cherry-pick during another cherry-pick."
msgstr ""
-#: sequencer.c:724
+#: sequencer.c:732
#, c-format
msgid "Could not parse line %d."
msgstr ""
-#: sequencer.c:729
+#: sequencer.c:737
msgid "No commits parsed."
msgstr ""
-#: sequencer.c:741
+#: sequencer.c:749
#, c-format
msgid "Could not open %s"
msgstr ""
-#: sequencer.c:745
+#: sequencer.c:753
#, c-format
msgid "Could not read %s."
msgstr ""
-#: sequencer.c:752
+#: sequencer.c:760
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr ""
-#: sequencer.c:782
+#: sequencer.c:790
#, c-format
msgid "Invalid key: %s"
msgstr ""
-#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52
+#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
#, c-format
msgid "Invalid value for %s: %s"
msgstr ""
-#: sequencer.c:795
+#: sequencer.c:803
#, c-format
msgid "Malformed options sheet: %s"
msgstr ""
-#: sequencer.c:814
+#: sequencer.c:822
msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: sequencer.c:815
+#: sequencer.c:823
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: sequencer.c:819
+#: sequencer.c:827
#, c-format
msgid "Could not create sequencer directory %s"
msgstr ""
-#: sequencer.c:835 sequencer.c:916
-#, c-format
-msgid "Error wrapping up %s."
-msgstr ""
-
-#: sequencer.c:854 sequencer.c:986
+#: sequencer.c:862 sequencer.c:998
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:856
+#: sequencer.c:864
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:858
+#: sequencer.c:866 sequencer.c:900
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
+#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
#, c-format
msgid "cannot open %s"
msgstr ""
-#: sequencer.c:880
+#: sequencer.c:888
#, c-format
msgid "cannot read %s: %s"
msgstr ""
-#: sequencer.c:881
+#: sequencer.c:889
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:887
+#: sequencer.c:895
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:909
+#: sequencer.c:921
#, c-format
msgid "Could not format %s."
msgstr ""
-#: sequencer.c:1054
+#: sequencer.c:1066
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:1057
+#: sequencer.c:1069
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:1091
+#: sequencer.c:1102
msgid "Can't revert as initial commit"
msgstr ""
-#: sequencer.c:1092
-msgid "Can't cherry-pick into empty head"
+#: setup.c:160
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+
+#: setup.c:173
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:248
+#: setup.c:223
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+
+#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
#, c-format
msgid "failed to read %s"
msgstr ""
@@ -1622,16 +1870,48 @@ msgstr ""
msgid "unknown repository extensions found:"
msgstr ""
-#: sha1_file.c:1080
+#: setup.c:762
+#, c-format
+msgid "Not a git repository (or any of the parent directories): %s"
+msgstr ""
+
+#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+msgid "Cannot come back to cwd"
+msgstr ""
+
+#: setup.c:845
+msgid "Unable to read current working directory"
+msgstr ""
+
+#: setup.c:920
+#, c-format
+msgid ""
+"Not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgstr ""
+
+#: setup.c:927
+#, c-format
+msgid "Cannot change to '%s/..'"
+msgstr ""
+
+#: setup.c:989
+#, c-format
+msgid ""
+"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+
+#: sha1_file.c:1046
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: sha1_file.c:2458
+#: sha1_file.c:2434
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: sha1_file.c:2462
+#: sha1_file.c:2438
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
@@ -1676,7 +1956,7 @@ msgstr ""
msgid "negative values not allowed for submodule.fetchJobs"
msgstr ""
-#: submodule-config.c:355
+#: submodule-config.c:358
#, c-format
msgid "invalid value for %s"
msgstr ""
@@ -1735,6 +2015,43 @@ msgstr ""
msgid "could not rename temporary file to %s"
msgstr ""
+#: transport.c:62
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr ""
+
+#: transport.c:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr ""
+
+#: transport.c:771
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+
+#: transport.c:775
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+
+#: transport.c:783
+msgid "Aborting."
+msgstr ""
+
#: transport-helper.c:1041
#, c-format
msgid "Could not read ref %s"
@@ -1744,7 +2061,7 @@ msgstr ""
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
-"%%sPlease commit your changes or stash them before you can switch branches."
+"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
#: unpack-trees.c:66
@@ -1758,7 +2075,7 @@ msgstr ""
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you can merge."
+"%%sPlease commit your changes or stash them before you merge."
msgstr ""
#: unpack-trees.c:71
@@ -1772,7 +2089,7 @@ msgstr ""
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you can %s."
+"%%sPlease commit your changes or stash them before you %s."
msgstr ""
#: unpack-trees.c:76
@@ -1793,7 +2110,7 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you can switch branches."
+"%%sPlease move or remove them before you switch branches."
msgstr ""
#: unpack-trees.c:87
@@ -1807,7 +2124,7 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you can merge."
+"%%sPlease move or remove them before you merge."
msgstr ""
#: unpack-trees.c:92
@@ -1821,7 +2138,7 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you can %s."
+"%%sPlease move or remove them before you %s."
msgstr ""
#: unpack-trees.c:97
@@ -1836,7 +2153,7 @@ msgstr ""
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
-"%%sPlease move or remove them before you can switch branches."
+"%%sPlease move or remove them before you switch branches."
msgstr ""
#: unpack-trees.c:104
@@ -1851,7 +2168,7 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you can merge."
+"%%sPlease move or remove them before you merge."
msgstr ""
#: unpack-trees.c:109
@@ -1865,7 +2182,7 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you can %s."
+"%%sPlease move or remove them before you %s."
msgstr ""
#: unpack-trees.c:114
@@ -1941,43 +2258,43 @@ msgstr ""
msgid "invalid '..' path segment"
msgstr ""
-#: wrapper.c:222 wrapper.c:381
+#: worktree.c:282
+#, c-format
+msgid "failed to read '%s'"
+msgstr ""
+
+#: wrapper.c:222 wrapper.c:392
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr ""
-#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
#, c-format
msgid "could not open '%s' for writing"
msgstr ""
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
-#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
+#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
#: builtin/pull.c:407
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: wrapper.c:594 wrapper.c:615
+#: wrapper.c:605 wrapper.c:626
#, c-format
msgid "unable to access '%s'"
msgstr ""
-#: wrapper.c:623
+#: wrapper.c:634
msgid "unable to get current working directory"
msgstr ""
-#: wrapper.c:650
-#, c-format
-msgid "could not open %s for writing"
-msgstr ""
-
-#: wrapper.c:661 builtin/am.c:410
+#: wrapper.c:658
#, c-format
msgid "could not write to %s"
msgstr ""
-#: wrapper.c:667
+#: wrapper.c:660
#, c-format
msgid "could not close %s"
msgstr ""
@@ -2007,11 +2324,11 @@ msgstr ""
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:198 wt-status.c:881
+#: wt-status.c:198 wt-status.c:882
msgid "Changes to be committed:"
msgstr ""
-#: wt-status.c:216 wt-status.c:890
+#: wt-status.c:216 wt-status.c:891
msgid "Changes not staged for commit:"
msgstr ""
@@ -2065,11 +2382,6 @@ msgstr ""
msgid "both modified:"
msgstr ""
-#: wt-status.c:266
-#, c-format
-msgid "bug: unhandled unmerged status %x"
-msgstr ""
-
#: wt-status.c:274
msgid "new file:"
msgstr ""
@@ -2114,233 +2426,232 @@ msgstr ""
msgid "untracked content, "
msgstr ""
-#: wt-status.c:391
-#, c-format
-msgid "bug: unhandled diff status %c"
-msgstr ""
-
-#: wt-status.c:755
+#: wt-status.c:756
msgid "Submodules changed but not updated:"
msgstr ""
-#: wt-status.c:757
+#: wt-status.c:758
msgid "Submodule changes to be committed:"
msgstr ""
-#: wt-status.c:838
+#: wt-status.c:839
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
msgstr ""
-#: wt-status.c:949
+#: wt-status.c:950
msgid "You have unmerged paths."
msgstr ""
-#: wt-status.c:952
+#: wt-status.c:953
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: wt-status.c:956
+#: wt-status.c:955
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr ""
+
+#: wt-status.c:960
msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: wt-status.c:959
+#: wt-status.c:963
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: wt-status.c:969
+#: wt-status.c:973
msgid "You are in the middle of an am session."
msgstr ""
-#: wt-status.c:972
+#: wt-status.c:976
msgid "The current patch is empty."
msgstr ""
-#: wt-status.c:976
+#: wt-status.c:980
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: wt-status.c:978
+#: wt-status.c:982
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:980
+#: wt-status.c:984
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: wt-status.c:1105
+#: wt-status.c:1109
msgid "No commands done."
msgstr ""
-#: wt-status.c:1108
+#: wt-status.c:1112
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:1119
+#: wt-status.c:1123
#, c-format
msgid " (see more in file %s)"
msgstr ""
-#: wt-status.c:1124
+#: wt-status.c:1128
msgid "No commands remaining."
msgstr ""
-#: wt-status.c:1127
+#: wt-status.c:1131
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:1135
+#: wt-status.c:1139
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: wt-status.c:1148
+#: wt-status.c:1152
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1153
+#: wt-status.c:1157
msgid "You are currently rebasing."
msgstr ""
-#: wt-status.c:1167
+#: wt-status.c:1171
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1169
+#: wt-status.c:1173
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1171
+#: wt-status.c:1175
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: wt-status.c:1177
+#: wt-status.c:1181
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1181
+#: wt-status.c:1185
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1186
+#: wt-status.c:1190
msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: wt-status.c:1189
+#: wt-status.c:1193
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1193
+#: wt-status.c:1197
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1198
+#: wt-status.c:1202
msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: wt-status.c:1201
+#: wt-status.c:1205
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: wt-status.c:1203
+#: wt-status.c:1207
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: wt-status.c:1213
+#: wt-status.c:1217
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: wt-status.c:1218
+#: wt-status.c:1222
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1221
+#: wt-status.c:1225
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1223
+#: wt-status.c:1227
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: wt-status.c:1232
+#: wt-status.c:1236
#, c-format
msgid "You are currently reverting commit %s."
msgstr ""
-#: wt-status.c:1237
+#: wt-status.c:1241
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1240
+#: wt-status.c:1244
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1242
+#: wt-status.c:1246
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: wt-status.c:1253
+#: wt-status.c:1257
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: wt-status.c:1257
+#: wt-status.c:1261
msgid "You are currently bisecting."
msgstr ""
-#: wt-status.c:1260
+#: wt-status.c:1264
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1460
+#: wt-status.c:1464
msgid "On branch "
msgstr ""
-#: wt-status.c:1466
+#: wt-status.c:1470
msgid "interactive rebase in progress; onto "
msgstr ""
-#: wt-status.c:1468
+#: wt-status.c:1472
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1473
+#: wt-status.c:1477
msgid "HEAD detached at "
msgstr ""
-#: wt-status.c:1475
+#: wt-status.c:1479
msgid "HEAD detached from "
msgstr ""
-#: wt-status.c:1478
+#: wt-status.c:1482
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1496
+#: wt-status.c:1500
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1510
+#: wt-status.c:1514
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1512
+#: wt-status.c:1516
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1516
+#: wt-status.c:1520
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2348,78 +2659,78 @@ msgid ""
"new files yourself (see 'git help status')."
msgstr ""
-#: wt-status.c:1522
+#: wt-status.c:1526
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1524
+#: wt-status.c:1528
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1530
+#: wt-status.c:1534
msgid "No changes"
msgstr ""
-#: wt-status.c:1535
+#: wt-status.c:1539
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1538
+#: wt-status.c:1542
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1541
+#: wt-status.c:1545
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1544
+#: wt-status.c:1548
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1547
+#: wt-status.c:1551
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1550 wt-status.c:1555
+#: wt-status.c:1554 wt-status.c:1559
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1553
+#: wt-status.c:1557
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1557
+#: wt-status.c:1561
#, c-format
-msgid "nothing to commit, working directory clean\n"
+msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: wt-status.c:1664
+#: wt-status.c:1668
msgid "Initial commit on "
msgstr ""
-#: wt-status.c:1668
+#: wt-status.c:1672
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1697
+#: wt-status.c:1701
msgid "gone"
msgstr ""
-#: wt-status.c:1699 wt-status.c:1707
+#: wt-status.c:1703 wt-status.c:1711
msgid "behind "
msgstr ""
-#: wt-status.c:1702 wt-status.c:1705
+#: wt-status.c:1706 wt-status.c:1709
msgid "ahead "
msgstr ""
@@ -2437,287 +2748,301 @@ msgstr ""
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:70 builtin/commit.c:280
+#: builtin/add.c:71 builtin/commit.c:281
msgid "updating files failed"
msgstr ""
-#: builtin/add.c:80
+#: builtin/add.c:81
#, c-format
msgid "remove '%s'\n"
msgstr ""
-#: builtin/add.c:134
+#: builtin/add.c:136
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:194 builtin/rev-parse.c:811
+#: builtin/add.c:196 builtin/rev-parse.c:811
msgid "Could not read the index"
msgstr ""
-#: builtin/add.c:205
+#: builtin/add.c:207
#, c-format
msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/add.c:209
+#: builtin/add.c:211
msgid "Could not write patch"
msgstr ""
-#: builtin/add.c:212
+#: builtin/add.c:214
msgid "editing patch failed"
msgstr ""
-#: builtin/add.c:215
+#: builtin/add.c:217
#, c-format
msgid "Could not stat '%s'"
msgstr ""
-#: builtin/add.c:217
+#: builtin/add.c:219
msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/add.c:222
+#: builtin/add.c:224
#, c-format
msgid "Could not apply '%s'"
msgstr ""
-#: builtin/add.c:232
+#: builtin/add.c:234
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
-#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
+#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr ""
-#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
-#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
-#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
+#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
+#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
msgid "be verbose"
msgstr ""
-#: builtin/add.c:252
+#: builtin/add.c:256
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
+#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
msgid "select hunks interactively"
msgstr ""
-#: builtin/add.c:254
+#: builtin/add.c:258
msgid "edit current diff and apply"
msgstr ""
-#: builtin/add.c:255
+#: builtin/add.c:259
msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/add.c:256
+#: builtin/add.c:260
msgid "update tracked files"
msgstr ""
-#: builtin/add.c:257
+#: builtin/add.c:261
msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/add.c:258
+#: builtin/add.c:262
msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/add.c:261
+#: builtin/add.c:265
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/add.c:263
+#: builtin/add.c:267
msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/add.c:264
+#: builtin/add.c:268
msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/add.c:265
+#: builtin/add.c:269
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:287
+#: builtin/add.c:270 builtin/update-index.c:958
+msgid "(+/-)x"
+msgstr ""
+
+#: builtin/add.c:270 builtin/update-index.c:959
+msgid "override the executable bit of the listed files"
+msgstr ""
+
+#: builtin/add.c:292
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/add.c:294
+#: builtin/add.c:300
msgid "adding files failed"
msgstr ""
-#: builtin/add.c:330
+#: builtin/add.c:336
msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/add.c:337
+#: builtin/add.c:343
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
#: builtin/add.c:352
#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr ""
+
+#: builtin/add.c:367
+#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/add.c:353
+#: builtin/add.c:368
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
+#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
#: builtin/submodule--helper.c:240
msgid "index file corrupt"
msgstr ""
-#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
+#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
msgid "Unable to write new index file"
msgstr ""
-#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
+#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
#, c-format
msgid "could not read '%s'"
msgstr ""
-#: builtin/am.c:430
+#: builtin/am.c:426
msgid "could not parse author script"
msgstr ""
-#: builtin/am.c:507
+#: builtin/am.c:503
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/am.c:548 builtin/notes.c:300
+#: builtin/am.c:544 builtin/notes.c:301
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/am.c:585 builtin/notes.c:315
+#: builtin/am.c:581 builtin/notes.c:316
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/am.c:611
+#: builtin/am.c:607
msgid "fseek failed"
msgstr ""
-#: builtin/am.c:788
+#: builtin/am.c:787
#, c-format
msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/am.c:853
+#: builtin/am.c:852
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/am.c:900
+#: builtin/am.c:899
msgid "invalid timestamp"
msgstr ""
-#: builtin/am.c:903 builtin/am.c:911
+#: builtin/am.c:902 builtin/am.c:910
msgid "invalid Date line"
msgstr ""
-#: builtin/am.c:908
+#: builtin/am.c:907
msgid "invalid timezone offset"
msgstr ""
-#: builtin/am.c:995
+#: builtin/am.c:996
msgid "Patch format detection failed."
msgstr ""
-#: builtin/am.c:1000 builtin/clone.c:380
+#: builtin/am.c:1001 builtin/clone.c:380
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/am.c:1004
+#: builtin/am.c:1005
msgid "Failed to split patches."
msgstr ""
-#: builtin/am.c:1136 builtin/commit.c:365
+#: builtin/am.c:1137 builtin/commit.c:366
msgid "unable to write index file"
msgstr ""
-#: builtin/am.c:1187
+#: builtin/am.c:1188
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/am.c:1188
+#: builtin/am.c:1189
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/am.c:1189
+#: builtin/am.c:1190
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/am.c:1327
+#: builtin/am.c:1328
msgid "Patch is empty. Was it split wrong?"
msgstr ""
-#: builtin/am.c:1401 builtin/log.c:1516
+#: builtin/am.c:1402 builtin/log.c:1543
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/am.c:1428
+#: builtin/am.c:1429
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: builtin/am.c:1630
+#: builtin/am.c:1602
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/am.c:1632
+#: builtin/am.c:1604
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/am.c:1651
+#: builtin/am.c:1623
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/am.c:1657
+#: builtin/am.c:1629
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/am.c:1672
+#: builtin/am.c:1654
msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/am.c:1696 builtin/merge.c:636
+#: builtin/am.c:1679 builtin/merge.c:628
msgid "git write-tree failed to write a tree"
msgstr ""
-#: builtin/am.c:1703
+#: builtin/am.c:1686
msgid "applying to an empty history"
msgstr ""
-#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
-#: builtin/merge.c:866
+#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
+#: builtin/merge.c:823
msgid "failed to write commit object"
msgstr ""
-#: builtin/am.c:1748 builtin/am.c:1752
+#: builtin/am.c:1731 builtin/am.c:1735
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/am.c:1768
+#: builtin/am.c:1751
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/am.c:1773
+#: builtin/am.c:1756
msgid "Commit Body is:"
msgstr ""
@@ -2725,296 +3050,296 @@ msgstr ""
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1783
+#: builtin/am.c:1766
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/am.c:1833
+#: builtin/am.c:1816
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:1868 builtin/am.c:1940
+#: builtin/am.c:1853 builtin/am.c:1925
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:1884
+#: builtin/am.c:1869
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:1892
+#: builtin/am.c:1877
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/am.c:1898
+#: builtin/am.c:1883
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr ""
-#: builtin/am.c:1943
+#: builtin/am.c:1928
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
-#: builtin/am.c:1950
+#: builtin/am.c:1935
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
msgstr ""
-#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
+#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/am.c:2110
+#: builtin/am.c:2095
msgid "failed to clean index"
msgstr ""
-#: builtin/am.c:2144
+#: builtin/am.c:2129
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/am.c:2205
+#: builtin/am.c:2192
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/am.c:2238
+#: builtin/am.c:2225
msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr ""
-#: builtin/am.c:2239
+#: builtin/am.c:2226
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/am.c:2245
+#: builtin/am.c:2232
msgid "run interactively"
msgstr ""
-#: builtin/am.c:2247
+#: builtin/am.c:2234
msgid "historical option -- no-op"
msgstr ""
-#: builtin/am.c:2249
+#: builtin/am.c:2236
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
-#: builtin/repack.c:171
+#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
+#: builtin/repack.c:172
msgid "be quiet"
msgstr ""
-#: builtin/am.c:2252
+#: builtin/am.c:2239
msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/am.c:2255
+#: builtin/am.c:2242
msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/am.c:2257
+#: builtin/am.c:2244
msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2259
+#: builtin/am.c:2246
msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2261
+#: builtin/am.c:2248
msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2263
+#: builtin/am.c:2250
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/am.c:2266
+#: builtin/am.c:2253
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/am.c:2269
+#: builtin/am.c:2256
msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/am.c:2270 builtin/apply.c:4546
+#: builtin/am.c:2257 builtin/apply.c:4837
msgid "action"
msgstr ""
-#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
-#: builtin/am.c:2298
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
+#: builtin/am.c:2285
msgid "pass it through git-apply"
msgstr ""
-#: builtin/am.c:2279 builtin/apply.c:4570
+#: builtin/am.c:2266 builtin/apply.c:4861
msgid "root"
msgstr ""
-#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
-#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
+#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
-#: builtin/submodule--helper.c:770
+#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:826
msgid "path"
msgstr ""
-#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134
-#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182
+#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134
+#: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185
#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
#: parse-options.h:132 parse-options.h:134 parse-options.h:244
msgid "n"
msgstr ""
-#: builtin/am.c:2291 builtin/apply.c:4514
+#: builtin/am.c:2278 builtin/apply.c:4805
msgid "num"
msgstr ""
-#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr ""
-#: builtin/am.c:2295
+#: builtin/am.c:2282
msgid "format the patch(es) are in"
msgstr ""
-#: builtin/am.c:2301
+#: builtin/am.c:2288
msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/am.c:2303
+#: builtin/am.c:2290
msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/am.c:2306
+#: builtin/am.c:2293
msgid "synonyms for --continue"
msgstr ""
-#: builtin/am.c:2309
+#: builtin/am.c:2296
msgid "skip the current patch"
msgstr ""
-#: builtin/am.c:2312
+#: builtin/am.c:2299
msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/am.c:2316
+#: builtin/am.c:2303
msgid "lie about committer date"
msgstr ""
-#: builtin/am.c:2318
+#: builtin/am.c:2305
msgid "use current timestamp for author date"
msgstr ""
-#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr ""
-#: builtin/am.c:2321
+#: builtin/am.c:2308
msgid "GPG-sign commits"
msgstr ""
-#: builtin/am.c:2324
+#: builtin/am.c:2311
msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/am.c:2339
+#: builtin/am.c:2326
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr ""
-#: builtin/am.c:2346
+#: builtin/am.c:2333
msgid "failed to read the index"
msgstr ""
-#: builtin/am.c:2361
+#: builtin/am.c:2348
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/am.c:2385
+#: builtin/am.c:2372
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/am.c:2391
+#: builtin/am.c:2378
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: builtin/apply.c:59
+#: builtin/apply.c:122
msgid "git apply [<options>] [<patch>...]"
msgstr ""
-#: builtin/apply.c:111
+#: builtin/apply.c:153
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr ""
-#: builtin/apply.c:126
+#: builtin/apply.c:169
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: builtin/apply.c:818
+#: builtin/apply.c:854
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: builtin/apply.c:827
+#: builtin/apply.c:863
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: builtin/apply.c:908
+#: builtin/apply.c:947
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: builtin/apply.c:937
+#: builtin/apply.c:984
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: builtin/apply.c:942
+#: builtin/apply.c:989
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: builtin/apply.c:943
+#: builtin/apply.c:990
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: builtin/apply.c:949
+#: builtin/apply.c:995
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: builtin/apply.c:1406
+#: builtin/apply.c:1489
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: builtin/apply.c:1463
+#: builtin/apply.c:1550
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: builtin/apply.c:1480
+#: builtin/apply.c:1567
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -3025,412 +3350,407 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:1646
+#: builtin/apply.c:1743
msgid "new file depends on old contents"
msgstr ""
-#: builtin/apply.c:1648
+#: builtin/apply.c:1745
msgid "deleted file still has contents"
msgstr ""
-#: builtin/apply.c:1674
+#: builtin/apply.c:1774
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: builtin/apply.c:1710
+#: builtin/apply.c:1810
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: builtin/apply.c:1712
+#: builtin/apply.c:1812
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: builtin/apply.c:1715
+#: builtin/apply.c:1815
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: builtin/apply.c:1861
+#: builtin/apply.c:1962
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: builtin/apply.c:1895
+#: builtin/apply.c:1999
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: builtin/apply.c:2048
+#: builtin/apply.c:2154
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: builtin/apply.c:2138
+#: builtin/apply.c:2244
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: builtin/apply.c:2142
+#: builtin/apply.c:2248
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: builtin/apply.c:2775
+#: builtin/apply.c:2901
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: builtin/apply.c:2894
+#: builtin/apply.c:3020
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:2906
+#: builtin/apply.c:3032
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: builtin/apply.c:2912
+#: builtin/apply.c:3038
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: builtin/apply.c:2932
+#: builtin/apply.c:3060
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: builtin/apply.c:3033
+#: builtin/apply.c:3163
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: builtin/apply.c:3039
+#: builtin/apply.c:3169
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: builtin/apply.c:3060
+#: builtin/apply.c:3190
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: builtin/apply.c:3184
+#: builtin/apply.c:3314
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
-#, c-format
-msgid "read of %s failed"
-msgstr ""
-
-#: builtin/apply.c:3237
+#: builtin/apply.c:3370
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: builtin/apply.c:3265 builtin/apply.c:3487
+#: builtin/apply.c:3399 builtin/apply.c:3630
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: builtin/apply.c:3346 builtin/apply.c:3501
+#: builtin/apply.c:3482 builtin/apply.c:3644
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
+#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
#, c-format
msgid "%s: %s"
msgstr ""
-#: builtin/apply.c:3355 builtin/apply.c:3509
+#: builtin/apply.c:3491 builtin/apply.c:3652
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: builtin/apply.c:3457
+#: builtin/apply.c:3597
msgid "removal patch leaves file contents"
msgstr ""
-#: builtin/apply.c:3526
+#: builtin/apply.c:3669
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: builtin/apply.c:3528
+#: builtin/apply.c:3671
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: builtin/apply.c:3687 builtin/apply.c:3689
+#: builtin/apply.c:3822 builtin/apply.c:3824
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: builtin/apply.c:3744
+#: builtin/apply.c:3879
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: builtin/apply.c:3747
+#: builtin/apply.c:3882
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: builtin/apply.c:3767
+#: builtin/apply.c:3902
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: builtin/apply.c:3772
+#: builtin/apply.c:3907
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: builtin/apply.c:3792
+#: builtin/apply.c:3927
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: builtin/apply.c:3796
+#: builtin/apply.c:3931
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: builtin/apply.c:3810
+#: builtin/apply.c:3945
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: builtin/apply.c:4046
+#: builtin/apply.c:4182
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: builtin/apply.c:4075
+#: builtin/apply.c:4215
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: builtin/apply.c:4079
+#: builtin/apply.c:4219
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: builtin/apply.c:4084
+#: builtin/apply.c:4224
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: builtin/apply.c:4087 builtin/apply.c:4195
+#: builtin/apply.c:4227 builtin/apply.c:4340
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: builtin/apply.c:4120
+#: builtin/apply.c:4260
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: builtin/apply.c:4169
+#: builtin/apply.c:4313
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: builtin/apply.c:4256
+#: builtin/apply.c:4403
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: builtin/apply.c:4264
+#: builtin/apply.c:4411
msgid "internal error"
msgstr ""
-#: builtin/apply.c:4267
+#: builtin/apply.c:4414
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:4277
+#: builtin/apply.c:4424
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: builtin/apply.c:4285
+#: builtin/apply.c:4432
#, c-format
msgid "cannot open %s: %s"
msgstr ""
-#: builtin/apply.c:4298
+#: builtin/apply.c:4445
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: builtin/apply.c:4301
+#: builtin/apply.c:4448
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: builtin/apply.c:4387
+#: builtin/apply.c:4537
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: builtin/apply.c:4395
+#: builtin/apply.c:4545
msgid "unrecognized input"
msgstr ""
-#: builtin/apply.c:4406
+#: builtin/apply.c:4556
msgid "unable to read index file"
msgstr ""
-#: builtin/apply.c:4509
+#: builtin/apply.c:4701
+msgid "--3way outside a repository"
+msgstr ""
+
+#: builtin/apply.c:4709
+msgid "--index outside a repository"
+msgstr ""
+
+#: builtin/apply.c:4712
+msgid "--cached outside a repository"
+msgstr ""
+
+#: builtin/apply.c:4745
+#, c-format
+msgid "can't open patch '%s'"
+msgstr ""
+
+#: builtin/apply.c:4760
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/apply.c:4766 builtin/apply.c:4776
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/apply.c:4800
msgid "don't apply changes matching the given path"
msgstr ""
-#: builtin/apply.c:4512
+#: builtin/apply.c:4803
msgid "apply changes matching the given path"
msgstr ""
-#: builtin/apply.c:4515
+#: builtin/apply.c:4806
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: builtin/apply.c:4518
+#: builtin/apply.c:4809
msgid "ignore additions made by the patch"
msgstr ""
-#: builtin/apply.c:4520
+#: builtin/apply.c:4811
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: builtin/apply.c:4524
+#: builtin/apply.c:4815
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: builtin/apply.c:4526
+#: builtin/apply.c:4817
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: builtin/apply.c:4528
+#: builtin/apply.c:4819
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: builtin/apply.c:4530
+#: builtin/apply.c:4821
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: builtin/apply.c:4532
+#: builtin/apply.c:4823
msgid "apply a patch without touching the working tree"
msgstr ""
-#: builtin/apply.c:4534
+#: builtin/apply.c:4825
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: builtin/apply.c:4536
+#: builtin/apply.c:4827
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: builtin/apply.c:4538
+#: builtin/apply.c:4829
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: builtin/apply.c:4540
+#: builtin/apply.c:4831
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
msgid "paths are separated with NUL character"
msgstr ""
-#: builtin/apply.c:4545
+#: builtin/apply.c:4836
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: builtin/apply.c:4547
+#: builtin/apply.c:4838
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: builtin/apply.c:4550 builtin/apply.c:4553
+#: builtin/apply.c:4841 builtin/apply.c:4844
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: builtin/apply.c:4556
+#: builtin/apply.c:4847
msgid "apply the patch in reverse"
msgstr ""
-#: builtin/apply.c:4558
+#: builtin/apply.c:4849
msgid "don't expect at least one line of context"
msgstr ""
-#: builtin/apply.c:4560
+#: builtin/apply.c:4851
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: builtin/apply.c:4562
+#: builtin/apply.c:4853
msgid "allow overlapping hunks"
msgstr ""
-#: builtin/apply.c:4565
+#: builtin/apply.c:4856
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: builtin/apply.c:4568
+#: builtin/apply.c:4859
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: builtin/apply.c:4571
+#: builtin/apply.c:4862
msgid "prepend <root> to all filenames"
msgstr ""
-#: builtin/apply.c:4593
-msgid "--3way outside a repository"
-msgstr ""
-
-#: builtin/apply.c:4601
-msgid "--index outside a repository"
-msgstr ""
-
-#: builtin/apply.c:4604
-msgid "--cached outside a repository"
-msgstr ""
-
-#: builtin/apply.c:4623
-#, c-format
-msgid "can't open patch '%s'"
-msgstr ""
-
-#: builtin/apply.c:4637
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/apply.c:4643 builtin/apply.c:4653
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] ""
-msgstr[1] ""
-
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
@@ -3486,103 +3806,103 @@ msgstr ""
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/blame.c:1782
+#: builtin/blame.c:1781
msgid "Blaming lines"
msgstr ""
-#: builtin/blame.c:2531
+#: builtin/blame.c:2536
msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/blame.c:2532
+#: builtin/blame.c:2537
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/blame.c:2533
+#: builtin/blame.c:2538
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:2534
+#: builtin/blame.c:2539
msgid "Show work cost statistics"
msgstr ""
-#: builtin/blame.c:2535
+#: builtin/blame.c:2540
msgid "Force progress reporting"
msgstr ""
-#: builtin/blame.c:2536
+#: builtin/blame.c:2541
msgid "Show output score for blame entries"
msgstr ""
-#: builtin/blame.c:2537
+#: builtin/blame.c:2542
msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/blame.c:2538
+#: builtin/blame.c:2543
msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/blame.c:2539
+#: builtin/blame.c:2544
msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/blame.c:2540
+#: builtin/blame.c:2545
msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/blame.c:2541
+#: builtin/blame.c:2546
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/blame.c:2542
+#: builtin/blame.c:2547
msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2543
+#: builtin/blame.c:2548
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/blame.c:2544
+#: builtin/blame.c:2549
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2545
+#: builtin/blame.c:2550
msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/blame.c:2546
+#: builtin/blame.c:2551
msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:2547
+#: builtin/blame.c:2552
msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/blame.c:2548
+#: builtin/blame.c:2553
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/blame.c:2549
+#: builtin/blame.c:2554
msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/blame.c:2550 builtin/blame.c:2551
+#: builtin/blame.c:2555 builtin/blame.c:2556
msgid "score"
msgstr ""
-#: builtin/blame.c:2550
+#: builtin/blame.c:2555
msgid "Find line copies within and across files"
msgstr ""
-#: builtin/blame.c:2551
+#: builtin/blame.c:2556
msgid "Find line movements within and across files"
msgstr ""
-#: builtin/blame.c:2552
+#: builtin/blame.c:2557
msgid "n,m"
msgstr ""
-#: builtin/blame.c:2552
+#: builtin/blame.c:2557
msgid "Process only line range n,m, counting from 1"
msgstr ""
@@ -3592,7 +3912,7 @@ msgstr ""
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2641
+#: builtin/blame.c:2649
msgid "4 years, 11 months ago"
msgstr ""
@@ -3689,117 +4009,121 @@ msgstr ""
msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:309
+#: builtin/branch.c:312
#, c-format
msgid "[%s: gone]"
msgstr ""
-#: builtin/branch.c:314
+#: builtin/branch.c:317
#, c-format
msgid "[%s]"
msgstr ""
-#: builtin/branch.c:319
+#: builtin/branch.c:322
#, c-format
msgid "[%s: behind %d]"
msgstr ""
-#: builtin/branch.c:321
+#: builtin/branch.c:324
#, c-format
msgid "[behind %d]"
msgstr ""
-#: builtin/branch.c:325
+#: builtin/branch.c:328
#, c-format
msgid "[%s: ahead %d]"
msgstr ""
-#: builtin/branch.c:327
+#: builtin/branch.c:330
#, c-format
msgid "[ahead %d]"
msgstr ""
-#: builtin/branch.c:330
+#: builtin/branch.c:333
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr ""
-#: builtin/branch.c:333
+#: builtin/branch.c:336
#, c-format
msgid "[ahead %d, behind %d]"
msgstr ""
-#: builtin/branch.c:346
+#: builtin/branch.c:349
msgid " **** invalid ref ****"
msgstr ""
-#: builtin/branch.c:372
+#: builtin/branch.c:375
#, c-format
msgid "(no branch, rebasing %s)"
msgstr ""
-#: builtin/branch.c:375
+#: builtin/branch.c:378
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr ""
#. TRANSLATORS: make sure this matches
#. "HEAD detached at " in wt-status.c
-#: builtin/branch.c:381
+#: builtin/branch.c:384
#, c-format
msgid "(HEAD detached at %s)"
msgstr ""
#. TRANSLATORS: make sure this matches
#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:386
+#: builtin/branch.c:389
#, c-format
msgid "(HEAD detached from %s)"
msgstr ""
-#: builtin/branch.c:390
+#: builtin/branch.c:393
msgid "(no branch)"
msgstr ""
-#: builtin/branch.c:541
+#: builtin/branch.c:544
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/branch.c:545
+#: builtin/branch.c:548
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/branch.c:560
+#: builtin/branch.c:563
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:570
+#: builtin/branch.c:573
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:587
+#: builtin/branch.c:590
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:591
+#: builtin/branch.c:594
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:594
+#: builtin/branch.c:597
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:601
+#: builtin/branch.c:604
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:623
-msgid "could not write branch description template"
+#: builtin/branch.c:620
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
msgstr ""
#: builtin/branch.c:651
@@ -3902,8 +4226,8 @@ msgstr ""
msgid "field name to sort on"
msgstr ""
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
-#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
+#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
#: builtin/tag.c:369
msgid "object"
msgstr ""
@@ -4019,61 +4343,61 @@ msgstr ""
msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/cat-file.c:428
+#: builtin/cat-file.c:443
msgid ""
"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
"<type>|--textconv) <object>"
msgstr ""
-#: builtin/cat-file.c:429
+#: builtin/cat-file.c:444
msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
msgstr ""
-#: builtin/cat-file.c:466
+#: builtin/cat-file.c:481
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/cat-file.c:467
+#: builtin/cat-file.c:482
msgid "show object type"
msgstr ""
-#: builtin/cat-file.c:468
+#: builtin/cat-file.c:483
msgid "show object size"
msgstr ""
-#: builtin/cat-file.c:470
+#: builtin/cat-file.c:485
msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/cat-file.c:471
+#: builtin/cat-file.c:486
msgid "pretty-print object's content"
msgstr ""
-#: builtin/cat-file.c:473
+#: builtin/cat-file.c:488
msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/cat-file.c:475
+#: builtin/cat-file.c:490
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/cat-file.c:476
+#: builtin/cat-file.c:491
msgid "buffer --batch output"
msgstr ""
-#: builtin/cat-file.c:478
+#: builtin/cat-file.c:493
msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:496
msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:484
+#: builtin/cat-file.c:499
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:501
msgid "show all objects with --batch or --batch-check"
msgstr ""
@@ -4101,7 +4425,7 @@ msgstr ""
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr ""
@@ -4191,9 +4515,9 @@ msgid "write the content to temporary files"
msgstr ""
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
-#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
-#: builtin/submodule--helper.c:774
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
+#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
+#: builtin/submodule--helper.c:830 builtin/worktree.c:469
msgid "string"
msgstr ""
@@ -4259,10 +4583,6 @@ msgstr ""
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:279 builtin/checkout.c:473
-msgid "corrupt index file"
-msgstr ""
-
#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
@@ -4272,50 +4592,50 @@ msgstr ""
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:622
+#: builtin/checkout.c:625
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:660
+#: builtin/checkout.c:664
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:664 builtin/clone.c:661
+#: builtin/checkout.c:668 builtin/clone.c:661
msgid "unable to update HEAD"
msgstr ""
-#: builtin/checkout.c:668
+#: builtin/checkout.c:672
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:671
+#: builtin/checkout.c:675
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:675
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:677 builtin/checkout.c:1067
+#: builtin/checkout.c:681 builtin/checkout.c:1070
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:679
+#: builtin/checkout.c:683
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:731
+#: builtin/checkout.c:734
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:737
+#: builtin/checkout.c:740
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4330,7 +4650,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:756
+#: builtin/checkout.c:759
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4347,162 +4667,162 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:792
+#: builtin/checkout.c:795
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:796
+#: builtin/checkout.c:799
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:823 builtin/checkout.c:1062
+#: builtin/checkout.c:826 builtin/checkout.c:1065
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:968
+#: builtin/checkout.c:971
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:1008 builtin/worktree.c:212
+#: builtin/checkout.c:1011 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1037
+#: builtin/checkout.c:1040
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1076
+#: builtin/checkout.c:1079
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1079 builtin/checkout.c:1083
+#: builtin/checkout.c:1082 builtin/checkout.c:1086
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
-#: builtin/checkout.c:1098
+#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
+#: builtin/checkout.c:1101
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1106
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
-#: builtin/worktree.c:325
+#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
+#: builtin/worktree.c:326
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1140
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1142
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1143
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1141
-msgid "detach the HEAD at named commit"
+#: builtin/checkout.c:1144 builtin/worktree.c:328
+msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1145
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1147
msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1147
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1148
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1150
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1152
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1153
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1151 builtin/merge.c:230
+#: builtin/checkout.c:1154 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
+#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
msgid "style"
msgstr ""
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1156
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1159
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1161
msgid "second guess 'git checkout <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1163
msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
-#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
+#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117
+#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr ""
-#: builtin/checkout.c:1192
+#: builtin/checkout.c:1195
msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1212
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1217
msgid "Missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1253
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1257
+#: builtin/checkout.c:1260
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr ""
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1265
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1266
+#: builtin/checkout.c:1269
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4633,7 +4953,7 @@ msgid "remove whole directories"
msgstr ""
#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
msgid "pattern"
msgstr ""
@@ -4673,7 +4993,7 @@ msgstr ""
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
msgid "create a bare repository"
msgstr ""
@@ -4701,16 +5021,16 @@ msgstr ""
msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/clone.c:80 builtin/init-db.c:470
+#: builtin/clone.c:80 builtin/init-db.c:473
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:81 builtin/init-db.c:471
+#: builtin/clone.c:81 builtin/init-db.c:474
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:83 builtin/submodule--helper.c:498
-#: builtin/submodule--helper.c:777
+#: builtin/clone.c:83 builtin/submodule--helper.c:495
+#: builtin/submodule--helper.c:833
msgid "reference repository"
msgstr ""
@@ -4734,7 +5054,7 @@ msgstr ""
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667
+#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667
#: builtin/pull.c:201
msgid "depth"
msgstr ""
@@ -4751,11 +5071,11 @@ msgstr ""
msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/clone.c:98 builtin/init-db.c:479
+#: builtin/clone.c:98 builtin/init-db.c:482
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:99 builtin/init-db.c:480
+#: builtin/clone.c:99 builtin/init-db.c:483
msgid "separate git dir from working tree"
msgstr ""
@@ -4767,11 +5087,11 @@ msgstr ""
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr ""
@@ -4801,6 +5121,11 @@ msgstr ""
msgid "reference repository '%s' is grafted"
msgstr ""
+#: builtin/clone.c:376
+#, c-format
+msgid "failed to open '%s'"
+msgstr ""
+
#: builtin/clone.c:384
#, c-format
msgid "%s exists and is not a directory"
@@ -4821,7 +5146,7 @@ msgstr ""
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:449 builtin/clone.c:633
+#: builtin/clone.c:449
#, c-format
msgid "done.\n"
msgstr ""
@@ -4838,12 +5163,7 @@ msgstr ""
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:628
-#, c-format
-msgid "Checking connectivity... "
-msgstr ""
-
-#: builtin/clone.c:631
+#: builtin/clone.c:633
msgid "remote did not send all necessary objects"
msgstr ""
@@ -4860,99 +5180,99 @@ msgstr ""
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:767
+#: builtin/clone.c:766
msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/clone.c:830
+#: builtin/clone.c:829
msgid "cannot repack to clean up"
msgstr ""
-#: builtin/clone.c:832
+#: builtin/clone.c:831
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:864 builtin/receive-pack.c:1731
+#: builtin/clone.c:863 builtin/receive-pack.c:1855
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:868
+#: builtin/clone.c:867
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:879
+#: builtin/clone.c:878
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:882
+#: builtin/clone.c:881
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:895
+#: builtin/clone.c:894
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:901 builtin/fetch.c:1174
+#: builtin/clone.c:900 builtin/fetch.c:1293
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:911
+#: builtin/clone.c:910
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:921
+#: builtin/clone.c:920
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
-#: builtin/worktree.c:220 builtin/worktree.c:247
+#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:939
+#: builtin/clone.c:938
#, c-format
msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:957
+#: builtin/clone.c:956
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:959
+#: builtin/clone.c:958
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:998
+#: builtin/clone.c:997
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1001
+#: builtin/clone.c:1000
msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/clone.c:1006
+#: builtin/clone.c:1005
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:1010
+#: builtin/clone.c:1009
#, c-format
msgid "Don't know how to clone %s"
msgstr ""
-#: builtin/clone.c:1059 builtin/clone.c:1067
+#: builtin/clone.c:1058 builtin/clone.c:1066
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:1070
+#: builtin/clone.c:1069
msgid "You appear to have cloned an empty repository."
msgstr ""
@@ -5055,103 +5375,103 @@ msgid ""
"the remaining commits.\n"
msgstr ""
-#: builtin/commit.c:307
+#: builtin/commit.c:308
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:348
+#: builtin/commit.c:349
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:354
+#: builtin/commit.c:355
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:367
+#: builtin/commit.c:368
msgid "unable to update temporary index"
msgstr ""
-#: builtin/commit.c:369
+#: builtin/commit.c:370
msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
+#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:447
+#: builtin/commit.c:448
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:449
+#: builtin/commit.c:450
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:458
+#: builtin/commit.c:459
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:477
+#: builtin/commit.c:478
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:582
+#: builtin/commit.c:583
#, c-format
msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/commit.c:584
+#: builtin/commit.c:585
#, c-format
msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/commit.c:603
+#: builtin/commit.c:604
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:611
+#: builtin/commit.c:612
#, c-format
msgid "invalid date format: %s"
msgstr ""
-#: builtin/commit.c:655
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr ""
-#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
+#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:704 builtin/shortlog.c:285
+#: builtin/commit.c:705 builtin/shortlog.c:286
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:706
+#: builtin/commit.c:707
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:710
+#: builtin/commit.c:711
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:737 builtin/commit.c:745
+#: builtin/commit.c:738 builtin/commit.c:746
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:742
+#: builtin/commit.c:743
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:796
+#: builtin/commit.c:797
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:814
+#: builtin/commit.c:815
#, c-format
msgid ""
"\n"
@@ -5161,7 +5481,7 @@ msgid ""
"and try again.\n"
msgstr ""
-#: builtin/commit.c:819
+#: builtin/commit.c:820
#, c-format
msgid ""
"\n"
@@ -5171,14 +5491,14 @@ msgid ""
"and try again.\n"
msgstr ""
-#: builtin/commit.c:832
+#: builtin/commit.c:833
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:839
+#: builtin/commit.c:840
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5186,341 +5506,341 @@ msgid ""
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:859
+#: builtin/commit.c:860
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:867
+#: builtin/commit.c:868
#, c-format
msgid "%sDate: %s"
msgstr ""
-#: builtin/commit.c:874
+#: builtin/commit.c:875
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:892
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:949
+#: builtin/commit.c:950
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:964 builtin/tag.c:266
+#: builtin/commit.c:965 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:1066
+#: builtin/commit.c:1067
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/commit.c:1081 builtin/commit.c:1321
+#: builtin/commit.c:1082 builtin/commit.c:1322
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1118
+#: builtin/commit.c:1119
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1148
+#: builtin/commit.c:1149
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1157
+#: builtin/commit.c:1158
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1160
+#: builtin/commit.c:1161
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1162
+#: builtin/commit.c:1163
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1165
+#: builtin/commit.c:1166
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1175
+#: builtin/commit.c:1176
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1177
+#: builtin/commit.c:1178
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/commit.c:1185
+#: builtin/commit.c:1186
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1202
+#: builtin/commit.c:1203
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1204
+#: builtin/commit.c:1205
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1206
+#: builtin/commit.c:1207
msgid "Clever... amending the last one with dirty index."
msgstr ""
-#: builtin/commit.c:1208
+#: builtin/commit.c:1209
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
-#: builtin/commit.c:1220 builtin/tag.c:474
+#: builtin/commit.c:1221 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1225
+#: builtin/commit.c:1226
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:1335 builtin/commit.c:1621
+#: builtin/commit.c:1336 builtin/commit.c:1622
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1337 builtin/commit.c:1623
+#: builtin/commit.c:1338 builtin/commit.c:1624
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
-#: builtin/worktree.c:437
+#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1342 builtin/commit.c:1627
+#: builtin/commit.c:1343 builtin/commit.c:1628
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1345 builtin/commit.c:1630
+#: builtin/commit.c:1346 builtin/commit.c:1631
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
+#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr ""
-#: builtin/commit.c:1348 builtin/commit.c:1633
+#: builtin/commit.c:1349 builtin/commit.c:1634
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1351
+#: builtin/commit.c:1352
msgid "show ignored files"
msgstr ""
-#: builtin/commit.c:1352 parse-options.h:155
+#: builtin/commit.c:1353 parse-options.h:155
msgid "when"
msgstr ""
-#: builtin/commit.c:1353
+#: builtin/commit.c:1354
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1355
+#: builtin/commit.c:1356
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1441
+#: builtin/commit.c:1442
msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/commit.c:1443
+#: builtin/commit.c:1444
msgid "could not parse newly created commit"
msgstr ""
-#: builtin/commit.c:1488
+#: builtin/commit.c:1489
msgid "detached HEAD"
msgstr ""
-#: builtin/commit.c:1491
+#: builtin/commit.c:1492
msgid " (root-commit)"
msgstr ""
-#: builtin/commit.c:1591
+#: builtin/commit.c:1592
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1592
+#: builtin/commit.c:1593
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1594
+#: builtin/commit.c:1595
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1595 builtin/tag.c:351
+#: builtin/commit.c:1596 builtin/tag.c:351
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1596
+#: builtin/commit.c:1597
msgid "author"
msgstr ""
-#: builtin/commit.c:1596
+#: builtin/commit.c:1597
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1597 builtin/gc.c:326
+#: builtin/commit.c:1598 builtin/gc.c:326
msgid "date"
msgstr ""
-#: builtin/commit.c:1597
+#: builtin/commit.c:1598
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
-#: builtin/notes.c:558 builtin/tag.c:349
+#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
+#: builtin/notes.c:559 builtin/tag.c:349
msgid "message"
msgstr ""
-#: builtin/commit.c:1598
+#: builtin/commit.c:1599
msgid "commit message"
msgstr ""
-#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
-#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
+#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
msgid "commit"
msgstr ""
-#: builtin/commit.c:1599
+#: builtin/commit.c:1600
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1600
+#: builtin/commit.c:1601
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:1601
+#: builtin/commit.c:1602
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/commit.c:1602
+#: builtin/commit.c:1603
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1603
+#: builtin/commit.c:1604
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
+#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr ""
-#: builtin/commit.c:1605
+#: builtin/commit.c:1606
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1606
+#: builtin/commit.c:1607
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1607
+#: builtin/commit.c:1608
msgid "default"
msgstr ""
-#: builtin/commit.c:1607 builtin/tag.c:354
+#: builtin/commit.c:1608 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/commit.c:1608
+#: builtin/commit.c:1609
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
+#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr ""
-#: builtin/commit.c:1613
+#: builtin/commit.c:1614
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1614
+#: builtin/commit.c:1615
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1615
+#: builtin/commit.c:1616
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1616
+#: builtin/commit.c:1617
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1617
+#: builtin/commit.c:1618
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1618
+#: builtin/commit.c:1619
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1619
-msgid "bypass pre-commit hook"
+#: builtin/commit.c:1620
+msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/commit.c:1620
+#: builtin/commit.c:1621
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1631
+#: builtin/commit.c:1632
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1632
+#: builtin/commit.c:1633
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1637
+#: builtin/commit.c:1638
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1668
+#: builtin/commit.c:1669
msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/commit.c:1718
+#: builtin/commit.c:1719
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1725
+#: builtin/commit.c:1726
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1744
+#: builtin/commit.c:1745
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1755
+#: builtin/commit.c:1756
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1760
+#: builtin/commit.c:1761
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1808
+#: builtin/commit.c:1809
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5531,139 +5851,139 @@ msgstr ""
msgid "git config [<options>]"
msgstr ""
-#: builtin/config.c:56
+#: builtin/config.c:55
msgid "Config file location"
msgstr ""
-#: builtin/config.c:57
+#: builtin/config.c:56
msgid "use global config file"
msgstr ""
-#: builtin/config.c:58
+#: builtin/config.c:57
msgid "use system config file"
msgstr ""
-#: builtin/config.c:59
+#: builtin/config.c:58
msgid "use repository config file"
msgstr ""
-#: builtin/config.c:60
+#: builtin/config.c:59
msgid "use given config file"
msgstr ""
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "blob-id"
msgstr ""
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "read config from given blob object"
msgstr ""
-#: builtin/config.c:62
+#: builtin/config.c:61
msgid "Action"
msgstr ""
-#: builtin/config.c:63
+#: builtin/config.c:62
msgid "get value: name [value-regex]"
msgstr ""
-#: builtin/config.c:64
+#: builtin/config.c:63
msgid "get all values: key [value-regex]"
msgstr ""
-#: builtin/config.c:65
+#: builtin/config.c:64
msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
-#: builtin/config.c:66
+#: builtin/config.c:65
msgid "get value specific for the URL: section[.var] URL"
msgstr ""
-#: builtin/config.c:67
+#: builtin/config.c:66
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
-#: builtin/config.c:68
+#: builtin/config.c:67
msgid "add a new variable: name value"
msgstr ""
-#: builtin/config.c:69
+#: builtin/config.c:68
msgid "remove a variable: name [value-regex]"
msgstr ""
-#: builtin/config.c:70
+#: builtin/config.c:69
msgid "remove all matches: name [value-regex]"
msgstr ""
-#: builtin/config.c:71
+#: builtin/config.c:70
msgid "rename section: old-name new-name"
msgstr ""
-#: builtin/config.c:72
+#: builtin/config.c:71
msgid "remove a section: name"
msgstr ""
-#: builtin/config.c:73
+#: builtin/config.c:72
msgid "list all"
msgstr ""
-#: builtin/config.c:74
+#: builtin/config.c:73
msgid "open an editor"
msgstr ""
-#: builtin/config.c:75
+#: builtin/config.c:74
msgid "find the color configured: slot [default]"
msgstr ""
-#: builtin/config.c:76
+#: builtin/config.c:75
msgid "find the color setting: slot [stdout-is-tty]"
msgstr ""
-#: builtin/config.c:77
+#: builtin/config.c:76
msgid "Type"
msgstr ""
-#: builtin/config.c:78
+#: builtin/config.c:77
msgid "value is \"true\" or \"false\""
msgstr ""
-#: builtin/config.c:79
+#: builtin/config.c:78
msgid "value is decimal number"
msgstr ""
-#: builtin/config.c:80
+#: builtin/config.c:79
msgid "value is --bool or --int"
msgstr ""
-#: builtin/config.c:81
+#: builtin/config.c:80
msgid "value is a path (file or directory name)"
msgstr ""
-#: builtin/config.c:82
+#: builtin/config.c:81
msgid "Other"
msgstr ""
-#: builtin/config.c:83
+#: builtin/config.c:82
msgid "terminate values with NUL byte"
msgstr ""
-#: builtin/config.c:84
+#: builtin/config.c:83
msgid "show variable names only"
msgstr ""
-#: builtin/config.c:85
+#: builtin/config.c:84
msgid "respect include directives on lookup"
msgstr ""
-#: builtin/config.c:86
+#: builtin/config.c:85
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
-#: builtin/config.c:328
+#: builtin/config.c:327
msgid "unable to parse default color value"
msgstr ""
-#: builtin/config.c:472
+#: builtin/config.c:471
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5673,7 +5993,7 @@ msgid ""
"#\temail = %s\n"
msgstr ""
-#: builtin/config.c:614
+#: builtin/config.c:613
#, c-format
msgid "cannot create configuration file %s"
msgstr ""
@@ -5709,7 +6029,7 @@ msgstr ""
msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/describe.c:250 builtin/log.c:465
+#: builtin/describe.c:250 builtin/log.c:480
#, c-format
msgid "Not a valid object name %s"
msgstr ""
@@ -5901,262 +6221,263 @@ msgstr ""
msgid "anonymize output"
msgstr ""
-#: builtin/fetch.c:20
+#: builtin/fetch.c:21
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/fetch.c:21
+#: builtin/fetch.c:22
msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:92 builtin/pull.c:174
+#: builtin/fetch.c:93 builtin/pull.c:174
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:94 builtin/pull.c:177
+#: builtin/fetch.c:95 builtin/pull.c:177
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:96 builtin/pull.c:180
+#: builtin/fetch.c:97 builtin/pull.c:180
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:97 builtin/pull.c:182
+#: builtin/fetch.c:98 builtin/pull.c:182
msgid "force overwrite of local branch"
msgstr ""
-#: builtin/fetch.c:99
+#: builtin/fetch.c:100
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:101 builtin/pull.c:184
+#: builtin/fetch.c:102 builtin/pull.c:184
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:103
+#: builtin/fetch.c:104
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:105
+#: builtin/fetch.c:106
msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/fetch.c:107 builtin/pull.c:187
+#: builtin/fetch.c:108 builtin/pull.c:187
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:108 builtin/pull.c:190
+#: builtin/fetch.c:109 builtin/pull.c:190
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:109 builtin/pull.c:191
+#: builtin/fetch.c:110 builtin/pull.c:191
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:113 builtin/pull.c:199
+#: builtin/fetch.c:114 builtin/pull.c:199
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:115
+#: builtin/fetch.c:116
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:118 builtin/pull.c:202
+#: builtin/fetch.c:119 builtin/pull.c:202
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:120 builtin/pull.c:205
+#: builtin/fetch.c:121 builtin/pull.c:205
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:122 builtin/log.c:1399
+#: builtin/fetch.c:123 builtin/log.c:1426
msgid "dir"
msgstr ""
-#: builtin/fetch.c:123
+#: builtin/fetch.c:124
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:126
+#: builtin/fetch.c:127
msgid "default mode for recursion"
msgstr ""
-#: builtin/fetch.c:128 builtin/pull.c:208
+#: builtin/fetch.c:129 builtin/pull.c:208
msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/fetch.c:129 builtin/pull.c:210
+#: builtin/fetch.c:130 builtin/pull.c:210
msgid "refmap"
msgstr ""
-#: builtin/fetch.c:130 builtin/pull.c:211
+#: builtin/fetch.c:131 builtin/pull.c:211
msgid "specify fetch refmap"
msgstr ""
-#: builtin/fetch.c:386
+#: builtin/fetch.c:387
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:466
+#: builtin/fetch.c:503
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr ""
+
+#: builtin/fetch.c:592
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:471
+#: builtin/fetch.c:596
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:485
-#, c-format
-msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
+#: builtin/fetch.c:609 builtin/fetch.c:689
+msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:486 builtin/fetch.c:574
-msgid "[rejected]"
+#: builtin/fetch.c:610
+msgid "can't fetch in current branch"
msgstr ""
-#: builtin/fetch.c:497
+#: builtin/fetch.c:619
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
-msgid " (unable to update local ref)"
+#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
+#: builtin/fetch.c:684
+msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:517
+#: builtin/fetch.c:639
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:520
+#: builtin/fetch.c:642
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:523
+#: builtin/fetch.c:645
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:569
-msgid "unable to update local ref"
-msgstr ""
-
-#: builtin/fetch.c:569
+#: builtin/fetch.c:684
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:576
-msgid "(non-fast-forward)"
+#: builtin/fetch.c:689
+msgid "non-fast-forward"
msgstr ""
-#: builtin/fetch.c:619
+#: builtin/fetch.c:733
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:637
+#: builtin/fetch.c:753
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/fetch.c:724 builtin/fetch.c:816
+#: builtin/fetch.c:839 builtin/fetch.c:934
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:735
+#: builtin/fetch.c:850
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/fetch.c:787
+#: builtin/fetch.c:904
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:788
+#: builtin/fetch.c:905
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:820
+#: builtin/fetch.c:937
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:821 builtin/remote.c:1025
+#: builtin/fetch.c:938 builtin/remote.c:1020
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:841
+#: builtin/fetch.c:960
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:860
+#: builtin/fetch.c:979
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:863
+#: builtin/fetch.c:982
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1039
#, c-format
msgid "Don't know how to fetch from %s"
msgstr ""
-#: builtin/fetch.c:1080
+#: builtin/fetch.c:1199
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1082 builtin/remote.c:96
+#: builtin/fetch.c:1201 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1100
+#: builtin/fetch.c:1219
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
-#: builtin/fetch.c:1123
+#: builtin/fetch.c:1242
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1165
+#: builtin/fetch.c:1284
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1286
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1187
+#: builtin/fetch.c:1306
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1189
+#: builtin/fetch.c:1308
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1200
+#: builtin/fetch.c:1319
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1208
+#: builtin/fetch.c:1327
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
@@ -6241,63 +6562,63 @@ msgstr ""
msgid "print only refs which contain the commit"
msgstr ""
-#: builtin/fsck.c:156 builtin/prune.c:140
-msgid "Checking connectivity"
-msgstr ""
-
-#: builtin/fsck.c:486
+#: builtin/fsck.c:519
msgid "Checking object directories"
msgstr ""
-#: builtin/fsck.c:552
+#: builtin/fsck.c:588
msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/fsck.c:558
+#: builtin/fsck.c:594
msgid "show unreachable objects"
msgstr ""
-#: builtin/fsck.c:559
+#: builtin/fsck.c:595
msgid "show dangling objects"
msgstr ""
-#: builtin/fsck.c:560
+#: builtin/fsck.c:596
msgid "report tags"
msgstr ""
-#: builtin/fsck.c:561
+#: builtin/fsck.c:597
msgid "report root nodes"
msgstr ""
-#: builtin/fsck.c:562
+#: builtin/fsck.c:598
msgid "make index objects head nodes"
msgstr ""
-#: builtin/fsck.c:563
+#: builtin/fsck.c:599
msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/fsck.c:564
+#: builtin/fsck.c:600
msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/fsck.c:565
+#: builtin/fsck.c:601
msgid "check only connectivity"
msgstr ""
-#: builtin/fsck.c:566
+#: builtin/fsck.c:602
msgid "enable more strict checking"
msgstr ""
-#: builtin/fsck.c:568
+#: builtin/fsck.c:604
msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/fsck.c:569 builtin/prune.c:107
+#: builtin/fsck.c:605 builtin/prune.c:107
msgid "show progress"
msgstr ""
-#: builtin/fsck.c:630
+#: builtin/fsck.c:606
+msgid "show verbose names for reachable objects"
+msgstr ""
+
+#: builtin/fsck.c:671
msgid "Checking objects"
msgstr ""
@@ -6577,7 +6898,7 @@ msgstr ""
msgid "no pattern given."
msgstr ""
-#: builtin/grep.c:845 builtin/index-pack.c:1477
+#: builtin/grep.c:845 builtin/index-pack.c:1479
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
@@ -6715,334 +7036,330 @@ msgstr ""
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:408
+#: builtin/help.c:401
msgid "Defining attributes per path"
msgstr ""
-#: builtin/help.c:409
+#: builtin/help.c:402
msgid "Everyday Git With 20 Commands Or So"
msgstr ""
-#: builtin/help.c:410
+#: builtin/help.c:403
msgid "A Git glossary"
msgstr ""
-#: builtin/help.c:411
+#: builtin/help.c:404
msgid "Specifies intentionally untracked files to ignore"
msgstr ""
-#: builtin/help.c:412
+#: builtin/help.c:405
msgid "Defining submodule properties"
msgstr ""
-#: builtin/help.c:413
+#: builtin/help.c:406
msgid "Specifying revisions and ranges for Git"
msgstr ""
-#: builtin/help.c:414
+#: builtin/help.c:407
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr ""
-#: builtin/help.c:415
+#: builtin/help.c:408
msgid "An overview of recommended workflows with Git"
msgstr ""
-#: builtin/help.c:427
+#: builtin/help.c:420
msgid "The common Git guides are:\n"
msgstr ""
-#: builtin/help.c:448 builtin/help.c:465
+#: builtin/help.c:441 builtin/help.c:458
#, c-format
msgid "usage: %s%s"
msgstr ""
-#: builtin/help.c:481
+#: builtin/help.c:474
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr ""
-#: builtin/index-pack.c:152
+#: builtin/index-pack.c:153
#, c-format
msgid "unable to open %s"
msgstr ""
-#: builtin/index-pack.c:202
+#: builtin/index-pack.c:203
#, c-format
msgid "object type mismatch at %s"
msgstr ""
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:223
#, c-format
msgid "did not receive expected object %s"
msgstr ""
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr ""
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:268
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:277
+#: builtin/index-pack.c:278
msgid "early EOF"
msgstr ""
-#: builtin/index-pack.c:278
+#: builtin/index-pack.c:279
msgid "read error on input"
msgstr ""
-#: builtin/index-pack.c:290
+#: builtin/index-pack.c:291
msgid "used more bytes than were available"
msgstr ""
-#: builtin/index-pack.c:297
+#: builtin/index-pack.c:298
msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/index-pack.c:313
+#: builtin/index-pack.c:314
#, c-format
msgid "unable to create '%s'"
msgstr ""
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/index-pack.c:332
+#: builtin/index-pack.c:333
msgid "pack signature mismatch"
msgstr ""
-#: builtin/index-pack.c:334
+#: builtin/index-pack.c:335
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/index-pack.c:352
+#: builtin/index-pack.c:353
#, c-format
-msgid "pack has bad object at offset %lu: %s"
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr ""
-#: builtin/index-pack.c:473
+#: builtin/index-pack.c:475
#, c-format
msgid "inflate returned %d"
msgstr ""
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:524
msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:532
msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:540
#, c-format
msgid "unknown object type %d"
msgstr ""
-#: builtin/index-pack.c:569
+#: builtin/index-pack.c:571
msgid "cannot pread pack file"
msgstr ""
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:573
#, c-format
-msgid "premature end of pack file, %lu byte missing"
-msgid_plural "premature end of pack file, %lu bytes missing"
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:597
+#: builtin/index-pack.c:599
msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
-#: builtin/index-pack.c:806 builtin/index-pack.c:815
+#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
+#: builtin/index-pack.c:808 builtin/index-pack.c:817
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:746 builtin/pack-objects.c:162
-#: builtin/pack-objects.c:254
+#: builtin/index-pack.c:748 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:256
#, c-format
msgid "unable to read %s"
msgstr ""
-#: builtin/index-pack.c:812
+#: builtin/index-pack.c:814
#, c-format
msgid "cannot read existing object %s"
msgstr ""
-#: builtin/index-pack.c:826
+#: builtin/index-pack.c:828
#, c-format
msgid "invalid blob object %s"
msgstr ""
-#: builtin/index-pack.c:840
+#: builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr ""
-#: builtin/index-pack.c:843
+#: builtin/index-pack.c:845
msgid "Error in object"
msgstr ""
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:917 builtin/index-pack.c:948
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1120
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1120
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:1150
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:1158
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1171
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1196
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1205
+#: builtin/index-pack.c:1207
#, c-format
msgid "unable to create thread: %s"
msgstr ""
-#: builtin/index-pack.c:1247
+#: builtin/index-pack.c:1249
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:1253
+#: builtin/index-pack.c:1255
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1265
+#: builtin/index-pack.c:1267
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/index-pack.c:1269
+#: builtin/index-pack.c:1271
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1293
+#: builtin/index-pack.c:1295
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1369
+#: builtin/index-pack.c:1371
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1393
+#: builtin/index-pack.c:1395
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1408
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1414
+#: builtin/index-pack.c:1416
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1429
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1440
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1471
+#: builtin/index-pack.c:1473
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
+#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1542
+#: builtin/index-pack.c:1544
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1589
+#: builtin/index-pack.c:1591
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1596
+#: builtin/index-pack.c:1598
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1611
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/index-pack.c:1638
-msgid "Cannot come back to cwd"
-msgstr ""
-
-#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
-#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
+#: builtin/index-pack.c:1693 builtin/index-pack.c:1696
+#: builtin/index-pack.c:1712 builtin/index-pack.c:1716
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1723
+#: builtin/index-pack.c:1730
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1731
+#: builtin/index-pack.c:1738
msgid "--verify with no packfile name given"
msgstr ""
@@ -7106,58 +7423,58 @@ msgstr ""
msgid "unable to move %s to %s"
msgstr ""
-#. TRANSLATORS: The first '%s' is either "Reinitialized
-#. existing" or "Initialized empty", the second " shared" or
-#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:403
+#: builtin/init-db.c:402
#, c-format
-msgid "%s%s Git repository in %s%s\n"
+msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:404
-msgid "Reinitialized existing"
+#: builtin/init-db.c:403
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:404
-msgid "Initialized empty"
+#: builtin/init-db.c:407
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:405
-msgid " shared"
+#: builtin/init-db.c:408
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:452
+#: builtin/init-db.c:455
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/init-db.c:475
+#: builtin/init-db.c:478
msgid "permissions"
msgstr ""
-#: builtin/init-db.c:476
+#: builtin/init-db.c:479
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/init-db.c:510 builtin/init-db.c:515
+#: builtin/init-db.c:513 builtin/init-db.c:518
#, c-format
msgid "cannot mkdir %s"
msgstr ""
-#: builtin/init-db.c:519
+#: builtin/init-db.c:522
#, c-format
msgid "cannot chdir to %s"
msgstr ""
-#: builtin/init-db.c:540
+#: builtin/init-db.c:543
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
-#: builtin/init-db.c:568
+#: builtin/init-db.c:571
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
@@ -7188,422 +7505,422 @@ msgstr ""
msgid "no input file given for in-place editing"
msgstr ""
-#: builtin/log.c:43
+#: builtin/log.c:44
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
-#: builtin/log.c:44
+#: builtin/log.c:45
msgid "git show [<options>] <object>..."
msgstr ""
-#: builtin/log.c:83
+#: builtin/log.c:84
#, c-format
msgid "invalid --decorate option: %s"
msgstr ""
-#: builtin/log.c:137
+#: builtin/log.c:139
msgid "suppress diff output"
msgstr ""
-#: builtin/log.c:138
+#: builtin/log.c:140
msgid "show source"
msgstr ""
-#: builtin/log.c:139
+#: builtin/log.c:141
msgid "Use mail map file"
msgstr ""
-#: builtin/log.c:140
+#: builtin/log.c:142
msgid "decorate options"
msgstr ""
-#: builtin/log.c:143
+#: builtin/log.c:145
msgid "Process line range n,m in file, counting from 1"
msgstr ""
-#: builtin/log.c:239
+#: builtin/log.c:241
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:471
+#: builtin/log.c:486
#, c-format
msgid "git show %s: bad file"
msgstr ""
-#: builtin/log.c:485 builtin/log.c:578
+#: builtin/log.c:500 builtin/log.c:594
#, c-format
msgid "Could not read object %s"
msgstr ""
-#: builtin/log.c:602
+#: builtin/log.c:618
#, c-format
msgid "Unknown type: %d"
msgstr ""
-#: builtin/log.c:722
+#: builtin/log.c:739
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:812
+#: builtin/log.c:839
msgid "name of output directory is too long"
msgstr ""
-#: builtin/log.c:827
+#: builtin/log.c:854
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
-#: builtin/log.c:841
+#: builtin/log.c:868
msgid "Need exactly one range."
msgstr ""
-#: builtin/log.c:851
+#: builtin/log.c:878
msgid "Not a range."
msgstr ""
-#: builtin/log.c:957
+#: builtin/log.c:984
msgid "Cover letter needs email format"
msgstr ""
-#: builtin/log.c:1036
+#: builtin/log.c:1064
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:1064
+#: builtin/log.c:1092
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/log.c:1109
+#: builtin/log.c:1137
msgid "Two output directories?"
msgstr ""
-#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
#, c-format
msgid "Unknown commit %s"
msgstr ""
-#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
-#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
-#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
-#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
+#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
+#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
+#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/log.c:1231
+#: builtin/log.c:1259
msgid "Could not find exact merge base."
msgstr ""
-#: builtin/log.c:1235
+#: builtin/log.c:1263
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually."
msgstr ""
-#: builtin/log.c:1255
+#: builtin/log.c:1283
msgid "Failed to find exact merge base"
msgstr ""
-#: builtin/log.c:1266
+#: builtin/log.c:1294
msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/log.c:1270
+#: builtin/log.c:1298
msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/log.c:1319
+#: builtin/log.c:1347
msgid "cannot get patch id"
msgstr ""
-#: builtin/log.c:1377
+#: builtin/log.c:1404
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1380
+#: builtin/log.c:1407
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1384
+#: builtin/log.c:1411
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1386
+#: builtin/log.c:1413
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1388
+#: builtin/log.c:1415
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1389
+#: builtin/log.c:1416
msgid "sfx"
msgstr ""
-#: builtin/log.c:1390
+#: builtin/log.c:1417
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1392
+#: builtin/log.c:1419
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1394
+#: builtin/log.c:1421
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1396
+#: builtin/log.c:1423
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1399
+#: builtin/log.c:1426
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1402
+#: builtin/log.c:1429
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1405
+#: builtin/log.c:1432
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1407
+#: builtin/log.c:1434
msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/log.c:1409
+#: builtin/log.c:1436
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1411
+#: builtin/log.c:1438
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1413
+#: builtin/log.c:1440
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1414
+#: builtin/log.c:1441
msgid "header"
msgstr ""
-#: builtin/log.c:1415
+#: builtin/log.c:1442
msgid "add email header"
msgstr ""
-#: builtin/log.c:1416 builtin/log.c:1418
+#: builtin/log.c:1443 builtin/log.c:1445
msgid "email"
msgstr ""
-#: builtin/log.c:1416
+#: builtin/log.c:1443
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1418
+#: builtin/log.c:1445
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1420
+#: builtin/log.c:1447
msgid "ident"
msgstr ""
-#: builtin/log.c:1421
+#: builtin/log.c:1448
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1423
+#: builtin/log.c:1450
msgid "message-id"
msgstr ""
-#: builtin/log.c:1424
+#: builtin/log.c:1451
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1425 builtin/log.c:1428
+#: builtin/log.c:1452 builtin/log.c:1455
msgid "boundary"
msgstr ""
-#: builtin/log.c:1426
+#: builtin/log.c:1453
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1429
+#: builtin/log.c:1456
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1433
+#: builtin/log.c:1460
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1435
+#: builtin/log.c:1462
msgid "signature"
msgstr ""
-#: builtin/log.c:1436
+#: builtin/log.c:1463
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1437
+#: builtin/log.c:1464
msgid "base-commit"
msgstr ""
-#: builtin/log.c:1438
+#: builtin/log.c:1465
msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/log.c:1440
+#: builtin/log.c:1467
msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:1441
+#: builtin/log.c:1468
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1531
+#: builtin/log.c:1558
msgid "-n and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1533
+#: builtin/log.c:1560
msgid "--subject-prefix and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1541
+#: builtin/log.c:1568
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1543
+#: builtin/log.c:1570
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1545
+#: builtin/log.c:1572
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1573
+#: builtin/log.c:1602
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1575
+#: builtin/log.c:1604
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/log.c:1672
+#: builtin/log.c:1698
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/log.c:1743
+#: builtin/log.c:1769
msgid "Failed to create output files"
msgstr ""
-#: builtin/log.c:1792
+#: builtin/log.c:1818
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:1846
+#: builtin/log.c:1872
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/ls-files.c:378
+#: builtin/ls-files.c:379
msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:427
+#: builtin/ls-files.c:428
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:429
+#: builtin/ls-files.c:430
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:431
+#: builtin/ls-files.c:432
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:433
+#: builtin/ls-files.c:434
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:435
+#: builtin/ls-files.c:436
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:437
+#: builtin/ls-files.c:438
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:439
+#: builtin/ls-files.c:440
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:442
+#: builtin/ls-files.c:443
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:444
+#: builtin/ls-files.c:445
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:446
+#: builtin/ls-files.c:447
msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/ls-files.c:448
+#: builtin/ls-files.c:449
msgid "show line endings of files"
msgstr ""
-#: builtin/ls-files.c:450
+#: builtin/ls-files.c:451
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:453
+#: builtin/ls-files.c:454
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:455
+#: builtin/ls-files.c:456
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:457
+#: builtin/ls-files.c:458
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:461
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:463
+#: builtin/ls-files.c:464
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:466
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:469
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:472
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:473
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:474
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:476
msgid "show debugging data"
msgstr ""
@@ -7686,186 +8003,172 @@ msgstr ""
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
-#: builtin/merge.c:45
+#: builtin/merge.c:46
msgid "git merge [<options>] [<commit>...]"
msgstr ""
-#: builtin/merge.c:46
+#: builtin/merge.c:47
msgid "git merge [<options>] <msg> HEAD <commit>"
msgstr ""
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge --abort"
msgstr ""
-#: builtin/merge.c:101
+#: builtin/merge.c:102
msgid "switch `m' requires a value"
msgstr ""
-#: builtin/merge.c:138
+#: builtin/merge.c:139
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr ""
-#: builtin/merge.c:139
+#: builtin/merge.c:140
#, c-format
msgid "Available strategies are:"
msgstr ""
-#: builtin/merge.c:144
+#: builtin/merge.c:145
#, c-format
msgid "Available custom strategies are:"
msgstr ""
-#: builtin/merge.c:194 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:126
msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:129
msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:198 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:132
msgid "(synonym to --stat)"
msgstr ""
-#: builtin/merge.c:200 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:135
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/merge.c:203 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:138
msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/merge.c:205 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:141
msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/merge.c:207 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:144
msgid "edit message before committing"
msgstr ""
-#: builtin/merge.c:208
+#: builtin/merge.c:209
msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/merge.c:210 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:150
msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/merge.c:214
-msgid "Verify that the named commit has a valid GPG signature"
+#: builtin/merge.c:215 builtin/pull.c:153
+msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157
#: builtin/revert.c:89
msgid "strategy"
msgstr ""
-#: builtin/merge.c:216 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:158
msgid "merge strategy to use"
msgstr ""
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:161
msgid "option=value"
msgstr ""
-#: builtin/merge.c:218 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:162
msgid "option for selected merge strategy"
msgstr ""
-#: builtin/merge.c:220
+#: builtin/merge.c:221
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
-#: builtin/merge.c:224
+#: builtin/merge.c:225
msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/merge.c:226 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:169
msgid "allow merging unrelated histories"
msgstr ""
-#: builtin/merge.c:254
+#: builtin/merge.c:255
msgid "could not run stash."
msgstr ""
-#: builtin/merge.c:259
+#: builtin/merge.c:260
msgid "stash failed"
msgstr ""
-#: builtin/merge.c:264
+#: builtin/merge.c:265
#, c-format
msgid "not a valid object: %s"
msgstr ""
-#: builtin/merge.c:283 builtin/merge.c:300
+#: builtin/merge.c:284 builtin/merge.c:301
msgid "read-tree failed"
msgstr ""
-#: builtin/merge.c:330
+#: builtin/merge.c:331
msgid " (nothing to squash)"
msgstr ""
-#: builtin/merge.c:343
+#: builtin/merge.c:342
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
-#: builtin/merge.c:1000
-#, c-format
-msgid "Could not write to '%s'"
-msgstr ""
-
-#: builtin/merge.c:375
-msgid "Writing SQUASH_MSG"
-msgstr ""
-
-#: builtin/merge.c:377
-msgid "Finishing SQUASH_MSG"
-msgstr ""
-
-#: builtin/merge.c:400
+#: builtin/merge.c:392
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:451
+#: builtin/merge.c:443
#, c-format
msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/merge.c:541
+#: builtin/merge.c:533
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/merge.c:660
+#: builtin/merge.c:652
msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/merge.c:674
+#: builtin/merge.c:666
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
-#: builtin/merge.c:687
+#: builtin/merge.c:681
#, c-format
msgid "unable to write %s"
msgstr ""
-#: builtin/merge.c:776
+#: builtin/merge.c:733
#, c-format
msgid "Could not read from '%s'"
msgstr ""
-#: builtin/merge.c:785
+#: builtin/merge.c:742
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/merge.c:791
+#: builtin/merge.c:748
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -7875,161 +8178,183 @@ msgid ""
"the commit.\n"
msgstr ""
-#: builtin/merge.c:815
+#: builtin/merge.c:772
msgid "Empty commit message."
msgstr ""
-#: builtin/merge.c:835
+#: builtin/merge.c:792
#, c-format
msgid "Wonderful.\n"
msgstr ""
-#: builtin/merge.c:890
+#: builtin/merge.c:847
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/merge.c:906
+#: builtin/merge.c:863
#, c-format
msgid "'%s' is not a commit"
msgstr ""
-#: builtin/merge.c:947
+#: builtin/merge.c:904
msgid "No current branch."
msgstr ""
-#: builtin/merge.c:949
+#: builtin/merge.c:906
msgid "No remote for the current branch."
msgstr ""
-#: builtin/merge.c:951
+#: builtin/merge.c:908
msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/merge.c:956
+#: builtin/merge.c:913
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:1091
+#: builtin/merge.c:960
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr ""
+
+#: builtin/merge.c:1034
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: builtin/merge.c:1219
+#: builtin/merge.c:1061
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr ""
+
+#: builtin/merge.c:1095
+msgid "not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1162
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1235
+#: builtin/merge.c:1178
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1242
+#: builtin/merge.c:1185
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1245
+#: builtin/merge.c:1188
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1254
+#: builtin/merge.c:1197
msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/merge.c:1262
+#: builtin/merge.c:1205
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/merge.c:1279
+#: builtin/merge.c:1222
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1281
+#: builtin/merge.c:1224
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1286
+#: builtin/merge.c:1229
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1288
+#: builtin/merge.c:1231
msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/merge.c:1344
+#: builtin/merge.c:1287
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: builtin/merge.c:1347
+#: builtin/merge.c:1290
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: builtin/merge.c:1350
+#: builtin/merge.c:1293
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: builtin/merge.c:1353
+#: builtin/merge.c:1296
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: builtin/merge.c:1415
+#: builtin/merge.c:1358
msgid "refusing to merge unrelated histories"
msgstr ""
-#: builtin/merge.c:1439
+#: builtin/merge.c:1367
+msgid "Already up-to-date."
+msgstr ""
+
+#: builtin/merge.c:1382
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1476
+#: builtin/merge.c:1419
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1483
+#: builtin/merge.c:1426
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1515
+#: builtin/merge.c:1451
+msgid "Already up-to-date. Yeeah!"
+msgstr ""
+
+#: builtin/merge.c:1457
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1538 builtin/merge.c:1617
+#: builtin/merge.c:1480 builtin/merge.c:1559
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1542
+#: builtin/merge.c:1484
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1608
+#: builtin/merge.c:1550
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1610
+#: builtin/merge.c:1552
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1619
+#: builtin/merge.c:1561
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1631
+#: builtin/merge.c:1573
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -8154,68 +8479,68 @@ msgstr ""
msgid "skip move/rename errors"
msgstr ""
-#: builtin/mv.c:152
+#: builtin/mv.c:155
#, c-format
msgid "destination '%s' is not a directory"
msgstr ""
-#: builtin/mv.c:163
+#: builtin/mv.c:166
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr ""
-#: builtin/mv.c:167
+#: builtin/mv.c:170
msgid "bad source"
msgstr ""
-#: builtin/mv.c:170
+#: builtin/mv.c:173
msgid "can not move directory into itself"
msgstr ""
-#: builtin/mv.c:173
+#: builtin/mv.c:176
msgid "cannot move directory over file"
msgstr ""
-#: builtin/mv.c:182
+#: builtin/mv.c:185
msgid "source directory is empty"
msgstr ""
-#: builtin/mv.c:207
+#: builtin/mv.c:210
msgid "not under version control"
msgstr ""
-#: builtin/mv.c:210
+#: builtin/mv.c:213
msgid "destination exists"
msgstr ""
-#: builtin/mv.c:218
+#: builtin/mv.c:221
#, c-format
msgid "overwriting '%s'"
msgstr ""
-#: builtin/mv.c:221
+#: builtin/mv.c:224
msgid "Cannot overwrite"
msgstr ""
-#: builtin/mv.c:224
+#: builtin/mv.c:227
msgid "multiple sources for the same target"
msgstr ""
-#: builtin/mv.c:226
+#: builtin/mv.c:229
msgid "destination directory does not exist"
msgstr ""
-#: builtin/mv.c:233
+#: builtin/mv.c:236
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr ""
-#: builtin/mv.c:254
+#: builtin/mv.c:257
#, c-format
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
#, c-format
msgid "renaming '%s' failed"
msgstr ""
@@ -8365,6 +8690,10 @@ msgstr ""
msgid "git notes get-ref"
msgstr ""
+#: builtin/notes.c:94
+msgid "Write/edit the notes for the following object:"
+msgstr ""
+
#: builtin/notes.c:147
#, c-format
msgid "unable to start 'show' for object '%s'"
@@ -8379,184 +8708,218 @@ msgstr ""
msgid "failed to finish 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:174 builtin/tag.c:248
-#, c-format
-msgid "could not create file '%s'"
-msgstr ""
-
-#: builtin/notes.c:193
+#: builtin/notes.c:194
msgid "Please supply the note contents using either -m or -F option"
msgstr ""
-#: builtin/notes.c:202
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr ""
-#: builtin/notes.c:204
+#: builtin/notes.c:205
#, c-format
msgid "The note contents have been left in %s"
msgstr ""
-#: builtin/notes.c:232 builtin/tag.c:439
+#: builtin/notes.c:233 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr ""
-#: builtin/notes.c:234 builtin/tag.c:442
+#: builtin/notes.c:235 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr ""
-#: builtin/notes.c:256
+#: builtin/notes.c:257
#, c-format
msgid "Failed to read object '%s'."
msgstr ""
-#: builtin/notes.c:260
+#: builtin/notes.c:261
#, c-format
msgid "Cannot read note data from non-blob object '%s'."
msgstr ""
-#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
-#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:946
+#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
+#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
+#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
msgid "too many parameters"
msgstr ""
-#: builtin/notes.c:375 builtin/notes.c:662
+#: builtin/notes.c:376 builtin/notes.c:663
#, c-format
msgid "No note found for object %s."
msgstr ""
-#: builtin/notes.c:396 builtin/notes.c:559
+#: builtin/notes.c:397 builtin/notes.c:560
msgid "note contents as a string"
msgstr ""
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:400 builtin/notes.c:563
msgid "note contents in a file"
msgstr ""
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "reuse and edit specified note object"
msgstr ""
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "reuse specified note object"
msgstr ""
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "allow storing empty note"
msgstr ""
-#: builtin/notes.c:409 builtin/notes.c:480
+#: builtin/notes.c:410 builtin/notes.c:481
msgid "replace existing notes"
msgstr ""
-#: builtin/notes.c:434
+#: builtin/notes.c:435
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:449 builtin/notes.c:528
+#: builtin/notes.c:450 builtin/notes.c:529
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
+#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
-#: builtin/notes.c:481
+#: builtin/notes.c:482
msgid "read objects from stdin"
msgstr ""
-#: builtin/notes.c:483
+#: builtin/notes.c:484
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
-#: builtin/notes.c:501
+#: builtin/notes.c:502
msgid "too few parameters"
msgstr ""
-#: builtin/notes.c:522
+#: builtin/notes.c:523
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:534
+#: builtin/notes.c:535
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr ""
-#: builtin/notes.c:586
+#: builtin/notes.c:587
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
-#: builtin/notes.c:768
+#: builtin/notes.c:753
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr ""
+
+#: builtin/notes.c:769
msgid "General options"
msgstr ""
-#: builtin/notes.c:770
+#: builtin/notes.c:771
msgid "Merge options"
msgstr ""
-#: builtin/notes.c:772
+#: builtin/notes.c:773
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
-#: builtin/notes.c:774
+#: builtin/notes.c:775
msgid "Committing unmerged notes"
msgstr ""
-#: builtin/notes.c:776
+#: builtin/notes.c:777
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/notes.c:778
+#: builtin/notes.c:779
msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/notes.c:780
+#: builtin/notes.c:781
msgid "abort notes merge"
msgstr ""
-#: builtin/notes.c:857
+#: builtin/notes.c:792
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr ""
+
+#: builtin/notes.c:797
+msgid "Must specify a notes ref to merge"
+msgstr ""
+
+#: builtin/notes.c:821
+#, c-format
+msgid "Unknown -s/--strategy: %s"
+msgstr ""
+
+#: builtin/notes.c:858
#, c-format
msgid "A notes merge into %s is already in-progress at %s"
msgstr ""
-#: builtin/notes.c:884
+#: builtin/notes.c:861
+#, c-format
+msgid "Failed to store link to current notes ref (%s)"
+msgstr ""
+
+#: builtin/notes.c:863
+#, c-format
+msgid ""
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
+msgstr ""
+
+#: builtin/notes.c:885
#, c-format
msgid "Object %s has no note\n"
msgstr ""
-#: builtin/notes.c:896
+#: builtin/notes.c:897
msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/notes.c:899
+#: builtin/notes.c:900
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:980
-msgid "notes-ref"
+#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+msgid "do not remove, show only"
+msgstr ""
+
+#: builtin/notes.c:939
+msgid "report pruned notes"
msgstr ""
#: builtin/notes.c:981
+msgid "notes-ref"
+msgstr ""
+
+#: builtin/notes.c:982
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1016 builtin/remote.c:1628
+#: builtin/notes.c:1017 builtin/remote.c:1623
#, c-format
msgid "Unknown subcommand: %s"
msgstr ""
@@ -8571,174 +8934,178 @@ msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
+#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
#, c-format
msgid "deflate error (%d)"
msgstr ""
-#: builtin/pack-objects.c:763
+#: builtin/pack-objects.c:766
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:779
msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:1017
+#: builtin/pack-objects.c:1037
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/pack-objects.c:2177
+#: builtin/pack-objects.c:2197
msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:2563
+#: builtin/pack-objects.c:2611
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:2567
+#: builtin/pack-objects.c:2615
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:2597
+#: builtin/pack-objects.c:2645
msgid "do not show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2647
msgid "show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2649
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2652
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/pack-objects.c:2605
+#: builtin/pack-objects.c:2653
msgid "version[,offset]"
msgstr ""
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2654
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:2609
+#: builtin/pack-objects.c:2657
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2659
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:2613
+#: builtin/pack-objects.c:2661
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2663
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:2617
+#: builtin/pack-objects.c:2665
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:2619
+#: builtin/pack-objects.c:2667
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:2621
+#: builtin/pack-objects.c:2669
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:2623
+#: builtin/pack-objects.c:2671
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:2625
+#: builtin/pack-objects.c:2673
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:2627
+#: builtin/pack-objects.c:2675
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:2629
+#: builtin/pack-objects.c:2677
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2679
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:2633
+#: builtin/pack-objects.c:2681
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:2636
+#: builtin/pack-objects.c:2684
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:2639
+#: builtin/pack-objects.c:2687
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2690
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2693
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2695
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2697
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:2650 parse-options.h:142
+#: builtin/pack-objects.c:2699
+msgid "pack loose unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2700 parse-options.h:142
msgid "time"
msgstr ""
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2701
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2704
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:2656
+#: builtin/pack-objects.c:2706
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:2658
+#: builtin/pack-objects.c:2708
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:2660
+#: builtin/pack-objects.c:2710
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:2662
+#: builtin/pack-objects.c:2712
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:2664
+#: builtin/pack-objects.c:2714
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:2666
+#: builtin/pack-objects.c:2716
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:2757
+#: builtin/pack-objects.c:2829
msgid "Counting objects"
msgstr ""
@@ -8766,15 +9133,11 @@ msgstr ""
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr ""
-#: builtin/prune.c:105 builtin/worktree.c:125
-msgid "do not remove, show only"
-msgstr ""
-
-#: builtin/prune.c:106 builtin/worktree.c:126
+#: builtin/prune.c:106 builtin/worktree.c:128
msgid "report pruned objects"
msgstr ""
-#: builtin/prune.c:109 builtin/worktree.c:128
+#: builtin/prune.c:109 builtin/worktree.c:130
msgid "expire objects older than <time>"
msgstr ""
@@ -8794,14 +9157,10 @@ msgstr ""
msgid "incorporate changes by rebasing rather than merging"
msgstr ""
-#: builtin/pull.c:147 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:101
msgid "allow fast-forward"
msgstr ""
-#: builtin/pull.c:153
-msgid "verify that the named commit has a valid GPG signature"
-msgstr ""
-
#: builtin/pull.c:156
msgid "automatically stash/stash pop before and after rebase"
msgstr ""
@@ -8819,15 +9178,15 @@ msgstr ""
msgid "Invalid value for pull.ff: %s"
msgstr ""
-#: builtin/pull.c:379
+#: builtin/pull.c:379 git-sh-setup.sh:226
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
-#: builtin/pull.c:385
+#: builtin/pull.c:385 git-sh-setup.sh:252
msgid "Additionally, your index contains uncommitted changes."
msgstr ""
-#: builtin/pull.c:387
+#: builtin/pull.c:387 git-sh-setup.sh:245
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
@@ -8877,7 +9236,7 @@ msgstr ""
msgid "<remote>"
msgstr ""
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr ""
@@ -8898,15 +9257,19 @@ msgid ""
"from the remote, but no such ref was fetched."
msgstr ""
-#: builtin/pull.c:864
+#: builtin/pull.c:820
+msgid "ignoring --verify-signatures for rebase"
+msgstr ""
+
+#: builtin/pull.c:867
msgid "--[no-]autostash option is only valid with --rebase."
msgstr ""
-#: builtin/pull.c:872
+#: builtin/pull.c:875
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
-#: builtin/pull.c:900
+#: builtin/pull.c:903
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -8914,7 +9277,7 @@ msgid ""
"commit %s."
msgstr ""
-#: builtin/pull.c:905
+#: builtin/pull.c:908
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -8925,11 +9288,11 @@ msgid ""
"to recover."
msgstr ""
-#: builtin/pull.c:920
+#: builtin/pull.c:923
msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/pull.c:924
+#: builtin/pull.c:927
msgid "Cannot rebase onto multiple branches."
msgstr ""
@@ -9049,12 +9412,12 @@ msgstr ""
msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/push.c:365
+#: builtin/push.c:366
#, c-format
msgid "bad repository '%s'"
msgstr ""
-#: builtin/push.c:366
+#: builtin/push.c:367
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -9067,103 +9430,115 @@ msgid ""
" git push <name>\n"
msgstr ""
-#: builtin/push.c:381
+#: builtin/push.c:385
msgid "--all and --tags are incompatible"
msgstr ""
-#: builtin/push.c:382
+#: builtin/push.c:386
msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:387
+#: builtin/push.c:391
msgid "--mirror and --tags are incompatible"
msgstr ""
-#: builtin/push.c:388
+#: builtin/push.c:392
msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:393
+#: builtin/push.c:397
msgid "--all and --mirror are incompatible"
msgstr ""
-#: builtin/push.c:505
+#: builtin/push.c:515
msgid "repository"
msgstr ""
-#: builtin/push.c:506 builtin/send-pack.c:161
+#: builtin/push.c:516 builtin/send-pack.c:161
msgid "push all refs"
msgstr ""
-#: builtin/push.c:507 builtin/send-pack.c:163
+#: builtin/push.c:517 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr ""
-#: builtin/push.c:509
+#: builtin/push.c:519
msgid "delete refs"
msgstr ""
-#: builtin/push.c:510
+#: builtin/push.c:520
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/push.c:513 builtin/send-pack.c:164
+#: builtin/push.c:523 builtin/send-pack.c:164
msgid "force updates"
msgstr ""
-#: builtin/push.c:515 builtin/send-pack.c:175
+#: builtin/push.c:525 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr ""
-#: builtin/push.c:516 builtin/send-pack.c:176
+#: builtin/push.c:526 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr ""
-#: builtin/push.c:519
+#: builtin/push.c:529
msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/push.c:521 builtin/send-pack.c:169
+#: builtin/push.c:531 builtin/send-pack.c:169
msgid "use thin pack"
msgstr ""
-#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
+#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr ""
-#: builtin/push.c:524
+#: builtin/push.c:534
msgid "set upstream for git pull/status"
msgstr ""
-#: builtin/push.c:527
+#: builtin/push.c:537
msgid "prune locally removed refs"
msgstr ""
-#: builtin/push.c:529
+#: builtin/push.c:539
msgid "bypass pre-push hook"
msgstr ""
-#: builtin/push.c:530
+#: builtin/push.c:540
msgid "push missing but relevant tags"
msgstr ""
-#: builtin/push.c:533 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr ""
-#: builtin/push.c:535 builtin/send-pack.c:170
+#: builtin/push.c:545 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr ""
-#: builtin/push.c:549
+#: builtin/push.c:546
+msgid "server-specific"
+msgstr ""
+
+#: builtin/push.c:546
+msgid "option to transmit"
+msgstr ""
+
+#: builtin/push.c:560
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/push.c:551
+#: builtin/push.c:562
msgid "--delete doesn't make sense without any refs"
msgstr ""
+#: builtin/push.c:579
+msgid "push options must not have new line characters"
+msgstr ""
+
#: builtin/read-tree.c:37
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
@@ -9239,11 +9614,11 @@ msgstr ""
msgid "git receive-pack <git-dir>"
msgstr ""
-#: builtin/receive-pack.c:1719
+#: builtin/receive-pack.c:1843
msgid "quiet"
msgstr ""
-#: builtin/receive-pack.c:1733
+#: builtin/receive-pack.c:1857
msgid "You must specify a directory."
msgstr ""
@@ -9388,12 +9763,12 @@ msgstr ""
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
-#: builtin/remote.c:190 builtin/remote.c:633
+#: builtin/remote.c:190 builtin/remote.c:629
#, c-format
msgid "remote %s already exists."
msgstr ""
-#: builtin/remote.c:194 builtin/remote.c:637
+#: builtin/remote.c:194 builtin/remote.c:633
#, c-format
msgid "'%s' is not a valid remote name"
msgstr ""
@@ -9416,17 +9791,17 @@ msgstr ""
msgid "(delete)"
msgstr ""
-#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
#, c-format
msgid "No such remote: %s"
msgstr ""
-#: builtin/remote.c:643
+#: builtin/remote.c:639
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr ""
-#: builtin/remote.c:663
+#: builtin/remote.c:659
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -9434,17 +9809,17 @@ msgid ""
"\tPlease update the configuration manually if necessary."
msgstr ""
-#: builtin/remote.c:699
+#: builtin/remote.c:695
#, c-format
msgid "deleting '%s' failed"
msgstr ""
-#: builtin/remote.c:733
+#: builtin/remote.c:729
#, c-format
msgid "creating '%s' failed"
msgstr ""
-#: builtin/remote.c:796
+#: builtin/remote.c:792
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -9454,282 +9829,292 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:810
+#: builtin/remote.c:806
#, c-format
msgid "Could not remove config section '%s'"
msgstr ""
-#: builtin/remote.c:911
+#: builtin/remote.c:907
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr ""
-#: builtin/remote.c:914
+#: builtin/remote.c:910
msgid " tracked"
msgstr ""
-#: builtin/remote.c:916
+#: builtin/remote.c:912
msgid " stale (use 'git remote prune' to remove)"
msgstr ""
-#: builtin/remote.c:918
+#: builtin/remote.c:914
msgid " ???"
msgstr ""
-#: builtin/remote.c:959
+#: builtin/remote.c:955
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-#: builtin/remote.c:967
+#: builtin/remote.c:963
#, c-format
msgid "rebases interactively onto remote %s"
msgstr ""
-#: builtin/remote.c:971
+#: builtin/remote.c:964
#, c-format
-msgid " merges with remote %s"
+msgid "rebases onto remote %s"
msgstr ""
-#: builtin/remote.c:972
-msgid " and with remote"
+#: builtin/remote.c:967
+#, c-format
+msgid " merges with remote %s"
msgstr ""
-#: builtin/remote.c:974
+#: builtin/remote.c:970
#, c-format
msgid "merges with remote %s"
msgstr ""
-#: builtin/remote.c:975
-msgid " and with remote"
+#: builtin/remote.c:973
+#, c-format
+msgid "%-*s and with remote %s\n"
msgstr ""
-#: builtin/remote.c:1021
+#: builtin/remote.c:1016
msgid "create"
msgstr ""
-#: builtin/remote.c:1024
+#: builtin/remote.c:1019
msgid "delete"
msgstr ""
-#: builtin/remote.c:1028
+#: builtin/remote.c:1023
msgid "up to date"
msgstr ""
-#: builtin/remote.c:1031
+#: builtin/remote.c:1026
msgid "fast-forwardable"
msgstr ""
-#: builtin/remote.c:1034
+#: builtin/remote.c:1029
msgid "local out of date"
msgstr ""
-#: builtin/remote.c:1041
+#: builtin/remote.c:1036
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1044
+#: builtin/remote.c:1039
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1048
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s forces to %s"
msgstr ""
-#: builtin/remote.c:1051
+#: builtin/remote.c:1046
#, c-format
msgid " %-*s pushes to %s"
msgstr ""
-#: builtin/remote.c:1119
+#: builtin/remote.c:1114
msgid "do not query remotes"
msgstr ""
-#: builtin/remote.c:1146
+#: builtin/remote.c:1141
#, c-format
msgid "* remote %s"
msgstr ""
-#: builtin/remote.c:1147
+#: builtin/remote.c:1142
#, c-format
msgid " Fetch URL: %s"
msgstr ""
-#: builtin/remote.c:1148 builtin/remote.c:1301
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
msgid "(no URL)"
msgstr ""
#. TRANSLATORS: the colon ':' should align with
#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1159 builtin/remote.c:1161
+#: builtin/remote.c:1154 builtin/remote.c:1156
#, c-format
msgid " Push URL: %s"
msgstr ""
-#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
+#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
#, c-format
msgid " HEAD branch: %s"
msgstr ""
-#: builtin/remote.c:1169
+#: builtin/remote.c:1158
+msgid "(not queried)"
+msgstr ""
+
+#: builtin/remote.c:1160
+msgid "(unknown)"
+msgstr ""
+
+#: builtin/remote.c:1164
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
-#: builtin/remote.c:1181
+#: builtin/remote.c:1176
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1184 builtin/remote.c:1211
+#: builtin/remote.c:1179 builtin/remote.c:1206
msgid " (status not queried)"
msgstr ""
-#: builtin/remote.c:1193
+#: builtin/remote.c:1188
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1201
+#: builtin/remote.c:1196
msgid " Local refs will be mirrored by 'git push'"
msgstr ""
-#: builtin/remote.c:1208
+#: builtin/remote.c:1203
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1229
+#: builtin/remote.c:1224
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr ""
-#: builtin/remote.c:1231
+#: builtin/remote.c:1226
msgid "delete refs/remotes/<name>/HEAD"
msgstr ""
-#: builtin/remote.c:1246
+#: builtin/remote.c:1241
msgid "Cannot determine remote HEAD"
msgstr ""
-#: builtin/remote.c:1248
+#: builtin/remote.c:1243
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-#: builtin/remote.c:1258
+#: builtin/remote.c:1253
#, c-format
msgid "Could not delete %s"
msgstr ""
-#: builtin/remote.c:1266
+#: builtin/remote.c:1261
#, c-format
msgid "Not a valid ref: %s"
msgstr ""
-#: builtin/remote.c:1268
+#: builtin/remote.c:1263
#, c-format
msgid "Could not setup %s"
msgstr ""
-#: builtin/remote.c:1286
+#: builtin/remote.c:1281
#, c-format
msgid " %s will become dangling!"
msgstr ""
-#: builtin/remote.c:1287
+#: builtin/remote.c:1282
#, c-format
msgid " %s has become dangling!"
msgstr ""
-#: builtin/remote.c:1297
+#: builtin/remote.c:1292
#, c-format
msgid "Pruning %s"
msgstr ""
-#: builtin/remote.c:1298
+#: builtin/remote.c:1293
#, c-format
msgid "URL: %s"
msgstr ""
-#: builtin/remote.c:1314
+#: builtin/remote.c:1309
#, c-format
msgid " * [would prune] %s"
msgstr ""
-#: builtin/remote.c:1317
+#: builtin/remote.c:1312
#, c-format
msgid " * [pruned] %s"
msgstr ""
-#: builtin/remote.c:1362
+#: builtin/remote.c:1357
msgid "prune remotes after fetching"
msgstr ""
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
#, c-format
msgid "No such remote '%s'"
msgstr ""
-#: builtin/remote.c:1441
+#: builtin/remote.c:1436
msgid "add branch"
msgstr ""
-#: builtin/remote.c:1448
+#: builtin/remote.c:1443
msgid "no remote specified"
msgstr ""
-#: builtin/remote.c:1465
+#: builtin/remote.c:1460
msgid "query push URLs rather than fetch URLs"
msgstr ""
-#: builtin/remote.c:1467
+#: builtin/remote.c:1462
msgid "return all URLs"
msgstr ""
-#: builtin/remote.c:1495
+#: builtin/remote.c:1490
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr ""
-#: builtin/remote.c:1521
+#: builtin/remote.c:1516
msgid "manipulate push URLs"
msgstr ""
-#: builtin/remote.c:1523
+#: builtin/remote.c:1518
msgid "add URL"
msgstr ""
-#: builtin/remote.c:1525
+#: builtin/remote.c:1520
msgid "delete URLs"
msgstr ""
-#: builtin/remote.c:1532
+#: builtin/remote.c:1527
msgid "--add --delete doesn't make sense"
msgstr ""
-#: builtin/remote.c:1573
+#: builtin/remote.c:1568
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr ""
-#: builtin/remote.c:1581
+#: builtin/remote.c:1576
#, c-format
msgid "No such URL found: %s"
msgstr ""
-#: builtin/remote.c:1583
+#: builtin/remote.c:1578
msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/remote.c:1597
+#: builtin/remote.c:1592
msgid "be verbose; must be placed before a subcommand"
msgstr ""
@@ -9737,77 +10122,85 @@ msgstr ""
msgid "git repack [<options>]"
msgstr ""
-#: builtin/repack.c:159
+#: builtin/repack.c:160
msgid "pack everything in a single pack"
msgstr ""
-#: builtin/repack.c:161
+#: builtin/repack.c:162
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
-#: builtin/repack.c:164
+#: builtin/repack.c:165
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
-#: builtin/repack.c:166
+#: builtin/repack.c:167
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr ""
-#: builtin/repack.c:168
+#: builtin/repack.c:169
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
-#: builtin/repack.c:170
+#: builtin/repack.c:171
msgid "do not run git-update-server-info"
msgstr ""
-#: builtin/repack.c:173
+#: builtin/repack.c:174
msgid "pass --local to git-pack-objects"
msgstr ""
-#: builtin/repack.c:175
+#: builtin/repack.c:176
msgid "write bitmap index"
msgstr ""
-#: builtin/repack.c:176
+#: builtin/repack.c:177
msgid "approxidate"
msgstr ""
-#: builtin/repack.c:177
+#: builtin/repack.c:178
msgid "with -A, do not loosen objects older than this"
msgstr ""
-#: builtin/repack.c:179
+#: builtin/repack.c:180
+msgid "with -a, repack unreachable objects"
+msgstr ""
+
+#: builtin/repack.c:182
msgid "size of the window used for delta compression"
msgstr ""
-#: builtin/repack.c:180 builtin/repack.c:184
+#: builtin/repack.c:183 builtin/repack.c:187
msgid "bytes"
msgstr ""
-#: builtin/repack.c:181
+#: builtin/repack.c:184
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
-#: builtin/repack.c:183
+#: builtin/repack.c:186
msgid "limits the maximum delta depth"
msgstr ""
-#: builtin/repack.c:185
+#: builtin/repack.c:188
msgid "maximum size of each packfile"
msgstr ""
-#: builtin/repack.c:187
+#: builtin/repack.c:190
msgid "repack objects in packs marked with .keep"
msgstr ""
-#: builtin/repack.c:197
+#: builtin/repack.c:200
msgid "cannot delete packs in a precious-objects repo"
msgstr ""
-#: builtin/repack.c:381
+#: builtin/repack.c:204
+msgid "--keep-unreachable and -A are incompatible"
+msgstr ""
+
+#: builtin/repack.c:391 builtin/worktree.c:115
#, c-format
-msgid "removing '%s' failed"
+msgid "failed to remove '%s'"
msgstr ""
#: builtin/replace.c:19
@@ -10027,7 +10420,7 @@ msgstr ""
msgid "Could not write new index file."
msgstr ""
-#: builtin/rev-list.c:350
+#: builtin/rev-list.c:362
msgid "rev-list does not support display of notes"
msgstr ""
@@ -10113,31 +10506,27 @@ msgstr ""
msgid "option for merge strategy"
msgstr ""
-#: builtin/revert.c:104
+#: builtin/revert.c:100
msgid "append commit name"
msgstr ""
-#: builtin/revert.c:106
+#: builtin/revert.c:102
msgid "preserve initially empty commits"
msgstr ""
-#: builtin/revert.c:107
+#: builtin/revert.c:103
msgid "allow commits with empty messages"
msgstr ""
-#: builtin/revert.c:108
+#: builtin/revert.c:104
msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/revert.c:112
-msgid "program error"
-msgstr ""
-
-#: builtin/revert.c:197
+#: builtin/revert.c:192
msgid "revert failed"
msgstr ""
-#: builtin/revert.c:212
+#: builtin/revert.c:207
msgid "cherry-pick failed"
msgstr ""
@@ -10407,12 +10796,12 @@ msgstr ""
msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/submodule--helper.c:24
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923
#, c-format
msgid "No such ref: %s"
msgstr ""
-#: builtin/submodule--helper.c:31
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr ""
@@ -10422,8 +10811,8 @@ msgstr ""
msgid "cannot strip one component off url '%s'"
msgstr ""
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
-#: builtin/submodule--helper.c:486
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
+#: builtin/submodule--helper.c:483
msgid "alternative anchor for relative paths"
msgstr ""
@@ -10431,151 +10820,172 @@ msgstr ""
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
-#: builtin/submodule--helper.c:366
+#: builtin/submodule--helper.c:364
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:370
+#: builtin/submodule--helper.c:368
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:378
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:387
+#: builtin/submodule--helper.c:385
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:404
msgid "Suppress output for initializing a submodule"
msgstr ""
-#: builtin/submodule--helper.c:411
+#: builtin/submodule--helper.c:409
msgid "git submodule--helper init [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:432
+#: builtin/submodule--helper.c:430
msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/submodule--helper.c:438
+#: builtin/submodule--helper.c:436
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:486
msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:489
msgid "name of the new submodule"
msgstr ""
-#: builtin/submodule--helper.c:495
+#: builtin/submodule--helper.c:492
msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/submodule--helper.c:501
+#: builtin/submodule--helper.c:498
msgid "depth for shallow clones"
msgstr ""
-#: builtin/submodule--helper.c:507
+#: builtin/submodule--helper.c:504
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
-#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
+#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
#, c-format
msgid "could not create directory '%s'"
msgstr ""
-#: builtin/submodule--helper.c:534
+#: builtin/submodule--helper.c:531
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:547
#, c-format
msgid "cannot open file '%s'"
msgstr ""
-#: builtin/submodule--helper.c:555
+#: builtin/submodule--helper.c:552
#, c-format
msgid "could not close file %s"
msgstr ""
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:559
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:609
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/submodule--helper.c:613
+#: builtin/submodule--helper.c:615
msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:641
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/submodule--helper.c:660
+#: builtin/submodule--helper.c:662
#, c-format
msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:792
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr ""
+
+#: builtin/submodule--helper.c:803
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr ""
+
+#: builtin/submodule--helper.c:824
msgid "path into the working tree"
msgstr ""
-#: builtin/submodule--helper.c:771
+#: builtin/submodule--helper.c:827
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/submodule--helper.c:775
+#: builtin/submodule--helper.c:831
msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/submodule--helper.c:779
+#: builtin/submodule--helper.c:835
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/submodule--helper.c:782
+#: builtin/submodule--helper.c:838
msgid "parallel jobs"
msgstr ""
-#: builtin/submodule--helper.c:783
+#: builtin/submodule--helper.c:840
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr ""
+
+#: builtin/submodule--helper.c:841
msgid "don't print cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:788
+#: builtin/submodule--helper.c:846
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:798
+#: builtin/submodule--helper.c:856
msgid "bad value for update parameter"
msgstr ""
-#: builtin/submodule--helper.c:855
+#: builtin/submodule--helper.c:927
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+
+#: builtin/submodule--helper.c:977
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr ""
-#: builtin/submodule--helper.c:862
+#: builtin/submodule--helper.c:984
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
@@ -10904,14 +11314,6 @@ msgstr ""
msgid "add the specified entry to the index"
msgstr ""
-#: builtin/update-index.c:958
-msgid "(+/-)x"
-msgstr ""
-
-#: builtin/update-index.c:959
-msgid "override the executable bit of the listed files"
-msgstr ""
-
#: builtin/update-index.c:963
msgid "mark files as \"not changing\""
msgstr ""
@@ -11070,82 +11472,109 @@ msgid "git worktree add [<options>] <path> [<branch>]"
msgstr ""
#: builtin/worktree.c:16
-msgid "git worktree prune [<options>]"
+msgid "git worktree list [<options>]"
msgstr ""
#: builtin/worktree.c:17
-msgid "git worktree list [<options>]"
+msgid "git worktree lock [<options>] <path>"
+msgstr ""
+
+#: builtin/worktree.c:18
+msgid "git worktree prune [<options>]"
msgstr ""
-#: builtin/worktree.c:40
+#: builtin/worktree.c:19
+msgid "git worktree unlock <path>"
+msgstr ""
+
+#: builtin/worktree.c:42
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
-#: builtin/worktree.c:46
+#: builtin/worktree.c:48
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
-#: builtin/worktree.c:51
+#: builtin/worktree.c:53
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-#: builtin/worktree.c:62
+#: builtin/worktree.c:64
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
-#: builtin/worktree.c:78
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
-#: builtin/worktree.c:113
-#, c-format
-msgid "failed to remove '%s'"
-msgstr ""
-
-#: builtin/worktree.c:202
+#: builtin/worktree.c:204
#, c-format
msgid "'%s' already exists"
msgstr ""
-#: builtin/worktree.c:234
+#: builtin/worktree.c:236
#, c-format
msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/worktree.c:270
+#: builtin/worktree.c:272
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr ""
-#: builtin/worktree.c:322
+#: builtin/worktree.c:323
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:324
+#: builtin/worktree.c:325
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:326
-msgid "create or reset a branch"
-msgstr ""
-
#: builtin/worktree.c:327
-msgid "detach HEAD at named commit"
+msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:328
+#: builtin/worktree.c:329
msgid "populate the new working tree"
msgstr ""
-#: builtin/worktree.c:336
+#: builtin/worktree.c:337
msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
+#: builtin/worktree.c:470
+msgid "reason for locking"
+msgstr ""
+
+#: builtin/worktree.c:482 builtin/worktree.c:515
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr ""
+
+#: builtin/worktree.c:484 builtin/worktree.c:517
+msgid "The main working tree cannot be locked or unlocked"
+msgstr ""
+
+#: builtin/worktree.c:489
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr ""
+
+#: builtin/worktree.c:491
+#, c-format
+msgid "'%s' is already locked"
+msgstr ""
+
+#: builtin/worktree.c:519
+#, c-format
+msgid "'%s' is not locked"
+msgstr ""
+
#: builtin/write-tree.c:13
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr ""
@@ -11162,6 +11591,26 @@ msgstr ""
msgid "only useful for debugging"
msgstr ""
+#: upload-pack.c:20
+msgid "git upload-pack [<options>] <dir>"
+msgstr ""
+
+#: upload-pack.c:837
+msgid "quit after a single request/response exchange"
+msgstr ""
+
+#: upload-pack.c:839
+msgid "exit immediately after initial ref advertisement"
+msgstr ""
+
+#: upload-pack.c:841
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr ""
+
+#: upload-pack.c:843
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr ""
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr ""
@@ -11173,7 +11622,7 @@ msgid ""
"to read about a specific subcommand or concept."
msgstr ""
-#: http.c:322
+#: http.c:323
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
@@ -11305,57 +11754,58 @@ msgstr ""
msgid "update the index with reused conflict resolution if possible"
msgstr ""
-#: git-bisect.sh:55
+#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr ""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:61
+#: git-bisect.sh:60
msgid "Do you want me to do it for you [Y/n]? "
msgstr ""
-#: git-bisect.sh:122
+#: git-bisect.sh:121
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr ""
-#: git-bisect.sh:126
+#: git-bisect.sh:125
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr ""
-#: git-bisect.sh:155
+#: git-bisect.sh:154
msgid "Bad HEAD - I need a HEAD"
msgstr ""
-#: git-bisect.sh:168
+#: git-bisect.sh:167
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
msgstr ""
-#: git-bisect.sh:178
+#: git-bisect.sh:177
msgid "won't bisect on cg-seek'ed tree"
msgstr ""
-#: git-bisect.sh:182
+#: git-bisect.sh:181
msgid "Bad HEAD - strange symbolic ref"
msgstr ""
-#: git-bisect.sh:234
+#: git-bisect.sh:233
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr ""
-#: git-bisect.sh:263
+#: git-bisect.sh:262
#, sh-format
msgid "Bad rev input: $arg"
msgstr ""
-#: git-bisect.sh:278
-msgid "Please call 'bisect_state' with at least one argument."
+#: git-bisect.sh:281
+#, sh-format
+msgid "Bad rev input: $bisected_head"
msgstr ""
#: git-bisect.sh:290
@@ -11486,7 +11936,45 @@ msgid ""
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
-#: git-rebase.sh:57
+#: git-merge-octopus.sh:46
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr ""
+
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr ""
+
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an Octopus."
+msgstr ""
+
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr ""
+
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up-to-date with $pretty_name"
+msgstr ""
+
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr ""
+
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr ""
+
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
+msgstr ""
+
+#: git-rebase.sh:56
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
@@ -11494,54 +11982,54 @@ msgid ""
"\"."
msgstr ""
-#: git-rebase.sh:168
+#: git-rebase.sh:156 git-rebase.sh:395
+#, sh-format
+msgid "Could not move back to $head_name"
+msgstr ""
+
+#: git-rebase.sh:167
msgid "Applied autostash."
msgstr ""
-#: git-rebase.sh:171
+#: git-rebase.sh:170
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr ""
-#: git-rebase.sh:172
+#: git-rebase.sh:171
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: git-rebase.sh:211
+#: git-rebase.sh:210
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: git-rebase.sh:216
+#: git-rebase.sh:215
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
-#: git-rebase.sh:357
+#: git-rebase.sh:356
msgid "No rebase in progress?"
msgstr ""
-#: git-rebase.sh:368
+#: git-rebase.sh:367
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: git-rebase.sh:375
+#: git-rebase.sh:374
msgid "Cannot read HEAD"
msgstr ""
-#: git-rebase.sh:378
+#: git-rebase.sh:377
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: git-rebase.sh:396
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr ""
-
-#: git-rebase.sh:415
+#: git-rebase.sh:414
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -11554,97 +12042,97 @@ msgid ""
"valuable there."
msgstr ""
-#: git-rebase.sh:466
+#: git-rebase.sh:465
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr ""
-#: git-rebase.sh:490
+#: git-rebase.sh:489
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: git-rebase.sh:493 git-rebase.sh:497
+#: git-rebase.sh:492 git-rebase.sh:496
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:502
+#: git-rebase.sh:501
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:525
+#: git-rebase.sh:524
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr ""
-#: git-rebase.sh:558
+#: git-rebase.sh:557
msgid "Cannot autostash"
msgstr ""
-#: git-rebase.sh:563
+#: git-rebase.sh:562
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr ""
-#: git-rebase.sh:567
+#: git-rebase.sh:566
msgid "Please commit or stash them."
msgstr ""
-#: git-rebase.sh:587
+#: git-rebase.sh:586
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:591
+#: git-rebase.sh:590
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:602
+#: git-rebase.sh:601
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
-#: git-rebase.sh:611
+#: git-rebase.sh:610
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-#: git-rebase.sh:621
+#: git-rebase.sh:620
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
-#: git-stash.sh:51
+#: git-stash.sh:50
msgid "git stash clear with parameters is unimplemented"
msgstr ""
-#: git-stash.sh:74
+#: git-stash.sh:73
msgid "You do not have the initial commit yet"
msgstr ""
-#: git-stash.sh:89
+#: git-stash.sh:88
msgid "Cannot save the current index state"
msgstr ""
-#: git-stash.sh:124 git-stash.sh:137
+#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr ""
-#: git-stash.sh:141
+#: git-stash.sh:140
msgid "No changes selected"
msgstr ""
-#: git-stash.sh:144
+#: git-stash.sh:143
msgid "Cannot remove temporary index (can't happen)"
msgstr ""
-#: git-stash.sh:157
+#: git-stash.sh:156
msgid "Cannot record working tree state"
msgstr ""
-#: git-stash.sh:189
+#: git-stash.sh:188
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr ""
@@ -11659,115 +12147,124 @@ msgstr ""
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:239
+#: git-stash.sh:238
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
" To provide a message, use git stash save -- '$option'"
msgstr ""
-#: git-stash.sh:260
+#: git-stash.sh:259
msgid "No local changes to save"
msgstr ""
-#: git-stash.sh:264
+#: git-stash.sh:263
msgid "Cannot initialize stash"
msgstr ""
-#: git-stash.sh:268
+#: git-stash.sh:267
msgid "Cannot save the current status"
msgstr ""
-#: git-stash.sh:286
+#: git-stash.sh:268
+#, sh-format
+msgid "Saved working directory and index state $stash_msg"
+msgstr ""
+
+#: git-stash.sh:285
msgid "Cannot remove worktree changes"
msgstr ""
-#: git-stash.sh:405
+#: git-stash.sh:404
#, sh-format
msgid "unknown option: $opt"
msgstr ""
-#: git-stash.sh:415
+#: git-stash.sh:414
msgid "No stash found."
msgstr ""
-#: git-stash.sh:422
+#: git-stash.sh:421
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:428
+#: git-stash.sh:427
#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:456
+#: git-stash.sh:455
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:467
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:475
+#: git-stash.sh:474
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:479
+#: git-stash.sh:478
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:487
+#: git-stash.sh:486
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:489
+#: git-stash.sh:488
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:523
+#: git-stash.sh:522
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:538
+#: git-stash.sh:537
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:561
+#: git-stash.sh:551
+msgid "The stash is kept in case you need it again."
+msgstr ""
+
+#: git-stash.sh:560
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:562
+#: git-stash.sh:561
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:570
+#: git-stash.sh:569
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:642
+#: git-stash.sh:641
msgid "(To restore them type \"git stash apply\")"
msgstr ""
-#: git-submodule.sh:219
+#: git-submodule.sh:183
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: git-submodule.sh:229
+#: git-submodule.sh:193
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:246
+#: git-submodule.sh:210
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:250
+#: git-submodule.sh:214
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -11775,212 +12272,214 @@ msgid ""
"Use -f if you really want to add it."
msgstr ""
-#: git-submodule.sh:268
+#: git-submodule.sh:232
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:270
+#: git-submodule.sh:234
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:278
+#: git-submodule.sh:242
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: git-submodule.sh:280
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from"
-msgstr ""
-
-#: git-submodule.sh:282
-#, sh-format
-msgid ""
-"use the '--force' option. If the local git directory is not the correct repo"
-msgstr ""
-
-#: git-submodule.sh:283
+#: git-submodule.sh:244
#, sh-format
msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+" $realrepo\n"
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr ""
-#: git-submodule.sh:285
+#: git-submodule.sh:250
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: git-submodule.sh:297
+#: git-submodule.sh:262
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:302
+#: git-submodule.sh:267
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:311
+#: git-submodule.sh:276
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:355
+#: git-submodule.sh:323
#, sh-format
msgid "Entering '$displaypath'"
msgstr ""
-#: git-submodule.sh:375
+#: git-submodule.sh:343
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
-#: git-submodule.sh:448
+#: git-submodule.sh:414
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr ""
-#: git-submodule.sh:453
+#: git-submodule.sh:419
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: git-submodule.sh:470
-#, sh-format
-msgid "Submodule work tree '$displaypath' contains a .git directory"
-msgstr ""
-
-#: git-submodule.sh:471
+#: git-submodule.sh:439
#, sh-format
msgid ""
+"Submodule work tree '$displaypath' contains a .git directory\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-#: git-submodule.sh:477
+#: git-submodule.sh:447
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
msgstr ""
-#: git-submodule.sh:480
+#: git-submodule.sh:450
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr ""
-#: git-submodule.sh:481
+#: git-submodule.sh:451
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
-#: git-submodule.sh:484
+#: git-submodule.sh:454
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr ""
-#: git-submodule.sh:493
+#: git-submodule.sh:463
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
-#: git-submodule.sh:635
+#: git-submodule.sh:612
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:644
+#: git-submodule.sh:622
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:667
+#: git-submodule.sh:627
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr ""
+
+#: git-submodule.sh:645
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:680
+#: git-submodule.sh:651
+#, sh-format
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr ""
+
+#: git-submodule.sh:658
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:681
+#: git-submodule.sh:659
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:685
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:686
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:691
+#: git-submodule.sh:669
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:692
+#: git-submodule.sh:670
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:697
+#: git-submodule.sh:675
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:698
+#: git-submodule.sh:676
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:729
+#: git-submodule.sh:707
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:837
+#: git-submodule.sh:815
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:889
+#: git-submodule.sh:867
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:909
+#: git-submodule.sh:887
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:912
+#: git-submodule.sh:890
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:915
+#: git-submodule.sh:893
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:940
+#: git-submodule.sh:918
msgid "blob"
msgstr ""
-#: git-submodule.sh:1059
+#: git-submodule.sh:1040
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:1123
+#: git-submodule.sh:1107
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr ""
@@ -11989,3 +12488,383 @@ msgstr ""
#, sh-format
msgid "See git-${cmd}(1) for details."
msgstr ""
+
+#: git-rebase--interactive.sh:131
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr ""
+
+#: git-rebase--interactive.sh:147
+msgid ""
+"\n"
+"Commands:\n"
+" p, pick = use commit\n"
+" r, reword = use commit, but edit the commit message\n"
+" e, edit = use commit, but stop for amending\n"
+" s, squash = use commit, but meld into previous commit\n"
+" f, fixup = like \"squash\", but discard this commit's log message\n"
+" x, exec = run command (the rest of the line) using shell\n"
+" d, drop = remove commit\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+
+#: git-rebase--interactive.sh:162
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+
+#: git-rebase--interactive.sh:166
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+
+#: git-rebase--interactive.sh:202
+#, sh-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+
+#: git-rebase--interactive.sh:227
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
+msgstr ""
+
+#: git-rebase--interactive.sh:266
+#, sh-format
+msgid "Invalid commit name: $sha1"
+msgstr ""
+
+#: git-rebase--interactive.sh:308
+msgid "Cannot write current commit's replacement sha1"
+msgstr ""
+
+#: git-rebase--interactive.sh:360
+#, sh-format
+msgid "Fast-forward to $sha1"
+msgstr ""
+
+#: git-rebase--interactive.sh:362
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
+msgstr ""
+
+#: git-rebase--interactive.sh:371
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
+msgstr ""
+
+#: git-rebase--interactive.sh:376
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
+msgstr ""
+
+#: git-rebase--interactive.sh:390
+#, sh-format
+msgid "Error redoing merge $sha1"
+msgstr ""
+
+#: git-rebase--interactive.sh:398
+#, sh-format
+msgid "Could not pick $sha1"
+msgstr ""
+
+#: git-rebase--interactive.sh:407
+#, sh-format
+msgid "This is the commit message #${n}:"
+msgstr ""
+
+#: git-rebase--interactive.sh:412
+#, sh-format
+msgid "The commit message #${n} will be skipped:"
+msgstr ""
+
+#: git-rebase--interactive.sh:423
+#, sh-format
+msgid "This is a combination of $count commit."
+msgid_plural "This is a combination of $count commits."
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-rebase--interactive.sh:431
+#, sh-format
+msgid "Cannot write $fixup_msg"
+msgstr ""
+
+#: git-rebase--interactive.sh:434
+msgid "This is a combination of 2 commits."
+msgstr ""
+
+#: git-rebase--interactive.sh:435
+msgid "This is the 1st commit message:"
+msgstr ""
+
+#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
+#: git-rebase--interactive.sh:521
+#, sh-format
+msgid "Could not apply $sha1... $rest"
+msgstr ""
+
+#: git-rebase--interactive.sh:549
+#, sh-format
+msgid ""
+"Could not amend commit after successfully picking $sha1... $rest\n"
+"This is most likely due to an empty commit message, or the pre-commit hook\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue "
+"before\n"
+"you are able to reword the commit."
+msgstr ""
+
+#: git-rebase--interactive.sh:564
+#, sh-format
+msgid "Stopped at $sha1_abbrev... $rest"
+msgstr ""
+
+#: git-rebase--interactive.sh:579
+#, sh-format
+msgid "Cannot '$squash_style' without a previous commit"
+msgstr ""
+
+#: git-rebase--interactive.sh:621
+#, sh-format
+msgid "Executing: $rest"
+msgstr ""
+
+#: git-rebase--interactive.sh:629
+#, sh-format
+msgid "Execution failed: $rest"
+msgstr ""
+
+#: git-rebase--interactive.sh:631
+msgid "and made changes to the index and/or the working tree"
+msgstr ""
+
+#: git-rebase--interactive.sh:633
+msgid ""
+"You can fix the problem, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+
+#. TRANSLATORS: after these lines is a command to be issued by the user
+#: git-rebase--interactive.sh:646
+#, sh-format
+msgid ""
+"Execution succeeded: $rest\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+
+#: git-rebase--interactive.sh:657
+#, sh-format
+msgid "Unknown command: $command $sha1 $rest"
+msgstr ""
+
+#: git-rebase--interactive.sh:658
+msgid "Please fix this using 'git rebase --edit-todo'."
+msgstr ""
+
+#: git-rebase--interactive.sh:693
+#, sh-format
+msgid "Successfully rebased and updated $head_name."
+msgstr ""
+
+#: git-rebase--interactive.sh:740
+msgid "Could not skip unnecessary pick commands"
+msgstr ""
+
+#: git-rebase--interactive.sh:898
+#, sh-format
+msgid ""
+"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+" - $line"
+msgstr ""
+
+#: git-rebase--interactive.sh:931
+#, sh-format
+msgid ""
+"Warning: the command isn't recognized in the following line:\n"
+" - $line"
+msgstr ""
+
+#: git-rebase--interactive.sh:970
+msgid "could not detach HEAD"
+msgstr ""
+
+#: git-rebase--interactive.sh:1008
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):"
+msgstr ""
+
+#: git-rebase--interactive.sh:1016
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error."
+msgstr ""
+
+#: git-rebase--interactive.sh:1027
+#, sh-format
+msgid ""
+"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
+"Ignoring."
+msgstr ""
+
+#: git-rebase--interactive.sh:1044
+msgid "You can fix this with 'git rebase --edit-todo'."
+msgstr ""
+
+#: git-rebase--interactive.sh:1045
+msgid "Or you can abort the rebase with 'git rebase --abort'."
+msgstr ""
+
+#: git-rebase--interactive.sh:1069
+msgid "Could not remove CHERRY_PICK_HEAD"
+msgstr ""
+
+#: git-rebase--interactive.sh:1074
+#, sh-format
+msgid ""
+"You have staged changes in your working tree.\n"
+"If these changes are meant to be\n"
+"squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In both case, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
+msgstr ""
+
+#: git-rebase--interactive.sh:1091
+msgid "Error trying to find the author identity to amend commit"
+msgstr ""
+
+#: git-rebase--interactive.sh:1096
+msgid ""
+"You have uncommitted changes in your working tree. Please commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+
+#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
+msgid "Could not commit staged changes."
+msgstr ""
+
+#: git-rebase--interactive.sh:1129
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+
+#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+msgid "Could not execute editor"
+msgstr ""
+
+#: git-rebase--interactive.sh:1145
+msgid "You need to set your committer info first"
+msgstr ""
+
+#: git-rebase--interactive.sh:1153
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr ""
+
+#: git-rebase--interactive.sh:1158
+msgid "No HEAD?"
+msgstr ""
+
+#: git-rebase--interactive.sh:1159
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr ""
+
+#: git-rebase--interactive.sh:1161
+msgid "Could not mark as interactive"
+msgstr ""
+
+#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+msgid "Could not init rewritten commits"
+msgstr ""
+
+#: git-rebase--interactive.sh:1276
+#, sh-format
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-rebase--interactive.sh:1281
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+
+#: git-rebase--interactive.sh:1288
+msgid "Note that empty commits are commented out"
+msgstr ""
+
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr ""
+
+#: git-sh-setup.sh:190
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr ""
+
+#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr ""
+
+#: git-sh-setup.sh:220
+msgid "Cannot rebase: You have unstaged changes."
+msgstr ""
+
+#: git-sh-setup.sh:223
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr ""
+
+#: git-sh-setup.sh:229
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr ""
+
+#: git-sh-setup.sh:242
+msgid "Cannot rebase: Your index contains uncommitted changes."
+msgstr ""
+
+#: git-sh-setup.sh:248
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr ""
+
+#: git-sh-setup.sh:372
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr ""
+
+#: git-sh-setup.sh:377
+msgid "Unable to determine absolute path of git directory"
+msgstr ""
diff --git a/po/is.po b/po/is.po
index 8692a8b..b8b34fd 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,14 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2010-09-20 14:44+0000\n"
-"PO-Revision-Date: 2010-06-05 19:06 +0000\n"
-"Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
+"POT-Creation-Date: 2016-06-17 18:55+0000\n"
+"PO-Revision-Date: 2016-06-17 19:17+0000\n"
+"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
"Language-Team: Git Mailing List <git@vger.kernel.org>\n"
"Language: is\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.5\n"
#. TRANSLATORS: This is a test. You don't need to translate it.
#: t/t0200/test.c:5
@@ -72,22 +73,31 @@ msgstr "TILRAUN: Perl tilraunastrengur"
msgid "TEST: A Perl test variable %s"
msgstr "TILRAUN: Perl tilraunastrengur með breytunni %s"
-#. TRANSLATORS: The first '%s' is either "Reinitialized
-#. existing" or "Initialized empty", the second " shared" or
-#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:355
+#: builtin/init-db.c:402
#, c-format
-msgid "%s%s Git repository in %s%s\n"
-msgstr "%s%s Git lind í %s%s\n"
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "Endurgerði Git lind í %s%s\n"
-#: builtin/init-db.c:356
-msgid "Reinitialized existing"
-msgstr "Endurgerði"
+#: builtin/init-db.c:403
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "Endurgerði Git lind í %s%s\n"
+
+#: builtin/init-db.c:407
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "Bjó til tóma sameiginlega Git lind í %s%s\n"
+
+#: builtin/init-db.c:408
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "Bjó til tóma Git lind í %s%s\n"
+
+#~ msgid "Reinitialized existing"
+#~ msgstr "Endurgerði"
-#: builtin/init-db.c:356
-msgid "Initialized empty"
-msgstr "Bjó til tóma"
+#~ msgid "Initialized empty"
+#~ msgstr "Bjó til tóma"
-#: builtin/init-db.c:357
-msgid " shared"
-msgstr " sameiginlega"
+#~ msgid " shared"
+#~ msgstr " sameiginlega"
diff --git a/po/ko.po b/po/ko.po
index c9f431c..d89a6fb 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -39,6 +39,7 @@
# | log | ê¸°ë¡ |
# | merge | 병합 |
# | note | 노트 |
+# | octopus | 옥토í¼ìŠ¤ (병합 ì „ëžµ) |
# | pack | ë¬¶ìŒ |
# | pathspec | 경로명세 |
# | rebase | 리베ì´ìŠ¤ |
@@ -57,8 +58,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-05-24 23:42+0800\n"
-"PO-Revision-Date: 2016-06-12 01:20+0900\n"
+"POT-Creation-Date: 2016-08-15 22:43+0800\n"
+"PO-Revision-Date: 2016-08-21 22:41+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Git Korean translation <http://github.com/changwoo/git-l10n-"
"ko>\n"
@@ -73,7 +74,32 @@ msgstr ""
msgid "hint: %.*s\n"
msgstr "힌트: %.*s\n"
-#: advice.c:88
+#: advice.c:83
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr "병합하지 ì•Šì€ íŒŒì¼ì´ 있으므로, 커밋 빼오기를 í•  수 없습니다."
+
+#: advice.c:85
+msgid "Committing is not possible because you have unmerged files."
+msgstr "병합하지 ì•Šì€ íŒŒì¼ì´ 있으므로, 커밋할 수 없습니다."
+
+#: advice.c:87
+msgid "Merging is not possible because you have unmerged files."
+msgstr "병합하지 ì•Šì€ íŒŒì¼ì´ 있으므로, 병합할 수 없습니다."
+
+#: advice.c:89
+msgid "Pulling is not possible because you have unmerged files."
+msgstr "병합하지 ì•Šì€ íŒŒì¼ì´ 있으므로, í’€ì„ í•  수 없습니다."
+
+#: advice.c:91
+msgid "Reverting is not possible because you have unmerged files."
+msgstr "병합하지 ì•Šì€ íŒŒì¼ì´ 있으므로, ë˜ëŒë¦¬ê¸°ë¥¼ í•  수 없습니다."
+
+#: advice.c:93
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
+msgstr "병합하지 ì•Šì€ íŒŒì¼ì´ 있으므로, %s í•  수 없습니다."
+
+#: advice.c:101
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -81,18 +107,49 @@ msgstr ""
"ìž‘ì—… í´ë”ì—ì„œ 문제를 ë°”ë¡œìž¡ì€ ë‹¤ìŒ, 'git add/rm <파ì¼>'ì„ ì ì ˆížˆ\n"
"사용해 해결 표시하고 커밋하십시오."
-#: advice.c:101 builtin/merge.c:1238
+#: advice.c:109
+msgid "Exiting because of an unresolved conflict."
+msgstr "해결하지 못한 ì¶©ëŒ ë•Œë¬¸ì— ë납니다."
+
+#: advice.c:114 builtin/merge.c:1181
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "병합 ìž‘ì—…ì„ ë‹¤ 마치지 않았습니다 (MERGE_HEAD 파ì¼ì´ 있습니다)."
-#: advice.c:103
+#: advice.c:116
msgid "Please, commit your changes before merging."
msgstr "병합하기 ì „ì— ë³€ê²½ ì‚¬í•­ì„ ì»¤ë°‹í•˜ì‹­ì‹œì˜¤."
-#: advice.c:104
+#: advice.c:117
msgid "Exiting because of unfinished merge."
msgstr "ë³‘í•©ì„ ë§ˆì¹˜ì§€ 못했기 ë•Œë¬¸ì— ë납니다."
+#: advice.c:123
+#, c-format
+msgid ""
+"Note: checking out '%s'.\n"
+"\n"
+"You are in 'detached HEAD' state. You can look around, make experimental\n"
+"changes and commit them, and you can discard any commits you make in this\n"
+"state without impacting any branches by performing another checkout.\n"
+"\n"
+"If you want to create a new branch to retain commits you create, you may\n"
+"do so (now or later) by using -b with the checkout command again. Example:\n"
+"\n"
+" git checkout -b <new-branch-name>\n"
+"\n"
+msgstr ""
+"주ì˜: '%s' ì²´í¬ì•„웃하기.\n"
+"\n"
+"지금 'HEADê°€ 분리ëœ' ìƒíƒœìž…니다. ì´ ìƒíƒœì—서는 여기저기 ëŒì•„ë³´ê³ ,\n"
+"실험ì ìœ¼ë¡œ 바꾼고 커밋하ë”ë¼ë„, ì²´í¬ì•„웃할 수 잇는 다른 브랜치ì—\n"
+"ì˜í–¥ì„ 미치지 ì•Šê³  변경 ì‚¬í•­ì„ ìžƒì–´ë²„ë¦´ 수 있습니다.\n"
+"\n"
+"ì»¤ë°‹ì„ ìœ ì§€í•˜ëŠ” 브랜치를 새로 만드려면, (지금ì´ë“  나중ì´ë“ ) ì²´í¬ì•„웃\n"
+"ëª…ë ¹ì„ ë‹¤ì‹œ 하면서 -b ì˜µì…˜ì„ ì‚¬ìš©í•˜ë©´ ë©ë‹ˆë‹¤. 예를 들어:\n"
+"\n"
+" git checkout -b <새-브랜치-ì´ë¦„>\n"
+"\n"
+
#: archive.c:12
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<옵션>] <트리-따위> [<경로>...]"
@@ -112,7 +169,7 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <저장소> [--exec <명령>] --list"
-#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "'%s' 경로명세가 ì–´ë–¤ 파ì¼ê³¼ë„ ì¼ì¹˜í•˜ì§€ 않습니다"
@@ -125,7 +182,7 @@ msgstr "형ì‹"
msgid "archive format"
msgstr "압축 형ì‹"
-#: archive.c:430 builtin/log.c:1395
+#: archive.c:430 builtin/log.c:1422
msgid "prefix"
msgstr "ì ‘ë‘ì–´"
@@ -133,10 +190,10 @@ msgstr "ì ‘ë‘ì–´"
msgid "prepend prefix to each pathname in the archive"
msgstr "ì•„ì¹´ì´ë¸Œì˜ ê° ê²½ë¡œ ì´ë¦„ì˜ ì•žì— ì§€ì •í•œ 경로를 붙입니다"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549
-#: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459
-#: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 builtin/blame.c:2554
+#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989
+#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:460
+#: builtin/ls-files.c:463 builtin/notes.c:399 builtin/notes.c:562
#: builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "파ì¼"
@@ -170,7 +227,7 @@ msgid "list supported archive formats"
msgstr "지ì›í•˜ëŠ” 압축 형ì‹ì˜ 목ë¡ì„ 표시합니다"
#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:776
+#: builtin/submodule--helper.c:832
msgid "repo"
msgstr "저장소"
@@ -178,7 +235,7 @@ msgstr "저장소"
msgid "retrieve the archive from remote repository <repo>"
msgstr "ì›ê²© 저장소 <저장소>ì—ì„œ ì•„ì¹´ì´ë¸Œë¥¼ 가져옵니다"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
msgid "command"
msgstr "명령"
@@ -186,6 +243,28 @@ msgstr "명령"
msgid "path to the remote git-upload-archive command"
msgstr "ì›ê²© git-upload-archive ëª…ë ¹ì˜ ê²½ë¡œ"
+#: archive.c:461
+msgid "Unexpected option --remote"
+msgstr "예ìƒì¹˜ 못한 옵션 --remote"
+
+#: archive.c:463
+msgid "Option --exec can only be used together with --remote"
+msgstr "--exec ì˜µì…˜ì€ --remote 옵션과 ê°™ì´ ì‚¬ìš©í•  경우ì—만 쓸 수 있습니다."
+
+#: archive.c:465
+msgid "Unexpected option --output"
+msgstr "예ìƒì¹˜ 못한 옵션 --output"
+
+#: archive.c:487
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "ì•Œ 수 없는 ì•„ì¹´ì´ë¸Œ í˜•ì‹ '%s'"
+
+#: archive.c:494
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "'%s' 형ì‹ì—서는 지ì›í•˜ì§€ 않는 ì¸ìž: -%d"
+
#: attr.c:263
msgid ""
"Negative patterns are ignored in git attributes\n"
@@ -194,6 +273,127 @@ msgstr ""
"git attributesì—ì„œ 반대 íŒ¨í„´ì€ ë¬´ì‹œë©ë‹ˆë‹¤.\n"
"ì•žì— ëŠë‚Œí‘œë¥¼ 쓰려면 '\\!'를 사용하십시오."
+#: bisect.c:441
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "'%s' 파ì¼ì„ ì—´ 수 없습니다"
+
+#: bisect.c:446
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "'%s' íŒŒì¼ ì•ˆì— ìž˜ëª»ëœ ë”°ì˜´í‘œê°€ ë¶™ì€ ë‚´ìš©: %s"
+
+#: bisect.c:655
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "ë” ì´ìƒ ì´ë“±ë¶„í•  수 없습니다!\n"
+
+#: bisect.c:708
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "올바른 커밋 ì´ë¦„ì´ ì•„ë‹™ë‹ˆë‹¤ (%s)"
+
+#: bisect.c:732
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+"%s 병합 ë² ì´ìŠ¤ê°€ 비정ìƒìž…니다.\n"
+"버그가 %s ë° [%s] 사ì´ì—ì„œ ê³ ì³ì¡Œë‹¤ëŠ” 뜻입니다.\n"
+
+#: bisect.c:737
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"%s 병합 ë² ì´ìŠ¤ê°€ 새롭습니다.\n"
+"ì†ì„±ì´ %s ë° [%s] 사ì´ì—ì„œ 변경ë˜ì—ˆìŠµë‹ˆë‹¤.\n"
+
+#: bisect.c:742
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"%s 병합 ë² ì´ìŠ¤ê°€ %s입니다.\n"
+"ì²˜ìŒ '%s' ì»¤ë°‹ì´ %s ë° [%s] 사ì´ë¼ëŠ” 뜻입니다.\n"
+
+#: bisect.c:750
+#, c-format
+msgid ""
+"Some %s revs are not ancestor of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
+msgstr ""
+"ì¼ë¶€ %s ë¦¬ë¹„ì „ì´ %s ë¦¬ë¹„ì „ì˜ ê³¼ê±° í•­ëª©ì´ ì•„ë‹™ë‹ˆë‹¤.\n"
+"git bisect ëª…ë ¹ì€ ì´ ê²½ìš°ì—는 올바르게 ë™ìž‘하지 않습니다.\n"
+"%s ë° %s ë¦¬ë¹„ì „ì„ ìž˜ëª» ì“´ 것 아닙니까?\n"
+
+#: bisect.c:763
+#, c-format
+msgid ""
+"the merge base between %s and [%s] must be skipped.\n"
+"So we cannot be sure the first %s commit is between %s and %s.\n"
+"We continue anyway."
+msgstr ""
+"%s ë° %s 사ì´ì˜ 머지 ë² ì´ìŠ¤ë¥¼ 건너ëœë‹ˆë‹¤.\n"
+"그러므로 ì²˜ìŒ %s ì»¤ë°‹ì´ %s ë° %s 사ì´ì— 있는지 확신할 수 없습니다.\n"
+"어쨌든 계ì†í•©ë‹ˆë‹¤."
+
+#: bisect.c:798
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "ì´ë“±ë¶„: 병합 ë² ì´ìŠ¤ë¥¼ 시험해야 합니다\n"
+
+#: bisect.c:849
+#, c-format
+msgid "a %s revision is needed"
+msgstr "í•˜ë‚˜ì˜ %s ë¦¬ë¹„ì „ì´ í•„ìš”í•©ë‹ˆë‹¤"
+
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#, c-format
+msgid "could not create file '%s'"
+msgstr "'%s' 파ì¼ì„ 만들 수 없습니다"
+
+#: bisect.c:917
+#, c-format
+msgid "could not read file '%s'"
+msgstr "'%s' 파ì¼ì„ ì½ì„ 수 없습니다"
+
+#: bisect.c:947
+msgid "reading bisect refs failed"
+msgstr "ì´ë“±ë¶„ ë ˆí¼ëŸ°ìŠ¤ ì½ê¸°ì— 실패했습니다"
+
+#: bisect.c:967
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr "%sì€(는) %s ë° %s 모ë‘ì— í•´ë‹¹ë©ë‹ˆë‹¤\n"
+
+#: bisect.c:975
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+"시험 가능한 ì»¤ë°‹ì´ ì—†ìŠµë‹ˆë‹¤.\n"
+"잘못ë„니 경로 파ë¼ë¯¸í„°ë¡œ 시작하지 않았습니까?\n"
+
+#: bisect.c:994
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(대략 %d 단계)"
+
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:998
+#, c-format
+msgid "Bisecting: %d revision left to test after this %s\n"
+msgid_plural "Bisecting: %d revisions left to test after this %s\n"
+msgstr[0] "ì´ë“±ë¶„: %2$s ë’¤ì— ì‹œí—˜í•  ë¦¬ë¹„ì „ì´ %1$dê°œ 남았습니다\n"
+
#: branch.c:53
#, c-format
msgid ""
@@ -344,7 +544,7 @@ msgstr "'%s' 파ì¼ì´ 버전2 번들 파ì¼ë¡œ ë³´ì´ì§€ 않습니다"
msgid "unrecognized header: %s%s (%d)"
msgstr "ì¸ì‹í•  수 없는 í—¤ë”: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:777
+#: bundle.c:87 builtin/commit.c:778
#, c-format
msgid "could not open '%s'"
msgstr "'%s'ì„(를) ì—´ 수 없습니다"
@@ -353,10 +553,10 @@ msgstr "'%s'ì„(를) ì—´ 수 없습니다"
msgid "Repository lacks these prerequisite commits:"
msgstr "ì €ìž¥ì†Œì— í•„ìˆ˜ì ì¸ ë‹¤ìŒ ì»¤ë°‹ì´ ì—†ìŠµë‹ˆë‹¤:"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
-#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
-#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
-#: builtin/merge.c:361 builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
+#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
+#: builtin/merge.c:356 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "리비전 walk 준비가 실패했습니다"
@@ -393,7 +593,7 @@ msgstr "rev-list ëª…ë ¹ì´ ì£½ì—ˆìŠµë‹ˆë‹¤"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "rev-list 옵션ì—ì„œ '%s' ë ˆí¼ëŸ°ìŠ¤ê°€ 제외ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "ì•Œ 수 없는 ì¸ìž: %s"
@@ -411,13 +611,13 @@ msgstr "'%s'ì„(를) 만들 수 없습니다"
msgid "index-pack died"
msgstr "index-pack ëª…ë ¹ì´ ì£½ì—ˆìŠµë‹ˆë‹¤"
-#: color.c:275
+#: color.c:290
#, c-format
msgid "invalid color value: %.*s"
msgstr "ìž˜ëª»ëœ ìƒ‰ ê°’: %.*s"
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
-#: builtin/am.c:2134
+#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
+#: builtin/am.c:2119
#, c-format
msgid "could not parse %s"
msgstr "parse %sì„(를) 파싱할 수 없습니다"
@@ -431,135 +631,226 @@ msgstr "%s %s, ì»¤ë°‹ì´ ì•„ë‹™ë‹ˆë‹¤"
msgid "memory exhausted"
msgstr "메모리 바닥남"
-#: config.c:475 config.c:477
+#: config.c:516
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "블롭 %2$s ì•ˆì— %1$d번 ì¤„ì— ìž˜ëª»ëœ ì„¤ì •"
+
+#: config.c:520
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "íŒŒì¼ %2$s ì•ˆì— %1$d번 ì¤„ì— ìž˜ëª»ëœ ì„¤ì •"
+
+#: config.c:524
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "표준 ìž…ë ¥ ì•ˆì— %d번 ì¤„ì— ìž˜ëª»ëœ ì„¤ì •"
+
+#: config.c:528
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "하위 모듈 블롭 %2$s ì•ˆì— %1$d번 ì¤„ì— ìž˜ëª»ëœ ì„¤ì •"
+
+#: config.c:532
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "명령행 %2$s ì•ˆì— %1$d번 ì¤„ì— ìž˜ëª»ëœ ì„¤ì •"
+
+#: config.c:536
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "%2$s ì•ˆì— %1$d번 ì¤„ì— ìž˜ëª»ëœ ì„¤ì •"
+
+#: config.c:660
+#, c-format
+msgid "bad numeric config value '%s' for '%s': out of range"
+msgstr "ìž˜ëª»ëœ ìˆ˜ì¹˜ 설정 ê°’ '%s' (키 '%s'): 범위 벗어남"
+
+#: config.c:661
+#, c-format
+msgid "bad numeric config value '%s' for '%s': invalid unit"
+msgstr "ìž˜ëª»ëœ ìˆ˜ì¹˜ 설정 ê°’ '%s' (키 '%s'): 단위 잘못ë¨"
+
+#: config.c:667
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: out of range"
+msgstr "ìž˜ëª»ëœ ìˆ˜ì¹˜ 설정 ê°’ '%s' (키 '%s', 블롭 %s): 범위 벗어남"
+
+#: config.c:668
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: invalid unit"
+msgstr "ìž˜ëª»ëœ ìˆ˜ì¹˜ 설정 ê°’ '%s' (키 '%s', 블롭 %s): 단위 잘못ë¨"
+
+#: config.c:672
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: out of range"
+msgstr "ìž˜ëª»ëœ ìˆ˜ì¹˜ 설정 ê°’ '%s' (키 '%s', íŒŒì¼ %s): 범위 벗어남"
+
+#: config.c:673
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: invalid unit"
+msgstr "ìž˜ëª»ëœ ìˆ˜ì¹˜ 설정 ê°’ '%s' (키 '%s', íŒŒì¼ %s): 단위 잘못ë¨"
+
+#: config.c:677
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: out of range"
+msgstr "ìž˜ëª»ëœ ìˆ˜ì¹˜ 설정 ê°’ '%s' (키 '%s', 표준입력): 범위 벗어남"
+
+#: config.c:678
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: invalid unit"
+msgstr "ìž˜ëª»ëœ ìˆ˜ì¹˜ 설정 ê°’ '%s' (키 '%s', 표준입력): 단위 잘못ë¨"
+
+#: config.c:682
#, c-format
-msgid "bad config line %d in %s %s"
-msgstr "%2$s %3$s %1$d번 ì¤„ì— ìž˜ëª»ëœ ì„¤ì •"
+msgid ""
+"bad numeric config value '%s' for '%s' in submodule-blob %s: out of range"
+msgstr "ìž˜ëª»ëœ ìˆ˜ì¹˜ 설정 ê°’ '%s' (키 '%s', 하위 모듈 블롭 %s): 범위 벗어남"
+
+#: config.c:683
+#, c-format
+msgid ""
+"bad numeric config value '%s' for '%s' in submodule-blob %s: invalid unit"
+msgstr "ìž˜ëª»ëœ ìˆ˜ì¹˜ 설정 ê°’ '%s' (키 '%s', 하위 모듈 블롭 %s): 단위 잘못ë¨"
+
+#: config.c:687
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: out of range"
+msgstr "ìž˜ëª»ëœ ìˆ˜ì¹˜ 설정 ê°’ '%s' (키 '%s', 명령행 %s): 범위 벗어남"
+
+#: config.c:688
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: invalid unit"
+msgstr "ìž˜ëª»ëœ ìˆ˜ì¹˜ 설정 ê°’ '%s' (키 '%s', 명령행 %s): 단위 잘못ë¨"
-#: config.c:593
+#: config.c:692
#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
-msgstr "ìž˜ëª»ëœ ìˆ˜ì¹˜ 설정 ê°’ '%s' (키 '%s', %s %s): %s"
+msgid "bad numeric config value '%s' for '%s' in %s: out of range"
+msgstr "ìž˜ëª»ëœ ìˆ˜ì¹˜ 설정 ê°’ '%s' (키 '%s', %s 안ì—): 범위 벗어남"
-#: config.c:595
+#: config.c:693
#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "ìž˜ëª»ëœ ìˆ˜ì¹˜ 설정 ê°’ '%s' (키 '%s'): %s"
+msgid "bad numeric config value '%s' for '%s' in %s: invalid unit"
+msgstr "ìž˜ëª»ëœ ìˆ˜ì¹˜ 설정 ê°’ '%s' (키 '%s', %s 안ì—): 단위 잘못ë¨"
-#: config.c:680
+#: config.c:780
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "다ìŒì— ì‚¬ìš©ìž ë””ë ‰í„°ë¦¬ í™•ìž¥ì— ì‹¤íŒ¨: '%s'"
-#: config.c:761 config.c:772
+#: config.c:861 config.c:872
#, c-format
msgid "bad zlib compression level %d"
msgstr "%dë²ˆì€ ì˜¬ë°”ë¥¸ zlib 압축 단계가 아닙니다"
-#: config.c:890
+#: config.c:990
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "오브ì íŠ¸ ìƒì„± 모드가 올바르지 않습니다: %s"
-#: config.c:1228
+#: config.c:1324
msgid "unable to parse command-line config"
msgstr "명령행 ì„¤ì •ì„ íŒŒì‹±í•  수 없습니다"
-#: config.c:1284
-msgid "unknown error occured while reading the configuration files"
+#: config.c:1374
+msgid "unknown error occurred while reading the configuration files"
msgstr "설정 파ì¼ì„ ì½ëŠ” 중 ì•Œ 수 없는 오류가 ìƒê²¼ìŠµë‹ˆë‹¤"
-#: config.c:1629
+#: config.c:1728
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "명령행 설정ì—ì„œ '%s'ì„(를) 설정할 수 없습니다"
-#: config.c:1631
+#: config.c:1730
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "'%2$s' 파ì¼ì˜ %3$d번 줄 '%1$s' 설정 변수가 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: config.c:1690
+#: config.c:1789
#, c-format
msgid "%s has multiple values"
msgstr "%sì€(는) 여러 ê°œ ê°’ì´ ìžˆìŠµë‹ˆë‹¤"
-#: config.c:2224
+#: config.c:2323
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "'%s'ì„(를) '%s'(으)ë¡œ 설정할 수 없습니다"
-#: config.c:2226
+#: config.c:2325
#, c-format
msgid "could not unset '%s'"
msgstr "'%s' ì„¤ì •ì„ ì§€ìš¸ 수 없습니다"
-#: connected.c:69
+#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr "ì—°ê²°ì„ í™•ì¸í•˜ëŠ” 중입니다"
+
+#: connected.c:74
msgid "Could not run 'git rev-list'"
msgstr "'git rev-list'를 실행할 수 없습니다"
-#: connected.c:89
+#: connected.c:94
msgid "failed write to rev-list"
msgstr "rev-list ì“°ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: connected.c:96
+#: connected.c:101
msgid "failed to close rev-list's stdin"
msgstr "rev-listì˜ í‘œì¤€ìž…ë ¥ì„ ë‹«ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: date.c:95
+#: date.c:97
msgid "in the future"
msgstr "미래ì—"
-#: date.c:101
+#: date.c:103
#, c-format
msgid "%lu second ago"
msgid_plural "%lu seconds ago"
msgstr[0] "%luì´ˆ ì „"
-#: date.c:108
+#: date.c:110
#, c-format
msgid "%lu minute ago"
msgid_plural "%lu minutes ago"
msgstr[0] "%lu분 전"
-#: date.c:115
+#: date.c:117
#, c-format
msgid "%lu hour ago"
msgid_plural "%lu hours ago"
msgstr[0] "%lu시간 전"
-#: date.c:122
+#: date.c:124
#, c-format
msgid "%lu day ago"
msgid_plural "%lu days ago"
msgstr[0] "%luì¼ ì „"
-#: date.c:128
+#: date.c:130
#, c-format
msgid "%lu week ago"
msgid_plural "%lu weeks ago"
msgstr[0] "%lu주 전"
-#: date.c:135
+#: date.c:137
#, c-format
msgid "%lu month ago"
msgid_plural "%lu months ago"
msgstr[0] "%lu달 전"
-#: date.c:146
+#: date.c:148
#, c-format
msgid "%lu year"
msgid_plural "%lu years"
msgstr[0] "%luë…„"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:149
+#: date.c:151
#, c-format
msgid "%s, %lu month ago"
msgid_plural "%s, %lu months ago"
msgstr[0] "%s %lu달 전"
-#: date.c:154 date.c:159
+#: date.c:156 date.c:161
#, c-format
msgid "%lu year ago"
msgid_plural "%lu years ago"
@@ -570,7 +861,7 @@ msgstr[0] "%luë…„ ì „"
msgid "failed to read orderfile '%s'"
msgstr "'%s' 순서 파ì¼ì„ ì½ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: diffcore-rename.c:538
+#: diffcore-rename.c:540
msgid "Performing inexact rename detection"
msgstr "부정확한 ì´ë¦„ 바꾸기 íƒìƒ‰ì„ 수행하는 중"
@@ -598,16 +889,16 @@ msgstr ""
"'diff.submodule' 설정 ë³€ìˆ˜ì— ì˜¤ë¥˜:\n"
"%s'"
-#: diff.c:3007
+#: diff.c:3017
#, c-format
msgid "external diff died, stopping at %s"
msgstr "외부 diff í”„ë¡œê·¸ëž¨ì´ ì£½ìŒ, %s 위치ì—ì„œ 멈춤"
-#: diff.c:3405
+#: diff.c:3415
msgid "--follow requires exactly one pathspec"
msgstr "--follow 옵션ì—는 정확히 í•˜ë‚˜ì˜ ê²½ë¡œëª…ì„¸ê°€ 필요합니다"
-#: diff.c:3568
+#: diff.c:3578
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -616,7 +907,7 @@ msgstr ""
"--dirstat/-X 옵션 파ë¼ë¯¸í„°ë¥¼ íŒŒì‹±í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤:\n"
"%s"
-#: diff.c:3582
+#: diff.c:3592
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "--submodule 옵션 파ë¼ë¯¸í„° íŒŒì‹±ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤: '%s'"
@@ -629,39 +920,30 @@ msgstr "ì»¤ë„ ì´ë¦„ê³¼ 정보를 ê°€ì ¸ì˜¤ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
msgid "Untracked cache is disabled on this system or location."
msgstr "ì´ ì‹œìŠ¤í…œ ë˜ëŠ” 위치ì—서는 추ì ë˜ì§€ 않는 ìºì‹œë¥¼ 사용하지 않습니다."
-#: gpg-interface.c:166 gpg-interface.c:235
-msgid "could not run gpg."
-msgstr "gpg를 실행할 수 없습니다."
-
#: gpg-interface.c:178
-msgid "gpg did not accept the data"
-msgstr "gpgì—ì„œ ë°ì´í„°ë¥¼ 받아들ì´ì§€ 않습니다"
-
-#: gpg-interface.c:189
msgid "gpg failed to sign the data"
msgstr "gpgì—ì„œ ë°ì´í„°ë¥¼ ì„œëª…í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
-#: gpg-interface.c:222
-#, c-format
-msgid "could not create temporary file '%s'"
-msgstr "'%s' ìž„ì‹œ 파ì¼ì„ 만들 수 없습니다"
+#: gpg-interface.c:208
+msgid "could not create temporary file"
+msgstr "ìž„ì‹œ 파ì¼ì„ 만들 수 없습니다"
-#: gpg-interface.c:224
+#: gpg-interface.c:210
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "ë¶„ë¦¬ëœ ì„œëª…ì„ '%s'ì— ì“°ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: grep.c:1718
+#: grep.c:1792
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': %sì„(를) ì½ì„ 수 없습니다"
-#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
+#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
#, c-format
msgid "failed to stat '%s'"
msgstr "'%s'ì— ëŒ€í•´ stat()ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: grep.c:1746
+#: grep.c:1820
#, c-format
msgid "'%s': short read"
msgstr "'%s': ì½ë‹¤ê°€ 잘림"
@@ -711,7 +993,7 @@ msgstr "(%0.1fì´ˆ ë’¤ì—)..."
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s'ì€(는) 깃 ëª…ë ¹ì´ ì•„ë‹™ë‹ˆë‹¤. 'git --help'를 참고하십시오."
-#: help.c:404 help.c:464
+#: help.c:404 help.c:470
msgid ""
"\n"
"Did you mean this?"
@@ -722,7 +1004,7 @@ msgstr[0] ""
"\n"
"다ìŒì„ ì˜ë„하신 것 아니었나요?"
-#: help.c:460
+#: help.c:466
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
@@ -755,83 +1037,78 @@ msgstr "'%s.lock'ì„ ë§Œë“¤ 수 없습니다: %s"
msgid "failed to read the cache"
msgstr "ìºì‹œë¥¼ ì½ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
-#: builtin/checkout.c:586 builtin/clone.c:732
+#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
+#: builtin/checkout.c:589 builtin/clone.c:732
msgid "unable to write new index file"
msgstr "새 ì¸ë±ìŠ¤ 파ì¼ì„ 쓸 수 없습니다"
-#: merge-recursive.c:189
-#, c-format
+#: merge-recursive.c:212
msgid "(bad commit)\n"
msgstr "(ìž˜ëª»ëœ ì»¤ë°‹)\n"
-#: merge-recursive.c:209
+#: merge-recursive.c:234
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "'%s' ê²½ë¡œì— ëŒ€í•´ addinfo_cacheê°€ 실패했습니다"
-#: merge-recursive.c:270
+#: merge-recursive.c:304
msgid "error building trees"
msgstr "트리 ë¹Œë“œì— ì˜¤ë¥˜"
-#: merge-recursive.c:689
+#: merge-recursive.c:723
#, c-format
msgid "failed to create path '%s'%s"
msgstr "'%s' 경로 ë§Œë“¤ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤%s"
-#: merge-recursive.c:700
+#: merge-recursive.c:734
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "하위 ë””ë ‰í„°ë¦¬ì— ê³µê°„ì„ ë§Œë“œë ¤ê³  %sì„(를) 제거합니다\n"
-#: merge-recursive.c:714 merge-recursive.c:735
+#: merge-recursive.c:748 merge-recursive.c:767
msgid ": perhaps a D/F conflict?"
msgstr ": ì•„ë§ˆë„ D/F 충ëŒ?"
-#: merge-recursive.c:725
+#: merge-recursive.c:757
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "'%s' ìœ„ì¹˜ì˜ ì¶”ì ë˜ì§€ 않는 파ì¼ì„ 잃기를 거부합니다"
-#: merge-recursive.c:765
+#: merge-recursive.c:799
#, c-format
msgid "cannot read object %s '%s'"
msgstr "%s '%s' 오브ì íŠ¸ë¥¼ ì½ì„ 수 ì—†ìŒ"
-#: merge-recursive.c:767
+#: merge-recursive.c:801
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s'ì— ëŒ€í•´ ë¸”ë¡­ì„ ì˜ˆìƒ"
-#: merge-recursive.c:790 builtin/clone.c:376
+#: merge-recursive.c:825
#, c-format
-msgid "failed to open '%s'"
-msgstr "'%s'ì„(를) ì—¬ëŠ”ë° ì‹¤íŒ¨"
+msgid "failed to open '%s': %s"
+msgstr "'%s'ì„(를) ì—¬ëŠ”ë° ì‹¤íŒ¨: %s"
-#: merge-recursive.c:798
+#: merge-recursive.c:836
#, c-format
-msgid "failed to symlink '%s'"
-msgstr "'%s' 심볼릭 ë§í¬ì— 실패"
+msgid "failed to symlink '%s': %s"
+msgstr "'%s' 심볼릭 ë§í¬ì— 실패: %s"
-#: merge-recursive.c:801
+#: merge-recursive.c:841
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "다ìŒì„ 어떻게 할지 ì•Œ 수 없습니다: %06o %s '%s'"
-#: merge-recursive.c:939
+#: merge-recursive.c:981
msgid "Failed to execute internal merge"
msgstr "내부 병합 ì‹¤í–‰ì— ì‹¤íŒ¨"
-#: merge-recursive.c:943
+#: merge-recursive.c:985
#, c-format
msgid "Unable to add %s to database"
msgstr "%sì„(를) ë°ì´í„°ë² ì´ìŠ¤ì— 추가할 수 없습니다"
-#: merge-recursive.c:959
-msgid "unsupported object type in the tree"
-msgstr "트리ì—ì„œ 지ì›í•˜ì§€ 않는 오브ì íŠ¸ 종류"
-
-#: merge-recursive.c:1034 merge-recursive.c:1048
+#: merge-recursive.c:1084 merge-recursive.c:1098
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -839,7 +1116,7 @@ msgid ""
msgstr ""
"충ëŒ! (%s/ì‚­ì œ): %s (위치 %s) ë° %s (%sì—ì„œ) ì‚­ì œ. %s ë²„ì „ì˜ %s íŠ¸ë¦¬ì— ë‚¨ìŒ."
-#: merge-recursive.c:1040 merge-recursive.c:1053
+#: merge-recursive.c:1090 merge-recursive.c:1103
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -848,20 +1125,20 @@ msgstr ""
"충ëŒ! (%s/ì‚­ì œ): %s (위치 %s) ë° %s (위치 %s) ì‚­ì œ. %s ë²„ì „ì˜ %s íŠ¸ë¦¬ì— "
"%s(으)ë¡œ 남ìŒ."
-#: merge-recursive.c:1094
+#: merge-recursive.c:1146
msgid "rename"
msgstr "ì´ë¦„바꾸기"
-#: merge-recursive.c:1094
+#: merge-recursive.c:1146
msgid "renamed"
msgstr "ì´ë¦„바꿈"
-#: merge-recursive.c:1150
+#: merge-recursive.c:1203
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%sì€(는) %sì— ìžˆëŠ” 디렉터리로 %s(으)ë¡œ ì´ë¦„ì„ ë°”ê¿‰ë‹ˆë‹¤"
-#: merge-recursive.c:1172
+#: merge-recursive.c:1228
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -870,145 +1147,136 @@ msgstr ""
"충ëŒ! (ì´ë¦„바꾸기/ì´ë¦„바꾸기): \"%3$s\" 브랜치ì—ì„œ ì´ë¦„바꾸기 \"%1$s\"->"
"\"%2$s\" \"%6$s\" 브랜치ì—ì„œ ì´ë¦„ 바꾸기 \"%4$s\"->\"%5$s\"%7$s"
-#: merge-recursive.c:1177
+#: merge-recursive.c:1233
msgid " (left unresolved)"
msgstr " (í•´ê²°ë˜ì§€ ì•ŠìŒ)"
-#: merge-recursive.c:1231
+#: merge-recursive.c:1295
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"충ëŒ! (rename/rename): ì´ë¦„ 바꾸기 %s->%s (위치 %s). ì´ë¦„ 바꾸기 %s->%s (위"
"치 %s)"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1328
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "대신 ì´ë¦„ì„ %sì—ì„œ %s(으)ë¡œ 바꾸고 %sì—ì„œ %s(으)ë¡œ 바꿉니다"
-#: merge-recursive.c:1460
+#: merge-recursive.c:1534
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "충ëŒ! (rename/add): ì´ë¦„ 바꾸기 %s->%s (위치 %s). %s 추가 (위치 %s)"
-#: merge-recursive.c:1470
+#: merge-recursive.c:1549
#, c-format
msgid "Adding merged %s"
msgstr "ë³‘í•©ëœ %sì„(를) 추가합니다"
-#: merge-recursive.c:1475 merge-recursive.c:1677
+#: merge-recursive.c:1556 merge-recursive.c:1769
#, c-format
msgid "Adding as %s instead"
msgstr "대신 %s(으)로 추가합니다"
-#: merge-recursive.c:1526
+#: merge-recursive.c:1613
#, c-format
msgid "cannot read object %s"
msgstr "%s 오브ì íŠ¸ë¥¼ ì½ì„ 수 없습니다"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1616
#, c-format
msgid "object %s is not a blob"
msgstr "%s 오브ì íŠ¸ëŠ” ë¸”ë¡­ì´ ì•„ë‹™ë‹ˆë‹¤"
-#: merge-recursive.c:1581
+#: merge-recursive.c:1669
msgid "modify"
msgstr "수정"
-#: merge-recursive.c:1581
+#: merge-recursive.c:1669
msgid "modified"
msgstr "수정ë¨"
-#: merge-recursive.c:1591
+#: merge-recursive.c:1679
msgid "content"
msgstr "ë‚´ìš©"
-#: merge-recursive.c:1598
+#: merge-recursive.c:1686
msgid "add/add"
msgstr "추가/추가"
-#: merge-recursive.c:1632
+#: merge-recursive.c:1721
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "건너뛰기: %s (기존과 같게 병합)"
-#: merge-recursive.c:1646
+#: merge-recursive.c:1735
#, c-format
msgid "Auto-merging %s"
msgstr "ìžë™ 병합: %s"
-#: merge-recursive.c:1650 git-submodule.sh:941
+#: merge-recursive.c:1739 git-submodule.sh:919
msgid "submodule"
msgstr "하위 모듈"
-#: merge-recursive.c:1651
+#: merge-recursive.c:1740
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "충ëŒ! (%s): %sì— ë³‘í•© 충ëŒ"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1834
#, c-format
msgid "Removing %s"
msgstr "제거: %s"
-#: merge-recursive.c:1762
+#: merge-recursive.c:1860
msgid "file/directory"
msgstr "파ì¼/디렉터리"
-#: merge-recursive.c:1768
+#: merge-recursive.c:1866
msgid "directory/file"
msgstr "디렉터리/파ì¼"
-#: merge-recursive.c:1773
+#: merge-recursive.c:1871
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"충ëŒ! (%s): ì´ë¦„ì´ %sì¸ ë””ë ‰í„°ë¦¬ê°€ %sì— ìžˆìŠµë‹ˆë‹¤. %sì„(를) %s(으)ë¡œ 추가합니"
"다"
-#: merge-recursive.c:1781
+#: merge-recursive.c:1880
#, c-format
msgid "Adding %s"
msgstr "추가: %s"
-#: merge-recursive.c:1798
-msgid "Fatal merge failure, shouldn't happen."
-msgstr "치명ì ì¸ 병합 실패, ì¼ì–´ë‚  수 없는 ìƒí™©."
-
-#: merge-recursive.c:1817
+#: merge-recursive.c:1917
msgid "Already up-to-date!"
msgstr "ì´ë¯¸ ì—…ë°ì´íŠ¸ ìƒíƒœìž…니다!"
-#: merge-recursive.c:1826
+#: merge-recursive.c:1926
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "%s ë° %s íŠ¸ë¦¬ì˜ ë³‘í•©ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: merge-recursive.c:1856
-#, c-format
-msgid "Unprocessed path??? %s"
-msgstr "처리ë˜ì§€ ì•Šì€ ê²½ë¡œ??? %s"
-
-#: merge-recursive.c:1904
+#: merge-recursive.c:2009
msgid "Merging:"
msgstr "병합:"
-#: merge-recursive.c:1917
+#: merge-recursive.c:2022
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "ê³¼ê±°ì˜ ê³µí†µ 커밋 %uê°œ 발견:"
-#: merge-recursive.c:1954
+#: merge-recursive.c:2061
msgid "merge returned no commit"
msgstr "병합 ê²°ê³¼ì— ì»¤ë°‹ì´ ì—†ìŠµë‹ˆë‹¤"
-#: merge-recursive.c:2011
+#: merge-recursive.c:2124
#, c-format
msgid "Could not parse object '%s'"
msgstr "'%s' 오브ì íŠ¸ë¥¼ 파싱할 수 없습니다"
-#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
+#: merge-recursive.c:2138 builtin/merge.c:641 builtin/merge.c:788
msgid "Unable to write index."
msgstr "ì¸ë±ìŠ¤ë¥¼ 쓸 수 없습니다."
@@ -1136,7 +1404,7 @@ msgstr ""
":(exclude) 패턴으로 제외할 ì‚¬í•­ì´ ì—†ìŠµë‹ˆë‹¤.\n"
"':/' ë˜ëŠ” '.' 추가를 잊으신 것 아닙니까?"
-#: pretty.c:971
+#: pretty.c:973
msgid "unable to parse --pretty format"
msgstr "--pretty 형ì‹ì„ 파싱할 수 없습니다"
@@ -1162,23 +1430,22 @@ msgstr ""
"GIT_INDEX_VERSIONì´ ì„¤ì •ë˜ì—ˆì§€ë§Œ, ì´ ê°’ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤.\n"
"%i ë²„ì „ì„ ì‚¬ìš©í•©ë‹ˆë‹¤"
-#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
-#: builtin/merge.c:995
+#: refs.c:551 builtin/merge.c:840
#, c-format
msgid "Could not open '%s' for writing"
msgstr "'%s'ì„(를) 쓰기용으로 ì—´ 수 없습니다"
-#: refs/files-backend.c:2243
+#: refs/files-backend.c:2534
#, c-format
msgid "could not delete reference %s: %s"
msgstr "%s ë ˆí¼ëŸ°ìŠ¤ë¥¼ 삭제할 수 없습니다: %s"
-#: refs/files-backend.c:2246
+#: refs/files-backend.c:2537
#, c-format
msgid "could not delete references: %s"
msgstr "ë ˆí¼ëŸ°ìŠ¤ë¥¼ 삭제할 수 없습니다: %s"
-#: refs/files-backend.c:2255
+#: refs/files-backend.c:2546
#, c-format
msgid "could not remove reference %s"
msgstr "%s ë ˆí¼ëŸ°ìŠ¤ë¥¼ 제거할 수 없습니다"
@@ -1336,84 +1603,84 @@ msgstr "%sì€(는) %s ë° %s ëª¨ë‘ ì¶”ì í•©ë‹ˆë‹¤"
msgid "Internal error"
msgstr "내부 오류"
-#: remote.c:1678 remote.c:1721
+#: remote.c:1677 remote.c:1720
msgid "HEAD does not point to a branch"
msgstr "HEAD가 브랜치를 가리키지 않습니다"
-#: remote.c:1687
+#: remote.c:1686
#, c-format
msgid "no such branch: '%s'"
msgstr "그런 브랜치가 없습니다: '%s'"
-#: remote.c:1690
+#: remote.c:1689
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "'%s' ë¸Œëžœì¹˜ì— ëŒ€í•´ ì—…ìŠ¤íŠ¸ë¦¼ì„ ì„¤ì •í•˜ì§€ 않았습니다"
-#: remote.c:1696
+#: remote.c:1695
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "업스트림 '%s' 브랜치가 리모트 ì¶”ì  ë¸Œëžœì¹˜ë¡œ 저장ë˜ì§€ 않았습니다"
-#: remote.c:1711
+#: remote.c:1710
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "리모트 '%2$s'ì˜ í‘¸ì‹œ ëŒ€ìƒ '%1$s'ì— ë¡œì»¬ ì¶”ì  ë¸Œëžœì¹˜ê°€ 없습니다"
-#: remote.c:1726
+#: remote.c:1725
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "'%s' ë¸Œëžœì¹˜ì— í‘¸ì‹œ 리모트가 없습니다"
-#: remote.c:1737
+#: remote.c:1736
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "'%s'ì— ëŒ€í•œ 푸시 ë ˆí¼ëŸ°ìŠ¤ëª…ì„¸ì— '%s'ì´(ê°€) 들어 있지 않습니다"
-#: remote.c:1750
+#: remote.c:1749
msgid "push has no destination (push.default is 'nothing')"
msgstr "í‘¸ì‹œì˜ ëŒ€ìƒì´ 없습니다 (push.defaultê°€ 'nothing'입니다)"
-#: remote.c:1772
+#: remote.c:1771
msgid "cannot resolve 'simple' push to a single destination"
msgstr "í•˜ë‚˜ì˜ ëŒ€ìƒì— 대해 'simple' 푸시를 처리할 수 없습니다"
-#: remote.c:2074
+#: remote.c:2073
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "현재 브랜치가 '%s' 기반ì´ì§€ë§Œ, ì—…ìŠ¤íŠ¸ë¦¼ì´ ì—†ì–´ì¡ŒìŠµë‹ˆë‹¤.\n"
-#: remote.c:2078
+#: remote.c:2077
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (바로잡으려면 \"git branch --unset-upstream\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)\n"
-#: remote.c:2081
+#: remote.c:2080
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "브랜치가 '%s'ì— ë§žê²Œ ì—…ë°ì´íŠ¸ëœ ìƒíƒœìž…니다.\n"
-#: remote.c:2085
+#: remote.c:2084
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "브랜치가 '%s'보다 %dê°œ ì»¤ë°‹ë§Œí¼ ì•žì— ìžˆìŠµë‹ˆë‹¤.\n"
-#: remote.c:2091
+#: remote.c:2090
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (ë¡œì»¬ì— ìžˆëŠ” ì»¤ë°‹ì„ ì œì¶œí•˜ë ¤ë©´ \"git push\"를 사용하십시오)\n"
-#: remote.c:2094
+#: remote.c:2093
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
msgstr[0] "브랜치가 '%s'보다 %dê°œ 커밋 ë’¤ì— ìžˆê³ , 앞으로 ëŒë¦´ 수 있습니다.\n"
-#: remote.c:2102
+#: remote.c:2101
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (로컬 브랜치를 ì—…ë°ì´íŠ¸í•˜ë ¤ë©´ \"git pull\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)\n"
-#: remote.c:2105
+#: remote.c:2104
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1425,21 +1692,21 @@ msgstr[0] ""
"현재 브랜치와 '%s'ì´(ê°€) ê°ˆë¼ì¡ŒìŠµë‹ˆë‹¤,\n"
"다른 ì»¤ë°‹ì´ ê°ê° %d개와 %dê°œ 있습니다.\n"
-#: remote.c:2115
+#: remote.c:2114
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (ë¦¬ëª¨íŠ¸ì˜ ë¸Œëžœì¹˜ë¥¼ 현재 브랜치로 병합하려면 \"git pull\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)\n"
-#: revision.c:2142
+#: revision.c:2132
msgid "your current branch appears to be broken"
msgstr "현재 브랜치가 ë§ê°€ì§„ 것처럼 보입니다"
-#: revision.c:2145
+#: revision.c:2135
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "현재 '%s' ë¸Œëžœì¹˜ì— ì•„ì§ ì•„ë¬´ ì»¤ë°‹ë„ ì—†ìŠµë‹ˆë‹¤"
-#: revision.c:2339
+#: revision.c:2329
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent ì˜µì…˜ì€ --bisect 옵션과 호환ë˜ì§€ 않습니다"
@@ -1452,25 +1719,29 @@ msgstr "/dev/null 열기 실패"
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) 실패"
-#: send-pack.c:295
+#: send-pack.c:298
msgid "failed to sign the push certificate"
msgstr "푸시 ì¸ì¦ì„œ ì„œëª…ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: send-pack.c:404
+#: send-pack.c:411
msgid "the receiving end does not support --signed push"
msgstr "받는 쪽ì—ì„œ --signed 푸시를 지ì›í•˜ì§€ 않습니다"
-#: send-pack.c:406
+#: send-pack.c:413
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
"받는 쪽ì—ì„œ --signed 푸시를 지ì›í•˜ì§€ 않으므로 푸시 ì¸ì¦ì„œë¥¼ 보내지 않습니다"
-#: send-pack.c:418
+#: send-pack.c:425
msgid "the receiving end does not support --atomic push"
msgstr "받는 쪽ì—ì„œ --atomic 푸시를 지ì›í•˜ì§€ 않습니다"
+#: send-pack.c:430
+msgid "the receiving end does not support push options"
+msgstr "받는 쪽ì—ì„œ 푸시 ì˜µì…˜ì„ ì§€ì›í•˜ì§€ 않습니다"
+
#: sequencer.c:174
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
@@ -1489,15 +1760,15 @@ msgstr ""
"'git add <경로>' ë˜ëŠ” 'git rm <경로>'ë¡œ 표시하십시오.\n"
"그리고 ê²°ê³¼ë¬¼ì„ 'git commit'으로 커밋하십시오"
-#: sequencer.c:190 sequencer.c:833 sequencer.c:912
+#: sequencer.c:190 sequencer.c:841 sequencer.c:924
#, c-format
msgid "Could not write to %s"
msgstr "%sì— ì“¸ 수 없습니다"
-#: sequencer.c:193
+#: sequencer.c:193 sequencer.c:843 sequencer.c:928
#, c-format
-msgid "Error wrapping up %s"
-msgstr "%s ìž ê·¸ëŠ”ë° ì˜¤ë¥˜"
+msgid "Error wrapping up %s."
+msgstr "%s ìž ê·¸ëŠ”ë° ì˜¤ë¥˜."
#: sequencer.c:208
msgid "Your local changes would be overwritten by cherry-pick."
@@ -1511,203 +1782,241 @@ msgstr "로컬 변경 ì‚¬í•­ì„ revert ë•Œë¬¸ì— ë®ì–´ 쓰게 ë©ë‹ˆë‹¤."
msgid "Commit your changes or stash them to proceed."
msgstr "변경 ì‚¬í•­ì„ ìŠ¤í…Œì´ì§•í•˜ê±°ë‚˜ 스태시한 ë‹¤ìŒ ê³„ì†í•˜ì‹­ì‹œì˜¤."
+#: sequencer.c:228
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: 정방향 진행"
+
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:300
+#: sequencer.c:303
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: 새 ì¸ë±ìŠ¤ 파ì¼ì„ 쓸 수 없습니다"
-#: sequencer.c:318
+#: sequencer.c:321
msgid "Could not resolve HEAD commit\n"
msgstr "HEAD ì»¤ë°‹ì„ ì²˜ë¦¬í•  수 없습니다\n"
-#: sequencer.c:338
+#: sequencer.c:341
msgid "Unable to update cache tree\n"
msgstr "ìºì‹œ 트리를 ì—…ë°ì´íŠ¸í•  수 없습니다\n"
-#: sequencer.c:390
+#: sequencer.c:393
#, c-format
msgid "Could not parse commit %s\n"
msgstr "%s ì»¤ë°‹ì„ íŒŒì‹±í•  수 없습니다\n"
-#: sequencer.c:395
+#: sequencer.c:398
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "%s ì´ì „ ì»¤ë°‹ì„ íŒŒì‹±í•  수 없습니다\n"
-#: sequencer.c:460
+#: sequencer.c:463
msgid "Your index file is unmerged."
msgstr "ì¸ë±ìŠ¤ 파ì¼ì´ 병합ë˜ì§€ 않았습니다."
-#: sequencer.c:479
+#: sequencer.c:482
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "%s ì»¤ë°‹ì€ ë³‘í•©ì´ì§€ë§Œ -m ì˜µì…˜ì´ ì£¼ì–´ì§€ì§€ 않았습니다."
# FIXME: "parent %d" 번호가 무슨 ì˜ë¯¸?
-#: sequencer.c:487
+#: sequencer.c:490
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "Commit %s ì»¤ë°‹ì— ì´ì „ 커밋 %dì´(ê°€) 없습니다"
-#: sequencer.c:491
+#: sequencer.c:494
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr "ë©”ì¸ë¼ì¸ì„ 지정했지만 %s ì»¤ë°‹ì´ ë³‘í•© ì»¤ë°‹ì´ ì•„ë‹™ë‹ˆë‹¤."
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:504
+#: sequencer.c:507
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: %s ì´ì „ ì»¤ë°‹ì„ íŒŒì‹±í•  수 없습니다"
-#: sequencer.c:508
+#: sequencer.c:511
#, c-format
msgid "Cannot get commit message for %s"
msgstr "%sì— ëŒ€í•œ 커밋 메시지를 가져올 수 없습니다"
-#: sequencer.c:594
+#: sequencer.c:597
#, c-format
msgid "could not revert %s... %s"
msgstr "다ìŒì„ ë˜ëŒë¦´(revert) 수 없습니다: %s... %s"
-#: sequencer.c:595
+#: sequencer.c:598
#, c-format
msgid "could not apply %s... %s"
msgstr "다ìŒì„ ì ìš©í• (apply) 수 없습니다: %s... %s"
-#: sequencer.c:630
+#: sequencer.c:633
msgid "empty commit set passed"
msgstr "빈 커밋 모ìŒì„ 건너 ëœë‹ˆë‹¤"
-#: sequencer.c:638
+#: sequencer.c:641
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: ì¸ë±ìŠ¤ ì½ê¸°ì— 실패했습니다"
-#: sequencer.c:642
+#: sequencer.c:645
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: ì¸ë±ìŠ¤ 새로 ê³ ì¹¨ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: sequencer.c:702
-#, c-format
-msgid "Cannot %s during a %s"
-msgstr "%2$s ë™ì•ˆ %1$s í•  수 없습니다"
+#: sequencer.c:705
+msgid "Cannot revert during a another revert."
+msgstr "ë˜ëŒë¦¬ëŠ”(revert) ì¤‘ì— ë˜ ë‹¤ë¥¸ ë˜ëŒë¦¬ê¸°ë¥¼ í•  수 없습니다."
+
+#: sequencer.c:706
+msgid "Cannot revert during a cherry-pick."
+msgstr "빼오기(cherry-pick) ì¤‘ì— ë˜ëŒë¦¬ê¸°(revert)를 í•  수 없습니다."
+
+#: sequencer.c:709
+msgid "Cannot cherry-pick during a revert."
+msgstr "ë˜ëŒë¦¬ê¸°(revert) ì¤‘ì— ë¹¼ì˜¤ê¸°(cherry-pick)를 í•  수 없습니다"
+
+#: sequencer.c:710
+msgid "Cannot cherry-pick during another cherry-pick."
+msgstr "빼오기(revert) ì¤‘ì— ë˜ ë‹¤ë¥¸ 빼오기를 í•  수 없습니다"
-#: sequencer.c:724
+#: sequencer.c:732
#, c-format
msgid "Could not parse line %d."
msgstr "%d번 ì¤„ì„ íŒŒì‹±í•  수 없습니다."
-#: sequencer.c:729
+#: sequencer.c:737
msgid "No commits parsed."
msgstr "파싱한 ì»¤ë°‹ì´ ì—†ìŠµë‹ˆë‹¤."
-#: sequencer.c:741
+#: sequencer.c:749
#, c-format
msgid "Could not open %s"
msgstr "%sì„(를) ì—´ 수 없습니다"
-#: sequencer.c:745
+#: sequencer.c:753
#, c-format
msgid "Could not read %s."
msgstr "%sì„(를) ì½ì„ 수 없습니다."
-#: sequencer.c:752
+#: sequencer.c:760
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "사용 불가능 ì¸ìŠ¤íŠ¸ëŸ­ì…˜ 파ì¼: %s"
-#: sequencer.c:782
+#: sequencer.c:790
#, c-format
msgid "Invalid key: %s"
msgstr "ìž˜ëª»ëœ í‚¤: %s"
-#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52
+#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
#, c-format
msgid "Invalid value for %s: %s"
msgstr "%sì˜ ê°’ì´ ì˜¬ë°”ë¥´ì§€ 않습니다: %s"
-#: sequencer.c:795
+#: sequencer.c:803
#, c-format
msgid "Malformed options sheet: %s"
msgstr "형ì‹ì´ ìž˜ëª»ëœ ì˜µì…˜ 파ì¼: %s"
-#: sequencer.c:814
+#: sequencer.c:822
msgid "a cherry-pick or revert is already in progress"
msgstr "ì´ë¯¸ 커밋 빼오기(cherry-pick) ë˜ëŠ” ë˜ëŒë¦¬ê¸°(revert)ê°€ 진행 중입니다"
-#: sequencer.c:815
+#: sequencer.c:823
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "\"git cherry-pick (--continue | --quit | --abort)\" ëª…ë ¹ì„ í•´ 보십시오"
-#: sequencer.c:819
+#: sequencer.c:827
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "%s 시퀀서 디렉터리를 만들 수 없습니다"
-#: sequencer.c:835 sequencer.c:916
-#, c-format
-msgid "Error wrapping up %s."
-msgstr "%s ìž ê·¸ëŠ”ë° ì˜¤ë¥˜."
-
-#: sequencer.c:854 sequencer.c:986
+#: sequencer.c:862 sequencer.c:998
msgid "no cherry-pick or revert in progress"
msgstr "빼오기(cherry-pick) ë˜ëŠ” ë˜ëŒë¦¬ê¸°(revert)ê°€ 진행 중ì´ì§€ 않습니다"
-#: sequencer.c:856
+#: sequencer.c:864
msgid "cannot resolve HEAD"
msgstr "HEAD를 구해 올 수 없습니다"
-#: sequencer.c:858
+#: sequencer.c:866 sequencer.c:900
msgid "cannot abort from a branch yet to be born"
msgstr "새로 만들고 있는 브랜치ì—ì„œ 중지할 수 없습니다"
-#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
+#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
#, c-format
msgid "cannot open %s"
msgstr "%sì„(를) ì—´ 수 없습니다"
-#: sequencer.c:880
+#: sequencer.c:888
#, c-format
msgid "cannot read %s: %s"
msgstr "%sì„(를) ì½ì„ 수 없습니다: %s"
-#: sequencer.c:881
+#: sequencer.c:889
msgid "unexpected end of file"
msgstr "예ìƒì¹˜ 못하게 파ì¼ì´ ë났습니다"
-#: sequencer.c:887
+#: sequencer.c:895
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "빼오기 ì „ì— ì €ìž¥í•œ HEAD 파ì¼ì´('%s') ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤"
-#: sequencer.c:909
+#: sequencer.c:921
#, c-format
msgid "Could not format %s."
msgstr "%sì— í¬ë§¤íŒ…í•  수 없습니다."
-#: sequencer.c:1054
+#: sequencer.c:1066
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: %s ì»¤ë°‹ì„ ë¹¼ì˜¬ 수 없습니다"
-#: sequencer.c:1057
+#: sequencer.c:1069
#, c-format
msgid "%s: bad revision"
msgstr "%s: ìž˜ëª»ëœ ë¦¬ë¹„ì „"
-#: sequencer.c:1091
+#: sequencer.c:1102
msgid "Can't revert as initial commit"
msgstr "ìµœì´ˆì˜ ì»¤ë°‹ì„ ë˜ëŒë¦´ 수 없습니다"
-#: sequencer.c:1092
-msgid "Can't cherry-pick into empty head"
-msgstr "빈 헤드로 ì»¤ë°‹ì„ ë¹¼ì˜¬ 수 없습니다."
+#: setup.c:160
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s: ìž‘ì—… í´ë”ì— ê·¸ëŸ° 경로가 없습니다.\n"
+"ë¡œì»¬ì— ì—†ëŠ” 경로를 지정하려면 'git <명령> -- <경로>...' ì‹ìœ¼ë¡œ 사용하십시오."
+
+#: setup.c:173
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"애매한 ì¸ìž '%s': ì•Œ 수 없는 리비전 ë˜ëŠ” ìž‘ì—… í´ë”ì— ì—†ëŠ” 경로.\n"
+"경로와 ë¦¬ë¹„ì „ì„ êµ¬ë¶„í•˜ë ¤ë©´ 다ìŒê³¼ ê°™ì´ '--'를 사용하십시오:\n"
+"'git <명령> [<리비전>...] -- [<파ì¼>...]'"
+
+#: setup.c:223
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"애매한 ì¸ìž '%s': ì•Œ 수 없는 리비전 ë° íŒŒì¼ ì´ë¦„\n"
+"경로와 ë¦¬ë¹„ì „ì„ êµ¬ë¶„í•˜ë ¤ë©´ 다ìŒê³¼ ê°™ì´ '--'를 사용하십시오:\n"
+"'git <명령> [<리비전>...] -- [<파ì¼>...]'"
-#: setup.c:248
+#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
#, c-format
msgid "failed to read %s"
msgstr "%sì„(를) ì½ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
@@ -1721,16 +2030,52 @@ msgstr "깃 저장소 버전 <= %d ë²„ì „ì„ ê¸°ëŒ€í•˜ì§€ë§Œ, %d ë²„ì „ì´ ë°œê²
msgid "unknown repository extensions found:"
msgstr "ì•Œ 수 없는 저장소 í™•ìž¥ì´ ìžˆìŠµë‹ˆë‹¤:"
-#: sha1_file.c:1080
+#: setup.c:762
+#, c-format
+msgid "Not a git repository (or any of the parent directories): %s"
+msgstr "(현재 í´ë” ë˜ëŠ” ìƒìœ„ í´ë”ê°€) 깃 저장소가 아닙니다: %s"
+
+#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+msgid "Cannot come back to cwd"
+msgstr "현재 디렉터리로 ëŒì•„올 수 없습니다"
+
+#: setup.c:845
+msgid "Unable to read current working directory"
+msgstr "현재 ìž‘ì—… 디렉터리를 ì½ì„ 수 없습니다"
+
+#: setup.c:920
+#, c-format
+msgid ""
+"Not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgstr ""
+"(현재 í´ë” ë˜ëŠ” 마운트 위치 %s까지 ìƒìœ„ í´ë”ê°€) 깃 저장소가 아닙니다\n"
+"íŒŒì¼ ì‹œìŠ¤í…œ 경계ì—ì„œ 중지합니다. (GIT_DISCOVERY_ACROSS_FILESYSTEM 설정ë˜ì§€ ì•ŠìŒ)"
+
+#: setup.c:927
+#, c-format
+msgid "Cannot change to '%s/..'"
+msgstr "'%s/..' 위치로 ì´ë™í•  수 없습니다"
+
+#: setup.c:989
+#, c-format
+msgid ""
+"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"core.sharedRepository 파ì¼ëª¨ë“œ ê°’ì— (0%.3o) 문제가 있습니다.\n"
+"파ì¼ì˜ 소유ìžì— ì½ê¸°ì™€ 쓰기 ê¶Œí•œì´ ìžˆì–´ì•¼ 합니다."
+
+#: sha1_file.c:1046
msgid "offset before end of packfile (broken .idx?)"
msgstr "ì˜¤í”„ì…‹ì´ ë¬¶ìŒ íŒŒì¼ ì•žìž…ë‹ˆë‹¤ (ë§ê°€ì§„ .idx?)"
-#: sha1_file.c:2458
+#: sha1_file.c:2434
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "ì˜¤í”„ì…‹ì´ %sì˜ ë¬¶ìŒ ì¸ë±ìŠ¤ 시작보다 앞입니다 (ë§ê°€ì§„ ì¸ë±ìŠ¤?)"
-#: sha1_file.c:2462
+#: sha1_file.c:2438
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "ì˜¤í”„ì…‹ì´ %sì˜ ë¬¶ìŒ ì¸ë±ìŠ¤ ë보다 뒤입니다 (ë§ê°€ì§„ ì¸ë±ìŠ¤?)"
@@ -1785,7 +2130,7 @@ msgstr "ì—…ë°ì´íŠ¸í•œ .gitmodules를 커밋할 사항으로 í‘œì‹œí•˜ëŠ”ë° ì‹
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "submodule.fetchJobs ê°’ì— ìŒìˆ˜ë¥¼ 쓸 수 없습니다"
-#: submodule-config.c:355
+#: submodule-config.c:358
#, c-format
msgid "invalid value for %s"
msgstr "%sì˜ ê°’ì´ ì˜¬ë°”ë¥´ì§€ 않습니다"
@@ -1844,6 +2189,56 @@ msgstr "ìž„ì‹œ 파ì¼ì„ ì—´ 수 없습니다: %s"
msgid "could not rename temporary file to %s"
msgstr "ìž„ì‹œ íŒŒì¼ ì´ë¦„ì„ '%s'(으)ë¡œ 바꿀 수 없습니다"
+#: transport.c:62
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "'%1$s'ì˜ ì—…ìŠ¤íŠ¸ë¦¼ì„ '%3$s'ì˜ '%2$s'(으)ë¡œ 설정할 것입니다\n"
+
+#: transport.c:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: ìž˜ëª»ëœ ê¹Šì´ ì˜µì…˜: %s"
+
+#: transport.c:771
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"ë‹¤ìŒ í•˜ìœ„ 모듈 ê²½ë¡œì— ë¦¬ëª¨íŠ¸ ì–´ë””ì—ë„ ì—†ëŠ”\n"
+"변경 ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤:\n"
+
+#: transport.c:775
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"ë¦¬ëª¨íŠ¸ì— í‘¸ì‹œí•˜ë ¤ë©´\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"ë˜ëŠ” 해당 경로로 cdí•œ 다ìŒ\n"
+"\n"
+"\tgit push\n"
+"\n"
+"ëª…ë ¹ì„ ì‹œë„í•´ 보십시오\n"
+"\n"
+
+#: transport.c:783
+msgid "Aborting."
+msgstr "중지함."
+
#: transport-helper.c:1041
#, c-format
msgid "Could not read ref %s"
@@ -1853,7 +2248,7 @@ msgstr "%s ë ˆí¼ëŸ°ìŠ¤ë¥¼ ì½ì„ 수 없습니다"
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
-"%%sPlease commit your changes or stash them before you can switch branches."
+"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
"ë‹¤ìŒ íŒŒì¼ì˜ 로컬 변경 ì‚¬í•­ì„ ì²´í¬ì•„웃 ë•Œë¬¸ì— ë®ì–´ 쓰게 ë©ë‹ˆë‹¤:\n"
"%%s브랜치를 전환하기 ì „ì— ë³€ê²½ ì‚¬í•­ì„ ì»¤ë°‹í•˜ê±°ë‚˜ 스태시하십시오."
@@ -1871,7 +2266,7 @@ msgstr ""
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you can merge."
+"%%sPlease commit your changes or stash them before you merge."
msgstr ""
"ë‹¤ìŒ íŒŒì¼ì˜ 로컬 변경 ì‚¬í•­ì„ ë³‘í•© ë•Œë¬¸ì— ë®ì–´ 쓰게 ë©ë‹ˆë‹¤:\n"
"%%s병합하기 ì „ì— ë³€ê²½ ì‚¬í•­ì„ ì»¤ë°‹í•˜ê±°ë‚˜ 스태시하십시오."
@@ -1887,7 +2282,7 @@ msgstr "ë‹¤ìŒ íŒŒì¼ì˜ 로컬 변경 ì‚¬í•­ì„ ë³‘í•© ë•Œë¬¸ì— ë®ì–´ 쓰게
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you can %s."
+"%%sPlease commit your changes or stash them before you %s."
msgstr ""
"ë‹¤ìŒ íŒŒì¼ì˜ 로컬 변경 ì‚¬í•­ì„ %s ë•Œë¬¸ì— ë®ì–´ 쓰게 ë©ë‹ˆë‹¤:\n"
"%%s%s ì „ì— ë³€ê²½ ì‚¬í•­ì„ ì»¤ë°‹í•˜ê±°ë‚˜ 스태시하십시오."
@@ -1914,9 +2309,9 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you can switch branches."
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-"ì²´í¬ì•„웃 ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì´ 제거ë©ë‹ˆë‹¤:\n"
+"ì²´í¬ì•„웃 ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë”ì˜ íŒŒì¼ì´ 제거ë©ë‹ˆë‹¤:\n"
"%%s브랜치를 전환하기 ì „ì— ì´ íŒŒì¼ì„ 옮기거나 제거하십시오."
#: unpack-trees.c:87
@@ -1932,9 +2327,9 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you can merge."
+"%%sPlease move or remove them before you merge."
msgstr ""
-"병합 ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì´ 제거ë©ë‹ˆë‹¤:\n"
+"병합 ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë”ì˜ íŒŒì¼ì´ 제거ë©ë‹ˆë‹¤:\n"
"%%s병합하기 ì „ì— ì´ íŒŒì¼ì„ 옮기거나 제거하십시오."
#: unpack-trees.c:92
@@ -1950,9 +2345,9 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you can %s."
+"%%sPlease move or remove them before you %s."
msgstr ""
-"%s ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì´ 제거ë©ë‹ˆë‹¤:\n"
+"%s ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë”ì˜ íŒŒì¼ì´ 제거ë©ë‹ˆë‹¤:\n"
"%%s%s 하기 ì „ì— ì´ íŒŒì¼ì„ 옮기거나 제거하십시오."
#: unpack-trees.c:97
@@ -1969,9 +2364,9 @@ msgstr ""
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
-"%%sPlease move or remove them before you can switch branches."
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-"ì²´í¬ì•„웃 ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì„ ë®ì–´ì”니다:\n"
+"ì²´í¬ì•„웃 ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë”ì˜ íŒŒì¼ì„ ë®ì–´ì”니다:\n"
"%%s브랜치를 전환하기 ì „ì— ì´ íŒŒì¼ì„ 옮기거나 제거하십시오."
#: unpack-trees.c:104
@@ -1988,9 +2383,9 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you can merge."
+"%%sPlease move or remove them before you merge."
msgstr ""
-"병합 ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì„ ë®ì–´ì”니다:\n"
+"병합 ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë”ì˜ íŒŒì¼ì„ ë®ì–´ì”니다:\n"
"%%s병합하기 ì „ì— ì´ íŒŒì¼ì„ 옮기거나 제거하십시오."
#: unpack-trees.c:109
@@ -2006,9 +2401,9 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you can %s."
+"%%sPlease move or remove them before you %s."
msgstr ""
-"%s ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì„ ë®ì–´ì”니다:\n"
+"%s ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë”ì˜ íŒŒì¼ì„ ë®ì–´ì”니다:\n"
"%%s%s 하기 ì „ì— ì´ íŒŒì¼ì„ 옮기거나 제거하십시오."
#: unpack-trees.c:114
@@ -2031,7 +2426,7 @@ msgid ""
"Cannot update sparse checkout: the following entries are not up-to-date:\n"
"%s"
msgstr ""
-"드문 ì²´í¬ì•„ì›ƒì„ ì—…ë°ì´íŠ¸í•  수 없습니다; ë‹¤ìŒ í•­ëª©ì´ ìµœì‹ ìœ¼ë¡œ ì—…ë°ì´íŠ¸ë˜ì§€ 않았습니다:\n"
+"드문 ì²´í¬ì•„ì›ƒì„ ì—…ë°ì´íŠ¸í•  수 없습니다. ë‹¤ìŒ í•­ëª©ì´ ìµœì‹ ìœ¼ë¡œ ì—…ë°ì´íŠ¸ë˜ì§€ 않았습니다:\n"
"%s"
#: unpack-trees.c:126
@@ -2041,7 +2436,8 @@ msgid ""
"update:\n"
"%s"
msgstr ""
-"드문 ì²´í¬ì•„웃 ì—…ë°ì´íŠ¸ ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì„ ë®ì–´ì”니다:\n"
+"드문 ì²´í¬ì•„웃 ì—…ë°ì´íŠ¸ ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì„ ë®ì–´ì”니"
+"다:\n"
"%s"
#: unpack-trees.c:128
@@ -2051,7 +2447,8 @@ msgid ""
"update:\n"
"%s"
msgstr ""
-"드문 ì²´í¬ì•„웃 ì—…ë°ì´íŠ¸ ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì„ 제거합니다:\n"
+"드문 ì²´í¬ì•„웃 ì—…ë°ì´íŠ¸ ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì„ 제거합니"
+"다:\n"
"%s"
#: unpack-trees.c:205
@@ -2092,43 +2489,43 @@ msgstr "ìž˜ëª»ëœ í¬íŠ¸ 번호"
msgid "invalid '..' path segment"
msgstr "경로ì—ì„œ ìž˜ëª»ëœ '..' 부분"
-#: wrapper.c:222 wrapper.c:381
+#: worktree.c:282
+#, c-format
+msgid "failed to read '%s'"
+msgstr "'%s'ì„(를) ì½ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: wrapper.c:222 wrapper.c:392
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "ì½ê¸°ì™€ 쓰기용으로 '%s'ì„(를) ì—´ 수 없습니다"
-#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
#, c-format
msgid "could not open '%s' for writing"
msgstr "'%s'ì„(를) 쓰기용으로 ì—´ 수 없습니다"
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
-#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
+#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
#: builtin/pull.c:407
#, c-format
msgid "could not open '%s' for reading"
msgstr "'%s'ì„(를) ì½ê¸°ìš©ìœ¼ë¡œ ì—´ 수 없습니다"
-#: wrapper.c:594 wrapper.c:615
+#: wrapper.c:605 wrapper.c:626
#, c-format
msgid "unable to access '%s'"
msgstr "'%s'ì— ì ‘ê·¼í•  수 없습니다"
-#: wrapper.c:623
+#: wrapper.c:634
msgid "unable to get current working directory"
msgstr "현재 작업 디렉터리를 가져올 수 없습니다"
-#: wrapper.c:650
-#, c-format
-msgid "could not open %s for writing"
-msgstr "%sì„(를) 쓰기용으로 ì—´ 수 없습니다"
-
-#: wrapper.c:661 builtin/am.c:410
+#: wrapper.c:658
#, c-format
msgid "could not write to %s"
msgstr "%sì— ì“¸ 수 없습니다"
-#: wrapper.c:667
+#: wrapper.c:660
#, c-format
msgid "could not close %s"
msgstr "%sì„(를) ë‹«ì„ ìˆ˜ 없습니다"
@@ -2159,11 +2556,11 @@ msgstr ""
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (해결했다고 표시하려면 \"git rm <파ì¼>...\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:198 wt-status.c:881
+#: wt-status.c:198 wt-status.c:882
msgid "Changes to be committed:"
msgstr "커밋할 변경 사항:"
-#: wt-status.c:216 wt-status.c:890
+#: wt-status.c:216 wt-status.c:891
msgid "Changes not staged for commit:"
msgstr "커밋하ë„ë¡ ì •í•˜ì§€ ì•Šì€ ë³€ê²½ 사항:"
@@ -2220,11 +2617,6 @@ msgstr "양쪽ì—ì„œ 추가:"
msgid "both modified:"
msgstr "양쪽ì—ì„œ 수정:"
-#: wt-status.c:266
-#, c-format
-msgid "bug: unhandled unmerged status %x"
-msgstr "bug: 병합하지 ì•Šì€ ìƒíƒœ %x 처리ë˜ì§€ ì•ŠìŒ"
-
#: wt-status.c:274
msgid "new file:"
msgstr "새 파ì¼:"
@@ -2269,20 +2661,15 @@ msgstr "수정한 내용, "
msgid "untracked content, "
msgstr "추ì í•˜ì§€ ì•Šì€ ë‚´ìš©, "
-#: wt-status.c:391
-#, c-format
-msgid "bug: unhandled diff status %c"
-msgstr "버그: 처리ë˜ì§€ ì•Šì€ diff ìƒíƒœ %c"
-
-#: wt-status.c:755
+#: wt-status.c:756
msgid "Submodules changed but not updated:"
msgstr "변경ë˜ì—ˆì§€ë§Œ ì—…ë°ì´íŠ¸í•˜ì§€ ì•Šì€ í•˜ìœ„ 모듈:"
-#: wt-status.c:757
+#: wt-status.c:758
msgid "Submodule changes to be committed:"
msgstr "커밋할 하위 ëª¨ë“ˆì˜ ë³€ê²½ 사항:"
-#: wt-status.c:838
+#: wt-status.c:839
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -2290,215 +2677,219 @@ msgstr ""
"ìœ„ì˜ ì¤„ì„ ë°”ê¾¸ì§€ 마십시오.\n"
"아래 있는 ë‚´ìš©ì€ ëª¨ë‘ ì œê±°ë©ë‹ˆë‹¤."
-#: wt-status.c:949
+#: wt-status.c:950
msgid "You have unmerged paths."
msgstr "병합하지 ì•Šì€ ê²½ë¡œê°€ 있습니다."
-#: wt-status.c:952
+#: wt-status.c:953
msgid " (fix conflicts and run \"git commit\")"
msgstr " (충ëŒì„ 바로잡고 \"git commit\"ì„ ì‹¤í–‰í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:956
+#: wt-status.c:955
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (ë³‘í•©ì„ ì¤‘ë‹¨í•˜ë ¤ë©´ \"git merge --abort\"를 사용하십시오)"
+
+#: wt-status.c:960
msgid "All conflicts fixed but you are still merging."
msgstr "모든 충ëŒì„ 바로잡았지만 ì•„ì§ ë³‘í•©í•˜ëŠ” 중입니다."
-#: wt-status.c:959
+#: wt-status.c:963
msgid " (use \"git commit\" to conclude merge)"
msgstr " (ë³‘í•©ì„ ë§ˆë¬´ë¦¬í•˜ë ¤ë©´ \"git commit\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:969
+#: wt-status.c:973
msgid "You are in the middle of an am session."
msgstr "am 세션 ì¤‘ê°„ì— ìžˆìŠµë‹ˆë‹¤."
-#: wt-status.c:972
+#: wt-status.c:976
msgid "The current patch is empty."
msgstr "현재 패치가 비어 있습니다."
-#: wt-status.c:976
+#: wt-status.c:980
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (충ëŒì„ ë°”ë¡œìž¡ì€ ë‹¤ìŒ \"git am --continue\"를 사용하십시오)"
-#: wt-status.c:978
+#: wt-status.c:982
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (ì´ íŒ¨ì¹˜ë¥¼ 건너 뛰려면 \"git am --skip\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:980
+#: wt-status.c:984
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (ì›ë³¸ 브랜치를 복구하려면 \"git am --abort\"를 사용하십시오)"
-#: wt-status.c:1105
+#: wt-status.c:1109
msgid "No commands done."
msgstr "완료한 명령 ì—†ìŒ."
-#: wt-status.c:1108
+#: wt-status.c:1112
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "최근 완료한 명령 (%d개 명령 완료):"
-#: wt-status.c:1119
+#: wt-status.c:1123
#, c-format
msgid " (see more in file %s)"
msgstr " (ìžì„¸í•œ 정보는 %s íŒŒì¼ ì°¸ê³ )"
-#: wt-status.c:1124
+#: wt-status.c:1128
msgid "No commands remaining."
msgstr "ëª…ë ¹ì´ ë‚¨ì•„ìžˆì§€ ì•ŠìŒ."
-#: wt-status.c:1127
+#: wt-status.c:1131
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "다ìŒì— í•  명령 (%dê°œ 명령 남ìŒ):"
-#: wt-status.c:1135
+#: wt-status.c:1139
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (보고 편집하려면 \"git rebase --edit-todo\"를 사용하십시오)"
-#: wt-status.c:1148
+#: wt-status.c:1152
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "현재 '%s' 브랜치를 '%s' 위로 리베ì´ìŠ¤í•˜ëŠ” 중입니다."
-#: wt-status.c:1153
+#: wt-status.c:1157
msgid "You are currently rebasing."
msgstr "현재 리베ì´ìŠ¤í•˜ëŠ” 중입니다."
-#: wt-status.c:1167
+#: wt-status.c:1171
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (충ëŒì„ 바로잡고 \"git rebase --continue\"를 사용하십시오)"
-#: wt-status.c:1169
+#: wt-status.c:1173
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (ì´ íŒ¨ì¹˜ë¥¼ 건너뛰려면 \"git rebase --skip\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:1171
+#: wt-status.c:1175
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (ì›ë³¸ 브랜치를 가져오려면 \"git rebase --abort\"를 사용하십시오)"
-#: wt-status.c:1177
+#: wt-status.c:1181
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
" (모든 충ëŒì„ 바로잡았습니다: \"git rebase --continue\"를 실행하십시오)"
-#: wt-status.c:1181
+#: wt-status.c:1185
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "현재 '%s' 브랜치를 '%s' 위로 리베ì´ìŠ¤í•˜ëŠ” 중 ì»¤ë°‹ì„ ë¶„ë¦¬í•˜ëŠ” 중입니다."
-#: wt-status.c:1186
+#: wt-status.c:1190
msgid "You are currently splitting a commit during a rebase."
msgstr "현재 리베ì´ìŠ¤í•˜ëŠ” 중 ì»¤ë°‹ì„ ë¶„ë¦¬í•˜ëŠ” 중입니다."
-#: wt-status.c:1189
+#: wt-status.c:1193
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (ìž‘ì—… í´ë”ê°€ 깨ë—해지면, \"git rebase --continue\"를 실행하십시오)"
-#: wt-status.c:1193
+#: wt-status.c:1197
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "'%s' 브랜치를 '%s' 위로 리베ì´ìŠ¤í•˜ëŠ” 중 ì»¤ë°‹ì„ íŽ¸ì§‘í•˜ëŠ” 중입니다."
-#: wt-status.c:1198
+#: wt-status.c:1202
msgid "You are currently editing a commit during a rebase."
msgstr "리베ì´ìŠ¤ ì¤‘ì— ì»¤ë°‹ì„ íŽ¸ì§‘í•˜ëŠ” 중입니다."
-#: wt-status.c:1201
+#: wt-status.c:1205
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (현재 ì»¤ë°‹ì„ ìˆ˜ì •í•˜ë ¤ë©´ \"git commit --amend\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:1203
+#: wt-status.c:1207
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (변경 ì‚¬í•­ì— ë§Œì¡±í•  ë•Œ \"git rebase --continue\"를 사용하십시오)"
-#: wt-status.c:1213
+#: wt-status.c:1217
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "현재 %s ì»¤ë°‹ì„ ë½‘ì•„ ë‚´ê³  있습니다."
-#: wt-status.c:1218
+#: wt-status.c:1222
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (충ëŒì„ 바로잡고 \"git cherry-pick --continue\"를 실행하십시오)"
-#: wt-status.c:1221
+#: wt-status.c:1225
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (모든 충ëŒì„ 바로잡았습니다: \"git cherry-pick --continue\"를 실행하십시오)"
-#: wt-status.c:1223
+#: wt-status.c:1227
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (뽑기 ìž‘ì—…ì„ ì·¨ì†Œí•˜ë ¤ë©´ \"git cherry-pick --abort\"를 사용하십시오)"
-#: wt-status.c:1232
+#: wt-status.c:1236
#, c-format
msgid "You are currently reverting commit %s."
msgstr "현재 %s ì»¤ë°‹ì„ ë˜ëŒë¦¬ëŠ” 중입니다."
-#: wt-status.c:1237
+#: wt-status.c:1241
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (충ëŒì„ 바로잡고 \"git revert --continue\"를 실행하십시오)"
-#: wt-status.c:1240
+#: wt-status.c:1244
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (모든 충ëŒì„ 바로잡았습니다: \"git revert --continue\"를 실행하십시오)"
-#: wt-status.c:1242
+#: wt-status.c:1246
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (ë˜ëŒë¦¬ê¸° ìž‘ì—…ì„ ì·¨ì†Œí•˜ë ¤ë©´ \"git revert --abort\"를 사용하십시오)"
-#: wt-status.c:1253
+#: wt-status.c:1257
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "'ì´ë“±ë¶„하는 중입니다. '%s' 브랜치부터 시작."
-#: wt-status.c:1257
+#: wt-status.c:1261
msgid "You are currently bisecting."
msgstr "'ì´ë“±ë¶„하는 중입니다."
-#: wt-status.c:1260
+#: wt-status.c:1264
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (ì›ëž˜ 브랜치로 ëŒì•„가려면 \"git bisect reset\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:1460
+#: wt-status.c:1464
msgid "On branch "
msgstr "현재 브랜치 "
-#: wt-status.c:1466
+#: wt-status.c:1470
msgid "interactive rebase in progress; onto "
msgstr "대화형 리베ì´ìŠ¤ 진행 중. ê°ˆ 위치는 "
-#: wt-status.c:1468
+#: wt-status.c:1472
msgid "rebase in progress; onto "
msgstr "리베ì´ìŠ¤ 진행 중. ê°ˆ 위치는 "
-#: wt-status.c:1473
+#: wt-status.c:1477
msgid "HEAD detached at "
msgstr "HEADê°€ ë‹¤ìŒ ìœ„ì¹˜ì—ì„œ 분리: "
-#: wt-status.c:1475
+#: wt-status.c:1479
msgid "HEAD detached from "
msgstr "HEADê°€ 다ìŒìœ¼ë¡œë¶€í„° 분리: "
-#: wt-status.c:1478
+#: wt-status.c:1482
msgid "Not currently on any branch."
msgstr "현재 ì–´ë–¤ ë¸Œëžœì¹˜ë„ ì‚¬ìš©í•˜ì§€ ì•ŠìŒ."
-#: wt-status.c:1496
+#: wt-status.c:1500
msgid "Initial commit"
msgstr "최초 커밋"
-#: wt-status.c:1510
+#: wt-status.c:1514
msgid "Untracked files"
msgstr "추ì í•˜ì§€ 않는 파ì¼"
-#: wt-status.c:1512
+#: wt-status.c:1516
msgid "Ignored files"
msgstr "무시한 파ì¼"
-#: wt-status.c:1516
+#: wt-status.c:1520
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2509,20 +2900,20 @@ msgstr ""
"'status -uno' ì˜µì…˜ì„ ì“°ë©´ 빨ë¼ì§ˆ ìˆ˜ë„ ìžˆì§€ë§Œ, 새 파ì¼ì„\n"
"ì§ì ‘ 찾아서 추가해야 합니다. ('git help status' 참고)"
-#: wt-status.c:1522
+#: wt-status.c:1526
#, c-format
msgid "Untracked files not listed%s"
msgstr "추ì í•˜ì§€ 않는 파ì¼ì„ 보지 않습니다%s"
-#: wt-status.c:1524
+#: wt-status.c:1528
msgid " (use -u option to show untracked files)"
msgstr " (추ì í•˜ì§€ 않는 파ì¼ì„ 보려면 -u ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:1530
+#: wt-status.c:1534
msgid "No changes"
msgstr "변경 사항 ì—†ìŒ"
-#: wt-status.c:1535
+#: wt-status.c:1539
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
@@ -2530,12 +2921,12 @@ msgstr ""
"\"를\n"
"사용하십시오)\n"
-#: wt-status.c:1538
+#: wt-status.c:1542
#, c-format
msgid "no changes added to commit\n"
msgstr "커밋할 변경 ì‚¬í•­ì„ ì¶”ê°€í•˜ì§€ 않았습니다\n"
-#: wt-status.c:1541
+#: wt-status.c:1545
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -2545,51 +2936,51 @@ msgstr ""
"\"git\n"
"add\"를 사용하십시오)\n"
-#: wt-status.c:1544
+#: wt-status.c:1548
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "커밋할 ì‚¬í•­ì„ ì¶”ê°€í•˜ì§€ 않았지만 추ì í•˜ì§€ 않는 파ì¼ì´ 있습니다\n"
-#: wt-status.c:1547
+#: wt-status.c:1551
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"커밋할 사항 ì—†ìŒ (파ì¼ì„ 만들거나 복사하고 \"git add\"를 사용하면 추ì í•©ë‹ˆ"
"다)\n"
-#: wt-status.c:1550 wt-status.c:1555
+#: wt-status.c:1554 wt-status.c:1559
#, c-format
msgid "nothing to commit\n"
msgstr "커밋할 사항 ì—†ìŒ\n"
-#: wt-status.c:1553
+#: wt-status.c:1557
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"커밋할 사항 ì—†ìŒ (추ì í•˜ì§€ 않는 파ì¼ì„ 보려면 -u ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)\n"
-#: wt-status.c:1557
+#: wt-status.c:1561
#, c-format
-msgid "nothing to commit, working directory clean\n"
+msgid "nothing to commit, working tree clean\n"
msgstr "커밋할 사항 ì—†ìŒ, ìž‘ì—… í´ë” 깨ë—함\n"
-#: wt-status.c:1664
+#: wt-status.c:1668
msgid "Initial commit on "
msgstr "최초 커밋, 브랜치: "
-#: wt-status.c:1668
+#: wt-status.c:1672
msgid "HEAD (no branch)"
msgstr "HEAD (브랜치 ì—†ìŒ)"
-#: wt-status.c:1697
+#: wt-status.c:1701
msgid "gone"
msgstr "ì—†ìŒ"
-#: wt-status.c:1699 wt-status.c:1707
+#: wt-status.c:1703 wt-status.c:1711
msgid "behind "
msgstr "ë‹¤ìŒ ë’¤ì—: "
-#: wt-status.c:1702 wt-status.c:1705
+#: wt-status.c:1706 wt-status.c:1709
msgid "ahead "
msgstr "ë‹¤ìŒ ì•žì—: "
@@ -2607,253 +2998,267 @@ msgstr "git add [<옵션>] [--] <경로명세>..."
msgid "unexpected diff status %c"
msgstr "예ìƒì¹˜ 못한 diff ìƒíƒœ %c"
-#: builtin/add.c:70 builtin/commit.c:280
+#: builtin/add.c:71 builtin/commit.c:281
msgid "updating files failed"
msgstr "íŒŒì¼ ì—…ë°ì´íŠ¸ê°€ 실패했습니다"
-#: builtin/add.c:80
+#: builtin/add.c:81
#, c-format
msgid "remove '%s'\n"
msgstr "'%s' 제거\n"
-#: builtin/add.c:134
+#: builtin/add.c:136
msgid "Unstaged changes after refreshing the index:"
msgstr "ì¸ë±ìŠ¤ë¥¼ 새로 고친 ë‹¤ìŒ ì»¤ë°‹ 표시하지 ì•Šì€ ë³€ê²½ 사항:"
-#: builtin/add.c:194 builtin/rev-parse.c:811
+#: builtin/add.c:196 builtin/rev-parse.c:811
msgid "Could not read the index"
msgstr "ì¸ë±ìŠ¤ë¥¼ ì½ì„ 수 없습니다"
-#: builtin/add.c:205
+#: builtin/add.c:207
#, c-format
msgid "Could not open '%s' for writing."
msgstr "'%s' 파ì¼ì„ 쓰기용으로 ì—´ 수 없습니다."
-#: builtin/add.c:209
+#: builtin/add.c:211
msgid "Could not write patch"
msgstr "패치를 쓸 수 없습니다"
-#: builtin/add.c:212
+#: builtin/add.c:214
msgid "editing patch failed"
msgstr "패치 íŽ¸ì§‘ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/add.c:215
+#: builtin/add.c:217
#, c-format
msgid "Could not stat '%s'"
msgstr "'%s'ì„(를) stat()í•  수 없습니다"
-#: builtin/add.c:217
+#: builtin/add.c:219
msgid "Empty patch. Aborted."
msgstr "빈 패치. 중지."
-#: builtin/add.c:222
+#: builtin/add.c:224
#, c-format
msgid "Could not apply '%s'"
msgstr "'%s'ì„(를) ì ìš©í•  수 없습니다"
-#: builtin/add.c:232
+#: builtin/add.c:234
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "ë‹¤ìŒ ê²½ë¡œëŠ” .gitignore íŒŒì¼ ì¤‘ 하나 ë•Œë¬¸ì— ë¬´ì‹œí•©ë‹ˆë‹¤:\n"
-#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
-#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
+#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "가짜로 실행"
-#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
-#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
-#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
+#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
+#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
msgid "be verbose"
msgstr "ìžì„¸ížˆ 표시"
-#: builtin/add.c:252
+#: builtin/add.c:256
msgid "interactive picking"
msgstr "대화ì‹ìœ¼ë¡œ 고릅니다"
-#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
+#: builtin/add.c:257 builtin/checkout.c:1156 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "대화ì‹ìœ¼ë¡œ ë³€ê²½ëœ ë¶€ë¶„ì„ ì„ íƒí•©ë‹ˆë‹¤"
-#: builtin/add.c:254
+#: builtin/add.c:258
msgid "edit current diff and apply"
msgstr "현재 diff를 편집하고 ì ìš©í•©ë‹ˆë‹¤"
-#: builtin/add.c:255
+#: builtin/add.c:259
msgid "allow adding otherwise ignored files"
msgstr "무시하는 파ì¼ì˜ 추가를 허용합니다"
-#: builtin/add.c:256
+#: builtin/add.c:260
msgid "update tracked files"
msgstr "추ì ë˜ëŠ” 파ì¼ì„ ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤"
-#: builtin/add.c:257
+#: builtin/add.c:261
msgid "record only the fact that the path will be added later"
msgstr "ë‚˜ì¤‘ì— ì¶”ê°€í•  것ì´ë¼ëŠ” 사실만 기ë¡í•©ë‹ˆë‹¤"
-#: builtin/add.c:258
+#: builtin/add.c:262
msgid "add changes from all tracked and untracked files"
msgstr "추ì ë˜ê³  추ì ë˜ì§€ 않는 모든 파ì¼ì˜ 변경 ì‚¬í•­ì„ ì¶”ê°€í•©ë‹ˆë‹¤"
-#: builtin/add.c:261
+#: builtin/add.c:265
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "ìž‘ì—… í´ë”ì—ì„œ 제거한 경로를 무시합니다 (--no-allê³¼ ë™ì¼)"
-#: builtin/add.c:263
+#: builtin/add.c:267
msgid "don't add, only refresh the index"
msgstr "추가하지 ì•Šê³  ì¸ë±ìŠ¤ë§Œ 새로 고칩니다"
-#: builtin/add.c:264
+#: builtin/add.c:268
msgid "just skip files which cannot be added because of errors"
msgstr "오류 ë•Œë¬¸ì— ì¶”ê°€í•  수 없는 파ì¼ì„ 건너ëœë‹ˆë‹¤"
-#: builtin/add.c:265
+#: builtin/add.c:269
msgid "check if - even missing - files are ignored in dry run"
msgstr "가짜로 ì‹¤í–‰í–ˆì„ ë•Œ 파ì¼ì„ 무시하는지 확ì¸í•©ë‹ˆë‹¤"
-#: builtin/add.c:287
+#: builtin/add.c:270 builtin/update-index.c:958
+msgid "(+/-)x"
+msgstr "(+/-)x"
+
+#: builtin/add.c:270 builtin/update-index.c:959
+msgid "override the executable bit of the listed files"
+msgstr "목ë¡ì˜ 파ì¼ì—ì„œ 실행 가능 비트를 바꿉니다"
+
+#: builtin/add.c:292
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "ì •ë§ë¡œ 추가하려면 -f ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤.\n"
-#: builtin/add.c:294
+#: builtin/add.c:300
msgid "adding files failed"
msgstr "íŒŒì¼ ì¶”ê°€ê°€ 실패했습니다"
-#: builtin/add.c:330
+#: builtin/add.c:336
msgid "-A and -u are mutually incompatible"
msgstr "-A ë° -u ì˜µì…˜ì€ ì„œë¡œ 호환ë˜ì§€ 않습니다"
-#: builtin/add.c:337
+#: builtin/add.c:343
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
"--ignore-missing ì˜µì…˜ì€ --dry-run 옵션과 ê°™ì´ ì‚¬ìš©í•  경우ì—만 쓸 수 있습니다."
#: builtin/add.c:352
#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "--chmod 파ë¼ë¯¸í„° '%s'ì€(는) -x ë˜ëŠ” +x 형ì‹ì´ì–´ì•¼ 합니다"
+
+#: builtin/add.c:367
+#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "아무 ê²ƒë„ ì§€ì •í•˜ì§€ 않았으므로 아무 ê²ƒë„ ì¶”ê°€í•˜ì§€ 않습니다.\n"
-#: builtin/add.c:353
+#: builtin/add.c:368
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "'git add .' ëª…ë ¹ì„ ì‹¤í–‰í•˜ë ¤ê³  í•œ 것 아니었습니까?\n"
-#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
+#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
#: builtin/submodule--helper.c:240
msgid "index file corrupt"
msgstr "ì¸ë±ìŠ¤ 파ì¼ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
+#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
msgid "Unable to write new index file"
msgstr "새 ì¸ë±ìŠ¤ 파ì¼ì— 쓸 수 없습니다"
-#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
+#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
#, c-format
msgid "could not read '%s'"
msgstr "'%s'ì—ì„œ ì½ì„ 수 없습니다"
-#: builtin/am.c:430
+#: builtin/am.c:426
msgid "could not parse author script"
msgstr "ìž‘ì„±ìž ìŠ¤í¬ë¦½íŠ¸ë¥¼ 파싱할 수 없습니다"
-#: builtin/am.c:507
+#: builtin/am.c:503
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "applypatch-msg í›… ë•Œë¬¸ì— '%s'ì´(ê°€) ì‚­ì œë˜ì—ˆìŠµë‹ˆë‹¤."
-#: builtin/am.c:548 builtin/notes.c:300
+#: builtin/am.c:544 builtin/notes.c:301
#, c-format
msgid "Malformed input line: '%s'."
msgstr "ìž˜ëª»ëœ í˜•ì‹ì˜ ìž…ë ¥ 줄: '%s'."
-#: builtin/am.c:585 builtin/notes.c:315
+#: builtin/am.c:581 builtin/notes.c:316
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "'%s'ì—ì„œ '%s'(으)ë¡œ 노트를 ë³µì‚¬í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/am.c:611
+#: builtin/am.c:607
msgid "fseek failed"
msgstr "fseek 실패"
-#: builtin/am.c:788
+#: builtin/am.c:787
#, c-format
msgid "could not parse patch '%s'"
msgstr "'%s' 패치를 파싱할 수 없습니다"
-#: builtin/am.c:853
+#: builtin/am.c:852
msgid "Only one StGIT patch series can be applied at once"
msgstr "í•œë²ˆì— í•˜ë‚˜ì˜ StGIT 패치 시리즈만 ì ìš©í•  수 있습니다"
-#: builtin/am.c:900
+#: builtin/am.c:899
msgid "invalid timestamp"
msgstr "ì‹œê°ì´ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/am.c:903 builtin/am.c:911
+#: builtin/am.c:902 builtin/am.c:910
msgid "invalid Date line"
msgstr "Date ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/am.c:908
+#: builtin/am.c:907
msgid "invalid timezone offset"
msgstr "시간대 ì˜¤í”„ì…‹ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/am.c:995
+#: builtin/am.c:996
msgid "Patch format detection failed."
msgstr "패치 í˜•ì‹ ê²€ìƒ‰ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
-#: builtin/am.c:1000 builtin/clone.c:380
+#: builtin/am.c:1001 builtin/clone.c:380
#, c-format
msgid "failed to create directory '%s'"
msgstr "'%s' 디렉터리 만들기가 실패했습니다"
-#: builtin/am.c:1004
+#: builtin/am.c:1005
msgid "Failed to split patches."
msgstr "패치를 ìª¼ê°œëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
-#: builtin/am.c:1136 builtin/commit.c:365
+#: builtin/am.c:1137 builtin/commit.c:366
msgid "unable to write index file"
msgstr "ì¸ë±ìŠ¤ 파ì¼ì„ 쓸 수 없습니다"
-#: builtin/am.c:1187
+#: builtin/am.c:1188
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "ì´ ë¬¸ì œë¥¼ í•´ê²°í–ˆì„ ë•Œ \"%s --continue\"를 실행하십시오."
-#: builtin/am.c:1188
+#: builtin/am.c:1189
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "ì´ íŒ¨ì¹˜ë¥¼ 건너뛰려면, ê·¸ 대신 \"%s --skip\"ì„ ì‹¤í–‰í•˜ì‹­ì‹œì˜¤."
-#: builtin/am.c:1189
+#: builtin/am.c:1190
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"ì›ëž˜ 브랜치를 복구하고 패치 ì ìš©ì„ 중지하려면 \"%s --abort\"를 실행하십시오."
-#: builtin/am.c:1327
+#: builtin/am.c:1328
msgid "Patch is empty. Was it split wrong?"
msgstr "패치가 비어 있습니다. 잘못 쪼개지지 않았나요?"
-#: builtin/am.c:1401 builtin/log.c:1516
+#: builtin/am.c:1402 builtin/log.c:1543
#, c-format
msgid "invalid ident line: %s"
msgstr "ìž˜ëª»ëœ ì‹ ì› ì¤„: %s"
-#: builtin/am.c:1428
+#: builtin/am.c:1429
#, c-format
msgid "unable to parse commit %s"
msgstr "%s ì»¤ë°‹ì„ íŒŒì‹±í•  수 없습니다"
-#: builtin/am.c:1630
+#: builtin/am.c:1602
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "ì €ìž¥ì†Œì— 3-ë°©í–¥ 병합으로 대신할 ë•Œ 필요한 ë¸”ë¡­ì´ ì—†ìŠµë‹ˆë‹¤."
-#: builtin/am.c:1632
+#: builtin/am.c:1604
msgid "Using index info to reconstruct a base tree..."
msgstr "ì¸ë±ìŠ¤ 정보를 사용해 기본 트리를 다시 만듭니다..."
-#: builtin/am.c:1651
+#: builtin/am.c:1623
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2861,38 +3266,38 @@ msgstr ""
"패치를 ì§ì ‘ 편집하셨습니까?\n"
"ì´ íŒ¨ì¹˜ëŠ” ì¸ë±ìŠ¤ì— 기ë¡ëœ 블롭ì—는 ì ìš©ë˜ì§€ 않습니다."
-#: builtin/am.c:1657
+#: builtin/am.c:1629
msgid "Falling back to patching base and 3-way merge..."
msgstr "ë² ì´ìŠ¤ 패치 ì ìš© ë° 3-ë°©í–¥ 병합으로 대신합니다..."
-#: builtin/am.c:1672
+#: builtin/am.c:1654
msgid "Failed to merge in the changes."
msgstr "변경 사항ì—ì„œ ë³‘í•©í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
-#: builtin/am.c:1696 builtin/merge.c:636
+#: builtin/am.c:1679 builtin/merge.c:628
msgid "git write-tree failed to write a tree"
msgstr "git write-treeê°€ 트리를 ì“°ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/am.c:1703
+#: builtin/am.c:1686
msgid "applying to an empty history"
msgstr "빈 커밋 ë‚´ì—­ì— ëŒ€í•´ ì ìš©í•©ë‹ˆë‹¤"
-#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
-#: builtin/merge.c:866
+#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
+#: builtin/merge.c:823
msgid "failed to write commit object"
msgstr "커밋 오브ì íŠ¸ë¥¼ ì“°ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/am.c:1748 builtin/am.c:1752
+#: builtin/am.c:1731 builtin/am.c:1735
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "다시 시작할 수 없습니다: %sì´(ê°€) 없습니다."
-#: builtin/am.c:1768
+#: builtin/am.c:1751
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"터미ë„ì— í‘œì¤€ ìž…ë ¥ì´ ì—°ê²°ë˜ì§€ ì•Šì€ ìƒíƒœì—ì„œ 대화형으로 실행할 수 없습니다."
-#: builtin/am.c:1773
+#: builtin/am.c:1756
msgid "Commit Body is:"
msgstr "커밋 본문ì€:"
@@ -2900,35 +3305,35 @@ msgstr "커밋 본문ì€:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1783
+#: builtin/am.c:1766
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "ì ìš©? 예[y]/아니오[n]/편집[e]/패치 보기[v]/ëª¨ë‘ ì ìš©[a]: "
-#: builtin/am.c:1833
+#: builtin/am.c:1816
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "ë³€ê²½ëœ ì¸ë±ìŠ¤: 패치를 ì ìš©í•  수 없습니다 (dirty: %s)"
-#: builtin/am.c:1868 builtin/am.c:1940
+#: builtin/am.c:1853 builtin/am.c:1925
#, c-format
msgid "Applying: %.*s"
msgstr "ì ìš©í•˜ëŠ” 중: %.*s"
-#: builtin/am.c:1884
+#: builtin/am.c:1869
msgid "No changes -- Patch already applied."
msgstr "변경 사항 ì—†ìŒ -- 패치가 ì´ë¯¸ ì ìš©ë˜ì—ˆìŠµë‹ˆë‹¤."
-#: builtin/am.c:1892
+#: builtin/am.c:1877
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "패치가 %s %.*s 위치ì—ì„œ 실패했습니다"
-#: builtin/am.c:1898
+#: builtin/am.c:1883
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "실패한 íŒ¨ì¹˜ì˜ ë³µì‚¬ë³¸ì´ ë‹¤ìŒ ìœ„ì¹˜ì— ìžˆìŠµë‹ˆë‹¤: %s"
-#: builtin/am.c:1943
+#: builtin/am.c:1928
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2938,7 +3343,7 @@ msgstr ""
"커밋으로 표시할 ì‚¬í•­ì´ ë‚¨ì•„ 있지 않으면, ì´ë¯¸ ê°™ì€ íŒ¨ì¹˜ì—ì„œ ì ìš©ëœ\n"
"ê²½ìš°ì¼ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. 그런 경우ì—는 ì´ íŒ¨ì¹˜ë¥¼ 건너뛰면 ë©ë‹ˆë‹¤."
-#: builtin/am.c:1950
+#: builtin/am.c:1935
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2946,17 +3351,17 @@ msgstr ""
"ì¸ë±ìŠ¤ì— 병합하지 ì•Šì€ ê²½ë¡œê°€ 남아 있습니다.\n"
"'git add' ì‚¬ìš©ì„ ìžŠì§€ 않으셨습니까?"
-#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
+#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "'%s' 오브ì íŠ¸ë¥¼ 파싱할 수 없습니다."
-#: builtin/am.c:2110
+#: builtin/am.c:2095
msgid "failed to clean index"
msgstr "ì¸ë±ìŠ¤ ì§€ìš°ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/am.c:2144
+#: builtin/am.c:2129
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -2964,157 +3369,157 @@ msgstr ""
"마지막 'am' 실패 ì´í›„ HEAD를 옮긴 것 같습니다.\n"
"ORIG_HEADë¡œ ë˜ëŒë¦¬ì§€ 않습니다."
-#: builtin/am.c:2205
+#: builtin/am.c:2192
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "--patch-format ì˜µì…˜ì— ëŒ€í•´ ìž˜ëª»ëœ ê°’: %s"
-#: builtin/am.c:2238
+#: builtin/am.c:2225
msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr "git am [<옵션>] [(<mbox>|<Maildir>)...]"
-#: builtin/am.c:2239
+#: builtin/am.c:2226
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<옵션>] (--continue | --skip | --abort)"
-#: builtin/am.c:2245
+#: builtin/am.c:2232
msgid "run interactively"
msgstr "대화형으로 실행합니다"
-#: builtin/am.c:2247
+#: builtin/am.c:2234
msgid "historical option -- no-op"
msgstr "아무 ë™ìž‘ë„ í•˜ì§€ 않습니다 (과거부터 ìžˆì—ˆë˜ ì˜µì…˜)"
-#: builtin/am.c:2249
+#: builtin/am.c:2236
msgid "allow fall back on 3way merging if needed"
msgstr "필요하면 3-ë°©í–¥ 병합으로 대신하ë„ë¡ í—ˆìš©í•©ë‹ˆë‹¤"
-#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
-#: builtin/repack.c:171
+#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
+#: builtin/repack.c:172
msgid "be quiet"
msgstr "간략히 표시합니다"
-#: builtin/am.c:2252
+#: builtin/am.c:2239
msgid "add a Signed-off-by line to the commit message"
msgstr "커밋 ë©”ì‹œì§€ì— Signed-off-by ì¤„ì„ ë‚¨ê¹ë‹ˆë‹¤"
-#: builtin/am.c:2255
+#: builtin/am.c:2242
msgid "recode into utf8 (default)"
msgstr "UTF-8 ì¸ì½”딩으로 변환합니다 (기본값)"
-#: builtin/am.c:2257
+#: builtin/am.c:2244
msgid "pass -k flag to git-mailinfo"
msgstr "git-mailinfoì— -k ì˜µì…˜ì„ ì”니다"
-#: builtin/am.c:2259
+#: builtin/am.c:2246
msgid "pass -b flag to git-mailinfo"
msgstr "git-mailinfoì— -b ì˜µì…˜ì„ ì”니다"
-#: builtin/am.c:2261
+#: builtin/am.c:2248
msgid "pass -m flag to git-mailinfo"
msgstr "git-mailinfoì— -m ì˜µì…˜ì„ ì”니다"
-#: builtin/am.c:2263
+#: builtin/am.c:2250
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "mbox 형ì‹ì— 대해 git-mailsplitì— --keep-cr ì˜µì…˜ì„ ì‚¬ìš©í•©ë‹ˆë‹¤"
-#: builtin/am.c:2266
+#: builtin/am.c:2253
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"am.keepcrì— ë¬´ê´€í•˜ê²Œ git-mailsplitì— --keep-cr ì˜µì…˜ì„ ì‚¬ìš©í•˜ì§€ 않습니다."
-#: builtin/am.c:2269
+#: builtin/am.c:2256
msgid "strip everything before a scissors line"
msgstr "절취선 ì•žì˜ ëª¨ë“  ì‚¬í•­ì„ ë¬´ì‹œí•©ë‹ˆë‹¤"
-#: builtin/am.c:2270 builtin/apply.c:4546
+#: builtin/am.c:2257 builtin/apply.c:4837
msgid "action"
msgstr "ë™ìž‘"
-#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
-#: builtin/am.c:2298
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
+#: builtin/am.c:2285
msgid "pass it through git-apply"
msgstr "git-applyì— ë„˜ê¹ë‹ˆë‹¤"
-#: builtin/am.c:2279 builtin/apply.c:4570
+#: builtin/am.c:2266 builtin/apply.c:4861
msgid "root"
msgstr "최ìƒìœ„"
-#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
-#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
+#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
-#: builtin/submodule--helper.c:770
+#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:826
msgid "path"
msgstr "경로"
-#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193
-#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 builtin/pull.c:193
+#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:645
#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2291 builtin/apply.c:4514
+#: builtin/am.c:2278 builtin/apply.c:4805
msgid "num"
msgstr "개수"
-#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "형ì‹"
-#: builtin/am.c:2295
+#: builtin/am.c:2282
msgid "format the patch(es) are in"
msgstr "íŒ¨ì¹˜ì˜ í˜•ì‹"
-#: builtin/am.c:2301
+#: builtin/am.c:2288
msgid "override error message when patch failure occurs"
msgstr "패치 실패가 ë°œìƒí–ˆì„ ë•Œ 오류 메시지 대신 사용합니다"
-#: builtin/am.c:2303
+#: builtin/am.c:2290
msgid "continue applying patches after resolving a conflict"
msgstr "충ëŒì„ í•´ê²°í•œ ë‹¤ìŒ íŒ¨ì¹˜ ì ìš©ì„ 계ì†í•©ë‹ˆë‹¤"
-#: builtin/am.c:2306
+#: builtin/am.c:2293
msgid "synonyms for --continue"
msgstr "--continue 옵션과 ë™ì¼"
-#: builtin/am.c:2309
+#: builtin/am.c:2296
msgid "skip the current patch"
msgstr "현재 패치 건너뛰기"
-#: builtin/am.c:2312
+#: builtin/am.c:2299
msgid "restore the original branch and abort the patching operation."
msgstr "ì›ëž˜ 브랜치를 복구하고 패치 ì ìš© ìž‘ì—…ì„ ì¤‘ì§€í•©ë‹ˆë‹¤."
# NOTE: ì˜µì…˜ì˜ ì˜ë¯¸ëŠ” ì´ê²Œ 맞다. ì›ë¬¸ì—서는 사용ìžê°€
# --committer-date-is-author-dateë¼ëŠ” ì˜µì…˜ì„ ë³´ê³  ì˜ë¯¸ë¥¼ ì•Œ 수 있다고 가정하고 있다.
-#: builtin/am.c:2316
+#: builtin/am.c:2303
msgid "lie about committer date"
msgstr "커미터 ì‹œê°ì„ ìž‘ì„±ìž ì‹œê°ìœ¼ë¡œ 넣습니다"
-#: builtin/am.c:2318
+#: builtin/am.c:2305
msgid "use current timestamp for author date"
msgstr "현재 ì‹œê°ì„ ìž‘ì„±ìž ì‹œê°ìœ¼ë¡œ 사용합니다"
-#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "키-ID"
-#: builtin/am.c:2321
+#: builtin/am.c:2308
msgid "GPG-sign commits"
msgstr "GPG 서명 커밋"
-#: builtin/am.c:2324
+#: builtin/am.c:2311
msgid "(internal use for git-rebase)"
msgstr "(git-rebase를 위한 내부 ìš©ë„)"
-#: builtin/am.c:2339
+#: builtin/am.c:2326
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -3122,16 +3527,16 @@ msgstr ""
"-b/--binary ì˜µì…˜ì€ ì˜¤ëžœ 시간 ë™ì•ˆ 아무 ë™ìž‘ë„ í•˜ì§€ 않았으므로, ì´\n"
"ì˜µì…˜ì€ ì œê±°ë  ì˜ˆì •ìž…ë‹ˆë‹¤. ì´ì œ 사용하지 마십시오."
-#: builtin/am.c:2346
+#: builtin/am.c:2333
msgid "failed to read the index"
msgstr "ì¸ë±ìŠ¤ ì½ê¸°ì— 실패했습니다"
-#: builtin/am.c:2361
+#: builtin/am.c:2348
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "ì´ì „ 리베ì´ìŠ¤ 디렉터리 %sì´(ê°€) ì•„ì§ ìžˆê³  mbox를 지정했습니다."
-#: builtin/am.c:2385
+#: builtin/am.c:2372
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -3140,74 +3545,74 @@ msgstr ""
"ë²—ì–´ë‚œ %s 디렉터리가 발견ë˜ì—ˆìŠµë‹ˆë‹¤.\n"
"제거하려면 \"git am --abort\"를 사용하십시오."
-#: builtin/am.c:2391
+#: builtin/am.c:2378
msgid "Resolve operation not in progress, we are not resuming."
msgstr "해소 ìž‘ì—…ì´ ì§„í–‰ 중입니다. 다시 시작하지 않습니다."
-#: builtin/apply.c:59
+#: builtin/apply.c:122
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<옵션>] [<패치>...]"
-#: builtin/apply.c:111
+#: builtin/apply.c:153
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "알 수 없는 공백 옵션 '%s'"
-#: builtin/apply.c:126
+#: builtin/apply.c:169
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "알 수 없는 공백 무시 옵션 '%s'"
-#: builtin/apply.c:818
+#: builtin/apply.c:854
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "타임스탬프 ì •ê·œì‹ì„ 준비할 수 없습니다 (%s)"
-#: builtin/apply.c:827
+#: builtin/apply.c:863
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec()ì—ì„œ ë‹¤ìŒ ìž…ë ¥ì— ëŒ€í•´ %dë²ˆì„ ë¦¬í„´í–ˆìŠµë‹ˆë‹¤: %s"
-#: builtin/apply.c:908
+#: builtin/apply.c:947
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "íŒ¨ì¹˜ì˜ %d번 ì¤„ì— íŒŒì¼ ì´ë¦„ì„ ì°¾ì„ ìˆ˜ 없습니다"
-#: builtin/apply.c:937
+#: builtin/apply.c:984
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: ìž˜ëª»ëœ git-diff - %2$d번 줄ì—ì„œ /dev/nullì„ ê¸°ëŒ€í–ˆì§€ë§Œ, '%1$s'ì´"
"(가) 왔습니다"
-#: builtin/apply.c:942
+#: builtin/apply.c:989
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: ìž˜ëª»ëœ git-diff - %d번 ì¤„ì— ìƒˆ íŒŒì¼ ì´ë¦„ì´ ì˜¬ë°”ë¥´ì§€ 않습니다"
-#: builtin/apply.c:943
+#: builtin/apply.c:990
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: ìž˜ëª»ëœ git-diff - %d번 ì¤„ì— ì˜ˆì „ íŒŒì¼ ì´ë¦„ì´ ì˜¬ë°”ë¥´ì§€ 않습니다"
-#: builtin/apply.c:949
+#: builtin/apply.c:995
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: ìž˜ëª»ëœ git-diff - %d번 줄ì—ì„œ /dev/nullì„ ê¸°ëŒ€í–ˆìŠµë‹ˆë‹¤"
-#: builtin/apply.c:1406
+#: builtin/apply.c:1489
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: 예ìƒì¹˜ 못한 줄: %.*s"
-#: builtin/apply.c:1463
+#: builtin/apply.c:1550
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "%d번 ì¤„ì— í—¤ë” ì—†ëŠ” 패치 부분: %.*s"
-#: builtin/apply.c:1480
+#: builtin/apply.c:1567
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -3219,76 +3624,76 @@ msgstr[0] ""
"경로 ì´ë¦„ 부분ì—ì„œ %d개를 ì œê±°ë¼ ë•Œ git diff í—¤ë”ì— íŒŒì¼ ì´ë¦„ ì •ë³´ê°€ 없습니"
"다. (%d번 줄)"
-#: builtin/apply.c:1646
+#: builtin/apply.c:1743
msgid "new file depends on old contents"
msgstr "새 파ì¼ì´ 예전 ë‚´ìš©ì— ì˜ì¡´í•©ë‹ˆë‹¤"
-#: builtin/apply.c:1648
+#: builtin/apply.c:1745
msgid "deleted file still has contents"
msgstr "삭제한 파ì¼ì— ì•„ì§ ë‚´ìš©ì´ ë“¤ì–´ 있습니다"
-#: builtin/apply.c:1674
+#: builtin/apply.c:1774
#, c-format
msgid "corrupt patch at line %d"
msgstr "패치가 %d번 줄ì—ì„œ ë§ê°€ì¡ŒìŠµë‹ˆë‹¤"
-#: builtin/apply.c:1710
+#: builtin/apply.c:1810
#, c-format
msgid "new file %s depends on old contents"
msgstr "새 íŒŒì¼ %sì´(ê°€) 예전 ë‚´ìš©ì— ì˜ì¡´í•©ë‹ˆë‹¤"
-#: builtin/apply.c:1712
+#: builtin/apply.c:1812
#, c-format
msgid "deleted file %s still has contents"
msgstr "삭제한 íŒŒì¼ %sì´(ê°€) ì•„ì§ ë‚´ìš©ì´ ë“¤ì–´ 있습니다"
-#: builtin/apply.c:1715
+#: builtin/apply.c:1815
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 경고: %s 파ì¼ì˜ ë‚´ìš©ì´ ë¹„ì–´ 있지만 ì‚­ì œë˜ì§€ 않았습니다"
-#: builtin/apply.c:1861
+#: builtin/apply.c:1962
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "%d번 ì¤„ì— ë°”ì´ë„ˆë¦¬ 패치가 ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤: %.*s"
-#: builtin/apply.c:1895
+#: builtin/apply.c:1999
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "%d번 ì¤„ì— ë°”ì´ë„ˆë¦¬ 패치가 ì´í•´í•  수 없습니다"
-#: builtin/apply.c:2048
+#: builtin/apply.c:2154
#, c-format
msgid "patch with only garbage at line %d"
msgstr "%d번 ì¤„ì— ì“°ë ˆê¸° ë°ì´í„°ë§Œ 있는 패치"
-#: builtin/apply.c:2138
+#: builtin/apply.c:2244
#, c-format
msgid "unable to read symlink %s"
msgstr "%s 심볼릭 ë§í¬ë¥¼ ì½ì„ 수 없습니다"
-#: builtin/apply.c:2142
+#: builtin/apply.c:2248
#, c-format
msgid "unable to open or read %s"
msgstr "%sì„(를) 열거나 ì½ì„ 수 없습니다"
-#: builtin/apply.c:2775
+#: builtin/apply.c:2901
#, c-format
msgid "invalid start of line: '%c'"
msgstr "줄 ì‹œìž‘ì´ ìž˜ëª»ë¨: '%c'"
-#: builtin/apply.c:2894
+#: builtin/apply.c:3020
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "패치 %d번 부분 %d번 줄ì—ì„œ 성공 (오프셋 %d줄)"
-#: builtin/apply.c:2906
+#: builtin/apply.c:3032
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "컨í…스트가 (%ld/%ld)ë¡œ 줄어듭니다. (%d번 줄ì—ì„œ ì ìš©)"
-#: builtin/apply.c:2912
+#: builtin/apply.c:3038
#, c-format
msgid ""
"while searching for:\n"
@@ -3297,334 +3702,329 @@ msgstr ""
"다ìŒì„ ê²€ìƒ‰í•˜ë˜ ì¤‘:\n"
"%.*s"
-#: builtin/apply.c:2932
+#: builtin/apply.c:3060
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "'%s'ì— ëŒ€í•œ ë°”ì´ë„ˆë¦¬ 패치 ë°ì´í„°ê°€ 없습니다"
-#: builtin/apply.c:3033
+#: builtin/apply.c:3163
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "ë°”ì´ë„ˆë¦¬ 패치를 '%s'ì— ì ìš©í•  수 없습니다"
-#: builtin/apply.c:3039
+#: builtin/apply.c:3169
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"'%s'ì— ëŒ€í•œ ë°”ì´ë„ˆë¦¬ 패치가 올바르지 ì•Šì€ ê²°ê³¼ë¥¼ 만듭니다. (기대한 ê°’ %s, 실"
"제 %s)"
-#: builtin/apply.c:3060
+#: builtin/apply.c:3190
#, c-format
msgid "patch failed: %s:%ld"
msgstr "패치 실패: %s:%ld"
-#: builtin/apply.c:3184
+#: builtin/apply.c:3314
#, c-format
msgid "cannot checkout %s"
msgstr "%sì„(를) 가져올 수 없습니다"
-#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
-#, c-format
-msgid "read of %s failed"
-msgstr "%s ì½ê¸°ê°€ 실패했습니다"
-
-#: builtin/apply.c:3237
+#: builtin/apply.c:3370
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "심볼릭 ë§í¬ ë’¤ì— ìžˆëŠ” '%s' ì½ê¸°"
-#: builtin/apply.c:3265 builtin/apply.c:3487
+#: builtin/apply.c:3399 builtin/apply.c:3630
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "%s 경로가 ì´ë¦„ì´ ë°”ë€Œì—ˆê±°ë‚˜ ì‚­ì œë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/apply.c:3346 builtin/apply.c:3501
+#: builtin/apply.c:3482 builtin/apply.c:3644
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: ì¸ë±ìŠ¤ì— 없습니다"
-#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
+#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3355 builtin/apply.c:3509
+#: builtin/apply.c:3491 builtin/apply.c:3652
#, c-format
msgid "%s: does not match index"
msgstr "%s: ì¸ë±ìŠ¤ì™€ 맞지 않습니다"
-#: builtin/apply.c:3457
+#: builtin/apply.c:3597
msgid "removal patch leaves file contents"
msgstr "제거하는 패치 다ìŒì— íŒŒì¼ ë‚´ìš©ì´ ë‚¨ì•˜ìŠµë‹ˆë‹¤"
-#: builtin/apply.c:3526
+#: builtin/apply.c:3669
#, c-format
msgid "%s: wrong type"
msgstr "%s: ìž˜ëª»ëœ ì¢…ë¥˜"
-#: builtin/apply.c:3528
+#: builtin/apply.c:3671
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%sì˜ ì¢…ë¥˜ê°€ %oì´ì§€ë§Œ %oì´(ê°€) ë˜ì–´ì•¼ 합니다"
-#: builtin/apply.c:3687 builtin/apply.c:3689
+#: builtin/apply.c:3822 builtin/apply.c:3824
#, c-format
msgid "invalid path '%s'"
msgstr "ìž˜ëª»ëœ ê²½ë¡œ '%s'"
-#: builtin/apply.c:3744
+#: builtin/apply.c:3879
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ì´ë¯¸ ì¸ë±ìŠ¤ì— 있습니다"
-#: builtin/apply.c:3747
+#: builtin/apply.c:3882
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ì´ë¯¸ ìž‘ì—… ë””ë ‰í„°ë¦¬ì— ìžˆìŠµë‹ˆë‹¤"
-#: builtin/apply.c:3767
+#: builtin/apply.c:3902
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$sì˜ ìƒˆ 모드(%1$o)ê°€ 예전 모드(%3$o)와 다릅니다"
-#: builtin/apply.c:3772
+#: builtin/apply.c:3907
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "%2$sì˜ ìƒˆ 모드(%1$o)ê°€ %4$sì˜ ì˜ˆì „ 모드(%3$o)와 다릅니다"
-#: builtin/apply.c:3792
+#: builtin/apply.c:3927
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "ì˜í–¥ 받는 '%s' 파ì¼ì´ 심볼릭 ë§í¬ ë’¤ì— ìžˆìŠµë‹ˆë‹¤"
-#: builtin/apply.c:3796
+#: builtin/apply.c:3931
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: 패치를 ì ìš©í•˜ì§€ 않습니다"
-#: builtin/apply.c:3810
+#: builtin/apply.c:3945
#, c-format
msgid "Checking patch %s..."
msgstr "%s 패치를 확ì¸í•˜ëŠ” 중입니다..."
-#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "경로 '%s'ì— ëŒ€í•´ make_cache_entry 실패"
-#: builtin/apply.c:4046
+#: builtin/apply.c:4182
#, c-format
msgid "unable to remove %s from index"
msgstr "ì¸ë±ìŠ¤ì—ì„œ %sì„(를) 제거할 수 없습니다"
-#: builtin/apply.c:4075
+#: builtin/apply.c:4215
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "하위 모듈 %sì— ëŒ€í•´ ì†ìƒëœ 패치"
-#: builtin/apply.c:4079
+#: builtin/apply.c:4219
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "새로 만든 íŒŒì¼ '%s'ì— ëŒ€í•´ stat()í•  수 없습니다"
-#: builtin/apply.c:4084
+#: builtin/apply.c:4224
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "새로 만든 íŒŒì¼ '%s'ì— ëŒ€í•´ 예비 저장소를 만들 수 없습니다"
-#: builtin/apply.c:4087 builtin/apply.c:4195
+#: builtin/apply.c:4227 builtin/apply.c:4340
#, c-format
msgid "unable to add cache entry for %s"
msgstr "%sì— ëŒ€í•´ ìºì‹œ í•­ëª©ì„ ì¶”ê°€í•  수 없습니다"
-#: builtin/apply.c:4120
+#: builtin/apply.c:4260
#, c-format
msgid "closing file '%s'"
msgstr "'%s' 파ì¼ì„ 닫는 중입니다"
-#: builtin/apply.c:4169
+#: builtin/apply.c:4313
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "'%s' 파ì¼ì— 쓸 수 없습니다 ('%o' 모드)"
-#: builtin/apply.c:4256
+#: builtin/apply.c:4403
#, c-format
msgid "Applied patch %s cleanly."
msgstr "%s 패치 ê¹”ë”하게 ì ìš©."
-#: builtin/apply.c:4264
+#: builtin/apply.c:4411
msgid "internal error"
msgstr "내부 오류"
-#: builtin/apply.c:4267
+#: builtin/apply.c:4414
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "%%s 패치를 (%dê°œ 거부) ì ìš©..."
-#: builtin/apply.c:4277
+#: builtin/apply.c:4424
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "truncating .rej íŒŒì¼ ì´ë¦„ì„ '%.*s.rej'(으)ë¡œ ìžë¦„"
-#: builtin/apply.c:4285
+#: builtin/apply.c:4432
#, c-format
msgid "cannot open %s: %s"
msgstr "%sì„(를) ì—´ 수 없습니다: %s"
-#: builtin/apply.c:4298
+#: builtin/apply.c:4445
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "패치 부위 #%d ê¹”ë”하게 ì ìš©."
-#: builtin/apply.c:4301
+#: builtin/apply.c:4448
#, c-format
msgid "Rejected hunk #%d."
msgstr "패치 부위 #%d 거부ë¨."
-#: builtin/apply.c:4387
+#: builtin/apply.c:4537
#, c-format
msgid "Skipped patch '%s'."
msgstr "패치 '%s' 건너뜀."
-#: builtin/apply.c:4395
+#: builtin/apply.c:4545
msgid "unrecognized input"
msgstr "ì¸ì‹í•  수 없는 ìž…ë ¥"
-#: builtin/apply.c:4406
+#: builtin/apply.c:4556
msgid "unable to read index file"
msgstr "ì¸ë±ìŠ¤ 파ì¼ì„ ì½ì„ 수 없습니다"
-#: builtin/apply.c:4509
+#: builtin/apply.c:4701
+msgid "--3way outside a repository"
+msgstr "저장소 ë°–ì—ì„œ --3way 옵션 사용"
+
+#: builtin/apply.c:4709
+msgid "--index outside a repository"
+msgstr "저장소 ë°–ì—ì„œ --index 옵션 사용"
+
+#: builtin/apply.c:4712
+msgid "--cached outside a repository"
+msgstr "저장소 ë°–ì—ì„œ --cached 옵션 사용"
+
+#: builtin/apply.c:4745
+#, c-format
+msgid "can't open patch '%s'"
+msgstr "'%s' 패치를 열 수 없습니다"
+
+#: builtin/apply.c:4760
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "공백 오류 %d개를 넘어갑니다"
+
+#: builtin/apply.c:4766 builtin/apply.c:4776
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d줄ì—ì„œ 공백 오류를 추가합니다."
+
+#: builtin/apply.c:4800
msgid "don't apply changes matching the given path"
msgstr "주어진 ê²½ë¡œì— í•´ë‹¹í•˜ëŠ” 변경 ì‚¬í•­ì„ ì ìš©í•˜ì§€ 않습니다"
-#: builtin/apply.c:4512
+#: builtin/apply.c:4803
msgid "apply changes matching the given path"
msgstr "주어진 ê²½ë¡œì— í•´ë‹¹í•˜ëŠ” 변경 ì‚¬í•­ì„ ì ìš©í•©ë‹ˆë‹¤"
-#: builtin/apply.c:4515
+#: builtin/apply.c:4806
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "전통ì ì¸ diff 경로 ì•žì˜ <개수>ê°œì˜ ì•ž 슬래시(/)를 제거합니다"
-#: builtin/apply.c:4518
+#: builtin/apply.c:4809
msgid "ignore additions made by the patch"
msgstr "패치ì—ì„œ 추가하는 파ì¼ì„ 무시합니다"
-#: builtin/apply.c:4520
+#: builtin/apply.c:4811
msgid "instead of applying the patch, output diffstat for the input"
msgstr "패치를 ì ìš©í•˜ëŠ” 대신, ìž…ë ¥ì— ëŒ€í•œ diffstatì„ ì¶œë ¥í•©ë‹ˆë‹¤"
-#: builtin/apply.c:4524
+#: builtin/apply.c:4815
msgid "show number of added and deleted lines in decimal notation"
msgstr "십진수로 추가 ë° ì‚­ì œí•œ 줄 수를 표시합니다"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4817
msgid "instead of applying the patch, output a summary for the input"
msgstr "패치를 ì ìš©í•˜ëŠ” 대신, ìž…ë ¥ì— ëŒ€í•œ ìš”ì•½ì„ ì¶œë ¥í•©ë‹ˆë‹¤"
-#: builtin/apply.c:4528
+#: builtin/apply.c:4819
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "패치를 ì ìš©í•˜ëŠ” 대신, 패치를 ì ìš© 가능한지 확ì¸í•©ë‹ˆë‹¤"
-#: builtin/apply.c:4530
+#: builtin/apply.c:4821
msgid "make sure the patch is applicable to the current index"
msgstr "현재 ì¸ë±ìŠ¤ì—ì„œ 패치가 ì ìš© 가능한지 확ì¸í•©ë‹ˆë‹¤"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4823
msgid "apply a patch without touching the working tree"
msgstr "ìž‘ì—… í´ë”를 바꾸지 ì•Šê³  패치를 ì ìš©í•©ë‹ˆë‹¤"
-#: builtin/apply.c:4534
+#: builtin/apply.c:4825
msgid "accept a patch that touches outside the working area"
msgstr "ìž‘ì—… ì˜ì—­ ë°–ì˜ íŒŒì¼ì„ 바꾸는 패치를 허용합니다"
-#: builtin/apply.c:4536
+#: builtin/apply.c:4827
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "그리고 íŒ¨ì¹˜ë„ ì ìš©í•©ë‹ˆë‹¤ (--stat/--summary/--check 옵션과 ê°™ì´ ì‚¬ìš©)"
-#: builtin/apply.c:4538
+#: builtin/apply.c:4829
msgid "attempt three-way merge if a patch does not apply"
msgstr "패치를 ì ìš©í•˜ì§€ 않으면 3-ë°©í–¥ ë³‘í•©ì„ ì‹œë„합니다"
-#: builtin/apply.c:4540
+#: builtin/apply.c:4831
msgid "build a temporary index based on embedded index information"
msgstr "내장 ì¸ë±ìŠ¤ 정보를 사용해 ìž„ì‹œ ì¸ë±ìŠ¤ë¥¼ 만듭니다"
-#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
msgid "paths are separated with NUL character"
msgstr "경로를 NUL 문ìžë¡œ 구분합니다"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4836
msgid "ensure at least <n> lines of context match"
msgstr "최소한 <n>ì¤„ì´ ì»¨í…스트와 ì¼ì¹˜í•˜ëŠ”지 확ì¸í•©ë‹ˆë‹¤"
-#: builtin/apply.c:4547
+#: builtin/apply.c:4838
msgid "detect new or modified lines that have whitespace errors"
msgstr "공백 오류가 있는 추가ë거나 ìˆ˜ì •ëœ ì¤„ì„ ì°¾ìŠµë‹ˆë‹¤"
-#: builtin/apply.c:4550 builtin/apply.c:4553
+#: builtin/apply.c:4841 builtin/apply.c:4844
msgid "ignore changes in whitespace when finding context"
msgstr "컨í…스트를 ì°¾ì„ ë•Œ 공백 변경 ì‚¬í•­ì„ ë¬´ì‹œí•©ë‹ˆë‹¤"
-#: builtin/apply.c:4556
+#: builtin/apply.c:4847
msgid "apply the patch in reverse"
msgstr "패치를 반대 순서로 ì ìš©í•©ë‹ˆë‹¤"
-#: builtin/apply.c:4558
+#: builtin/apply.c:4849
msgid "don't expect at least one line of context"
msgstr "ìµœì†Œí•œì˜ ì»¨í…스트 í•œ ì¤„ë„ ì—†ì´ ì ìš©í•©ë‹ˆë‹¤"
-#: builtin/apply.c:4560
+#: builtin/apply.c:4851
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "ê±°ë¶€ëœ íŒ¨ì¹˜ ë¶€ë¶„ì„ ëŒ€ì‘ë˜ëŠ” *.rej 파ì¼ì— 남겨둡니다"
-#: builtin/apply.c:4562
+#: builtin/apply.c:4853
msgid "allow overlapping hunks"
msgstr "패치 ë¶€ë¶„ì´ ê²¹ì³ë„ 허용합니다"
-#: builtin/apply.c:4565
+#: builtin/apply.c:4856
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "íŒŒì¼ ëì— ì¤„ë°”ê¿ˆì´ ë¹ ì¡ŒìŒì„ 잘못 검색한 ê²½ìš°ì— ë¬´ì‹œí•©ë‹ˆë‹¤"
-#: builtin/apply.c:4568
+#: builtin/apply.c:4859
msgid "do not trust the line counts in the hunk headers"
msgstr "패치 ë¶€ë¶„ì˜ í—¤ë”ì˜ ì¤„ 수를 신용하지 않습니다"
-#: builtin/apply.c:4571
+#: builtin/apply.c:4862
msgid "prepend <root> to all filenames"
msgstr "모든 íŒŒì¼ ì´ë¦„ì— <최ìƒìœ„>를 ì•žì— ë¶™ìž…ë‹ˆë‹¤"
-#: builtin/apply.c:4593
-msgid "--3way outside a repository"
-msgstr "저장소 ë°–ì—ì„œ --3way 옵션 사용"
-
-#: builtin/apply.c:4601
-msgid "--index outside a repository"
-msgstr "저장소 ë°–ì—ì„œ --index 옵션 사용"
-
-#: builtin/apply.c:4604
-msgid "--cached outside a repository"
-msgstr "저장소 ë°–ì—ì„œ --cached 옵션 사용"
-
-#: builtin/apply.c:4623
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "'%s' 패치를 열 수 없습니다"
-
-#: builtin/apply.c:4637
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] "공백 오류 %d개를 넘어갑니다"
-
-#: builtin/apply.c:4643 builtin/apply.c:4653
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] "%d줄ì—ì„œ 공백 오류를 추가합니다."
-
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
@@ -3680,103 +4080,103 @@ msgstr "git blame [<옵션>] [<리비전-옵션>] [<리비전>] [--] <파ì¼>"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<리비전-옵션>ì€ git-rev-list(1)ì— ì„¤ëª…ë˜ì–´ 있습니다"
-#: builtin/blame.c:1782
+#: builtin/blame.c:1781
msgid "Blaming lines"
msgstr "블레임 줄"
-#: builtin/blame.c:2531
+#: builtin/blame.c:2536
msgid "Show blame entries as we find them, incrementally"
msgstr "블레임 í•­ëª©ì„ ì°¾ìžë§ˆìž ì ì§„ì ìœ¼ë¡œ 표시합니다"
-#: builtin/blame.c:2532
+#: builtin/blame.c:2537
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "가장ìžë¦¬ ì»¤ë°‹ì— ëŒ€í•´ 빈 SHA-1ì„ í‘œì‹œí•©ë‹ˆë‹¤ (기본값: 꺼ì§)"
-#: builtin/blame.c:2533
+#: builtin/blame.c:2538
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "최ìƒìœ„ ì»¤ë°‹ì„ ê°€ìž¥ìžë¦¬ 커밋으로 취급하지 않습니다 (기본값: 꺼ì§)"
-#: builtin/blame.c:2534
+#: builtin/blame.c:2539
msgid "Show work cost statistics"
msgstr "작업 비용 통계를 표시합니다"
-#: builtin/blame.c:2535
+#: builtin/blame.c:2540
msgid "Force progress reporting"
msgstr "강제로 진행 ìƒí™©ì„ 표시합니다"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2541
msgid "Show output score for blame entries"
msgstr "블레임 í•­ëª©ì— ëŒ€í•´ 출력 ì ìˆ˜ë¥¼ 표시합니다"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2542
msgid "Show original filename (Default: auto)"
msgstr "ì›ëž˜ íŒŒì¼ ì´ë¦„ 표시 (기본값: ìžë™)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2543
msgid "Show original linenumber (Default: off)"
msgstr "ì›ëž˜ 줄 번호 표시 (기본값: 하지 ì•ŠìŒ)"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2544
msgid "Show in a format designed for machine consumption"
msgstr "컴퓨터 처리용으로 ì„¤ê³„ëœ í˜•ì‹ìœ¼ë¡œ 표시합니다"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2545
msgid "Show porcelain format with per-line commit information"
msgstr "줄마다 커밋 ì •ë³´ê°€ 표시ë˜ëŠ” 사용ìžìš© 형ì‹ìœ¼ë¡œ 표시합니다"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2546
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "git-annotate와 ë™ì¼í•œ 형ì‹ì„ 사용합니다 (기본값: 꺼ì§)"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2547
msgid "Show raw timestamp (Default: off)"
msgstr "내부 형ì‹ìœ¼ë¡œ ì‹œê°ì„ 표시합니다 (기본값: 꺼ì§)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2548
msgid "Show long commit SHA1 (Default: off)"
msgstr "길게 커밋 SHA1ì„ í‘œì‹œí•©ë‹ˆë‹¤ (기본값: 꺼ì§)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2549
msgid "Suppress author name and timestamp (Default: off)"
msgstr "ìž‘ì„±ìž ì´ë¦„ê³¼ ì‹œê°ì„ 표시하지 않습니다 (기본값: 꺼ì§)"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2550
msgid "Show author email instead of name (Default: off)"
msgstr "ìž‘ì„±ìž ì´ë¦„ ëŒ€ì‹ ì— ì „ìžë©”ì¼ì„ 표시합니다 (기본값: 꺼ì§)"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2551
msgid "Ignore whitespace differences"
msgstr "공백 ë¬¸ìž ì°¨ì´ì ì„ 무시합니다"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2552
msgid "Spend extra cycles to find better match"
msgstr "ë” ì¼ì¹˜í•˜ëŠ” í•­ëª©ì„ ì°¾ëŠ”ë° ë” ì‹œê°„ì„ ì†Œëª¨í•©ë‹ˆë‹¤"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2553
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "git-rev-list를 호출하는 대신 <파ì¼>ì—ì„œ ë¦¬ë¹„ì „ì„ ì‚¬ìš©í•©ë‹ˆë‹¤"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2554
msgid "Use <file>'s contents as the final image"
msgstr "<파ì¼>ì˜ ë‚´ìš©ì„ ìµœì¢… ì´ë¯¸ì§€ë¡œ 사용합니다"
-#: builtin/blame.c:2550 builtin/blame.c:2551
+#: builtin/blame.c:2555 builtin/blame.c:2556
msgid "score"
msgstr "ì ìˆ˜"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2555
msgid "Find line copies within and across files"
msgstr "íŒŒì¼ ë‚´ë¶€ì™€ íŒŒì¼ ì‚¬ì´ì˜ ë³µì‚¬ëœ ì¤„ì„ ì°¾ìŠµë‹ˆë‹¤"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2556
msgid "Find line movements within and across files"
msgstr "íŒŒì¼ ë‚´ë¶€ì™€ íŒŒì¼ ì‚¬ì´ì˜ 옮겨진 ì¤„ì„ ì°¾ìŠµë‹ˆë‹¤"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2557
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2557
msgid "Process only line range n,m, counting from 1"
msgstr "n,m줄 (1번 줄부터 시작) 사ì´ì˜ 범위만 처리"
@@ -3786,7 +4186,7 @@ msgstr "n,m줄 (1번 줄부터 시작) 사ì´ì˜ 범위만 처리"
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2641
+#: builtin/blame.c:2649
msgid "4 years, 11 months ago"
msgstr "4년 11달 전"
@@ -3889,118 +4289,125 @@ msgstr "리모트 ì¶”ì  '%s' 브랜치를 삭제합니다. (과거 %s)\n"
msgid "Deleted branch %s (was %s).\n"
msgstr "%s 브랜치 삭제 (과거 %s).\n"
-#: builtin/branch.c:309
+#: builtin/branch.c:312
#, c-format
msgid "[%s: gone]"
msgstr "[%s: 사ë¼ì§]"
-#: builtin/branch.c:314
+#: builtin/branch.c:317
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:319
+#: builtin/branch.c:322
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: %d개 뒤]"
-#: builtin/branch.c:321
+#: builtin/branch.c:324
#, c-format
msgid "[behind %d]"
msgstr "[%d개 뒤]"
-#: builtin/branch.c:325
+#: builtin/branch.c:328
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: %d개 앞]"
-#: builtin/branch.c:327
+#: builtin/branch.c:330
#, c-format
msgid "[ahead %d]"
msgstr "[%d개 앞]"
-#: builtin/branch.c:330
+#: builtin/branch.c:333
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: %d개 앞, %d개 뒤]"
-#: builtin/branch.c:333
+#: builtin/branch.c:336
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[%d개 앞, %d개 뒤]"
-#: builtin/branch.c:346
+#: builtin/branch.c:349
msgid " **** invalid ref ****"
msgstr " **** ìž˜ëª»ëœ ë ˆí¼ëŸ°ìŠ¤ ****"
-#: builtin/branch.c:372
+#: builtin/branch.c:375
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(브랜치 ì—†ìŒ, %s 리베ì´ìŠ¤)"
-#: builtin/branch.c:375
+#: builtin/branch.c:378
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(브랜치 ì—†ìŒ, ì´ë“±ë¶„ %sì—ì„œ 시작)"
#. TRANSLATORS: make sure this matches
#. "HEAD detached at " in wt-status.c
-#: builtin/branch.c:381
+#: builtin/branch.c:384
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD %s 위치ì—ì„œ 분리ë¨)"
#. TRANSLATORS: make sure this matches
#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:386
+#: builtin/branch.c:389
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD %s(으)로부터 분리ë¨)"
-#: builtin/branch.c:390
+#: builtin/branch.c:393
msgid "(no branch)"
msgstr "(브랜치 ì—†ìŒ)"
-#: builtin/branch.c:541
+#: builtin/branch.c:544
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "%s 브랜치를 %s ìœ„ì¹˜ì— ë¦¬ë² ì´ìŠ¤í•©ë‹ˆë‹¤"
-#: builtin/branch.c:545
+#: builtin/branch.c:548
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "%s 브랜치를 %s 위치ì—ì„œ bisect합니다"
-#: builtin/branch.c:560
+#: builtin/branch.c:563
msgid "cannot rename the current branch while not on any."
msgstr "브랜치 ìœ„ì— ì—†ìœ¼ë©´ì„œ 현재 브랜치 ì´ë¦„ì„ ë°”ê¿€ 수 없습니다."
-#: builtin/branch.c:570
+#: builtin/branch.c:573
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "ìž˜ëª»ëœ ë¸Œëžœì¹˜ ì´ë¦„: '%s'"
-#: builtin/branch.c:587
+#: builtin/branch.c:590
msgid "Branch rename failed"
msgstr "브랜치 ì´ë¦„ 바꾸기 실패"
-#: builtin/branch.c:591
+#: builtin/branch.c:594
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "ì´ë¦„ì´ ìž˜ëª»ëœ '%s' ë¸Œëžœì¹˜ì˜ ì´ë¦„ì„ ë‹¤ë¥´ê²Œ 바꿉니다"
-#: builtin/branch.c:594
+#: builtin/branch.c:597
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "브랜치 ì´ë¦„ì„ %s(으)ë¡œ 바꾸지만, HEAD를 ì—…ë°ì´íŠ¸í•˜ì§€ 않습니다!"
-#: builtin/branch.c:601
+#: builtin/branch.c:604
msgid "Branch is renamed, but update of config-file failed"
msgstr "ë¸Œëžœì¹˜ì˜ ì´ë¦„ì„ ë°”ê¾¸ì§€ë§Œ, config-file ì—…ë°ì´íŠ¸ê°€ 실패했습니다"
-#: builtin/branch.c:623
-msgid "could not write branch description template"
-msgstr "브랜치 설명 ì„œì‹ì„ 쓸 수 없습니다"
+#: builtin/branch.c:620
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+"ë‹¤ìŒ ë¸Œëžœì¹˜ì— ëŒ€í•œ ì„¤ëª…ì„ ì“°ì‹­ì‹œì˜¤:\n"
+" %s\n"
+"'%c' 문ìžë¡œ 시작하는 ì¤„ì€ ë¬´ì‹œë©ë‹ˆë‹¤.\n"
#: builtin/branch.c:651
msgid "Generic options"
@@ -4103,8 +4510,8 @@ msgstr "키"
msgid "field name to sort on"
msgstr "정렬한 ê¸°ì¤€ì´ ë˜ëŠ” í•„ë“œ ì´ë¦„"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
-#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
+#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
#: builtin/tag.c:369
msgid "object"
msgstr "오브ì íŠ¸"
@@ -4229,7 +4636,7 @@ msgstr "ë²ˆë“¤ì„ ë§Œë“œë ¤ë©´ 저장소가 필요합니다."
msgid "Need a repository to unbundle."
msgstr "ë²ˆë“¤ì„ í•´ì œí•˜ë ¤ë©´ 저장소가 필요합니다."
-#: builtin/cat-file.c:428
+#: builtin/cat-file.c:443
msgid ""
"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
"<type>|--textconv) <object>"
@@ -4237,56 +4644,56 @@ msgstr ""
"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<종류"
">|--textconv) <오브ì íŠ¸>"
-#: builtin/cat-file.c:429
+#: builtin/cat-file.c:444
msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-#: builtin/cat-file.c:466
+#: builtin/cat-file.c:481
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<종류>는 ë‹¤ìŒ ì¤‘ 하나가 ë  ìˆ˜ 있습니다: blob, tree, commit, tag"
-#: builtin/cat-file.c:467
+#: builtin/cat-file.c:482
msgid "show object type"
msgstr "오브ì íŠ¸ 종류를 봅니다"
-#: builtin/cat-file.c:468
+#: builtin/cat-file.c:483
msgid "show object size"
msgstr "오브ì íŠ¸ í¬ê¸°ë¥¼ 봅니다"
-#: builtin/cat-file.c:470
+#: builtin/cat-file.c:485
msgid "exit with zero when there's no error"
msgstr "오류가 ì—†ì„ ë•Œ 0ì„ ë¦¬í„´í•˜ê³  ë냅니다"
-#: builtin/cat-file.c:471
+#: builtin/cat-file.c:486
msgid "pretty-print object's content"
msgstr "오브ì íŠ¸ì˜ ë‚´ìš©ì„ ì˜ˆì˜ê²Œ 표시합니다"
-#: builtin/cat-file.c:473
+#: builtin/cat-file.c:488
msgid "for blob objects, run textconv on object's content"
msgstr "블롭 오브ì íŠ¸ì— 대해서는, 오브ì íŠ¸ì˜ ë‚´ìš©ì— ëŒ€í•´ textconv를 실행합니다"
-#: builtin/cat-file.c:475
+#: builtin/cat-file.c:490
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "-s ë° -t ì˜µì…˜ì´ ì†ìƒëœ 오브ì íŠ¸ì— 대해 ë™ìž‘하ë„ë¡ í—ˆìš©í•©ë‹ˆë‹¤"
-#: builtin/cat-file.c:476
+#: builtin/cat-file.c:491
msgid "buffer --batch output"
msgstr "--batch ì¶œë ¥ì— ëŒ€í•´ 버í¼ë§í•©ë‹ˆë‹¤"
-#: builtin/cat-file.c:478
+#: builtin/cat-file.c:493
msgid "show info and content of objects fed from the standard input"
msgstr "표준 ìž…ë ¥ì—ì„œ ìž…ë ¥ëœ ì˜¤ë¸Œì íŠ¸ì˜ 정보와 ë‚´ìš©ì„ í‘œì‹œí•©ë‹ˆë‹¤"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:496
msgid "show info about objects fed from the standard input"
msgstr "표준 ìž…ë ¥ì—ì„œ ìž…ë ¥ëœ ì˜¤ë¸Œì íŠ¸ì˜ 정보를 표시합니다"
-#: builtin/cat-file.c:484
+#: builtin/cat-file.c:499
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"트리 ë‚´ë¶€ì˜ ì‹¬ë³¼ë¦­ ë§í¬ë¥¼ ë”°ë¼ê°‘니다 (--batch ë˜ëŠ” --batch-check와 ê°™ì´ ì‚¬ìš©)"
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:501
msgid "show all objects with --batch or --batch-check"
msgstr "--batch ë˜ëŠ” --batch-checkì—ì„œ 모든 오브ì íŠ¸ë¥¼ 표시합니다"
@@ -4314,7 +4721,7 @@ msgstr "표준 ìž…ë ¥ì—ì„œ íŒŒì¼ ì´ë¦„ì„ ì½ìŠµë‹ˆë‹¤"
msgid "terminate input and output records by a NUL character"
msgstr "NUL 문ìžë¥¼ 기준으로 ìžë£Œ ìž…ë ¥ ë° ì¶œë ¥ì„ ë©ˆì¶¥ë‹ˆë‹¤"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "진행 ìƒí™© 표시를 하지 않습니다"
@@ -4404,9 +4811,9 @@ msgid "write the content to temporary files"
msgstr "ë‚´ìš©ì„ ìž„ì‹œ 파ì¼ì— ì”니다"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
-#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
-#: builtin/submodule--helper.c:774
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
+#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
+#: builtin/submodule--helper.c:830 builtin/worktree.c:469
msgid "string"
msgstr "문ìžì—´"
@@ -4472,10 +4879,6 @@ msgstr "'%s' ì˜µì…˜ì€ %s 옵션과 ê°™ì´ ì“¸ 수 없습니다"
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "경로를 ì—…ë°ì´íŠ¸í•˜ê³  '%s' 브랜치로 전환하는 ì¼ì€ ë™ì‹œì— í•  수 없습니다."
-#: builtin/checkout.c:279 builtin/checkout.c:473
-msgid "corrupt index file"
-msgstr "ì†ìƒëœ ì¸ë±ìŠ¤ 파ì¼"
-
#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
@@ -4485,50 +4888,50 @@ msgstr "'%s' 경로를 병합하지 않았습니다"
msgid "you need to resolve your current index first"
msgstr "현재 ì¸ë±ìŠ¤ë¥¼ 먼저 해결해야 합니다"
-#: builtin/checkout.c:622
+#: builtin/checkout.c:625
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "'%s'ì— ëŒ€í•´ reflogí•  수 없습니다: %s\n"
-#: builtin/checkout.c:660
+#: builtin/checkout.c:663
msgid "HEAD is now at"
msgstr "HEADì˜ í˜„ìž¬ 위치는"
-#: builtin/checkout.c:664 builtin/clone.c:661
+#: builtin/checkout.c:667 builtin/clone.c:661
msgid "unable to update HEAD"
msgstr "HEAD를 ì—…ë°ì´íŠ¸í•  수 없습니다"
-#: builtin/checkout.c:668
+#: builtin/checkout.c:671
#, c-format
msgid "Reset branch '%s'\n"
msgstr "'%s' 브랜치 리셋\n"
-#: builtin/checkout.c:671
+#: builtin/checkout.c:674
#, c-format
msgid "Already on '%s'\n"
msgstr "ì´ë¯¸ '%s'ì— ìžˆìŠµë‹ˆë‹¤\n"
-#: builtin/checkout.c:675
+#: builtin/checkout.c:678
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "'%s' 브랜치로 전환하고 리셋합니다\n"
-#: builtin/checkout.c:677 builtin/checkout.c:1067
+#: builtin/checkout.c:680 builtin/checkout.c:1069
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "새로 만든 '%s' 브랜치로 전환합니다\n"
-#: builtin/checkout.c:679
+#: builtin/checkout.c:682
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "'%s' 브랜치로 전환합니다\n"
-#: builtin/checkout.c:731
+#: builtin/checkout.c:733
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 그리고 %dê°œ ë”.\n"
-#: builtin/checkout.c:737
+#: builtin/checkout.c:739
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4546,7 +4949,7 @@ msgstr[0] ""
"\n"
"%s\n"
-#: builtin/checkout.c:756
+#: builtin/checkout.c:758
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4567,151 +4970,151 @@ msgstr[0] ""
" git branch <새-브랜치-ì´ë¦„> %s\n"
"\n"
-#: builtin/checkout.c:792
+#: builtin/checkout.c:794
msgid "internal error in revision walk"
msgstr "리비전 walkì— ë‚´ë¶€ 오류"
-#: builtin/checkout.c:796
+#: builtin/checkout.c:798
msgid "Previous HEAD position was"
msgstr "ì´ì „ HEAD 위치는"
-#: builtin/checkout.c:823 builtin/checkout.c:1062
+#: builtin/checkout.c:825 builtin/checkout.c:1064
msgid "You are on a branch yet to be born"
msgstr "현재 위치가 만들 ì˜ˆì •ì¸ ë¸Œëžœì¹˜ì— ìžˆìŠµë‹ˆë‹¤"
-#: builtin/checkout.c:968
+#: builtin/checkout.c:970
#, c-format
msgid "only one reference expected, %d given."
msgstr "í•˜ë‚˜ì˜ ë ˆí¼ëŸ°ìŠ¤ë§Œ 지정해야 하지만 %d개를 지정했습니다."
-#: builtin/checkout.c:1008 builtin/worktree.c:212
+#: builtin/checkout.c:1010 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "ìž˜ëª»ëœ ë ˆí¼ëŸ°ìŠ¤: %s"
-#: builtin/checkout.c:1037
+#: builtin/checkout.c:1039
#, c-format
msgid "reference is not a tree: %s"
msgstr "ë ˆí¼ëŸ°ìŠ¤ê°€ 트리가 아닙니다: %s"
-#: builtin/checkout.c:1076
+#: builtin/checkout.c:1078
msgid "paths cannot be used with switching branches"
msgstr "브랜치를 ì „í™˜í•˜ëŠ”ë° ê²½ë¡œë¥¼ 사용할 수 없습니다"
-#: builtin/checkout.c:1079 builtin/checkout.c:1083
+#: builtin/checkout.c:1081 builtin/checkout.c:1085
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' ì˜µì…˜ì€ ë¸Œëžœì¹˜ë¥¼ 전환할 ë•Œ 쓸 수 없습니다"
-#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
-#: builtin/checkout.c:1098
+#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
+#: builtin/checkout.c:1100
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ì˜µì…˜ì€ '%s' 옵션과 ê°™ì´ ì“¸ 수 없습니다"
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1105
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "브랜치를 ì»¤ë°‹ì´ ì•„ë‹Œ '%s'(으)ë¡œ 전환할 수 없습니다"
-#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
-#: builtin/worktree.c:325
+#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
+#: builtin/worktree.c:326
msgid "branch"
msgstr "브랜치"
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1139
msgid "create and checkout a new branch"
msgstr "새 브랜치를 만들고 가져옵니다"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1141
msgid "create/reset and checkout a branch"
msgstr "브랜치를 만들거나 리셋하고 가져옵니다"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1142
msgid "create reflog for new branch"
msgstr "새 ë¸Œëžœì¹˜ì— ëŒ€í•œ reflog를 만듭니다"
-#: builtin/checkout.c:1141
-msgid "detach the HEAD at named commit"
-msgstr "지정한 커밋ì—ì„œ HEAD를 분리합니다"
+#: builtin/checkout.c:1143 builtin/worktree.c:328
+msgid "detach HEAD at named commit"
+msgstr "HEAD를 해당 커밋ì—ì„œ 분리합니다"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1144
msgid "set upstream info for new branch"
msgstr "새 ë¸Œëžœì¹˜ì— ëŒ€í•œ 업스트림 정보를 설정합니다"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1146
msgid "new-branch"
msgstr "새-브랜치"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1146
msgid "new unparented branch"
msgstr "ìƒìœ„ 브랜치가 없는 새 브랜치"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1147
msgid "checkout our version for unmerged files"
msgstr "병합ë˜ì§€ ì•Šì€ íŒŒì¼ì— 대해 우리쪽 ë²„ì „ì„ ê°€ì ¸ì˜µë‹ˆë‹¤"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1149
msgid "checkout their version for unmerged files"
msgstr "병합ë˜ì§€ ì•Šì€ íŒŒì¼ì— 대해 ìƒëŒ€íŽ¸ ë²„ì „ì„ ê°€ì ¸ì˜µë‹ˆë‹¤"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1151
msgid "force checkout (throw away local modifications)"
msgstr "강제로 ì²´í¬ì•„웃합니다 (로컬ì—ì„œ 수정한 ì‚¬í•­ì„ ë²„ë¦½ë‹ˆë‹¤)"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1152
msgid "perform a 3-way merge with the new branch"
msgstr "새 ë¸Œëžœì¹˜ì— ëŒ€í•´ 3-ë°©í–¥ ë³‘í•©ì„ ìˆ˜í–‰í•©ë‹ˆë‹¤"
-#: builtin/checkout.c:1151 builtin/merge.c:230
+#: builtin/checkout.c:1153 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr "무시하는 파ì¼ì„ ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤ (기본값)"
-#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
+#: builtin/checkout.c:1154 builtin/log.c:1459 parse-options.h:250
msgid "style"
msgstr "스타ì¼"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1155
msgid "conflict style (merge or diff3)"
msgstr "ì¶©ëŒ ìŠ¤íƒ€ì¼ (merge ë˜ëŠ” diff3)"
# FIXME: ì˜ë¯¸ 불명
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1158
msgid "do not limit pathspecs to sparse entries only"
msgstr "경로명세를 드문 항목ì—만 제한하지 않습니다"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1160
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "'git checkout <없는-브랜치>'ì— ëŒ€í•´ 추측합니다"
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1162
msgid "do not check if another worktree is holding the given ref"
msgstr "다른 ìž‘ì—…í´ë”ì— ì£¼ì–´ì§„ ë ˆí¼ëŸ°ìŠ¤ê°€ 있는지 확ì¸í•˜ì§€ 않습니다"
-#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
-#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
+#: builtin/checkout.c:1163 builtin/clone.c:60 builtin/fetch.c:117
+#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "강제로 진행 ìƒí™©ì„ 표시합니다"
-#: builtin/checkout.c:1192
+#: builtin/checkout.c:1194
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B ë° --orphan ì˜µì…˜ì€ ì„œë¡œ 호환ë˜ì§€ 않습니다"
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1211
msgid "--track needs a branch name"
msgstr "--track ì˜µì…˜ì€ ë¸Œëžœì¹˜ ì´ë¦„ì´ í•„ìš”í•©ë‹ˆë‹¤"
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1216
msgid "Missing branch name; try -b"
msgstr "브랜치 ì´ë¦„ì´ ì—†ìŠµë‹ˆë‹¤. -b ì˜µì…˜ì„ ì‚¬ìš©í•´ 보십시오"
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1252
msgid "invalid path specification"
msgstr "경로 명세가 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/checkout.c:1257
+#: builtin/checkout.c:1259
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4720,12 +5123,12 @@ msgstr ""
"ë™ì‹œì— 경로를 ì—…ë°ì´íŠ¸í•˜ê³  '%s' 브랜치로 전환할 수 없습니다.\n"
"ì»¤ë°‹ì„ í™•ì¸í•  수 없는 '%s'ì„(를) 가져오려고 하셨습니까?"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1264
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach ì˜µì…˜ì€ ê²½ë¡œ ì¸ìžë¥¼ 받지 않습니다 '%s'"
-#: builtin/checkout.c:1266
+#: builtin/checkout.c:1268
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4877,7 +5280,7 @@ msgid "remove whole directories"
msgstr "전체 디렉터리 제거"
#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
msgid "pattern"
msgstr "패턴"
@@ -4921,7 +5324,7 @@ msgstr "git clone [<옵션>] [--] <저장소> [<디렉터리>]"
msgid "don't create a checkout"
msgstr "ì²´í¬ì•„ì›ƒì„ ë§Œë“¤ì§€ 않습니다"
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
msgid "create a bare repository"
msgstr "간략한 저장소를 만듭니다"
@@ -4949,16 +5352,16 @@ msgstr "복제한 결과물ì—ì„œ 하위 ëª¨ë“ˆì„ ì´ˆê¸°í™”í•©ë‹ˆë‹¤"
msgid "number of submodules cloned in parallel"
msgstr "병렬ì ìœ¼ë¡œ 복제하는 하위모듈 개수"
-#: builtin/clone.c:80 builtin/init-db.c:470
+#: builtin/clone.c:80 builtin/init-db.c:473
msgid "template-directory"
msgstr "ì„œì‹-디렉터리"
-#: builtin/clone.c:81 builtin/init-db.c:471
+#: builtin/clone.c:81 builtin/init-db.c:474
msgid "directory from which templates will be used"
msgstr "ì„œì‹ì„ 사용할 디렉터리 위치"
-#: builtin/clone.c:83 builtin/submodule--helper.c:498
-#: builtin/submodule--helper.c:777
+#: builtin/clone.c:83 builtin/submodule--helper.c:495
+#: builtin/submodule--helper.c:833
msgid "reference repository"
msgstr "ë ˆí¼ëŸ°ìŠ¤ 저장소"
@@ -4982,7 +5385,7 @@ msgstr "ë¦¬ëª¨íŠ¸ì˜ HEAD 대신 <브랜치>를 가져옵니다"
msgid "path to git-upload-pack on the remote"
msgstr "ë¦¬ëª¨íŠ¸ì˜ git-upload-pack 경로"
-#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201
+#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 builtin/pull.c:201
msgid "depth"
msgstr "깊ì´"
@@ -4998,11 +5401,11 @@ msgstr "í•˜ë‚˜ì˜ ë¸Œëžœì¹˜ë§Œ 복제합니다 (HEAD ë˜ëŠ” --branchë¡œ 지정)"
msgid "any cloned submodules will be shallow"
msgstr "모든 복제한 하위 ëª¨ë“ˆì€ ì–•ì€ ëª¨ë“ˆìž…ë‹ˆë‹¤"
-#: builtin/clone.c:98 builtin/init-db.c:479
+#: builtin/clone.c:98 builtin/init-db.c:482
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:99 builtin/init-db.c:480
+#: builtin/clone.c:99 builtin/init-db.c:483
msgid "separate git dir from working tree"
msgstr "깃 디렉터리를 ìž‘ì—… í´ë”와 ë³„ê°œì˜ ìœ„ì¹˜ì— ë†“ìŠµë‹ˆë‹¤"
@@ -5014,11 +5417,11 @@ msgstr "키=값"
msgid "set config inside the new repository"
msgstr "새 저장소 안ì—ì„œ 설정합니다"
-#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "IPv4 주소만 사용합니다"
-#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "IPv6 주소만 사용합니다"
@@ -5051,6 +5454,11 @@ msgstr "ë ˆí¼ëŸ°ìŠ¤ '%s' 저장소가 ì–•ì€ ì €ìž¥ì†Œìž…ë‹ˆë‹¤"
msgid "reference repository '%s' is grafted"
msgstr "ë ˆí¼ëŸ°ìŠ¤ '%s' 저장소가 붙어 있는 저장소입니다"
+#: builtin/clone.c:376
+#, c-format
+msgid "failed to open '%s'"
+msgstr "'%s'ì„(를) ì—¬ëŠ”ë° ì‹¤íŒ¨"
+
#: builtin/clone.c:384
#, c-format
msgid "%s exists and is not a directory"
@@ -5071,7 +5479,7 @@ msgstr "'%s' ë§í¬ë¥¼ ë§Œë“œëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
msgid "failed to copy file to '%s'"
msgstr "파ì¼ì„ '%s'(으)ë¡œ ë³µì‚¬í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/clone.c:449 builtin/clone.c:633
+#: builtin/clone.c:449
#, c-format
msgid "done.\n"
msgstr "완료.\n"
@@ -5091,12 +5499,7 @@ msgstr ""
msgid "Could not find remote branch %s to clone."
msgstr "복제할 ë¦¬ëª¨íŠ¸ì˜ %s 브랜치를 ì°¾ì„ ìˆ˜ 없습니다."
-#: builtin/clone.c:628
-#, c-format
-msgid "Checking connectivity... "
-msgstr "ì—°ê²°ì„ í™•ì¸í•˜ëŠ” 중입니다..."
-
-#: builtin/clone.c:631
+#: builtin/clone.c:633
msgid "remote did not send all necessary objects"
msgstr "리모트ì—ì„œ 필요한 오브ì íŠ¸ë¥¼ ëª¨ë‘ ë³´ë‚´ì§€ 않았습니다"
@@ -5113,100 +5516,100 @@ msgstr "리모트 HEADê°€ 없는 ë ˆí¼ëŸ°ìŠ¤ë¥¼ 참고하므로, ì²´í¬ì•„웃í•
msgid "unable to checkout working tree"
msgstr "ìž‘ì—… í´ë”를 ì²´í¬ì•„웃할 수 없습니다"
-#: builtin/clone.c:767
+#: builtin/clone.c:766
msgid "unable to write parameters to config file"
msgstr "파ë¼ë¯¸í„°ë¥¼ 설정 파ì¼ì— 쓸 수 없습니다"
-#: builtin/clone.c:830
+#: builtin/clone.c:829
msgid "cannot repack to clean up"
msgstr "정리용으로 repack할 수 없습니다"
-#: builtin/clone.c:832
+#: builtin/clone.c:831
msgid "cannot unlink temporary alternates file"
msgstr "ë³´ì¡° ìž„ì‹œ 파ì¼ì„ 삭제할 수 없습니다"
-#: builtin/clone.c:864 builtin/receive-pack.c:1731
+#: builtin/clone.c:863 builtin/receive-pack.c:1857
msgid "Too many arguments."
msgstr "너무 ì¸ìžê°€ 많습니다."
-#: builtin/clone.c:868
+#: builtin/clone.c:867
msgid "You must specify a repository to clone."
msgstr "복제할 저장소를 지정해야 합니다."
-#: builtin/clone.c:879
+#: builtin/clone.c:878
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare ë° --origin %s ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다."
-#: builtin/clone.c:882
+#: builtin/clone.c:881
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare ë° --separate-git-dir ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다."
-#: builtin/clone.c:895
+#: builtin/clone.c:894
#, c-format
msgid "repository '%s' does not exist"
msgstr "'%s' 저장소가 없습니다"
-#: builtin/clone.c:901 builtin/fetch.c:1174
+#: builtin/clone.c:900 builtin/fetch.c:1293
#, c-format
msgid "depth %s is not a positive number"
msgstr "깊ì´ê°€(%s) 0보다 í° ìˆ˜ê°€ 아닙니다"
-#: builtin/clone.c:911
+#: builtin/clone.c:910
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "ëŒ€ìƒ ê²½ë¡œê°€('%s') ì´ë¯¸ 있고 빈 디렉터리가 아닙니다."
-#: builtin/clone.c:921
+#: builtin/clone.c:920
#, c-format
msgid "working tree '%s' already exists."
msgstr "ìž‘ì—… í´ë”ê°€('%s') ì´ë¯¸ 있습니다."
-#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
-#: builtin/worktree.c:220 builtin/worktree.c:247
+#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "'%s'ì˜ ì•ž 디렉터리를 만들 수 없습니다"
-#: builtin/clone.c:939
+#: builtin/clone.c:938
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "작업 디렉터리를('%s') 만들 수 없습니다"
-#: builtin/clone.c:957
+#: builtin/clone.c:956
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "간략한 저장소로('%s') 복제합니다...\n"
-#: builtin/clone.c:959
+#: builtin/clone.c:958
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "'%s'ì— ë³µì œí•©ë‹ˆë‹¤...\n"
-#: builtin/clone.c:998
+#: builtin/clone.c:997
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"--depth ì˜µì…˜ì€ ë¡œì»¬ 복제ì—ì„œ 무시ë©ë‹ˆë‹¤. ëŒ€ì‹ ì— 'file://'ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤."
-#: builtin/clone.c:1001
+#: builtin/clone.c:1000
msgid "source repository is shallow, ignoring --local"
msgstr "ì›ë³¸ 저장소가 ì–•ì€ ì €ìž¥ì†Œì´ë¯€ë¡œ, --local ì˜µì…˜ì„ ë¬´ì‹œí•©ë‹ˆë‹¤"
-#: builtin/clone.c:1006
+#: builtin/clone.c:1005
msgid "--local is ignored"
msgstr "--local ì˜µì…˜ì€ ë¬´ì‹œë©ë‹ˆë‹¤"
-#: builtin/clone.c:1010
+#: builtin/clone.c:1009
#, c-format
msgid "Don't know how to clone %s"
msgstr "%sì˜ ë³µì œ ë°©ë²•ì„ ì•Œì§€ 못합니다"
-#: builtin/clone.c:1059 builtin/clone.c:1067
+#: builtin/clone.c:1058 builtin/clone.c:1066
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "ë¦¬ëª¨íŠ¸ì˜ %s 브랜치가 업스트림 %sì— ì—†ìŠµë‹ˆë‹¤"
-#: builtin/clone.c:1070
+#: builtin/clone.c:1069
msgid "You appear to have cloned an empty repository."
msgstr "빈 저장소를 복제한 것처럼 보입니다."
@@ -5346,66 +5749,66 @@ msgstr ""
"ê·¸ 다ìŒì— \"git cherry-pick --continue\"를 하면 나머지 커밋ì—\n"
"대해 커밋 빼오기를 다시 시작합니다.\n"
-#: builtin/commit.c:307
+#: builtin/commit.c:308
msgid "failed to unpack HEAD tree object"
msgstr "HEAD 트리 오브ì íŠ¸ì˜ 묶ìŒì„ í‘¸ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/commit.c:348
+#: builtin/commit.c:349
msgid "unable to create temporary index"
msgstr "ìž„ì‹œ ì¸ë±ìŠ¤ë¥¼ 만들 수 없습니다"
-#: builtin/commit.c:354
+#: builtin/commit.c:355
msgid "interactive add failed"
msgstr "대화형 추가가 실패했습니다"
-#: builtin/commit.c:367
+#: builtin/commit.c:368
msgid "unable to update temporary index"
msgstr "ìž„ì‹œ ì¸ë±ìŠ¤ë¥¼ ì—…ë°ì´íŠ¸í•  수 없습니다"
-#: builtin/commit.c:369
+#: builtin/commit.c:370
msgid "Failed to update main cache tree"
msgstr "주요 ìºì‹œ 트리를 ì—…ë°ì´íŠ¸í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
+#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
msgid "unable to write new_index file"
msgstr "new_index 파ì¼ì— 쓸 수 없습니다"
-#: builtin/commit.c:447
+#: builtin/commit.c:448
msgid "cannot do a partial commit during a merge."
msgstr "병합하는 중 부분 ì»¤ë°‹ì„ í•  수 없습니다."
-#: builtin/commit.c:449
+#: builtin/commit.c:450
msgid "cannot do a partial commit during a cherry-pick."
msgstr "커밋 빼오기를 하는 중 부분 ì»¤ë°‹ì„ í•  수 없습니다."
-#: builtin/commit.c:458
+#: builtin/commit.c:459
msgid "cannot read the index"
msgstr "ì¸ë±ìŠ¤ë¥¼ ì½ì„ 수 없습니다"
-#: builtin/commit.c:477
+#: builtin/commit.c:478
msgid "unable to write temporary index file"
msgstr "ìž„ì‹œ ì¸ë±ìŠ¤ 파ì¼ì„ 쓸 수 없습니다"
-#: builtin/commit.c:582
+#: builtin/commit.c:583
#, c-format
msgid "commit '%s' lacks author header"
msgstr "'%s' ì»¤ë°‹ì— ìž‘ì„±ìž í—¤ë”ê°€ 없습니다"
-#: builtin/commit.c:584
+#: builtin/commit.c:585
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "'%s' ì»¤ë°‹ì˜ ìž‘ì„±ìž í—¤ë” í˜•ì‹ì´ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/commit.c:603
+#: builtin/commit.c:604
msgid "malformed --author parameter"
msgstr "--author 파ë¼ë¯¸í„° 형ì‹ì´ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/commit.c:611
+#: builtin/commit.c:612
#, c-format
msgid "invalid date format: %s"
msgstr "ì‹œê° í˜•ì‹ì´ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤: %s"
-#: builtin/commit.c:655
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -5413,38 +5816,38 @@ msgstr ""
"현재 커밋 메시지ì—ì„œ 사용ë˜ì§€ 않는 ì£¼ì„ ë¬¸ìžë¥¼\n"
"ì„ íƒí•  수 없습니다"
-#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
+#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
#, c-format
msgid "could not lookup commit %s"
msgstr "%s ì»¤ë°‹ì„ ì°¾ì•„ë³¼ 수 없습니다"
-#: builtin/commit.c:704 builtin/shortlog.c:285
+#: builtin/commit.c:705 builtin/shortlog.c:286
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(표준 ìž…ë ¥ì—ì„œ 로그 메시지를 ì½ìŒ)\n"
-#: builtin/commit.c:706
+#: builtin/commit.c:707
msgid "could not read log from standard input"
msgstr "표준 ìž…ë ¥ì—ì„œ 로그 메시지를 ì½ì„ 수 없습니다"
-#: builtin/commit.c:710
+#: builtin/commit.c:711
#, c-format
msgid "could not read log file '%s'"
msgstr "'%s' 로그 파ì¼ì„ ì½ì„ 수 없습니다"
-#: builtin/commit.c:737 builtin/commit.c:745
+#: builtin/commit.c:738 builtin/commit.c:746
msgid "could not read SQUASH_MSG"
msgstr "SQUASH_MSG를 ì½ì„ 수 없습니다"
-#: builtin/commit.c:742
+#: builtin/commit.c:743
msgid "could not read MERGE_MSG"
msgstr "MERGE_MSG를 ì½ì„ 수 없습니다"
-#: builtin/commit.c:796
+#: builtin/commit.c:797
msgid "could not write commit template"
msgstr "커밋 ì„œì‹ì„ 쓸 수 없습니다"
-#: builtin/commit.c:814
+#: builtin/commit.c:815
#, c-format
msgid ""
"\n"
@@ -5459,7 +5862,7 @@ msgstr ""
"\t%s\n"
"다시 ì‹œë„하십시오.\n"
-#: builtin/commit.c:819
+#: builtin/commit.c:820
#, c-format
msgid ""
"\n"
@@ -5474,7 +5877,7 @@ msgstr ""
"\t%s\n"
"다시 ì‹œë„하십시오.\n"
-#: builtin/commit.c:832
+#: builtin/commit.c:833
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5483,7 +5886,7 @@ msgstr ""
"변경 ì‚¬í•­ì— ëŒ€í•œ 커밋 메시지를 입력하십시오. '%c' 문ìžë¡œ 시작하는\n"
"ì¤„ì€ ë¬´ì‹œë˜ê³ , 메시지를 입력하지 않으면 ì»¤ë°‹ì´ ì¤‘ì§€ë©ë‹ˆë‹¤.\n"
-#: builtin/commit.c:839
+#: builtin/commit.c:840
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5494,149 +5897,149 @@ msgstr ""
"ì¤„ì€ ë³´ì¡´ë˜ë‹ˆ, 필요하면 ì§ì ‘ 제거하십시오. 메시지를 입력하지\n"
"않으면 ì»¤ë°‹ì´ ì¤‘ì§€ë©ë‹ˆë‹¤.\n"
-#: builtin/commit.c:859
+#: builtin/commit.c:860
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s작성ìž: %.*s <%.*s>"
-#: builtin/commit.c:867
+#: builtin/commit.c:868
#, c-format
msgid "%sDate: %s"
msgstr "%sì‹œê°: %s"
-#: builtin/commit.c:874
+#: builtin/commit.c:875
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s커미터: %.*s <%.*s>"
-#: builtin/commit.c:892
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "ì¸ë±ìŠ¤ë¥¼ ì½ì„ 수 없습니다"
-#: builtin/commit.c:949
+#: builtin/commit.c:950
msgid "Error building trees"
msgstr "트리를 ë§Œë“œëŠ”ë° ì˜¤ë¥˜"
-#: builtin/commit.c:964 builtin/tag.c:266
+#: builtin/commit.c:965 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "메시지를 -m ë˜ëŠ” -F 옵션으로 입력하십시오.\n"
-#: builtin/commit.c:1066
+#: builtin/commit.c:1067
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' ì˜µì…˜ì´ 'ì´ë¦„ <ì „ìžë©”ì¼>' 형ì‹ì´ 아니고 기존 작성ìžì—ë„ ì—†ìŠµë‹ˆë‹¤"
-#: builtin/commit.c:1081 builtin/commit.c:1321
+#: builtin/commit.c:1082 builtin/commit.c:1322
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "추ì ë˜ì§€ 않는 íŒŒì¼ ëª¨ë“œê°€ ('%s') 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/commit.c:1118
+#: builtin/commit.c:1119
msgid "--long and -z are incompatible"
msgstr "--long ë° -z ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다"
-#: builtin/commit.c:1148
+#: builtin/commit.c:1149
msgid "Using both --reset-author and --author does not make sense"
msgstr "--reset-author ë° --author ì˜µì…˜ì„ ëª¨ë‘ ì‚¬ìš©í•˜ë©´ 앞뒤가 맞지 않습니다"
-#: builtin/commit.c:1157
+#: builtin/commit.c:1158
msgid "You have nothing to amend."
msgstr "바꿀 ì‚¬í•­ì´ ì—†ìŠµë‹ˆë‹¤."
-#: builtin/commit.c:1160
+#: builtin/commit.c:1161
msgid "You are in the middle of a merge -- cannot amend."
msgstr "병합 ì¤‘ì— ìžˆìŠµë‹ˆë‹¤ -- ì»¤ë°‹ì„ ë°”ê¿€ 수 없습니다."
-#: builtin/commit.c:1162
+#: builtin/commit.c:1163
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "커밋 빼오기 ì¤‘ì— ìžˆìŠµë‹ˆë‹¤ -- ì»¤ë°‹ì„ ë°”ê¿€ 수 없습니다."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1166
msgid "Options --squash and --fixup cannot be used together"
msgstr "--squash ë° --fixup ì˜µì…˜ì€ ê°™ì´ ì“¸ 수 없습니다"
-#: builtin/commit.c:1175
+#: builtin/commit.c:1176
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "-c/-C/-F/--fixup 옵션 ì¤‘ì— í•˜ë‚˜ë§Œ 사용할 수 있습니다."
-#: builtin/commit.c:1177
+#: builtin/commit.c:1178
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "-m ì˜µì…˜ì€ -c/-C/-F/--fixup 옵션과 ê°™ì´ ì“¸ 수 없습니다."
-#: builtin/commit.c:1185
+#: builtin/commit.c:1186
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author ì˜µì…˜ì€ -C, -c ë˜ëŠ” --amend 옵션과 ê°™ì´ ì¨ì•¼ 합니다."
-#: builtin/commit.c:1202
+#: builtin/commit.c:1203
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"--include/--only/--all/--interactive/--patch 옵션 중 하나만 사용할 수 있습니"
"다."
-#: builtin/commit.c:1204
+#: builtin/commit.c:1205
msgid "No paths with --include/--only does not make sense."
msgstr "경로가 ì—†ì´ --include/--only ì˜µì…˜ì„ ì“°ë©´ 앞뒤가 맞지 않습니다."
-#: builtin/commit.c:1206
+#: builtin/commit.c:1207
msgid "Clever... amending the last one with dirty index."
msgstr "기발하네요... ë§ˆì§€ë§‰ì„ ë³€ê²½ëœ ì¸ë±ìŠ¤ë¡œ 바꿉니다."
-#: builtin/commit.c:1208
+#: builtin/commit.c:1209
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
"-i ë˜ëŠ” -o ì—†ì´ ëª…ì‹œì ì¸ 경로를 지정했습니다. --only 경로를 가정합니다..."
-#: builtin/commit.c:1220 builtin/tag.c:474
+#: builtin/commit.c:1221 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "ìž˜ëª»ëœ ì •ë¦¬ 모드 %s"
-#: builtin/commit.c:1225
+#: builtin/commit.c:1226
msgid "Paths with -a does not make sense."
msgstr "-a 옵션과 경로를 ê°™ì´ ì‚¬ìš©í•˜ë©´ 앞뒤가 맞지 않습니다."
-#: builtin/commit.c:1335 builtin/commit.c:1621
+#: builtin/commit.c:1336 builtin/commit.c:1622
msgid "show status concisely"
msgstr "ìƒíƒœë¥¼ 간략하게 표시합니다"
-#: builtin/commit.c:1337 builtin/commit.c:1623
+#: builtin/commit.c:1338 builtin/commit.c:1624
msgid "show branch information"
msgstr "브랜치 정보를 표시합니다"
-#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
-#: builtin/worktree.c:437
+#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "컴퓨터가 ì½ì„ 수 있는 형ì‹"
-#: builtin/commit.c:1342 builtin/commit.c:1627
+#: builtin/commit.c:1343 builtin/commit.c:1628
msgid "show status in long format (default)"
msgstr "긴 형ì‹ìœ¼ë¡œ ìƒíƒœë¥¼ 표시합니다 (기본값)"
-#: builtin/commit.c:1345 builtin/commit.c:1630
+#: builtin/commit.c:1346 builtin/commit.c:1631
msgid "terminate entries with NUL"
msgstr "NUL 문ìžë¡œ í•­ëª©ì„ ë냅니다"
-#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
+#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "모드"
-#: builtin/commit.c:1348 builtin/commit.c:1633
+#: builtin/commit.c:1349 builtin/commit.c:1634
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"추ì ë˜ì§€ 않는 파ì¼ì„ 표시합니다. 추가 옵션: all, normal, no (기본값: all)"
-#: builtin/commit.c:1351
+#: builtin/commit.c:1352
msgid "show ignored files"
msgstr "무시ë˜ëŠ” 파ì¼ì„ 표시합니다"
-#: builtin/commit.c:1352 parse-options.h:155
+#: builtin/commit.c:1353 parse-options.h:155
msgid "when"
msgstr "언제"
-#: builtin/commit.c:1353
+#: builtin/commit.c:1354
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -5644,198 +6047,198 @@ msgstr ""
"하위 ëª¨ë“ˆì˜ ë³€ê²½ì„ ë¬´ì‹œí•©ë‹ˆë‹¤. 추가 옵션: all, dirty, untracked. (기본값: "
"all)"
-#: builtin/commit.c:1355
+#: builtin/commit.c:1356
msgid "list untracked files in columns"
msgstr "추ì ë˜ì§€ 않는 파ì¼ì˜ 목ë¡ì„ 여러 ì—´ë¡œ 표시합니다"
-#: builtin/commit.c:1441
+#: builtin/commit.c:1442
msgid "couldn't look up newly created commit"
msgstr "새로 만든 ì»¤ë°‹ì„ ì°¾ì•„ë³¼ 수 없습니다"
-#: builtin/commit.c:1443
+#: builtin/commit.c:1444
msgid "could not parse newly created commit"
msgstr "새로 만든 ì»¤ë°‹ì„ íŒŒì‹±í•  수 없습니다"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1489
msgid "detached HEAD"
msgstr "HEAD 분리ë¨"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1492
msgid " (root-commit)"
msgstr " (최ìƒìœ„-커밋)"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1592
msgid "suppress summary after successful commit"
msgstr "성공ì ì¸ 커밋 í›„ì— ìš”ì•½ì„ í‘œì‹œí•˜ì§€ 않습니다"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1593
msgid "show diff in commit message template"
msgstr "커밋 메시지 ì„œì‹ì— diff를 표시합니다"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1595
msgid "Commit message options"
msgstr "커밋 메시지 옵션"
-#: builtin/commit.c:1595 builtin/tag.c:351
+#: builtin/commit.c:1596 builtin/tag.c:351
msgid "read message from file"
msgstr "파ì¼ì—ì„œ 메시지를 ì½ìŠµë‹ˆë‹¤"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1597
msgid "author"
msgstr "작성ìž"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1597
msgid "override author for commit"
msgstr "ì»¤ë°‹ì˜ ìž‘ì„±ìžë¥¼ 지정합니다"
-#: builtin/commit.c:1597 builtin/gc.c:326
+#: builtin/commit.c:1598 builtin/gc.c:326
msgid "date"
msgstr "ì‹œê°"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1598
msgid "override date for commit"
msgstr "ì»¤ë°‹ì˜ ì‹œê°ì„ 지정합니다"
-#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
-#: builtin/notes.c:558 builtin/tag.c:349
+#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
+#: builtin/notes.c:559 builtin/tag.c:349
msgid "message"
msgstr "메시지"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1599
msgid "commit message"
msgstr "커밋 메시지"
-#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
-#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
+#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
msgid "commit"
msgstr "커밋"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1600
msgid "reuse and edit message from specified commit"
msgstr "지정한 ì»¤ë°‹ì˜ ë©”ì‹œì§€ë¥¼ 재사용하고 편집합니다"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1601
msgid "reuse message from specified commit"
msgstr "지정한 커밋ì—ì„œ 메시지를 재사용합니다"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1602
msgid "use autosquash formatted message to fixup specified commit"
msgstr "지정한 ì»¤ë°‹ì„ ìˆ˜ì •í•˜ëŠ”ë° autosquash í˜•ì‹ ë©”ì‹œì§€ë¥¼ 사용합니다"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1603
msgid "use autosquash formatted message to squash specified commit"
msgstr "지정한 ì»¤ë°‹ì„ í•©ì¹˜ëŠ”ë° autosquash í˜•ì‹ ë©”ì‹œì§€ë¥¼ 사용합니다"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1604
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "ì»¤ë°‹ì„ ë‚´ê°€ 작성한 것으로 만듭니다 (-C/-c/--amend와 ê°™ì´ ì‚¬ìš©)"
-#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
+#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "Signed-off-by: ì¤„ì„ ì¶”ê°€í•©ë‹ˆë‹¤"
-#: builtin/commit.c:1605
+#: builtin/commit.c:1606
msgid "use specified template file"
msgstr "지정한 ì„œì‹ íŒŒì¼ì„ 사용합니다"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1607
msgid "force edit of commit"
msgstr "커밋 íŽ¸ì§‘ì„ ê°•ì œí•©ë‹ˆë‹¤"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1608
msgid "default"
msgstr "기본값"
-#: builtin/commit.c:1607 builtin/tag.c:354
+#: builtin/commit.c:1608 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "메시지ì—ì„œ 공백과 #주ì„ì„ ì§€ì›ë‹ˆë‹¤"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1609
msgid "include status in commit message template"
msgstr "커밋 메시지 ì„œì‹ì— ìƒíƒœë¥¼ í¬í•¨í•©ë‹ˆë‹¤"
-#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
+#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "GPG 서명 커밋"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1614
msgid "Commit contents options"
msgstr "커밋 내용 옵션"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1615
msgid "commit all changed files"
msgstr "ë³€ê²½ëœ íŒŒì¼ì„ ëª¨ë‘ ì»¤ë°‹í•©ë‹ˆë‹¤"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1616
msgid "add specified files to index for commit"
msgstr "지정한 파ì¼ì„ 커밋할 ì¸ë±ìŠ¤ì— 추가합니다"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1617
msgid "interactively add files"
msgstr "대화형으로 파ì¼ì„ 추가합니다"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1618
msgid "interactively add changes"
msgstr "대화형으로 변경 ì‚¬í•­ì„ ì¶”ê°€í•©ë‹ˆë‹¤"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1619
msgid "commit only specified files"
msgstr "지정한 파ì¼ë§Œ 커밋합니다"
-#: builtin/commit.c:1619
-msgid "bypass pre-commit hook"
-msgstr "커밋 ì „ 후í¬ë¥¼ 건너ëœë‹ˆë‹¤"
-
#: builtin/commit.c:1620
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "커밋 ì „ 후í¬ì™€ 커밋 메시지 후í¬ë¥¼ 건너ëœë‹ˆë‹¤"
+
+#: builtin/commit.c:1621
msgid "show what would be committed"
msgstr "ë¬´ì—‡ì„ ì»¤ë°‹í• ì§€ 표시합니다"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1632
msgid "amend previous commit"
msgstr "바로 ì•ž ì»¤ë°‹ì„ ë°”ê¿‰ë‹ˆë‹¤"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1633
msgid "bypass post-rewrite hook"
msgstr "다시쓰기 후 후í¬ë¥¼ 건너ëœë‹ˆë‹¤"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1638
msgid "ok to record an empty change"
msgstr "빈 변경 ì‚¬í•­ì„ ê¸°ë¡í•˜ë„ë¡ í—ˆìš©í•©ë‹ˆë‹¤"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
msgid "ok to record a change with an empty message"
msgstr "빈 메시지와 ê°™ì´ ë³€ê²½ ì‚¬í•­ì„ ê¸°ë¡í•˜ë„ë¡ í—ˆìš©í•©ë‹ˆë‹¤"
-#: builtin/commit.c:1668
+#: builtin/commit.c:1669
msgid "could not parse HEAD commit"
msgstr "HEAD ì»¤ë°‹ì„ íŒŒì‹±í•  수 없습니다"
-#: builtin/commit.c:1718
+#: builtin/commit.c:1719
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "ì†ìƒëœ MERGE_HEAD íŒŒì¼ (%s)"
-#: builtin/commit.c:1725
+#: builtin/commit.c:1726
msgid "could not read MERGE_MODE"
msgstr "MERGE_MODE를 ì½ì„ 수 없습니다"
-#: builtin/commit.c:1744
+#: builtin/commit.c:1745
#, c-format
msgid "could not read commit message: %s"
msgstr "커밋 메시지를 ì½ì„ 수 없습니다: %s"
-#: builtin/commit.c:1755
+#: builtin/commit.c:1756
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "ì»¤ë°‹ì„ ì¤‘ì§€í•©ë‹ˆë‹¤. 메시지를 편집하지 않았습니다.\n"
-#: builtin/commit.c:1760
+#: builtin/commit.c:1761
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "ì»¤ë°‹ì„ ì¤‘ì§€í•©ë‹ˆë‹¤. 커밋 메시지가 비어 있습니다.\n"
-#: builtin/commit.c:1808
+#: builtin/commit.c:1809
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5849,139 +6252,139 @@ msgstr ""
msgid "git config [<options>]"
msgstr "git config [<옵션>]"
-#: builtin/config.c:56
+#: builtin/config.c:55
msgid "Config file location"
msgstr "설정 íŒŒì¼ ìœ„ì¹˜"
-#: builtin/config.c:57
+#: builtin/config.c:56
msgid "use global config file"
msgstr "공통 설정 파ì¼ì„ 사용합니다"
-#: builtin/config.c:58
+#: builtin/config.c:57
msgid "use system config file"
msgstr "시스템 설정 파ì¼ì„ 사용합니다"
-#: builtin/config.c:59
+#: builtin/config.c:58
msgid "use repository config file"
msgstr "저장소 설정 파ì¼ì„ 사용합니다"
-#: builtin/config.c:60
+#: builtin/config.c:59
msgid "use given config file"
msgstr "지정한 설정 파ì¼ì„ 사용합니다"
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "blob-id"
msgstr "블롭-id"
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "read config from given blob object"
msgstr "지정한 블롭 오브ì íŠ¸ì—ì„œ ì„¤ì •ì„ ì½ìŠµë‹ˆë‹¤"
-#: builtin/config.c:62
+#: builtin/config.c:61
msgid "Action"
msgstr "ë™ìž‘"
-#: builtin/config.c:63
+#: builtin/config.c:62
msgid "get value: name [value-regex]"
msgstr "ê°’ì„ ê°€ì ¸ì˜µë‹ˆë‹¤: <ì´ë¦„> [<ê°’-ì •ê·œì‹>]"
-#: builtin/config.c:64
+#: builtin/config.c:63
msgid "get all values: key [value-regex]"
msgstr "모든 ê°’ì„ ê°€ì ¸ì˜µë‹ˆë‹¤: <키> [<ê°’-ì •ê·œì‹>]"
-#: builtin/config.c:65
+#: builtin/config.c:64
msgid "get values for regexp: name-regex [value-regex]"
msgstr "ì •ê·œì‹ì— 대한 ê°’ì„ ê°€ì ¸ì˜µë‹ˆë‹¤: <ì´ë¦„-ì •ê·œì‹> [<ê°’-ì •ê·œì‹>]"
-#: builtin/config.c:66
+#: builtin/config.c:65
msgid "get value specific for the URL: section[.var] URL"
msgstr "<URL>ì— íŠ¹ì •ë˜ëŠ” ê°’ì„ ê°€ì ¸ì˜µë‹ˆë‹¤: <섹션>[.<변수>] <URL>"
-#: builtin/config.c:67
+#: builtin/config.c:66
msgid "replace all matching variables: name value [value_regex]"
msgstr "해당하는 변수를 ëª¨ë‘ ì œê±°í•©ë‹ˆë‹¤: <ì´ë¦„> <ê°’> [<ê°’-ì •ê·œì‹>]"
-#: builtin/config.c:68
+#: builtin/config.c:67
msgid "add a new variable: name value"
msgstr "새 변수를 추가합니다: <ì´ë¦„> <ê°’>"
-#: builtin/config.c:69
+#: builtin/config.c:68
msgid "remove a variable: name [value-regex]"
msgstr "변수를 제거합니다: <ì´ë¦„> [<ê°’-ì •ê·œì‹>]"
-#: builtin/config.c:70
+#: builtin/config.c:69
msgid "remove all matches: name [value-regex]"
msgstr "해당하는 í•­ëª©ì„ ëª¨ë‘ ì œê±°í•©ë‹ˆë‹¤: <ì´ë¦„> [<ê°’-ì •ê·œì‹>]"
-#: builtin/config.c:71
+#: builtin/config.c:70
msgid "rename section: old-name new-name"
msgstr "ì„¹ì…˜ì˜ ì´ë¦„ì„ ë°”ê¿‰ë‹ˆë‹¤: <옛-ì´ë¦„> <새-ì´ë¦„>"
-#: builtin/config.c:72
+#: builtin/config.c:71
msgid "remove a section: name"
msgstr "ì„¹ì…˜ì„ ì œê±°í•©ë‹ˆë‹¤: <ì´ë¦„>"
-#: builtin/config.c:73
+#: builtin/config.c:72
msgid "list all"
msgstr "ì „ì²´ 목ë¡ì„ 표시합니다"
-#: builtin/config.c:74
+#: builtin/config.c:73
msgid "open an editor"
msgstr "편집기를 엽니다"
-#: builtin/config.c:75
+#: builtin/config.c:74
msgid "find the color configured: slot [default]"
msgstr "설정한 ìƒ‰ì„ ì°¾ìŠµë‹ˆë‹¤: slot [<기본값>]"
-#: builtin/config.c:76
+#: builtin/config.c:75
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "색 ì„¤ì •ì„ ì°¾ìŠµë‹ˆë‹¤: slot [<표준출력ì´-TTYì¸ì§€-여부>]"
-#: builtin/config.c:77
+#: builtin/config.c:76
msgid "Type"
msgstr "값 종류"
-#: builtin/config.c:78
+#: builtin/config.c:77
msgid "value is \"true\" or \"false\""
msgstr "ê°’ì´ \"true\" ë˜ëŠ” \"false\"입니다"
-#: builtin/config.c:79
+#: builtin/config.c:78
msgid "value is decimal number"
msgstr "ê°’ì´ ì‹­ì§„ìˆ˜ìž…ë‹ˆë‹¤"
-#: builtin/config.c:80
+#: builtin/config.c:79
msgid "value is --bool or --int"
msgstr "ê°’ì´ --bool ë˜ëŠ” --int입니다"
-#: builtin/config.c:81
+#: builtin/config.c:80
msgid "value is a path (file or directory name)"
msgstr "ê°’ì´ ê²½ë¡œ(íŒŒì¼ ë˜ëŠ” 디렉터리 ì´ë¦„)입니다"
-#: builtin/config.c:82
+#: builtin/config.c:81
msgid "Other"
msgstr "기타"
-#: builtin/config.c:83
+#: builtin/config.c:82
msgid "terminate values with NUL byte"
msgstr "ê°’ì„ NUL ë°”ì´íŠ¸ë¡œ ë냅니다"
-#: builtin/config.c:84
+#: builtin/config.c:83
msgid "show variable names only"
msgstr "변수 ì´ë¦„만 표시합니다"
-#: builtin/config.c:85
+#: builtin/config.c:84
msgid "respect include directives on lookup"
msgstr "찾아볼 때 include 지시어를 고려합니다"
-#: builtin/config.c:86
+#: builtin/config.c:85
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "ì„¤ì •ì˜ ì¶œì²˜ë¥¼ 표시합니다 (파ì¼, 표준 ìž…ë ¥, 블롭, 명령행)"
-#: builtin/config.c:328
+#: builtin/config.c:327
msgid "unable to parse default color value"
msgstr "기본 색 ê°’ì„ íŒŒì‹±í•  수 없습니다"
-#: builtin/config.c:472
+#: builtin/config.c:471
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5996,7 +6399,7 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:614
+#: builtin/config.c:613
#, c-format
msgid "cannot create configuration file %s"
msgstr "%s 설정 파ì¼ì„ 만들 수 없습니다"
@@ -6032,7 +6435,7 @@ msgstr "ì£¼ì„ ë‹¬ë¦° %s íƒœê·¸ì— ë‚´ìž¥ëœ ì´ë¦„ì´ ì—†ìŠµë‹ˆë‹¤"
msgid "tag '%s' is really '%s' here"
msgstr "'%s' 태그가 실제 여기 '%s'입니다"
-#: builtin/describe.c:250 builtin/log.c:465
+#: builtin/describe.c:250 builtin/log.c:480
#, c-format
msgid "Not a valid object name %s"
msgstr "올바른 오브ì íŠ¸ ì´ë¦„ì´ ì•„ë‹™ë‹ˆë‹¤ (%s)"
@@ -6230,176 +6633,177 @@ msgstr "ë ˆí¼ëŸ°ìŠ¤ëª…세를 내보낸 ë ˆí¼ëŸ°ìŠ¤ì— ì ìš©í•©ë‹ˆë‹¤"
msgid "anonymize output"
msgstr "ì¶œë ¥ì„ ìµëª…화합니다"
-#: builtin/fetch.c:20
+#: builtin/fetch.c:21
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<옵션>] [<저장소> [<ë ˆí¼ëŸ°ìŠ¤ëª…세>...]]"
-#: builtin/fetch.c:21
+#: builtin/fetch.c:22
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<옵션>] <그룹>"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<옵션>] [(<저장소> | <그룹>)...]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<옵션>]"
-#: builtin/fetch.c:92 builtin/pull.c:174
+#: builtin/fetch.c:93 builtin/pull.c:174
msgid "fetch from all remotes"
msgstr "모든 리모트ì—ì„œ 가져옵니다"
-#: builtin/fetch.c:94 builtin/pull.c:177
+#: builtin/fetch.c:95 builtin/pull.c:177
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "ë®ì–´ì“°ì§€ ë§ê³  .git/FETCH_HEADì— ë§ë¶™ìž…니다"
-#: builtin/fetch.c:96 builtin/pull.c:180
+#: builtin/fetch.c:97 builtin/pull.c:180
msgid "path to upload pack on remote end"
msgstr "리모트 ìª½ì— ë¬¶ìŒì„ 업로드할 경로"
-#: builtin/fetch.c:97 builtin/pull.c:182
+#: builtin/fetch.c:98 builtin/pull.c:182
msgid "force overwrite of local branch"
msgstr "로컬 브랜치를 강제로 ë®ì–´ì”니다"
-#: builtin/fetch.c:99
+#: builtin/fetch.c:100
msgid "fetch from multiple remotes"
msgstr "여러 리모트ì—ì„œ 가져옵니다"
-#: builtin/fetch.c:101 builtin/pull.c:184
+#: builtin/fetch.c:102 builtin/pull.c:184
msgid "fetch all tags and associated objects"
msgstr "모든 태그와 관련 오브ì íŠ¸ë¥¼ 가져옵니다"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:104
msgid "do not fetch all tags (--no-tags)"
msgstr "모든 태그를 가져오지 않습니다 (--no-tags)"
-#: builtin/fetch.c:105
+#: builtin/fetch.c:106
msgid "number of submodules fetched in parallel"
msgstr "병렬ì ìœ¼ë¡œ 받아오는 하위모듈 개수"
-#: builtin/fetch.c:107 builtin/pull.c:187
+#: builtin/fetch.c:108 builtin/pull.c:187
msgid "prune remote-tracking branches no longer on remote"
msgstr "ë¦¬ëª¨íŠ¸ì— ì´ì œ 없는 리모트 ì¶”ì  ë¸Œëžœì¹˜ë¥¼ 잘ë¼ëƒ…니다"
-#: builtin/fetch.c:108 builtin/pull.c:190
+#: builtin/fetch.c:109 builtin/pull.c:190
msgid "on-demand"
msgstr "주문형"
-#: builtin/fetch.c:109 builtin/pull.c:191
+#: builtin/fetch.c:110 builtin/pull.c:191
msgid "control recursive fetching of submodules"
msgstr "하위 모듈 재귀ì ìœ¼ë¡œ 가져오기 ë°©ì‹ì„ 설정합니다"
-#: builtin/fetch.c:113 builtin/pull.c:199
+#: builtin/fetch.c:114 builtin/pull.c:199
msgid "keep downloaded pack"
msgstr "다운로드한 묶ìŒì„ 보존합니다"
-#: builtin/fetch.c:115
+#: builtin/fetch.c:116
msgid "allow updating of HEAD ref"
msgstr "HEAD ë ˆí¼ëŸ°ìŠ¤ ì—…ë°ì´íŠ¸ë¥¼ 허용합니다"
-#: builtin/fetch.c:118 builtin/pull.c:202
+#: builtin/fetch.c:119 builtin/pull.c:202
msgid "deepen history of shallow clone"
msgstr "ì–•ì€ ë³µì œì˜ ì»¤ë°‹ ë‚´ì—­ì„ ê¹Šê²Œ 만듭니다"
-#: builtin/fetch.c:120 builtin/pull.c:205
+#: builtin/fetch.c:121 builtin/pull.c:205
msgid "convert to a complete repository"
msgstr "완전한 저장소로 전환합니다"
-#: builtin/fetch.c:122 builtin/log.c:1399
+#: builtin/fetch.c:123 builtin/log.c:1426
msgid "dir"
msgstr "디렉터리"
-#: builtin/fetch.c:123
+#: builtin/fetch.c:124
msgid "prepend this to submodule path output"
msgstr "하위 모듈 경로 ì¶œë ¥ì˜ ì•žì— ì´ ë””ë ‰í„°ë¦¬ë¥¼ 붙입니다"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:127
msgid "default mode for recursion"
msgstr "재귀 기본 모드"
-#: builtin/fetch.c:128 builtin/pull.c:208
+#: builtin/fetch.c:129 builtin/pull.c:208
msgid "accept refs that update .git/shallow"
msgstr ".git/shallow를 ì—…ë°ì´íŠ¸í•˜ëŠ” ë ˆí¼ëŸ°ìŠ¤ë¥¼ 허용합니다"
-#: builtin/fetch.c:129 builtin/pull.c:210
+#: builtin/fetch.c:130 builtin/pull.c:210
msgid "refmap"
msgstr "ë ˆí¼ëŸ°ìŠ¤ë§µ"
-#: builtin/fetch.c:130 builtin/pull.c:211
+#: builtin/fetch.c:131 builtin/pull.c:211
msgid "specify fetch refmap"
msgstr "ë ˆí¼ëŸ°ìŠ¤ë§µ 가져오기를 지정합니다"
-#: builtin/fetch.c:386
+#: builtin/fetch.c:387
msgid "Couldn't find remote ref HEAD"
msgstr "리모트 ë ˆí¼ëŸ°ìŠ¤ HEAD를 ì°¾ì„ ìˆ˜ 없습니다"
-#: builtin/fetch.c:466
+#: builtin/fetch.c:503
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "fetch.output ì„¤ì •ì— ìž˜ëª»ëœ ê°’ì´ ìžˆìŠµë‹ˆë‹¤: %s"
+
+#: builtin/fetch.c:592
#, c-format
msgid "object %s not found"
msgstr "%s 오브ì íŠ¸ê°€ 없습니다"
-#: builtin/fetch.c:471
+#: builtin/fetch.c:596
msgid "[up to date]"
msgstr "[최신 ìƒíƒœ]"
-#: builtin/fetch.c:485
-#, c-format
-msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
-msgstr "! %-*s %-*s -> %s (현재 브랜치ì—ì„œ 가져올 수 ì—†ìŒ)"
-
-#: builtin/fetch.c:486 builtin/fetch.c:574
+#: builtin/fetch.c:609 builtin/fetch.c:689
msgid "[rejected]"
msgstr "[거부ë¨]"
-#: builtin/fetch.c:497
+#: builtin/fetch.c:610
+msgid "can't fetch in current branch"
+msgstr "현재 브랜치ì—ì„œ 가져올 수 ì—†ìŒ"
+
+#: builtin/fetch.c:619
msgid "[tag update]"
msgstr "[태그 ì—…ë°ì´íŠ¸]"
-#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
-msgid " (unable to update local ref)"
-msgstr " (로컬 ë ˆí¼ëŸ°ìŠ¤ë¥¼ ì—…ë°ì´íŠ¸í•  수 ì—†ìŒ)"
+#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
+#: builtin/fetch.c:684
+msgid "unable to update local ref"
+msgstr "로컬 ë ˆí¼ëŸ°ìŠ¤ë¥¼ ì—…ë°ì´íŠ¸í•  수 없습니다"
-#: builtin/fetch.c:517
+#: builtin/fetch.c:639
msgid "[new tag]"
msgstr "[새로운 태그]"
-#: builtin/fetch.c:520
+#: builtin/fetch.c:642
msgid "[new branch]"
msgstr "[새로운 브랜치]"
-#: builtin/fetch.c:523
+#: builtin/fetch.c:645
msgid "[new ref]"
msgstr "[새로운 ë ˆí¼ëŸ°ìŠ¤]"
-#: builtin/fetch.c:569
-msgid "unable to update local ref"
-msgstr "로컬 ë ˆí¼ëŸ°ìŠ¤ë¥¼ ì—…ë°ì´íŠ¸í•  수 없습니다"
-
-#: builtin/fetch.c:569
+#: builtin/fetch.c:684
msgid "forced update"
msgstr "ê°•ì œ ì—…ë°ì´íŠ¸"
-#: builtin/fetch.c:576
-msgid "(non-fast-forward)"
-msgstr "(ì •ë°©í–¥ ì§„í–‰ì´ ì•„ë‹˜)"
+#: builtin/fetch.c:689
+msgid "non-fast-forward"
+msgstr "ì •ë°©í–¥ ì§„í–‰ì´ ì•„ë‹˜"
-#: builtin/fetch.c:619
+#: builtin/fetch.c:733
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%sì´(ê°€) 모든 필요한 오브ì íŠ¸ë¥¼ 보내지 않았습니다\n"
-#: builtin/fetch.c:637
+#: builtin/fetch.c:753
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "ì–•ì€ ìµœìƒìœ„ì˜ ì—…ë°ì´íŠ¸ê°€ 허용ë˜ì§€ 않으므로 %sì„(를) 거부합니다"
-#: builtin/fetch.c:724 builtin/fetch.c:816
+#: builtin/fetch.c:839 builtin/fetch.c:934
#, c-format
msgid "From %.*s\n"
msgstr "%.*s URLì—ì„œ\n"
-#: builtin/fetch.c:735
+#: builtin/fetch.c:850
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -6408,55 +6812,55 @@ msgstr ""
"ì—…ë°ì´íŠ¸í•  수 없는 로컬 ë ˆí¼ëŸ°ìŠ¤ê°€ 있습니다. 과거 ì¶©ëŒ ë¸Œëžœì¹˜ë¥¼\n"
" 제거하려면 'git remote prune %s' ëª…ë ¹ì„ ì‹¤í–‰í•´ 보십시오"
-#: builtin/fetch.c:787
+#: builtin/fetch.c:904
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s ë ˆí¼ëŸ°ìŠ¤ê°€ ì—°ê²°ì´ ëŠì–´ì§€ê²Œ ë©ë‹ˆë‹¤)"
-#: builtin/fetch.c:788
+#: builtin/fetch.c:905
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s ë ˆí¼ëŸ°ìŠ¤ê°€ ì—°ê²°ì´ ëŠì–´ì¡ŒìŠµë‹ˆë‹¤)"
-#: builtin/fetch.c:820
+#: builtin/fetch.c:937
msgid "[deleted]"
msgstr "[ì‚­ì œë¨]"
-#: builtin/fetch.c:821 builtin/remote.c:1025
+#: builtin/fetch.c:938 builtin/remote.c:1020
msgid "(none)"
msgstr "(ì—†ìŒ)"
-#: builtin/fetch.c:841
+#: builtin/fetch.c:960
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "간략한 저장소가 ì•„ë‹Œ ì €ìž¥ì†Œì˜ í˜„ìž¬ %s 브랜치로 가져오기를 거절합니다"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:979
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "\"%s\" ì˜µì…˜ì˜ \"%s\" ê°’ì€ %sì— ëŒ€í•´ 올바르지 않습니다"
-#: builtin/fetch.c:863
+#: builtin/fetch.c:982
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "\"%s\" ì˜µì…˜ì€ '%s'ì— ëŒ€í•´ 무시ë©ë‹ˆë‹¤\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1039
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "'%s'ì—ì„œ 가져오는 ë°©ë²•ì„ ì•Œ 수 없습니다"
-#: builtin/fetch.c:1080
+#: builtin/fetch.c:1199
#, c-format
msgid "Fetching %s\n"
msgstr "%sì„(를) 가져오는 중\n"
-#: builtin/fetch.c:1082 builtin/remote.c:96
+#: builtin/fetch.c:1201 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "%sì„(를) 가져올 수 없습니다"
-#: builtin/fetch.c:1100
+#: builtin/fetch.c:1219
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -6464,33 +6868,33 @@ msgstr ""
"리모트 저장소를 지정하지 않았습니다. 새 ë¦¬ë¹„ì „ì„ ê°€ì ¸ì˜¬ 수 있는\n"
"URLì´ë‚˜ 리모트 ì´ë¦„ì„ ì§€ì •í•˜ì‹­ì‹œì˜¤."
-#: builtin/fetch.c:1123
+#: builtin/fetch.c:1242
msgid "You need to specify a tag name."
msgstr "태그 ì´ë¦„ì„ ì§€ì •í•´ì•¼ 합니다."
-#: builtin/fetch.c:1165
+#: builtin/fetch.c:1284
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth ë° --unshallow ì˜µì…˜ì€ ê°™ì´ ì“¸ 수 없습니다"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1286
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
"완전한 ì €ìž¥ì†Œì— ëŒ€í•´ --unshallow ì˜µì…˜ì„ ì‚¬ìš©í•˜ëŠ” ê±´ 앞뒤가 맞지 않습니다"
-#: builtin/fetch.c:1187
+#: builtin/fetch.c:1306
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all ëª…ë ¹ì— ì €ìž¥ì†Œ ì¸ìžê°€ 없습니다"
-#: builtin/fetch.c:1189
+#: builtin/fetch.c:1308
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all ëª…ë ¹ì€ ë ˆí¼ëŸ°ìŠ¤ëª…세 ì¸ìžì™€ ê°™ì´ ì“°ë©´ 앞뒤가 맞지 않습니다"
-#: builtin/fetch.c:1200
+#: builtin/fetch.c:1319
#, c-format
msgid "No such remote or remote group: %s"
msgstr "그런 리모트나 리모트 ê·¸ë£¹ì´ ì—†ìŠµë‹ˆë‹¤: %s"
-#: builtin/fetch.c:1208
+#: builtin/fetch.c:1327
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "ê·¸ë£¹ì„ ê°€ì ¸ì˜¤ê³  ë ˆí¼ëŸ°ìŠ¤ëª…세를 지정하면 앞뒤가 맞지 않습니다"
@@ -6574,65 +6978,65 @@ msgstr "병합하지 않는 ë ˆí¼ëŸ°ìŠ¤ë§Œ 표시합니다"
#: builtin/for-each-ref.c:45
msgid "print only refs which contain the commit"
-msgstr "ì»¤ë°‹ì´ í¬í•¨ëœ ë ˆí¼ëŸ°ìŠ¤ë§Œ 표시합니다"
-
-#: builtin/fsck.c:156 builtin/prune.c:140
-msgid "Checking connectivity"
-msgstr "ì—°ê²°ì„ í™•ì¸í•˜ëŠ” 중입니다"
+msgstr "ì»¤ë°‹ì´ ë“¤ì–´ 있는 ë ˆí¼ëŸ°ìŠ¤ë§Œ 표시합니다"
-#: builtin/fsck.c:486
+#: builtin/fsck.c:519
msgid "Checking object directories"
msgstr "오브ì íŠ¸ 디렉터리를 확ì¸í•˜ëŠ” 중입니다"
-#: builtin/fsck.c:552
+#: builtin/fsck.c:588
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<옵션>] [<오브ì íŠ¸>...]"
-#: builtin/fsck.c:558
+#: builtin/fsck.c:594
msgid "show unreachable objects"
-msgstr "ì ê·¼í•  수 없는 오브ì íŠ¸ë¥¼ 표시합니다"
+msgstr "접근할 수 없는 오브ì íŠ¸ë¥¼ 표시합니다"
-#: builtin/fsck.c:559
+#: builtin/fsck.c:595
msgid "show dangling objects"
msgstr "ì—°ê²°ì´ ëŠì–´ì§„ 오브ì íŠ¸ë¥¼ 표시합니다"
-#: builtin/fsck.c:560
+#: builtin/fsck.c:596
msgid "report tags"
msgstr "태그를 알립니다"
-#: builtin/fsck.c:561
+#: builtin/fsck.c:597
msgid "report root nodes"
msgstr "최ìƒìœ„ 노드를 알립니다"
-#: builtin/fsck.c:562
+#: builtin/fsck.c:598
msgid "make index objects head nodes"
msgstr "ì¸ë±ìŠ¤ 오브ì íŠ¸ 헤드 노드를 만듭니다"
-#: builtin/fsck.c:563
+#: builtin/fsck.c:599
msgid "make reflogs head nodes (default)"
msgstr "reflog 헤드 노드를 만듭니다 (기본값)"
-#: builtin/fsck.c:564
+#: builtin/fsck.c:600
msgid "also consider packs and alternate objects"
msgstr "묶ìŒê³¼ ë³´ì¡° 오브ì íŠ¸ë„ 만듭니다"
-#: builtin/fsck.c:565
+#: builtin/fsck.c:601
msgid "check only connectivity"
msgstr "연결만 확ì¸í•©ë‹ˆë‹¤"
-#: builtin/fsck.c:566
+#: builtin/fsck.c:602
msgid "enable more strict checking"
msgstr "ë” ì—„ê²©í•˜ê²Œ 확ì¸í•©ë‹ˆë‹¤"
-#: builtin/fsck.c:568
+#: builtin/fsck.c:604
msgid "write dangling objects in .git/lost-found"
msgstr ".git/lost-found ì•ˆì— ì—°ê²°ì´ ëŠì–´ì§„ 오브ì íŠ¸ë¥¼ ì”니다"
-#: builtin/fsck.c:569 builtin/prune.c:107
+#: builtin/fsck.c:605 builtin/prune.c:107
msgid "show progress"
msgstr "진행 ìƒí™©ì„ 표시합니다"
-#: builtin/fsck.c:630
+#: builtin/fsck.c:606
+msgid "show verbose names for reachable objects"
+msgstr "접근할 수 없는 오브ì íŠ¸ì˜ ì´ë¦„ì„ ìžì„¸ížˆ 표시합니다"
+
+#: builtin/fsck.c:671
msgid "Checking objects"
msgstr "오브ì íŠ¸ë¥¼ 확ì¸í•©ë‹ˆë‹¤"
@@ -6920,7 +7324,7 @@ msgstr "grep(1) ì‹¤í–‰ì„ í—ˆìš©í•©ë‹ˆë‹¤ (ì´ ë¹Œë“œì—서는 무시)"
msgid "no pattern given."
msgstr "íŒ¨í„´ì„ ì§€ì •í•˜ì§€ 않았습니다."
-#: builtin/grep.c:845 builtin/index-pack.c:1477
+#: builtin/grep.c:845 builtin/index-pack.c:1479
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "ìž˜ëª»ëœ ìŠ¤ë ˆë“œ 수를 지정했습니다 (%d)"
@@ -7111,282 +7515,278 @@ msgstr "사용법: %s%s"
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s' ëª…ë ¹ì€ `%s' ëª…ë ¹ì˜ ë‹¨ì¶•ìž…ë‹ˆë‹¤"
-#: builtin/index-pack.c:152
+#: builtin/index-pack.c:153
#, c-format
msgid "unable to open %s"
msgstr "%sì„(를) ì—´ 수 없습니다"
-#: builtin/index-pack.c:202
+#: builtin/index-pack.c:203
#, c-format
msgid "object type mismatch at %s"
msgstr "오브ì íŠ¸ 종류가 맞지 않습니다 (%s)"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:223
#, c-format
msgid "did not receive expected object %s"
msgstr "예ìƒí•œ %s 오브ì íŠ¸ë¥¼ 받지 않았습니다"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "%s 오브ì íŠ¸: 예ìƒí•œ 종류 %s, 실제 %s"
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:268
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "%d ë°”ì´íŠ¸ë¥¼ 채울 수 없습니다"
-#: builtin/index-pack.c:277
+#: builtin/index-pack.c:278
msgid "early EOF"
msgstr "너무 빨리 파ì¼ì´ ë남"
-#: builtin/index-pack.c:278
+#: builtin/index-pack.c:279
msgid "read error on input"
msgstr "ìž…ë ¥ì— ì½ê¸° 오류"
-#: builtin/index-pack.c:290
+#: builtin/index-pack.c:291
msgid "used more bytes than were available"
msgstr "있는 ë°”ì´íŠ¸ë³´ë‹¤ ë” ë§Žì´ ì‚¬ìš©í•©ë‹ˆë‹¤"
-#: builtin/index-pack.c:297
+#: builtin/index-pack.c:298
msgid "pack too large for current definition of off_t"
msgstr "현재 ì •ì˜ëœ off_tì— ë¹„í•´ 묶ìŒì´ 너무 í½ë‹ˆë‹¤"
-#: builtin/index-pack.c:313
+#: builtin/index-pack.c:314
#, c-format
msgid "unable to create '%s'"
msgstr "'%s'ì„(를) 만들 수 없습니다"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "cannot open packfile '%s'"
msgstr "'%s' ë¬¶ìŒ íŒŒì¼ì„ ì—´ 수 없습니다"
-#: builtin/index-pack.c:332
+#: builtin/index-pack.c:333
msgid "pack signature mismatch"
msgstr "ë¬¶ìŒ ì„œëª…ì´ ë§žì§€ 않습니다"
-#: builtin/index-pack.c:334
+#: builtin/index-pack.c:335
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "묶ìŒì˜ %<PRIu32> ë²„ì „ì„ ì§€ì›í•˜ì§€ 않습니다"
-#: builtin/index-pack.c:352
+#: builtin/index-pack.c:353
#, c-format
-msgid "pack has bad object at offset %lu: %s"
-msgstr "묶ìŒì˜ %lu ì˜¤í”„ì…‹ì— ìž˜ëª»ëœ ì˜¤ë¸Œì íŠ¸ê°€ 있습니다: %s"
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "묶ìŒì˜ %<PRIuMAX> ì˜¤í”„ì…‹ì— ìž˜ëª»ëœ ì˜¤ë¸Œì íŠ¸ê°€ 있습니다: %s"
-#: builtin/index-pack.c:473
+#: builtin/index-pack.c:475
#, c-format
msgid "inflate returned %d"
msgstr "inflateê°€ %dë²ˆì„ ë¦¬í„´í–ˆìŠµë‹ˆë‹¤"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:524
msgid "offset value overflow for delta base object"
msgstr "ë¸íƒ€ ë² ì´ìŠ¤ 오브ì íŠ¸ì— 대해 오프셋 ê°’ì´ ì˜¤ë²„í”Œë¡œìš°"
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:532
msgid "delta base offset is out of bound"
msgstr "ë¸íƒ€ ë² ì´ìŠ¤ ì˜¤í”„ì…‹ì´ ë²”ìœ„ë¥¼ 벗어났습니다"
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:540
#, c-format
msgid "unknown object type %d"
msgstr "ì•Œ 수 없는 오브ì íŠ¸ 종류 %d번"
-#: builtin/index-pack.c:569
+#: builtin/index-pack.c:571
msgid "cannot pread pack file"
msgstr "ë¬¶ìŒ íŒŒì¼ì— 대해 pread를 í•  수 없습니다"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:573
#, c-format
-msgid "premature end of pack file, %lu byte missing"
-msgid_plural "premature end of pack file, %lu bytes missing"
-msgstr[0] "ë¬¶ìŒ íŒŒì¼ì´ 너무 ì¼ì° ë남. %lu ë°”ì´íŠ¸ 부족"
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+msgstr[0] "ë¬¶ìŒ íŒŒì¼ì´ 너무 ì¼ì° ë남. %<PRIuMAX> ë°”ì´íŠ¸ 부족"
-#: builtin/index-pack.c:597
+#: builtin/index-pack.c:599
msgid "serious inflate inconsistency"
msgstr "심ê°í•œ inflate 부조화"
-#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
-#: builtin/index-pack.c:806 builtin/index-pack.c:815
+#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
+#: builtin/index-pack.c:808 builtin/index-pack.c:817
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1 충ëŒì´ %sì—ì„œ 발견ë˜ì—ˆìŠµë‹ˆë‹¤!"
-#: builtin/index-pack.c:746 builtin/pack-objects.c:162
-#: builtin/pack-objects.c:254
+#: builtin/index-pack.c:748 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:256
#, c-format
msgid "unable to read %s"
msgstr "%sì„(를) ì½ì„ 수 없습니다"
-#: builtin/index-pack.c:812
+#: builtin/index-pack.c:814
#, c-format
msgid "cannot read existing object %s"
msgstr "기존 %s 오브ì íŠ¸ë¥¼ ì½ì„ 수 없습니다"
-#: builtin/index-pack.c:826
+#: builtin/index-pack.c:828
#, c-format
msgid "invalid blob object %s"
msgstr "ìž˜ëª»ëœ ë¸”ë¡­ 오브ì íŠ¸ %s"
-#: builtin/index-pack.c:840
+#: builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr "ìž˜ëª»ëœ %s"
-#: builtin/index-pack.c:843
+#: builtin/index-pack.c:845
msgid "Error in object"
msgstr "오브ì íŠ¸ì— 오류"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%sì˜ ëª¨ë“  하위 오브ì íŠ¸ì— 접근할 수 없습니다"
-#: builtin/index-pack.c:917 builtin/index-pack.c:948
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "ë¸íƒ€ë¥¼ ì ìš©í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1120
msgid "Receiving objects"
msgstr "오브ì íŠ¸ë¥¼ 받는 중"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1120
msgid "Indexing objects"
msgstr "오브ì íŠ¸ ì¸ë±ìŠ¤ë¥¼ 만드는 중"
-#: builtin/index-pack.c:1150
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "묶ìŒì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤ (SHA1 ì¼ì¹˜í•˜ì§€ ì•ŠìŒ)"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "ë¬¶ìŒ íŒŒì¼ì— 대해 fstat()í•  수 없습니다"
-#: builtin/index-pack.c:1158
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "묶ìŒì˜ ëì— ì“°ë ˆê¸° ë°ì´í„°ê°€ 있습니다"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1171
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects()ì—ì„œ 극심한 혼란"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1196
msgid "Resolving deltas"
msgstr "ë¸íƒ€ë¥¼ 알아내는 중"
-#: builtin/index-pack.c:1205
+#: builtin/index-pack.c:1207
#, c-format
msgid "unable to create thread: %s"
msgstr "스레드를 만들 수 없습니다: %s"
-#: builtin/index-pack.c:1247
+#: builtin/index-pack.c:1249
msgid "confusion beyond insanity"
msgstr "극심한 혼란"
-#: builtin/index-pack.c:1253
+#: builtin/index-pack.c:1255
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "로컬 오브ì íŠ¸ %dê°œ 마침"
-#: builtin/index-pack.c:1265
+#: builtin/index-pack.c:1267
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "%sì— ëŒ€í•´ 예ìƒì¹˜ 못한 í…Œì¼ ì²´í¬ì„¬ (ë””ìŠ¤í¬ ì†ìƒ?)"
-#: builtin/index-pack.c:1269
+#: builtin/index-pack.c:1271
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "묶ìŒì— 알아내지 못한 ë¸íƒ€ %d개가 있습니다"
-#: builtin/index-pack.c:1293
+#: builtin/index-pack.c:1295
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "추가한 오브ì íŠ¸ë¥¼ deflateí•  수 없습니다 (%d)"
-#: builtin/index-pack.c:1369
+#: builtin/index-pack.c:1371
#, c-format
msgid "local object %s is corrupt"
msgstr "%s 로컬 오브ì íŠ¸ê°€ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/index-pack.c:1393
+#: builtin/index-pack.c:1395
msgid "error while closing pack file"
msgstr "ë¬¶ìŒ íŒŒì¼ì„ ë‹«ëŠ”ë° ì˜¤ë¥˜"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1408
#, c-format
msgid "cannot write keep file '%s'"
msgstr "'%s' ë³´ì¡´ 파ì¼ì„ 쓸 수 없습니다"
-#: builtin/index-pack.c:1414
+#: builtin/index-pack.c:1416
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "ì“´ '%s' ë³´ì¡´ 파ì¼ì„ 닫지 못했습니다"
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1429
msgid "cannot store pack file"
msgstr "ë¬¶ìŒ íŒŒì¼ì„ 저장할 수 없습니다"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1440
msgid "cannot store index file"
msgstr "ì¸ë±ìŠ¤ 파ì¼ì„ 저장할 수 없습니다"
-#: builtin/index-pack.c:1471
+#: builtin/index-pack.c:1473
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "ìž˜ëª»ëœ pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
+#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr "스레드 ê¸°ëŠ¥ì´ ì—†ìŠµë‹ˆë‹¤. %s 무시"
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "기존 '%s' ë¬¶ìŒ íŒŒì¼ì„ ì—´ 수 없습니다"
-#: builtin/index-pack.c:1542
+#: builtin/index-pack.c:1544
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "'%s'ì— ëŒ€í•œ 기존 ë¬¶ìŒ idx 파ì¼ì„ ì—´ 수 없습니다"
-#: builtin/index-pack.c:1589
+#: builtin/index-pack.c:1591
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "ë¸íƒ€ 아님: 오브ì íŠ¸ %dê°œ"
-#: builtin/index-pack.c:1596
+#: builtin/index-pack.c:1598
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "ì²´ì¸ ê¸¸ì´ = %d: 오브ì íŠ¸ %luê°œ"
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1611
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "'%s' 묶ìŒíŒŒì¼ ì´ë¦„ì´ '.pack'으로 ë나지 않습니다"
-#: builtin/index-pack.c:1638
-msgid "Cannot come back to cwd"
-msgstr "현재 디렉터리로 ëŒì•„올 수 없습니다"
-
-#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
-#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
+#: builtin/index-pack.c:1693 builtin/index-pack.c:1696
+#: builtin/index-pack.c:1712 builtin/index-pack.c:1716
#, c-format
msgid "bad %s"
msgstr "ìž˜ëª»ëœ %s"
-#: builtin/index-pack.c:1723
+#: builtin/index-pack.c:1730
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin ì˜µì…˜ì€ --stdin 옵션과 ê°™ì´ ì“¸ 수 없습니다"
-#: builtin/index-pack.c:1731
+#: builtin/index-pack.c:1738
msgid "--verify with no packfile name given"
msgstr "--verify ì˜µì…˜ì— ë¬¶ìŒíŒŒì¼ ì´ë¦„ì„ ì§€ì •í•˜ì§€ 않았습니다"
@@ -7450,27 +7850,27 @@ msgstr "íŒŒì¼ ì¢…ë¥˜ %dë²ˆì„ ì²˜ë¦¬í•  수 없습니다"
msgid "unable to move %s to %s"
msgstr "%sì„(를) %s(으)ë¡œ 옮길 수 없습니다"
-#. TRANSLATORS: The first '%s' is either "Reinitialized
-#. existing" or "Initialized empty", the second " shared" or
-#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:403
+#: builtin/init-db.c:402
#, c-format
-msgid "%s%s Git repository in %s%s\n"
-msgstr "%s%s 깃 저장소, 위치 %s%s\n"
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "%s%s ì•ˆì˜ ê¸°ì¡´ 공유 깃 저장소를 다시 초기화했습니다\n"
-#: builtin/init-db.c:404
-msgid "Reinitialized existing"
-msgstr "다시 초기화: 기존"
+#: builtin/init-db.c:403
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "%s%s ì•ˆì˜ ê¸°ì¡´ 깃 저장소를 다시 초기화했습니다\n"
-#: builtin/init-db.c:404
-msgid "Initialized empty"
-msgstr "초기화: 빈"
+#: builtin/init-db.c:407
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "%s%s ì•ˆì˜ ë¹ˆ 공유 깃 저장소를 다시 초기화했습니다\n"
-#: builtin/init-db.c:405
-msgid " shared"
-msgstr " 공유"
+#: builtin/init-db.c:408
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "%s%s ì•ˆì˜ ë¹ˆ 깃 저장소를 다시 초기화했습니다\n"
-#: builtin/init-db.c:452
+#: builtin/init-db.c:455
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7478,25 +7878,25 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<ì„œì‹-디렉터리>] [--shared[=<권"
"한>]] [<디렉터리>]"
-#: builtin/init-db.c:475
+#: builtin/init-db.c:478
msgid "permissions"
msgstr "권한"
-#: builtin/init-db.c:476
+#: builtin/init-db.c:479
msgid "specify that the git repository is to be shared amongst several users"
msgstr "깃 저장소를 다른 사용ìžê°€ 공유할 수 있게 지정"
-#: builtin/init-db.c:510 builtin/init-db.c:515
+#: builtin/init-db.c:513 builtin/init-db.c:518
#, c-format
msgid "cannot mkdir %s"
msgstr "%sì— ëŒ€í•´ mkdir를 í•  수 없습니다"
-#: builtin/init-db.c:519
+#: builtin/init-db.c:522
#, c-format
msgid "cannot chdir to %s"
msgstr "%sì— ëŒ€í•´ chdir를 í•  수 없습니다"
-#: builtin/init-db.c:540
+#: builtin/init-db.c:543
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7505,7 +7905,7 @@ msgstr ""
"%s (ë˜ëŠ” --work-tree=<디렉터리>) 허용ë˜ì§€ ì•ŠìŒ. %s (ë˜ëŠ” --git-"
"dir=<directory>) ì§€ì •ì´ ì—†ìœ¼ë©´"
-#: builtin/init-db.c:568
+#: builtin/init-db.c:571
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "ìž‘ì—… í´ë” '%s'ì— ì ‘ê·¼í•  수 없습니다"
@@ -7538,115 +7938,115 @@ msgstr "추가할 트레ì¼ëŸ¬"
msgid "no input file given for in-place editing"
msgstr "íŒŒì¼ ì§ì ‘ íŽ¸ì§‘ì— ìž…ë ¥ 파ì¼ì„ 지정하지 않았습니다"
-#: builtin/log.c:43
+#: builtin/log.c:44
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<옵션>] [<리비전-범위>] [[--] <경로>...]"
-#: builtin/log.c:44
+#: builtin/log.c:45
msgid "git show [<options>] <object>..."
msgstr "git show [<옵션>] <오브ì íŠ¸>..."
-#: builtin/log.c:83
+#: builtin/log.c:84
#, c-format
msgid "invalid --decorate option: %s"
msgstr "ìž˜ëª»ëœ --decorate 옵션: %s"
-#: builtin/log.c:137
+#: builtin/log.c:139
msgid "suppress diff output"
msgstr "diff를 출력하지 않습니다"
-#: builtin/log.c:138
+#: builtin/log.c:140
msgid "show source"
msgstr "소스를 표시합니다"
-#: builtin/log.c:139
+#: builtin/log.c:141
msgid "Use mail map file"
msgstr "ë©”ì¼ ë§µ 파ì¼ì„ 사용합니다"
-#: builtin/log.c:140
+#: builtin/log.c:142
msgid "decorate options"
msgstr "꾸미기 옵션"
-#: builtin/log.c:143
+#: builtin/log.c:145
msgid "Process line range n,m in file, counting from 1"
msgstr "파ì¼ì—ì„œ n,m ë²”ìœ„ì˜ ì¤„ì„ ì²˜ë¦¬í•©ë‹ˆë‹¤ (1부터 시작)"
-#: builtin/log.c:239
+#: builtin/log.c:241
#, c-format
msgid "Final output: %d %s\n"
msgstr "최종 출력: %d %s\n"
-#: builtin/log.c:471
+#: builtin/log.c:486
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: ìž˜ëª»ëœ íŒŒì¼"
-#: builtin/log.c:485 builtin/log.c:578
+#: builtin/log.c:500 builtin/log.c:594
#, c-format
msgid "Could not read object %s"
msgstr "%s 오브ì íŠ¸ë¥¼ ì½ì„ 수 없습니다"
-#: builtin/log.c:602
+#: builtin/log.c:618
#, c-format
msgid "Unknown type: %d"
msgstr "알 수 없는 종류: %d"
-#: builtin/log.c:722
+#: builtin/log.c:739
msgid "format.headers without value"
msgstr "format.headers ì„¤ì •ì— ê°’ì´ ì—†ìŒ"
-#: builtin/log.c:812
+#: builtin/log.c:839
msgid "name of output directory is too long"
msgstr "출력 ë””ë ‰í„°ë¦¬ì˜ ì´ë¦„ì´ ë„ˆë¬´ ê¹ë‹ˆë‹¤"
-#: builtin/log.c:827
+#: builtin/log.c:854
#, c-format
msgid "Cannot open patch file %s"
msgstr "%s 패치 파ì¼ì„ ì—´ 수 없습니다"
-#: builtin/log.c:841
+#: builtin/log.c:868
msgid "Need exactly one range."
msgstr "정확히 í•˜ë‚˜ì˜ ë²”ìœ„ê°€ 필요합니다."
-#: builtin/log.c:851
+#: builtin/log.c:878
msgid "Not a range."
msgstr "범위가 아닙니다."
-#: builtin/log.c:957
+#: builtin/log.c:984
msgid "Cover letter needs email format"
msgstr "커버레터는 ì „ìžë©”ì¼ í˜•ì‹ì´ì–´ì•¼ 합니다"
-#: builtin/log.c:1036
+#: builtin/log.c:1064
#, c-format
msgid "insane in-reply-to: %s"
msgstr "정신나간 in-reply-to í—¤ë”: %s"
-#: builtin/log.c:1064
+#: builtin/log.c:1092
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<옵션>] [<시작시ê°> | <리비전-범위>]"
-#: builtin/log.c:1109
+#: builtin/log.c:1137
msgid "Two output directories?"
msgstr "출력 디렉터리가 ë‘ê°œ?"
-#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
#, c-format
msgid "Unknown commit %s"
msgstr "알 수 없는 커밋 %s"
-#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
-#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
-#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
-#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
+#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
+#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
+#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "'%s'ì„(를) 올바른 ë ˆí¼ëŸ°ìŠ¤ë¡œ ì•Œì•„ë‚´ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
-#: builtin/log.c:1231
+#: builtin/log.c:1259
msgid "Could not find exact merge base."
msgstr "정확한 병합 기준ì ì„ ì°¾ì„ ìˆ˜ 없습니다."
-#: builtin/log.c:1235
+#: builtin/log.c:1263
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -7657,209 +8057,209 @@ msgstr ""
"아니면 ì§ì ‘ '--base=<기준ì -커밋-ID>' 옵션으로 ê¸°ì¤€ì  ì»¤ë°‹ì„ ì§€ì •í• \n"
"ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤."
-#: builtin/log.c:1255
+#: builtin/log.c:1283
msgid "Failed to find exact merge base"
msgstr "정확한 병합 기준ì ì„ ì°¾ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/log.c:1266
+#: builtin/log.c:1294
msgid "base commit should be the ancestor of revision list"
msgstr "ê¸°ì¤€ì  ì»¤ë°‹ì€ ë¦¬ë¹„ì „ 목ë¡ì˜ ìƒìœ„ 커밋ì´ì–´ì•¼ 합니다"
-#: builtin/log.c:1270
+#: builtin/log.c:1298
msgid "base commit shouldn't be in revision list"
msgstr "ê¸°ì¤€ì  ì»¤ë°‹ì€ ë¦¬ë¹„ì „ 목ë¡ì— 들어 있으면 안 ë©ë‹ˆë‹¤"
-#: builtin/log.c:1319
+#: builtin/log.c:1347
msgid "cannot get patch id"
msgstr "패치 ID를 알아낼 수 없습니다"
-#: builtin/log.c:1377
+#: builtin/log.c:1404
msgid "use [PATCH n/m] even with a single patch"
msgstr "í•˜ë‚˜ì˜ íŒ¨ì¹˜ì— ëŒ€í•´ì„œë„ [PATCh n/m]ì„ ë¶™ìž…ë‹ˆë‹¤"
-#: builtin/log.c:1380
+#: builtin/log.c:1407
msgid "use [PATCH] even with multiple patches"
msgstr "여러 ê°œ íŒ¨ì¹˜ì— ëŒ€í•´ì„œë„ [PATCH]를 붙입니다"
-#: builtin/log.c:1384
+#: builtin/log.c:1411
msgid "print patches to standard out"
msgstr "패치를 표준 출력으로 표시합니다"
-#: builtin/log.c:1386
+#: builtin/log.c:1413
msgid "generate a cover letter"
msgstr "커버레터를 만듭니다"
-#: builtin/log.c:1388
+#: builtin/log.c:1415
msgid "use simple number sequence for output file names"
msgstr "출력 íŒŒì¼ ì´ë¦„ì— ê°„ë‹¨í•œ ì¼ë ¨ 번호를 사용합니다"
-#: builtin/log.c:1389
+#: builtin/log.c:1416
msgid "sfx"
msgstr "확장ìž"
-#: builtin/log.c:1390
+#: builtin/log.c:1417
msgid "use <sfx> instead of '.patch'"
msgstr "'.patch' 대신 <확장ìž>를 사용합니다"
-#: builtin/log.c:1392
+#: builtin/log.c:1419
msgid "start numbering patches at <n> instead of 1"
msgstr "패치 번호를 1 대신 <n>ì—ì„œ 시작합니다"
-#: builtin/log.c:1394
+#: builtin/log.c:1421
msgid "mark the series as Nth re-roll"
msgstr "시리즈를 N번째 re-roll로 표시합니다"
-#: builtin/log.c:1396
+#: builtin/log.c:1423
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "[PATCH] 대신 [<ì ‘ë‘ì–´>]를 사용합니다"
-#: builtin/log.c:1399
+#: builtin/log.c:1426
msgid "store resulting files in <dir>"
msgstr "ê²°ê³¼ 파ì¼ì„ <디렉터리>ì— ì €ìž¥í•©ë‹ˆë‹¤"
-#: builtin/log.c:1402
+#: builtin/log.c:1429
msgid "don't strip/add [PATCH]"
msgstr "[PATCH]를 ìžë¥´ê±°ë‚˜ 추가하지 않습니다"
-#: builtin/log.c:1405
+#: builtin/log.c:1432
msgid "don't output binary diffs"
msgstr "ë°”ì´ë„ˆë¦¬ diff를 만들지 않습니다"
-#: builtin/log.c:1407
+#: builtin/log.c:1434
msgid "output all-zero hash in From header"
msgstr "From í—¤ë”ì—ì„œ ëª¨ë‘ 0ì¸ í•´ì‹œë¥¼ 출력합니다"
-#: builtin/log.c:1409
+#: builtin/log.c:1436
msgid "don't include a patch matching a commit upstream"
msgstr "ì—…ìŠ¤íŠ¸ë¦¼ì— ìžˆëŠ” 패치를 í¬í•¨í•˜ì§€ 않습니다"
-#: builtin/log.c:1411
+#: builtin/log.c:1438
msgid "show patch format instead of default (patch + stat)"
msgstr "기본값 (패치 + 통계) 대신 패치 형ì‹ì„ 표시합니다"
-#: builtin/log.c:1413
+#: builtin/log.c:1440
msgid "Messaging"
msgstr "메시징"
-#: builtin/log.c:1414
+#: builtin/log.c:1441
msgid "header"
msgstr "í—¤ë”"
-#: builtin/log.c:1415
+#: builtin/log.c:1442
msgid "add email header"
msgstr "ì „ìžë©”ì¼ í—¤ë”"
-#: builtin/log.c:1416 builtin/log.c:1418
+#: builtin/log.c:1443 builtin/log.c:1445
msgid "email"
msgstr "ì „ìžë©”ì¼"
-#: builtin/log.c:1416
+#: builtin/log.c:1443
msgid "add To: header"
msgstr "To: í—¤ë”를 추가합니다"
-#: builtin/log.c:1418
+#: builtin/log.c:1445
msgid "add Cc: header"
msgstr "Cc: í—¤ë”를 추가합니다"
-#: builtin/log.c:1420
+#: builtin/log.c:1447
msgid "ident"
msgstr "ì‹ ì›"
-#: builtin/log.c:1421
+#: builtin/log.c:1448
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "<ì‹ ì›>ì—ì„œ From 주소를 설정합니다 (없으면 커미터 주소 ì‹ ì› ì‚¬ìš©)"
-#: builtin/log.c:1423
+#: builtin/log.c:1450
msgid "message-id"
msgstr "메시지-ID"
-#: builtin/log.c:1424
+#: builtin/log.c:1451
msgid "make first mail a reply to <message-id>"
msgstr "첫 ë©”ì¼ì„ <메시지-ID>ì— ëŒ€í•œ 답장 ë©”ì¼ë¡œ 만듭니다"
-#: builtin/log.c:1425 builtin/log.c:1428
+#: builtin/log.c:1452 builtin/log.c:1455
msgid "boundary"
msgstr "경계"
-#: builtin/log.c:1426
+#: builtin/log.c:1453
msgid "attach the patch"
msgstr "패치를 첨부합니다"
-#: builtin/log.c:1429
+#: builtin/log.c:1456
msgid "inline the patch"
msgstr "패치를 ë³¸ë¬¸ì— í¬í•¨í•©ë‹ˆë‹¤"
-#: builtin/log.c:1433
+#: builtin/log.c:1460
msgid "enable message threading, styles: shallow, deep"
msgstr "ë©”ì‹œì§€ì— ìŠ¤ë ˆë“œë¥¼ 사용, 스타ì¼: shallow, deep"
-#: builtin/log.c:1435
+#: builtin/log.c:1462
msgid "signature"
msgstr "서명"
-#: builtin/log.c:1436
+#: builtin/log.c:1463
msgid "add a signature"
msgstr "ì„œëª…ì„ ì¶”ê°€í•©ë‹ˆë‹¤"
-#: builtin/log.c:1437
+#: builtin/log.c:1464
msgid "base-commit"
msgstr "ë² ì´ìŠ¤-커밋"
-#: builtin/log.c:1438
+#: builtin/log.c:1465
msgid "add prerequisite tree info to the patch series"
msgstr "전제조건 트리 정보를 패치 ì‹œë¦¬ì¦ˆì— ì¶”ê°€í•©ë‹ˆë‹¤"
-#: builtin/log.c:1440
+#: builtin/log.c:1467
msgid "add a signature from a file"
msgstr "파ì¼ì—ì„œ ì„œëª…ì„ ì¶”ê°€í•©ë‹ˆë‹¤"
-#: builtin/log.c:1441
+#: builtin/log.c:1468
msgid "don't print the patch filenames"
msgstr "패치 íŒŒì¼ ì´ë¦„ì„ í‘œì‹œí•˜ì§€ 않습니다"
-#: builtin/log.c:1531
+#: builtin/log.c:1558
msgid "-n and -k are mutually exclusive."
msgstr "-n ë° -k ì˜µì…˜ì€ í•˜ë‚˜ë§Œ ì¨ì•¼ 합니다."
-#: builtin/log.c:1533
+#: builtin/log.c:1560
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix ë° -k ì˜µì…˜ì€ í•˜ë‚˜ë§Œ ì¨ì•¼ 합니다."
-#: builtin/log.c:1541
+#: builtin/log.c:1568
msgid "--name-only does not make sense"
msgstr "--name-only ì˜µì…˜ì€ ì•žë’¤ê°€ 맞지 않습니다"
-#: builtin/log.c:1543
+#: builtin/log.c:1570
msgid "--name-status does not make sense"
msgstr "--name-status ì˜µì…˜ì€ ì•žë’¤ê°€ 맞지 않습니다"
-#: builtin/log.c:1545
+#: builtin/log.c:1572
msgid "--check does not make sense"
msgstr "--check ì˜µì…˜ì€ ì•žë’¤ê°€ 맞지 않습니다"
-#: builtin/log.c:1573
+#: builtin/log.c:1602
msgid "standard output, or directory, which one?"
msgstr "표준 출력ì´ë‚˜ 디렉터리 ì¤‘ì— í•˜ë‚˜ë§Œ 지정해야 합니다."
-#: builtin/log.c:1575
+#: builtin/log.c:1604
#, c-format
msgid "Could not create directory '%s'"
msgstr "'%s' 디렉터리를 만들 수 없습니다"
-#: builtin/log.c:1672
+#: builtin/log.c:1698
#, c-format
msgid "unable to read signature file '%s'"
msgstr "'%s' 서명 파ì¼ì„ ì½ì„ 수 없습니다"
-#: builtin/log.c:1743
+#: builtin/log.c:1769
msgid "Failed to create output files"
msgstr "출력 파ì¼ì„ ë§Œë“œëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/log.c:1792
+#: builtin/log.c:1818
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<업스트림> [<헤드> [<한계값>]]]"
-#: builtin/log.c:1846
+#: builtin/log.c:1872
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7867,99 +8267,99 @@ msgstr ""
"추ì ë˜ëŠ” 리모트 브랜치를 ì°¾ì„ ìˆ˜ 없습니다. <업스트림>ì„ ìˆ˜ë™ìœ¼ë¡œ 지정하십시"
"오.\n"
-#: builtin/ls-files.c:378
+#: builtin/ls-files.c:379
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<옵션>] [<파ì¼>...]"
-#: builtin/ls-files.c:427
+#: builtin/ls-files.c:428
msgid "identify the file status with tags"
msgstr "íŒŒì¼ ìƒíƒœë¥¼ 태그와 ê°™ì´ í‘œì‹œí•©ë‹ˆë‹¤"
-#: builtin/ls-files.c:429
+#: builtin/ls-files.c:430
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "'변경ë˜ì§€ 않았다고 가정' 파ì¼ì— 소문ìžë¥¼ 사용합니다"
-#: builtin/ls-files.c:431
+#: builtin/ls-files.c:432
msgid "show cached files in the output (default)"
msgstr "ì¶œë ¥ì— ìºì‹œëœ 파ì¼ì„ 표시합니다 (기본값)"
-#: builtin/ls-files.c:433
+#: builtin/ls-files.c:434
msgid "show deleted files in the output"
msgstr "ì¶œë ¥ì— ì‚­ì œëœ íŒŒì¼ì„ 표시합니다"
-#: builtin/ls-files.c:435
+#: builtin/ls-files.c:436
msgid "show modified files in the output"
msgstr "ì¶œë ¥ì— ìˆ˜ì •ëœ íŒŒì¼ì„ 표시합니다"
-#: builtin/ls-files.c:437
+#: builtin/ls-files.c:438
msgid "show other files in the output"
msgstr "ì¶œë ¥ì— ê¸°íƒ€ 파ì¼ì„ 표시합니다"
-#: builtin/ls-files.c:439
+#: builtin/ls-files.c:440
msgid "show ignored files in the output"
msgstr "ì¶œë ¥ì— ë¬´ì‹œëœ íŒŒì¼ì„ 표시합니다"
-#: builtin/ls-files.c:442
+#: builtin/ls-files.c:443
msgid "show staged contents' object name in the output"
msgstr "ì¶œë ¥ì— ì»¤ë°‹ í‘œì‹œëœ ë‚´ìš©ì˜ ì˜¤ë¸Œì íŠ¸ ì´ë¦„ì„ í‘œì‹œí•©ë‹ˆë‹¤"
-#: builtin/ls-files.c:444
+#: builtin/ls-files.c:445
msgid "show files on the filesystem that need to be removed"
msgstr "íŒŒì¼ ì‹œìŠ¤í…œì—ì„œ 제거해야 하는 파ì¼ì„ 표시합니다"
-#: builtin/ls-files.c:446
+#: builtin/ls-files.c:447
msgid "show 'other' directories' names only"
msgstr "기타 ë””ë ‰í„°ë¦¬ì˜ ì´ë¦„만 표시합니다"
-#: builtin/ls-files.c:448
+#: builtin/ls-files.c:449
msgid "show line endings of files"
msgstr "파ì¼ì˜ 줄 ëì„ í‘œì‹œí•©ë‹ˆë‹¤"
-#: builtin/ls-files.c:450
+#: builtin/ls-files.c:451
msgid "don't show empty directories"
msgstr "빈 디렉터리 표시하지 않기"
-#: builtin/ls-files.c:453
+#: builtin/ls-files.c:454
msgid "show unmerged files in the output"
msgstr "ì¶œë ¥ì— ë³‘í•©í•˜ì§€ ì•Šì€ íŒŒì¼ì„ 표시합니다"
-#: builtin/ls-files.c:455
+#: builtin/ls-files.c:456
msgid "show resolve-undo information"
msgstr "resolve-undo 정보를 표시합니다"
-#: builtin/ls-files.c:457
+#: builtin/ls-files.c:458
msgid "skip files matching pattern"
msgstr "íŒ¨í„´ì— ì¼ì¹˜í•˜ëŠ” 파ì¼ì„ 건너ëœë‹ˆë‹¤"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:461
msgid "exclude patterns are read from <file>"
msgstr "제외할 íŒ¨í„´ì„ <파ì¼>ì—ì„œ ì½ìŠµë‹ˆë‹¤"
-#: builtin/ls-files.c:463
+#: builtin/ls-files.c:464
msgid "read additional per-directory exclude patterns in <file>"
-msgstr "<파ì¼>ì—ì„œ 추가ì ì¸ 디렉토리별 제외 íŒ¨í„´ì„ ì½ìŠµë‹ˆë‹¤"
+msgstr "<파ì¼>ì—ì„œ 추가ì ì¸ 디렉터리별 제외 íŒ¨í„´ì„ ì½ìŠµë‹ˆë‹¤"
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:466
msgid "add the standard git exclusions"
msgstr "표준 깃 제외 íŒ¨í„´ì„ ì¶”ê°€í•©ë‹ˆë‹¤"
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:469
msgid "make the output relative to the project top directory"
-msgstr "최ìƒìœ„ 디렉토리 ìƒëŒ€ 경로로 출력합니다"
+msgstr "최ìƒìœ„ 디렉터리 ìƒëŒ€ 경로로 출력합니다"
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:472
msgid "if any <file> is not in the index, treat this as an error"
msgstr "<파ì¼>ì´ ì¸ë±ìŠ¤ ì•ˆì— ì—†ìœ¼ë©´ 오류로 취급합니다"
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:473
msgid "tree-ish"
msgstr "트리-따위"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:474
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "<트리-따위> 뒤로 제거한 경로가 있다고 가정합니다"
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:476
msgid "show debugging data"
msgstr "디버깅 ë°ì´í„°ë¥¼ 표시합니다"
@@ -8045,187 +8445,173 @@ msgstr "ì „ì²´ 경로 ì´ë¦„ 사용"
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "ì „ì²´ 트리 ëª©ë¡ í‘œì‹œ, 현재 디렉터리만 ì•„ë‹ˆë¼ (--full-name 옵션 í¬í•¨)"
-#: builtin/merge.c:45
+#: builtin/merge.c:46
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<옵션>] [<커밋>...]"
-#: builtin/merge.c:46
+#: builtin/merge.c:47
msgid "git merge [<options>] <msg> HEAD <commit>"
msgstr "git merge [<옵션>] <메시지> HEAD <커밋>"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:101
+#: builtin/merge.c:102
msgid "switch `m' requires a value"
msgstr "`m' 옵션ì—는 ê°’ì´ í•„ìš”í•©ë‹ˆë‹¤"
-#: builtin/merge.c:138
+#: builtin/merge.c:139
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "'%s' 병합 ì „ëžµì„ ì°¾ì„ ìˆ˜ 없습니다.\n"
-#: builtin/merge.c:139
+#: builtin/merge.c:140
#, c-format
msgid "Available strategies are:"
msgstr "사용 가능한 ì „ëžµì€:"
-#: builtin/merge.c:144
+#: builtin/merge.c:145
#, c-format
msgid "Available custom strategies are:"
msgstr "사용 가능한 ì‚¬ìš©ìž ì„¤ì • ì „ëžµì€:"
-#: builtin/merge.c:194 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:126
msgid "do not show a diffstat at the end of the merge"
msgstr "ë³‘í•©ì´ ëë‚  ë•Œ diffstatì„ í‘œì‹œí•˜ì§€ 않습니다"
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:129
msgid "show a diffstat at the end of the merge"
msgstr "ë³‘í•©ì´ ëë‚  ë•Œ diffstatì„ í‘œì‹œí•©ë‹ˆë‹¤"
-#: builtin/merge.c:198 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:132
msgid "(synonym to --stat)"
msgstr "(--stat 옵션과 ë™ì¼)"
-#: builtin/merge.c:200 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:135
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "병합 ì»¤ë°‹ì˜ ë©”ì‹œì§€ì— shortlog í•­ëª©ì„ (최대 <n>ê°œ) 추가합니다"
-#: builtin/merge.c:203 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:138
msgid "create a single commit instead of doing a merge"
msgstr "병합하는 대신 í•˜ë‚˜ì˜ ì»¤ë°‹ì„ ë§Œë“­ë‹ˆë‹¤"
-#: builtin/merge.c:205 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:141
msgid "perform a commit if the merge succeeds (default)"
msgstr "ë³‘í•©ì´ ì„±ê³µí•˜ë©´ ì»¤ë°‹ì„ í•©ë‹ˆë‹¤ (기본값)"
-#: builtin/merge.c:207 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:144
msgid "edit message before committing"
msgstr "커밋 ì „ì— ë©”ì‹œì§€ë¥¼ 편집합니다"
-#: builtin/merge.c:208
+#: builtin/merge.c:209
msgid "allow fast-forward (default)"
msgstr "ì •ë°©í–¥ ì§„í–‰ì„ í—ˆìš©í•©ë‹ˆë‹¤ (기본값)"
-#: builtin/merge.c:210 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:150
msgid "abort if fast-forward is not possible"
msgstr "ì •ë°©í–¥ ì§„í–‰ì´ ë¶ˆê°€ëŠ¥í•˜ë©´ 중지합니다"
-#: builtin/merge.c:214
-msgid "Verify that the named commit has a valid GPG signature"
-msgstr "ì´ë¦„ ë¶™ì¸ ì»¤ë°‹ì— ì˜¬ë°”ë¥¸ GPG ì„œëª…ì´ ìžˆëŠ”ì§€ ê²€ì¦í•©ë‹ˆë‹¤"
+#: builtin/merge.c:215 builtin/pull.c:153
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "지정한 ì»¤ë°‹ì— ì˜¬ë°”ë¥¸ GPG ì„œëª…ì´ ìžˆëŠ”ì§€ ê²€ì¦í•©ë‹ˆë‹¤"
-#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157
#: builtin/revert.c:89
msgid "strategy"
msgstr "ì „ëžµ"
-#: builtin/merge.c:216 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:158
msgid "merge strategy to use"
msgstr "사용할 병합 전략"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:161
msgid "option=value"
msgstr "옵션=값"
-#: builtin/merge.c:218 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:162
msgid "option for selected merge strategy"
msgstr "ì„ íƒí•œ 병합 ì „ëžµì— ëŒ€í•œ 옵션"
-#: builtin/merge.c:220
+#: builtin/merge.c:221
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "병합 커밋 메시지 (ì •ë°©í–¥ì´ ì•„ë‹Œ ë³‘í•©ì— ëŒ€í•´)"
-#: builtin/merge.c:224
+#: builtin/merge.c:225
msgid "abort the current in-progress merge"
msgstr "현재 진행 ì¤‘ì¸ ë³‘í•©ì„ ì¤‘ì§€í•©ë‹ˆë‹¤"
-#: builtin/merge.c:226 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:169
msgid "allow merging unrelated histories"
msgstr "관계 없는 커밋 ë‚´ì—­ì˜ ë³‘í•©ì„ í—ˆìš©í•©ë‹ˆë‹¤"
-#: builtin/merge.c:254
+#: builtin/merge.c:255
msgid "could not run stash."
msgstr "stash를 실행할 수 없습니다."
-#: builtin/merge.c:259
+#: builtin/merge.c:260
msgid "stash failed"
msgstr "스태시 실패"
-#: builtin/merge.c:264
+#: builtin/merge.c:265
#, c-format
msgid "not a valid object: %s"
msgstr "올바른 오브ì íŠ¸ê°€ 아닙니다: %s"
-#: builtin/merge.c:283 builtin/merge.c:300
+#: builtin/merge.c:284 builtin/merge.c:301
msgid "read-tree failed"
msgstr "read-tree 실패"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
msgid " (nothing to squash)"
msgstr " (í•©ì¹  ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤)"
-#: builtin/merge.c:343
+#: builtin/merge.c:342
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "커밋 합치기 -- HEAD를 ì—…ë°ì´íŠ¸í•˜ì§€ 않습니다\n"
-#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
-#: builtin/merge.c:1000
-#, c-format
-msgid "Could not write to '%s'"
-msgstr "'%s'ì— ì“¸ 수 없습니다"
-
-#: builtin/merge.c:375
-msgid "Writing SQUASH_MSG"
-msgstr "SQUASH_MSG를 쓰는 중"
-
-#: builtin/merge.c:377
-msgid "Finishing SQUASH_MSG"
-msgstr "SQUASH_MSG를 마치는 중"
-
-#: builtin/merge.c:400
+#: builtin/merge.c:392
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "병합 메시지가 없습니다 -- HEAD를 ì—…ë°ì´íŠ¸í•˜ì§€ 않습니다\n"
-#: builtin/merge.c:451
+#: builtin/merge.c:443
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s'ì´(ê°€) ì»¤ë°‹ì„ ê°€ë¦¬í‚¤ì§€ 않습니다"
-#: builtin/merge.c:541
+#: builtin/merge.c:533
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "ìž˜ëª»ëœ branch.%s.mergeoptions 문ìžì—´: %s"
-#: builtin/merge.c:660
+#: builtin/merge.c:652
msgid "Not handling anything other than two heads merge."
msgstr "ë‘ ê°œì˜ í—¤ë“œ 병합 외ì—는 처리하지 않습니다."
-#: builtin/merge.c:674
+#: builtin/merge.c:666
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "merge-recursiveì— ëŒ€í•´ ì•Œ 수 없는 옵션: -X%s"
-#: builtin/merge.c:687
+#: builtin/merge.c:681
#, c-format
msgid "unable to write %s"
msgstr "%sì— ì“¸ 수 없습니다"
-#: builtin/merge.c:776
+#: builtin/merge.c:733
#, c-format
msgid "Could not read from '%s'"
msgstr "'%s'ì—ì„œ ì½ì„ 수 없습니다"
-#: builtin/merge.c:785
+#: builtin/merge.c:742
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"ë³‘í•©ì„ ì»¤ë°‹í•˜ì§€ 않습니다. ë³‘í•©ì„ ë§ˆì¹˜ë ¤ë©´ 'git commit'ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤.\n"
-#: builtin/merge.c:791
+#: builtin/merge.c:748
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -8241,52 +8627,66 @@ msgstr ""
"'%c' 문ìžë¡œ 시작하는 ì¤„ì€ ë¬´ì‹œë˜ê³ , 메시지가 비어 있으면 커밋ì„\n"
"중지합니다.\n"
-#: builtin/merge.c:815
+#: builtin/merge.c:772
msgid "Empty commit message."
msgstr "빈 커밋 메시지."
-#: builtin/merge.c:835
+#: builtin/merge.c:792
#, c-format
msgid "Wonderful.\n"
msgstr "훌륭합니다.\n"
-#: builtin/merge.c:890
+#: builtin/merge.c:847
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "ìžë™ ë³‘í•©ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤. 충ëŒì„ 바로잡고 ê²°ê³¼ë¬¼ì„ ì»¤ë°‹í•˜ì‹­ì‹œì˜¤.\n"
-#: builtin/merge.c:906
+#: builtin/merge.c:863
#, c-format
msgid "'%s' is not a commit"
msgstr "'%s'ì€(는) ì»¤ë°‹ì´ ì•„ë‹™ë‹ˆë‹¤"
-#: builtin/merge.c:947
+#: builtin/merge.c:904
msgid "No current branch."
msgstr "현재 브랜치가 없습니다."
-#: builtin/merge.c:949
+#: builtin/merge.c:906
msgid "No remote for the current branch."
msgstr "현재 ë¸Œëžœì¹˜ì— ëŒ€í•œ 리모트가 없습니다."
-#: builtin/merge.c:951
+#: builtin/merge.c:908
msgid "No default upstream defined for the current branch."
msgstr "현재 ë¸Œëžœì¹˜ì— ëŒ€í•´ 기본 ì—…ìŠ¤íŠ¸ë¦¼ì„ ì§€ì •í•˜ì§€ 않았습니다."
-#: builtin/merge.c:956
+#: builtin/merge.c:913
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "리모트 %2$sì—ì„œ %1$sì— ëŒ€í•œ 리모트 ì¶”ì  ë¸Œëžœì¹˜ê°€ 없습니다"
-#: builtin/merge.c:1091
+#: builtin/merge.c:960
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "ìž˜ëª»ëœ ê°’ '%s', 환경 '%s'"
+
+#: builtin/merge.c:1034
#, c-format
msgid "could not close '%s'"
msgstr "'%s'ì„(를) ë‹«ì„ ìˆ˜ 없습니다"
-#: builtin/merge.c:1219
+#: builtin/merge.c:1061
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "%s 안ì—ì„œ 병합할 수 있는 í•­ëª©ì´ ì•„ë‹™ë‹ˆë‹¤: %s"
+
+#: builtin/merge.c:1095
+msgid "not something we can merge"
+msgstr "병합할 수 있는 í•­ëª©ì´ ì•„ë‹™ë‹ˆë‹¤"
+
+#: builtin/merge.c:1162
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "중지할 병합 ìž‘ì—…ì´ ì—†ìŠµë‹ˆë‹¤. (MERGE_HEADê°€ ì—†ìŒ)"
-#: builtin/merge.c:1235
+#: builtin/merge.c:1178
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8294,7 +8694,7 @@ msgstr ""
"ë³‘í•©ì„ ë§ˆì¹˜ì§€ 않았습니다. (MERGE_HEAD 있ìŒ)\n"
"병합하기 ì „ì— ë³€ê²½ ì‚¬í•­ì„ ì»¤ë°‹í•˜ì‹­ì‹œì˜¤."
-#: builtin/merge.c:1242
+#: builtin/merge.c:1185
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8302,104 +8702,112 @@ msgstr ""
"커밋 빼오기를 마치지 않았습니다. (COMMIT_PICK_HEAD 있ìŒ)\n"
"병합하기 ì „ì— ë³€ê²½ ì‚¬í•­ì„ ì»¤ë°‹í•˜ì‹­ì‹œì˜¤."
-#: builtin/merge.c:1245
+#: builtin/merge.c:1188
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "커밋 빼오기를 마치지 않았습니다. (CHERRY_PICK_HEAD 있ìŒ)"
-#: builtin/merge.c:1254
+#: builtin/merge.c:1197
msgid "You cannot combine --squash with --no-ff."
msgstr "--squash ì˜µì…˜ì„ --no-ff 옵션과 ê°™ì´ ì“¸ 수 없습니다."
-#: builtin/merge.c:1262
+#: builtin/merge.c:1205
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "ì»¤ë°‹ì„ ì§€ì •í•˜ì§€ 않았고 merge.defaultToUpstream를 설정하지 않았습니다."
-#: builtin/merge.c:1279
+#: builtin/merge.c:1222
msgid "Squash commit into empty head not supported yet"
msgstr "빈 헤드로 ì»¤ë°‹ì„ í•©ì¹˜ê¸°ëŠ” 지ì›í•˜ì§€ 않습니다"
-#: builtin/merge.c:1281
+#: builtin/merge.c:1224
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "ì •ë°©í–¥ì´ ì•„ë‹Œ ì»¤ë°‹ì€ ë¹ˆ 헤드ì—서는 앞뒤가 맞지 않습니다"
-#: builtin/merge.c:1286
+#: builtin/merge.c:1229
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 병합할 수 있는 í•­ëª©ì´ ì•„ë‹™ë‹ˆë‹¤"
-#: builtin/merge.c:1288
+#: builtin/merge.c:1231
msgid "Can merge only exactly one commit into empty head"
msgstr "빈 헤드ì—는 정확히 í•˜ë‚˜ì˜ ì»¤ë°‹ë§Œ 병합할 수 있습니다"
-#: builtin/merge.c:1344
+#: builtin/merge.c:1287
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "%s ì»¤ë°‹ì— ì‹ ë¢°í•˜ì§€ 않는 (서명ìžê°€ %së¼ê³  하는) GPG ì„œëª…ì´ ìžˆìŠµë‹ˆë‹¤."
-#: builtin/merge.c:1347
+#: builtin/merge.c:1290
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "%s ì»¤ë°‹ì— ìž˜ëª»ëœ (서명ìžê°€ %së¼ê³  하는) GPG ì„œëª…ì´ ìžˆìŠµë‹ˆë‹¤."
-#: builtin/merge.c:1350
+#: builtin/merge.c:1293
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "%s ì»¤ë°‹ì— GPG ì„œëª…ì´ ì—†ìŠµë‹ˆë‹¤."
-#: builtin/merge.c:1353
+#: builtin/merge.c:1296
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "%s ì»¤ë°‹ì— %sì˜ ì˜¬ë°”ë¥¸ GPG ì„œëª…ì´ ì—†ìŠµë‹ˆë‹¤\n"
-#: builtin/merge.c:1415
+#: builtin/merge.c:1358
msgid "refusing to merge unrelated histories"
msgstr "관계 없는 커밋 ë‚´ì—­ì˜ ë³‘í•©ì„ ê±°ë¶€í•©ë‹ˆë‹¤"
-#: builtin/merge.c:1439
+#: builtin/merge.c:1367
+msgid "Already up-to-date."
+msgstr "ì´ë¯¸ ì—…ë°ì´íŠ¸ ìƒíƒœìž…니다."
+
+#: builtin/merge.c:1382
#, c-format
msgid "Updating %s..%s\n"
msgstr "ì—…ë°ì´íŠ¸ 중 %s..%s\n"
-#: builtin/merge.c:1476
+#: builtin/merge.c:1419
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "아주 간단한 ì¸ë±ìŠ¤ 내부 ë³‘í•©ì„ ì‹œë„합니다...\n"
-#: builtin/merge.c:1483
+#: builtin/merge.c:1426
#, c-format
msgid "Nope.\n"
msgstr "아님.\n"
-#: builtin/merge.c:1515
+#: builtin/merge.c:1451
+msgid "Already up-to-date. Yeeah!"
+msgstr "ì´ë¯¸ ì—…ë°ì´íŠ¸ ìƒíƒœìž…니다. 야호!"
+
+#: builtin/merge.c:1457
msgid "Not possible to fast-forward, aborting."
msgstr "ì •ë°©í–¥ì´ ë¶ˆê°€ëŠ¥í•˜ë¯€ë¡œ, 중지합니다."
-#: builtin/merge.c:1538 builtin/merge.c:1617
+#: builtin/merge.c:1480 builtin/merge.c:1559
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "트리를 본래 위치로 ë˜ëŒë¦½ë‹ˆë‹¤...\n"
-#: builtin/merge.c:1542
+#: builtin/merge.c:1484
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "병합 ì „ëžµ %s ì‹œë„...\n"
-#: builtin/merge.c:1608
+#: builtin/merge.c:1550
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "ë³‘í•©ì„ ì²˜ë¦¬í•œ ì „ëžµì´ ì—†ìŠµë‹ˆë‹¤.\n"
-#: builtin/merge.c:1610
+#: builtin/merge.c:1552
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "ì „ëžµ %s(으)ë¡œ ë³‘í•©ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤.\n"
-#: builtin/merge.c:1619
+#: builtin/merge.c:1561
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "ìˆ˜ë™ í•´ê²°ì˜ ì¤€ë¹„ë¥¼ 위해 %s ì „ëžµì„ ì‚¬ìš©í•©ë‹ˆë‹¤.\n"
-#: builtin/merge.c:1631
+#: builtin/merge.c:1573
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "ìžë™ ë³‘í•©ì´ ìž˜ 진행ë˜ì—ˆìŠµë‹ˆë‹¤. 요청한대로 커밋 ì „ì— ì¤‘ì§€í•©ë‹ˆë‹¤\n"
@@ -8526,68 +8934,68 @@ msgstr "대ìƒì´ ì´ë¯¸ ìžˆì–´ë„ ê°•ì œë¡œ 옮기기/ì´ë¦„ 바꾸기를 í•©ë‹
msgid "skip move/rename errors"
msgstr "옮기기/ì´ë¦„ 바꾸기 오류를 건너 ëœë‹ˆë‹¤"
-#: builtin/mv.c:152
+#: builtin/mv.c:155
#, c-format
msgid "destination '%s' is not a directory"
msgstr "대ìƒì´ ('%s') 디렉터리가 아닙니다"
-#: builtin/mv.c:163
+#: builtin/mv.c:166
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "'%s'ì„(를) '%s'(으)ë¡œ ì´ë¦„ 바꾸기합니다\n"
-#: builtin/mv.c:167
+#: builtin/mv.c:170
msgid "bad source"
msgstr "ìž˜ëª»ëœ ì›ë³¸"
-#: builtin/mv.c:170
+#: builtin/mv.c:173
msgid "can not move directory into itself"
msgstr "디렉터리를 ìžê¸° ìžì‹ ìœ¼ë¡œ 옮길 수 없습니다"
-#: builtin/mv.c:173
+#: builtin/mv.c:176
msgid "cannot move directory over file"
msgstr "디렉터리를 파ì¼ë¡œ 옮길 수 없습니다"
-#: builtin/mv.c:182
+#: builtin/mv.c:185
msgid "source directory is empty"
msgstr "ì›ë³¸ 디렉터리가 비어 있습니다"
-#: builtin/mv.c:207
+#: builtin/mv.c:210
msgid "not under version control"
msgstr "버전 컨트롤 ì¤‘ì´ ì•„ë‹™ë‹ˆë‹¤"
-#: builtin/mv.c:210
+#: builtin/mv.c:213
msgid "destination exists"
msgstr "대ìƒì´ 있습니다"
-#: builtin/mv.c:218
+#: builtin/mv.c:221
#, c-format
msgid "overwriting '%s'"
msgstr "'%s' ë®ì–´ì“°ê¸°"
-#: builtin/mv.c:221
+#: builtin/mv.c:224
msgid "Cannot overwrite"
msgstr "ë®ì–´ì“¸ 수 없습니다"
-#: builtin/mv.c:224
+#: builtin/mv.c:227
msgid "multiple sources for the same target"
msgstr "ë™ì¼í•œ 대ìƒì— 대해 여러 ê°œ ì›ë³¸"
-#: builtin/mv.c:226
+#: builtin/mv.c:229
msgid "destination directory does not exist"
msgstr "ëŒ€ìƒ ë””ë ‰í„°ë¦¬ê°€ 없습니다"
-#: builtin/mv.c:233
+#: builtin/mv.c:236
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, ì›ë³¸=%s, 대ìƒ=%s"
-#: builtin/mv.c:254
+#: builtin/mv.c:257
#, c-format
msgid "Renaming %s to %s\n"
msgstr "ì´ë¦„ 바꾸기, '%s'ì—ì„œ '%s'(으)ë¡œ\n"
-#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
#, c-format
msgid "renaming '%s' failed"
msgstr "'%s'ì˜ ì´ë¦„ 바꾸기가 실패했습니다"
@@ -8743,6 +9151,10 @@ msgstr "git notes prune [<옵션>]"
msgid "git notes get-ref"
msgstr "git notes get-ref"
+#: builtin/notes.c:94
+msgid "Write/edit the notes for the following object:"
+msgstr "ë‹¤ìŒ ì˜¤ë¸Œì íŠ¸ì— 노트를 쓰거나 편집합니다:"
+
#: builtin/notes.c:147
#, c-format
msgid "unable to start 'show' for object '%s'"
@@ -8757,80 +9169,75 @@ msgstr "'show' ì¶œë ¥ì„ ì½ì„ 수 없습니다"
msgid "failed to finish 'show' for object '%s'"
msgstr "오브ì íŠ¸ '%s'ì— ëŒ€í•´ 'show'를 ë§ˆì¹˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/notes.c:174 builtin/tag.c:248
-#, c-format
-msgid "could not create file '%s'"
-msgstr "'%s' 파ì¼ì„ 만들 수 없습니다"
-
-#: builtin/notes.c:193
+#: builtin/notes.c:194
msgid "Please supply the note contents using either -m or -F option"
msgstr "노트 ë‚´ìš©ì„ -m ë˜ëŠ” -F 옵션으로 입력하십시오"
-#: builtin/notes.c:202
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "노트 오브ì íŠ¸ë¥¼ 쓸 수 없습니다"
-#: builtin/notes.c:204
+#: builtin/notes.c:205
#, c-format
msgid "The note contents have been left in %s"
msgstr "노트 ë‚´ìš©ì€ %sì— ë‚¨ìŠµë‹ˆë‹¤"
-#: builtin/notes.c:232 builtin/tag.c:439
+#: builtin/notes.c:233 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr "'%s'ì„(를) ì½ì„ 수 없습니다"
-#: builtin/notes.c:234 builtin/tag.c:442
+#: builtin/notes.c:235 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr "'%s'ì„(를) 열거나 ì½ì„ 수 없습니다"
-#: builtin/notes.c:256
+#: builtin/notes.c:257
#, c-format
msgid "Failed to read object '%s'."
msgstr "'%s' 오브ì íŠ¸ ì½ê¸°ì— 실패했습니다."
-#: builtin/notes.c:260
+#: builtin/notes.c:261
#, c-format
msgid "Cannot read note data from non-blob object '%s'."
msgstr "ë¸”ë¡­ì´ ì•„ë‹Œ '%s' 오브ì íŠ¸ì— 대해 노트 ë°ì´í„°ë¥¼ ì½ì„ 수 없습니다."
-#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
-#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:946
+#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
+#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
+#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
msgid "too many parameters"
msgstr "파ë¼ë¯¸í„°ê°€ 너무 많습니다"
-#: builtin/notes.c:375 builtin/notes.c:662
+#: builtin/notes.c:376 builtin/notes.c:663
#, c-format
msgid "No note found for object %s."
msgstr "%s 오브ì íŠ¸ì— 대해 노트가 없습니다."
-#: builtin/notes.c:396 builtin/notes.c:559
+#: builtin/notes.c:397 builtin/notes.c:560
msgid "note contents as a string"
msgstr "문ìžì—´ë¡œ 노트 ë‚´ìš©"
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:400 builtin/notes.c:563
msgid "note contents in a file"
msgstr "íŒŒì¼ ì•ˆì— ë…¸íŠ¸ ë‚´ìš©"
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "reuse and edit specified note object"
msgstr "지정한 노트 오브ì íŠ¸ë¥¼ 재사용하고 편집합니다"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "reuse specified note object"
msgstr "지정한 노트 오브ì íŠ¸ë¥¼ 재사용합니다"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "allow storing empty note"
msgstr "빈 노트 ì €ìž¥ì„ í—ˆìš©í•©ë‹ˆë‹¤"
-#: builtin/notes.c:409 builtin/notes.c:480
+#: builtin/notes.c:410 builtin/notes.c:481
msgid "replace existing notes"
msgstr "기존 노트를 바꿉니다"
-#: builtin/notes.c:434
+#: builtin/notes.c:435
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -8839,29 +9246,29 @@ msgstr ""
"노트를 추가할 수 없습니다. %s 오브ì íŠ¸ì— 대한 기존 노트가 있습니다. 기존 노트"
"를 ë®ì–´ì“°ë ¤ë©´ '-f' ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤"
-#: builtin/notes.c:449 builtin/notes.c:528
+#: builtin/notes.c:450 builtin/notes.c:529
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "%s 오브ì íŠ¸ì— 대한 기존 노트를 ë®ì–´ì”니다\n"
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
+#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
#, c-format
msgid "Removing note for object %s\n"
msgstr "%s 오브ì íŠ¸ì— 대한 노트를 제거합니다\n"
-#: builtin/notes.c:481
+#: builtin/notes.c:482
msgid "read objects from stdin"
msgstr "표준 ìž…ë ¥ì—ì„œ 오브ì íŠ¸ë¥¼ ì½ìŠµë‹ˆë‹¤"
-#: builtin/notes.c:483
+#: builtin/notes.c:484
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "<명령>ì— ëŒ€í•œ 다시쓰기 ì„¤ì •ì„ ì½ì–´ë“¤ìž…니다 (--stdin 옵션 í¬í•¨)"
-#: builtin/notes.c:501
+#: builtin/notes.c:502
msgid "too few parameters"
msgstr "파ë¼ë¯¸í„°ê°€ 너무 ì ìŠµë‹ˆë‹¤"
-#: builtin/notes.c:522
+#: builtin/notes.c:523
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -8870,12 +9277,12 @@ msgstr ""
"노트를 복사할 수 없습니다. %s 오브ì íŠ¸ì— 대한 기존 노트가 있습니다. 기존 노트"
"를 ë®ì–´ì“°ë ¤ë©´ '-f' ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤"
-#: builtin/notes.c:534
+#: builtin/notes.c:535
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr "ì›ë³¸ %s 오브ì íŠ¸ì— 대한 노트가 없습니다. 복사할 수 없습니다."
-#: builtin/notes.c:586
+#: builtin/notes.c:587
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -8884,15 +9291,20 @@ msgstr ""
"-m/-F/-c/-C ì˜µì…˜ì€ 'edit' 하위 ëª…ë ¹ì— ëŒ€í•´ ì‚¬ìš©ì„ ê¶Œí•˜ì§€ 않습니다.\n"
"ëŒ€ì‹ ì— 'git notes add -f -m/-F/-c/-C' ëª…ë ¹ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤.\n"
-#: builtin/notes.c:768
+#: builtin/notes.c:753
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "알 수 없는 노트 병합 전략 %s"
+
+#: builtin/notes.c:769
msgid "General options"
msgstr "ì¼ë°˜ 옵션"
-#: builtin/notes.c:770
+#: builtin/notes.c:771
msgid "Merge options"
msgstr "병합 옵션"
-#: builtin/notes.c:772
+#: builtin/notes.c:773
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -8900,49 +9312,83 @@ msgstr ""
"주어진 ì „ëžµì„ ì‚¬ìš©í•´ 노트 충ëŒì„ 해결합니다 (manual/ours/theirs/union/"
"cat_sort_uniq)"
-#: builtin/notes.c:774
+#: builtin/notes.c:775
msgid "Committing unmerged notes"
msgstr "병합하지 ì•Šì€ ë…¸íŠ¸ 커밋"
-#: builtin/notes.c:776
+#: builtin/notes.c:777
msgid "finalize notes merge by committing unmerged notes"
msgstr "병합하지 ì•Šì€ ë…¸íŠ¸ë¥¼ 커밋해 노트 ë³‘í•©ì„ ë§ˆì¹©ë‹ˆë‹¤"
-#: builtin/notes.c:778
+#: builtin/notes.c:779
msgid "Aborting notes merge resolution"
msgstr "노트 병합 해결 중지"
-#: builtin/notes.c:780
+#: builtin/notes.c:781
msgid "abort notes merge"
msgstr "노트 ë³‘í•©ì„ ì¤‘ì§€í•©ë‹ˆë‹¤"
-#: builtin/notes.c:857
+#: builtin/notes.c:792
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "--commit, --abort, -s/--strategy ì˜µì…˜ì„ ì„žì–´ 쓸 수 없습니다"
+
+#: builtin/notes.c:797
+msgid "Must specify a notes ref to merge"
+msgstr "병합할 노트 ë ˆí¼ëŸ°ìŠ¤ë¥¼ 지정해야 합니다"
+
+#: builtin/notes.c:821
+#, c-format
+msgid "Unknown -s/--strategy: %s"
+msgstr "알 수 없는 전략(-s/--strategy): %s"
+
+#: builtin/notes.c:858
#, c-format
msgid "A notes merge into %s is already in-progress at %s"
msgstr "%s 위치로 노트 ë³‘í•©ì´ ì´ë¯¸ %sì—ì„œ 진행중입니다"
-#: builtin/notes.c:884
+#: builtin/notes.c:861
+#, c-format
+msgid "Failed to store link to current notes ref (%s)"
+msgstr "현재 노트 ë ˆí¼ëŸ°ìŠ¤ì˜ (%s) ë§í¬ë¥¼ ì €ìž¥í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
+
+#: builtin/notes.c:863
+#, c-format
+msgid ""
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
+msgstr "ìžë™ 노트 ë³‘í•©ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤. %s ì•ˆì˜ ì¶©ëŒì„ 바로잡고 결과를 'git notes merge --commit' 명령으로 커밋하십시오. ë˜ëŠ” 'git notes merge --abort' 명령으로 ë³‘í•©ì„ ì¤‘ì§€í•˜ì‹­ì‹œì˜¤.\n"
+
+#: builtin/notes.c:885
#, c-format
msgid "Object %s has no note\n"
msgstr "%s 오브ì íŠ¸ì— 노트가 없습니다\n"
-#: builtin/notes.c:896
+#: builtin/notes.c:897
msgid "attempt to remove non-existent note is not an error"
msgstr "없는 노트를 제거하려는 ì‹œë„를 오류가 ì•„ë‹Œ 것으로 취급합니다"
-#: builtin/notes.c:899
+#: builtin/notes.c:900
msgid "read object names from the standard input"
msgstr "표준 ìž…ë ¥ì—ì„œ 오브ì íŠ¸ ì´ë¦„ì„ ì½ìŠµë‹ˆë‹¤"
-#: builtin/notes.c:980
+#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+msgid "do not remove, show only"
+msgstr "제거하지 않고, 보여주기만 합니다"
+
+#: builtin/notes.c:939
+msgid "report pruned notes"
+msgstr "잘ë¼ë‚¸ 노트를 알립니다"
+
+#: builtin/notes.c:981
msgid "notes-ref"
msgstr "노트-ë ˆí¼ëŸ°ìŠ¤"
-#: builtin/notes.c:981
+#: builtin/notes.c:982
msgid "use notes from <notes-ref>"
msgstr "<노트-ë ˆí¼ëŸ°ìŠ¤>ì—ì„œ 노트를 사용합니다"
-#: builtin/notes.c:1016 builtin/remote.c:1628
+#: builtin/notes.c:1017 builtin/remote.c:1623
#, c-format
msgid "Unknown subcommand: %s"
msgstr "알 수 없는 하위 명령: %s"
@@ -8960,175 +9406,180 @@ msgstr ""
"git pack-objects [<옵션>...] <ë² ì´ìŠ¤ì´ë¦„> [< <ë ˆí¼ëŸ°ìŠ¤ëª©ë¡> | < <오브ì íŠ¸ëª©ë¡"
">]"
-#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
+#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
#, c-format
msgid "deflate error (%d)"
msgstr "deflate 오류 (%d)"
-#: builtin/pack-objects.c:763
+#: builtin/pack-objects.c:766
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
-msgstr "배트맵 쓰기를 하지 않습니다. 묶ìŒì€ pack.packSizeLimit ê°’ì— ë”°ë¼ ìª¼ê°œì§‘ë‹ˆë‹¤"
+msgstr ""
+"배트맵 쓰기를 하지 않습니다. 묶ìŒì€ pack.packSizeLimit ê°’ì— ë”°ë¼ ìª¼ê°œì§‘ë‹ˆë‹¤"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:779
msgid "Writing objects"
msgstr "오브ì íŠ¸ 쓰는 중"
-#: builtin/pack-objects.c:1017
+#: builtin/pack-objects.c:1037
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "묶ìŒì— 들어있지 ì•Šì€ ì˜¤ë¸Œì íŠ¸ê°€ 있으므로, 비트맵 쓰기를 하지 않습니다"
-#: builtin/pack-objects.c:2177
+#: builtin/pack-objects.c:2197
msgid "Compressing objects"
msgstr "오브ì íŠ¸ 압축하는 중"
-#: builtin/pack-objects.c:2563
+#: builtin/pack-objects.c:2611
#, c-format
msgid "unsupported index version %s"
msgstr "지ì›í•˜ì§€ 않는 ì¸ë±ìŠ¤ 버전 %s"
-#: builtin/pack-objects.c:2567
+#: builtin/pack-objects.c:2615
#, c-format
msgid "bad index version '%s'"
msgstr "ìž˜ëª»ëœ ì¸ë±ìŠ¤ 버전 '%s'"
-#: builtin/pack-objects.c:2597
+#: builtin/pack-objects.c:2645
msgid "do not show progress meter"
msgstr "ì§„í–‰ë¥ ì„ í‘œì‹œí•˜ì§€ 않습니다"
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2647
msgid "show progress meter"
msgstr "ì§„í–‰ë¥ ì„ í‘œì‹œí•©ë‹ˆë‹¤"
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2649
msgid "show progress meter during object writing phase"
msgstr "오브ì íŠ¸ 쓰기 단계ì—ì„œ ì§„í–‰ë¥ ì„ í‘œì‹œí•©ë‹ˆë‹¤"
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2652
msgid "similar to --all-progress when progress meter is shown"
msgstr "ì§„í–‰ë¥ ì´ í‘œì‹œë  ë•Œ --all-progress와 비슷합니다"
-#: builtin/pack-objects.c:2605
+#: builtin/pack-objects.c:2653
msgid "version[,offset]"
msgstr "버전[,오프셋]"
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2654
msgid "write the pack index file in the specified idx format version"
msgstr "지정한 ë²„ì „ì˜ ì¸ë±ìŠ¤ 형ì‹ì— ë”°ë¼ ë¬¶ìŒ ì¸ë±ìŠ¤ 파ì¼ì„ ì”니다"
-#: builtin/pack-objects.c:2609
+#: builtin/pack-objects.c:2657
msgid "maximum size of each output pack file"
msgstr "출력 ë¬¶ìŒ íŒŒì¼ì˜ 최대 í¬ê¸°"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2659
msgid "ignore borrowed objects from alternate object store"
msgstr "ë³´ì¡° 오브ì íŠ¸ 저장소ì—ì„œ 빌려온 오브ì íŠ¸ë¥¼ 무시합니다"
-#: builtin/pack-objects.c:2613
+#: builtin/pack-objects.c:2661
msgid "ignore packed objects"
msgstr "ë¬¶ìŒ ì˜¤ë¸Œì íŠ¸ë¥¼ 무시합니다"
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2663
msgid "limit pack window by objects"
msgstr "ë¬¶ìŒ ìœˆë„우를 오브ì íŠ¸ 단위로 제한합니다"
-#: builtin/pack-objects.c:2617
+#: builtin/pack-objects.c:2665
msgid "limit pack window by memory in addition to object limit"
msgstr "ë¬¶ìŒ ìœˆë„우를 오브ì íŠ¸ ë‹¨ìœ„ì— ì¶”ê°€ë¡œ 메모리 단위로 제한합니다"
-#: builtin/pack-objects.c:2619
+#: builtin/pack-objects.c:2667
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "결과물 묶ìŒì—ì„œ 허용ë˜ëŠ” 최대 길ì´ì˜ ë¸íƒ€ ì²´ì¸"
-#: builtin/pack-objects.c:2621
+#: builtin/pack-objects.c:2669
msgid "reuse existing deltas"
msgstr "기존 ë¸íƒ€ë¥¼ 재사용합니다"
-#: builtin/pack-objects.c:2623
+#: builtin/pack-objects.c:2671
msgid "reuse existing objects"
msgstr "기존 오브ì íŠ¸ë¥¼ 재사용합니다"
-#: builtin/pack-objects.c:2625
+#: builtin/pack-objects.c:2673
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA 오브ì íŠ¸ë¥¼ 사용합니다"
-#: builtin/pack-objects.c:2627
+#: builtin/pack-objects.c:2675
msgid "use threads when searching for best delta matches"
msgstr "최ìƒì˜ ë¸íƒ€ ì¼ì¹˜ë¥¼ ê²€ìƒ‰í•˜ëŠ”ë° ìŠ¤ë ˆë“œë¥¼ 사용합니다"
-#: builtin/pack-objects.c:2629
+#: builtin/pack-objects.c:2677
msgid "do not create an empty pack output"
msgstr "빈 ë¬¶ìŒ ì¶œë ¥ì„ ë§Œë“¤ì§€ 않습니다"
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2679
msgid "read revision arguments from standard input"
msgstr "표준 ìž…ë ¥ì—ì„œ 리비전 ì¸ìžë¥¼ ì½ìŠµë‹ˆë‹¤"
-#: builtin/pack-objects.c:2633
+#: builtin/pack-objects.c:2681
msgid "limit the objects to those that are not yet packed"
msgstr "묶지 않는 오브ì íŠ¸ 수를 제한합니다"
-#: builtin/pack-objects.c:2636
+#: builtin/pack-objects.c:2684
msgid "include objects reachable from any reference"
msgstr "모든 ë ˆí¼ëŸ°ìŠ¤ì—ì„œ ì ‘ê·¼ 가능한 오브ì íŠ¸ë¥¼ í¬í•¨í•©ë‹ˆë‹¤"
-#: builtin/pack-objects.c:2639
+#: builtin/pack-objects.c:2687
msgid "include objects referred by reflog entries"
msgstr "reflog 항목ì—ì„œ ë ˆí¼ëŸ°ìŠ¤í•  수 있는 오브ì íŠ¸ë¥¼ í¬í•¨í•©ë‹ˆë‹¤"
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2690
msgid "include objects referred to by the index"
msgstr "ì¸ë±ìŠ¤ì—ì„œ< ë ˆí¼ëŸ°ìŠ¤í•˜ëŠ” 오브ì íŠ¸ë¥¼ í¬í•¨í•©ë‹ˆë‹¤"
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2693
msgid "output pack to stdout"
msgstr "묶ìŒì„ 표준 출력으로 출력합니다"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2695
msgid "include tag objects that refer to objects to be packed"
msgstr "묶ìŒì— 들어갈 오브ì íŠ¸ë¥¼ ë ˆí¼ëŸ°ìŠ¤í•˜ëŠ” 태그 오브ì íŠ¸ë¥¼ í¬í•¨í•©ë‹ˆë‹¤"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2697
msgid "keep unreachable objects"
msgstr "ì ‘ê·¼ 불가능 오브ì íŠ¸ë¥¼ 보존합니다"
-#: builtin/pack-objects.c:2650 parse-options.h:142
+#: builtin/pack-objects.c:2699
+msgid "pack loose unreachable objects"
+msgstr "ëŠìŠ¨í•œ ì ‘ê·¼ 불가능 오브ì íŠ¸ë¥¼ 묶습니다"
+
+#: builtin/pack-objects.c:2700 parse-options.h:142
msgid "time"
msgstr "ì‹œê°"
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2701
msgid "unpack unreachable objects newer than <time>"
msgstr "<ì‹œê°>보다 새로운 ì ‘ê·¼ 불가능 오브ì íŠ¸ì˜ 묶ìŒì„ 풉니다"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2704
msgid "create thin packs"
msgstr "ì–‡ì€ ë¬¶ìŒì„ 만듭니다"
-#: builtin/pack-objects.c:2656
+#: builtin/pack-objects.c:2706
msgid "create packs suitable for shallow fetches"
msgstr "ì–•ì€ ê°€ì ¸ì˜¤ê¸°ì— ì í•©í•œ 묶ìŒì„ 만듭니다"
-#: builtin/pack-objects.c:2658
+#: builtin/pack-objects.c:2708
msgid "ignore packs that have companion .keep file"
msgstr "해당하는 .keep 파ì¼ì´ 있는 묶ìŒì„ 무시합니다"
-#: builtin/pack-objects.c:2660
+#: builtin/pack-objects.c:2710
msgid "pack compression level"
msgstr "ë¬¶ìŒ ì••ì¶• 단계"
# FIXME: graft?
-#: builtin/pack-objects.c:2662
+#: builtin/pack-objects.c:2712
msgid "do not hide commits by grafts"
msgstr "붙어 있는 ì»¤ë°‹ì„ ìˆ¨ê¸°ì§€ 않습니다"
-#: builtin/pack-objects.c:2664
+#: builtin/pack-objects.c:2714
msgid "use a bitmap index if available to speed up counting objects"
msgstr "가능하면 비트맵 ì¸ë±ìŠ¤ë¥¼ 사용해 오브ì íŠ¸ 세기 ì†ë„를 높입니다"
-#: builtin/pack-objects.c:2666
+#: builtin/pack-objects.c:2716
msgid "write a bitmap index together with the pack index"
msgstr "ë¬¶ìŒ ì¸ë±ìŠ¤ì™€ ê°™ì´ ë¹„íŠ¸ë§µ ì¸ë±ìŠ¤ë¥¼ ì”니다"
-#: builtin/pack-objects.c:2757
+#: builtin/pack-objects.c:2829
msgid "Counting objects"
msgstr "오브ì íŠ¸ 개수 세는 중"
@@ -9156,15 +9607,11 @@ msgstr "ì¤‘ë³µëœ ì˜¤ë¸Œì íŠ¸ 제거"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <ì‹œê°>] [--] [<헤드>...]"
-#: builtin/prune.c:105 builtin/worktree.c:125
-msgid "do not remove, show only"
-msgstr "제거하지 않고, 보여주기만 합니다"
-
-#: builtin/prune.c:106 builtin/worktree.c:126
+#: builtin/prune.c:106 builtin/worktree.c:128
msgid "report pruned objects"
msgstr "잘ë¼ë‚¸ 오브ì íŠ¸ë¥¼ 알립니다"
-#: builtin/prune.c:109 builtin/worktree.c:128
+#: builtin/prune.c:109 builtin/worktree.c:130
msgid "expire objects older than <time>"
msgstr "<ì‹œê°>보다 오래 ëœ ì˜¤ë¸Œì íŠ¸ê°€ 만료ë©ë‹ˆë‹¤"
@@ -9184,14 +9631,10 @@ msgstr "병합 관련 옵션"
msgid "incorporate changes by rebasing rather than merging"
msgstr "변경 ì‚¬í•­ì„ ì ìš©í•  ë•Œ 병합하는 대신 리베ì´ìŠ¤í•©ë‹ˆë‹¤"
-#: builtin/pull.c:147 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "ì •ë°©í–¥ ì§„í–‰ì„ í—ˆìš©í•©ë‹ˆë‹¤"
-#: builtin/pull.c:153
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "지정한 ì»¤ë°‹ì— ì˜¬ë°”ë¥¸ GPG ì„œëª…ì´ ìžˆëŠ”ì§€ ê²€ì¦í•©ë‹ˆë‹¤"
-
#: builtin/pull.c:156
msgid "automatically stash/stash pop before and after rebase"
msgstr "리베ì´ìŠ¤ ì „ê³¼ í›„ì— stash ë° stash popì„ ìžë™ìœ¼ë¡œ 합니다"
@@ -9209,16 +9652,16 @@ msgstr "병렬ì ìœ¼ë¡œ í’€ì„ ì‹¤í–‰í•  하위모듈 개수"
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ffì— ëŒ€í•´ ìž˜ëª»ëœ ê°’: %s"
-#: builtin/pull.c:379
+#: builtin/pull.c:379 git-sh-setup.sh:226
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
"리베ì´ìŠ¤ë¡œ í’€ì„ í•  수 없습니다: 스테ì´ì§•í•˜ì§€ ì•Šì€ ë³€ê²½ ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤."
-#: builtin/pull.c:385
+#: builtin/pull.c:385 git-sh-setup.sh:252
msgid "Additionally, your index contains uncommitted changes."
msgstr "추가로, ì¸ë±ìŠ¤ì— 커밋하지 ì•Šì€ ë³€ê²½ ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤."
-#: builtin/pull.c:387
+#: builtin/pull.c:387 git-sh-setup.sh:245
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
"리베ì´ìŠ¤ë¡œ í’€ì„ í•  수 없습니다: ì¸ë±ìŠ¤ì— 커밋하지 ì•Šì€ ë³€ê²½ ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤."
@@ -9274,7 +9717,7 @@ msgstr "ìžì„¸í•œ 정보는 git-pull(1) 페ì´ì§€ë¥¼ 참고하십시오."
msgid "<remote>"
msgstr "<리모트>"
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<브랜치>"
@@ -9297,15 +9740,19 @@ msgstr ""
"설정ì—ì„œ ë¦¬ëª¨íŠ¸ì˜ '%s' ë ˆí¼ëŸ°ìŠ¤ì™€ 병합하ë„ë¡ ì§€ì •í–ˆì§€ë§Œ,\n"
"그런 ë ˆí¼ëŸ°ìŠ¤ë¥¼ 가져오지 않았습니다."
-#: builtin/pull.c:864
+#: builtin/pull.c:820
+msgid "ignoring --verify-signatures for rebase"
+msgstr "리베ì´ìŠ¤ì— 대해 --verify-signatures ì˜µì…˜ì„ ë¬´ì‹œí•©ë‹ˆë‹¤"
+
+#: builtin/pull.c:867
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash ì˜µì…˜ì€ --rebase 옵션과 ê°™ì´ ì¨ì•¼ 합니다."
-#: builtin/pull.c:872
+#: builtin/pull.c:875
msgid "Updating an unborn branch with changes added to the index."
msgstr "만들어지지 ì•Šì€ ë¸Œëžœì¹˜ë¥¼ ì¸ë±ìŠ¤ì— ì¶”ê°€ëœ ë³€ê²½ 사항으로 ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤."
-#: builtin/pull.c:900
+#: builtin/pull.c:903
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -9316,7 +9763,7 @@ msgstr ""
"ìž‘ì—… í´ë”를 %s 커밋ì—ì„œ ì •ë°©í–¥\n"
"진행합니다."
-#: builtin/pull.c:905
+#: builtin/pull.c:908
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -9333,11 +9780,11 @@ msgstr ""
"$ git reset --hard\n"
"복구ë©ë‹ˆë‹¤."
-#: builtin/pull.c:920
+#: builtin/pull.c:923
msgid "Cannot merge multiple branches into empty head."
msgstr "여러 브랜치를 빈 헤드로 병합할 수 없습니다."
-#: builtin/pull.c:924
+#: builtin/pull.c:927
msgid "Cannot rebase onto multiple branches."
msgstr "여러 브랜치로 리베ì´ìŠ¤í•  수 없습니다."
@@ -9504,12 +9951,12 @@ msgstr "다ìŒì— 푸시: %s\n"
msgid "failed to push some refs to '%s'"
msgstr "ë ˆí¼ëŸ°ìŠ¤ë¥¼ '%s'ì— í‘¸ì‹œí•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/push.c:365
+#: builtin/push.c:366
#, c-format
msgid "bad repository '%s'"
msgstr "ìž˜ëª»ëœ ì €ìž¥ì†Œ '%s'"
-#: builtin/push.c:366
+#: builtin/push.c:367
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -9530,103 +9977,115 @@ msgstr ""
"\n"
" git push <name>\n"
-#: builtin/push.c:381
+#: builtin/push.c:385
msgid "--all and --tags are incompatible"
msgstr "--all ë° --tags ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다"
-#: builtin/push.c:382
+#: builtin/push.c:386
msgid "--all can't be combined with refspecs"
msgstr "--all ì˜µì…˜ì€ ë ˆí¼ëŸ°ìŠ¤ëª…세와 ê°™ì´ ì“¸ 수 없습니다"
-#: builtin/push.c:387
+#: builtin/push.c:391
msgid "--mirror and --tags are incompatible"
msgstr "--mirror ë° --tags ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다"
-#: builtin/push.c:388
+#: builtin/push.c:392
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror ì˜µì…˜ì€ ë ˆí¼ëŸ°ìŠ¤ëª…세와 ê°™ì´ ì“¸ 수 없습니다"
-#: builtin/push.c:393
+#: builtin/push.c:397
msgid "--all and --mirror are incompatible"
msgstr "--all ë° --mirror ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다"
-#: builtin/push.c:505
+#: builtin/push.c:515
msgid "repository"
msgstr "저장소"
-#: builtin/push.c:506 builtin/send-pack.c:161
+#: builtin/push.c:516 builtin/send-pack.c:161
msgid "push all refs"
msgstr "모든 ë ˆí¼ëŸ°ìŠ¤ 푸시하기"
-#: builtin/push.c:507 builtin/send-pack.c:163
+#: builtin/push.c:517 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "모든 ë ˆí¼ëŸ°ìŠ¤ 미러"
-#: builtin/push.c:509
+#: builtin/push.c:519
msgid "delete refs"
msgstr "ë ˆí¼ëŸ°ìŠ¤ ì‚­ì œ"
-#: builtin/push.c:510
+#: builtin/push.c:520
msgid "push tags (can't be used with --all or --mirror)"
msgstr "태그 푸시하기 (--all ë˜ëŠ” --mirror 옵션과 ê°™ì´ ì“¸ 수 ì—†ìŒ)"
-#: builtin/push.c:513 builtin/send-pack.c:164
+#: builtin/push.c:523 builtin/send-pack.c:164
msgid "force updates"
msgstr "강제로 ì—…ë°ì´íŠ¸"
-#: builtin/push.c:515 builtin/send-pack.c:175
+#: builtin/push.c:525 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "ë ˆí¼ëŸ°ìŠ¤ì´ë¦„>:<예ìƒ"
-#: builtin/push.c:516 builtin/send-pack.c:176
+#: builtin/push.c:526 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "ë ˆí¼ëŸ°ìŠ¤ì˜ 과거 ê°’ì´ ì´ ê°’ì´ì–´ì•¼ 합니다"
-#: builtin/push.c:519
+#: builtin/push.c:529
msgid "control recursive pushing of submodules"
msgstr "ìž¬ê·€ì  í•˜ìœ„ 모듈 푸시 ë°©ì‹ì„ 설정합니다"
-#: builtin/push.c:521 builtin/send-pack.c:169
+#: builtin/push.c:531 builtin/send-pack.c:169
msgid "use thin pack"
msgstr "ì–‡ì€ ë¬¶ìŒì„ 사용합니다"
-#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
+#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "receive pack 프로그램"
-#: builtin/push.c:524
+#: builtin/push.c:534
msgid "set upstream for git pull/status"
msgstr "git pull/statusì— ëŒ€í•œ ì—…ìŠ¤íŠ¸ë¦¼ì„ ì„¤ì •í•©ë‹ˆë‹¤"
-#: builtin/push.c:527
+#: builtin/push.c:537
msgid "prune locally removed refs"
msgstr "로컬ì—ì„œ 제거한 ë ˆí¼ëŸ°ìŠ¤ë¥¼ 잘ë¼ëƒ…니다"
-#: builtin/push.c:529
+#: builtin/push.c:539
msgid "bypass pre-push hook"
msgstr "푸시 ì „ 후í¬ë¥¼ 건너ëœë‹ˆë‹¤"
-#: builtin/push.c:530
+#: builtin/push.c:540
msgid "push missing but relevant tags"
msgstr "빠졌지만 ê´€ë ¨ëœ íƒœê·¸ë¥¼ 푸시합니다"
-#: builtin/push.c:533 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "í‘¸ì‹œì— GPG 서명"
-#: builtin/push.c:535 builtin/send-pack.c:170
+#: builtin/push.c:545 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "리모트 ìª½ì— ì›ìž íŠ¸ëžœìž­ì…˜ì„ ìš”ì²­í•©ë‹ˆë‹¤"
-#: builtin/push.c:549
+#: builtin/push.c:546
+msgid "server-specific"
+msgstr "서버-전용-옵션"
+
+#: builtin/push.c:546
+msgid "option to transmit"
+msgstr "전송할 옵션"
+
+#: builtin/push.c:560
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete ì˜µì…˜ì€ --all, --mirror, --tags 옵션과 호환ë˜ì§€ 않습니다"
-#: builtin/push.c:551
+#: builtin/push.c:562
msgid "--delete doesn't make sense without any refs"
msgstr "--delete ì˜µì…˜ì€ ë ˆí¼ëŸ°ìŠ¤ ì—†ì´ ì•žë’¤ê°€ 맞지 않습니다"
+#: builtin/push.c:579
+msgid "push options must not have new line characters"
+msgstr "푸시 옵션ì—는 줄바꿈 문ìžê°€ 들어갈 수 없습니다"
+
#: builtin/read-tree.c:37
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
@@ -9705,11 +10164,11 @@ msgstr "unpack-trees 디버깅"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:1719
+#: builtin/receive-pack.c:1845
msgid "quiet"
msgstr "출력 않기"
-#: builtin/receive-pack.c:1733
+#: builtin/receive-pack.c:1859
msgid "You must specify a directory."
msgstr "디렉터리를 지정해야 합니다."
@@ -9859,12 +10318,12 @@ msgstr "--mirror 옵션과 ê°™ì´ ë§ˆìŠ¤í„° 브랜치를 지정하면 앞뒤가
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "마스터 브랜치를 ì§€ì •ì€ fetch 미러ì—서만 앞뒤가 맞습니다"
-#: builtin/remote.c:190 builtin/remote.c:633
+#: builtin/remote.c:190 builtin/remote.c:629
#, c-format
msgid "remote %s already exists."
msgstr "%s 리모트가 ì´ë¯¸ 있습니다."
-#: builtin/remote.c:194 builtin/remote.c:637
+#: builtin/remote.c:194 builtin/remote.c:633
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s'ì€(는) 올바른 리모트 ì´ë¦„ì´ ì•„ë‹™ë‹ˆë‹¤"
@@ -9887,17 +10346,17 @@ msgstr "(ì¼ì¹˜)"
msgid "(delete)"
msgstr "(삭제)"
-#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
#, c-format
msgid "No such remote: %s"
msgstr "그런 리모트가 없습니다: %s"
-#: builtin/remote.c:643
+#: builtin/remote.c:639
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "설정 ì„¹ì…˜ì„ '%s'ì—ì„œ '%s'(으)ë¡œ 바꿀 수 없습니다"
-#: builtin/remote.c:663
+#: builtin/remote.c:659
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -9908,17 +10367,17 @@ msgstr ""
"\t%s\n"
"\t필요하면 ì„¤ì •ì„ ìˆ˜ë™ìœ¼ë¡œ ì—…ë°ì´íŠ¸í•˜ì‹­ì‹œì˜¤."
-#: builtin/remote.c:699
+#: builtin/remote.c:695
#, c-format
msgid "deleting '%s' failed"
msgstr "'%s' 삭제가 실패했습니다"
-#: builtin/remote.c:733
+#: builtin/remote.c:729
#, c-format
msgid "creating '%s' failed"
msgstr "'%s' 만들기가 실패했습니다"
-#: builtin/remote.c:796
+#: builtin/remote.c:792
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -9930,280 +10389,290 @@ msgstr[0] ""
"다.\n"
"삭제하려면 다ìŒì„ 사용하십시오:"
-#: builtin/remote.c:810
+#: builtin/remote.c:806
#, c-format
msgid "Could not remove config section '%s'"
msgstr "설정 섹션 '%s'ì„(를) 제거할 수 없습니다"
-#: builtin/remote.c:911
+#: builtin/remote.c:907
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 새 항목 (ë‹¤ìŒ ê°€ì ¸ì˜¤ê¸°ëŠ” remotes/%s 아래 저장ë©ë‹ˆë‹¤)"
-#: builtin/remote.c:914
+#: builtin/remote.c:910
msgid " tracked"
msgstr " 추ì ë¨"
-#: builtin/remote.c:916
+#: builtin/remote.c:912
msgid " stale (use 'git remote prune' to remove)"
msgstr " ì˜¤ëž˜ë¨ (제거하려면 'git remote prune'ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: builtin/remote.c:918
+#: builtin/remote.c:914
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:959
+#: builtin/remote.c:955
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "ìž˜ëª»ëœ branch.%s.merge ê°’. 여러 ê°œ 브랜치로 리베ì´ìŠ¤í•  수 없습니다"
-#: builtin/remote.c:967
+#: builtin/remote.c:963
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "리모트 %s 위로 대화ì‹ìœ¼ë¡œ 리베ì´ìŠ¤í•©ë‹ˆë‹¤"
-#: builtin/remote.c:971
+#: builtin/remote.c:964
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "리모트 %s 위로 리베ì´ìŠ¤í•©ë‹ˆë‹¤"
+
+#: builtin/remote.c:967
#, c-format
msgid " merges with remote %s"
msgstr " 병합: 리모트 %s"
-#: builtin/remote.c:972
-msgid " and with remote"
-msgstr " 그리고 리모트"
-
-#: builtin/remote.c:974
+#: builtin/remote.c:970
#, c-format
msgid "merges with remote %s"
msgstr "병합: 리모트 %s"
-#: builtin/remote.c:975
-msgid " and with remote"
-msgstr " 그리고 리모트"
+#: builtin/remote.c:973
+#, c-format
+msgid "%-*s and with remote %s\n"
+msgstr "%-*s 그리고 리모트 %s\n"
-#: builtin/remote.c:1021
+#: builtin/remote.c:1016
msgid "create"
msgstr "만들기"
-#: builtin/remote.c:1024
+#: builtin/remote.c:1019
msgid "delete"
msgstr "삭제"
-#: builtin/remote.c:1028
+#: builtin/remote.c:1023
msgid "up to date"
msgstr "최신 ìƒíƒœ"
-#: builtin/remote.c:1031
+#: builtin/remote.c:1026
msgid "fast-forwardable"
msgstr "정방향 진행 가능"
-#: builtin/remote.c:1034
+#: builtin/remote.c:1029
msgid "local out of date"
msgstr "ë¡œì»¬ì´ ë’¤ë–¨ì–´ì§"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1036
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*sì—ì„œ %-*s(으)ë¡œ ê°•ì œ (%s)"
-#: builtin/remote.c:1044
+#: builtin/remote.c:1039
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*sì—ì„œ %-*s(으)ë¡œ 푸시 (%s)"
-#: builtin/remote.c:1048
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*sì—ì„œ %s(으)ë¡œ ê°•ì œ"
-#: builtin/remote.c:1051
+#: builtin/remote.c:1046
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*sì—ì„œ %s(으)ë¡œ 푸시"
-#: builtin/remote.c:1119
+#: builtin/remote.c:1114
msgid "do not query remotes"
msgstr "ë¦¬ëª¨íŠ¸ì— ì§ˆì˜í•˜ì§€ 않습니다"
-#: builtin/remote.c:1146
+#: builtin/remote.c:1141
#, c-format
msgid "* remote %s"
msgstr "* 리모트 %s"
-#: builtin/remote.c:1147
+#: builtin/remote.c:1142
#, c-format
msgid " Fetch URL: %s"
msgstr " 가져오기 URL: %s"
-#: builtin/remote.c:1148 builtin/remote.c:1301
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
msgid "(no URL)"
msgstr "(URL ì—†ìŒ)"
#. TRANSLATORS: the colon ':' should align with
#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1159 builtin/remote.c:1161
+#: builtin/remote.c:1154 builtin/remote.c:1156
#, c-format
msgid " Push URL: %s"
msgstr " 푸시 URL: %s"
-#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
+#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 브랜치: %s"
-#: builtin/remote.c:1169
+#: builtin/remote.c:1158
+msgid "(not queried)"
+msgstr "(질ì˜í•˜ì§€ ì•ŠìŒ)"
+
+#: builtin/remote.c:1160
+msgid "(unknown)"
+msgstr "(ì•Œ 수 ì—†ìŒ)"
+
+#: builtin/remote.c:1164
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 브랜치 (리모트 HEAD는 애매하고, ë‹¤ìŒ ì¤‘ í•˜ë‚˜ì¼ ìˆ˜ 있습니다):\n"
-#: builtin/remote.c:1181
+#: builtin/remote.c:1176
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " 리모트 브랜치:%s"
-#: builtin/remote.c:1184 builtin/remote.c:1211
+#: builtin/remote.c:1179 builtin/remote.c:1206
msgid " (status not queried)"
msgstr " (ìƒíƒœë¥¼ 질ì˜í•˜ì§€ ì•ŠìŒ)"
-#: builtin/remote.c:1193
+#: builtin/remote.c:1188
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 'git pull'ì— ì‚¬ìš©í•  로컬 브랜치를 설정:"
-#: builtin/remote.c:1201
+#: builtin/remote.c:1196
msgid " Local refs will be mirrored by 'git push'"
msgstr " 로컬 ë ˆí¼ëŸ°ìŠ¤ë¥¼ 'git push'ë¡œ 미러ë§í•  예정"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1203
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " 로컬 ë ˆí¼ëŸ°ìŠ¤ë¥¼ 'git push'ë¡œ 미러ë§%s:"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1224
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "ë ˆí¼ëŸ°ìŠ¤/리모트/<ì´ë¦„>/HEAD ê°’ì„ ë¦¬ëª¨íŠ¸ì— ë§žê²Œ 설정합니다"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1226
msgid "delete refs/remotes/<name>/HEAD"
msgstr "ë ˆí¼ëŸ°ìŠ¤/리모트/<ì´ë¦„>/HEAD ê°’ì„ ì‚­ì œí•©ë‹ˆë‹¤"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1241
msgid "Cannot determine remote HEAD"
msgstr "리모트 HEAD를 결정할 수 없습니다"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1243
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"리모트 HEAD 브랜치가 여러개입니다. ë‹¤ìŒ ì¤‘ 하나를 명시ì ìœ¼ë¡œ 지정하십시오:"
-#: builtin/remote.c:1258
+#: builtin/remote.c:1253
#, c-format
msgid "Could not delete %s"
msgstr "%sì„(를) 삭제할 수 없습니다"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1261
#, c-format
msgid "Not a valid ref: %s"
msgstr "올바른 ë ˆí¼ëŸ°ìŠ¤ê°€ 아닙니다: %s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1263
#, c-format
msgid "Could not setup %s"
msgstr "%sì„(를) 설정할 수 없습니다"
-#: builtin/remote.c:1286
+#: builtin/remote.c:1281
#, c-format
msgid " %s will become dangling!"
msgstr " %sì˜ ì—°ê²°ì´ ëŠì–´ì§‘니다!"
-#: builtin/remote.c:1287
+#: builtin/remote.c:1282
#, c-format
msgid " %s has become dangling!"
msgstr " %sì˜ ì—°ê²°ì´ ëŠì–´ì¡ŒìŠµë‹ˆë‹¤!"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1292
#, c-format
msgid "Pruning %s"
msgstr "잘ë¼ëƒ„: %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1293
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1309
#, c-format
msgid " * [would prune] %s"
msgstr " * [잘ë¼ë‚¼ 예정] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1312
#, c-format
msgid " * [pruned] %s"
msgstr " * [잘ë¼ëƒ„] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1357
msgid "prune remotes after fetching"
msgstr "가져온 í›„ì— ë¦¬ëª¨íŠ¸ë¥¼ 잘ë¼ëƒ…니다"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
#, c-format
msgid "No such remote '%s'"
msgstr "그런 리모트가 없습니다 ('%s')"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1436
msgid "add branch"
msgstr "브랜치를 추가합니다"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1443
msgid "no remote specified"
msgstr "리모트를 지정하지 않았습니다"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1460
msgid "query push URLs rather than fetch URLs"
msgstr "가져오기 URLì´ ì•„ë‹ˆë¼ í‘¸ì‹œ URLì„ ì§ˆì˜í•©ë‹ˆë‹¤"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1462
msgid "return all URLs"
msgstr "모든 URLì„ ë¦¬í„´í•©ë‹ˆë‹¤"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1490
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "'%s' ë¦¬ëª¨íŠ¸ì— ëŒ€í•œ URLì„ ì„¤ì •í•˜ì§€ 않았습니다"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1516
msgid "manipulate push URLs"
msgstr "푸시 URLì„ ì§€ì •í•©ë‹ˆë‹¤"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1518
msgid "add URL"
msgstr "URLì„ ì¶”ê°€í•©ë‹ˆë‹¤"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1520
msgid "delete URLs"
msgstr "URLì„ ì‚­ì œí•©ë‹ˆë‹¤"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1527
msgid "--add --delete doesn't make sense"
msgstr "--add --delete ì˜µì…˜ì„ ë‘˜ë‹¤ ì“°ë©´ 안 ë©ë‹ˆë‹¤"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1568
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "ìž˜ëª»ëœ ì˜¤ëž˜ì „ URL 패턴: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1576
#, c-format
msgid "No such URL found: %s"
msgstr "그런 URLì´ ì—†ìŠµë‹ˆë‹¤: %s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1578
msgid "Will not delete all non-push URLs"
msgstr "í‘¸ì‹œìš©ì´ ì•„ë‹Œ 모든 URLì„ ì‚­ì œí•˜ì§€ 않습니다"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1592
msgid "be verbose; must be placed before a subcommand"
msgstr "ìžì„¸ížˆ 표시합니다 (하위 명령 ì•žì— ì™€ì•¼ 합니다)"
@@ -10211,79 +10680,87 @@ msgstr "ìžì„¸ížˆ 표시합니다 (하위 명령 ì•žì— ì™€ì•¼ 합니다)"
msgid "git repack [<options>]"
msgstr "git repack [<옵션>]"
-#: builtin/repack.c:159
+#: builtin/repack.c:160
msgid "pack everything in a single pack"
msgstr "í•˜ë‚˜ì˜ ë¬¶ìŒ ì•ˆì— ëª¨ë‘ ë¬¶ìŠµë‹ˆë‹¤"
-#: builtin/repack.c:161
+#: builtin/repack.c:162
msgid "same as -a, and turn unreachable objects loose"
msgstr "-a와 ë™ì¼í•˜ê³ , ì ‘ê·¼ 불가능 오브ì íŠ¸ë¥¼ ëŠìŠ¨í•˜ê²Œ 바꿉니다"
-#: builtin/repack.c:164
+#: builtin/repack.c:165
msgid "remove redundant packs, and run git-prune-packed"
msgstr "ì—¬ë¶„ì˜ ë¬¶ìŒì„ 제거하고, git-prune-packed를 실행합니다"
-#: builtin/repack.c:166
+#: builtin/repack.c:167
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "git-pack-objectsì— --no-reuse-delta ì˜µì…˜ì„ ë„˜ê¹ë‹ˆë‹¤"
-#: builtin/repack.c:168
+#: builtin/repack.c:169
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "git-pack-objectsì— --no-reuse-object ì˜µì…˜ì„ ë„˜ê¹ë‹ˆë‹¤"
-#: builtin/repack.c:170
+#: builtin/repack.c:171
msgid "do not run git-update-server-info"
msgstr "git-update-server-info를 실행하지 않습니다"
-#: builtin/repack.c:173
+#: builtin/repack.c:174
msgid "pass --local to git-pack-objects"
msgstr "git-pack-objectsì— --local ì˜µì…˜ì„ ë„˜ê¹ë‹ˆë‹¤"
-#: builtin/repack.c:175
+#: builtin/repack.c:176
msgid "write bitmap index"
msgstr "비트맵 ì¸ë±ìŠ¤ë¥¼ ì”니다"
-#: builtin/repack.c:176
+#: builtin/repack.c:177
msgid "approxidate"
msgstr "대략ì˜ì‹œê°"
-#: builtin/repack.c:177
+#: builtin/repack.c:178
msgid "with -A, do not loosen objects older than this"
msgstr ""
"-Aì— ì¶”ê°€ë¡œ, 지정한 ì‹œê°ë³´ë‹¤ ì˜¤ëž˜ëœ ì˜¤ë¸Œì íŠ¸ë¥¼ ëŠìŠ¨í•˜ê²Œ 만들지 않습니다"
-#: builtin/repack.c:179
+#: builtin/repack.c:180
+msgid "with -a, repack unreachable objects"
+msgstr "-a와 ê°™ì´, ì ‘ê·¼ 불가능 오브ì íŠ¸ë¥¼ 다시 묶습니다"
+
+#: builtin/repack.c:182
msgid "size of the window used for delta compression"
msgstr "ë¸íƒ€ ì••ì¶•ì— ì‚¬ìš©í•  윈ë„ìš° í¬ê¸°"
-#: builtin/repack.c:180 builtin/repack.c:184
+#: builtin/repack.c:183 builtin/repack.c:187
msgid "bytes"
msgstr "ë°”ì´íŠ¸ìˆ˜"
-#: builtin/repack.c:181
+#: builtin/repack.c:184
msgid "same as the above, but limit memory size instead of entries count"
msgstr "위와 ë™ì¼í•˜ì§€ë§Œ, 항목 수 대신 메모리 í¬ê¸°ë¥¼ 제한합니다"
-#: builtin/repack.c:183
+#: builtin/repack.c:186
msgid "limits the maximum delta depth"
msgstr "최대 ë¸íƒ€ 깊ì´ë¥¼ 제한합니다"
-#: builtin/repack.c:185
+#: builtin/repack.c:188
msgid "maximum size of each packfile"
msgstr "ë¬¶ìŒ íŒŒì¼ì˜ 최대 í¬ê¸°"
-#: builtin/repack.c:187
+#: builtin/repack.c:190
msgid "repack objects in packs marked with .keep"
msgstr ".keep으로 í‘œì‹œëœ ë¬¶ìŒì˜ 오브ì íŠ¸ë¥¼ 다시 묶습니다"
-#: builtin/repack.c:197
+#: builtin/repack.c:200
msgid "cannot delete packs in a precious-objects repo"
msgstr "precious-objects ì €ìž¥ì†Œì˜ ë¬¶ìŒì„ 삭제할 수 없습니다"
-#: builtin/repack.c:381
+#: builtin/repack.c:204
+msgid "--keep-unreachable and -A are incompatible"
+msgstr "--keep-unreachable ë° -A ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다"
+
+#: builtin/repack.c:391 builtin/worktree.c:115
#, c-format
-msgid "removing '%s' failed"
-msgstr "'%s' 제거가 실패했습니다"
+msgid "failed to remove '%s'"
+msgstr "'%s' ì œê±°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
#: builtin/replace.c:19
msgid "git replace [-f] <object> <replacement>"
@@ -10506,7 +10983,7 @@ msgstr "ì¸ë±ìŠ¤ 파ì¼ì„ '%s' 리비전으로 리셋할 수 없습니다."
msgid "Could not write new index file."
msgstr "새 ì¸ë±ìŠ¤ 파ì¼ì„ 쓸 수 없습니다."
-#: builtin/rev-list.c:350
+#: builtin/rev-list.c:362
msgid "rev-list does not support display of notes"
msgstr "rev-list는 노트 표시를 지ì›í•˜ì§€ 않습니다"
@@ -10599,31 +11076,27 @@ msgstr "옵션"
msgid "option for merge strategy"
msgstr "병합 전략 옵션"
-#: builtin/revert.c:104
+#: builtin/revert.c:100
msgid "append commit name"
msgstr "커밋 ì´ë¦„ì„ ë’¤ì— ë¶™ìž…ë‹ˆë‹¤"
-#: builtin/revert.c:106
+#: builtin/revert.c:102
msgid "preserve initially empty commits"
msgstr "최초 빈 ì»¤ë°‹ì„ ìœ ì§€í•©ë‹ˆë‹¤"
-#: builtin/revert.c:107
+#: builtin/revert.c:103
msgid "allow commits with empty messages"
msgstr "빈 메시지로 ì»¤ë°‹ì„ í—ˆìš©í•©ë‹ˆë‹¤"
-#: builtin/revert.c:108
+#: builtin/revert.c:104
msgid "keep redundant, empty commits"
msgstr "ì—¬ë¶„ì˜ ë¹ˆ ì»¤ë°‹ì„ ìœ ì§€í•©ë‹ˆë‹¤"
-#: builtin/revert.c:112
-msgid "program error"
-msgstr "프로그램 오류"
-
-#: builtin/revert.c:197
+#: builtin/revert.c:192
msgid "revert failed"
msgstr "ë˜ëŒë¦¬ê¸° 실패"
-#: builtin/revert.c:212
+#: builtin/revert.c:207
msgid "cherry-pick failed"
msgstr "cherry-pick 실패"
@@ -10909,12 +11382,12 @@ msgstr "ì£¼ì„ ë¬¸ìžë¡œ 시작하는 모든 ì¤„ì„ ê±´ë„ˆë›°ê³  제거합니다
msgid "prepend comment character and space to each line"
msgstr "ê° ì¤„ì˜ ì•žì— ì£¼ì„ ë¬¸ìžì™€ ê³µë°±ì„ ë¶™ìž…ë‹ˆë‹¤"
-#: builtin/submodule--helper.c:24
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923
#, c-format
msgid "No such ref: %s"
msgstr "그런 ë ˆí¼ëŸ°ìŠ¤ê°€ 없습니다: %s"
-#: builtin/submodule--helper.c:31
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "ì „ì²´ ë ˆí¼ëŸ°ìŠ¤ ì´ë¦„ì´ í•„ìš”í•˜ì§€ë§Œ, ìž…ë ¥ì€ %s"
@@ -10924,8 +11397,8 @@ msgstr "ì „ì²´ ë ˆí¼ëŸ°ìŠ¤ ì´ë¦„ì´ í•„ìš”í•˜ì§€ë§Œ, ìž…ë ¥ì€ %s"
msgid "cannot strip one component off url '%s'"
msgstr "'%s' URL í•˜ë‚˜ì˜ ë‹¨ê³„ë¥¼ 잘ë¼ë‚¼ 수 없습니다"
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
-#: builtin/submodule--helper.c:486
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
+#: builtin/submodule--helper.c:483
msgid "alternative anchor for relative paths"
msgstr "ìƒëŒ€ ê²½ë¡œì— ì‚¬ìš©í•  ë˜ë‹¤ë¥¸ 기준"
@@ -10933,151 +11406,174 @@ msgstr "ìƒëŒ€ ê²½ë¡œì— ì‚¬ìš©í•  ë˜ë‹¤ë¥¸ 기준"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<경로>] [<경로>...]"
-#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ".gitmodulesì—ì„œ 하위 모듈 경로 '%s'ì— ëŒ€í•œ URLì´ ì—†ìŠµë‹ˆë‹¤"
-#: builtin/submodule--helper.c:366
+#: builtin/submodule--helper.c:364
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "하위 모듈 경로 '%s'ì— ëŒ€í•œ URLì„ ë“±ë¡í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/submodule--helper.c:370
+#: builtin/submodule--helper.c:368
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "'%3$s' ê²½ë¡œì— ëŒ€í•´ '%1$s' (%2$s) 하위 모듈 등ë¡\n"
-#: builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:378
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "경고: '%s' 하위 ëª¨ë“ˆì— ëŒ€í•´ 커맨드 ì—…ë°ì´íŠ¸ 모드가 제안ë˜ì—ˆìŠµë‹ˆë‹¤\n"
-#: builtin/submodule--helper.c:387
+#: builtin/submodule--helper.c:385
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "'%s' 하위 ëª¨ë“ˆì— ëŒ€í•´ ì—…ë°ì´íŠ¸ 모드 등ë¡ì´ 실패했습니다"
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:404
msgid "Suppress output for initializing a submodule"
msgstr "하위 모듈 ì´ˆê¸°í™”ì— ì¶œë ¥ì„ í•˜ì§€ 않습니다"
-#: builtin/submodule--helper.c:411
+#: builtin/submodule--helper.c:409
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<경로>]"
-#: builtin/submodule--helper.c:432
+#: builtin/submodule--helper.c:430
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <경로>"
-#: builtin/submodule--helper.c:438
+#: builtin/submodule--helper.c:436
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "경로 '%s'ì— ëŒ€í•´ .gitmodulesì— ìžˆëŠ” 하위모듈 ë§¤í•‘ì´ ì—†ìŠµë‹ˆë‹¤"
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:486
msgid "where the new submodule will be cloned to"
msgstr "새 하위 ëª¨ë“ˆì„ ë³µì œí•  ëŒ€ìƒ ìœ„ì¹˜"
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:489
msgid "name of the new submodule"
msgstr "새 하위 모듈 ì´ë¦„"
-#: builtin/submodule--helper.c:495
+#: builtin/submodule--helper.c:492
msgid "url where to clone the submodule from"
msgstr "하위 ëª¨ë“ˆì„ ë³µì œí•´ 올 URL"
-#: builtin/submodule--helper.c:501
+#: builtin/submodule--helper.c:498
msgid "depth for shallow clones"
msgstr "ì–•ì€ ë³µì œì— ì‚¬ìš©í•  깊ì´"
-#: builtin/submodule--helper.c:507
+#: builtin/submodule--helper.c:504
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
-msgstr "git submodule--helper clone [--prefix=<경로>] [--quiet] [--reference <저장소>] [--name <ì´ë¦„>] [--depth <깊ì´>] --url <url> --path <경로>"
+msgstr ""
+"git submodule--helper clone [--prefix=<경로>] [--quiet] [--reference <저장소"
+">] [--name <ì´ë¦„>] [--depth <깊ì´>] --url <url> --path <경로>"
-#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
+#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
#, c-format
msgid "could not create directory '%s'"
msgstr "'%s' 디렉터리를 만들 수 없습니다"
-#: builtin/submodule--helper.c:534
+#: builtin/submodule--helper.c:531
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "'%s'ì—ì„œ 하위 모듈 경로 '%s'ì— ë³µì œí•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:547
#, c-format
msgid "cannot open file '%s'"
msgstr "'%s' 파ì¼ì„ ì—´ 수 없습니다"
-#: builtin/submodule--helper.c:555
+#: builtin/submodule--helper.c:552
#, c-format
msgid "could not close file %s"
msgstr "%s 파ì¼ì„ ë‹«ì„ ìˆ˜ 없습니다"
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:559
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "'%s'ì— ëŒ€í•œ 하위 모듈 디렉터리를 가져올 수 없습니다"
-#: builtin/submodule--helper.c:609
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "'%s' 하위 모듈 경로가 초기화ë˜ì§€ 않았습니다"
-#: builtin/submodule--helper.c:613
+#: builtin/submodule--helper.c:615
msgid "Maybe you want to use 'update --init'?"
msgstr "'update --init'ì„ í•˜ë ¤ê³  í•œ 것 아니었습니까?"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:641
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "병합하지 하위 모듈 %s 건너뜀"
-#: builtin/submodule--helper.c:660
+#: builtin/submodule--helper.c:662
#, c-format
msgid "Skipping submodule '%s'"
msgstr "하위 모듈 '%s' 건너뜀"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:792
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "'%s' ë³µì œí•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤. ìž¬ì‹œë„ ì˜ˆì •"
+
+#: builtin/submodule--helper.c:803
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "ë‘번째 '%s' ë³µì œí•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤. 중지합니다"
+
+#: builtin/submodule--helper.c:824
msgid "path into the working tree"
msgstr "ìž‘ì—… í´ë”ë¡œ 가는 경로"
-#: builtin/submodule--helper.c:771
+#: builtin/submodule--helper.c:827
msgid "path into the working tree, across nested submodule boundaries"
msgstr "ìž‘ì—… í´ë”ë¡œ 가는 경로, ë‚´ìž¥ëœ í•˜ìœ„ ëª¨ë“ˆì˜ ê²½ê³„ 통과"
-#: builtin/submodule--helper.c:775
+#: builtin/submodule--helper.c:831
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout ë˜ëŠ” none"
-#: builtin/submodule--helper.c:779
+#: builtin/submodule--helper.c:835
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "지정한 ê°œìˆ˜ì˜ ë¦¬ë¹„ì „ì—ì„œ 잘린 ì–•ì€ ë³µì œë¥¼ 만듭니다"
-#: builtin/submodule--helper.c:782
+#: builtin/submodule--helper.c:838
msgid "parallel jobs"
msgstr "병렬 작업 개수"
-#: builtin/submodule--helper.c:783
+#: builtin/submodule--helper.c:840
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "최초 복제가 ì–•ì€ ë³µì œ ì¶”ì²œì„ ë”°ë¥¼ì§€ 여부"
+
+#: builtin/submodule--helper.c:841
msgid "don't print cloning progress"
msgstr "복제 ê³¼ì •ì„ í‘œì‹œí•˜ì§€ 않습니다"
-#: builtin/submodule--helper.c:788
+#: builtin/submodule--helper.c:846
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<경로>] [<경로>...]"
-#: builtin/submodule--helper.c:798
+#: builtin/submodule--helper.c:856
msgid "bad value for update parameter"
msgstr "파ë¼ë¯¸í„° ì—…ë°ì´íŠ¸ì— ê°’ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/submodule--helper.c:855
+#: builtin/submodule--helper.c:927
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr "하위 모듈 (%s) 브랜치가 ìƒìœ„ 프로ì íŠ¸ 브랜치를 ì´ì–´ë°›ë„ë¡ ì„¤ì •ë˜ì—ˆì§€ë§Œ, ìƒìœ„ 프로ì íŠ¸ì— 브랜치가 없습니다"
+
+#: builtin/submodule--helper.c:977
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "submodule--helper 하위 ëª…ë ¹ì€ í•˜ìœ„ 명령으로 호출해야 합니다"
-#: builtin/submodule--helper.c:862
+#: builtin/submodule--helper.c:984
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s'ì€(는) 올바른 submodule--helper 하위 ëª…ë ¹ì´ ì•„ë‹™ë‹ˆë‹¤"
@@ -11418,14 +11914,6 @@ msgstr "<모드>,<오브ì íŠ¸>,<경로>"
msgid "add the specified entry to the index"
msgstr "지정한 í•­ëª©ì„ ì¸ë±ìŠ¤ì— 추가합니다"
-#: builtin/update-index.c:958
-msgid "(+/-)x"
-msgstr "(+/-)x"
-
-#: builtin/update-index.c:959
-msgid "override the executable bit of the listed files"
-msgstr "목ë¡ì˜ 파ì¼ì—ì„œ 실행 가능 비트를 바꿉니다"
-
#: builtin/update-index.c:963
msgid "mark files as \"not changing\""
msgstr "파ì¼ì„ \"바꾸지 ì•ŠìŒ\"으로 표시합니다"
@@ -11501,7 +11989,7 @@ msgstr "íŒŒì¼ ì‹œìŠ¤í…œì´ ì¶”ì í•˜ì§€ 않는 ìºì‹œë¥¼ 지ì›í•˜ëŠ”지 검사
#: builtin/update-index.c:1014
msgid "enable untracked cache without testing the filesystem"
-msgstr "íŒŒì¼ ì‹œìŠ¤í…œ 테스트 ì—†ì´ ì¶”ì í•˜ì§€ 않는 ìºì‹œë¥¼ 사용합니다"
+msgstr "íŒŒì¼ ì‹œìŠ¤í…œ 시험 ì—†ì´ ì¶”ì í•˜ì§€ 않는 ìºì‹œë¥¼ 사용합니다"
#: builtin/update-index.c:1134
msgid "Untracked cache disabled"
@@ -11585,82 +12073,109 @@ msgid "git worktree add [<options>] <path> [<branch>]"
msgstr "git worktree add [<옵션>] <경로> [<브랜치>]"
#: builtin/worktree.c:16
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<옵션>]"
+
+#: builtin/worktree.c:17
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<옵션>] <경로>"
+
+#: builtin/worktree.c:18
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<옵션>]"
-#: builtin/worktree.c:17
-msgid "git worktree list [<options>]"
-msgstr "git worktree list [<옵션>]"
+#: builtin/worktree.c:19
+msgid "git worktree unlock <path>"
+msgstr "git worktree unlock <경로>"
-#: builtin/worktree.c:40
+#: builtin/worktree.c:42
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "worktrees/%s 제거: 올바른 디렉터리가 아닙나다"
-#: builtin/worktree.c:46
+#: builtin/worktree.c:48
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "worktrees/%s 제거: gitdir 파ì¼ì´ 없습니다"
-#: builtin/worktree.c:51
+#: builtin/worktree.c:53
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "worktrees/%s 제거: gitdir 파ì¼ì„ ì½ì„ 수 없습니다 (%s)"
-#: builtin/worktree.c:62
+#: builtin/worktree.c:64
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "worktrees/%s 제거: gitdir 파ì¼ì´ 올바르지 않습니다"
-#: builtin/worktree.c:78
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "worktrees/%s 제거: gitdir 파ì¼ì´ 없는 위치를 가리킵니다"
-#: builtin/worktree.c:113
-#, c-format
-msgid "failed to remove '%s'"
-msgstr "'%s' ì œê±°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-
-#: builtin/worktree.c:202
+#: builtin/worktree.c:204
#, c-format
msgid "'%s' already exists"
msgstr "'%s'ì´(ê°€) ì´ë¯¸ 있습니다"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:236
#, c-format
msgid "could not create directory of '%s'"
msgstr "'%s'ì˜ ë””ë ‰í„°ë¦¬ë¥¼ 만들 수 없습니다"
-#: builtin/worktree.c:270
+#: builtin/worktree.c:272
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "%s 준비 중 (ID %s)"
-#: builtin/worktree.c:322
+#: builtin/worktree.c:323
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "다른 ìž‘ì—… í´ë”ì—ì„œ ì²´í¬ì•„웃했ë”ë¼ë„ <브랜치>를 ì²´í¬ì•„웃합니다"
-#: builtin/worktree.c:324
+#: builtin/worktree.c:325
msgid "create a new branch"
msgstr "새 브랜치를 만듭니다"
-#: builtin/worktree.c:326
+#: builtin/worktree.c:327
msgid "create or reset a branch"
msgstr "브랜치를 만들거나 리셋합니다"
-#: builtin/worktree.c:327
-msgid "detach HEAD at named commit"
-msgstr "HEAD를 해당 커밋ì—ì„œ 분리합니다"
-
-#: builtin/worktree.c:328
+#: builtin/worktree.c:329
msgid "populate the new working tree"
msgstr "새 ìž‘ì—… í´ë”를 만듭니다"
-#: builtin/worktree.c:336
+#: builtin/worktree.c:337
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B, --detach 옵션 중 하나만 쓸 수 있습니다"
+#: builtin/worktree.c:470
+msgid "reason for locking"
+msgstr "잠그는 ì´ìœ "
+
+#: builtin/worktree.c:482 builtin/worktree.c:515
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr "'%s'ì€(는) ìž‘ì—… í´ë”ê°€ 아닙니다"
+
+#: builtin/worktree.c:484 builtin/worktree.c:517
+msgid "The main working tree cannot be locked or unlocked"
+msgstr "ë©”ì¸ ìž‘ì—… í´ë”를 잠그거나 잠금 해제할 수 없습니다"
+
+#: builtin/worktree.c:489
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "'%s'ì€(는) ì´ë¯¸ 잠겼습니다. ì´ìœ : %s"
+
+#: builtin/worktree.c:491
+#, c-format
+msgid "'%s' is already locked"
+msgstr "'%s'ì€(는) ì´ë¯¸ 잠겼습니다"
+
+#: builtin/worktree.c:519
+#, c-format
+msgid "'%s' is not locked"
+msgstr "'%s'ì€(는) 잠기지 않았습니다"
+
#: builtin/write-tree.c:13
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<ì ‘ë‘ì–´>/]"
@@ -11677,6 +12192,26 @@ msgstr "하위 디렉터리 <ì ‘ë‘ì–´>ì— ëŒ€í•´ 트리 오브ì íŠ¸ë¥¼ ì”니ë
msgid "only useful for debugging"
msgstr "디버깅 ìš©ë„로만 사용"
+#: upload-pack.c:20
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<옵션>] <디렉터리>"
+
+#: upload-pack.c:837
+msgid "quit after a single request/response exchange"
+msgstr "í•˜ë‚˜ì˜ ìš”ì²­/ì‘답 êµí™˜ ë’¤ì— ë납니다"
+
+#: upload-pack.c:839
+msgid "exit immediately after initial ref advertisement"
+msgstr "최초 ë ˆí¼ëŸ°ìŠ¤ 알림 ë’¤ì— ì¦‰ì‹œ ë납니다"
+
+#: upload-pack.c:841
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "<디렉터리>ê°€ 깃 디렉터리가 아니면 <디렉터리>/.git/ í´ë”를 ì‹œë„하지 않습니다."
+
+#: upload-pack.c:843
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "<n>ì´ˆ ë™ì•ˆ ë°˜ì‘ì´ ì—†ìœ¼ë©´ ì „ì†¡ì„ ì¤‘ì§€í•©ë‹ˆë‹¤"
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "디버깅 메시지를 표준오류로 출력합니다"
@@ -11691,7 +12226,7 @@ msgstr ""
"목ë¡ì„ ë³¼ 수 있습니다. 특정 하위 명령어나 ê°œë…ì— ëŒ€í•´ ì½ì–´ 보려면 'git help\n"
"<명령>' ë˜ëŠ” 'git help <ê°œë…>' ëª…ë ¹ì„ ì‹¤í–‰í•˜ì‹­ì‹œì˜¤."
-#: http.c:322
+#: http.c:323
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "공개 키 ê³ ì •ì€ cURL 7.44.0 ì•ž 버전ì—서는 지ì›í•˜ì§€ 않습니다"
@@ -11823,32 +12358,32 @@ msgstr "SHA-1 í‘œì‹œì— <n>ê°œì˜ ìˆ«ìžë¥¼ 사용합니다"
msgid "update the index with reused conflict resolution if possible"
msgstr "가능하면 ì¸ë±ìŠ¤ë¥¼ 재사용한 ì¶©ëŒ í•´ê²°ë¡œ ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤"
-#: git-bisect.sh:55
+#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "\"git bisect start\" 명령으로 시작해야 합니다"
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:61
+#: git-bisect.sh:60
msgid "Do you want me to do it for you [Y/n]? "
msgstr "지금 하시겠습니까 [Y/n]? "
-#: git-bisect.sh:122
+#: git-bisect.sh:121
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "알 수 없는 옵션: '$arg'"
-#: git-bisect.sh:126
+#: git-bisect.sh:125
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "'$arg'ì€(는) 올바른 리비전처럼 ë³´ì´ì§€ 않습니다"
-#: git-bisect.sh:155
+#: git-bisect.sh:154
msgid "Bad HEAD - I need a HEAD"
msgstr "ìž˜ëª»ëœ HEAD - HEADê°€ 필요합니다"
-#: git-bisect.sh:168
+#: git-bisect.sh:167
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
@@ -11856,27 +12391,28 @@ msgstr ""
"'$start_head' 받아오기가 실패했습니다. 'git bisect reset <valid-branch>'를 "
"해 보십시오."
-#: git-bisect.sh:178
+#: git-bisect.sh:177
msgid "won't bisect on cg-seek'ed tree"
msgstr "cg-seekí•œ 트리ì—ì„œ bisect를 í•  수 없습니다"
-#: git-bisect.sh:182
+#: git-bisect.sh:181
msgid "Bad HEAD - strange symbolic ref"
msgstr "ìž˜ëª»ëœ HEAD - 심볼릭 ë ˆí¼ëŸ°ìŠ¤ê°€ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: git-bisect.sh:234
+#: git-bisect.sh:233
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "ìž˜ëª»ëœ bisect_write ì¸ìž: $state"
-#: git-bisect.sh:263
+#: git-bisect.sh:262
#, sh-format
msgid "Bad rev input: $arg"
msgstr "ìž˜ëª»ëœ ë¦¬ë¹„ì „ ìž…ë ¥: $arg"
-#: git-bisect.sh:278
-msgid "Please call 'bisect_state' with at least one argument."
-msgstr "'bisect_state' í˜¸ì¶œì€ ìµœì†Œí•œ í•˜ë‚˜ì˜ ì¸ìžë¥¼ ì¨ì•¼ 합니다."
+#: git-bisect.sh:281
+#, sh-format
+msgid "Bad rev input: $bisected_head"
+msgstr "ìž˜ëª»ëœ ë¦¬ë¹„ì „ ìž…ë ¥: $bisected_head"
#: git-bisect.sh:290
#, sh-format
@@ -12019,7 +12555,45 @@ msgstr ""
"'git bisect terms'ì— ëŒ€í•´ ìž˜ëª»ëœ ì¸ìž '$arg'.\n"
"지ì›í•˜ëŠ” 옵션ì€: --term-good|--term-old ë° --term-bad|--term-new."
-#: git-rebase.sh:57
+#: git-merge-octopus.sh:46
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr "오류: ë‹¤ìŒ íŒŒì¼ì˜ 로컬 변경 ì‚¬í•­ì„ ë³‘í•© ë•Œë¬¸ì— ë®ì–´ 쓰게 ë©ë‹ˆë‹¤."
+
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr "ìžë™ ë³‘í•©ì´ ë™ìž‘하지 않았습니다."
+
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an Octopus."
+msgstr "옥토í¼ìŠ¤ ì „ëžµ ë³‘í•©ì„ í•  수 없습니다."
+
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "$pretty_name(으)ë¡œ 공통 ì»¤ë°‹ì„ ì°¾ì„ ìˆ˜ 없습니다"
+
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up-to-date with $pretty_name"
+msgstr "ì´ë¯¸ $pretty_nameì— ì—…ë°ì´íŠ¸ ìƒíƒœìž…니다"
+
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "다ìŒìœ¼ë¡œ ì •ë°©í–¥ 진행: $pretty_name"
+
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "$pretty_nameì— ê°„ë‹¨í•œ 병합 ì‹œë„합니다"
+
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
+msgstr "간단한 ë³‘í•©ì´ ë™ìž‘하지 않습니다. ìžë™ ë³‘í•©ì„ ì‹œë„합니다."
+
+#: git-rebase.sh:56
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
@@ -12031,16 +12605,21 @@ msgstr ""
"ì›ëž˜ 브랜치를 ì²´í¬ì•„웃하고 리베ì´ìŠ¤ë¥¼ 중지하려면, \"git rebase --abort\"를 실"
"행하십시오."
-#: git-rebase.sh:168
+#: git-rebase.sh:156 git-rebase.sh:395
+#, sh-format
+msgid "Could not move back to $head_name"
+msgstr "'$head_name' 위치로 ëŒì•„ê°ˆ 수 없습니다"
+
+#: git-rebase.sh:167
msgid "Applied autostash."
msgstr "ìžë™ìŠ¤íƒœì‹œ ì ìš©."
-#: git-rebase.sh:171
+#: git-rebase.sh:170
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "\"$stash_sha1\"ì„(를) 저장할 수 없습니다"
-#: git-rebase.sh:172
+#: git-rebase.sh:171
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
@@ -12050,27 +12629,27 @@ msgstr ""
"변경 ì‚¬í•­ì€ ìŠ¤íƒœì‹œ ì•ˆì— ì•ˆì „í•˜ê²Œ 들어 있습니다.\n"
"언제든지 \"git stash pop\" ë˜ëŠ” \"git stash drop\"ì„ ì‹¤í–‰í•  수 있습니다.\n"
-#: git-rebase.sh:211
+#: git-rebase.sh:210
msgid "The pre-rebase hook refused to rebase."
msgstr "리베ì´ìŠ¤ ì „ 후í¬ì—ì„œ 리베ì´ìŠ¤ë¥¼ 거부했습니다."
-#: git-rebase.sh:216
+#: git-rebase.sh:215
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "git-amì´ ì§„í–‰ ì¤‘ì¸ ê²ƒì²˜ëŸ¼ 보입니다. 리베ì´ìŠ¤í•  수 없습니다."
-#: git-rebase.sh:357
+#: git-rebase.sh:356
msgid "No rebase in progress?"
msgstr "리베ì´ìŠ¤ê°€ 진행 중ì´ì§€ 않습니다"
-#: git-rebase.sh:368
+#: git-rebase.sh:367
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "--edit-todo ë™ìž‘ì€ ëŒ€í™”í˜• 리베ì´ìŠ¤ì—서만 사용할 수 있습니다."
-#: git-rebase.sh:375
+#: git-rebase.sh:374
msgid "Cannot read HEAD"
msgstr "HEAD를 ì½ì„ 수 없습니다"
-#: git-rebase.sh:378
+#: git-rebase.sh:377
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -12078,12 +12657,7 @@ msgstr ""
"모든 병합 충ëŒì„ 편집하고 git add\n"
"명령으로 í•´ê²°ë˜ì—ˆë‹¤ê³  표시해야 합니다"
-#: git-rebase.sh:396
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "'$head_name' 위치로 ëŒì•„ê°ˆ 수 없습니다"
-
-#: git-rebase.sh:415
+#: git-rebase.sh:414
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -12104,97 +12678,97 @@ msgstr ""
"ì´ ëª…ë ¹ì„ ë‹¤ì‹œ 실행하십시오. 중요한 ì‚¬í•­ì´ ë‚¨ì•„ ìžˆì„ ê²½ìš°ë¥¼\n"
"대비해 여기서 멈춥니다."
-#: git-rebase.sh:466
+#: git-rebase.sh:465
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "ìž˜ëª»ëœ ì—…ìŠ¤íŠ¸ë¦¼ $upstream_name"
-#: git-rebase.sh:490
+#: git-rebase.sh:489
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: 여러 ê°œì˜ ë³‘í•© ë² ì´ìŠ¤ê°€ 있습니다"
-#: git-rebase.sh:493 git-rebase.sh:497
+#: git-rebase.sh:492 git-rebase.sh:496
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: 병합 ë² ì´ìŠ¤ê°€ 없습니다"
-#: git-rebase.sh:502
+#: git-rebase.sh:501
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "올바른 ì»¤ë°‹ì„ ê°€ë¦¬í‚¤ì§€ 않습니다: $onto_name"
-#: git-rebase.sh:525
+#: git-rebase.sh:524
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "ì¹˜ëª…ì  ì´ìƒ: 그런 브랜치가 없습니다: $branch_name"
-#: git-rebase.sh:558
+#: git-rebase.sh:557
msgid "Cannot autostash"
msgstr "ìžë™ 스태시를 í•  수 없습니다"
-#: git-rebase.sh:563
+#: git-rebase.sh:562
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "ìžë™ 스태시를 만들었습니다: $stash_abbrev"
-#: git-rebase.sh:567
+#: git-rebase.sh:566
msgid "Please commit or stash them."
msgstr "커밋하거나 ìŠ¤íƒœì‹œì— ë„£ìœ¼ì‹­ì‹œì˜¤."
-#: git-rebase.sh:587
+#: git-rebase.sh:586
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "현재 브랜치가 ($branch_name) 최신 ìƒíƒœìž…니다."
-#: git-rebase.sh:591
+#: git-rebase.sh:590
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "현재 브랜치가 ($branch_name) 최신 ìƒíƒœìž…니다. ê°•ì œ 리베ì´ìŠ¤í•©ë‹ˆë‹¤."
-#: git-rebase.sh:602
+#: git-rebase.sh:601
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "변경 사항 '$mb'ì—ì„œ '$onto'(으)ë¡œ:"
-#: git-rebase.sh:611
+#: git-rebase.sh:610
msgid "First, rewinding head to replay your work on top of it..."
msgstr "ìž‘ì—… ì‚¬í•­ì„ ë‹¤ì‹œ 넣기 위해 먼저 헤드를 뒤로 ëŒë¦½ë‹ˆë‹¤..."
-#: git-rebase.sh:621
+#: git-rebase.sh:620
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name 브랜치를 $onto_name 위치로 정방향 진행합니다."
-#: git-stash.sh:51
+#: git-stash.sh:50
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear ëª…ë ¹ì„ íŒŒë¼ë¯¸í„°ì™€ ê°™ì´ ì“°ê¸°ëŠ” 구현ë˜ì§€ 않았습니다"
-#: git-stash.sh:74
+#: git-stash.sh:73
msgid "You do not have the initial commit yet"
msgstr "ì•„ì§ ìµœì´ˆ ì»¤ë°‹ì´ ì—†ìŠµë‹ˆë‹¤"
-#: git-stash.sh:89
+#: git-stash.sh:88
msgid "Cannot save the current index state"
msgstr "현재 ì¸ë±ìŠ¤ ìƒíƒœë¥¼ 저장할 수 없습니다"
-#: git-stash.sh:124 git-stash.sh:137
+#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "현재 ìž‘ì—… í´ë” ìƒíƒœë¥¼ 저장할 수 없습니다"
-#: git-stash.sh:141
+#: git-stash.sh:140
msgid "No changes selected"
msgstr "변경 ì‚¬í•­ì„ ì„ íƒí•˜ì§€ 않았습니다"
-#: git-stash.sh:144
+#: git-stash.sh:143
msgid "Cannot remove temporary index (can't happen)"
msgstr "ìž„ì‹œ ì¸ë±ìŠ¤ë¥¼ 제거할 수 없습니다 (ì¼ì–´ë‚  수 없는 ìƒí™©)"
-#: git-stash.sh:157
+#: git-stash.sh:156
msgid "Cannot record working tree state"
msgstr "ìž‘ì—… í´ë” ìƒíƒœë¥¼ 기ë¡í•  수 없습니다"
-#: git-stash.sh:189
+#: git-stash.sh:188
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "$ref_stashì„(를) $w_commit(으)ë¡œ ì—…ë°ì´íŠ¸í•  수 없습니다"
@@ -12209,7 +12783,7 @@ msgstr "$ref_stashì„(를) $w_commit(으)ë¡œ ì—…ë°ì´íŠ¸í•  수 없습니다"
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:239
+#: git-stash.sh:238
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -12218,108 +12792,117 @@ msgstr ""
"오류: 'stash save'ì— ëŒ€í•´ ì•Œ 수 없는 옵션: $option\n"
" 메시지를 넘기려면, 다ìŒê³¼ ê°™ì´ ì“°ì‹­ì‹œì˜¤: git stash save -- '$option'"
-#: git-stash.sh:260
+#: git-stash.sh:259
msgid "No local changes to save"
msgstr "저장할 로컬 변경 ì‚¬í•­ì´ ì—†ìŠµë‹ˆë‹¤"
-#: git-stash.sh:264
+#: git-stash.sh:263
msgid "Cannot initialize stash"
msgstr "스태시를 초기화할 수 없습니다"
-#: git-stash.sh:268
+#: git-stash.sh:267
msgid "Cannot save the current status"
msgstr "현재 ìƒíƒœë¥¼ 저장할 수 없습니다"
-#: git-stash.sh:286
+#: git-stash.sh:268
+#, sh-format
+msgid "Saved working directory and index state $stash_msg"
+msgstr "ìž‘ì—… í´ë”와 $stash_msg ì¸ë±ìŠ¤ ìƒíƒœë¥¼ 저장했습니다"
+
+#: git-stash.sh:285
msgid "Cannot remove worktree changes"
msgstr "ìž‘ì—…í´ë” 변경 ì‚¬í•­ì„ ì œê±°í•  수 없습니다"
-#: git-stash.sh:405
+#: git-stash.sh:404
#, sh-format
msgid "unknown option: $opt"
msgstr "알 수 없는 옵션: $opt"
-#: git-stash.sh:415
+#: git-stash.sh:414
msgid "No stash found."
msgstr "스태시가 없습니다."
-#: git-stash.sh:422
+#: git-stash.sh:421
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "너무 ë§Žì€ ë¦¬ë¹„ì „ì„ ì§€ì •í–ˆìŠµë‹ˆë‹¤: $REV"
-#: git-stash.sh:428
+#: git-stash.sh:427
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$referenceì€(는) 올바른 ë ˆí¼ëŸ°ìŠ¤ê°€ 아닙니다"
-#: git-stash.sh:456
+#: git-stash.sh:455
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args'ì€(는) 스태시 ì»¤ë°‹ì´ ì•„ë‹™ë‹ˆë‹¤"
-#: git-stash.sh:467
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args'ì€(는) 스태시 ë ˆí¼ëŸ°ìŠ¤ê°€ 아닙니다"
-#: git-stash.sh:475
+#: git-stash.sh:474
msgid "unable to refresh index"
msgstr "ì¸ë±ìŠ¤ë¥¼ 새로 ê³ ì¹  수 없습니다"
-#: git-stash.sh:479
+#: git-stash.sh:478
msgid "Cannot apply a stash in the middle of a merge"
msgstr "병합 ë„ì¤‘ì— ìŠ¤íƒœì‹œë¥¼ ì ìš©í•  수 없습니다"
-#: git-stash.sh:487
+#: git-stash.sh:486
msgid "Conflicts in index. Try without --index."
msgstr "ì¸ë±ìŠ¤ì— 충ëŒ. --index ì—†ì´ ì‹œë„í•´ 보십시오."
-#: git-stash.sh:489
+#: git-stash.sh:488
msgid "Could not save index tree"
msgstr "ì¸ë±ìŠ¤ 트리를 저장할 수 없습니다"
-#: git-stash.sh:523
+#: git-stash.sh:522
msgid "Cannot unstage modified files"
msgstr "수정한 파ì¼ì„ 스테ì´ì§€ì—ì„œ 뺄 수 없습니다"
-#: git-stash.sh:538
+#: git-stash.sh:537
msgid "Index was not unstashed."
msgstr "ì¸ë±ìŠ¤ê°€ 스태시ì—ì„œ 빠졌습니다."
-#: git-stash.sh:561
+#: git-stash.sh:551
+msgid "The stash is kept in case you need it again."
+msgstr "다시 필요할 때를 대비해 스태시를 보관합니다."
+
+#: git-stash.sh:560
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} 지움 ($s)"
-#: git-stash.sh:562
+#: git-stash.sh:561
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: 스태시 í•­ëª©ì„ ì§€ìš¸ 수 없습니다"
-#: git-stash.sh:570
+#: git-stash.sh:569
msgid "No branch name specified"
msgstr "브랜치 ì´ë¦„ì„ ì§€ì •í•˜ì§€ 않았습니다"
-#: git-stash.sh:642
+#: git-stash.sh:641
msgid "(To restore them type \"git stash apply\")"
msgstr "(복구하려면 \"git stash apply\"를 실행하십시오)"
-#: git-submodule.sh:219
+#: git-submodule.sh:183
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "ìƒëŒ€ 경로는 ìž‘ì—… í´ë”ì˜ ìµœìƒìœ„ì—서만 쓸 수 있습니다"
-#: git-submodule.sh:229
+#: git-submodule.sh:193
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "저장소 URL: '$repo' ê°’ì€ ì ˆëŒ€ 경로거나 ./ ë˜ëŠ” ../ë¡œ 시작해야 합니다."
-#: git-submodule.sh:246
+#: git-submodule.sh:210
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path'ì€(는) ì´ë¯¸ ì¸ë±ìŠ¤ì— 있습니다"
-#: git-submodule.sh:250
+#: git-submodule.sh:214
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -12330,93 +12913,86 @@ msgstr ""
"$sm_path\n"
"ì •ë§ë¡œ 추가하려면 -f ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤."
-#: git-submodule.sh:268
+#: git-submodule.sh:232
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "'$sm_path'ì˜ ê¸°ì¡´ 저장소를 ì¸ë±ìŠ¤ì— 추가합니다"
-#: git-submodule.sh:270
+#: git-submodule.sh:234
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path'ì´(ê°€) ì´ë¯¸ 있고 올바른 git 저장소가 아닙니다"
-#: git-submodule.sh:278
+#: git-submodule.sh:242
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "'$sm_name'ì— ëŒ€í•œ 깃 디렉터리가 로컬ì—ì„œ 리모트가 있는 채로 있습니다:"
-#: git-submodule.sh:280
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from"
-msgstr "다시 복제하지 ì•Šê³  ì´ ë¡œì»¬ 깃 디렉터리를 재활용하려면"
-
-#: git-submodule.sh:282
-#, sh-format
-msgid ""
-"use the '--force' option. If the local git directory is not the correct repo"
-msgstr ""
-"'--force' ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤. 로컬 깃 디렉터리가 올바른 저장소가 아니거나"
-
-#: git-submodule.sh:283
+#: git-submodule.sh:244
#, sh-format
msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+" $realrepo\n"
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
"or you are unsure what this means choose another name with the '--name' "
"option."
-msgstr "무슨 ì˜ë¯¸ì¸ì§€ 잘 모르겠다면 '--name' 옵션으로 다른 ì´ë¦„ì„ ì“°ì‹­ì‹œì˜¤."
+msgstr ""
+"ì´ ë¡œì»¬ 깃 디렉터리를 ë‹¤ìŒ ì €ìž¥ì†Œì—ì„œ 다시 복제하는 대신 다시 사용하려면,\n"
+" $realrepo\n"
+"'--force' ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤. 로컬 깃 디렉터리가 올바른 저장소가 아니거나\n"
+"무슨 ì˜ë¯¸ì¸ì§€ 잘 모르겠으면 '--name' 옵션으로 다른 ì´ë¦„ì„ ì„ íƒí•˜ì‹­ì‹œì˜¤."
-#: git-submodule.sh:285
+#: git-submodule.sh:250
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "로컬 깃 디렉터리를 '$sm_name' 하위모듈로 다시 활성화합니다."
-#: git-submodule.sh:297
+#: git-submodule.sh:262
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "'$sm_path' 하위 ëª¨ë“ˆì„ ì²´í¬ì•„웃할 수 없습니다"
-#: git-submodule.sh:302
+#: git-submodule.sh:267
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "'$sm_path' 하위 ëª¨ë“ˆì„ ì¶”ê°€í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: git-submodule.sh:311
+#: git-submodule.sh:276
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "'$sm_path' 하위 ëª¨ë“ˆì„ ë“±ë¡í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: git-submodule.sh:355
+#: git-submodule.sh:323
#, sh-format
msgid "Entering '$displaypath'"
msgstr "'$displaypath' 들어ê°"
-#: git-submodule.sh:375
+#: git-submodule.sh:343
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr "'$displaypath'ì—ì„œ 멈춤. 스í¬ë¦½íŠ¸ê°€ 0ì´ ì•„ë‹Œ ìƒíƒœë¥¼ 리턴함."
-#: git-submodule.sh:448
+#: git-submodule.sh:414
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "경로명세 ë° --all ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다"
-#: git-submodule.sh:453
+#: git-submodule.sh:419
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "ì •ë§ë¡œ 모든 하위 모듈 초기화를 해제하려면 '--all'ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤"
-#: git-submodule.sh:470
-#, sh-format
-msgid "Submodule work tree '$displaypath' contains a .git directory"
-msgstr "하위 모듈 ìž‘ì—… í´ë”ì— ('$displaypath') .git 디렉터리가 들어 있습니다"
-
-#: git-submodule.sh:471
+#: git-submodule.sh:439
#, sh-format
msgid ""
+"Submodule work tree '$displaypath' contains a .git directory\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr "(ì •ë§ë¡œ ê·¸ 커밋 내역까지 í¬í•¨í•´ 제거하려면 'rm -rf'를 사용하십시오)"
+msgstr ""
+"하위 모듈 ìž‘ì—… í´ë” '$displaypath'ì— .git 디렉터리가 들어 있습니다\n"
+"(ì •ë§ë¡œ ê·¸ 커밋 내역까지 í¬í•¨í•´ 제거하려면 'rm -rf'를 사용하십시오)"
-#: git-submodule.sh:477
+#: git-submodule.sh:447
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -12425,122 +13001,136 @@ msgstr ""
"하위 모듈 ìž‘ì—… í´ë”ì— ('$displaypath') 로컬 수정 ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤. 버리려면 '-"
"f'를 사용하십시오"
-#: git-submodule.sh:480
+#: git-submodule.sh:450
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "'$displaypath' 디렉터리를 지ì›ë‹ˆë‹¤"
-#: git-submodule.sh:481
+#: git-submodule.sh:451
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "하위 모듈 디렉터리를 ('$displaypath') 제거할 수 없습니다"
-#: git-submodule.sh:484
+#: git-submodule.sh:454
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "빈 하위 모듈 디렉터리를 ('$displaypath') 만들 수 없습니다"
-#: git-submodule.sh:493
+#: git-submodule.sh:463
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"'$name' 하위 ëª¨ë“ˆì´ ($url) '$displaypath' ê²½ë¡œì— ëŒ€í•´ 등ë¡ë˜ì§€ 않았습니다"
-#: git-submodule.sh:635
+#: git-submodule.sh:612
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "하위 모듈 경로ì—ì„œ ('$displaypath') 현재 ë¦¬ë¹„ì „ì„ ì°¾ì„ ìˆ˜ 없습니다"
-#: git-submodule.sh:644
+#: git-submodule.sh:622
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "하위 모듈 경로 '$sm_path'ì—ì„œ 가져올 수 없습니다"
-#: git-submodule.sh:667
+#: git-submodule.sh:627
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr "하위 모듈 경로 '$sm_path'ì—ì„œ 현재 ${remote_name}/${branch} ë¦¬ë¹„ì „ì„ ì°¾ì„ ìˆ˜ 없습니다"
+
+#: git-submodule.sh:645
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'ì—ì„œ 가져올 수 없습니다"
-#: git-submodule.sh:680
+#: git-submodule.sh:651
+#, sh-format
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr "'$displaypath' 하위 모듈 경로ì—ì„œ 가져왔지만, $sha1 ì»¤ë°‹ì´ ë“¤ì–´ìžˆì§€ 않습니다. ì´ ì»¤ë°‹ì„ ì§ì ‘ ê°€ì ¸ì˜¤ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
+
+#: git-submodule.sh:658
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'ì—ì„œ '$sha1'ì„(를) ì²´í¬ì•„웃할 수 없습니다"
-#: git-submodule.sh:681
+#: git-submodule.sh:659
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "하위 모듈 경로 '$displaypath': '$sha1' ì²´í¬ì•„웃"
-#: git-submodule.sh:685
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'ì—ì„œ '$sha1'ì„(를) 리베ì´ìŠ¤í•  수 없습니다"
-#: git-submodule.sh:686
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "하위 모듈 경로 '$displaypath': '$sha1'(으)ë¡œ 리베ì´ìŠ¤"
-#: git-submodule.sh:691
+#: git-submodule.sh:669
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'ì—ì„œ '$sha1' 병합할 수 없습니다"
-#: git-submodule.sh:692
+#: git-submodule.sh:670
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "하위 모듈 경로 '$displaypath': '$sha1'ì—ì„œ 병합"
-#: git-submodule.sh:697
+#: git-submodule.sh:675
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "'$command $sha1' ì‹¤í–‰ì´ í•˜ìœ„ 모듈 경로 '$displaypath'ì—ì„œ 실패했습니다"
-#: git-submodule.sh:698
+#: git-submodule.sh:676
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "하위 모듈 경로 '$displaypath': '$command $sha1'"
-#: git-submodule.sh:729
+#: git-submodule.sh:707
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "재귀ì ìœ¼ë¡œ 하위 모듈 경로 '$displaypath'ì— ë“¤ì–´ê°€ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: git-submodule.sh:837
+#: git-submodule.sh:815
msgid "The --cached option cannot be used with the --files option"
msgstr "--cached ì˜µì…˜ì€ --files 옵션과 ê°™ì´ ì“¸ 수 없습니다"
-#: git-submodule.sh:889
+#: git-submodule.sh:867
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "예ìƒì¹˜ 못한 모드 $mod_dst"
-#: git-submodule.sh:909
+#: git-submodule.sh:887
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 경고: '$display_name'ì— '$sha1_src' ì»¤ë°‹ì´ ë“¤ì–´ìžˆì§€ 않습니다"
-#: git-submodule.sh:912
+#: git-submodule.sh:890
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 경고: '$display_name'ì— '$sha1_dst' ì»¤ë°‹ì´ ë“¤ì–´ìžˆì§€ 않습니다"
-#: git-submodule.sh:915
+#: git-submodule.sh:893
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" 경고: '$display_name'ì— '$sha1_src' ë° '$sha1_dst' ì»¤ë°‹ì´ ë“¤ì–´ìžˆì§€ 않습니다"
-#: git-submodule.sh:940
+#: git-submodule.sh:918
msgid "blob"
msgstr "블롭"
-#: git-submodule.sh:1059
+#: git-submodule.sh:1040
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "재귀ì ìœ¼ë¡œ 하위 모듈 경로 '$sm_path'ì— ë“¤ì–´ê°€ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: git-submodule.sh:1123
+#: git-submodule.sh:1107
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "하위 모듈 URLì„ '$displaypath'ì— ëŒ€í•´ ë™ê¸°í™”"
@@ -12549,3 +13139,564 @@ msgstr "하위 모듈 URLì„ '$displaypath'ì— ëŒ€í•´ ë™ê¸°í™”"
#, sh-format
msgid "See git-${cmd}(1) for details."
msgstr "ìžì„¸í•œ 정보는 git-${cmd}(1) 페ì´ì§€ë¥¼ 참고하십시오."
+
+#: git-rebase--interactive.sh:131
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr "리베ì´ìŠ¤ì¤‘ ($new_count/$total)"
+
+#: git-rebase--interactive.sh:147
+msgid ""
+"\n"
+"Commands:\n"
+" p, pick = use commit\n"
+" r, reword = use commit, but edit the commit message\n"
+" e, edit = use commit, but stop for amending\n"
+" s, squash = use commit, but meld into previous commit\n"
+" f, fixup = like \"squash\", but discard this commit's log message\n"
+" x, exec = run command (the rest of the line) using shell\n"
+" d, drop = remove commit\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+"\n"
+"명령어:\n"
+" p, pick = 커밋 사용\n"
+" r, reword = 커밋 사용하지만, 커밋 메시지 편집\n"
+" e, edit = 커밋 사용하지만, 커밋 수정(amend)ì„ ìœ„í•´ 중단\n"
+" s, squash = 커밋 사용하지만, ì´ì „ 커밋과 합치기\n"
+" f, fixup = \"squash\"와 같지만, ì´ ì»¤ë°‹ì˜ ë¡œê·¸ 메시지를 버림\n"
+" x, exec = ì…¸ì„ ì‚¬ìš©í•´ 명령 실행 (ë’¤ì— ëª…ë ¹ 지정)\n"
+" d, drop = 커밋 제거\n"
+"\n"
+"ì´ ì¤„ì€ ìˆœì„œë¥¼ 바꿀 수 있습니다. 위ì—ì„œ 아래 순서로 실행합니다.\n"
+
+#: git-rebase--interactive.sh:162
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr "\nì¤„ì„ ì œê±°í•˜ì§€ 않습니다. ì»¤ë°‹ì„ ì œê±°í•˜ë ¤ë©´ 명시ì ìœ¼ë¡œ 'drop'ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤.\n"
+
+#: git-rebase--interactive.sh:166
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr "\n여기 ì¤„ì„ ì œê±°í•˜ë©´ 해당 ì»¤ë°‹ì„ ìžƒì–´ë²„ë¦½ë‹ˆë‹¤!\n"
+
+#: git-rebase--interactive.sh:202
+#, sh-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"지금 ë‹¤ìŒ ëª…ë ¹ìœ¼ë¡œ ì»¤ë°‹ì„ ìˆ˜ì •í•  수 있습니다:\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"변경 ì‚¬í•­ì— ë§Œì¡±í•˜ë©´, 다ìŒì„ 실행하십시오:\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:227
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
+msgstr "$sha1: 빼오기가 가능한 ì»¤ë°‹ì´ ì•„ë‹™ë‹ˆë‹¤"
+
+#: git-rebase--interactive.sh:266
+#, sh-format
+msgid "Invalid commit name: $sha1"
+msgstr "ìž˜ëª»ëœ ì»¤ë°‹ ì´ë¦„: $sha1"
+
+#: git-rebase--interactive.sh:308
+msgid "Cannot write current commit's replacement sha1"
+msgstr "현재 ì»¤ë°‹ì˜ ëŒ€ì²´ sha1ì„ ì“¸ 수 없습니다"
+
+#: git-rebase--interactive.sh:360
+#, sh-format
+msgid "Fast-forward to $sha1"
+msgstr "정방향 진행, $sha1 위치로"
+
+#: git-rebase--interactive.sh:362
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
+msgstr "$sha1 위치로 정방향 진행할 수 없습니다"
+
+#: git-rebase--interactive.sh:371
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
+msgstr "HEAD를 $first_parent 위치로 옮길 수 없습니다"
+
+#: git-rebase--interactive.sh:376
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
+msgstr "병합 squash 거부: $sha1"
+
+#: git-rebase--interactive.sh:390
+#, sh-format
+msgid "Error redoing merge $sha1"
+msgstr "$sha1 ë³‘í•©ì„ ë‹¤ì‹œ í•˜ëŠ”ë° ì˜¤ë¥˜"
+
+#: git-rebase--interactive.sh:398
+#, sh-format
+msgid "Could not pick $sha1"
+msgstr "$sha1ì„ ë¹¼ì˜¤ê¸° í•  수 없습니다"
+
+#: git-rebase--interactive.sh:408 git-rebase--interactive.sh:474
+msgid "This is the 1st commit message:"
+msgstr "1번째 커밋 메시지입니다:"
+
+#: git-rebase--interactive.sh:409
+msgid "This is the 2nd commit message:"
+msgstr "2번째 커밋 메시지입니다:"
+
+#: git-rebase--interactive.sh:410
+msgid "This is the 3rd commit message:"
+msgstr "3번째 커밋 메시지입니다:"
+
+#: git-rebase--interactive.sh:411
+msgid "This is the 4th commit message:"
+msgstr "4번째 커밋 메시지입니다:"
+
+#: git-rebase--interactive.sh:412
+msgid "This is the 5th commit message:"
+msgstr "5번째 커밋 메시지입니다:"
+
+#: git-rebase--interactive.sh:413
+msgid "This is the 6th commit message:"
+msgstr "6번째 커밋 메시지입니다:"
+
+#: git-rebase--interactive.sh:414
+msgid "This is the 7th commit message:"
+msgstr "7번째 커밋 메시지입니다:"
+
+#: git-rebase--interactive.sh:415
+msgid "This is the 8th commit message:"
+msgstr "8번째 커밋 메시지입니다:"
+
+#: git-rebase--interactive.sh:416
+msgid "This is the 9th commit message:"
+msgstr "9번째 커밋 메시지입니다:"
+
+#: git-rebase--interactive.sh:417
+msgid "This is the 10th commit message:"
+msgstr "10번째 커밋 메시지입니다:"
+
+#. TRANSLATORS: if the language you are translating into
+#. doesn't allow you to compose a sentence in this fashion,
+#. consider translating as if this and the following few strings
+#. were "This is the commit message ${n}:"
+#: git-rebase--interactive.sh:422
+#, sh-format
+msgid "This is the ${n}th commit message:"
+msgstr "${n}번째 커밋 메시지입니다:"
+
+#: git-rebase--interactive.sh:423
+#, sh-format
+msgid "This is the ${n}st commit message:"
+msgstr "${n}번째 커밋 메시지입니다:"
+
+#: git-rebase--interactive.sh:424
+#, sh-format
+msgid "This is the ${n}nd commit message:"
+msgstr "${n}번째 커밋 메시지입니다:"
+
+#: git-rebase--interactive.sh:425
+#, sh-format
+msgid "This is the ${n}rd commit message:"
+msgstr "${n}번째 커밋 메시지입니다:"
+
+#: git-rebase--interactive.sh:426
+#, sh-format
+msgid "This is the commit message ${n}:"
+msgstr "커밋 메시지 ${n}입니다:"
+
+#: git-rebase--interactive.sh:432
+msgid "The 1st commit message will be skipped:"
+msgstr "1번째 커밋 메시지를 건너ëœë‹ˆë‹¤:"
+
+#: git-rebase--interactive.sh:433
+msgid "The 2nd commit message will be skipped:"
+msgstr "2번째 커밋 메시지를 건너ëœë‹ˆë‹¤:"
+
+#: git-rebase--interactive.sh:434
+msgid "The 3rd commit message will be skipped:"
+msgstr "3번째 커밋 메시지를 건너ëœë‹ˆë‹¤:"
+
+#: git-rebase--interactive.sh:435
+msgid "The 4th commit message will be skipped:"
+msgstr "4번째 커밋 메시지를 건너ëœë‹ˆë‹¤:"
+
+#: git-rebase--interactive.sh:436
+msgid "The 5th commit message will be skipped:"
+msgstr "5번째 커밋 메시지를 건너ëœë‹ˆë‹¤:"
+
+#: git-rebase--interactive.sh:437
+msgid "The 6th commit message will be skipped:"
+msgstr "6번째 커밋 메시지를 건너ëœë‹ˆë‹¤:"
+
+#: git-rebase--interactive.sh:438
+msgid "The 7th commit message will be skipped:"
+msgstr "7번째 커밋 메시지를 건너ëœë‹ˆë‹¤:"
+
+#: git-rebase--interactive.sh:439
+msgid "The 8th commit message will be skipped:"
+msgstr "8번째 커밋 메시지를 건너ëœë‹ˆë‹¤:"
+
+#: git-rebase--interactive.sh:440
+msgid "The 9th commit message will be skipped:"
+msgstr "9번째 커밋 메시지를 건너ëœë‹ˆë‹¤:"
+
+#: git-rebase--interactive.sh:441
+msgid "The 10th commit message will be skipped:"
+msgstr "10번째 커밋 메시지를 건너ëœë‹ˆë‹¤:"
+
+#. TRANSLATORS: if the language you are translating into
+#. doesn't allow you to compose a sentence in this fashion,
+#. consider translating as if this and the following few strings
+#. were "The commit message ${n} will be skipped:"
+#: git-rebase--interactive.sh:446
+#, sh-format
+msgid "The ${n}th commit message will be skipped:"
+msgstr "${n}번째 커밋 메시지를 건너ëœë‹ˆë‹¤:"
+
+#: git-rebase--interactive.sh:447
+#, sh-format
+msgid "The ${n}st commit message will be skipped:"
+msgstr "${n}번째 커밋 메시지를 건너ëœë‹ˆë‹¤:"
+
+#: git-rebase--interactive.sh:448
+#, sh-format
+msgid "The ${n}nd commit message will be skipped:"
+msgstr "${n}번째 커밋 메시지를 건너ëœë‹ˆë‹¤:"
+
+#: git-rebase--interactive.sh:449
+#, sh-format
+msgid "The ${n}rd commit message will be skipped:"
+msgstr "${n}번째 커밋 메시지를 건너ëœë‹ˆë‹¤:"
+
+#: git-rebase--interactive.sh:450
+#, sh-format
+msgid "The commit message ${n} will be skipped:"
+msgstr "${n}번째 커밋 메시지를 건너ëœë‹ˆë‹¤:"
+
+#: git-rebase--interactive.sh:462
+#, sh-format
+msgid "This is a combination of $count commit."
+msgid_plural "This is a combination of $count commits."
+msgstr[0] "커밋 $count개가 ì„žì¸ ê²°ê³¼ìž…ë‹ˆë‹¤."
+
+#: git-rebase--interactive.sh:470
+#, sh-format
+msgid "Cannot write $fixup_msg"
+msgstr "$fixup_msg를 쓸 수 없습니다"
+
+#: git-rebase--interactive.sh:473
+msgid "This is a combination of 2 commits."
+msgstr "커밋 2개가 ì„žì¸ ê²°ê³¼ìž…ë‹ˆë‹¤."
+
+#: git-rebase--interactive.sh:514 git-rebase--interactive.sh:557
+#: git-rebase--interactive.sh:560
+#, sh-format
+msgid "Could not apply $sha1... $rest"
+msgstr "다ìŒì„ ì ìš©í• (apply) 수 없습니다: $sha1... $rest"
+
+#: git-rebase--interactive.sh:588
+#, sh-format
+msgid ""
+"Could not amend commit after successfully picking $sha1... $rest\n"
+"This is most likely due to an empty commit message, or the pre-commit hook\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue "
+"before\n"
+"you are able to reword the commit."
+msgstr ""
+"성공ì ìœ¼ë¡œ $sha1... $rest ì»¤ë°‹ì„ ë¹¼ì˜¨ ë’¤ì— ì»¤ë°‹ì„ ìˆ˜ì •í•  수 없습니다.\n"
+"ëŒ€ë¶€ë¶„ì˜ ê²½ìš° 빈 커밋 메시지 때문ì´ê±°ë‚˜, ë˜ëŠ” 커밋 ì „ 후í¬ê°€ 실패했기\n"
+"때문입니다. 커밋 메시지를 수정하기 ì „ì— ì´ ë¬¸ì œë¥¼ 먼저 해결해야 합니다."
+
+#: git-rebase--interactive.sh:603
+#, sh-format
+msgid "Stopped at $sha1_abbrev... $rest"
+msgstr "다ìŒì—ì„œ 멈춥니다: $sha1_abbrev... $rest"
+
+#: git-rebase--interactive.sh:618
+#, sh-format
+msgid "Cannot '$squash_style' without a previous commit"
+msgstr "ì´ì „ 커밋 ì—†ì´ '$squash_style' 수행할 수 없습니다"
+
+#: git-rebase--interactive.sh:660
+#, sh-format
+msgid "Executing: $rest"
+msgstr "실행 중: $rest"
+
+#: git-rebase--interactive.sh:668
+#, sh-format
+msgid "Execution failed: $rest"
+msgstr "실행 실패: $rest"
+
+#: git-rebase--interactive.sh:670
+msgid "and made changes to the index and/or the working tree"
+msgstr "그리고 ì¸ë±ìŠ¤ 그리고/ë˜ëŠ” ìž‘ì—… í´ë”ì— ë³€ê²½ ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤"
+
+#: git-rebase--interactive.sh:672
+msgid ""
+"You can fix the problem, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"문제를 바로잡고, 다ìŒì„ 실행하십시오\n"
+"\n"
+"\tgit rebase --continue"
+
+#. TRANSLATORS: after these lines is a command to be issued by the user
+#: git-rebase--interactive.sh:685
+#, sh-format
+msgid ""
+"Execution succeeded: $rest\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"실행 성공: $rest\n"
+"하지만 변경 ì‚¬í•­ì„ ì¸ë±ìŠ¤ ë°/ë˜ëŠ” ìž‘ì—… í´ë”ì— ë‚¨ê²¨ë‘¡ë‹ˆë‹¤.\n"
+"변경 ì‚¬í•­ì„ ì»¤ë°‹í•˜ê±°ë‚˜ ìŠ¤íƒœì‹œì— ë„£ìœ¼ë ¤ë©´, 다ìŒì„ 실행하십시오:\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:696
+#, sh-format
+msgid "Unknown command: $command $sha1 $rest"
+msgstr "알 수 없는 명령: $command $sha1 $rest"
+
+#: git-rebase--interactive.sh:697
+msgid "Please fix this using 'git rebase --edit-todo'."
+msgstr "'git rebase --edit-todo' 명령으로 바로잡으십시오."
+
+#: git-rebase--interactive.sh:732
+#, sh-format
+msgid "Successfully rebased and updated $head_name."
+msgstr "성공ì ìœ¼ë¡œ 리베ì´ìŠ¤í–ˆê³  $head_name ì—…ë°ì´íŠ¸í–ˆìŠµë‹ˆë‹¤."
+
+#: git-rebase--interactive.sh:779
+msgid "Could not skip unnecessary pick commands"
+msgstr "불필요한 빼오기 ëª…ë ¹ì„ ê±´ë„ˆë›¸ 수 없습니다"
+
+#: git-rebase--interactive.sh:937
+#, sh-format
+msgid ""
+"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+" - $line"
+msgstr ""
+"경고: ë‹¤ìŒ ì¤„ì—ì„œ 해당 SHA-1ì´ ì—†ê±°ë‚˜ ì»¤ë°‹ì´ ì•„ë‹™ë‹ˆë‹¤:\n"
+" - $line"
+
+#: git-rebase--interactive.sh:970
+#, sh-format
+msgid ""
+"Warning: the command isn't recognized in the following line:\n"
+" - $line"
+msgstr ""
+"경고: ë‹¤ìŒ ì¤„ì—ì„œ 명령어가 무엇ì¸ì§€ ì•Œ 수 없습니다:\n"
+" - $line"
+
+#: git-rebase--interactive.sh:1009
+msgid "could not detach HEAD"
+msgstr "HEAD는 분리할 수 없습니다"
+
+#: git-rebase--interactive.sh:1047
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):"
+msgstr ""
+"경고: ì¼ë¶€ ì»¤ë°‹ì´ ì˜ë„치 않게 ë²„ë ¤ì¡Œì„ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤.\n"
+"버려진 커밋 (최근ì—ì„œ 과거 순서):"
+
+#: git-rebase--interactive.sh:1055
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error."
+msgstr ""
+"ì´ ë©”ì‹œì§€ë¥¼ 보지 않으려면, \"drop\"ì„ ì‚¬ìš©í•´ 명시ì ìœ¼ë¡œ ì»¤ë°‹ì„ ì œê±°í•˜ì‹­ì‹œì˜¤.\n"
+"\n"
+"'git config rebase.missingCommitsCheck' 명령으로 경고 단계를 바꿀 수 있습니다.\n"
+"가능한 ë™ìž‘ì€: ignore, warn, error"
+
+#: git-rebase--interactive.sh:1066
+#, sh-format
+msgid ""
+"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
+"Ignoring."
+msgstr "rebase.missingCommitsCheck ì˜µì…˜ì— ëŒ€í•´ ì¸ì‹í•  수 없는 $check_level 설정. 무시합니다."
+
+#: git-rebase--interactive.sh:1083
+msgid "You can fix this with 'git rebase --edit-todo'."
+msgstr "'git rebase --edit-todo' 명령으로 ë°”ë¡œìž¡ì„ ìˆ˜ 있습니다."
+
+#: git-rebase--interactive.sh:1084
+msgid "Or you can abort the rebase with 'git rebase --abort'."
+msgstr "아니면 'git rebase --abort' 명령으로 리베ì´ìŠ¤ë¥¼ 중지할 ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤."
+
+#: git-rebase--interactive.sh:1108
+msgid "Could not remove CHERRY_PICK_HEAD"
+msgstr "CHERRY_PICK_HEAD를 제거할 수 없습니다"
+
+#: git-rebase--interactive.sh:1113
+#, sh-format
+msgid ""
+"You have staged changes in your working tree.\n"
+"If these changes are meant to be\n"
+"squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In both case, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
+msgstr ""
+"ìž‘ì—… í´ë”ì— ìŠ¤í…Œì´ì§•í•œ 변경 ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤.\n"
+"ì´ ë³€ê²½ ì‚¬í•­ì„ ì´ì „ ì»¤ë°‹ì— í•©ì¹˜ë ¤ë©´,\n"
+"다ìŒì„ 실행하십시오:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"새 커밋으로 만드려면 다ìŒì„ 실행하십시오:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"ì–´ë–¤ 경우ì´ë“ , 마친 다ìŒì— ë‹¤ìŒ ëª…ë ¹ìœ¼ë¡œ 계ì†í•©ë‹ˆë‹¤:\n"
+"\n"
+" git rebase --continue\n"
+
+#: git-rebase--interactive.sh:1130
+msgid "Error trying to find the author identity to amend commit"
+msgstr "ì»¤ë°‹ì„ ìˆ˜ì •í•œ ìž‘ì„±ìž ì‹ ì›ì„ ì°¾ëŠ”ë° ì˜¤ë¥˜"
+
+#: git-rebase--interactive.sh:1135
+msgid ""
+"You have uncommitted changes in your working tree. Please commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"ìž‘ì—… í´ë”ì— ì»¤ë°‹í•˜ì§€ ì•Šì€ ë³€ê²½ ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤. ì´ ì‚¬í•­ì„ ë¨¼ì €\n"
+"커밋하고 'git rebase --continue' ëª…ë ¹ì„ ë‹¤ì‹œ 실행하십시오."
+
+#: git-rebase--interactive.sh:1140 git-rebase--interactive.sh:1144
+msgid "Could not commit staged changes."
+msgstr "스테ì´ì§•í•œ 변경 ì‚¬í•­ì€ ì»¤ë°‹í•  수 없습니다."
+
+#: git-rebase--interactive.sh:1168
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"진행 ì¤‘ì¸ ëŒ€í™”í˜• 리베ì´ìŠ¤ì˜ TODO 파ì¼ì„ 편집하는 중입니다.\n"
+"편집 ë’¤ì— ë¦¬ë² ì´ìŠ¤ë¥¼ 계ì†í•˜ë ¤ë©´ 다ìŒì„ 실행하십시오:\n"
+" git rebase --continue\n"
+"\n"
+
+#: git-rebase--interactive.sh:1176 git-rebase--interactive.sh:1337
+msgid "Could not execute editor"
+msgstr "편집기를 실행할 수 없습니다"
+
+#: git-rebase--interactive.sh:1184
+msgid "You need to set your committer info first"
+msgstr "먼저 커밋하는 사람 정보를 설정해야 합니다"
+
+#: git-rebase--interactive.sh:1192
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr "$switch_to를 ì²´í¬ì•„웃할 수 없습니다"
+
+#: git-rebase--interactive.sh:1197
+msgid "No HEAD?"
+msgstr "HEAD가 없습니다?"
+
+#: git-rebase--interactive.sh:1198
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr "임시로 $state_dir 디렉터리를 만들 수 없습니다"
+
+#: git-rebase--interactive.sh:1200
+msgid "Could not mark as interactive"
+msgstr "대화형으로 표시할 수 없습니다."
+
+#: git-rebase--interactive.sh:1210 git-rebase--interactive.sh:1215
+msgid "Could not init rewritten commits"
+msgstr "다시 ìž‘ì„±ëœ ì»¤ë°‹ì„ ì´ˆê¸°í™”í•  수 없습니다"
+
+#: git-rebase--interactive.sh:1315
+#, sh-format
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] "리베ì´ìŠ¤ $shortrevisions, $shortonto 위로 (명령 $todocountê°œ)"
+
+#: git-rebase--interactive.sh:1320
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr "\n하지만 ëª¨ë‘ ì œê±°í•  경우, 리베ì´ìŠ¤ë¥¼ 중지합니다.\n\n"
+
+#: git-rebase--interactive.sh:1327
+msgid "Note that empty commits are commented out"
+msgstr "단 빈 ì»¤ë°‹ì€ ì£¼ì„ ì²˜ë¦¬ë˜ì—ˆìŠµë‹ˆë‹¤."
+
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "사용법: $dashless $USAGE"
+
+#: git-sh-setup.sh:190
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr "$cdup 디렉터리로 (ìž‘ì—…í´ë” 최ìƒìœ„) ì´ë™í•  수 없습니다"
+
+#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr "치명ì : $program_nameì€ ìž‘ì—… í´ë” ì—†ì´ ì‚¬ìš©í•  수 없습니다."
+
+#: git-sh-setup.sh:220
+msgid "Cannot rebase: You have unstaged changes."
+msgstr "리베ì´ìŠ¤í•  수 없습니다: 스테ì´ì§•í•˜ì§€ ì•Šì€ ë³€ê²½ ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤."
+
+#: git-sh-setup.sh:223
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr "브랜치를 다시 쓸 수 없습니다: 스테ì´ì§•í•˜ì§€ ì•Šì€ ë³€ê²½ ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤."
+
+#: git-sh-setup.sh:229
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr "$action í•  수 없습니다: 스테ì´ì§•í•˜ì§€ ì•Šì€ ë³€ê²½ ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤."
+
+#: git-sh-setup.sh:242
+msgid "Cannot rebase: Your index contains uncommitted changes."
+msgstr "리베ì´ìŠ¤í•  수 없습니다: ì¸ë±ìŠ¤ì— 커밋하지 ì•Šì€ ë³€ê²½ ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤."
+
+#: git-sh-setup.sh:248
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr "$action í•  수 없습니다: ì¸ë±ìŠ¤ì— 커밋하지 ì•Šì€ ë³€ê²½ ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤."
+
+#: git-sh-setup.sh:372
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr "ì´ ëª…ë ¹ì€ ìž‘ì—… í´ë”ì˜ ìµœìƒìœ„ì—서만 쓸 수 있습니다."
+
+#: git-sh-setup.sh:377
+msgid "Unable to determine absolute path of git directory"
+msgstr "깃 ë””ë ‰í„°ë¦¬ì˜ ì ˆëŒ€ 경로를 알아낼 수 없습니다"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index f2cc93f..c8658df 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-05-24 23:42+0800\n"
-"PO-Revision-Date: 2016-05-31 18:17+0000\n"
+"POT-Creation-Date: 2016-08-27 23:21+0800\n"
+"PO-Revision-Date: 2016-09-03 12:00+0000\n"
"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
"Language-Team: Portuguese\n"
"Language: pt\n"
@@ -23,9 +23,35 @@ msgstr ""
#: advice.c:55
#, c-format
msgid "hint: %.*s\n"
-msgstr "sugestão: %.*s\n"
+msgstr "dica: %.*s\n"
-#: advice.c:88
+#: advice.c:83
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr ""
+"Não é possível efetuar cherry-pick porque tem ficheiros não integrados."
+
+#: advice.c:85
+msgid "Committing is not possible because you have unmerged files."
+msgstr "Não é possível submeter porque tem ficheiros não integrados."
+
+#: advice.c:87
+msgid "Merging is not possible because you have unmerged files."
+msgstr "Não é possível integrar porque tem ficheiros não integrados."
+
+#: advice.c:89
+msgid "Pulling is not possible because you have unmerged files."
+msgstr "Não é possível puxar porque tem ficheiros não integrados."
+
+#: advice.c:91
+msgid "Reverting is not possible because you have unmerged files."
+msgstr "Não é possível reverte porque tem ficheiros não integrados."
+
+#: advice.c:93
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
+msgstr "Não é possível efetuar %s porque tem ficheiros não integrados."
+
+#: advice.c:101
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -33,18 +59,49 @@ msgstr ""
"Corrija-os na árvore de trabalho e use 'git add/rm <ficheiro>'\n"
"conforme apropriado para marcá-los como resolvidos e submeta."
-#: advice.c:101 builtin/merge.c:1238
+#: advice.c:109
+msgid "Exiting because of an unresolved conflict."
+msgstr "A terminar devido a conflito não resolvido."
+
+#: advice.c:114 builtin/merge.c:1181
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Não concluído a integração (MERGE_HEAD presente)."
-#: advice.c:103
+#: advice.c:116
msgid "Please, commit your changes before merging."
msgstr "Submeta as suas alterações antes de integrar."
-#: advice.c:104
+#: advice.c:117
msgid "Exiting because of unfinished merge."
msgstr "A terminar devido a integração incompleta."
+#: advice.c:123
+#, c-format
+msgid ""
+"Note: checking out '%s'.\n"
+"\n"
+"You are in 'detached HEAD' state. You can look around, make experimental\n"
+"changes and commit them, and you can discard any commits you make in this\n"
+"state without impacting any branches by performing another checkout.\n"
+"\n"
+"If you want to create a new branch to retain commits you create, you may\n"
+"do so (now or later) by using -b with the checkout command again. Example:\n"
+"\n"
+" git checkout -b <new-branch-name>\n"
+"\n"
+msgstr ""
+"Nota: a extrair '%s'.\n"
+"\n"
+"Encontra-se em estado 'HEAD destacada'. Pode inspecionar, fazer alterações\n"
+"experimentais e submetê-las e pode descartar qualquer commit que faça neste\n"
+"estado sem interferir outro ramo se extrair outro ramo.\n"
+"\n"
+"Se deseja criar um novo ramo para reter os commits que criou, pode fazê-lo\n"
+"(agora ou mais tarde) usando -b com o comando checkout outra vez. Exemplo:\n"
+"\n"
+" git checkout -b <novo-nome-ramo>\n"
+"\n"
+
#: archive.c:12
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<opções>] <árvore-etc> [<caminho>...]"
@@ -64,7 +121,7 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <repo> [--exec <cmd>] --list"
-#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "o especificador de caminho '%s' não corresponde a nenhum ficheiro"
@@ -77,7 +134,7 @@ msgstr "fmt"
msgid "archive format"
msgstr "formato do arquivo"
-#: archive.c:430 builtin/log.c:1395
+#: archive.c:430 builtin/log.c:1422
msgid "prefix"
msgstr "prefixo"
@@ -85,11 +142,11 @@ msgstr "prefixo"
msgid "prepend prefix to each pathname in the archive"
msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548
-#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
-#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 builtin/blame.c:2554
+#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989
+#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:460
+#: builtin/ls-files.c:463 builtin/notes.c:399 builtin/notes.c:562
+#: builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "ficheiro"
@@ -122,7 +179,7 @@ msgid "list supported archive formats"
msgstr "listar formatos de arquivo suportados"
#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:776
+#: builtin/submodule--helper.c:832
msgid "repo"
msgstr "repo"
@@ -130,7 +187,7 @@ msgstr "repo"
msgid "retrieve the archive from remote repository <repo>"
msgstr "obter o arquivo a partir do repositório remoto <repo>"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
msgid "command"
msgstr "comando"
@@ -138,6 +195,28 @@ msgstr "comando"
msgid "path to the remote git-upload-archive command"
msgstr "caminho para o comando git-upload-archive no remoto"
+#: archive.c:461
+msgid "Unexpected option --remote"
+msgstr "Opção inesperada --remote"
+
+#: archive.c:463
+msgid "Option --exec can only be used together with --remote"
+msgstr "A opção --exec só pode ser usada em conjunto com --remote"
+
+#: archive.c:465
+msgid "Unexpected option --output"
+msgstr "Opção inesperada --output"
+
+#: archive.c:487
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Formato de arquivo desconhecido '%s'"
+
+#: archive.c:494
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argumento não suportado para o formato '%s': -%d"
+
#: attr.c:263
msgid ""
"Negative patterns are ignored in git attributes\n"
@@ -146,6 +225,130 @@ msgstr ""
"Os padrões negativos são ignorados nos atributos do git\n"
"Use '\\!' para uma exclamação literal à esquerda."
+#: bisect.c:441
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Não foi possível abrir o ficheiro '%s'"
+
+#: bisect.c:446
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "Conteúdo incorretamente citado no ficheiro '%s': %s"
+
+#: bisect.c:655
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "Não se está a bissetar mais!\n"
+
+#: bisect.c:708
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "%s não é um nome de commit válido"
+
+#: bisect.c:732
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+"A base de integração %s é má (bad).\n"
+"Significa que o bug foi corrigido entre %s e [%s].\n"
+
+#: bisect.c:737
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"A base de integração %s é nova (new).\n"
+"A propriedade foi mudada entre %s e [%s].\n"
+
+#: bisect.c:742
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"A base de integração %s é %s.\n"
+"Significa que o primeiro commit '%s' está entre %s e [%s].\n"
+
+#: bisect.c:750
+#, c-format
+msgid ""
+"Some %s revs are not ancestor of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
+msgstr ""
+"Algumas revisões %s não antecedem a revisão %s.\n"
+"git bisect não pode funcionar corretamente nesta situação.\n"
+"Talvez confundiu revisões %s e %s?\n"
+
+#: bisect.c:763
+#, c-format
+msgid ""
+"the merge base between %s and [%s] must be skipped.\n"
+"So we cannot be sure the first %s commit is between %s and %s.\n"
+"We continue anyway."
+msgstr ""
+"tem-se que saltar a base de integração entre %s e [%s].\n"
+"Portanto não se pode ter a certeza que o primeiro commit %s está entre %s e "
+"%s.\n"
+"Continua-se de qualquer maneira."
+
+#: bisect.c:798
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "A bissetar: uma base de integração tem de ser testada\n"
+
+#: bisect.c:849
+#, c-format
+msgid "a %s revision is needed"
+msgstr "precisa-se de uma revisão %s"
+
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#, c-format
+msgid "could not create file '%s'"
+msgstr "não foi possível criar o ficheiro '%s'"
+
+#: bisect.c:917
+#, c-format
+msgid "could not read file '%s'"
+msgstr "não foi possível ler o ficheiro '%s'"
+
+#: bisect.c:947
+msgid "reading bisect refs failed"
+msgstr "falha ao ler referências bissetadas"
+
+#: bisect.c:967
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr "%s era %s e %s em simultâneo\n"
+
+#: bisect.c:975
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+"Nenhum commit testável encontrado.\n"
+"Talvez tenha começado com parâmetros de caminho incorretos?\n"
+
+#: bisect.c:994
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(aproximadamente %d passo)"
+msgstr[1] "(aproximadamente %d passos)"
+
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:998
+#, c-format
+msgid "Bisecting: %d revision left to test after this %s\n"
+msgid_plural "Bisecting: %d revisions left to test after this %s\n"
+msgstr[0] "A bissetar: falta %d revisão para testar depois desta %s\n"
+msgstr[1] "A bissetar: faltam %d revisões para testar depois desta %s\n"
+
#: branch.c:53
#, c-format
msgid ""
@@ -293,7 +496,7 @@ msgstr "'%s' não parece ser um ficheiro bundle v2"
msgid "unrecognized header: %s%s (%d)"
msgstr "cabeçalho não reconhecido: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:777
+#: bundle.c:87 builtin/commit.c:778
#, c-format
msgid "could not open '%s'"
msgstr "não foi possível abrir '%s'"
@@ -302,10 +505,10 @@ msgstr "não foi possível abrir '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "O repositório não possuí estes commits pré-requisitados:"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
-#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
-#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
-#: builtin/merge.c:361 builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
+#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
+#: builtin/merge.c:356 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "falha ao configurar percurso de revisões"
@@ -344,7 +547,7 @@ msgstr "rev-list terminou inesperadamente"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "a referência '%s' é excluída pelas opções de rev-list"
-#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "argumento não reconhecido: %s"
@@ -362,13 +565,13 @@ msgstr "não é possível criar '%s'"
msgid "index-pack died"
msgstr "index-pack terminou inesperadamente"
-#: color.c:275
+#: color.c:290
#, c-format
msgid "invalid color value: %.*s"
msgstr "valor de cor inválido: %.*s"
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
-#: builtin/am.c:2134
+#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
+#: builtin/am.c:2119
#, c-format
msgid "could not parse %s"
msgstr "não foi possível analisar %s"
@@ -382,129 +585,195 @@ msgstr "%s %s não é um commit!"
msgid "memory exhausted"
msgstr "memória esgotada"
-#: config.c:475 config.c:477
-#, fuzzy, c-format
-msgid "bad config line %d in %s %s"
-msgstr "linha %d de configuração incorreta em %s %s"
+#: config.c:516
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "linha de configuração %d incorreta no blob %s"
+
+#: config.c:520
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "linha de configuração %d incorreta no ficheiro %s"
+
+#: config.c:524
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "linha de configuração %d incorreta na entrada padrão"
-#: config.c:593
-#, c-format, fuzzy
-msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
-msgstr "valor numérico '%s' da configuração '%s' em %s %s incorreto: %s"
+#: config.c:528
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "linha de configuração %d incorreta no submódulo-blob %s"
-#: config.c:595
+#: config.c:532
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "linha de configuração %d incorreta na linha de comandos %s"
+
+#: config.c:536
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "linha de configuração %d incorreta em %s"
+
+#: config.c:655
+msgid "out of range"
+msgstr "fora de intervalo"
+
+#: config.c:655
+msgid "invalid unit"
+msgstr "unidade inválida"
+
+#: config.c:661
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "valor numérico '%s' da configuração '%s' incorreto: %s"
-#: config.c:680
+#: config.c:666
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "valor numérico '%s' da configuração '%s' incorreto no blob %s: %s"
+
+#: config.c:669
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "valor numérico '%s' da configuração '%s' incorreto no ficheiro %s: %s"
+
+#: config.c:672
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr ""
+"valor numérico '%s' da configuração '%s' incorreto na entrada padrão: %s"
+
+#: config.c:675
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr ""
+"valor numérico '%s' da configuração '%s' incorreto no submódulo-blob %s: %s"
+
+#: config.c:678
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr ""
+"valor numérico '%s' da configuração '%s' incorreto na linha de comandos %s: "
+"%s"
+
+#: config.c:681
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "valor numérico '%s' da configuração '%s' incorreto em %s: %s"
+
+#: config.c:768
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "falha ao expandir diretório de utilizador em: '%s'"
-#: config.c:761 config.c:772
+#: config.c:849 config.c:860
#, c-format
msgid "bad zlib compression level %d"
msgstr "nível de compressão zlib %d incorreto"
-#: config.c:890
+#: config.c:978
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "modo inválido para criação de objeto: %s"
-#: config.c:1228
+#: config.c:1312
msgid "unable to parse command-line config"
msgstr "não é possível analisar configuração de linha de comandos"
-#: config.c:1284
-msgid "unknown error occured while reading the configuration files"
+#: config.c:1362
+msgid "unknown error occurred while reading the configuration files"
msgstr ""
"ocorreu um erro desconhecido durante a leitura dos ficheiros de configuração"
-#: config.c:1629
+#: config.c:1716
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "não é possível analisar '%s' da configuração de linha de comandos"
-#: config.c:1631
+#: config.c:1718
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "variável de configuração '%s' incorreta no ficheiro '%s' na linha %d"
-#: config.c:1690
+#: config.c:1777
#, c-format
msgid "%s has multiple values"
msgstr "%s tem múltiplos valores"
-#: config.c:2224
+#: config.c:2311
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "não foi possível definir '%s' como '%s'"
-#: config.c:2226
+#: config.c:2313
#, c-format
msgid "could not unset '%s'"
msgstr "não foi possível reiniciar '%s'"
-#: connected.c:69
+#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr "A verificar conectividade"
+
+#: connected.c:74
msgid "Could not run 'git rev-list'"
msgstr "Não foi possível executar 'git rev-list'"
-#: connected.c:89
+#: connected.c:94
msgid "failed write to rev-list"
msgstr "falha ao escrever para rev-list"
-#: connected.c:96
+#: connected.c:101
msgid "failed to close rev-list's stdin"
msgstr "falha ao fechar entrada padrão de rev-list"
-#: date.c:95
+#: date.c:97
msgid "in the future"
msgstr "no futuro"
-#: date.c:101
+#: date.c:103
#, c-format
msgid "%lu second ago"
msgid_plural "%lu seconds ago"
-msgstr[0] "há %lu segundo atrás"
-msgstr[1] "há %lu segundos atrás"
+msgstr[0] "há %lu segundo"
+msgstr[1] "há %lu segundos"
-#: date.c:108
+#: date.c:110
#, c-format
msgid "%lu minute ago"
msgid_plural "%lu minutes ago"
-msgstr[0] "há %lu minuto atrás"
-msgstr[1] "há %lu minutos atrás"
+msgstr[0] "há %lu minuto"
+msgstr[1] "há %lu minutos"
-#: date.c:115
+#: date.c:117
#, c-format
msgid "%lu hour ago"
msgid_plural "%lu hours ago"
-msgstr[0] "há %lu hora atrás"
-msgstr[1] "há %lu horas atrás"
+msgstr[0] "há %lu hora"
+msgstr[1] "há %lu horas"
-#: date.c:122
+#: date.c:124
#, c-format
msgid "%lu day ago"
msgid_plural "%lu days ago"
-msgstr[0] "há %lu dia atrás"
-msgstr[1] "há %lu dias atrás"
+msgstr[0] "há %lu dia"
+msgstr[1] "há %lu dias"
-#: date.c:128
+#: date.c:130
#, c-format
msgid "%lu week ago"
msgid_plural "%lu weeks ago"
-msgstr[0] "há %lu semana atrás"
-msgstr[1] "há %lu semanas atrás"
+msgstr[0] "há %lu semana"
+msgstr[1] "há %lu semanas"
-#: date.c:135
+#: date.c:137
#, c-format
msgid "%lu month ago"
msgid_plural "%lu months ago"
-msgstr[0] "há %lu mês atrás"
-msgstr[1] "há %lu meses atrás"
+msgstr[0] "há %lu mês"
+msgstr[1] "há %lu meses"
-#: date.c:146
+#: date.c:148
#, c-format
msgid "%lu year"
msgid_plural "%lu years"
@@ -512,26 +781,26 @@ msgstr[0] "%lu ano"
msgstr[1] "%lu anos"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:149
+#: date.c:151
#, c-format
msgid "%s, %lu month ago"
msgid_plural "%s, %lu months ago"
msgstr[0] "há %s e %lu mês"
msgstr[1] "há %s e %lu meses"
-#: date.c:154 date.c:159
+#: date.c:156 date.c:161
#, c-format
msgid "%lu year ago"
msgid_plural "%lu years ago"
-msgstr[0] "há %lu ano atrás"
-msgstr[1] "há %lu anos atrás"
+msgstr[0] "há %lu ano"
+msgstr[1] "há %lu anos"
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
msgstr "falha ao ler o ficheiro de comando '%s'"
-#: diffcore-rename.c:538
+#: diffcore-rename.c:540
msgid "Performing inexact rename detection"
msgstr "Deteção de mudança de nome inexata em curso"
@@ -559,16 +828,16 @@ msgstr ""
"Erros encontrados na variável de configuração 'diff.dirstat':\n"
"%s"
-#: diff.c:3007
+#: diff.c:3017
#, c-format
msgid "external diff died, stopping at %s"
msgstr "o diff externo terminou inesperadamente, interrompido em %s"
-#: diff.c:3405
+#: diff.c:3415
msgid "--follow requires exactly one pathspec"
msgstr "--follow requer exatamente um único especificador de caminho"
-#: diff.c:3568
+#: diff.c:3578
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -577,7 +846,7 @@ msgstr ""
"Falha ao analisar parâmetro da opção --dirstat/-X:\n"
"%s"
-#: diff.c:3582
+#: diff.c:3592
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"
@@ -590,39 +859,30 @@ msgstr "falha ao obter nome e informação do kernel"
msgid "Untracked cache is disabled on this system or location."
msgstr "A cache não controlada está desativada neste sistema ou localização."
-#: gpg-interface.c:166 gpg-interface.c:235
-msgid "could not run gpg."
-msgstr "não foi possível executar gpg."
-
#: gpg-interface.c:178
-msgid "gpg did not accept the data"
-msgstr "gpg não aceitou os dados"
-
-#: gpg-interface.c:189
msgid "gpg failed to sign the data"
msgstr "gpg não assinou os dados"
-#: gpg-interface.c:222
-#, c-format
-msgid "could not create temporary file '%s'"
-msgstr "não foi possível criar ficheiro temporário '%s'"
+#: gpg-interface.c:208
+msgid "could not create temporary file"
+msgstr "não foi possível criar ficheiro temporário"
-#: gpg-interface.c:224
+#: gpg-interface.c:210
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "falha ao escrever assinatura destacada em '%s'"
-#: grep.c:1718
+#: grep.c:1792
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': não foi possível ler %s"
-#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
+#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
#, c-format
msgid "failed to stat '%s'"
msgstr "falha ao invocar stat de '%s'"
-#: grep.c:1746
+#: grep.c:1820
#, c-format
msgid "'%s': short read"
msgstr "'%s': leitura truncada"
@@ -672,7 +932,7 @@ msgstr "automaticamente em %0.1f..."
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s' não é um comando do git. Consulte 'git --help'."
-#: help.c:404 help.c:464
+#: help.c:404 help.c:470
msgid ""
"\n"
"Did you mean this?"
@@ -686,7 +946,7 @@ msgstr[1] ""
"\n"
"Queria dizer deste?"
-#: help.c:460
+#: help.c:466
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
@@ -719,83 +979,78 @@ msgstr "Não é foi possível criar '%s.lock': %s"
msgid "failed to read the cache"
msgstr "falha ao ler a cache"
-#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
-#: builtin/checkout.c:586 builtin/clone.c:732
+#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
+#: builtin/checkout.c:589 builtin/clone.c:732
msgid "unable to write new index file"
msgstr "não foi possível escrever novo ficheiro de índice"
-#: merge-recursive.c:189
-#, c-format
+#: merge-recursive.c:209
msgid "(bad commit)\n"
msgstr "(commit incorreto)\n"
-#: merge-recursive.c:209
+#: merge-recursive.c:231
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "addinfo_cache falhou no caminho '%s'"
-#: merge-recursive.c:270
+#: merge-recursive.c:301
msgid "error building trees"
msgstr "erro ao construir árvores"
-#: merge-recursive.c:689
+#: merge-recursive.c:720
#, c-format
msgid "failed to create path '%s'%s"
msgstr "falha ao criar o caminho '%s'%s"
-#: merge-recursive.c:700
+#: merge-recursive.c:731
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "A remover %s para criar espaço para o subdiretório\n"
-#: merge-recursive.c:714 merge-recursive.c:735
+#: merge-recursive.c:745 merge-recursive.c:764
msgid ": perhaps a D/F conflict?"
msgstr ": talvez um conflito D/F?"
-#: merge-recursive.c:725
+#: merge-recursive.c:754
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "perda de ficheiro não controlado em '%s' recusada"
-#: merge-recursive.c:765
+#: merge-recursive.c:796
#, c-format
msgid "cannot read object %s '%s'"
msgstr "não é possível ler o objeto %s: '%s'"
-#: merge-recursive.c:767
+#: merge-recursive.c:798
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob para %s '%s' esperado"
-#: merge-recursive.c:790 builtin/clone.c:376
+#: merge-recursive.c:822
#, c-format
-msgid "failed to open '%s'"
-msgstr "falha ao abrir '%s'"
+msgid "failed to open '%s': %s"
+msgstr "falha ao abrir '%s': %s"
-#: merge-recursive.c:798
+#: merge-recursive.c:833
#, c-format
-msgid "failed to symlink '%s'"
-msgstr "falha ao criar a ligação simbólica '%s'"
+msgid "failed to symlink '%s': %s"
+msgstr "falha ao criar a ligação simbólica '%s': %s"
-#: merge-recursive.c:801
+#: merge-recursive.c:838
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "não sei o que fazer com %06o %s '%s'"
-#: merge-recursive.c:939
+#: merge-recursive.c:978
msgid "Failed to execute internal merge"
msgstr "Falha ao executar integração interna"
-#: merge-recursive.c:943
+#: merge-recursive.c:982
#, c-format
msgid "Unable to add %s to database"
msgstr "Não é possível adicionar %s à base de dados"
-#: merge-recursive.c:959
-msgid "unsupported object type in the tree"
-msgstr "tipo de objeto sem suporte encontrado na árvore"
-
-#: merge-recursive.c:1034 merge-recursive.c:1048
+#: merge-recursive.c:1081 merge-recursive.c:1095
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -804,7 +1059,7 @@ msgstr ""
"CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "
"deixada na árvore."
-#: merge-recursive.c:1040 merge-recursive.c:1053
+#: merge-recursive.c:1087 merge-recursive.c:1100
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -813,20 +1068,20 @@ msgstr ""
"CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "
"deixada na árvore em %s."
-#: merge-recursive.c:1094
+#: merge-recursive.c:1143
msgid "rename"
msgstr "mudar nome"
-#: merge-recursive.c:1094
+#: merge-recursive.c:1143
msgid "renamed"
msgstr "nome mudado"
-#: merge-recursive.c:1150
+#: merge-recursive.c:1200
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s é um diretório em %s adicionando %s no seu lugar"
-#: merge-recursive.c:1172
+#: merge-recursive.c:1225
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -835,147 +1090,138 @@ msgstr ""
"CONFLITO (mudar nome/mudar nome): Mudar o nome \"%s\"->\"%s\" no ramo \"%s\" "
"mudar o nome \"%s\"->\"%s\" em \"%s\"%s"
-#: merge-recursive.c:1177
+#: merge-recursive.c:1230
msgid " (left unresolved)"
msgstr " (por resolver)"
-#: merge-recursive.c:1231
+#: merge-recursive.c:1292
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "
"%s->%s em %s"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1325
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "A mudar o nome de %s para %s e de %s para %s, em alternativa"
-#: merge-recursive.c:1460
+#: merge-recursive.c:1531
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "
"%s"
-#: merge-recursive.c:1470
+#: merge-recursive.c:1546
#, c-format
msgid "Adding merged %s"
msgstr "A adicionar %s integrado"
-#: merge-recursive.c:1475 merge-recursive.c:1677
+#: merge-recursive.c:1553 merge-recursive.c:1766
#, c-format
msgid "Adding as %s instead"
msgstr "A adicionar como %s, em alternativa."
-#: merge-recursive.c:1526
+#: merge-recursive.c:1610
#, c-format
msgid "cannot read object %s"
msgstr "não foi possível ler o objeto %s"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1613
#, c-format
msgid "object %s is not a blob"
msgstr "o objeto %s não é um blob"
-#: merge-recursive.c:1581
+#: merge-recursive.c:1666
msgid "modify"
msgstr "modificar"
-#: merge-recursive.c:1581
+#: merge-recursive.c:1666
msgid "modified"
msgstr "modificado"
-#: merge-recursive.c:1591
+#: merge-recursive.c:1676
msgid "content"
msgstr "conteúdo"
-#: merge-recursive.c:1598
+#: merge-recursive.c:1683
msgid "add/add"
msgstr "adicionar/adicionar"
-#: merge-recursive.c:1632
+#: merge-recursive.c:1718
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s ignorado (integrado é igual ao existente)"
-#: merge-recursive.c:1646
+#: merge-recursive.c:1732
#, c-format
msgid "Auto-merging %s"
msgstr "A integrar automaticamente %s"
-#: merge-recursive.c:1650 git-submodule.sh:941
+#: merge-recursive.c:1736 git-submodule.sh:919
msgid "submodule"
msgstr "submódulo"
-#: merge-recursive.c:1651
+#: merge-recursive.c:1737
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLITO (%s): conflito de integração em %s"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1831
#, c-format
msgid "Removing %s"
msgstr "A remover %s"
-#: merge-recursive.c:1762
+#: merge-recursive.c:1857
msgid "file/directory"
msgstr "ficheiro/diretório"
-#: merge-recursive.c:1768
+#: merge-recursive.c:1863
msgid "directory/file"
msgstr "diretório/ficheiro"
-#: merge-recursive.c:1773
+#: merge-recursive.c:1868
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLITO (%s): Há um diretório designado %s em %s. A adicionar %s como %s"
-#: merge-recursive.c:1781
+#: merge-recursive.c:1877
#, c-format
msgid "Adding %s"
msgstr "A adicionar %s"
-#: merge-recursive.c:1798
-msgid "Fatal merge failure, shouldn't happen."
-msgstr "Falha de integração fatal, não devia acontecer."
-
-#: merge-recursive.c:1817
+#: merge-recursive.c:1914
msgid "Already up-to-date!"
msgstr "Já está atualizado!"
-#: merge-recursive.c:1826
+#: merge-recursive.c:1923
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "falha ao integrar as árvores %s e %s"
-#: merge-recursive.c:1856
-#, c-format
-msgid "Unprocessed path??? %s"
-msgstr "Caminho não processado??? %s"
-
-#: merge-recursive.c:1904
+#: merge-recursive.c:2006
msgid "Merging:"
msgstr "A integrar:"
-#: merge-recursive.c:1917
+#: merge-recursive.c:2019
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u antecessor comum encontrado:"
msgstr[1] "%u antecessores comuns encontrados:"
-#: merge-recursive.c:1954
+#: merge-recursive.c:2058
msgid "merge returned no commit"
msgstr "a integração não retornou nenhum commit"
-#: merge-recursive.c:2011
+#: merge-recursive.c:2121
#, c-format
msgid "Could not parse object '%s'"
msgstr "Não foi possível analisar o objeto '%s'"
-#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
+#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
msgid "Unable to write index."
msgstr "Não é possível escrever no índice."
@@ -1036,7 +1282,7 @@ msgstr "-NUM"
msgid "malformed object name '%s'"
msgstr "nome do objeto malformado '%s'"
-#: path.c:796
+#: path.c:798
#, c-format
msgid "Could not make %s writable by group"
msgstr "Não foi possível dar permissão de escrita ao grupo a %s"
@@ -1108,7 +1354,7 @@ msgstr ""
"Não há nada para excluir de acordo com o padrão :(excluir).\n"
"Talvez se tenha esquecido de acrescentar ':/' ou '.' ?"
-#: pretty.c:971
+#: pretty.c:973
msgid "unable to parse --pretty format"
msgstr "não foi possível analisar o formato de --pretty"
@@ -1134,23 +1380,22 @@ msgstr ""
"GIT_INDEX_VERSION definido, mas com valor inválido.\n"
"A usar a versão %i"
-#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
-#: builtin/merge.c:995
+#: refs.c:551 builtin/merge.c:840
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Não foi possível abrir '%s' para escrita"
-#: refs/files-backend.c:2243
+#: refs/files-backend.c:2534
#, c-format
msgid "could not delete reference %s: %s"
msgstr "não foi possível eliminar a referência %s: %s"
-#: refs/files-backend.c:2246
+#: refs/files-backend.c:2537
#, c-format
msgid "could not delete references: %s"
msgstr "não foi possível eliminar as referências: %s"
-#: refs/files-backend.c:2255
+#: refs/files-backend.c:2546
#, c-format
msgid "could not remove reference %s"
msgstr "não foi possível eliminar a referência %s"
@@ -1308,79 +1553,79 @@ msgstr "%s segue %s e %s em simultâneo"
msgid "Internal error"
msgstr "Erro interno"
-#: remote.c:1678 remote.c:1721
+#: remote.c:1677 remote.c:1720
msgid "HEAD does not point to a branch"
msgstr "HEAD não aponta para um ramo"
-#: remote.c:1687
+#: remote.c:1686
#, c-format
msgid "no such branch: '%s'"
msgstr "ramo inexistente: '%s'"
-#: remote.c:1690
+#: remote.c:1689
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "nenhum ramo a montante configurado para o ramo '%s'"
-#: remote.c:1696
+#: remote.c:1695
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
"o ramo a montante '%s' não está guardado como um ramo de monitorização remoto"
-#: remote.c:1711
+#: remote.c:1710
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"o destino de publicação '%s' no remoto '%s' não é seguido por nenhum ramo "
"local"
-#: remote.c:1726
+#: remote.c:1725
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "o ramo '%s' não tem nenhum remoto para publicar"
-#: remote.c:1737
+#: remote.c:1736
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
"'%2$s' não faz parte dos especificadores de referência de '%1$s' para "
"publicação"
-#: remote.c:1750
+#: remote.c:1749
msgid "push has no destination (push.default is 'nothing')"
msgstr "publicação sem destino (push.default é 'nothing')"
-#: remote.c:1772
+#: remote.c:1771
msgid "cannot resolve 'simple' push to a single destination"
msgstr "não é possível resolver a publicação 'simple' num único destino"
-#: remote.c:2074
+#: remote.c:2073
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "A base do seu ramo é '%s', mas o ramo a montante desapareceu.\n"
-#: remote.c:2078
+#: remote.c:2077
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (use \"git branch --unset-upstream\" para corrigir)\n"
-#: remote.c:2081
+#: remote.c:2080
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "O seu ramo está atualizado com '%s'.\n"
-#: remote.c:2085
+#: remote.c:2084
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "O seu ramo está à frente de '%s' por %d commit.\n"
msgstr[1] "O seu ramo está à frente de '%s' por %d commits.\n"
-#: remote.c:2091
+#: remote.c:2090
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (use \"git push\" para publicar os commits locais)\n"
-#: remote.c:2094
+#: remote.c:2093
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1392,11 +1637,11 @@ msgstr[1] ""
"O seu ramo está atrás de '%s' por %d commits, podendo ser atualizado com "
"avanço rápido.\n"
-#: remote.c:2102
+#: remote.c:2101
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (use \"git pull\" para atualizar o seu ramo local)\n"
-#: remote.c:2105
+#: remote.c:2104
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1411,20 +1656,20 @@ msgstr[1] ""
"O seu ramo e '%s' divergiram,\n"
"tendo cada um %d e %d commits diferentes, respetivamente.\n"
-#: remote.c:2115
+#: remote.c:2114
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (use \"git pull\" para integrar o ramo remoto no seu ramo)\n"
-#: revision.c:2142
+#: revision.c:2132
msgid "your current branch appears to be broken"
msgstr "o ramo atual parece estar danificado"
-#: revision.c:2145
+#: revision.c:2135
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "o ramo atual '%s' ainda não contém nenhum commit"
-#: revision.c:2339
+#: revision.c:2329
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent é incompatível com --bisect"
@@ -1437,15 +1682,15 @@ msgstr "falha ao abrir /dev/null"
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) falhou"
-#: send-pack.c:295
+#: send-pack.c:298
msgid "failed to sign the push certificate"
msgstr "falha ao assinar o certificado de publicação"
-#: send-pack.c:404
+#: send-pack.c:411
msgid "the receiving end does not support --signed push"
msgstr "o recetor não suporta publicação com --signed"
-#: send-pack.c:406
+#: send-pack.c:413
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -1453,10 +1698,14 @@ msgstr ""
"certificado de publicação não enviado uma vez que o recetor não suporta "
"publicação com --signed"
-#: send-pack.c:418
+#: send-pack.c:425
msgid "the receiving end does not support --atomic push"
msgstr "o recetor não suporta publicação com --atomic"
+#: send-pack.c:430
+msgid "the receiving end does not support push options"
+msgstr "o recetor não suporta opções de publicação"
+
#: sequencer.c:174
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
@@ -1475,14 +1724,14 @@ msgstr ""
"com 'git add <caminhos>' ou 'git rm <caminhos>'\n"
"e submeta o resultado com 'git commit'"
-#: sequencer.c:190 sequencer.c:833 sequencer.c:912
+#: sequencer.c:190 sequencer.c:841 sequencer.c:924
#, c-format
msgid "Could not write to %s"
msgstr "Não foi possível escrever em %s"
-#: sequencer.c:193
+#: sequencer.c:193 sequencer.c:843 sequencer.c:928
#, c-format
-msgid "Error wrapping up %s"
+msgid "Error wrapping up %s."
msgstr "Erro ao rematar %s."
#: sequencer.c:208
@@ -1495,47 +1744,52 @@ msgstr "As suas alterações locais serão substituídas por revert."
#: sequencer.c:213
msgid "Commit your changes or stash them to proceed."
-msgstr "Submeta ou empilhe (stash) as suas alterações para continuar."
+msgstr "Submeta ou esconda as suas alterações para continuar."
+
+#: sequencer.c:228
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: avanço rápido"
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:300
+#: sequencer.c:303
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Não foi possível escrever novo ficheiro de índice"
-#: sequencer.c:318
+#: sequencer.c:321
msgid "Could not resolve HEAD commit\n"
msgstr "Não foi possível resolver o commit HEAD\n"
-#: sequencer.c:338
+#: sequencer.c:341
msgid "Unable to update cache tree\n"
msgstr "Não foi possível atualizar a árvore de cache\n"
-#: sequencer.c:390
+#: sequencer.c:393
#, c-format
msgid "Could not parse commit %s\n"
msgstr "Não foi possível analisar o commit %s\n"
-#: sequencer.c:395
+#: sequencer.c:398
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "Não foi possível analisar o commit pai %s\n"
-#: sequencer.c:460
+#: sequencer.c:463
msgid "Your index file is unmerged."
msgstr "Ficheiro de índice não integrado."
-#: sequencer.c:479
+#: sequencer.c:482
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "O commit %s é uma integração mas não foi fornecida nenhuma opção -m."
-#: sequencer.c:487
+#: sequencer.c:490
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "O commit %s não tem o pai %d"
-#: sequencer.c:491
+#: sequencer.c:494
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr ""
@@ -1543,157 +1797,194 @@ msgstr ""
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:504
+#: sequencer.c:507
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: não foi possível analisar o commit pai %s"
-#: sequencer.c:508
+#: sequencer.c:511
#, c-format
msgid "Cannot get commit message for %s"
msgstr "Não é possível obter a mensagem de commit de %s"
-#: sequencer.c:594
+#: sequencer.c:597
#, c-format
msgid "could not revert %s... %s"
msgstr "não foi possível reverter %s... %s"
-#: sequencer.c:595
+#: sequencer.c:598
#, c-format
msgid "could not apply %s... %s"
msgstr "não foi possível aplicar %s... %s"
-#: sequencer.c:630
+#: sequencer.c:633
msgid "empty commit set passed"
msgstr "o conjunto de commits especificado está vazio"
-#: sequencer.c:638
+#: sequencer.c:641
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: falha ao ler o índice"
-#: sequencer.c:642
+#: sequencer.c:645
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: falha ao atualizar o índice"
-#: sequencer.c:702
-#, c-format
-msgid "Cannot %s during a %s"
-msgstr "Não foi possível efetuar %s durante %s"
+#: sequencer.c:705
+msgid "Cannot revert during another revert."
+msgstr "Não é possível reverter durante outra reversão."
+
+#: sequencer.c:706
+msgid "Cannot revert during a cherry-pick."
+msgstr "Não é possível reverter durante um cherry-pick."
+
+#: sequencer.c:709
+msgid "Cannot cherry-pick during a revert."
+msgstr "Não é possível efetuar cherry-pick durante uma reversão."
+
+#: sequencer.c:710
+msgid "Cannot cherry-pick during another cherry-pick."
+msgstr ""
+"Não é possível efetuar cherry-pick durante outro cherry-pick. durante um "
+"cherry-pick."
-#: sequencer.c:724
+#: sequencer.c:732
#, c-format
msgid "Could not parse line %d."
msgstr "Não foi possível analisar a linha %d."
-#: sequencer.c:729
+#: sequencer.c:737
msgid "No commits parsed."
msgstr "Nenhum commit analisado."
-#: sequencer.c:741
+#: sequencer.c:749
#, c-format
msgid "Could not open %s"
msgstr "Não foi possível abrir %s"
-#: sequencer.c:745
+#: sequencer.c:753
#, c-format
msgid "Could not read %s."
msgstr "Não foi possível ler %s."
-#: sequencer.c:752
+#: sequencer.c:760
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "Folha de instruções inutilizável: %s"
-#: sequencer.c:782
+#: sequencer.c:790
#, c-format
msgid "Invalid key: %s"
msgstr "Chave inválida: %s"
-#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52
+#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Valor inválido de %s: %s"
-#: sequencer.c:795
+#: sequencer.c:803
#, c-format
msgid "Malformed options sheet: %s"
msgstr "Folha de opções malformada: %s"
-#: sequencer.c:814
+#: sequencer.c:822
msgid "a cherry-pick or revert is already in progress"
msgstr "cherry-pick ou revert em curso"
-#: sequencer.c:815
+#: sequencer.c:823
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\""
-#: sequencer.c:819
+#: sequencer.c:827
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "Não foi possível criar o diretório do sequenciador %s"
-#: sequencer.c:835 sequencer.c:916
-#, c-format
-msgid "Error wrapping up %s."
-msgstr "Erro ao rematar %s."
-
-#: sequencer.c:854 sequencer.c:986
+#: sequencer.c:862 sequencer.c:998
msgid "no cherry-pick or revert in progress"
msgstr "nenhum cherry-pick ou revert em curso"
-#: sequencer.c:856
+#: sequencer.c:864
msgid "cannot resolve HEAD"
msgstr "não é possível resolver HEAD"
-#: sequencer.c:858
+#: sequencer.c:866 sequencer.c:900
msgid "cannot abort from a branch yet to be born"
msgstr "não é possível abortar um ramo ainda não criado"
-#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
+#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
#, c-format
msgid "cannot open %s"
msgstr "não é possível abrir %s"
-#: sequencer.c:880
+#: sequencer.c:888
#, c-format
msgid "cannot read %s: %s"
msgstr "não é possível ler %s: %s"
-#: sequencer.c:881
+#: sequencer.c:889
msgid "unexpected end of file"
msgstr "fim de ficheiro inesperado"
-#: sequencer.c:887
+#: sequencer.c:895
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "o ficheiro HEAD de pre-cherry-pick '%s' está corrompido"
-#: sequencer.c:909
+#: sequencer.c:921
#, c-format
msgid "Could not format %s."
msgstr "Não foi possível formatar %s."
-#: sequencer.c:1054
+#: sequencer.c:1066
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: não é possível efetuar cherry-pick de %s"
-#: sequencer.c:1057
+#: sequencer.c:1069
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisão incorreta"
-#: sequencer.c:1091
+#: sequencer.c:1102
msgid "Can't revert as initial commit"
msgstr "Não é possível reverter como commit inicial"
-#: sequencer.c:1092
-msgid "Can't cherry-pick into empty head"
-msgstr "Não é possível efetuar cherry-pick numa cabeça vazia"
+#: setup.c:160
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s: não há tal caminho na árvore de trabalho.\n"
+"Use 'git <comando> -- <caminho>...' para especificar caminhos que não "
+"existem localmente."
-#: setup.c:248
+#: setup.c:173
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"argumento ambíguo '%s': revisão ou caminho desconhecidos não encontrado na "
+"árvore de trabalho.\n"
+"Use '--' para separar caminhos de revisões, assim:\n"
+"'git <comando> [<revisão>...] -- [<ficheiro>...]'"
+
+#: setup.c:223
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"argumento ambíguo '%s': revisão e nome de ficheiro\n"
+"Use '--' para separar caminhos de revisões, assim:\n"
+"'git <comando> [<revisão>...] -- [<ficheiro>...]'"
+
+#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
#, c-format
msgid "failed to read %s"
msgstr "falha ao ler %s"
@@ -1707,16 +1998,53 @@ msgstr "Esperava-se versão do repositório git <= %d, obteve-se %d"
msgid "unknown repository extensions found:"
msgstr "extensões de repositório desconhecidas encontradas:"
-#: sha1_file.c:1080
+#: setup.c:762
+#, c-format
+msgid "Not a git repository (or any of the parent directories): %s"
+msgstr "Não é um repositório git (ou um dos diretórios pai): %s"
+
+#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+msgid "Cannot come back to cwd"
+msgstr "Não é possível voltar ao diretório de trabalho atual"
+
+#: setup.c:845
+msgid "Unable to read current working directory"
+msgstr "Não é possível ler o diretório de trabalho atual"
+
+#: setup.c:920
+#, c-format
+msgid ""
+"Not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgstr ""
+"Não é um repositório git (ou um diretório pai até ao ponto de montagem %s)\n"
+"Interrompido no limite do sistema de ficheiros "
+"(GIT_DISCOVERY_ACROSS_FILESYSTEM não definido)."
+
+#: setup.c:927
+#, c-format
+msgid "Cannot change to '%s/..'"
+msgstr "Não é possível mudar para '%s/..'"
+
+#: setup.c:989
+#, c-format
+msgid ""
+"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"Problema com o valor core.sharedRepository modo de ficheiro (0%.3o).\n"
+"O dono dos ficheiros tem de ter sempre permissões de leitura e escrita."
+
+#: sha1_file.c:1046
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)"
-#: sha1_file.c:2458
+#: sha1_file.c:2434
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset antes do início do índice do pacote %s (índice corrompido?)"
-#: sha1_file.c:2462
+#: sha1_file.c:2438
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "offset depois do fim do índice do pacote %s (índice truncado?)"
@@ -1775,10 +2103,10 @@ msgstr "falha ao preparar .gitmodules atualizado"
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "não é permitido valores negativos em submodule.fetchJobs"
-#: submodule-config.c:355
+#: submodule-config.c:358
#, c-format
msgid "invalid value for %s"
-msgstr "Valor inválido de %s"
+msgstr "valor inválido de %s"
#: trailer.c:237
#, c-format
@@ -1834,6 +2162,56 @@ msgstr "não foi possível abrir ficheiro temporário"
msgid "could not rename temporary file to %s"
msgstr "não foi possível mudar o nome do ficheiro temporário para %s"
+#: transport.c:62
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Iria definir o ramo a montante de '%s' como '%s' de '%s'\n"
+
+#: transport.c:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transporte: opção de profundidade '%s' inválida"
+
+#: transport.c:771
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Os seguintes caminhos de submódulo contêm alterações que\n"
+"não puderam ser encontradas a nenhum remoto:\n"
+
+#: transport.c:775
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Por favor tente\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"ou cd para o caminho e use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"para publicá-las no remoto.\n"
+"\n"
+
+#: transport.c:783
+msgid "Aborting."
+msgstr "Abortado."
+
#: transport-helper.c:1041
#, c-format
msgid "Could not read ref %s"
@@ -1843,11 +2221,11 @@ msgstr "Não foi possível ler a referência %s"
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
-"%%sPlease commit your changes or stash them before you can switch branches."
+"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
"extrair:\n"
-"%%sSubmeta as suas alterações ou empilhe-as (stash) antes de trocar de ramo."
+"%%sSubmeta as suas alterações ou esconda-as antes de trocar de ramo."
#: unpack-trees.c:66
#, c-format
@@ -1863,11 +2241,11 @@ msgstr ""
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you can merge."
+"%%sPlease commit your changes or stash them before you merge."
msgstr ""
"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
"integrar:\n"
-"%%sSubmeta as suas alterações ou empilhe-as (stash) antes de integrar."
+"%%sSubmeta as suas alterações ou esconda-as antes de integrar."
#: unpack-trees.c:71
#, c-format
@@ -1883,11 +2261,11 @@ msgstr ""
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you can %s."
+"%%sPlease commit your changes or stash them before you %s."
msgstr ""
-"As suas alterações locais nos seguintes ficheiros seriam substituídas por %s:"
-"\n"
-"%%sSubmeta as suas alterações ou empilhe-as (stash) antes de efetuar %s."
+"As suas alterações locais nos seguintes ficheiros seriam substituídas por "
+"%s:\n"
+"%%sSubmeta as suas alterações ou esconda-as antes de efetuar %s."
#: unpack-trees.c:76
#, c-format
@@ -1895,8 +2273,8 @@ msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%s"
msgstr ""
-"As suas alterações locais nos seguintes ficheiros seriam substituídas por %s:"
-"\n"
+"As suas alterações locais nos seguintes ficheiros seriam substituídas por "
+"%s:\n"
"%%s"
#: unpack-trees.c:81
@@ -1905,15 +2283,15 @@ msgid ""
"Updating the following directories would lose untracked files in it:\n"
"%s"
msgstr ""
-"Perder-se-iam ficheiros não controlados ao atualizar os seguintes diretórios:"
-"\n"
+"Perder-se-iam ficheiros não controlados ao atualizar os seguintes "
+"diretórios:\n"
"%s"
#: unpack-trees.c:85
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you can switch branches."
+"%%sPlease move or remove them before you switch branches."
msgstr ""
"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
"removidos ao extrair:\n"
@@ -1933,7 +2311,7 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you can merge."
+"%%sPlease move or remove them before you merge."
msgstr ""
"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
"removidos ao integrar:\n"
@@ -1953,7 +2331,7 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you can %s."
+"%%sPlease move or remove them before you %s."
msgstr ""
"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
"removidos por %s:\n"
@@ -1974,7 +2352,7 @@ msgstr ""
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
-"%%sPlease move or remove them before you can switch branches."
+"%%sPlease move or remove them before you switch branches."
msgstr ""
"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
"substituídos ao extrair:\n"
@@ -1995,7 +2373,7 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you can merge."
+"%%sPlease move or remove them before you merge."
msgstr ""
"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
"substituídos ao integrar:\n"
@@ -2015,7 +2393,7 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you can %s."
+"%%sPlease move or remove them before you %s."
msgstr ""
"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
"substituídos por %s:\n"
@@ -2106,43 +2484,43 @@ msgstr "número de porta inválido"
msgid "invalid '..' path segment"
msgstr "segmento de caminho '..' inválido"
-#: wrapper.c:222 wrapper.c:381
+#: worktree.c:282
+#, c-format
+msgid "failed to read '%s'"
+msgstr "falha ao ler '%s'"
+
+#: wrapper.c:222 wrapper.c:392
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "não foi possível abrir '%s' para leitura e escrita"
-#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
#, c-format
msgid "could not open '%s' for writing"
msgstr "não foi possível abrir '%s' para escrita"
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
-#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
+#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
#: builtin/pull.c:407
#, c-format
msgid "could not open '%s' for reading"
msgstr "não foi possível abrir '%s' para leitura"
-#: wrapper.c:594 wrapper.c:615
+#: wrapper.c:605 wrapper.c:626
#, c-format
msgid "unable to access '%s'"
msgstr "não é possível aceder a '%s'"
-#: wrapper.c:623
+#: wrapper.c:634
msgid "unable to get current working directory"
msgstr "não é possível de obter o diretório de trabalho atual"
-#: wrapper.c:650
-#, c-format
-msgid "could not open %s for writing"
-msgstr "não foi possível abrir %s para escrita"
-
-#: wrapper.c:661 builtin/am.c:410
+#: wrapper.c:658
#, c-format
msgid "could not write to %s"
msgstr "não foi possível escrever para %s"
-#: wrapper.c:667
+#: wrapper.c:660
#, c-format
msgid "could not close %s"
msgstr "não foi possível fechar %s"
@@ -2174,11 +2552,11 @@ msgstr ""
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (use \"git rm <ficheiro>...\" para marcar como resolvido)"
-#: wt-status.c:198 wt-status.c:881
+#: wt-status.c:198 wt-status.c:882
msgid "Changes to be committed:"
msgstr "Alterações para serem submetidas:"
-#: wt-status.c:216 wt-status.c:890
+#: wt-status.c:216 wt-status.c:891
msgid "Changes not staged for commit:"
msgstr "Alterações não preparadas para submeter:"
@@ -2237,11 +2615,6 @@ msgstr "adicionado por ambos:"
msgid "both modified:"
msgstr "modificado por ambos:"
-#: wt-status.c:266
-#, c-format
-msgid "bug: unhandled unmerged status %x"
-msgstr ""
-
#: wt-status.c:274
msgid "new file:"
msgstr "novo ficheiro:"
@@ -2286,20 +2659,15 @@ msgstr "conteúdo modificado, "
msgid "untracked content, "
msgstr "conteúdo não controlado, "
-#: wt-status.c:391
-#, c-format
-msgid "bug: unhandled diff status %c"
-msgstr ""
-
-#: wt-status.c:755
+#: wt-status.c:756
msgid "Submodules changed but not updated:"
msgstr "Submódulos alterados mas não atualizados:"
-#: wt-status.c:757
+#: wt-status.c:758
msgid "Submodule changes to be committed:"
msgstr "Alterações em submódulos para serem submetidas:"
-#: wt-status.c:838
+#: wt-status.c:839
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -2307,100 +2675,104 @@ msgstr ""
"Não altere a linha acima.\n"
"Tudo o que estiver abaixo será removido."
-#: wt-status.c:949
+#: wt-status.c:950
msgid "You have unmerged paths."
msgstr "Há caminhos não integrados."
-#: wt-status.c:952
+#: wt-status.c:953
msgid " (fix conflicts and run \"git commit\")"
msgstr " (corrija os conflitos e execute \"git commit\")"
-#: wt-status.c:956
+#: wt-status.c:955
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (use \"git am --abort\" para abortar a integração)"
+
+#: wt-status.c:960
msgid "All conflicts fixed but you are still merging."
msgstr "Todos os conflitos foram corrigidos mas ainda está a integrar."
-#: wt-status.c:959
+#: wt-status.c:963
msgid " (use \"git commit\" to conclude merge)"
msgstr " (use \"git commit\" para concluir a integração)"
-#: wt-status.c:969
+#: wt-status.c:973
msgid "You are in the middle of an am session."
msgstr "Sessão am em curso."
-#: wt-status.c:972
+#: wt-status.c:976
msgid "The current patch is empty."
msgstr "O patch atual está vazio."
-#: wt-status.c:976
+#: wt-status.c:980
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (corrija os conflitos e execute \"git am --continue\")"
-#: wt-status.c:978
+#: wt-status.c:982
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (use \"git am --skip\" para ignorar este patch)"
-#: wt-status.c:980
+#: wt-status.c:984
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (use \"git am --abort\" para restaurar o ramo original)"
-#: wt-status.c:1105
+#: wt-status.c:1109
msgid "No commands done."
msgstr "Nenhum comando concluído."
-#: wt-status.c:1108
+#: wt-status.c:1112
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Último comando concluído (%d comando concluído):"
msgstr[1] "Últimos comandos concluídos (%d comandos concluídos):"
-#: wt-status.c:1119
+#: wt-status.c:1123
#, c-format
msgid " (see more in file %s)"
msgstr " (veja mais no ficheiro %s)"
-#: wt-status.c:1124
+#: wt-status.c:1128
msgid "No commands remaining."
msgstr "Nenhum comando por concluir."
-#: wt-status.c:1127
+#: wt-status.c:1131
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Próximo comando a executar (%d comando restante):"
msgstr[1] "Próximos comandos a executar (%d comandos restantes):"
-#: wt-status.c:1135
+#: wt-status.c:1139
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (use \"git rebase --edit-todo\" para visualizar e editar)"
-#: wt-status.c:1148
+#: wt-status.c:1152
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Está a realizar rebase do ramo '%s' sobre '%s'."
-#: wt-status.c:1153
+#: wt-status.c:1157
msgid "You are currently rebasing."
msgstr "Está a rebasear neste momento."
-#: wt-status.c:1167
+#: wt-status.c:1171
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (corrija os conflitos e execute \"git rebase --continue\")"
-#: wt-status.c:1169
+#: wt-status.c:1173
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (use \"git rebase --skip\" para ignorar este patch)"
-#: wt-status.c:1171
+#: wt-status.c:1175
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (use \"git rebase --abort\" para restaurar o ramo original)"
-#: wt-status.c:1177
+#: wt-status.c:1181
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
" (todos os conflitos foram corrigidos: execute \"git rebase --continue\")"
-#: wt-status.c:1181
+#: wt-status.c:1185
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -2408,126 +2780,126 @@ msgstr ""
"Está a dividir um commit ao mesmo tempo que se efetua rebase do ramo '%s' "
"sobre '%s'."
-#: wt-status.c:1186
+#: wt-status.c:1190
msgid "You are currently splitting a commit during a rebase."
msgstr "Está a dividir um commit durante um rebase."
-#: wt-status.c:1189
+#: wt-status.c:1193
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Assim que o diretório de trabalho estiver limpo, execute \"git rebase --"
"continue\")"
-#: wt-status.c:1193
+#: wt-status.c:1197
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Está a editar um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre "
"'%s'."
-#: wt-status.c:1198
+#: wt-status.c:1202
msgid "You are currently editing a commit during a rebase."
msgstr "Está a editar um commit durante um rebase."
-#: wt-status.c:1201
+#: wt-status.c:1205
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (use \"git commit --amend\" para emendar o commit atual)"
-#: wt-status.c:1203
+#: wt-status.c:1207
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (use \"git rebase --continue\" assim que estiver satisfeito com as "
"alterações)"
-#: wt-status.c:1213
+#: wt-status.c:1217
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Está a realizar cherry-pick do commit %s."
-#: wt-status.c:1218
+#: wt-status.c:1222
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (corrija os conflitos e execute \"git cherry-pick --continue\")"
-#: wt-status.c:1221
+#: wt-status.c:1225
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (todos os conflitos foram corrigidos: execute \"git cherry-pick --continue"
"\")"
-#: wt-status.c:1223
+#: wt-status.c:1227
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (use \"git cherry-pick --abort\" para cancelar a operação de cherry-pick)"
-#: wt-status.c:1232
+#: wt-status.c:1236
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Está a reverter o commit %s neste comento."
-#: wt-status.c:1237
+#: wt-status.c:1241
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (corrija dos conflitos e execute \"git revert --continue\")"
-#: wt-status.c:1240
+#: wt-status.c:1244
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (todos os conflitos foram corrigidos: execute \"git revert --continue\")"
-#: wt-status.c:1242
+#: wt-status.c:1246
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (use \"git rever --abort\" para cancelar a operação de reversão)"
-#: wt-status.c:1253
+#: wt-status.c:1257
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Está a bissetar, iniciado a partir do ramo '%s'."
-#: wt-status.c:1257
+#: wt-status.c:1261
msgid "You are currently bisecting."
msgstr "Está a bissetar neste momento."
-#: wt-status.c:1260
+#: wt-status.c:1264
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (use \"git bisect reset\" para voltar ao ramo original)"
-#: wt-status.c:1460
+#: wt-status.c:1464
msgid "On branch "
msgstr "No ramo "
-#: wt-status.c:1466
+#: wt-status.c:1470
msgid "interactive rebase in progress; onto "
msgstr "rebase interativo em curso; sobre "
-#: wt-status.c:1468
+#: wt-status.c:1472
msgid "rebase in progress; onto "
msgstr "rebase em curso; sobre "
-#: wt-status.c:1473
+#: wt-status.c:1477
msgid "HEAD detached at "
msgstr "HEAD destacada em "
-#: wt-status.c:1475
+#: wt-status.c:1479
msgid "HEAD detached from "
msgstr "HEAD destacada de "
-#: wt-status.c:1478
+#: wt-status.c:1482
msgid "Not currently on any branch."
msgstr "Não se encontra em nenhum ramo neste momento."
-#: wt-status.c:1496
+#: wt-status.c:1500
msgid "Initial commit"
msgstr "Commit inicial"
-#: wt-status.c:1510
+#: wt-status.c:1514
msgid "Untracked files"
msgstr "Ficheiros não controlados"
-#: wt-status.c:1512
+#: wt-status.c:1516
msgid "Ignored files"
msgstr "Ficheiros ignorados"
-#: wt-status.c:1516
+#: wt-status.c:1520
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2539,32 +2911,32 @@ msgstr ""
"cuidado de não se esquecer de adicionar novos ficheiros\n"
"(consulte 'git help status')."
-#: wt-status.c:1522
+#: wt-status.c:1526
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ficheiros não controlados não listados%s"
-#: wt-status.c:1524
+#: wt-status.c:1528
msgid " (use -u option to show untracked files)"
msgstr " (use a opção -u para mostrar os ficheiros não controlados)"
-#: wt-status.c:1530
+#: wt-status.c:1534
msgid "No changes"
msgstr "Sem alterações"
-#: wt-status.c:1535
+#: wt-status.c:1539
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"nenhuma alteração adicionada para submeter (use \"git add\" e/ou \"git "
"commit -a\")\n"
-#: wt-status.c:1538
+#: wt-status.c:1542
#, c-format
msgid "no changes added to commit\n"
msgstr "nenhuma alteração adicionada para submeter\n"
-#: wt-status.c:1541
+#: wt-status.c:1545
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -2573,54 +2945,54 @@ msgstr ""
"não foi adicionado nada para submeter, mas existem ficheiros não controlados "
"(use \"git add\" para controlá-los)\n"
-#: wt-status.c:1544
+#: wt-status.c:1548
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"não foi adicionado nada para submeter, mas existem ficheiros não "
"controlados\n"
-#: wt-status.c:1547
+#: wt-status.c:1551
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"não há nada para submeter (crie/copie ficheiros e use \"git add\" para "
"controlá-los)\n"
-#: wt-status.c:1550 wt-status.c:1555
+#: wt-status.c:1554 wt-status.c:1559
#, c-format
msgid "nothing to commit\n"
msgstr "não há nada para submeter\n"
-#: wt-status.c:1553
+#: wt-status.c:1557
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-"não há nada para submeter (use -u para mostrar os ficheiros não controlados)"
-"\n"
+"não há nada para submeter (use -u para mostrar os ficheiros não "
+"controlados)\n"
-#: wt-status.c:1557
+#: wt-status.c:1561
#, c-format
-msgid "nothing to commit, working directory clean\n"
-msgstr "não há nada para submeter, diretório de trabalho limpo\n"
+msgid "nothing to commit, working tree clean\n"
+msgstr "não há nada para submeter, árvore de trabalho limpa\n"
-#: wt-status.c:1664
+#: wt-status.c:1668
msgid "Initial commit on "
msgstr "Commit inicial em "
-#: wt-status.c:1668
+#: wt-status.c:1672
msgid "HEAD (no branch)"
msgstr "HEAD (nenhum ramo)"
-#: wt-status.c:1697
+#: wt-status.c:1701
msgid "gone"
msgstr "desaparecido"
-#: wt-status.c:1699 wt-status.c:1707
+#: wt-status.c:1703 wt-status.c:1711
msgid "behind "
msgstr "atrás "
-#: wt-status.c:1702 wt-status.c:1705
+#: wt-status.c:1706 wt-status.c:1709
msgid "ahead "
msgstr "à frente "
@@ -2638,257 +3010,271 @@ msgstr "git add [<opções>] [--] <caminho>..."
msgid "unexpected diff status %c"
msgstr "diff status inesperado %c"
-#: builtin/add.c:70 builtin/commit.c:280
+#: builtin/add.c:71 builtin/commit.c:281
msgid "updating files failed"
msgstr "falha ao atualizar os ficheiros"
-#: builtin/add.c:80
+#: builtin/add.c:81
#, c-format
msgid "remove '%s'\n"
msgstr "remover '%s'\n"
-#: builtin/add.c:134
+#: builtin/add.c:136
msgid "Unstaged changes after refreshing the index:"
msgstr "Alterações não preparadas depois de atualizar o índice:"
-#: builtin/add.c:194 builtin/rev-parse.c:811
+#: builtin/add.c:196 builtin/rev-parse.c:811
msgid "Could not read the index"
msgstr "Não foi possível ler o índice"
-#: builtin/add.c:205
+#: builtin/add.c:207
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Não foi possível abrir '%s' para escrita."
-#: builtin/add.c:209
+#: builtin/add.c:211
msgid "Could not write patch"
msgstr "Não foi possível escrever patch"
-#: builtin/add.c:212
+#: builtin/add.c:214
msgid "editing patch failed"
msgstr "falha ao editar patch"
-#: builtin/add.c:215
+#: builtin/add.c:217
#, c-format
msgid "Could not stat '%s'"
msgstr "Não foi possível obter stat de '%s'"
-#: builtin/add.c:217
+#: builtin/add.c:219
msgid "Empty patch. Aborted."
msgstr "Patch vazio. Abortado."
-#: builtin/add.c:222
+#: builtin/add.c:224
#, c-format
msgid "Could not apply '%s'"
msgstr "Não foi possível aplicar '%s'"
-#: builtin/add.c:232
+#: builtin/add.c:234
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Os seguintes caminhos estão ignorados por algum ficheiro .gitignore:\n"
-#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
-#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
+#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "simular ação"
-#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
-#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
-#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
+#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
+#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
msgid "be verbose"
msgstr "ser verboso"
-#: builtin/add.c:252
+#: builtin/add.c:256
msgid "interactive picking"
msgstr "seleção interativa"
-#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
+#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "selecionar blocos interativamente"
-#: builtin/add.c:254
+#: builtin/add.c:258
msgid "edit current diff and apply"
msgstr "editar o diff atual e aplicá-lo"
-#: builtin/add.c:255
+#: builtin/add.c:259
msgid "allow adding otherwise ignored files"
msgstr "permitir adicionar ficheiros ignorados"
-#: builtin/add.c:256
+#: builtin/add.c:260
msgid "update tracked files"
msgstr "atualizar ficheiros controlados"
-#: builtin/add.c:257
+#: builtin/add.c:261
msgid "record only the fact that the path will be added later"
msgstr "registar apenas o facto de que o caminho será adicionado mais tarde"
-#: builtin/add.c:258
+#: builtin/add.c:262
msgid "add changes from all tracked and untracked files"
msgstr ""
"adicionar alterações de todos os ficheiros controlados ou não controlados"
-#: builtin/add.c:261
+#: builtin/add.c:265
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"ignorar caminhos removidos na árvore de trabalho (o mesmo que --no-all)"
-#: builtin/add.c:263
+#: builtin/add.c:267
msgid "don't add, only refresh the index"
msgstr "não adicionar, apenas atualizar o índice"
-#: builtin/add.c:264
+#: builtin/add.c:268
msgid "just skip files which cannot be added because of errors"
msgstr "ignorar ficheiros que não podem ser adicionados por causa de erros"
-#: builtin/add.c:265
+#: builtin/add.c:269
msgid "check if - even missing - files are ignored in dry run"
msgstr "verificar quais os ficheiros ignorados na simulação"
-#: builtin/add.c:287
+#: builtin/add.c:270 builtin/update-index.c:958
+msgid "(+/-)x"
+msgstr "(+/-)x"
+
+#: builtin/add.c:270 builtin/update-index.c:959
+msgid "override the executable bit of the listed files"
+msgstr "substituir o bit executável dos ficheiros listados"
+
+#: builtin/add.c:292
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Use -f se deseja mesmo adicioná-los.\n"
-#: builtin/add.c:294
+#: builtin/add.c:300
msgid "adding files failed"
msgstr "falha ao adicionar ficheiros"
-#: builtin/add.c:330
+#: builtin/add.c:336
msgid "-A and -u are mutually incompatible"
msgstr "-A e -u são mutuamente incompatíveis"
-#: builtin/add.c:337
+#: builtin/add.c:343
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "A opção --ignore-missing só pode ser usada em conjunto com --dry-run"
#: builtin/add.c:352
#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "o parâmetro '%s' de --chmod tem de ser -x ou +x"
+
+#: builtin/add.c:367
+#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Não foi especificado nada, nada adicionado.\n"
-#: builtin/add.c:353
+#: builtin/add.c:368
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Queria dizer 'git add .'?\n"
-#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
+#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
#: builtin/submodule--helper.c:240
msgid "index file corrupt"
msgstr "ficheiro de índice corrompido"
-#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
+#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
msgid "Unable to write new index file"
msgstr "Não foi possível escrever novo ficheiro de índice"
-#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
+#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
#, c-format
msgid "could not read '%s'"
msgstr "não foi possível ler '%s'"
-#: builtin/am.c:430
+#: builtin/am.c:426
msgid "could not parse author script"
msgstr "não foi possível analisar o autor do script"
-#: builtin/am.c:507
+#: builtin/am.c:503
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' foi eliminado pelo hook applypatch-msg"
-#: builtin/am.c:548 builtin/notes.c:300
+#: builtin/am.c:544 builtin/notes.c:301
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Linha de entrada malformada: '%s'."
-#: builtin/am.c:585 builtin/notes.c:315
+#: builtin/am.c:581 builtin/notes.c:316
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Falha ao copiar notas de '%s' para '%s'"
-#: builtin/am.c:611
+#: builtin/am.c:607
msgid "fseek failed"
msgstr "falha ao invocar fseek"
-#: builtin/am.c:788
+#: builtin/am.c:787
#, c-format
msgid "could not parse patch '%s'"
msgstr "não foi possível analisar o patch '%s'"
-#: builtin/am.c:853
+#: builtin/am.c:852
msgid "Only one StGIT patch series can be applied at once"
msgstr "Só pode ser aplicada uma série de patches StGIT duma só vez"
-#: builtin/am.c:900
+#: builtin/am.c:899
msgid "invalid timestamp"
msgstr "carimbo de data/hora inválido"
-#: builtin/am.c:903 builtin/am.c:911
+#: builtin/am.c:902 builtin/am.c:910
msgid "invalid Date line"
msgstr "linha de Data inválida"
-#: builtin/am.c:908
+#: builtin/am.c:907
msgid "invalid timezone offset"
msgstr "mudança de fuso horário inválida"
-#: builtin/am.c:995
+#: builtin/am.c:996
msgid "Patch format detection failed."
msgstr "Falha ao detetar o formato do patch."
-#: builtin/am.c:1000 builtin/clone.c:380
+#: builtin/am.c:1001 builtin/clone.c:380
#, c-format
msgid "failed to create directory '%s'"
msgstr "falha ao criar o diretório '%s'"
-#: builtin/am.c:1004
+#: builtin/am.c:1005
msgid "Failed to split patches."
msgstr "Falha ao dividir patches."
-#: builtin/am.c:1136 builtin/commit.c:365
+#: builtin/am.c:1137 builtin/commit.c:366
msgid "unable to write index file"
msgstr "não é possível escrever o ficheiro de índice"
-#: builtin/am.c:1187
+#: builtin/am.c:1188
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Após resolver este problema, execute \"%s --continue\"."
-#: builtin/am.c:1188
+#: builtin/am.c:1189
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Se preferir ignorar este patch, execute \"%s --skip\"."
-#: builtin/am.c:1189
+#: builtin/am.c:1190
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Para restaurar o ramo original e interromper a aplicação dos patches, "
"execute \"%s --abort\"."
-#: builtin/am.c:1327
+#: builtin/am.c:1328
msgid "Patch is empty. Was it split wrong?"
msgstr "O patch está vazio. Foi dividido incorretamente?"
-#: builtin/am.c:1401 builtin/log.c:1516
+#: builtin/am.c:1402 builtin/log.c:1543
#, c-format
msgid "invalid ident line: %s"
msgstr "linha de identidade inválida: %s"
-#: builtin/am.c:1428
+#: builtin/am.c:1429
#, c-format
msgid "unable to parse commit %s"
msgstr "não foi possível analisar o commit %s"
-#: builtin/am.c:1630
+#: builtin/am.c:1602
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"O repositório não tem os blobs necessários para recorrer a integração com 3 "
"pontos."
-#: builtin/am.c:1632
+#: builtin/am.c:1604
msgid "Using index info to reconstruct a base tree..."
msgstr "A usar informação do índice para reconstruir uma árvore de base..."
-#: builtin/am.c:1651
+#: builtin/am.c:1623
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2896,41 +3282,41 @@ msgstr ""
"Editou o patch manualmente?\n"
"Não é possível aplicá-lo aos blobs registados no índice."
-#: builtin/am.c:1657
+#: builtin/am.c:1629
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
"A recorrer a uma de base para aplicação de patches e integração com 3 "
"pontos..."
-#: builtin/am.c:1672
+#: builtin/am.c:1654
msgid "Failed to merge in the changes."
msgstr "Falha ao integrar as alterações."
-#: builtin/am.c:1696 builtin/merge.c:636
+#: builtin/am.c:1679 builtin/merge.c:628
msgid "git write-tree failed to write a tree"
msgstr "git write-tree falhou ao escrever uma árvore"
-#: builtin/am.c:1703
+#: builtin/am.c:1686
msgid "applying to an empty history"
msgstr "a aplicar a um histórico vazio"
-#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
-#: builtin/merge.c:866
+#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
+#: builtin/merge.c:823
msgid "failed to write commit object"
msgstr "falha ao escrever objeto de commit"
-#: builtin/am.c:1748 builtin/am.c:1752
+#: builtin/am.c:1731 builtin/am.c:1735
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "não é possível continuar: %s não existe."
-#: builtin/am.c:1768
+#: builtin/am.c:1751
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"não é possível entrar em modo interativo sem um entrada padrão conectada a "
"um terminal."
-#: builtin/am.c:1773
+#: builtin/am.c:1756
msgid "Commit Body is:"
msgstr "Corpo do commit:"
@@ -2938,35 +3324,35 @@ msgstr "Corpo do commit:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1783
+#: builtin/am.c:1766
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Aplicar? [y]sim/[n]ão/[e]ditar/[v]er patch/[a]ceitar todos: "
-#: builtin/am.c:1833
+#: builtin/am.c:1816
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Ãndice modificado: não é possível aplicar patches (modificado: %s)"
-#: builtin/am.c:1868 builtin/am.c:1940
+#: builtin/am.c:1853 builtin/am.c:1925
#, c-format
msgid "Applying: %.*s"
msgstr "A aplicar: %.*s"
-#: builtin/am.c:1884
+#: builtin/am.c:1869
msgid "No changes -- Patch already applied."
msgstr "Nenhuma alteração -- Já foi aplicado o patch."
-#: builtin/am.c:1892
+#: builtin/am.c:1877
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Falha ao aplicar o patch em %s %.*s"
-#: builtin/am.c:1898
+#: builtin/am.c:1883
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "A cópia do patch que falhou encontra-se em: %s"
-#: builtin/am.c:1943
+#: builtin/am.c:1928
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2976,7 +3362,7 @@ msgstr ""
"Se não há nada por preparar, provavelmente essas mesmas alterações\n"
"já foram introduzidas; pode querer ignorar este patch."
-#: builtin/am.c:1950
+#: builtin/am.c:1935
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2984,17 +3370,17 @@ msgstr ""
"Ainda há caminhos não integrados no índice.\n"
"Esqueceu-se de usar 'git add'?"
-#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
+#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Não foi possível analisar o objeto '%s'."
-#: builtin/am.c:2110
+#: builtin/am.c:2095
msgid "failed to clean index"
msgstr "falha ao limpar o índice"
-#: builtin/am.c:2144
+#: builtin/am.c:2129
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -3002,155 +3388,155 @@ msgstr ""
"Parece que a HEAD foi movida desde a última vez que o 'am' falhou.\n"
"Não recuando a ORIG_HEAD"
-#: builtin/am.c:2205
+#: builtin/am.c:2192
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor inválido de --patch-format: %s"
-#: builtin/am.c:2238
+#: builtin/am.c:2225
msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr "git am [<opções>] [(<mbox>|<Maildir>)...]"
-#: builtin/am.c:2239
+#: builtin/am.c:2226
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opções>] (--continue | --skip | --abort)"
-#: builtin/am.c:2245
+#: builtin/am.c:2232
msgid "run interactively"
msgstr "executar interativamente"
-#: builtin/am.c:2247
+#: builtin/am.c:2234
msgid "historical option -- no-op"
msgstr "opção histórica -- sem-ação"
-#: builtin/am.c:2249
+#: builtin/am.c:2236
msgid "allow fall back on 3way merging if needed"
msgstr "permitir recorrer a integração com 3 pontos se necessário"
-#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
-#: builtin/repack.c:171
+#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
+#: builtin/repack.c:172
msgid "be quiet"
msgstr "silencioso"
-#: builtin/am.c:2252
+#: builtin/am.c:2239
msgid "add a Signed-off-by line to the commit message"
msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit"
-#: builtin/am.c:2255
+#: builtin/am.c:2242
msgid "recode into utf8 (default)"
msgstr "recodificar em utf8 (predefinição)"
-#: builtin/am.c:2257
+#: builtin/am.c:2244
msgid "pass -k flag to git-mailinfo"
msgstr "passar a opção -k ao git-mailinfo"
-#: builtin/am.c:2259
+#: builtin/am.c:2246
msgid "pass -b flag to git-mailinfo"
msgstr "passar a opção -b ao git-mailinfo"
-#: builtin/am.c:2261
+#: builtin/am.c:2248
msgid "pass -m flag to git-mailinfo"
msgstr "passar a opção -m ao git-mailinfo"
-#: builtin/am.c:2263
+#: builtin/am.c:2250
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passar a opção --keep-cr ao gitmailsplit para formato de mbox"
-#: builtin/am.c:2266
+#: builtin/am.c:2253
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"não passar a opção --keep-cr ao git-mailsplit independentemente de am.keepcr"
-#: builtin/am.c:2269
+#: builtin/am.c:2256
msgid "strip everything before a scissors line"
msgstr "retirar todo o conteúdo antes da linha de tesoura"
-#: builtin/am.c:2270 builtin/apply.c:4546
+#: builtin/am.c:2257 builtin/apply.c:4837
msgid "action"
msgstr "ação"
-#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
-#: builtin/am.c:2298
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
+#: builtin/am.c:2285
msgid "pass it through git-apply"
msgstr "transmitir ao git-apply"
-#: builtin/am.c:2279 builtin/apply.c:4570
+#: builtin/am.c:2266 builtin/apply.c:4861
msgid "root"
msgstr "raiz"
-#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
-#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
+#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
-#: builtin/submodule--helper.c:770
+#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:826
msgid "path"
msgstr "caminho"
-#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134
-#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182
-#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
-#: parse-options.h:132 parse-options.h:134 parse-options.h:244
+#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 builtin/pull.c:193
+#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:645
+#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
+#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2291 builtin/apply.c:4514
+#: builtin/am.c:2278 builtin/apply.c:4805
msgid "num"
msgstr "num"
-#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "formato"
-#: builtin/am.c:2295
+#: builtin/am.c:2282
msgid "format the patch(es) are in"
msgstr "formato de apresentação de patches"
-#: builtin/am.c:2301
+#: builtin/am.c:2288
msgid "override error message when patch failure occurs"
msgstr "substituir a mensagem de erro quando a aplicação do patch falha"
-#: builtin/am.c:2303
+#: builtin/am.c:2290
msgid "continue applying patches after resolving a conflict"
msgstr "continuar a aplicar os patches depois de resolver os conflitos"
-#: builtin/am.c:2306
+#: builtin/am.c:2293
msgid "synonyms for --continue"
msgstr "sinónimo de --continue"
-#: builtin/am.c:2309
+#: builtin/am.c:2296
msgid "skip the current patch"
msgstr "ignorar o patch atual"
-#: builtin/am.c:2312
+#: builtin/am.c:2299
msgid "restore the original branch and abort the patching operation."
msgstr "restaurar o ramo original e abortar a operação de patch."
-#: builtin/am.c:2316
+#: builtin/am.c:2303
msgid "lie about committer date"
msgstr "mentir sobre a data de commit"
-#: builtin/am.c:2318
+#: builtin/am.c:2305
msgid "use current timestamp for author date"
msgstr "usar a data e hora atual como data de autor"
-#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "id-chave"
-#: builtin/am.c:2321
+#: builtin/am.c:2308
msgid "GPG-sign commits"
msgstr "assinar os commits com GPG"
-#: builtin/am.c:2324
+#: builtin/am.c:2311
msgid "(internal use for git-rebase)"
msgstr "(uso interno de git-rebase)"
-#: builtin/am.c:2339
+#: builtin/am.c:2326
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -3158,17 +3544,17 @@ msgstr ""
"A opção -b/--binary há muito que é ignorada e será\n"
"futuramente removida. Por favor não a use."
-#: builtin/am.c:2346
+#: builtin/am.c:2333
msgid "failed to read the index"
msgstr "falha ao ler o índice"
-#: builtin/am.c:2361
+#: builtin/am.c:2348
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"o diretório de rebesa anterior %s ainda existe, mas foi fornecida uma mbox."
-#: builtin/am.c:2385
+#: builtin/am.c:2372
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -3177,76 +3563,76 @@ msgstr ""
"Diretório abandonado %s encontrado.\n"
"Use \"git am --abort\" para o remover."
-#: builtin/am.c:2391
+#: builtin/am.c:2378
msgid "Resolve operation not in progress, we are not resuming."
msgstr "A operação de resolução não está em curso, não retomando."
-#: builtin/apply.c:59
+#: builtin/apply.c:122
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<opções>] [<patch>...]"
-#: builtin/apply.c:111
+#: builtin/apply.c:153
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "opção de espaço em branco não reconhecida '%s'"
-#: builtin/apply.c:126
+#: builtin/apply.c:169
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "opção de ignorar espaço em branco não reconhecida '%s'"
-#: builtin/apply.c:818
+#: builtin/apply.c:854
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Não é possível preparar a regexp de carimbo de data/hora %s"
-#: builtin/apply.c:827
+#: builtin/apply.c:863
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec retornou %d para a entra: %s"
-#: builtin/apply.c:908
+#: builtin/apply.c:947
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "não foi possível encontrar o nome do ficheiro no patch na linha %d"
-#: builtin/apply.c:937
+#: builtin/apply.c:984
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: git-diff incorreto - esperava-se /dev/null, obteve-se %s na linha "
"%d"
-#: builtin/apply.c:942
+#: builtin/apply.c:989
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: git-diff incorreto - o nome do novo ficheiro na linha %d é "
"inconsistente"
-#: builtin/apply.c:943
+#: builtin/apply.c:990
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: git-diff incorreto - o nome do ficheiro antigo na linha %d é "
"inconsistente"
-#: builtin/apply.c:949
+#: builtin/apply.c:995
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff incorreto - esperava-se /dev/null na linha %d"
-#: builtin/apply.c:1406
+#: builtin/apply.c:1489
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recontagem: linha inesperada: %.*s"
-#: builtin/apply.c:1463
+#: builtin/apply.c:1550
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragmento de patch sem cabeçalho na linha %d: %.*s"
-#: builtin/apply.c:1480
+#: builtin/apply.c:1567
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -3261,77 +3647,77 @@ msgstr[1] ""
"o cabeçalho do git diff não revelou o nome do ficheiro depois de se remover "
"%d componentes de caminho (linha %d)"
-#: builtin/apply.c:1646
+#: builtin/apply.c:1743
msgid "new file depends on old contents"
msgstr "o novo ficheiro depende de conteúdos antigos"
-#: builtin/apply.c:1648
+#: builtin/apply.c:1745
msgid "deleted file still has contents"
msgstr "o ficheiro eliminado ainda tem conteúdos"
-#: builtin/apply.c:1674
+#: builtin/apply.c:1774
#, c-format
msgid "corrupt patch at line %d"
msgstr "patch corrompido na linha %d"
-#: builtin/apply.c:1710
+#: builtin/apply.c:1810
#, c-format
msgid "new file %s depends on old contents"
msgstr "o novo ficheiro %s depende de conteúdos antigos"
-#: builtin/apply.c:1712
+#: builtin/apply.c:1812
#, c-format
msgid "deleted file %s still has contents"
msgstr "o ficheiro eliminado %s ainda tem conteúdos"
-#: builtin/apply.c:1715
+#: builtin/apply.c:1815
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** aviso: o ficheiro %s ficará vazio, mas não será eliminado"
-#: builtin/apply.c:1861
+#: builtin/apply.c:1962
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "patch binário corrompido na linha %d: %.*s"
-#: builtin/apply.c:1895
+#: builtin/apply.c:1999
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "patch binário não reconhecido na linha %d"
-#: builtin/apply.c:2048
+#: builtin/apply.c:2154
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch incompreensível na linha %d"
-#: builtin/apply.c:2138
+#: builtin/apply.c:2244
#, c-format
msgid "unable to read symlink %s"
msgstr "não é possível ler a ligação simbólica %s"
-#: builtin/apply.c:2142
+#: builtin/apply.c:2248
#, c-format
msgid "unable to open or read %s"
msgstr "não é possível abrir ou ler %s"
-#: builtin/apply.c:2775
+#: builtin/apply.c:2901
#, c-format
msgid "invalid start of line: '%c'"
msgstr "início de linha inválido: '%c'"
-#: builtin/apply.c:2894
+#: builtin/apply.c:3020
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Excerto nº%d bem sucedido na linha %d (%d linha deslocada)."
msgstr[1] "Excerto nº%d bem sucedido na linha %d (%d linhas deslocadas)."
-#: builtin/apply.c:2906
+#: builtin/apply.c:3032
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Contexto reduzido para (%ld/%ld) para aplicar o fragmento em %d"
-#: builtin/apply.c:2912
+#: builtin/apply.c:3038
#, c-format
msgid ""
"while searching for:\n"
@@ -3340,341 +3726,335 @@ msgstr ""
"ao procura por:\n"
"%.*s"
-#: builtin/apply.c:2932
+#: builtin/apply.c:3060
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "falta de dados do patch binário '%s'"
-#: builtin/apply.c:3033
+#: builtin/apply.c:3163
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "o patch binário não foi aplicado corretamente a '%s'"
-#: builtin/apply.c:3039
+#: builtin/apply.c:3169
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"o patch binário aplicado a '%s' gera resultados incorretos (esperava-se %s, "
"obteve-se %s)"
-#: builtin/apply.c:3060
+#: builtin/apply.c:3190
#, c-format
msgid "patch failed: %s:%ld"
msgstr "falha ao aplicar o patch: %s:%ld"
-#: builtin/apply.c:3184
+#: builtin/apply.c:3314
#, c-format
msgid "cannot checkout %s"
msgstr "não é possível extrair %s"
-#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
-#, c-format
-msgid "read of %s failed"
-msgstr "falha ao ler %s"
-
-#: builtin/apply.c:3237
+#: builtin/apply.c:3370
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "a ler '%s' indicado por uma ligação simbólica"
-#: builtin/apply.c:3265 builtin/apply.c:3487
+#: builtin/apply.c:3399 builtin/apply.c:3630
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "o caminho %s foi eliminado ou mudou de nome"
-#: builtin/apply.c:3346 builtin/apply.c:3501
+#: builtin/apply.c:3482 builtin/apply.c:3644
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: não existe no índice"
-#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
+#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3355 builtin/apply.c:3509
+#: builtin/apply.c:3491 builtin/apply.c:3652
#, c-format
msgid "%s: does not match index"
msgstr "%s: não tem correspondência no índice"
-#: builtin/apply.c:3457
+#: builtin/apply.c:3597
msgid "removal patch leaves file contents"
msgstr "patch de remoção deixa conteúdos no ficheiro"
-#: builtin/apply.c:3526
+#: builtin/apply.c:3669
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipo errado"
-#: builtin/apply.c:3528
+#: builtin/apply.c:3671
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s é do tipo %o, esperado %o"
-#: builtin/apply.c:3687 builtin/apply.c:3689
+#: builtin/apply.c:3822 builtin/apply.c:3824
#, c-format
msgid "invalid path '%s'"
msgstr "caminho inválido '%s'"
-#: builtin/apply.c:3744
+#: builtin/apply.c:3879
#, c-format
msgid "%s: already exists in index"
msgstr "%s: já existe no índice"
-#: builtin/apply.c:3747
+#: builtin/apply.c:3882
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: já existe no diretório de trabalho"
-#: builtin/apply.c:3767
+#: builtin/apply.c:3902
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o)"
-#: builtin/apply.c:3772
+#: builtin/apply.c:3907
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o) de %s"
-#: builtin/apply.c:3792
+#: builtin/apply.c:3927
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "o ficheiro afetado '%s' é indicado por uma ligação simbólica"
-#: builtin/apply.c:3796
+#: builtin/apply.c:3931
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: patch não se aplica com sucesso"
-#: builtin/apply.c:3810
+#: builtin/apply.c:3945
#, c-format
msgid "Checking patch %s..."
msgstr "A verificar o patch %s..."
-#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "falha ao invocar make_cache_entry em '%s'"
-#: builtin/apply.c:4046
+#: builtin/apply.c:4182
#, c-format
msgid "unable to remove %s from index"
msgstr "não é possível remover %s do índice"
-#: builtin/apply.c:4075
+#: builtin/apply.c:4215
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "patch corrompido no submódulo %s"
-#: builtin/apply.c:4079
+#: builtin/apply.c:4219
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "não é possível obter estado do novo ficheiro criado '%s'"
-#: builtin/apply.c:4084
+#: builtin/apply.c:4224
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"não é possível criar armazenamento de segurança do ficheiro recém-criado %s"
-#: builtin/apply.c:4087 builtin/apply.c:4195
+#: builtin/apply.c:4227 builtin/apply.c:4340
#, c-format
msgid "unable to add cache entry for %s"
msgstr "não é possível adicionar %s à cache"
-#: builtin/apply.c:4120
+#: builtin/apply.c:4260
#, c-format
msgid "closing file '%s'"
msgstr "a fechar o ficheiro '%s'"
-#: builtin/apply.c:4169
+#: builtin/apply.c:4313
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "não é possível escrever o ficheiro '%s' com o modo %o"
-#: builtin/apply.c:4256
+#: builtin/apply.c:4403
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s aplicado com sucesso."
-#: builtin/apply.c:4264
+#: builtin/apply.c:4411
msgid "internal error"
msgstr "erro interno"
-#: builtin/apply.c:4267
+#: builtin/apply.c:4414
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "A aplicar patch %%s com %d rejeição..."
msgstr[1] "A aplicar patch %%s com %d rejeições..."
-#: builtin/apply.c:4277
+#: builtin/apply.c:4424
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "a truncar o nome do ficheiro .rej em %.*s.rej"
-#: builtin/apply.c:4285
+#: builtin/apply.c:4432
#, c-format
msgid "cannot open %s: %s"
msgstr "não é possível abrir %s: %s"
-#: builtin/apply.c:4298
+#: builtin/apply.c:4445
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Excerto nº%d aplicado com sucesso."
-#: builtin/apply.c:4301
+#: builtin/apply.c:4448
#, c-format
msgid "Rejected hunk #%d."
msgstr "Excerto nº%d rejeitado."
-#: builtin/apply.c:4387
+#: builtin/apply.c:4537
#, c-format
msgid "Skipped patch '%s'."
msgstr "Patch '%s' ignorado."
-#: builtin/apply.c:4395
+#: builtin/apply.c:4545
msgid "unrecognized input"
msgstr "entrada não reconhecida"
-#: builtin/apply.c:4406
+#: builtin/apply.c:4556
msgid "unable to read index file"
msgstr "não foi possível ler o ficheiro de índice"
-#: builtin/apply.c:4509
+#: builtin/apply.c:4701
+msgid "--3way outside a repository"
+msgstr "--3way fora de um repositório"
+
+#: builtin/apply.c:4709
+msgid "--index outside a repository"
+msgstr "--index fora de um repositório"
+
+#: builtin/apply.c:4712
+msgid "--cached outside a repository"
+msgstr "--cached fora de um repositório"
+
+#: builtin/apply.c:4745
+#, c-format
+msgid "can't open patch '%s'"
+msgstr "não é possível abrir o patch '%s'"
+
+#: builtin/apply.c:4760
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "%d erro de espaço em branco reprimido"
+msgstr[1] "%d erros de espaço em branco reprimidos"
+
+#: builtin/apply.c:4766 builtin/apply.c:4776
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d linha adiciona erros de espaço em branco."
+msgstr[1] "%d linhas adicionam erros de espaço em branco."
+
+#: builtin/apply.c:4800
msgid "don't apply changes matching the given path"
msgstr "não aplicar alterações que correspondam ao caminho fornecido"
-#: builtin/apply.c:4512
+#: builtin/apply.c:4803
msgid "apply changes matching the given path"
msgstr "aplicar alterações que correspondam ao caminho fornecido"
-#: builtin/apply.c:4515
+#: builtin/apply.c:4806
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "remover <num> barras à esquerda dos caminhos de diff tradicional"
-#: builtin/apply.c:4518
+#: builtin/apply.c:4809
msgid "ignore additions made by the patch"
msgstr "ignorar adições feitas pelo patch"
-#: builtin/apply.c:4520
+#: builtin/apply.c:4811
msgid "instead of applying the patch, output diffstat for the input"
msgstr "em vez de aplicar o patch, mostrar o diffstat da entrada"
-#: builtin/apply.c:4524
+#: builtin/apply.c:4815
msgid "show number of added and deleted lines in decimal notation"
msgstr "mostrar número de linhas adicionadas e removidas em notação decimal"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4817
msgid "instead of applying the patch, output a summary for the input"
msgstr "em vez de aplicar o patch, mostrar um resumo da entrada"
-#: builtin/apply.c:4528
+#: builtin/apply.c:4819
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "em vez de aplicar o patch, verificar se o patch pode ser aplicado"
-#: builtin/apply.c:4530
+#: builtin/apply.c:4821
msgid "make sure the patch is applicable to the current index"
msgstr "garantir que o patch pode ser aplicado ao índice atual"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4823
msgid "apply a patch without touching the working tree"
msgstr "aplicar um patch sem tocar na árvore de trabalho"
-#: builtin/apply.c:4534
+#: builtin/apply.c:4825
msgid "accept a patch that touches outside the working area"
msgstr "aceitar patches que alteram ficheiros fora da área de trabalho"
-#: builtin/apply.c:4536
+#: builtin/apply.c:4827
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "aplicar o patch também (use com --stat/--summary/--check)"
-#: builtin/apply.c:4538
+#: builtin/apply.c:4829
msgid "attempt three-way merge if a patch does not apply"
-msgstr ""
-"tentar integração com três pontos se um patch não se se aplica com êxito"
+msgstr "tentar integração com três pontos se um patch não se aplica com êxito"
-#: builtin/apply.c:4540
+#: builtin/apply.c:4831
msgid "build a temporary index based on embedded index information"
msgstr ""
"construir um índice temporário baseado na informação incorporada do índice"
-#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
msgid "paths are separated with NUL character"
msgstr "os caminhos estão separados por caracteres NUL"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4836
msgid "ensure at least <n> lines of context match"
msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"
-#: builtin/apply.c:4547
+#: builtin/apply.c:4838
msgid "detect new or modified lines that have whitespace errors"
msgstr "detetar linhas novas ou modificadas que tenham espaços em branco"
-#: builtin/apply.c:4550 builtin/apply.c:4553
+#: builtin/apply.c:4841 builtin/apply.c:4844
msgid "ignore changes in whitespace when finding context"
msgstr "ignorar alterações de espaço em branco ao procurar contexto"
-#: builtin/apply.c:4556
+#: builtin/apply.c:4847
msgid "apply the patch in reverse"
msgstr "aplicar o patch em reverso"
-#: builtin/apply.c:4558
+#: builtin/apply.c:4849
msgid "don't expect at least one line of context"
msgstr "não esperar nenhuma linha de contexto"
-#: builtin/apply.c:4560
+#: builtin/apply.c:4851
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "deixar os excertos rejeitados nos respetivos ficheiros *.rej"
-#: builtin/apply.c:4562
+#: builtin/apply.c:4853
msgid "allow overlapping hunks"
msgstr "permitir a sobreposição de excertos"
-#: builtin/apply.c:4565
+#: builtin/apply.c:4856
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"tolerar deteções incorretas de falta de nova linha no final do ficheiro"
-#: builtin/apply.c:4568
+#: builtin/apply.c:4859
msgid "do not trust the line counts in the hunk headers"
msgstr "não confiar na contagem de linhas no cabeçalho dos excertos"
-#: builtin/apply.c:4571
+#: builtin/apply.c:4862
msgid "prepend <root> to all filenames"
msgstr "preceder <root> a todos os nomes de ficheiro"
-#: builtin/apply.c:4593
-msgid "--3way outside a repository"
-msgstr "--3way fora de um repositório"
-
-#: builtin/apply.c:4601
-msgid "--index outside a repository"
-msgstr "--index fora de um repositório"
-
-#: builtin/apply.c:4604
-msgid "--cached outside a repository"
-msgstr "--cached fora de um repositório"
-
-#: builtin/apply.c:4623
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "não é possível abrir o patch '%s'"
-
-#: builtin/apply.c:4637
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] "%d erro de espaço em branco reprimido"
-msgstr[1] "%d erros de espaço em branco reprimidos"
-
-#: builtin/apply.c:4643 builtin/apply.c:4653
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] "%d linha adiciona erros de espaço em branco."
-msgstr[1] "%d linhas adicionam erros de espaço em branco."
-
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
@@ -3730,105 +4110,105 @@ msgstr "git blame [<opções>] [<rev-opções>] [<rev>] [--] <ficheiro>"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opções> estão documentadas em git-rev-list(1)"
-#: builtin/blame.c:1782
+#: builtin/blame.c:1781
msgid "Blaming lines"
msgstr "Linhas de culpa"
-#: builtin/blame.c:2531
+#: builtin/blame.c:2536
msgid "Show blame entries as we find them, incrementally"
msgstr ""
"Mostrar entradas de culpa à medida que forem encontradas, incrementalmente"
-#: builtin/blame.c:2532
+#: builtin/blame.c:2537
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Mostar SHA-1 dos commits limite em branco (Predefinição: desativado)"
-#: builtin/blame.c:2533
+#: builtin/blame.c:2538
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Não tratar os commits raiz como limites (Predefinição: desativado)"
-#: builtin/blame.c:2534
+#: builtin/blame.c:2539
msgid "Show work cost statistics"
msgstr "Mostrar estatísticas de custo de atividade"
-#: builtin/blame.c:2535
+#: builtin/blame.c:2540
msgid "Force progress reporting"
msgstr "Forçar informação de progresso"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2541
msgid "Show output score for blame entries"
msgstr "Mostrar a pontuação das entradas de culpa"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2542
msgid "Show original filename (Default: auto)"
msgstr "Mostrar o nome do ficheiro original (Predefinição: auto)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2543
msgid "Show original linenumber (Default: off)"
msgstr "Mostrar números de linha originais (Predefinição: desativado)"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2544
msgid "Show in a format designed for machine consumption"
msgstr "Mostrar em formato próprio para ser consumo por uma máquina"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2545
msgid "Show porcelain format with per-line commit information"
msgstr "Mostrar em formato de porcelana com informações de commit por linha"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2546
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Usar o mesmo modo de saída que git-annotate (Predefinição: desativado)"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2547
msgid "Show raw timestamp (Default: off)"
msgstr "Mostrar carimbo de data/hora em bruto (Predefinição: desativado)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2548
msgid "Show long commit SHA1 (Default: off)"
msgstr "Mostrar SHA1 longo de commit (Predefinição: desativado)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2549
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
"Suprimir nome de autor e carimbo de data/hora (Predefinição: desativado)"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2550
msgid "Show author email instead of name (Default: off)"
msgstr "Mostrar o email do autor em vez do nome (Predefinição: desativado)"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2551
msgid "Ignore whitespace differences"
msgstr "Ignorar as diferenças de espaço em branco"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2552
msgid "Spend extra cycles to find better match"
msgstr "Despender ciclos extra para encontrar uma melhor correspondência"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2553
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Usar revisões do <ficheiro> em vez de invocar git-rev-list"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2554
msgid "Use <file>'s contents as the final image"
msgstr "Usar o conteúdo do <ficheiro> como imagem final"
-#: builtin/blame.c:2550 builtin/blame.c:2551
+#: builtin/blame.c:2555 builtin/blame.c:2556
msgid "score"
msgstr "pontuação"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2555
msgid "Find line copies within and across files"
msgstr "Localizar linhas copiadas dentro e entre ficheiros"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2556
msgid "Find line movements within and across files"
msgstr "Localizar linhas movidas dentro e entre ficheiros"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2557
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2557
msgid "Process only line range n,m, counting from 1"
msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1"
@@ -3838,7 +4218,7 @@ msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1"
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2641
+#: builtin/blame.c:2649
msgid "4 years, 11 months ago"
msgstr "há 4 anos e 11 meses atrás"
@@ -3941,120 +4321,127 @@ msgstr "Ramo de monitorização remoto %s eliminado (era %s).\n"
msgid "Deleted branch %s (was %s).\n"
msgstr "Ramo %s eliminado (era %s).\n"
-#: builtin/branch.c:309
+#: builtin/branch.c:312
#, c-format
msgid "[%s: gone]"
msgstr "[%s: desaparecido]"
-#: builtin/branch.c:314
+#: builtin/branch.c:317
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:319
+#: builtin/branch.c:322
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: atrás %d]"
-#: builtin/branch.c:321
+#: builtin/branch.c:324
#, c-format
msgid "[behind %d]"
msgstr "[atrás %d]"
-#: builtin/branch.c:325
+#: builtin/branch.c:328
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: à frente %d]"
-#: builtin/branch.c:327
+#: builtin/branch.c:330
#, c-format
msgid "[ahead %d]"
msgstr "[à frente %d]"
-#: builtin/branch.c:330
+#: builtin/branch.c:333
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: à frente %d, atrás %d]"
-#: builtin/branch.c:333
+#: builtin/branch.c:336
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[à frente %d, atrás %d]"
-#: builtin/branch.c:346
+#: builtin/branch.c:349
msgid " **** invalid ref ****"
msgstr " **** referências inválida ****"
-#: builtin/branch.c:372
+#: builtin/branch.c:375
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(nenhum ramo, a efetuar rebase de %s)"
-#: builtin/branch.c:375
+#: builtin/branch.c:378
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(nenhum ramo, bissecção iniciada em %s)"
#. TRANSLATORS: make sure this matches
#. "HEAD detached at " in wt-status.c
-#: builtin/branch.c:381
+#: builtin/branch.c:384
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD destacada em %s)"
#. TRANSLATORS: make sure this matches
#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:386
+#: builtin/branch.c:389
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD destacada de %s)"
-#: builtin/branch.c:390
+#: builtin/branch.c:393
msgid "(no branch)"
msgstr "(nenhum ramo)"
-#: builtin/branch.c:541
+#: builtin/branch.c:544
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "O ramo %s está a ser rebaseado em %s"
-#: builtin/branch.c:545
+#: builtin/branch.c:548
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "O ramo %s está a ser bissetado em %s"
-#: builtin/branch.c:560
+#: builtin/branch.c:563
msgid "cannot rename the current branch while not on any."
msgstr ""
"não é possível mudar o nome do ramo atual vista que não se encontra num ramo."
-#: builtin/branch.c:570
+#: builtin/branch.c:573
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nome de ramo inválido: '%s'"
-#: builtin/branch.c:587
+#: builtin/branch.c:590
msgid "Branch rename failed"
msgstr "Falha ao mudar o nome do ramo"
-#: builtin/branch.c:591
+#: builtin/branch.c:594
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "O ramo incorretamente denominado '%s' mudou de nome"
-#: builtin/branch.c:594
+#: builtin/branch.c:597
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "O nome do ramo mudou para %s, mas a HEAD não está atualizada!"
-#: builtin/branch.c:601
+#: builtin/branch.c:604
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"O ramo mudou de nome, mas a atualização do ficheiro de configuração falhou"
-#: builtin/branch.c:623
-msgid "could not write branch description template"
-msgstr "não foi possível escrever o modelo da descrição do ramo"
+#: builtin/branch.c:620
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+"Edite a descrição do ramo:\n"
+" %s\n"
+"Linha começadas com '%c' serão ignoradas.\n"
#: builtin/branch.c:651
msgid "Generic options"
@@ -4156,8 +4543,8 @@ msgstr "chave"
msgid "field name to sort on"
msgstr "nome do campo pelo qual ordernar"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
-#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
+#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
#: builtin/tag.c:369
msgid "object"
msgstr "objeto"
@@ -4247,7 +4634,8 @@ msgstr "não faz sentido criar 'HEAD' manualmente"
#: builtin/branch.c:846
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
-msgstr "as opções -a e -r de 'git branch' não fazem sentido com um nome de ramo"
+msgstr ""
+"as opções -a e -r de 'git branch' não fazem sentido com um nome de ramo"
#: builtin/branch.c:849
#, c-format
@@ -4282,65 +4670,65 @@ msgstr "É necessário um repositório para criar um bundle."
msgid "Need a repository to unbundle."
msgstr "É preciso um repositório para desempacotar."
-#: builtin/cat-file.c:428
+#: builtin/cat-file.c:443
msgid ""
"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
"<type>|--textconv) <object>"
msgstr ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-"
-"type]|-e|-p|<tipo>|--textconv) <objeto>"
+"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
+"<tipo>|--textconv) <objeto>"
-#: builtin/cat-file.c:429
+#: builtin/cat-file.c:444
msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-#: builtin/cat-file.c:466
+#: builtin/cat-file.c:481
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipo> pode ser um de: blob, tree, commit, tag"
-#: builtin/cat-file.c:467
+#: builtin/cat-file.c:482
msgid "show object type"
msgstr "mostrar tipo do objeto"
-#: builtin/cat-file.c:468
+#: builtin/cat-file.c:483
msgid "show object size"
msgstr "mostrar tamanho do objeto"
-#: builtin/cat-file.c:470
+#: builtin/cat-file.c:485
msgid "exit with zero when there's no error"
msgstr "sair com retorno zero quando não houver erros"
-#: builtin/cat-file.c:471
+#: builtin/cat-file.c:486
msgid "pretty-print object's content"
msgstr "mostrar conteúdo do objeto com impressão bonita"
-#: builtin/cat-file.c:473
+#: builtin/cat-file.c:488
msgid "for blob objects, run textconv on object's content"
msgstr "executar textconv no conteúdo de objetos blob"
-#: builtin/cat-file.c:475
+#: builtin/cat-file.c:490
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "permitir que -s e -t funcionem com objetos danificados/corrompidos"
-#: builtin/cat-file.c:476
+#: builtin/cat-file.c:491
msgid "buffer --batch output"
msgstr "carregar a saída de --batch"
-#: builtin/cat-file.c:478
+#: builtin/cat-file.c:493
msgid "show info and content of objects fed from the standard input"
msgstr "mostrar informação e conteúdo dos objetos fornecidos na entrada padrão"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:496
msgid "show info about objects fed from the standard input"
msgstr "mostrar informação sobre os objetos fornecidos na entrada padrão"
-#: builtin/cat-file.c:484
+#: builtin/cat-file.c:499
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"seguir ligações simbólica no interior da árvore (usado com --batch ou --"
"batch-check)"
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:501
msgid "show all objects with --batch or --batch-check"
msgstr "mostrar todos os objetos com --batch ou --batch-check"
@@ -4368,7 +4756,7 @@ msgstr "ler os nomes dos ficheiros da entrada padrão"
msgid "terminate input and output records by a NUL character"
msgstr "terminar registos da entrada e da saída com um carácter NUL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "suprimir informação de progresso"
@@ -4460,9 +4848,9 @@ msgid "write the content to temporary files"
msgstr "escrever o conteúdo em ficheiros temporários"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
-#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
-#: builtin/submodule--helper.c:774
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
+#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
+#: builtin/submodule--helper.c:830 builtin/worktree.c:469
msgid "string"
msgstr "cadeia"
@@ -4529,10 +4917,6 @@ msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Não é possível atualizar os caminhos e mudar para o ramo '%s' ao mesmo tempo."
-#: builtin/checkout.c:279 builtin/checkout.c:473
-msgid "corrupt index file"
-msgstr "ficheiro de índice corrompido"
-
#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
@@ -4542,50 +4926,50 @@ msgstr "o caminho '%s' não foi integrado"
msgid "you need to resolve your current index first"
msgstr "primeiro deve resolver o índice atual"
-#: builtin/checkout.c:622
+#: builtin/checkout.c:625
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Não é possível efetuar reflog de '%s': %s\n"
-#: builtin/checkout.c:660
+#: builtin/checkout.c:664
msgid "HEAD is now at"
msgstr "HEAD está agora em"
-#: builtin/checkout.c:664 builtin/clone.c:661
+#: builtin/checkout.c:668 builtin/clone.c:661
msgid "unable to update HEAD"
msgstr "não foi possível atualizar HEAD"
-#: builtin/checkout.c:668
+#: builtin/checkout.c:672
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Repor ramo '%s'\n"
-#: builtin/checkout.c:671
+#: builtin/checkout.c:675
#, c-format
msgid "Already on '%s'\n"
msgstr "Já em '%s'\n"
-#: builtin/checkout.c:675
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Mudou para e repôs o ramo '%s'\n"
-#: builtin/checkout.c:677 builtin/checkout.c:1067
+#: builtin/checkout.c:681 builtin/checkout.c:1070
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Mudou para o novo ramo '%s'\n"
-#: builtin/checkout.c:679
+#: builtin/checkout.c:683
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Mudou para o ramo '%s'\n"
-#: builtin/checkout.c:731
+#: builtin/checkout.c:734
#, c-format
msgid " ... and %d more.\n"
msgstr " ... e mais %d.\n"
-#: builtin/checkout.c:737
+#: builtin/checkout.c:740
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4606,7 +4990,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:756
+#: builtin/checkout.c:759
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4633,166 +5017,166 @@ msgstr[1] ""
" git branch <nome-do-novo-ramo> %s\n"
"\n"
-#: builtin/checkout.c:792
+#: builtin/checkout.c:795
msgid "internal error in revision walk"
msgstr "erro interno durante o curso de revisões"
-#: builtin/checkout.c:796
+#: builtin/checkout.c:799
msgid "Previous HEAD position was"
msgstr "A posição anterior de HEAD era"
-#: builtin/checkout.c:823 builtin/checkout.c:1062
+#: builtin/checkout.c:826 builtin/checkout.c:1065
msgid "You are on a branch yet to be born"
msgstr "Está num ramo ainda não criado"
-#: builtin/checkout.c:968
+#: builtin/checkout.c:971
#, c-format
msgid "only one reference expected, %d given."
msgstr "esperava-se apenas uma referência, %d fornecidas."
-#: builtin/checkout.c:1008 builtin/worktree.c:212
+#: builtin/checkout.c:1011 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "referência inválida: %s"
-#: builtin/checkout.c:1037
+#: builtin/checkout.c:1040
#, c-format
msgid "reference is not a tree: %s"
msgstr "a referência não é uma árvore: %s"
-#: builtin/checkout.c:1076
+#: builtin/checkout.c:1079
msgid "paths cannot be used with switching branches"
msgstr "não podem ser usados caminhos ao mudar de ramo"
-#: builtin/checkout.c:1079 builtin/checkout.c:1083
+#: builtin/checkout.c:1082 builtin/checkout.c:1086
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' não pode ser usado ao mudar de ramo"
-#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
-#: builtin/checkout.c:1098
+#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
+#: builtin/checkout.c:1101
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' não pode ser usado com '%s'"
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1106
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Não é possível mudar de ramo para '%s', visto que não é um commit"
-#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
-#: builtin/worktree.c:325
+#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
+#: builtin/worktree.c:326
msgid "branch"
msgstr "ramo"
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1140
msgid "create and checkout a new branch"
msgstr "criar e extrair um novo ramo"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1142
msgid "create/reset and checkout a branch"
msgstr "criar/repor e extrair um ramo"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1143
msgid "create reflog for new branch"
msgstr "criar reflog do novo ramo"
-#: builtin/checkout.c:1141
-msgid "detach the HEAD at named commit"
+#: builtin/checkout.c:1144 builtin/worktree.c:328
+msgid "detach HEAD at named commit"
msgstr "destacar HEAD no commit indicado"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1145
msgid "set upstream info for new branch"
msgstr "definir a informação do ramo a montante do novo ramo"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1147
msgid "new-branch"
msgstr "novo-ramo"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1147
msgid "new unparented branch"
msgstr "novo ramo sem pai"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1148
msgid "checkout our version for unmerged files"
msgstr "extrair a nossa versão dos ficheiros não integrados"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1150
msgid "checkout their version for unmerged files"
msgstr "extrair a versão deles dos ficheiros não integrados"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1152
msgid "force checkout (throw away local modifications)"
msgstr "forçar extração (descartar modificações locais)"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1153
msgid "perform a 3-way merge with the new branch"
msgstr "realizar uma integração com 3 pontos com o novo ramo"
-#: builtin/checkout.c:1151 builtin/merge.c:230
+#: builtin/checkout.c:1154 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr "atualizar ficheiros ignorados (predefinição)"
-#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
+#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
msgid "style"
msgstr "estilo"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1156
msgid "conflict style (merge or diff3)"
msgstr "estilo de conflito (merge ou diff3)"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1159
msgid "do not limit pathspecs to sparse entries only"
msgstr "não restringir especificadores de caminho a entradas esparsas"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1161
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1163
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"não verificar se outra árvore de trabalho contém a referência fornecida"
-#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
-#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
+#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117
+#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "forçar informação de progresso"
-#: builtin/checkout.c:1192
+#: builtin/checkout.c:1195
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B e --orphan são mutuamente exclusivos"
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1212
msgid "--track needs a branch name"
msgstr "--track requer um nome dum ramo"
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1217
msgid "Missing branch name; try -b"
msgstr "Falta um nome dum ramo; tente -b"
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1253
msgid "invalid path specification"
msgstr "especificação de caminho inválida"
-#: builtin/checkout.c:1257
+#: builtin/checkout.c:1260
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr ""
-"Não é possível atualizar os caminho e mudar para o ramo '%s' ao mesmo tempo."
-"\n"
+"Não é possível atualizar os caminho e mudar para o ramo '%s' ao mesmo "
+"tempo.\n"
"Pretendia extrair '%s' o qual não pode ser resolvido como commit?"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1265
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach não aceita um caminho como argumento '%s'"
-#: builtin/checkout.c:1266
+#: builtin/checkout.c:1269
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4945,7 +5329,7 @@ msgid "remove whole directories"
msgstr "remover diretórios inteiros"
#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
msgid "pattern"
msgstr "padrão"
@@ -4989,7 +5373,7 @@ msgstr "git clone [<opções>] [--] <repo> [<dir>]"
msgid "don't create a checkout"
msgstr "não criar uma extração"
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
msgid "create a bare repository"
msgstr "criar um repositório nu"
@@ -5017,16 +5401,16 @@ msgstr "inicializar submódulos no clone"
msgid "number of submodules cloned in parallel"
msgstr "número de submódulos clonados em paralelo"
-#: builtin/clone.c:80 builtin/init-db.c:470
+#: builtin/clone.c:80 builtin/init-db.c:473
msgid "template-directory"
msgstr "diretório-modelo"
-#: builtin/clone.c:81 builtin/init-db.c:471
+#: builtin/clone.c:81 builtin/init-db.c:474
msgid "directory from which templates will be used"
msgstr "diretório que contém os modelos usados"
-#: builtin/clone.c:83 builtin/submodule--helper.c:498
-#: builtin/submodule--helper.c:777
+#: builtin/clone.c:83 builtin/submodule--helper.c:495
+#: builtin/submodule--helper.c:833
msgid "reference repository"
msgstr "repositório de referência"
@@ -5050,8 +5434,7 @@ msgstr "extrair <ramo> em vez da HEAD do remoto"
msgid "path to git-upload-pack on the remote"
msgstr "caminho para git-upload-pack no remoto"
-#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667
-#: builtin/pull.c:201
+#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 builtin/pull.c:201
msgid "depth"
msgstr "profundidade"
@@ -5067,11 +5450,11 @@ msgstr "clonar apenas um ramo, HEAD ou --branch"
msgid "any cloned submodules will be shallow"
msgstr "qualquer submódulo clonado será raso"
-#: builtin/clone.c:98 builtin/init-db.c:479
+#: builtin/clone.c:98 builtin/init-db.c:482
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:99 builtin/init-db.c:480
+#: builtin/clone.c:99 builtin/init-db.c:483
msgid "separate git dir from working tree"
msgstr "separar o repositório git da árvore de trabalho"
@@ -5083,11 +5466,11 @@ msgstr "chave=valor"
msgid "set config inside the new repository"
msgstr "definir configuração dentro do novo repositório"
-#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "usar apenas endereços IPv4"
-#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "usar apenas endereços IPv6"
@@ -5121,6 +5504,11 @@ msgstr "o repositório de referência '%s' é raso"
msgid "reference repository '%s' is grafted"
msgstr "o repositório de referência '%s' está enxertado"
+#: builtin/clone.c:376
+#, c-format
+msgid "failed to open '%s'"
+msgstr "falha ao abrir '%s'"
+
#: builtin/clone.c:384
#, c-format
msgid "%s exists and is not a directory"
@@ -5141,7 +5529,7 @@ msgstr "falha ao criar a ligação '%s'"
msgid "failed to copy file to '%s'"
msgstr "falha ao copiar o ficheiro para '%s'"
-#: builtin/clone.c:449 builtin/clone.c:633
+#: builtin/clone.c:449
#, c-format
msgid "done.\n"
msgstr "concluído.\n"
@@ -5161,12 +5549,7 @@ msgstr ""
msgid "Could not find remote branch %s to clone."
msgstr "Ramo remoto %s não encontrado para clonar."
-#: builtin/clone.c:628
-#, c-format
-msgid "Checking connectivity... "
-msgstr "A verificar a conectividade... "
-
-#: builtin/clone.c:631
+#: builtin/clone.c:633
msgid "remote did not send all necessary objects"
msgstr "o remoto não enviou todos os objetos necessários"
@@ -5178,106 +5561,107 @@ msgstr "não foi possível atualizar %s"
#: builtin/clone.c:698
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-"a HEAD remota referencia uma referência inexistente, não é possível extrair."
-"\n"
+"a HEAD remota referencia uma referência inexistente, não é possível "
+"extrair.\n"
#: builtin/clone.c:729
msgid "unable to checkout working tree"
msgstr "não foi possível extrair a árvore de trabalho"
-#: builtin/clone.c:767
+#: builtin/clone.c:766
msgid "unable to write parameters to config file"
msgstr "não foi possível escrever os parâmetros no ficheiro de configuração"
-#: builtin/clone.c:830
+#: builtin/clone.c:829
msgid "cannot repack to clean up"
msgstr "não é possível reempacotar para limpar"
-#: builtin/clone.c:832
+#: builtin/clone.c:831
msgid "cannot unlink temporary alternates file"
-msgstr "não é possível invocar unlink sobre o ficheiro sobressalente temporário"
+msgstr ""
+"não é possível invocar unlink sobre o ficheiro sobressalente temporário"
-#: builtin/clone.c:864 builtin/receive-pack.c:1731
+#: builtin/clone.c:863 builtin/receive-pack.c:1855
msgid "Too many arguments."
msgstr "Demasiados argumentos."
-#: builtin/clone.c:868
+#: builtin/clone.c:867
msgid "You must specify a repository to clone."
msgstr "Deve especificar um repositório para clonar."
-#: builtin/clone.c:879
+#: builtin/clone.c:878
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "as opções --bare e --origin %s são incompatíveis."
-#: builtin/clone.c:882
+#: builtin/clone.c:881
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare e --separate-git-dir são incompatíveis."
-#: builtin/clone.c:895
+#: builtin/clone.c:894
#, c-format
msgid "repository '%s' does not exist"
msgstr "o repositório '%s' não existe"
-#: builtin/clone.c:901 builtin/fetch.c:1174
+#: builtin/clone.c:900 builtin/fetch.c:1293
#, c-format
msgid "depth %s is not a positive number"
msgstr "profundidade %s não é um número positivo"
-#: builtin/clone.c:911
+#: builtin/clone.c:910
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "o caminho de destino '%s' já existe e não é um diretório vazio."
-#: builtin/clone.c:921
+#: builtin/clone.c:920
#, c-format
msgid "working tree '%s' already exists."
msgstr "a árvore de trabalho '%s' já existe."
-#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
-#: builtin/worktree.c:220 builtin/worktree.c:247
+#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "não foi possível criar os diretórios superiores de '%s'"
-#: builtin/clone.c:939
+#: builtin/clone.c:938
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "não foi possível criar o diretório de árvore de trabalho '%s'"
-#: builtin/clone.c:957
+#: builtin/clone.c:956
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "A clonar no repositório nu '%s'...\n"
-#: builtin/clone.c:959
+#: builtin/clone.c:958
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "A clonar em '%s'...\n"
-#: builtin/clone.c:998
+#: builtin/clone.c:997
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth é ignorado em clones locais; use file:// ."
-#: builtin/clone.c:1001
+#: builtin/clone.c:1000
msgid "source repository is shallow, ignoring --local"
msgstr "o repositório de origem é raso, --local ignorado"
-#: builtin/clone.c:1006
+#: builtin/clone.c:1005
msgid "--local is ignored"
msgstr "--local ignorado"
-#: builtin/clone.c:1010
+#: builtin/clone.c:1009
#, c-format
msgid "Don't know how to clone %s"
msgstr "Não sei como clonar %s"
-#: builtin/clone.c:1059 builtin/clone.c:1067
+#: builtin/clone.c:1058 builtin/clone.c:1066
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "O ramo remoto %s não foi encontrado no repositório a montante %s"
-#: builtin/clone.c:1070
+#: builtin/clone.c:1069
msgid "You appear to have cloned an empty repository."
msgstr "Parece foi clonado um repositório vazio."
@@ -5416,66 +5800,66 @@ msgstr ""
"Depois \"git cherry-pick --continue\" irá retomar o cherry-pick\n"
"dos restantes commits.\n"
-#: builtin/commit.c:307
+#: builtin/commit.c:308
msgid "failed to unpack HEAD tree object"
msgstr "falha ao descompactar o objeto árvore HEAD"
-#: builtin/commit.c:348
+#: builtin/commit.c:349
msgid "unable to create temporary index"
msgstr "não foi possível criar índice temporário"
-#: builtin/commit.c:354
+#: builtin/commit.c:355
msgid "interactive add failed"
msgstr "falha ao adicionar interativamente"
-#: builtin/commit.c:367
+#: builtin/commit.c:368
msgid "unable to update temporary index"
msgstr "não é possível atualizar o índice temporário"
-#: builtin/commit.c:369
+#: builtin/commit.c:370
msgid "Failed to update main cache tree"
msgstr "Falha ao atualizar a árvore de cache principal"
-#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
+#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
msgid "unable to write new_index file"
msgstr "não é possível escrever o ficheiro new_index"
-#: builtin/commit.c:447
+#: builtin/commit.c:448
msgid "cannot do a partial commit during a merge."
msgstr "não é possível fazer um commit parcial durante uma integração."
-#: builtin/commit.c:449
+#: builtin/commit.c:450
msgid "cannot do a partial commit during a cherry-pick."
msgstr "não é possível fazer um commit parcial durante um cherry-pick."
-#: builtin/commit.c:458
+#: builtin/commit.c:459
msgid "cannot read the index"
msgstr "não é possível ler o índice"
-#: builtin/commit.c:477
+#: builtin/commit.c:478
msgid "unable to write temporary index file"
msgstr "não é possível escrever ficheiro de índice temporário"
-#: builtin/commit.c:582
+#: builtin/commit.c:583
#, c-format
msgid "commit '%s' lacks author header"
msgstr "o commit '%s' não tem cabeçalho de autor"
-#: builtin/commit.c:584
+#: builtin/commit.c:585
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "o commit '%s' tem a linha de autor malformada"
-#: builtin/commit.c:603
+#: builtin/commit.c:604
msgid "malformed --author parameter"
msgstr "parâmetro --author malformado"
-#: builtin/commit.c:611
+#: builtin/commit.c:612
#, c-format
msgid "invalid date format: %s"
msgstr "formato de data inválido: %s"
-#: builtin/commit.c:655
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -5483,38 +5867,38 @@ msgstr ""
"não foi possível selecionar um carácter de comentário que\n"
"não estivesse já a ser usado na mensagem de commit atual"
-#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
+#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
#, c-format
msgid "could not lookup commit %s"
msgstr "não foi possível consultar o commit %s"
-#: builtin/commit.c:704 builtin/shortlog.c:285
+#: builtin/commit.c:705 builtin/shortlog.c:286
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(a ler mensagem de log da entrada padrão)\n"
-#: builtin/commit.c:706
+#: builtin/commit.c:707
msgid "could not read log from standard input"
msgstr "não foi possível ler o log da entrada padrão"
-#: builtin/commit.c:710
+#: builtin/commit.c:711
#, c-format
msgid "could not read log file '%s'"
msgstr "não é possível ler o ficheiro de log '%s'"
-#: builtin/commit.c:737 builtin/commit.c:745
+#: builtin/commit.c:738 builtin/commit.c:746
msgid "could not read SQUASH_MSG"
msgstr "não foi possível ler SQUASH_MSG"
-#: builtin/commit.c:742
+#: builtin/commit.c:743
msgid "could not read MERGE_MSG"
msgstr "não foi possível ler MERGE_MSG"
-#: builtin/commit.c:796
+#: builtin/commit.c:797
msgid "could not write commit template"
msgstr "não foi possível escrever o modelo de commit"
-#: builtin/commit.c:814
+#: builtin/commit.c:815
#, c-format
msgid ""
"\n"
@@ -5529,7 +5913,7 @@ msgstr ""
"\t%s\n"
"e tente de novo.\n"
-#: builtin/commit.c:819
+#: builtin/commit.c:820
#, c-format
msgid ""
"\n"
@@ -5544,7 +5928,7 @@ msgstr ""
"\t%s\n"
"e tente outra vez.\n"
-#: builtin/commit.c:832
+#: builtin/commit.c:833
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5554,7 +5938,7 @@ msgstr ""
"Linhas começadas com '%c' serão ignoradas, e uma mensagem vazia\n"
"aborta o commit.\n"
-#: builtin/commit.c:839
+#: builtin/commit.c:840
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5565,149 +5949,149 @@ msgstr ""
"Linhas começadas com '%c' serão mantidas; pode removê-las se o desejar.\n"
"Uma mensagem vazia aborta o commit.\n"
-#: builtin/commit.c:859
+#: builtin/commit.c:860
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:867
+#: builtin/commit.c:868
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:874
+#: builtin/commit.c:875
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommitter: %.*s <%.*s>"
-#: builtin/commit.c:892
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "Não é possível ler o índice"
-#: builtin/commit.c:949
+#: builtin/commit.c:950
msgid "Error building trees"
msgstr "Erro ao construir árvores"
-#: builtin/commit.c:964 builtin/tag.c:266
+#: builtin/commit.c:965 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Indique a mensagem usando as opções -m ou -F.\n"
-#: builtin/commit.c:1066
+#: builtin/commit.c:1067
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' não é do tipo 'Nome <email>' e não corresponde a um autor "
"existente"
-#: builtin/commit.c:1081 builtin/commit.c:1321
+#: builtin/commit.c:1082 builtin/commit.c:1322
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Modo inválido de ficheiros não controlados '%s'"
-#: builtin/commit.c:1118
+#: builtin/commit.c:1119
msgid "--long and -z are incompatible"
msgstr "--long e -z são incompatíveis"
-#: builtin/commit.c:1148
+#: builtin/commit.c:1149
msgid "Using both --reset-author and --author does not make sense"
msgstr "Não faz sentido usar --reset-author e --author ao mesmo tempo"
-#: builtin/commit.c:1157
+#: builtin/commit.c:1158
msgid "You have nothing to amend."
msgstr "Não há nada para emendar."
-#: builtin/commit.c:1160
+#: builtin/commit.c:1161
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Integração em curso -- não é possível emendar."
-#: builtin/commit.c:1162
+#: builtin/commit.c:1163
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Cherry-pick em curso -- não é possível emendar."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1166
msgid "Options --squash and --fixup cannot be used together"
msgstr "As opções --squash e --fixup não podem ser usadas juntas"
-#: builtin/commit.c:1175
+#: builtin/commit.c:1176
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Apenas um entre -c/-C/-F/--fixup pode ser usado."
-#: builtin/commit.c:1177
+#: builtin/commit.c:1178
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "A opção -m não pode ser combinada com -c/C/-F/--fixup."
-#: builtin/commit.c:1185
+#: builtin/commit.c:1186
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author só pode ser usado com -C, -c ou --amend."
-#: builtin/commit.c:1202
+#: builtin/commit.c:1203
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Apenas um entre --include/--only/--all/--interactive/--patch pode ser usado."
-#: builtin/commit.c:1204
+#: builtin/commit.c:1205
msgid "No paths with --include/--only does not make sense."
msgstr "As opções --include/--only não fazem sentido sem indicar caminhos."
-#: builtin/commit.c:1206
+#: builtin/commit.c:1207
msgid "Clever... amending the last one with dirty index."
msgstr "Inteligente... a emendar o último commit com o índice sujo."
-#: builtin/commit.c:1208
+#: builtin/commit.c:1209
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Caminhos explícitos especificados sem -i ou -o; assumindo --only..."
-#: builtin/commit.c:1220 builtin/tag.c:474
+#: builtin/commit.c:1221 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Modo de limpeza inválido %s"
-#: builtin/commit.c:1225
+#: builtin/commit.c:1226
msgid "Paths with -a does not make sense."
msgstr "Indicar caminhos com -a não faz sentido."
-#: builtin/commit.c:1335 builtin/commit.c:1621
+#: builtin/commit.c:1336 builtin/commit.c:1622
msgid "show status concisely"
msgstr "mostrar status de forma concisa"
-#: builtin/commit.c:1337 builtin/commit.c:1623
+#: builtin/commit.c:1338 builtin/commit.c:1624
msgid "show branch information"
msgstr "mostrar informação do ramo"
-#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
-#: builtin/worktree.c:437
+#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "saída inteligível por máquina"
-#: builtin/commit.c:1342 builtin/commit.c:1627
+#: builtin/commit.c:1343 builtin/commit.c:1628
msgid "show status in long format (default)"
msgstr "apresentar status em formato longo (predefinição)"
-#: builtin/commit.c:1345 builtin/commit.c:1630
+#: builtin/commit.c:1346 builtin/commit.c:1631
msgid "terminate entries with NUL"
msgstr "terminar entradas com NUL"
-#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
+#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "modo"
-#: builtin/commit.c:1348 builtin/commit.c:1633
+#: builtin/commit.c:1349 builtin/commit.c:1634
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"mostrar ficheiros não controlados, modo é opcional: all, normal, no. "
"(Predefinição: all)"
-#: builtin/commit.c:1351
+#: builtin/commit.c:1352
msgid "show ignored files"
msgstr "mostrar ficheiros ignorados"
-#: builtin/commit.c:1352 parse-options.h:155
+#: builtin/commit.c:1353 parse-options.h:155
msgid "when"
msgstr "quando"
-#: builtin/commit.c:1353
+#: builtin/commit.c:1354
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -5715,199 +6099,200 @@ msgstr ""
"ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. "
"(Predefinição: all)"
-#: builtin/commit.c:1355
+#: builtin/commit.c:1356
msgid "list untracked files in columns"
msgstr "listar ficheiros não controlados em colunas"
-#: builtin/commit.c:1441
+#: builtin/commit.c:1442
msgid "couldn't look up newly created commit"
msgstr "não foi possível consultar o commit recém-criado"
-#: builtin/commit.c:1443
+#: builtin/commit.c:1444
msgid "could not parse newly created commit"
msgstr "não foi possível analisar o commit recém-criado"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1489
msgid "detached HEAD"
msgstr "HEAD destacada"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1492
msgid " (root-commit)"
msgstr " (commit-raiz)"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1592
msgid "suppress summary after successful commit"
msgstr "suprimir o resumo depois de submeter com sucesso"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1593
msgid "show diff in commit message template"
msgstr "mostrar diff no modelo da mensagem de commit"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1595
msgid "Commit message options"
msgstr "Opções de mensagem de commit"
-#: builtin/commit.c:1595 builtin/tag.c:351
+#: builtin/commit.c:1596 builtin/tag.c:351
msgid "read message from file"
msgstr "ler mensagem de um ficheiro"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1597
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1597
msgid "override author for commit"
msgstr "substituir autor do commit"
-#: builtin/commit.c:1597 builtin/gc.c:326
+#: builtin/commit.c:1598 builtin/gc.c:326
msgid "date"
msgstr "data"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1598
msgid "override date for commit"
msgstr "substituir data do commit"
-#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
-#: builtin/notes.c:558 builtin/tag.c:349
+#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
+#: builtin/notes.c:559 builtin/tag.c:349
msgid "message"
msgstr "mensagem"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1599
msgid "commit message"
msgstr "mensagem de commit"
-#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
-#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
+#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1600
msgid "reuse and edit message from specified commit"
msgstr "reutilizar e editar a mensagem de um commit especificado"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1601
msgid "reuse message from specified commit"
msgstr "reutilizar a mensagem de um commit especificado"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1602
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"usar mensagem com formato autosquash para corrigir o commit especificado"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1603
msgid "use autosquash formatted message to squash specified commit"
-msgstr "usar mensagem com formato autosquash para esmagar o commit especificado"
+msgstr ""
+"usar mensagem com formato autosquash para esmagar o commit especificado"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1604
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "agora sou eu o autor do commit (usado com C/-c/--amend)"
-#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
+#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "adicionar Signed-off-by:"
-#: builtin/commit.c:1605
+#: builtin/commit.c:1606
msgid "use specified template file"
msgstr "usar ficheiro de modelo especificado"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1607
msgid "force edit of commit"
msgstr "forçar edição do commit"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1608
msgid "default"
msgstr "predefinição"
-#: builtin/commit.c:1607 builtin/tag.c:354
+#: builtin/commit.c:1608 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "como retirar espaços e #comentários da mensagem"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1609
msgid "include status in commit message template"
msgstr "incluir status no modelo da mensagem de commit"
-#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
+#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "assinar o commit com GPG"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1614
msgid "Commit contents options"
msgstr "Opções de conteúdo do commit"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1615
msgid "commit all changed files"
msgstr "submeter todos os ficheiros alterados"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1616
msgid "add specified files to index for commit"
msgstr "adicionar ficheiros especificados ao índice para submeter"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1617
msgid "interactively add files"
msgstr "adicionar ficheiros interativamente"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1618
msgid "interactively add changes"
msgstr "adicionar alterações interativamente"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1619
msgid "commit only specified files"
msgstr "submeter somente os ficheiros especificados"
-#: builtin/commit.c:1619
-msgid "bypass pre-commit hook"
-msgstr "ignorar pre-commit hook"
-
#: builtin/commit.c:1620
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "ignorar pre-commit e commit-msg hooks"
+
+#: builtin/commit.c:1621
msgid "show what would be committed"
msgstr "mostrar o que seria submetido"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1632
msgid "amend previous commit"
msgstr "emendar o commit anterior"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1633
msgid "bypass post-rewrite hook"
msgstr "ignorar post-rewrite hook"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1638
msgid "ok to record an empty change"
msgstr "aceitar o registo duma alteração vazia"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
msgid "ok to record a change with an empty message"
msgstr "aceitar o registo duma alteração com uma mensagem vazia"
-#: builtin/commit.c:1668
+#: builtin/commit.c:1669
msgid "could not parse HEAD commit"
msgstr "não foi possível analisar o commit HEAD"
-#: builtin/commit.c:1718
+#: builtin/commit.c:1719
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Ficheiro MERGE_HEAD corrompido (%s)"
-#: builtin/commit.c:1725
+#: builtin/commit.c:1726
msgid "could not read MERGE_MODE"
msgstr "não foi possível ler MERGE_MODE"
-#: builtin/commit.c:1744
+#: builtin/commit.c:1745
#, c-format
msgid "could not read commit message: %s"
msgstr "não foi possível ler a mensagem de commit: %s"
-#: builtin/commit.c:1755
+#: builtin/commit.c:1756
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "A abortar o commit; não editou a mensagem.\n"
-#: builtin/commit.c:1760
+#: builtin/commit.c:1761
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n"
-#: builtin/commit.c:1808
+#: builtin/commit.c:1809
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5921,142 +6306,142 @@ msgstr ""
msgid "git config [<options>]"
msgstr "git config [<opções>]"
-#: builtin/config.c:56
+#: builtin/config.c:55
msgid "Config file location"
msgstr "Localização do ficheiro de configuração"
-#: builtin/config.c:57
+#: builtin/config.c:56
msgid "use global config file"
msgstr "usar ficheiro de configuração global"
-#: builtin/config.c:58
+#: builtin/config.c:57
msgid "use system config file"
msgstr "usar ficheiro de configuração do sistema"
-#: builtin/config.c:59
+#: builtin/config.c:58
msgid "use repository config file"
msgstr "usar ficheiro de configuração do repositório"
-#: builtin/config.c:60
+#: builtin/config.c:59
msgid "use given config file"
msgstr "usar ficheiro de configuração fornecido"
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "blob-id"
msgstr "id-blob"
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "read config from given blob object"
msgstr "ler configuração a partir do objeto blob fornecido"
-#: builtin/config.c:62
+#: builtin/config.c:61
msgid "Action"
msgstr "Ação"
-#: builtin/config.c:63
+#: builtin/config.c:62
msgid "get value: name [value-regex]"
msgstr "obter valor: nome [regex-do-valor]"
-#: builtin/config.c:64
+#: builtin/config.c:63
msgid "get all values: key [value-regex]"
msgstr "obter todos os valores: chave [regex-do-valor]"
-#: builtin/config.c:65
+#: builtin/config.c:64
msgid "get values for regexp: name-regex [value-regex]"
msgstr "obter valores para a regexp: regex-do-nome [regex-do-valor]"
-#: builtin/config.c:66
+#: builtin/config.c:65
msgid "get value specific for the URL: section[.var] URL"
msgstr "obter valor do URL especificado: section[.var] URL"
-#: builtin/config.c:67
+#: builtin/config.c:66
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
"substituir todos as variáveis correspondentes: nome valor [regex-do-valor]"
-#: builtin/config.c:68
+#: builtin/config.c:67
msgid "add a new variable: name value"
msgstr "adicionar uma nova variável: nome valor"
-#: builtin/config.c:69
+#: builtin/config.c:68
msgid "remove a variable: name [value-regex]"
msgstr "remover uma variável: nome [regex-do-valor]"
-#: builtin/config.c:70
+#: builtin/config.c:69
msgid "remove all matches: name [value-regex]"
msgstr "remover todas as correspondências: nome [regex-do-valor]"
-#: builtin/config.c:71
+#: builtin/config.c:70
msgid "rename section: old-name new-name"
msgstr "mudar o nome da secção: nome-antigo novo-nome"
-#: builtin/config.c:72
+#: builtin/config.c:71
msgid "remove a section: name"
msgstr "remover uma secção: nome"
-#: builtin/config.c:73
+#: builtin/config.c:72
msgid "list all"
msgstr "listar todos"
-#: builtin/config.c:74
+#: builtin/config.c:73
msgid "open an editor"
msgstr "abrir um editor"
-#: builtin/config.c:75
+#: builtin/config.c:74
msgid "find the color configured: slot [default]"
msgstr "encontrar a cor configurada: slot [predefinição]"
-#: builtin/config.c:76
+#: builtin/config.c:75
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "encontrar a definição de cor: slot [stdout-é-tty]"
-#: builtin/config.c:77
+#: builtin/config.c:76
msgid "Type"
msgstr "Tipo"
-#: builtin/config.c:78
+#: builtin/config.c:77
msgid "value is \"true\" or \"false\""
msgstr "o valor é \"true\" (verdadeiro) ou \"false\" (falso)"
-#: builtin/config.c:79
+#: builtin/config.c:78
msgid "value is decimal number"
msgstr "o valor é um número decimal"
-#: builtin/config.c:80
+#: builtin/config.c:79
msgid "value is --bool or --int"
msgstr "o valor é --bool ou --int"
-#: builtin/config.c:81
+#: builtin/config.c:80
msgid "value is a path (file or directory name)"
msgstr "o valor é um caminho (nome dum ficheiro ou diretório)"
-#: builtin/config.c:82
+#: builtin/config.c:81
msgid "Other"
msgstr "Outro"
-#: builtin/config.c:83
+#: builtin/config.c:82
msgid "terminate values with NUL byte"
msgstr "terminar valores com o byte NUL"
-#: builtin/config.c:84
+#: builtin/config.c:83
msgid "show variable names only"
msgstr "mostrar apenas os nomes das variáveis"
-#: builtin/config.c:85
+#: builtin/config.c:84
msgid "respect include directives on lookup"
msgstr "respeitar diretivas de inclusão ao pesquisar"
-#: builtin/config.c:86
+#: builtin/config.c:85
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"mostrar a origem da configuração (ficheiro, entrada padrão, blob, linha de "
"comandos)"
-#: builtin/config.c:328
+#: builtin/config.c:327
msgid "unable to parse default color value"
msgstr "não é possível analisar o valor de cor por omissão"
-#: builtin/config.c:472
+#: builtin/config.c:471
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -6071,7 +6456,7 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:614
+#: builtin/config.c:613
#, c-format
msgid "cannot create configuration file %s"
msgstr "não é possível criar o ficheiro de configuração %s"
@@ -6107,7 +6492,7 @@ msgstr "a tag anotada %s não tem nenhum nome incorporado"
msgid "tag '%s' is really '%s' here"
msgstr "a tag '%s' está de facto em '%s'"
-#: builtin/describe.c:250 builtin/log.c:465
+#: builtin/describe.c:250 builtin/log.c:480
#, c-format
msgid "Not a valid object name %s"
msgstr "%s não é um nome de objeto válido"
@@ -6307,176 +6692,179 @@ msgstr "Aplicar o especificador de referência a referências exportadas"
msgid "anonymize output"
msgstr "anonimizar saída"
-#: builtin/fetch.c:20
+#: builtin/fetch.c:21
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr "git fetch [<opções>] [<repositório> [<especificador-de-referência>...]]"
+msgstr ""
+"git fetch [<opções>] [<repositório> [<especificador-de-referência>...]]"
-#: builtin/fetch.c:21
+#: builtin/fetch.c:22
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<opções>] <grupo>"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<opções>] [(<repositório> | <grupo>)...]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opções>]"
-#: builtin/fetch.c:92 builtin/pull.c:174
+#: builtin/fetch.c:93 builtin/pull.c:174
msgid "fetch from all remotes"
msgstr "obter de todos os remotos"
-#: builtin/fetch.c:94 builtin/pull.c:177
+#: builtin/fetch.c:95 builtin/pull.c:177
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "acrescentar a .git/FETCH_HEAD em vez de substituir"
-#: builtin/fetch.c:96 builtin/pull.c:180
+#: builtin/fetch.c:97 builtin/pull.c:180
msgid "path to upload pack on remote end"
msgstr "caminho para o comando upload pack no remoto"
-#: builtin/fetch.c:97 builtin/pull.c:182
+#: builtin/fetch.c:98 builtin/pull.c:182
msgid "force overwrite of local branch"
msgstr "forçar a substituição do ramo local"
-#: builtin/fetch.c:99
+#: builtin/fetch.c:100
msgid "fetch from multiple remotes"
msgstr "obter de múltiplos remotos"
-#: builtin/fetch.c:101 builtin/pull.c:184
+#: builtin/fetch.c:102 builtin/pull.c:184
msgid "fetch all tags and associated objects"
msgstr "obter todas as tags e objetos associados"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:104
msgid "do not fetch all tags (--no-tags)"
msgstr "não obter todas as tags (--no-tags)"
-#: builtin/fetch.c:105
+#: builtin/fetch.c:106
msgid "number of submodules fetched in parallel"
msgstr "número de submódulos obtidos em paralelo"
-#: builtin/fetch.c:107 builtin/pull.c:187
+#: builtin/fetch.c:108 builtin/pull.c:187
msgid "prune remote-tracking branches no longer on remote"
-msgstr "eliminar os ramos de monitorização remotos que já não existem no remoto"
+msgstr ""
+"eliminar os ramos de monitorização remotos que já não existem no remoto"
-#: builtin/fetch.c:108 builtin/pull.c:190
+#: builtin/fetch.c:109 builtin/pull.c:190
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:109 builtin/pull.c:191
+#: builtin/fetch.c:110 builtin/pull.c:191
msgid "control recursive fetching of submodules"
msgstr "controlar a obtenção recursiva de submódulos"
-#: builtin/fetch.c:113 builtin/pull.c:199
+#: builtin/fetch.c:114 builtin/pull.c:199
msgid "keep downloaded pack"
msgstr "manter o pacote transferido"
-#: builtin/fetch.c:115
+#: builtin/fetch.c:116
msgid "allow updating of HEAD ref"
msgstr "permitir a atualização da referência HEAD"
-#: builtin/fetch.c:118 builtin/pull.c:202
+#: builtin/fetch.c:119 builtin/pull.c:202
msgid "deepen history of shallow clone"
msgstr "aprofundar o histórico de um clone raso"
-#: builtin/fetch.c:120 builtin/pull.c:205
+#: builtin/fetch.c:121 builtin/pull.c:205
msgid "convert to a complete repository"
msgstr "converter num repositório completo"
-#: builtin/fetch.c:122 builtin/log.c:1399
+#: builtin/fetch.c:123 builtin/log.c:1426
msgid "dir"
msgstr "dir"
-#: builtin/fetch.c:123
+#: builtin/fetch.c:124
msgid "prepend this to submodule path output"
msgstr "preceder isto ao caminho do submódulo"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:127
msgid "default mode for recursion"
msgstr "modo recursivo por omissão"
-#: builtin/fetch.c:128 builtin/pull.c:208
+#: builtin/fetch.c:129 builtin/pull.c:208
msgid "accept refs that update .git/shallow"
msgstr "aceitar referência que atualizem .git/shallow"
-#: builtin/fetch.c:129 builtin/pull.c:210
+#: builtin/fetch.c:130 builtin/pull.c:210
msgid "refmap"
msgstr "mapa de referências"
-#: builtin/fetch.c:130 builtin/pull.c:211
+#: builtin/fetch.c:131 builtin/pull.c:211
msgid "specify fetch refmap"
msgstr "especificar mapa de referências"
-#: builtin/fetch.c:386
+#: builtin/fetch.c:387
msgid "Couldn't find remote ref HEAD"
msgstr "Referência remota HEAD não encontrada"
-#: builtin/fetch.c:466
+#: builtin/fetch.c:503
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "a configuração fetch.ouput contém o valor inválido %s"
+
+#: builtin/fetch.c:592
#, c-format
msgid "object %s not found"
msgstr "objeto %s não encontrado"
-#: builtin/fetch.c:471
+#: builtin/fetch.c:596
msgid "[up to date]"
msgstr "[atualizado]"
-#: builtin/fetch.c:485
-#, c-format
-msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
-msgstr "! %-*s %-*s -> %s (não é possível obter no ramo atual)"
-
-#: builtin/fetch.c:486 builtin/fetch.c:574
+#: builtin/fetch.c:609 builtin/fetch.c:689
msgid "[rejected]"
msgstr "[rejeitado]"
-#: builtin/fetch.c:497
+#: builtin/fetch.c:610
+msgid "can't fetch in current branch"
+msgstr "não é possível obter no ramo atual"
+
+#: builtin/fetch.c:619
msgid "[tag update]"
msgstr "[tag atualizada]"
-#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
-msgid " (unable to update local ref)"
-msgstr " (não é possível atualizar a referência local)"
+#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
+#: builtin/fetch.c:684
+msgid "unable to update local ref"
+msgstr "não é possível atualizar a referência local"
-#: builtin/fetch.c:517
+#: builtin/fetch.c:639
msgid "[new tag]"
msgstr "[nova tag]"
-#: builtin/fetch.c:520
+#: builtin/fetch.c:642
msgid "[new branch]"
msgstr "[novo ramo]"
-#: builtin/fetch.c:523
+#: builtin/fetch.c:645
msgid "[new ref]"
msgstr "[nova referência]"
-#: builtin/fetch.c:569
-msgid "unable to update local ref"
-msgstr "não é possível atualizar a referência local"
-
-#: builtin/fetch.c:569
+#: builtin/fetch.c:684
msgid "forced update"
msgstr "atualização forçada"
-#: builtin/fetch.c:576
-msgid "(non-fast-forward)"
-msgstr "(sem avanço rápido)"
+#: builtin/fetch.c:689
+msgid "non-fast-forward"
+msgstr "sem avanço-rápido"
-#: builtin/fetch.c:619
+#: builtin/fetch.c:733
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s não enviou todos os objetos necessários\n"
-#: builtin/fetch.c:637
+#: builtin/fetch.c:753
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "%s rejeitado, porque as raízes rasas não podem ser atualizadas"
-#: builtin/fetch.c:724 builtin/fetch.c:816
+#: builtin/fetch.c:839 builtin/fetch.c:934
#, c-format
msgid "From %.*s\n"
msgstr "De %.*s\n"
-#: builtin/fetch.c:735
+#: builtin/fetch.c:850
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -6485,55 +6873,55 @@ msgstr ""
"algumas referências locais não puderam ser atualizadas; tente executar\n"
" 'git remote prune %s' para remover algum ramo antigo em conflito"
-#: builtin/fetch.c:787
+#: builtin/fetch.c:904
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s ficará suspenso)"
-#: builtin/fetch.c:788
+#: builtin/fetch.c:905
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s ficou suspenso)"
-#: builtin/fetch.c:820
+#: builtin/fetch.c:937
msgid "[deleted]"
msgstr "[eliminado]"
-#: builtin/fetch.c:821 builtin/remote.c:1025
+#: builtin/fetch.c:938 builtin/remote.c:1020
msgid "(none)"
msgstr "(nenhum)"
-#: builtin/fetch.c:841
+#: builtin/fetch.c:960
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Obtenção de objetos no ramo atual %s de um repositório não nu recusada"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:979
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "O valor \"%2$s\" da opção \"%1$s\" não é válido em %3$s"
-#: builtin/fetch.c:863
+#: builtin/fetch.c:982
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Opção \"%s\" ignorada em %s\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1039
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Não sei como obter de %s"
-#: builtin/fetch.c:1080
+#: builtin/fetch.c:1199
#, c-format
msgid "Fetching %s\n"
msgstr "A obter de %s\n"
-#: builtin/fetch.c:1082 builtin/remote.c:96
+#: builtin/fetch.c:1201 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "Não foi possível obter de %s"
-#: builtin/fetch.c:1100
+#: builtin/fetch.c:1219
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -6541,32 +6929,32 @@ msgstr ""
"Nenhum repositório remoto especificado. Especifique um URL ou\n"
"o nome remoto a partir do qual as novas revisões devem ser obtidas."
-#: builtin/fetch.c:1123
+#: builtin/fetch.c:1242
msgid "You need to specify a tag name."
msgstr "Deve especificar um nome para a tag."
-#: builtin/fetch.c:1165
+#: builtin/fetch.c:1284
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth e --unshallow não podem ser usados juntos"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1286
msgid "--unshallow on a complete repository does not make sense"
msgstr "usar --unshallow num repositório completo não faz sentido"
-#: builtin/fetch.c:1187
+#: builtin/fetch.c:1306
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all não leva um repositório como argumento"
-#: builtin/fetch.c:1189
+#: builtin/fetch.c:1308
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all não faz sentido com especificadores de referência"
-#: builtin/fetch.c:1200
+#: builtin/fetch.c:1319
#, c-format
msgid "No such remote or remote group: %s"
msgstr "O remoto ou grupo remoto não existe: %s"
-#: builtin/fetch.c:1208
+#: builtin/fetch.c:1327
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Não faz sentido obter um grupo e especificar uma referência"
@@ -6656,63 +7044,63 @@ msgstr "imprimir apenas referências não integrada"
msgid "print only refs which contain the commit"
msgstr "imprimir apenas referências que contenham o commit"
-#: builtin/fsck.c:156 builtin/prune.c:140
-msgid "Checking connectivity"
-msgstr "A verificar conectividade"
-
-#: builtin/fsck.c:486
+#: builtin/fsck.c:519
msgid "Checking object directories"
msgstr "A verificar diretórios de objetos"
-#: builtin/fsck.c:552
+#: builtin/fsck.c:588
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opções>] [<objeto>...]"
-#: builtin/fsck.c:558
+#: builtin/fsck.c:594
msgid "show unreachable objects"
msgstr "mostrar objetos inalcançáveis"
-#: builtin/fsck.c:559
+#: builtin/fsck.c:595
msgid "show dangling objects"
msgstr "mostrar objetos suspensos"
-#: builtin/fsck.c:560
+#: builtin/fsck.c:596
msgid "report tags"
msgstr "mostrar tags"
-#: builtin/fsck.c:561
+#: builtin/fsck.c:597
msgid "report root nodes"
msgstr "mostrar nós raiz"
-#: builtin/fsck.c:562
+#: builtin/fsck.c:598
msgid "make index objects head nodes"
msgstr "considerar objetos do índice como nós cabeça"
-#: builtin/fsck.c:563
+#: builtin/fsck.c:599
msgid "make reflogs head nodes (default)"
msgstr "considerar os reflogs como nós cabeça (predefinição)"
-#: builtin/fsck.c:564
+#: builtin/fsck.c:600
msgid "also consider packs and alternate objects"
msgstr "considerar também pacotes e objetos sobressalente"
-#: builtin/fsck.c:565
+#: builtin/fsck.c:601
msgid "check only connectivity"
msgstr "verificar só a conetividade"
-#: builtin/fsck.c:566
+#: builtin/fsck.c:602
msgid "enable more strict checking"
msgstr "ativar verificação mais rigorosa"
-#: builtin/fsck.c:568
+#: builtin/fsck.c:604
msgid "write dangling objects in .git/lost-found"
msgstr "escrever objetos suspensos em .git/lost-found"
-#: builtin/fsck.c:569 builtin/prune.c:107
+#: builtin/fsck.c:605 builtin/prune.c:107
msgid "show progress"
msgstr "mostrar progresso"
-#: builtin/fsck.c:630
+#: builtin/fsck.c:606
+msgid "show verbose names for reachable objects"
+msgstr "mostrar nomes verbosos de objetos inalcançáveis"
+
+#: builtin/fsck.c:671
msgid "Checking objects"
msgstr "A verificar objetos"
@@ -7007,7 +7395,7 @@ msgstr "permitir invocar grep(1) (ignorado nesta compilação)"
msgid "no pattern given."
msgstr "nenhum padrão fornecido."
-#: builtin/grep.c:845 builtin/index-pack.c:1477
+#: builtin/grep.c:845 builtin/index-pack.c:1479
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "número de threads especificado inválido (%d)"
@@ -7038,8 +7426,8 @@ msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
msgstr ""
-"git hash-object [-t <tipo>] [-w] [--path=<ficheiro> | --no-filters] [--stdin]"
-" [--] <ficheiro>..."
+"git hash-object [-t <tipo>] [-w] [--path=<ficheiro> | --no-filters] [--"
+"stdin] [--] <ficheiro>..."
#: builtin/hash-object.c:82
msgid "git hash-object --stdin-paths"
@@ -7154,335 +7542,331 @@ msgstr "nenhum visualizador de manual atendeu o pedido"
msgid "no info viewer handled the request"
msgstr "nenhum visualizador de info atendeu o pedido"
-#: builtin/help.c:408
+#: builtin/help.c:401
msgid "Defining attributes per path"
msgstr "Definir atributos por caminho"
-#: builtin/help.c:409
+#: builtin/help.c:402
msgid "Everyday Git With 20 Commands Or So"
msgstr "Diário Git com mais ou menos 20 Comandos"
-#: builtin/help.c:410
+#: builtin/help.c:403
msgid "A Git glossary"
msgstr "Um Glossário do Git"
-#: builtin/help.c:411
+#: builtin/help.c:404
msgid "Specifies intentionally untracked files to ignore"
msgstr ""
"Especificar ficheiros não controlados para serem intencionalmente ignorados"
-#: builtin/help.c:412
+#: builtin/help.c:405
msgid "Defining submodule properties"
msgstr "Definir propriedades de submódulos"
-#: builtin/help.c:413
+#: builtin/help.c:406
msgid "Specifying revisions and ranges for Git"
msgstr "Especificar revisões e intervalos do Git"
-#: builtin/help.c:414
+#: builtin/help.c:407
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Uma introdução ao Git (versão 1.5.1 ou mais recente)"
-#: builtin/help.c:415
+#: builtin/help.c:408
msgid "An overview of recommended workflows with Git"
msgstr "Uma descrição geral dos fluxos de trabalho recomendados para o Git"
-#: builtin/help.c:427
+#: builtin/help.c:420
msgid "The common Git guides are:\n"
msgstr "Os guias comuns do Git:\n"
-#: builtin/help.c:448 builtin/help.c:465
+#: builtin/help.c:441 builtin/help.c:458
#, c-format
msgid "usage: %s%s"
msgstr "utilização: %s%s"
-#: builtin/help.c:481
+#: builtin/help.c:474
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "'git %s' é um alias de '%s'"
-#: builtin/index-pack.c:152
+#: builtin/index-pack.c:153
#, c-format
msgid "unable to open %s"
msgstr "não foi possível abrir %s"
-#: builtin/index-pack.c:202
+#: builtin/index-pack.c:203
#, c-format
msgid "object type mismatch at %s"
msgstr "incompatibilidade de tipo de objeto em %s"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:223
#, c-format
msgid "did not receive expected object %s"
msgstr "o objeto esperado %s não foi recebido"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objeto %s: tipo esperado %s, obtido %s"
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:268
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "não é possível preencher %d byte"
msgstr[1] "não é possível preencher %d bytes"
-#: builtin/index-pack.c:277
+#: builtin/index-pack.c:278
msgid "early EOF"
msgstr "fim de ficheiro (EOF) prematuro"
-#: builtin/index-pack.c:278
+#: builtin/index-pack.c:279
msgid "read error on input"
msgstr "erro de leitura da entrada"
-#: builtin/index-pack.c:290
+#: builtin/index-pack.c:291
msgid "used more bytes than were available"
msgstr "foram usados mais bytes dos que estavam disponíveis"
-#: builtin/index-pack.c:297
+#: builtin/index-pack.c:298
msgid "pack too large for current definition of off_t"
msgstr "pacote demasiado grande para a definição atual de off_t"
-#: builtin/index-pack.c:313
+#: builtin/index-pack.c:314
#, c-format
msgid "unable to create '%s'"
msgstr "não foi possível criar '%s'"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "cannot open packfile '%s'"
msgstr "não é possível abrir o ficheiro de pacote '%s'"
-#: builtin/index-pack.c:332
+#: builtin/index-pack.c:333
msgid "pack signature mismatch"
msgstr "a assinatura do pacote não corresponde"
-#: builtin/index-pack.c:334
+#: builtin/index-pack.c:335
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "versão de pacote %<PRIu32> não suportada"
-#: builtin/index-pack.c:352
+#: builtin/index-pack.c:353
#, c-format
-msgid "pack has bad object at offset %lu: %s"
-msgstr "pacote com objeto incorreto no offset %lu: %s"
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "pacote com objeto incorreto no offset %<PRIuMAX>: %s"
-#: builtin/index-pack.c:473
+#: builtin/index-pack.c:475
#, c-format
msgid "inflate returned %d"
msgstr "a descompactação retornou %d"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:524
msgid "offset value overflow for delta base object"
msgstr "delta de objeto base com capacidade excedida no valor de offset"
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:532
msgid "delta base offset is out of bound"
msgstr "offset da base delta está fora do limite"
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:540
#, c-format
msgid "unknown object type %d"
msgstr "objeto de tipo desconhecido %d"
-#: builtin/index-pack.c:569
+#: builtin/index-pack.c:571
msgid "cannot pread pack file"
msgstr "não é possível invocar pread sobre o ficheiro de pacote"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:573
#, c-format
-msgid "premature end of pack file, %lu byte missing"
-msgid_plural "premature end of pack file, %lu bytes missing"
-msgstr[0] "fim de ficheiro de pacote prematuro, falta %lu byte"
-msgstr[1] "fim de ficheiro de pacote prematuro, faltam %lu bytes"
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+msgstr[0] "fim prematuro de ficheiro de pacote, falta %<PRIuMAX> byte"
+msgstr[1] "fim prematuro de ficheiro de pacote, faltam %<PRIuMAX> bytes"
-#: builtin/index-pack.c:597
+#: builtin/index-pack.c:599
msgid "serious inflate inconsistency"
msgstr "inconsistência de descompactação grave"
-#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
-#: builtin/index-pack.c:806 builtin/index-pack.c:815
+#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
+#: builtin/index-pack.c:808 builtin/index-pack.c:817
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLISÃO DE SHA1 COM %s ENCONTRADA!"
-#: builtin/index-pack.c:746 builtin/pack-objects.c:162
-#: builtin/pack-objects.c:254
+#: builtin/index-pack.c:748 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:256
#, c-format
msgid "unable to read %s"
msgstr "não foi possível ler %s"
-#: builtin/index-pack.c:812
+#: builtin/index-pack.c:814
#, c-format
msgid "cannot read existing object %s"
msgstr "não é possível ler o objeto existente %s"
-#: builtin/index-pack.c:826
+#: builtin/index-pack.c:828
#, c-format
msgid "invalid blob object %s"
msgstr "objeto blob inválido %s"
-#: builtin/index-pack.c:840
+#: builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr "inválido %s"
-#: builtin/index-pack.c:843
+#: builtin/index-pack.c:845
msgid "Error in object"
msgstr "Erro no objeto"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Nem todos os objetos filhos de %s são alcançáveis"
-#: builtin/index-pack.c:917 builtin/index-pack.c:948
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "falha ao aplicar delta"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1120
msgid "Receiving objects"
msgstr "A receber objetos"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1120
msgid "Indexing objects"
msgstr "A indexar objetos"
-#: builtin/index-pack.c:1150
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "pacote corrompido (SHA1 não corresponde)"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "não é possível invocar fstat sobre o ficheiro de pacote"
-#: builtin/index-pack.c:1158
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "pacote com lixo no final"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1171
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "extrema confusão em parse_pack_objects()"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1196
msgid "Resolving deltas"
msgstr "A resolver deltas"
-#: builtin/index-pack.c:1205
+#: builtin/index-pack.c:1207
#, c-format
msgid "unable to create thread: %s"
msgstr "não foi possível criar thread: %s"
-#: builtin/index-pack.c:1247
+#: builtin/index-pack.c:1249
msgid "confusion beyond insanity"
msgstr "extrema confusão"
-#: builtin/index-pack.c:1253
+#: builtin/index-pack.c:1255
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "concluído com %d objeto local"
msgstr[1] "concluído com %d objetos locais"
-#: builtin/index-pack.c:1265
+#: builtin/index-pack.c:1267
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Soma de verificação inesperada no final de %s (corrupção no disco?)"
-#: builtin/index-pack.c:1269
+#: builtin/index-pack.c:1271
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "pacote com %d delta não resolvido"
msgstr[1] "pacote com %d deltas não resolvidos"
-#: builtin/index-pack.c:1293
+#: builtin/index-pack.c:1295
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "não é possível compactar objeto acrescentado (%d)"
-#: builtin/index-pack.c:1369
+#: builtin/index-pack.c:1371
#, c-format
msgid "local object %s is corrupt"
msgstr "objeto local %s corrompido"
-#: builtin/index-pack.c:1393
+#: builtin/index-pack.c:1395
msgid "error while closing pack file"
msgstr "erro ao fechar ficheiro de pacote"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1408
#, c-format
msgid "cannot write keep file '%s'"
msgstr "não é possível escrever o ficheiro de conservação '%s'"
-#: builtin/index-pack.c:1414
+#: builtin/index-pack.c:1416
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "não é possível fechar o ficheiro de conservação '%s' escrito"
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1429
msgid "cannot store pack file"
msgstr "não é possível guardar ficheiro de pacote"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1440
msgid "cannot store index file"
msgstr "não é possível guardar o ficheiro índice"
-#: builtin/index-pack.c:1471
+#: builtin/index-pack.c:1473
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> incorreto"
-#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
+#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr "sem suporte de threads, %s ignorado"
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Não é possível abrir o ficheiro de pacote '%s' existente"
-#: builtin/index-pack.c:1542
+#: builtin/index-pack.c:1544
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Não é possível abrir o ficheiro de índice do pacote existente de '%s'"
-#: builtin/index-pack.c:1589
+#: builtin/index-pack.c:1591
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "%d objeto não delta"
msgstr[1] "%d objetos não delta"
-#: builtin/index-pack.c:1596
+#: builtin/index-pack.c:1598
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "comprimento de cadeia = %d: %lu objeto"
msgstr[1] "comprimento de cadeia = %d: %lu objetos"
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1611
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "o nome do ficheiro de pacote '%s' não termina em '.pack'"
-#: builtin/index-pack.c:1638
-msgid "Cannot come back to cwd"
-msgstr "Não é possível voltar ao diretório de trabalho atual"
-
-#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
-#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
+#: builtin/index-pack.c:1693 builtin/index-pack.c:1696
+#: builtin/index-pack.c:1712 builtin/index-pack.c:1716
#, c-format
msgid "bad %s"
msgstr "%s incorreto"
-#: builtin/index-pack.c:1723
+#: builtin/index-pack.c:1730
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin não pode ser usado sem --stdin"
-#: builtin/index-pack.c:1731
+#: builtin/index-pack.c:1738
msgid "--verify with no packfile name given"
msgstr "--verify sem nome do ficheiro de pacote indicado"
@@ -7546,54 +7930,54 @@ msgstr "não foi possível processar o tipo de ficheiro %d"
msgid "unable to move %s to %s"
msgstr "não foi possível mover %s para %s"
-#. TRANSLATORS: The first '%s' is either "Reinitialized
-#. existing" or "Initialized empty", the second " shared" or
-#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:403
+#: builtin/init-db.c:402
#, c-format
-msgid "%s%s Git repository in %s%s\n"
-msgstr "Repositório Git %s%s em %s%s\n"
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "Repositório Git partilhado e existente reinicializado em %s%s\n"
-#: builtin/init-db.c:404
-msgid "Reinitialized existing"
-msgstr "existente reinicializado"
+#: builtin/init-db.c:403
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "Repositório Git existem reinicializado em %s%s\n"
-#: builtin/init-db.c:404
-msgid "Initialized empty"
-msgstr "vazio inicializado"
+#: builtin/init-db.c:407
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "Repositório Git vazio e partilhado inicializado em %s%s\n"
-#: builtin/init-db.c:405
-msgid " shared"
-msgstr " partilhado"
+#: builtin/init-db.c:408
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "Repositório Git vazio inicializado em %s%s\n"
-#: builtin/init-db.c:452
+#: builtin/init-db.c:455
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgstr ""
-"git init [-q | --quiet] [--bare] [--template=<diretório-modelo>] "
-"[--shared[=<permissões>]] [<diretório>]"
+"git init [-q | --quiet] [--bare] [--template=<diretório-modelo>] [--"
+"shared[=<permissões>]] [<diretório>]"
-#: builtin/init-db.c:475
+#: builtin/init-db.c:478
msgid "permissions"
msgstr "permissões"
-#: builtin/init-db.c:476
+#: builtin/init-db.c:479
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
"especificar que o repositório git será partilhado por vários utilizadores"
-#: builtin/init-db.c:510 builtin/init-db.c:515
+#: builtin/init-db.c:513 builtin/init-db.c:518
#, c-format
msgid "cannot mkdir %s"
msgstr "não é possível criar o diretório %s"
-#: builtin/init-db.c:519
+#: builtin/init-db.c:522
#, c-format
msgid "cannot chdir to %s"
msgstr "não é possível mudar para o diretório %s"
-#: builtin/init-db.c:540
+#: builtin/init-db.c:543
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7602,7 +7986,7 @@ msgstr ""
"%s (ou --work-tree=<diretório>) não é permitido sem especificar %s (ou --git-"
"dir=<diretório>)"
-#: builtin/init-db.c:568
+#: builtin/init-db.c:571
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Não é possível aceder à árvore de trabalho '%s'"
@@ -7635,332 +8019,332 @@ msgstr "terminadores a adicionar"
msgid "no input file given for in-place editing"
msgstr "nenhum ficheiro de entrada fornecido para edição no local"
-#: builtin/log.c:43
+#: builtin/log.c:44
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<opções>] [<intervalo-de-revisões>] [[--] <caminho>...]"
-#: builtin/log.c:44
+#: builtin/log.c:45
msgid "git show [<options>] <object>..."
msgstr "git show [<opções>] <objeto>..."
-#: builtin/log.c:83
+#: builtin/log.c:84
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opção --decorate inválida: %s"
-#: builtin/log.c:137
+#: builtin/log.c:139
msgid "suppress diff output"
msgstr "suprimir saída do diff"
-#: builtin/log.c:138
+#: builtin/log.c:140
msgid "show source"
msgstr "mostrar origem"
-#: builtin/log.c:139
+#: builtin/log.c:141
msgid "Use mail map file"
msgstr "usar ficheiro de mapeamento de correio"
-#: builtin/log.c:140
+#: builtin/log.c:142
msgid "decorate options"
msgstr "opções de decoração"
-#: builtin/log.c:143
+#: builtin/log.c:145
msgid "Process line range n,m in file, counting from 1"
-msgstr "processar intervalo de linhas n,m, a cantar a partir de 1"
+msgstr "processar intervalo de linhas n,m, a contar a partir de 1"
-#: builtin/log.c:239
+#: builtin/log.c:241
#, c-format
msgid "Final output: %d %s\n"
msgstr "Resultado final: %d %s\n"
-#: builtin/log.c:471
+#: builtin/log.c:486
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: ficheiro incorreto"
-#: builtin/log.c:485 builtin/log.c:578
+#: builtin/log.c:500 builtin/log.c:594
#, c-format
msgid "Could not read object %s"
msgstr "Não foi possível ler o objeto %s"
-#: builtin/log.c:602
+#: builtin/log.c:618
#, c-format
msgid "Unknown type: %d"
msgstr "Tipo desconhecido: %d"
-#: builtin/log.c:722
+#: builtin/log.c:739
msgid "format.headers without value"
msgstr "format.headers sem valor"
-#: builtin/log.c:812
+#: builtin/log.c:839
msgid "name of output directory is too long"
msgstr "o nome do diretório de saída é demasiado longo"
-#: builtin/log.c:827
+#: builtin/log.c:854
#, c-format
msgid "Cannot open patch file %s"
msgstr "Não é possível abrir o ficheiro de patch %s"
-#: builtin/log.c:841
+#: builtin/log.c:868
msgid "Need exactly one range."
msgstr "É necessário exatamente um intervalo."
-#: builtin/log.c:851
+#: builtin/log.c:878
msgid "Not a range."
msgstr "Não é um intervalo."
-#: builtin/log.c:957
+#: builtin/log.c:984
msgid "Cover letter needs email format"
msgstr "A carta de apresentação precisa de um formato de e-mail"
-#: builtin/log.c:1036
+#: builtin/log.c:1064
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to incorreto: %s"
-#: builtin/log.c:1064
+#: builtin/log.c:1092
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opções>] [<desde> | <intervalo-de-revisões>]"
-#: builtin/log.c:1109
+#: builtin/log.c:1137
msgid "Two output directories?"
msgstr "Dois diretórios de saída?"
-#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
#, c-format
msgid "Unknown commit %s"
msgstr "Commit desconhecido %s"
-#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
-#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
-#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
-#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
+#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
+#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
+#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Falha ao resolver '%s' numa referência válida."
-#: builtin/log.c:1231
+#: builtin/log.c:1259
msgid "Could not find exact merge base."
msgstr "Não foi possível encontrar a base exata de integração."
-#: builtin/log.c:1235
+#: builtin/log.c:1263
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually."
msgstr ""
-"Falha ao obter ramo a montante, se quer gravar o commit base automaticamente,"
-"\n"
+"Falha ao obter ramo a montante, se quer gravar o commit base "
+"automaticamente,\n"
"use branch --set-upstream-to para seguir um ramo remoto.\n"
"Ou pode especificar o commit base com --base=<base-commit-id> manualmente."
-#: builtin/log.c:1255
+#: builtin/log.c:1283
msgid "Failed to find exact merge base"
msgstr "Falha ao procurar base exata de integração"
-#: builtin/log.c:1266
+#: builtin/log.c:1294
msgid "base commit should be the ancestor of revision list"
msgstr "o commit base deve ser o antecessor da lista de revisões"
-#: builtin/log.c:1270
+#: builtin/log.c:1298
msgid "base commit shouldn't be in revision list"
msgstr "o commit base não deve fazer parte da lista de revisões"
-#: builtin/log.c:1319
+#: builtin/log.c:1347
msgid "cannot get patch id"
msgstr "não é possível obter o id do patch"
-#: builtin/log.c:1377
+#: builtin/log.c:1404
msgid "use [PATCH n/m] even with a single patch"
msgstr "usar [PATCH n/m] mesmo com um único patch"
-#: builtin/log.c:1380
+#: builtin/log.c:1407
msgid "use [PATCH] even with multiple patches"
msgstr "usar [PATCH] mesmo com múltiplos patches"
-#: builtin/log.c:1384
+#: builtin/log.c:1411
msgid "print patches to standard out"
msgstr "imprimir patches para a saída padrão"
-#: builtin/log.c:1386
+#: builtin/log.c:1413
msgid "generate a cover letter"
msgstr "gerar uma carta de apresentação"
-#: builtin/log.c:1388
+#: builtin/log.c:1415
msgid "use simple number sequence for output file names"
msgstr ""
"usar uma sequência de números simples para denominar os ficheiros gerados"
-#: builtin/log.c:1389
+#: builtin/log.c:1416
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1390
+#: builtin/log.c:1417
msgid "use <sfx> instead of '.patch'"
msgstr "usar <sfx> em vez de '.patch'"
-#: builtin/log.c:1392
+#: builtin/log.c:1419
msgid "start numbering patches at <n> instead of 1"
msgstr "começar a numerar os patches em <n> em vez de 1"
-#: builtin/log.c:1394
+#: builtin/log.c:1421
msgid "mark the series as Nth re-roll"
msgstr "marcar a série como a n-ésima reiteração"
-#: builtin/log.c:1396
+#: builtin/log.c:1423
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "usar [<prefixo>] em vez de [PATCH]"
-#: builtin/log.c:1399
+#: builtin/log.c:1426
msgid "store resulting files in <dir>"
msgstr "guardar os ficheiros resultantes em <dir>"
-#: builtin/log.c:1402
+#: builtin/log.c:1429
msgid "don't strip/add [PATCH]"
msgstr "não tirar/inserir [PATCH]"
-#: builtin/log.c:1405
+#: builtin/log.c:1432
msgid "don't output binary diffs"
msgstr "não gerar diffs binários"
-#: builtin/log.c:1407
+#: builtin/log.c:1434
msgid "output all-zero hash in From header"
msgstr "preencher o cabeçalho From com hash de zeros"
-#: builtin/log.c:1409
+#: builtin/log.c:1436
msgid "don't include a patch matching a commit upstream"
msgstr "não incluir um patch que coincida com um commit a montante"
-#: builtin/log.c:1411
+#: builtin/log.c:1438
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"mostrar no formato de patch em vez de no formato por omissão (patch + stat)"
-#: builtin/log.c:1413
+#: builtin/log.c:1440
msgid "Messaging"
msgstr "Mensagem"
-#: builtin/log.c:1414
+#: builtin/log.c:1441
msgid "header"
msgstr "cabeçalho"
-#: builtin/log.c:1415
+#: builtin/log.c:1442
msgid "add email header"
msgstr "adicionar cabeçalho de e-mail"
-#: builtin/log.c:1416 builtin/log.c:1418
+#: builtin/log.c:1443 builtin/log.c:1445
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1416
+#: builtin/log.c:1443
msgid "add To: header"
msgstr "adicionar cabeçalho To:"
-#: builtin/log.c:1418
+#: builtin/log.c:1445
msgid "add Cc: header"
msgstr "adicionar cabeçalho Cc:"
-#: builtin/log.c:1420
+#: builtin/log.c:1447
msgid "ident"
msgstr "identidade"
-#: builtin/log.c:1421
+#: builtin/log.c:1448
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"definir o endereço From como <identidade> (ou como identidade do committer "
"se não indicado)"
-#: builtin/log.c:1423
+#: builtin/log.c:1450
msgid "message-id"
msgstr "id-mensagem"
-#: builtin/log.c:1424
+#: builtin/log.c:1451
msgid "make first mail a reply to <message-id>"
msgstr "usar o primeiro email para responder a <id-mensagem>"
-#: builtin/log.c:1425 builtin/log.c:1428
+#: builtin/log.c:1452 builtin/log.c:1455
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1426
+#: builtin/log.c:1453
msgid "attach the patch"
msgstr "anexar o patch"
-#: builtin/log.c:1429
+#: builtin/log.c:1456
msgid "inline the patch"
msgstr "incorporar o patch"
-#: builtin/log.c:1433
+#: builtin/log.c:1460
msgid "enable message threading, styles: shallow, deep"
msgstr "ativar mensagens por tópicos, estilos: shallow (raso), deep (profundo)"
-#: builtin/log.c:1435
+#: builtin/log.c:1462
msgid "signature"
msgstr "assinatura"
-#: builtin/log.c:1436
+#: builtin/log.c:1463
msgid "add a signature"
msgstr "adicionar uma assinatura"
-#: builtin/log.c:1437
+#: builtin/log.c:1464
msgid "base-commit"
msgstr "commit-base"
-#: builtin/log.c:1438
+#: builtin/log.c:1465
msgid "add prerequisite tree info to the patch series"
msgstr "adicionar informação pré-requisito da árvore à série de patches"
-#: builtin/log.c:1440
+#: builtin/log.c:1467
msgid "add a signature from a file"
msgstr "adicionar uma assinatura de um ficheiro"
-#: builtin/log.c:1441
+#: builtin/log.c:1468
msgid "don't print the patch filenames"
msgstr "não imprimir os nomes dos ficheiros de patch"
-#: builtin/log.c:1531
+#: builtin/log.c:1558
msgid "-n and -k are mutually exclusive."
msgstr "-n e -k são mutuamente exclusivos."
-#: builtin/log.c:1533
+#: builtin/log.c:1560
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix e -k são mutuamente exclusivos."
-#: builtin/log.c:1541
+#: builtin/log.c:1568
msgid "--name-only does not make sense"
msgstr "--name-only não faz sentido"
-#: builtin/log.c:1543
+#: builtin/log.c:1570
msgid "--name-status does not make sense"
msgstr "--name-status não faz sentido"
-#: builtin/log.c:1545
+#: builtin/log.c:1572
msgid "--check does not make sense"
msgstr "--check não faz sentido"
-#: builtin/log.c:1573
+#: builtin/log.c:1602
msgid "standard output, or directory, which one?"
msgstr "saída padrão, ou diretório, qual deles?"
-#: builtin/log.c:1575
+#: builtin/log.c:1604
#, c-format
msgid "Could not create directory '%s'"
msgstr "Não foi possível criar o diretório '%s'"
-#: builtin/log.c:1672
+#: builtin/log.c:1698
#, c-format
msgid "unable to read signature file '%s'"
msgstr "não é possível ler o ficheiro de assinatura '%s'"
-#: builtin/log.c:1743
+#: builtin/log.c:1769
msgid "Failed to create output files"
msgstr "Falha ao criar os ficheiros de saída"
-#: builtin/log.c:1792
+#: builtin/log.c:1818
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<ramo-a-montante> [<head> [<limite>]]]"
-#: builtin/log.c:1846
+#: builtin/log.c:1872
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7968,103 +8352,103 @@ msgstr ""
"O ramo remoto seguido não foi encontrado, especifique <ramo-a-montante> "
"manualmente.\n"
-#: builtin/ls-files.c:378
+#: builtin/ls-files.c:379
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opções>] [<ficheiro>...]"
-#: builtin/ls-files.c:427
+#: builtin/ls-files.c:428
msgid "identify the file status with tags"
msgstr "identificar o estado do ficheiro com tags"
-#: builtin/ls-files.c:429
+#: builtin/ls-files.c:430
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
"usar letras minúsculas para ficheiros 'assumido não alterado' ('assume "
"unchanged')"
-#: builtin/ls-files.c:431
+#: builtin/ls-files.c:432
msgid "show cached files in the output (default)"
msgstr "mostrar ficheiros em cache na saída (predefinição)"
-#: builtin/ls-files.c:433
+#: builtin/ls-files.c:434
msgid "show deleted files in the output"
msgstr "mostrar ficheiros eliminados na saída"
-#: builtin/ls-files.c:435
+#: builtin/ls-files.c:436
msgid "show modified files in the output"
msgstr "mostrar ficheiros modificados na saída"
-#: builtin/ls-files.c:437
+#: builtin/ls-files.c:438
msgid "show other files in the output"
msgstr "mostrar outros ficheiros na saída"
-#: builtin/ls-files.c:439
+#: builtin/ls-files.c:440
msgid "show ignored files in the output"
msgstr "mostrar ficheiros ignorados na saída"
-#: builtin/ls-files.c:442
+#: builtin/ls-files.c:443
msgid "show staged contents' object name in the output"
msgstr "mostrar nome de objetos com conteúdo preparado, na saída"
-#: builtin/ls-files.c:444
+#: builtin/ls-files.c:445
msgid "show files on the filesystem that need to be removed"
msgstr ""
"mostrar ficheiros no sistema de ficheiros que precisam de ser removidos"
-#: builtin/ls-files.c:446
+#: builtin/ls-files.c:447
msgid "show 'other' directories' names only"
msgstr "mostrar nomes de diretórios 'other' (outro)"
-#: builtin/ls-files.c:448
+#: builtin/ls-files.c:449
msgid "show line endings of files"
msgstr "mostrar finais de linha dos ficheiros"
-#: builtin/ls-files.c:450
+#: builtin/ls-files.c:451
msgid "don't show empty directories"
msgstr "não mostrar diretórios vazios"
-#: builtin/ls-files.c:453
+#: builtin/ls-files.c:454
msgid "show unmerged files in the output"
msgstr "mostrar ficheiros não integrados na saída"
-#: builtin/ls-files.c:455
+#: builtin/ls-files.c:456
msgid "show resolve-undo information"
msgstr "mostrar informação de resolver-desfazer"
-#: builtin/ls-files.c:457
+#: builtin/ls-files.c:458
msgid "skip files matching pattern"
msgstr "ignorar ficheiros que correspondam ao padrão"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:461
msgid "exclude patterns are read from <file>"
msgstr "ler padrões de exclusão do <ficheiro>"
-#: builtin/ls-files.c:463
+#: builtin/ls-files.c:464
msgid "read additional per-directory exclude patterns in <file>"
msgstr "ler padrões de exclusão por diretório do <ficheiro>"
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:466
msgid "add the standard git exclusions"
msgstr "incluir as exclusões standard do git"
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:469
msgid "make the output relative to the project top directory"
msgstr "mostrar os caminhos relativamente ao diretório superior do projeto"
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:472
msgid "if any <file> is not in the index, treat this as an error"
msgstr "se um <ficheiro> não estiver no índice, tratar como erro"
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:473
msgid "tree-ish"
msgstr "árvore-etc"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:474
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"fingir que os caminhos removidos desde <árvore-etc> ainda estão presentes"
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:476
msgid "show debugging data"
msgstr "mostrar dados de depuração"
@@ -8151,190 +8535,176 @@ msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
"mostrar a árvore completa; não apenas o diretório atual (implica --full-name)"
-#: builtin/merge.c:45
+#: builtin/merge.c:46
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opções>] [<commit>...]"
-#: builtin/merge.c:46
+#: builtin/merge.c:47
msgid "git merge [<options>] <msg> HEAD <commit>"
msgstr "git merge [<opções>] <msg> HEAD <commit>"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:101
+#: builtin/merge.c:102
msgid "switch `m' requires a value"
msgstr "a opção 'm' requer um valor"
-#: builtin/merge.c:138
+#: builtin/merge.c:139
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Estratégia de integração '%s' não encontrada.\n"
-#: builtin/merge.c:139
+#: builtin/merge.c:140
#, c-format
msgid "Available strategies are:"
msgstr "Estratégias disponíveis:"
-#: builtin/merge.c:144
+#: builtin/merge.c:145
#, c-format
msgid "Available custom strategies are:"
msgstr "Estratégias personalizadas disponíveis:"
-#: builtin/merge.c:194 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:126
msgid "do not show a diffstat at the end of the merge"
msgstr "não apresentar um diffstat ao fim da integração"
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:129
msgid "show a diffstat at the end of the merge"
msgstr "mostrar um diffstat ao fim da integração"
-#: builtin/merge.c:198 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:132
msgid "(synonym to --stat)"
msgstr "(sinónimo de --stat)"
-#: builtin/merge.c:200 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:135
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"adicionar (no máximo <n>) entradas do shortlog à mensagem de commit da "
"integração"
-#: builtin/merge.c:203 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:138
msgid "create a single commit instead of doing a merge"
msgstr "criar um único commit em vez de realizar uma integração"
-#: builtin/merge.c:205 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:141
msgid "perform a commit if the merge succeeds (default)"
msgstr "realizar um commit se a integração for bem sucedida (predefinição)"
-#: builtin/merge.c:207 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:144
msgid "edit message before committing"
msgstr "editar a mensagem antes de submeter"
-#: builtin/merge.c:208
+#: builtin/merge.c:209
msgid "allow fast-forward (default)"
msgstr "permitir avanço rápido (predefinição)"
-#: builtin/merge.c:210 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:150
msgid "abort if fast-forward is not possible"
msgstr "abortar se não é possível efetuar avanço rápido"
-#: builtin/merge.c:214
-msgid "Verify that the named commit has a valid GPG signature"
+#: builtin/merge.c:215 builtin/pull.c:153
+msgid "verify that the named commit has a valid GPG signature"
msgstr "verificar se o commit tem uma assinatura GPG válida"
-#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157
#: builtin/revert.c:89
msgid "strategy"
msgstr "estratégia"
-#: builtin/merge.c:216 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:158
msgid "merge strategy to use"
msgstr "estratégia de integração a usar"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:161
msgid "option=value"
msgstr "opção=valor"
-#: builtin/merge.c:218 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:162
msgid "option for selected merge strategy"
msgstr "opções da estratégia de integração selecionada"
-#: builtin/merge.c:220
+#: builtin/merge.c:221
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "mensagem de commit (de integração não suscetível a avanço rápido)"
-#: builtin/merge.c:224
+#: builtin/merge.c:225
msgid "abort the current in-progress merge"
msgstr "abortar integração em curso"
-#: builtin/merge.c:226 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:169
msgid "allow merging unrelated histories"
msgstr "permitir integração de históricos não relacionados"
-#: builtin/merge.c:254
+#: builtin/merge.c:255
msgid "could not run stash."
msgstr "não foi possível executar o comando stash."
-#: builtin/merge.c:259
+#: builtin/merge.c:260
msgid "stash failed"
msgstr "falha ao executar o comando stash"
-#: builtin/merge.c:264
+#: builtin/merge.c:265
#, c-format
msgid "not a valid object: %s"
msgstr "nome de objeto inválido: %s"
-#: builtin/merge.c:283 builtin/merge.c:300
+#: builtin/merge.c:284 builtin/merge.c:301
msgid "read-tree failed"
msgstr "falha ao executar o comando read-tree"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
msgid " (nothing to squash)"
msgstr " (não há nada para esmagar)"
-#: builtin/merge.c:343
+#: builtin/merge.c:342
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Commit esmagado -- HEAD não atualizada\n"
-#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
-#: builtin/merge.c:1000
-#, c-format
-msgid "Could not write to '%s'"
-msgstr "Não foi possível escrever em '%s'"
-
-#: builtin/merge.c:375
-msgid "Writing SQUASH_MSG"
-msgstr "A escrever SQUASH_MSG"
-
-#: builtin/merge.c:377
-msgid "Finishing SQUASH_MSG"
-msgstr "A concluir SQUASH_MSG"
-
-#: builtin/merge.c:400
+#: builtin/merge.c:392
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Nenhuma mensagem de integração -- HEAD não atualizada\n"
-#: builtin/merge.c:451
+#: builtin/merge.c:443
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' não aponta para um commit"
-#: builtin/merge.c:541
+#: builtin/merge.c:533
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Valor de branch.%s.mergeoptions incorreto: %s"
-#: builtin/merge.c:660
+#: builtin/merge.c:652
msgid "Not handling anything other than two heads merge."
msgstr "Não se processa outra coisa senão incorporação de duas cabeças."
-#: builtin/merge.c:674
+#: builtin/merge.c:666
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Opção desconhecida de merge-recursive: -X%s"
-#: builtin/merge.c:687
+#: builtin/merge.c:681
#, c-format
msgid "unable to write %s"
msgstr "não foi possível escrever %s"
-#: builtin/merge.c:776
+#: builtin/merge.c:733
#, c-format
msgid "Could not read from '%s'"
msgstr "Não foi possível ler '%s'"
-#: builtin/merge.c:785
+#: builtin/merge.c:742
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Commit de integração não realizado; use 'git commit' para concluir a "
"integração.\n"
-#: builtin/merge.c:791
+#: builtin/merge.c:748
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -8350,54 +8720,68 @@ msgstr ""
"Linhas começadas com '%c' são ignoradas e uma mensagem vazia\n"
"aborta o commit.\n"
-#: builtin/merge.c:815
+#: builtin/merge.c:772
msgid "Empty commit message."
msgstr "Mensagem de commit vazia."
-#: builtin/merge.c:835
+#: builtin/merge.c:792
#, c-format
msgid "Wonderful.\n"
msgstr "Maravilhoso.\n"
-#: builtin/merge.c:890
+#: builtin/merge.c:847
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Falha ao realizar integração automática; corrija os conflitos e submeta o "
"resultado.\n"
-#: builtin/merge.c:906
+#: builtin/merge.c:863
#, c-format
msgid "'%s' is not a commit"
msgstr "'%s' não é um commit"
-#: builtin/merge.c:947
+#: builtin/merge.c:904
msgid "No current branch."
msgstr "Nenhum ramo atual."
-#: builtin/merge.c:949
+#: builtin/merge.c:906
msgid "No remote for the current branch."
msgstr "Não há um remoto para o ramo atual."
-#: builtin/merge.c:951
+#: builtin/merge.c:908
msgid "No default upstream defined for the current branch."
msgstr "Não está definido nenhum ramo a montante para o ramo atual."
-#: builtin/merge.c:956
+#: builtin/merge.c:913
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Nenhum ramo de monitorização remoto seguido por %s de %s"
-#: builtin/merge.c:1091
+#: builtin/merge.c:960
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Valor '%s' incorreto no ambiente '%s'"
+
+#: builtin/merge.c:1034
#, c-format
msgid "could not close '%s'"
msgstr "não foi possível fechar '%s'"
-#: builtin/merge.c:1219
+#: builtin/merge.c:1061
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "não se pode integrar em %s: %s"
+
+#: builtin/merge.c:1095
+msgid "not something we can merge"
+msgstr "não se pode integrar"
+
+#: builtin/merge.c:1162
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Não há nenhuma integração para se abortar (MERGE_HEAD não presente)."
-#: builtin/merge.c:1235
+#: builtin/merge.c:1178
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8405,7 +8789,7 @@ msgstr ""
"Não concluiu a integração (MERGE_HEAD presente).\n"
"Submeta as suas alterações antes de integrar."
-#: builtin/merge.c:1242
+#: builtin/merge.c:1185
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8413,109 +8797,117 @@ msgstr ""
"Cherry-pick não concluído (CHERRY_PICK_HEAD presente).\n"
"Submeta as suas alterações antes de integrar."
-#: builtin/merge.c:1245
+#: builtin/merge.c:1188
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Cherry-pick não concluído (CHERRY_PICK_HEAD presente)."
-#: builtin/merge.c:1254
+#: builtin/merge.c:1197
msgid "You cannot combine --squash with --no-ff."
msgstr "Não é possível combinar --squash e --no-ff."
-#: builtin/merge.c:1262
+#: builtin/merge.c:1205
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Nenhum commit especificado e merge.defaultToUpstream não definido."
-#: builtin/merge.c:1279
+#: builtin/merge.c:1222
msgid "Squash commit into empty head not supported yet"
msgstr "Esmagar um commit numa cabeça vazia ainda não é suportado"
-#: builtin/merge.c:1281
+#: builtin/merge.c:1224
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Não faz sentido submeter de modo não suscetível a avanço rápido, numa cabeça "
"vazia"
-#: builtin/merge.c:1286
+#: builtin/merge.c:1229
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - não é algo se possa integrar"
-#: builtin/merge.c:1288
+#: builtin/merge.c:1231
msgid "Can merge only exactly one commit into empty head"
msgstr "Só se pode integrar exatamente um commit numa cabeça vazia"
-#: builtin/merge.c:1344
+#: builtin/merge.c:1287
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"A assinatura GPG do commit %s, alegadamente assinada por %s, não é de "
"confiança."
-#: builtin/merge.c:1347
+#: builtin/merge.c:1290
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"A assinatura GPG do commit %s, alegadamente assinada por %s, está incorreta."
-#: builtin/merge.c:1350
+#: builtin/merge.c:1293
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "O commit %s não tem uma assinatura GPG."
-#: builtin/merge.c:1353
+#: builtin/merge.c:1296
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "A assinatura GPG do commit %s por %s está correta\n"
-#: builtin/merge.c:1415
+#: builtin/merge.c:1358
msgid "refusing to merge unrelated histories"
msgstr "integração de históricos não relacionados recusada"
-#: builtin/merge.c:1439
+#: builtin/merge.c:1367
+msgid "Already up-to-date."
+msgstr "Já está atualizado."
+
+#: builtin/merge.c:1382
#, c-format
msgid "Updating %s..%s\n"
msgstr "A atualizar %s..%s\n"
-#: builtin/merge.c:1476
+#: builtin/merge.c:1419
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "A tentar integração mesmo trivial no interior do índice...\n"
-#: builtin/merge.c:1483
+#: builtin/merge.c:1426
#, c-format
msgid "Nope.\n"
msgstr "Não.\n"
-#: builtin/merge.c:1515
+#: builtin/merge.c:1451
+msgid "Already up-to-date. Yeeah!"
+msgstr "Já está atualizado. Sim!"
+
+#: builtin/merge.c:1457
msgid "Not possible to fast-forward, aborting."
msgstr "Não é possível avançar rapidamente, a abortar."
-#: builtin/merge.c:1538 builtin/merge.c:1617
+#: builtin/merge.c:1480 builtin/merge.c:1559
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "A recuar a árvore ao seu estado original...\n"
-#: builtin/merge.c:1542
+#: builtin/merge.c:1484
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "A tentar a estratégia de integração %s...\n"
-#: builtin/merge.c:1608
+#: builtin/merge.c:1550
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Nenhuma estratégia de integração conseguiu processar a integração.\n"
-#: builtin/merge.c:1610
+#: builtin/merge.c:1552
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Falha ao integrar com a estratégia %s.\n"
-#: builtin/merge.c:1619
+#: builtin/merge.c:1561
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "A usar %s para preparar resolução manual.\n"
-#: builtin/merge.c:1631
+#: builtin/merge.c:1573
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -8624,15 +9016,14 @@ msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<opções>] <origem>... <destino>"
#: builtin/mv.c:70
-#, fuzzy, c-format
+#, c-format
msgid "Directory %s is in index and no submodule?"
-msgstr "O diretório %s está no índice mas não em nenhum submódulo?"
+msgstr "O diretório %s está no índice porém nenhum submódulo?"
#: builtin/mv.c:72 builtin/rm.c:317
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-"Prepare as suas alterações em .gitmodules ou empilhe-as (stash) para "
-"prosseguir"
+"Prepare as suas alterações em .gitmodules ou esconda-as para prosseguir"
#: builtin/mv.c:90
#, c-format
@@ -8647,68 +9038,68 @@ msgstr "forçar mover/mudar o nome mesmo que o destino exista"
msgid "skip move/rename errors"
msgstr "ignorar erros ao mover/mudar o nome"
-#: builtin/mv.c:152
+#: builtin/mv.c:155
#, c-format
msgid "destination '%s' is not a directory"
msgstr "o destino '%s' não é um diretório"
-#: builtin/mv.c:163
+#: builtin/mv.c:166
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "A verificar a mudança de nome de '%s' para '%s'\n"
-#: builtin/mv.c:167
+#: builtin/mv.c:170
msgid "bad source"
msgstr "origem incorreta"
-#: builtin/mv.c:170
+#: builtin/mv.c:173
msgid "can not move directory into itself"
msgstr "não é possível mover um diretório para dentro de si próprio"
-#: builtin/mv.c:173
+#: builtin/mv.c:176
msgid "cannot move directory over file"
msgstr "não é possível mover um diretório para um ficheiro"
-#: builtin/mv.c:182
+#: builtin/mv.c:185
msgid "source directory is empty"
msgstr "o diretório de origem está vazio"
-#: builtin/mv.c:207
+#: builtin/mv.c:210
msgid "not under version control"
msgstr "não está no controlo de versões"
-#: builtin/mv.c:210
+#: builtin/mv.c:213
msgid "destination exists"
msgstr "o destino já existe"
-#: builtin/mv.c:218
+#: builtin/mv.c:221
#, c-format
msgid "overwriting '%s'"
msgstr "a substituir '%s'"
-#: builtin/mv.c:221
+#: builtin/mv.c:224
msgid "Cannot overwrite"
msgstr "Não é possível substituir"
-#: builtin/mv.c:224
+#: builtin/mv.c:227
msgid "multiple sources for the same target"
msgstr "múltiplas origens para o mesmo destino"
-#: builtin/mv.c:226
+#: builtin/mv.c:229
msgid "destination directory does not exist"
msgstr "o diretório de destino não existe"
-#: builtin/mv.c:233
+#: builtin/mv.c:236
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, origem=%s, destino=%s"
-#: builtin/mv.c:254
+#: builtin/mv.c:257
#, c-format
msgid "Renaming %s to %s\n"
msgstr "A mudar de nome de %s para %s\n"
-#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
#, c-format
msgid "renaming '%s' failed"
msgstr "falha ao mudar o nome de '%s'"
@@ -8863,6 +9254,10 @@ msgstr "git notes prune [<opções>]"
msgid "git notes get-ref"
msgstr "git notes get-ref"
+#: builtin/notes.c:94
+msgid "Write/edit the notes for the following object:"
+msgstr "Escreva/edite as notas do seguinte objeto:"
+
#: builtin/notes.c:147
#, c-format
msgid "unable to start 'show' for object '%s'"
@@ -8877,80 +9272,75 @@ msgstr "não foi possível ler a saída do comando 'show'"
msgid "failed to finish 'show' for object '%s'"
msgstr "falha ao concluir o comando 'show' sobre o objeto '%s'"
-#: builtin/notes.c:174 builtin/tag.c:248
-#, c-format
-msgid "could not create file '%s'"
-msgstr "não foi possível criar o ficheiro '%s'"
-
-#: builtin/notes.c:193
+#: builtin/notes.c:194
msgid "Please supply the note contents using either -m or -F option"
msgstr "Forneça o conteúdo da nota usando a opção -m ou -F"
-#: builtin/notes.c:202
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "não é possível escrever o objeto de nota"
-#: builtin/notes.c:204
+#: builtin/notes.c:205
#, c-format
msgid "The note contents have been left in %s"
msgstr "O conteúdo da nota foi guardado em %s"
-#: builtin/notes.c:232 builtin/tag.c:439
+#: builtin/notes.c:233 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr "não é possível ler '%s'"
-#: builtin/notes.c:234 builtin/tag.c:442
+#: builtin/notes.c:235 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr "não foi possível abrir ou ler '%s'"
-#: builtin/notes.c:256
+#: builtin/notes.c:257
#, c-format
msgid "Failed to read object '%s'."
msgstr "Falha ao ler o objeto '%s'."
-#: builtin/notes.c:260
+#: builtin/notes.c:261
#, c-format
msgid "Cannot read note data from non-blob object '%s'."
msgstr "Não é possível ler os dados da nota de um objeto não-blob '%s'."
-#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
-#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:946
+#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
+#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
+#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
msgid "too many parameters"
msgstr "demasiados parâmetros"
-#: builtin/notes.c:375 builtin/notes.c:662
+#: builtin/notes.c:376 builtin/notes.c:663
#, c-format
msgid "No note found for object %s."
msgstr "A nota do objeto %s não foi encontrada."
-#: builtin/notes.c:396 builtin/notes.c:559
+#: builtin/notes.c:397 builtin/notes.c:560
msgid "note contents as a string"
msgstr "conteúdo da nota sob a forma de cadeia de caracteres"
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:400 builtin/notes.c:563
msgid "note contents in a file"
msgstr "conteúdo da nota de um ficheiro"
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "reuse and edit specified note object"
msgstr "reutilizar e editar o objeto de nota especificado"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "reuse specified note object"
msgstr "reutilizar o objeto de nota especificado"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "allow storing empty note"
msgstr "permitir guardar uma nota vazia"
-#: builtin/notes.c:409 builtin/notes.c:480
+#: builtin/notes.c:410 builtin/notes.c:481
msgid "replace existing notes"
msgstr "substituir notas existentes"
-#: builtin/notes.c:434
+#: builtin/notes.c:435
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -8959,29 +9349,29 @@ msgstr ""
"Não é possível adicionar notas. Notas do objeto %s encontradas. Use '-f' "
"para substituí-las."
-#: builtin/notes.c:449 builtin/notes.c:528
+#: builtin/notes.c:450 builtin/notes.c:529
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "A substituir as notas existentes do objeto %s\n"
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
+#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
#, c-format
msgid "Removing note for object %s\n"
msgstr "A remover a nota do objeto %s\n"
-#: builtin/notes.c:481
+#: builtin/notes.c:482
msgid "read objects from stdin"
msgstr "ler objetos da entrada padrão"
-#: builtin/notes.c:483
+#: builtin/notes.c:484
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "carregar configuração de reescrita do <comando> (implica --stdin)"
-#: builtin/notes.c:501
+#: builtin/notes.c:502
msgid "too few parameters"
msgstr "parâmetros insuficientes"
-#: builtin/notes.c:522
+#: builtin/notes.c:523
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -8990,12 +9380,12 @@ msgstr ""
"Não é possível copiar notas. Notas do objeto %s encontradas. Use '-f' para "
"substituí-las."
-#: builtin/notes.c:534
+#: builtin/notes.c:535
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr "Não existem notas no objeto de origem %s. Não é possível copiar."
-#: builtin/notes.c:586
+#: builtin/notes.c:587
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -9004,65 +9394,107 @@ msgstr ""
"As opções -m/-F/-c/-C são obsoletas no subcomando 'edit'.\n"
"Use 'git notes add -f -m/-F/-c/-C' em seu lugar.\n"
-#: builtin/notes.c:768
+#: builtin/notes.c:753
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "estratégia de integração de notas %s desconhecida"
+
+#: builtin/notes.c:769
msgid "General options"
msgstr "Opções gerais"
-#: builtin/notes.c:770
+#: builtin/notes.c:771
msgid "Merge options"
msgstr "Opções de integração"
-#: builtin/notes.c:772
+#: builtin/notes.c:773
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
-"resolver conflitos nas notas usando a estratégia indicada "
-"(manual/ours/theirs/union/cat_sort_uniq)"
+"resolver conflitos nas notas usando a estratégia indicada (manual/ours/"
+"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:774
+#: builtin/notes.c:775
msgid "Committing unmerged notes"
msgstr "A submeter notas não integradas"
-#: builtin/notes.c:776
+#: builtin/notes.c:777
msgid "finalize notes merge by committing unmerged notes"
msgstr "concluir integração de notas, submetendo notas não integradas"
-#: builtin/notes.c:778
+#: builtin/notes.c:779
msgid "Aborting notes merge resolution"
msgstr "A abortar resolução de integração das notas"
-#: builtin/notes.c:780
+#: builtin/notes.c:781
msgid "abort notes merge"
msgstr "abortar integração das notas"
-#: builtin/notes.c:857
+#: builtin/notes.c:792
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "não é possível misturar --commit, --abort ou -s/--strategy"
+
+#: builtin/notes.c:797
+msgid "Must specify a notes ref to merge"
+msgstr "Tem de especificar uma referência de notas para integrar"
+
+#: builtin/notes.c:821
+#, c-format
+msgid "Unknown -s/--strategy: %s"
+msgstr "-s/--strategy desconhecida: %s"
+
+#: builtin/notes.c:858
#, c-format
msgid "A notes merge into %s is already in-progress at %s"
msgstr "Uma integração das notas em %s já está em curso em %s"
-#: builtin/notes.c:884
+#: builtin/notes.c:861
+#, c-format
+msgid "Failed to store link to current notes ref (%s)"
+msgstr "Falha ao guardar ligação à referência de notas atual (%s)"
+
+#: builtin/notes.c:863
+#, c-format
+msgid ""
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
+msgstr ""
+"A integração automática de notas falhou. Corrija os conflitos em %s e "
+"submeta o resultado com 'git notes merge --commit' ou aborte a integração "
+"com 'git notes merge --abort'.\n"
+
+#: builtin/notes.c:885
#, c-format
msgid "Object %s has no note\n"
msgstr "O objeto %s não tem nenhuma nota\n"
-#: builtin/notes.c:896
+#: builtin/notes.c:897
msgid "attempt to remove non-existent note is not an error"
msgstr "não considerar como erro a remoção de uma nota não existente"
-#: builtin/notes.c:899
+#: builtin/notes.c:900
msgid "read object names from the standard input"
msgstr "ler nome dos objetos da entrada padrão"
-#: builtin/notes.c:980
+#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+msgid "do not remove, show only"
+msgstr "não remover, mostrar apenas"
+
+#: builtin/notes.c:939
+msgid "report pruned notes"
+msgstr "reportar notas podadas"
+
+#: builtin/notes.c:981
msgid "notes-ref"
msgstr "notes-ref"
-#: builtin/notes.c:981
+#: builtin/notes.c:982
msgid "use notes from <notes-ref>"
msgstr "usar notas de <notes-ref>"
-#: builtin/notes.c:1016 builtin/remote.c:1628
+#: builtin/notes.c:1017 builtin/remote.c:1623
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Subcomando desconhecido: %s"
@@ -9081,182 +9513,186 @@ msgstr ""
"git pack-objects [<opções>...] <nome-base> [< <lista-referências> | < <lista-"
"objetos>]"
-#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
+#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
#, c-format
msgid "deflate error (%d)"
msgstr "erro ao compactar (%d)"
-#: builtin/pack-objects.c:763
+#: builtin/pack-objects.c:766
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-"a desativar escrita de mapa de bits, os pacotes são divididos devido a "
-"pack.packSizeLimit"
+"a desativar escrita de mapa de bits, os pacotes são divididos devido a pack."
+"packSizeLimit"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:779
msgid "Writing objects"
msgstr "A escrever objetos"
-#: builtin/pack-objects.c:1017
+#: builtin/pack-objects.c:1037
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"a desativar escrita de mapa de bits, visto que alguns objetos não estão a "
"ser compactados"
-#: builtin/pack-objects.c:2177
+#: builtin/pack-objects.c:2197
msgid "Compressing objects"
msgstr "A comprimir objetos"
-#: builtin/pack-objects.c:2563
+#: builtin/pack-objects.c:2611
#, c-format
msgid "unsupported index version %s"
msgstr "versão de índice %s não suportada"
-#: builtin/pack-objects.c:2567
+#: builtin/pack-objects.c:2615
#, c-format
msgid "bad index version '%s'"
msgstr "versão de índice '%s' incorreta"
-#: builtin/pack-objects.c:2597
+#: builtin/pack-objects.c:2645
msgid "do not show progress meter"
msgstr "não mostrar medidor de progresso"
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2647
msgid "show progress meter"
msgstr "mostrar medidor de progresso"
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2649
msgid "show progress meter during object writing phase"
msgstr "mostrar medidor de progresso durante a fase de escrita de objetos"
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2652
msgid "similar to --all-progress when progress meter is shown"
msgstr "semelhante a --all-progress quando o medidor de progresso é mostrado"
-#: builtin/pack-objects.c:2605
+#: builtin/pack-objects.c:2653
msgid "version[,offset]"
msgstr "versão[,offset]"
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2654
msgid "write the pack index file in the specified idx format version"
msgstr ""
"escrever o ficheiro de índice do pacote na versão de formato especificada"
-#: builtin/pack-objects.c:2609
+#: builtin/pack-objects.c:2657
msgid "maximum size of each output pack file"
msgstr "tamanho máximo de cada ficheiro de pacote gerado"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2659
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorar objetos emprestados do arquivo de objetos sobressalentes"
-#: builtin/pack-objects.c:2613
+#: builtin/pack-objects.c:2661
msgid "ignore packed objects"
msgstr "ignorar objetos compactados"
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2663
msgid "limit pack window by objects"
msgstr "limitar a janela de compactação por objetos"
-#: builtin/pack-objects.c:2617
+#: builtin/pack-objects.c:2665
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"limitar a janela de compactação por memória em adição ao limite por objetos"
-#: builtin/pack-objects.c:2619
+#: builtin/pack-objects.c:2667
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "tamanho máximo de cadeias delta permitidas no pacote resultante"
-#: builtin/pack-objects.c:2621
+#: builtin/pack-objects.c:2669
msgid "reuse existing deltas"
msgstr "reutilizar deltas existentes"
-#: builtin/pack-objects.c:2623
+#: builtin/pack-objects.c:2671
msgid "reuse existing objects"
msgstr "reutilizar objetos existentes"
-#: builtin/pack-objects.c:2625
+#: builtin/pack-objects.c:2673
msgid "use OFS_DELTA objects"
msgstr "usar objetos OFS_DELTA"
-#: builtin/pack-objects.c:2627
+#: builtin/pack-objects.c:2675
msgid "use threads when searching for best delta matches"
msgstr "usar threads ao procurar pela melhor correspondência delta"
-#: builtin/pack-objects.c:2629
+#: builtin/pack-objects.c:2677
msgid "do not create an empty pack output"
msgstr "não criar um pacote vazio"
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2679
msgid "read revision arguments from standard input"
msgstr "ler argumentos de revisão da entrada padrão"
-#: builtin/pack-objects.c:2633
+#: builtin/pack-objects.c:2681
msgid "limit the objects to those that are not yet packed"
msgstr "restringir-se aos objetos que ainda não foram compactados"
-#: builtin/pack-objects.c:2636
+#: builtin/pack-objects.c:2684
msgid "include objects reachable from any reference"
msgstr "incluir objetos alcançáveis a partir de qualquer referência"
-#: builtin/pack-objects.c:2639
+#: builtin/pack-objects.c:2687
msgid "include objects referred by reflog entries"
msgstr "incluir objetos referenciados por entradas do reflog"
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2690
msgid "include objects referred to by the index"
msgstr "incluir objetos referenciados pelo índice"
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2693
msgid "output pack to stdout"
msgstr "gerar pacote para a saída padrão"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2695
msgid "include tag objects that refer to objects to be packed"
msgstr "incluir objetos tag que refiram objetos a compactar"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2697
msgid "keep unreachable objects"
msgstr "manter objetos inalcançáveis"
-#: builtin/pack-objects.c:2650 parse-options.h:142
+#: builtin/pack-objects.c:2699
+msgid "pack loose unreachable objects"
+msgstr "empacotar objetos soltos inalcançáveis"
+
+#: builtin/pack-objects.c:2700 parse-options.h:142
msgid "time"
msgstr "hora"
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2701
msgid "unpack unreachable objects newer than <time>"
msgstr "descompactar objetos inalcançáveis mais recentes que <hora>"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2704
msgid "create thin packs"
msgstr "criar pacotes finos"
-#: builtin/pack-objects.c:2656
+#: builtin/pack-objects.c:2706
msgid "create packs suitable for shallow fetches"
msgstr "criar pacotes adequados para obter em repositórios pouco profundos"
-#: builtin/pack-objects.c:2658
+#: builtin/pack-objects.c:2708
msgid "ignore packs that have companion .keep file"
msgstr "ignorar pacotes que tenham um ficheiro .keep"
-#: builtin/pack-objects.c:2660
+#: builtin/pack-objects.c:2710
msgid "pack compression level"
msgstr "nível de compactação do pacote"
-#: builtin/pack-objects.c:2662
+#: builtin/pack-objects.c:2712
msgid "do not hide commits by grafts"
msgstr "não esconder commits introduzidos por enxertos"
-#: builtin/pack-objects.c:2664
+#: builtin/pack-objects.c:2714
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"usar um índice de mapa de bits se disponível, para acelerar a contagem de "
"objetos"
-#: builtin/pack-objects.c:2666
+#: builtin/pack-objects.c:2716
msgid "write a bitmap index together with the pack index"
msgstr "escrever um índice de mapa de bits juntamente com o índice do pacote"
-#: builtin/pack-objects.c:2757
+#: builtin/pack-objects.c:2829
msgid "Counting objects"
msgstr "A contar objetos"
@@ -9284,15 +9720,11 @@ msgstr "A remover objetos duplicados"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <hora>] [--] [<head>...]"
-#: builtin/prune.c:105 builtin/worktree.c:125
-msgid "do not remove, show only"
-msgstr "não remover, mostrar apenas"
-
-#: builtin/prune.c:106 builtin/worktree.c:126
+#: builtin/prune.c:106 builtin/worktree.c:128
msgid "report pruned objects"
msgstr "apresentar objetos eliminados"
-#: builtin/prune.c:109 builtin/worktree.c:128
+#: builtin/prune.c:109 builtin/worktree.c:130
msgid "expire objects older than <time>"
msgstr "expirar objetos mais antigos que <hora>"
@@ -9312,14 +9744,10 @@ msgstr "Opções relativas a integração"
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporar alterações por rebase em vez de integrar"
-#: builtin/pull.c:147 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "permitir avanço rápido"
-#: builtin/pull.c:153
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "verificar se o commit tem uma assinatura GPG válida"
-
#: builtin/pull.c:156
msgid "automatically stash/stash pop before and after rebase"
msgstr "empilhar/desempilhar automaticamente antes de depois de rebase"
@@ -9337,15 +9765,15 @@ msgstr "número de submódulos puxados em paralelo"
msgid "Invalid value for pull.ff: %s"
msgstr "Valor inválido de pull.ff: %s"
-#: builtin/pull.c:379
+#: builtin/pull.c:379 git-sh-setup.sh:226
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr "Não é possível puxar com rebase: tem alterações não preparadas."
-#: builtin/pull.c:385
+#: builtin/pull.c:385 git-sh-setup.sh:252
msgid "Additionally, your index contains uncommitted changes."
msgstr "Além disso, o índice contém alterações não submetidas."
-#: builtin/pull.c:387
+#: builtin/pull.c:387 git-sh-setup.sh:245
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
"Não é possível puxar com rebase: o índice contém alterações não submetidas."
@@ -9405,7 +9833,7 @@ msgstr "Consulte git-pull(1) para obter mais detalhes."
msgid "<remote>"
msgstr "<remoto>"
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<ramo>"
@@ -9430,17 +9858,21 @@ msgstr ""
"A configuração indica para integrar com a referência '%s'\n"
"do remoto, mas aquela referência não foi obtida."
-#: builtin/pull.c:864
+#: builtin/pull.c:820
+msgid "ignoring --verify-signatures for rebase"
+msgstr "ignorado --verify-signatures para rebase"
+
+#: builtin/pull.c:867
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "a opção --[no-]autostash só é válida com --rebase."
-#: builtin/pull.c:872
+#: builtin/pull.c:875
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"A atualizar um ramo que ainda não foi criado e com alterações adicionadas ao "
"índice."
-#: builtin/pull.c:900
+#: builtin/pull.c:903
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -9451,7 +9883,7 @@ msgstr ""
"a avançar a árvore de trabalho a partir do\n"
"commit %s."
-#: builtin/pull.c:905
+#: builtin/pull.c:908
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -9468,11 +9900,11 @@ msgstr ""
"$ git reset --hard\n"
"para recuperar."
-#: builtin/pull.c:920
+#: builtin/pull.c:923
msgid "Cannot merge multiple branches into empty head."
msgstr "Não é possível integrar múltiplos ramos numa cabeça vazia."
-#: builtin/pull.c:924
+#: builtin/pull.c:927
msgid "Cannot rebase onto multiple branches."
msgstr "Não é possível efetuar rebase sobre múltiplos ramos."
@@ -9635,12 +10067,12 @@ msgstr "A publicar em %s\n"
msgid "failed to push some refs to '%s'"
msgstr "falha ao publicar algumas referências em '%s'"
-#: builtin/push.c:365
+#: builtin/push.c:366
#, c-format
msgid "bad repository '%s'"
msgstr "repositório '%s' incorreto"
-#: builtin/push.c:366
+#: builtin/push.c:367
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -9662,113 +10094,125 @@ msgstr ""
"\n"
" git push <nome>\n"
-#: builtin/push.c:381
+#: builtin/push.c:385
msgid "--all and --tags are incompatible"
msgstr "--all e --tags são incompatíveis"
-#: builtin/push.c:382
+#: builtin/push.c:386
msgid "--all can't be combined with refspecs"
msgstr "--all não pode ser combinado com especificadores de referências"
-#: builtin/push.c:387
+#: builtin/push.c:391
msgid "--mirror and --tags are incompatible"
msgstr "--mirror e --tags são incompatíveis"
-#: builtin/push.c:388
+#: builtin/push.c:392
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror não pode ser combinado com especificadores de referências"
-#: builtin/push.c:393
+#: builtin/push.c:397
msgid "--all and --mirror are incompatible"
msgstr "--all e --mirror são incompatíveis"
-#: builtin/push.c:505
+#: builtin/push.c:515
msgid "repository"
msgstr "repositório"
-#: builtin/push.c:506 builtin/send-pack.c:161
+#: builtin/push.c:516 builtin/send-pack.c:161
msgid "push all refs"
msgstr "publicar todas as referências"
-#: builtin/push.c:507 builtin/send-pack.c:163
+#: builtin/push.c:517 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "replicar todas as referências"
-#: builtin/push.c:509
+#: builtin/push.c:519
msgid "delete refs"
msgstr "eliminar referências"
-#: builtin/push.c:510
+#: builtin/push.c:520
msgid "push tags (can't be used with --all or --mirror)"
msgstr "publicar tags (não pode ser usado com --all ou --mirror)"
-#: builtin/push.c:513 builtin/send-pack.c:164
+#: builtin/push.c:523 builtin/send-pack.c:164
msgid "force updates"
msgstr "forçar atualização"
-#: builtin/push.c:515 builtin/send-pack.c:175
+#: builtin/push.c:525 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "nome da referência>:<esperado"
-#: builtin/push.c:516 builtin/send-pack.c:176
+#: builtin/push.c:526 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "exigir que o antigo valor da referência tenha este valor"
-#: builtin/push.c:519
+#: builtin/push.c:529
msgid "control recursive pushing of submodules"
msgstr "controlar a publicação recursiva de submódulos"
-#: builtin/push.c:521 builtin/send-pack.c:169
+#: builtin/push.c:531 builtin/send-pack.c:169
msgid "use thin pack"
msgstr "usar pacote fino"
-#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
+#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "programa receive pack"
-#: builtin/push.c:524
+#: builtin/push.c:534
msgid "set upstream for git pull/status"
msgstr "definir o ramo a montante usado com git pull/status"
-#: builtin/push.c:527
+#: builtin/push.c:537
msgid "prune locally removed refs"
msgstr "eliminar referências removidas localmente"
-#: builtin/push.c:529
+#: builtin/push.c:539
msgid "bypass pre-push hook"
msgstr "ignorar pre-push hook"
-#: builtin/push.c:530
+#: builtin/push.c:540
msgid "push missing but relevant tags"
msgstr "publicar tags perdidas mas relevantes"
-#: builtin/push.c:533 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "assinar publicação com GPG"
-#: builtin/push.c:535 builtin/send-pack.c:170
+#: builtin/push.c:545 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "solicitar transação atómica no servidor remoto"
-#: builtin/push.c:549
+#: builtin/push.c:546
+msgid "server-specific"
+msgstr "específico do servidor"
+
+#: builtin/push.c:546
+msgid "option to transmit"
+msgstr "opção para transmitir"
+
+#: builtin/push.c:560
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete é incompatível com --all, --mirror e --tags"
-#: builtin/push.c:551
+#: builtin/push.c:562
msgid "--delete doesn't make sense without any refs"
msgstr "--delete não faz sentido sem uma referência"
+#: builtin/push.c:579
+msgid "push options must not have new line characters"
+msgstr "as opções de publicação não podem ter carateres de nova linha"
+
#: builtin/read-tree.c:37
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefixo>)"
-" [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] "
-"[--index-output=<ficheiro>] (--empty | <árvore-etc1> [<árvore-etc2> [<árvore-"
-"etc3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<prefixo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-"
+"sparse-checkout] [--index-output=<ficheiro>] (--empty | <árvore-etc1> "
+"[<árvore-etc2> [<árvore-etc3>]])"
#: builtin/read-tree.c:110
msgid "write resulting index to <file>"
@@ -9840,11 +10284,11 @@ msgstr "depurar unpack-trees"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:1719
+#: builtin/receive-pack.c:1843
msgid "quiet"
msgstr "silencioso"
-#: builtin/receive-pack.c:1733
+#: builtin/receive-pack.c:1857
msgid "You must specify a directory."
msgstr "Deve especificar um diretório."
@@ -9867,8 +10311,8 @@ msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
msgstr ""
-"git remote add [-t <ramo>] [-m <mestre>] [-f] [--tags | --no-tags] "
-"[--mirror=<fetch|push>] <nome> <url>"
+"git remote add [-t <ramo>] [-m <mestre>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <nome> <url>"
#: builtin/remote.c:14 builtin/remote.c:34
msgid "git remote rename <old> <new>"
@@ -9994,12 +10438,12 @@ msgstr "especificar um ramo mestre não faz sentido com --mirror"
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "especificar ramos para seguir só faz sentido com fetch mirrors"
-#: builtin/remote.c:190 builtin/remote.c:633
+#: builtin/remote.c:190 builtin/remote.c:629
#, c-format
msgid "remote %s already exists."
msgstr "o remoto %s já existe."
-#: builtin/remote.c:194 builtin/remote.c:637
+#: builtin/remote.c:194 builtin/remote.c:633
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' não é um nome de remoto válido"
@@ -10023,18 +10467,18 @@ msgstr "(correspondente)"
msgid "(delete)"
msgstr "(eliminado)"
-#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
#, c-format
msgid "No such remote: %s"
msgstr "Remoto inexistente: %s"
-#: builtin/remote.c:643
+#: builtin/remote.c:639
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr ""
"Não foi possível mudar o nome da secção de configuração de '%s' para '%s'"
-#: builtin/remote.c:663
+#: builtin/remote.c:659
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -10046,17 +10490,17 @@ msgstr ""
"\t%s\n"
"\tAtualize a configuração manualmente se necessário."
-#: builtin/remote.c:699
+#: builtin/remote.c:695
#, c-format
msgid "deleting '%s' failed"
msgstr "falha ao eliminar '%s'"
-#: builtin/remote.c:733
+#: builtin/remote.c:729
#, c-format
msgid "creating '%s' failed"
msgstr "falha ao criar '%s'"
-#: builtin/remote.c:796
+#: builtin/remote.c:792
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -10070,284 +10514,293 @@ msgstr[1] ""
"Nota: alguns ramos fora da hierarquia refs/remotes/ não foram removidos;\n"
"para os remover, use:"
-#: builtin/remote.c:810
+#: builtin/remote.c:806
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Não foi possível remover a secção de configuração '%s'"
-#: builtin/remote.c:911
+#: builtin/remote.c:907
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " novo (os próxima objetos obtidos serão guardados em remotes/%s)"
-#: builtin/remote.c:914
+#: builtin/remote.c:910
msgid " tracked"
msgstr " seguido"
-#: builtin/remote.c:916
+#: builtin/remote.c:912
msgid " stale (use 'git remote prune' to remove)"
msgstr " obsoleto (use 'git remote prune' para remover)"
-#: builtin/remote.c:918
+#: builtin/remote.c:914
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:959
+#: builtin/remote.c:955
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-"branch.%s.merge inválido; não é possível realizar rebase sobre mais do que "
-"um ramo"
+"branch.%s.merge inválido; não é possível rebasear sobre mais do que um ramo"
-#: builtin/remote.c:967
+#: builtin/remote.c:963
#, c-format
msgid "rebases interactively onto remote %s"
-msgstr "realiza rebase interativo sobre %s do remoto"
+msgstr "rebaseia interativamente sobre %s do remoto"
-#: builtin/remote.c:971
+#: builtin/remote.c:964
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "rebaseia sobre %s do remoto"
+
+#: builtin/remote.c:967
#, c-format
msgid " merges with remote %s"
msgstr " integra com %s do remoto"
-#: builtin/remote.c:972
-msgid " and with remote"
-msgstr " e com o remoto"
-
-#: builtin/remote.c:974
+#: builtin/remote.c:970
#, c-format
msgid "merges with remote %s"
msgstr "integra com %s do remoto"
-#: builtin/remote.c:975
-msgid " and with remote"
-msgstr " e com o remoto"
+#: builtin/remote.c:973
+#, c-format
+msgid "%-*s and with remote %s\n"
+msgstr "%-*s e com o %s do remoto\n"
-#: builtin/remote.c:1021
+#: builtin/remote.c:1016
msgid "create"
msgstr "criado"
-#: builtin/remote.c:1024
+#: builtin/remote.c:1019
msgid "delete"
msgstr "eliminado"
-#: builtin/remote.c:1028
+#: builtin/remote.c:1023
msgid "up to date"
msgstr "atualizado"
-#: builtin/remote.c:1031
+#: builtin/remote.c:1026
msgid "fast-forwardable"
msgstr "pode ser avançado rapidamente"
-#: builtin/remote.c:1034
+#: builtin/remote.c:1029
msgid "local out of date"
msgstr "local desatualizado"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1036
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s força em %-*s (%s)"
-#: builtin/remote.c:1044
+#: builtin/remote.c:1039
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s publica em %-*s (%s)"
-#: builtin/remote.c:1048
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s força em %s"
-#: builtin/remote.c:1051
+#: builtin/remote.c:1046
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s publica em %s"
-#: builtin/remote.c:1119
+#: builtin/remote.c:1114
msgid "do not query remotes"
msgstr "não consultar remotos"
-#: builtin/remote.c:1146
+#: builtin/remote.c:1141
#, c-format
msgid "* remote %s"
msgstr "* remoto %s"
-#: builtin/remote.c:1147
+#: builtin/remote.c:1142
#, c-format
msgid " Fetch URL: %s"
msgstr " Obter do URL: %s"
-#: builtin/remote.c:1148 builtin/remote.c:1301
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
msgid "(no URL)"
msgstr "(nenhum URL)"
#. TRANSLATORS: the colon ':' should align with
#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1159 builtin/remote.c:1161
+#: builtin/remote.c:1154 builtin/remote.c:1156
#, c-format
msgid " Push URL: %s"
msgstr " Publicar no URL: %s"
-#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
+#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
#, c-format
msgid " HEAD branch: %s"
msgstr " Ramo HEAD: %s"
-#: builtin/remote.c:1169
+#: builtin/remote.c:1158
+msgid "(not queried)"
+msgstr "(não consultado)"
+
+#: builtin/remote.c:1160
+msgid "(unknown)"
+msgstr "(desconhecido)"
+
+#: builtin/remote.c:1164
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " Ramo HEAD (o remoto HEAD é ambíguo, pode ser um dos seguintes):\n"
-#: builtin/remote.c:1181
+#: builtin/remote.c:1176
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Ramo remoto:%s"
msgstr[1] " Ramos remotos:%s"
-#: builtin/remote.c:1184 builtin/remote.c:1211
+#: builtin/remote.c:1179 builtin/remote.c:1206
msgid " (status not queried)"
msgstr " (estado não consultado)"
-#: builtin/remote.c:1193
+#: builtin/remote.c:1188
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Ramo local configurado para 'git pull':"
msgstr[1] " Ramos locais configurados para 'git pull':"
-#: builtin/remote.c:1201
+#: builtin/remote.c:1196
msgid " Local refs will be mirrored by 'git push'"
msgstr " Referências locais serão refletidas (mirror) por 'git push'"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1203
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Referência local configurada para 'git push'%s:"
msgstr[1] " Referências locais configuradas para 'git push'%s:"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1224
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "definir refs/remotes/<nome>/HEAD de acordo com o remoto"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1226
msgid "delete refs/remotes/<name>/HEAD"
msgstr "eliminar refs/remotes/<nome>/HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1241
msgid "Cannot determine remote HEAD"
msgstr "Não é possível determinar o remoto HEAD"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1243
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Múltiplos ramos HEAD remotos. Escolha um explicitamente com:"
-#: builtin/remote.c:1258
+#: builtin/remote.c:1253
#, c-format
msgid "Could not delete %s"
msgstr "Não foi possível eliminar %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1261
#, c-format
msgid "Not a valid ref: %s"
msgstr "Referência inválida: %s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1263
#, c-format
msgid "Could not setup %s"
msgstr "Não foi possível configurar %s"
-#: builtin/remote.c:1286
+#: builtin/remote.c:1281
#, c-format
msgid " %s will become dangling!"
msgstr " %s ficará suspenso!"
-#: builtin/remote.c:1287
+#: builtin/remote.c:1282
#, c-format
msgid " %s has become dangling!"
msgstr " %s ficou suspenso!"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1292
#, c-format
msgid "Pruning %s"
msgstr "A eliminar %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1293
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1309
#, c-format
msgid " * [would prune] %s"
msgstr " * [eliminaria] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1312
#, c-format
msgid " * [pruned] %s"
msgstr " * [eliminado] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1357
msgid "prune remotes after fetching"
msgstr "eliminar remotos depois de obter"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
#, c-format
msgid "No such remote '%s'"
msgstr "Remoto inexistente '%s'"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1436
msgid "add branch"
msgstr "adicionar ramo"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1443
msgid "no remote specified"
msgstr "nenhum remoto especificado"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1460
msgid "query push URLs rather than fetch URLs"
msgstr "consultar URLs de publicação em vez de URLs utilizados para obter"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1462
msgid "return all URLs"
msgstr "retornar todos os URLs"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1490
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "o remoto '%s' não tem nenhum URL configurado"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1516
msgid "manipulate push URLs"
msgstr "manipular URLs de publicação"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1518
msgid "add URL"
msgstr "adicionar URL"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1520
msgid "delete URLs"
msgstr "eliminar URLs"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1527
msgid "--add --delete doesn't make sense"
msgstr "--add --delete não faz sentido"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1568
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Padrão de URL antigo inválido: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1576
#, c-format
msgid "No such URL found: %s"
msgstr "URL não encontrado: %s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1578
msgid "Will not delete all non-push URLs"
msgstr "Não é possível remover todos os URLs de não publicação"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1592
msgid "be verbose; must be placed before a subcommand"
msgstr "ser verboso; deve ser colocado antes de um subcomando"
@@ -10355,79 +10808,87 @@ msgstr "ser verboso; deve ser colocado antes de um subcomando"
msgid "git repack [<options>]"
msgstr "git repack [<opções>]"
-#: builtin/repack.c:159
+#: builtin/repack.c:160
msgid "pack everything in a single pack"
msgstr "compactar tudo num único pacote"
-#: builtin/repack.c:161
+#: builtin/repack.c:162
msgid "same as -a, and turn unreachable objects loose"
msgstr "o mesmo que -a, e soltar objetos inalcançáveis"
-#: builtin/repack.c:164
+#: builtin/repack.c:165
msgid "remove redundant packs, and run git-prune-packed"
msgstr "remover pacotes redundantes e executar git-prune-packed"
-#: builtin/repack.c:166
+#: builtin/repack.c:167
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "passar --no-reuse-delta ao git-pack-objects"
-#: builtin/repack.c:168
+#: builtin/repack.c:169
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "passar --no-reuse-object ao git-pack-objects"
-#: builtin/repack.c:170
+#: builtin/repack.c:171
msgid "do not run git-update-server-info"
msgstr "não executar git-update-server-info"
-#: builtin/repack.c:173
+#: builtin/repack.c:174
msgid "pass --local to git-pack-objects"
msgstr "passar --local ao git-pack-objects"
-#: builtin/repack.c:175
+#: builtin/repack.c:176
msgid "write bitmap index"
msgstr "escrever índice de mapa de bits"
-#: builtin/repack.c:176
+#: builtin/repack.c:177
msgid "approxidate"
msgstr "aproximar"
-#: builtin/repack.c:177
+#: builtin/repack.c:178
msgid "with -A, do not loosen objects older than this"
msgstr "com -A, não soltar mais objetos além destes"
-#: builtin/repack.c:179
+#: builtin/repack.c:180
+msgid "with -a, repack unreachable objects"
+msgstr "com -a, reempacotar objetos inalcançáveis"
+
+#: builtin/repack.c:182
msgid "size of the window used for delta compression"
msgstr "dimensão da janela usada em compressão de deltas"
-#: builtin/repack.c:180 builtin/repack.c:184
+#: builtin/repack.c:183 builtin/repack.c:187
msgid "bytes"
msgstr "bytes"
-#: builtin/repack.c:181
+#: builtin/repack.c:184
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"o mesmo que o anterior, mas limitar a memória usada em vez do número de "
"entradas"
-#: builtin/repack.c:183
+#: builtin/repack.c:186
msgid "limits the maximum delta depth"
msgstr "limitar a profundidade máxima de delta"
-#: builtin/repack.c:185
+#: builtin/repack.c:188
msgid "maximum size of each packfile"
msgstr "tamanho máximo de cada ficheiro de pacote"
-#: builtin/repack.c:187
+#: builtin/repack.c:190
msgid "repack objects in packs marked with .keep"
msgstr "reempacotar objetos em pacotes marcados com .keep"
-#: builtin/repack.c:197
+#: builtin/repack.c:200
msgid "cannot delete packs in a precious-objects repo"
msgstr "não é possível eliminar pacotes num repositório de objetos-preciosos"
-#: builtin/repack.c:381
+#: builtin/repack.c:204
+msgid "--keep-unreachable and -A are incompatible"
+msgstr "--keep-unreachable e -A são incompatíveis"
+
+#: builtin/repack.c:391 builtin/worktree.c:115
#, c-format
-msgid "removing '%s' failed"
+msgid "failed to remove '%s'"
msgstr "falha ao remover '%s'"
#: builtin/replace.c:19
@@ -10652,7 +11113,7 @@ msgstr "Não foi possível repor o ficheiro índice para a revisão '%s'."
msgid "Could not write new index file."
msgstr "Não foi possível escrever novo ficheiro de índice."
-#: builtin/rev-list.c:350
+#: builtin/rev-list.c:362
msgid "rev-list does not support display of notes"
msgstr "rev-list não suporta apresentação de notas"
@@ -10744,31 +11205,27 @@ msgstr "opção"
msgid "option for merge strategy"
msgstr "opção de estratégia de integração"
-#: builtin/revert.c:104
+#: builtin/revert.c:100
msgid "append commit name"
msgstr "acrescentar nome do commit"
-#: builtin/revert.c:106
+#: builtin/revert.c:102
msgid "preserve initially empty commits"
msgstr "preservar commits inicialmente vazios"
-#: builtin/revert.c:107
+#: builtin/revert.c:103
msgid "allow commits with empty messages"
msgstr "permitir commits com mensagens vazias"
-#: builtin/revert.c:108
+#: builtin/revert.c:104
msgid "keep redundant, empty commits"
msgstr "manter commits redundantes e vazios"
-#: builtin/revert.c:112
-msgid "program error"
-msgstr "erro do programa"
-
-#: builtin/revert.c:197
+#: builtin/revert.c:192
msgid "revert failed"
msgstr "falha ao reverter"
-#: builtin/revert.c:212
+#: builtin/revert.c:207
msgid "cherry-pick failed"
msgstr "falha ao efetuar cherry-pick"
@@ -10901,7 +11358,8 @@ msgstr "imprimir estado do programa auxiliar remoto"
#: builtin/shortlog.c:13
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
-msgstr "git shortlog [<opções>] [<intervalo-de-revisões>] [[--] [<caminho>...]]"
+msgstr ""
+"git shortlog [<opções>] [<intervalo-de-revisões>] [[--] [<caminho>...]]"
#: builtin/shortlog.c:242
msgid "sort output according to the number of commits per author"
@@ -11009,8 +11467,8 @@ msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgstr ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | "
-"--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<padrão>...]"
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<padrão>...]"
#: builtin/show-ref.c:11
msgid "git show-ref --exclude-existing[=<pattern>]"
@@ -11067,12 +11525,12 @@ msgstr ""
msgid "prepend comment character and space to each line"
msgstr "preceder cada linha com um carácter de comentário e um espaço"
-#: builtin/submodule--helper.c:24
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923
#, c-format
msgid "No such ref: %s"
msgstr "Referência inexistente: %s"
-#: builtin/submodule--helper.c:31
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Esperava-se um nome completo de uma referência, obteve-se %s"
@@ -11082,8 +11540,8 @@ msgstr "Esperava-se um nome completo de uma referência, obteve-se %s"
msgid "cannot strip one component off url '%s'"
msgstr "não é possível tirar um componente do URL '%s'"
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
-#: builtin/submodule--helper.c:486
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
+#: builtin/submodule--helper.c:483
msgid "alternative anchor for relative paths"
msgstr "âncora alternativa para caminhos relativos"
@@ -11091,66 +11549,66 @@ msgstr "âncora alternativa para caminhos relativos"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Nenhum URL encontrado para o caminho de submódulo '%s' em .gitmodules"
-#: builtin/submodule--helper.c:366
+#: builtin/submodule--helper.c:364
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Falha ao registar o URL do caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:370
+#: builtin/submodule--helper.c:368
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submódulo '%s' (%s) registado com caminho '%s'\n"
-#: builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:378
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "aviso: modo de atualização do comando sugerido para o submódulo '%s'\n"
-#: builtin/submodule--helper.c:387
+#: builtin/submodule--helper.c:385
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:404
msgid "Suppress output for initializing a submodule"
msgstr "Suprimir a saída ao inicializar um submódulo"
-#: builtin/submodule--helper.c:411
+#: builtin/submodule--helper.c:409
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<caminho>]"
-#: builtin/submodule--helper.c:432
+#: builtin/submodule--helper.c:430
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <caminho>"
-#: builtin/submodule--helper.c:438
+#: builtin/submodule--helper.c:436
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"nenhum mapeamento de submódulo do caminho '%s' encontrado em .gitmodules"
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:486
msgid "where the new submodule will be cloned to"
msgstr "sítio para aonde o novo submódulo será clonado"
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:489
msgid "name of the new submodule"
msgstr "nome do novo submódulo"
-#: builtin/submodule--helper.c:495
+#: builtin/submodule--helper.c:492
msgid "url where to clone the submodule from"
msgstr "url donde clonar o submódulos"
-#: builtin/submodule--helper.c:501
+#: builtin/submodule--helper.c:498
msgid "depth for shallow clones"
msgstr "profundidade de clones rasos"
-#: builtin/submodule--helper.c:507
+#: builtin/submodule--helper.c:504
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -11158,89 +11616,112 @@ msgstr ""
"git submodule--helper clone [--prefix=<caminho>] [--quiet] [--reference "
"<repositório>] [--name <nome>] [--depth <depth>] --url <url> --path <caminho>"
-#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
+#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
#, c-format
msgid "could not create directory '%s'"
msgstr "não foi possível criar o diretório '%s'"
-#: builtin/submodule--helper.c:534
+#: builtin/submodule--helper.c:531
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:547
#, c-format
msgid "cannot open file '%s'"
msgstr "não é possível abrir o ficheiro '%s'"
-#: builtin/submodule--helper.c:555
+#: builtin/submodule--helper.c:552
#, c-format
msgid "could not close file %s"
msgstr "não é possível fechar o ficheiro %s"
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:559
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "não foi possível obter o diretório do submódulo de '%s'"
-#: builtin/submodule--helper.c:609
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Caminho de submódulo '%s' não inicializado"
-#: builtin/submodule--helper.c:613
+#: builtin/submodule--helper.c:615
msgid "Maybe you want to use 'update --init'?"
msgstr "Pretendia usar 'update --init'?"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:641
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "A ignorar submódulo %s não integrado"
-#: builtin/submodule--helper.c:660
+#: builtin/submodule--helper.c:662
#, c-format
msgid "Skipping submodule '%s'"
msgstr "A ignorar submódulo '%s'"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:792
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "Falha ao clonar '%s'. Nova tentativa agendada"
+
+#: builtin/submodule--helper.c:803
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "Falha ao clonar '%s' pela segunda vez, abortado"
+
+#: builtin/submodule--helper.c:824
msgid "path into the working tree"
msgstr "caminho para a árvore de trabalho"
-#: builtin/submodule--helper.c:771
+#: builtin/submodule--helper.c:827
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"caminho para a árvore de trabalho, atravessando limites de submódulos "
"aninhados"
-#: builtin/submodule--helper.c:775
+#: builtin/submodule--helper.c:831
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout ou none"
-#: builtin/submodule--helper.c:779
+#: builtin/submodule--helper.c:835
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "criar um clone raso, truncado ao número especificado de revisões"
-#: builtin/submodule--helper.c:782
+#: builtin/submodule--helper.c:838
msgid "parallel jobs"
msgstr "trabalhos em paralelo"
-#: builtin/submodule--helper.c:783
+#: builtin/submodule--helper.c:840
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "se o clone inicial deve seguir a recomendação rasa"
+
+#: builtin/submodule--helper.c:841
msgid "don't print cloning progress"
msgstr "não imprimir progresso da clonagem"
-#: builtin/submodule--helper.c:788
+#: builtin/submodule--helper.c:846
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:798
+#: builtin/submodule--helper.c:856
msgid "bad value for update parameter"
msgstr "valor incorreto no parâmetro update"
-#: builtin/submodule--helper.c:855
+#: builtin/submodule--helper.c:927
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+"O ramo do submódulo (%s) foi configurado para herdar o ramo do superprojeto, "
+"mas o superprojeto não está em nenhum ramo"
+
+#: builtin/submodule--helper.c:977
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "o subcomando submodule--helper deve ser invocado com um subcomando"
-#: builtin/submodule--helper.c:862
+#: builtin/submodule--helper.c:984
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' não é um subcomando válido de submodule--helper"
@@ -11590,14 +12071,6 @@ msgstr "<modo>,<objeto>,<caminho>"
msgid "add the specified entry to the index"
msgstr "adicionar o elemento especificado ao índice"
-#: builtin/update-index.c:958
-msgid "(+/-)x"
-msgstr "(+/-)x"
-
-#: builtin/update-index.c:959
-msgid "override the executable bit of the listed files"
-msgstr "substituir o bit executável dos ficheiros listados"
-
#: builtin/update-index.c:963
msgid "mark files as \"not changing\""
msgstr "marcar ficheiros como \"não alterados\""
@@ -11708,8 +12181,7 @@ msgstr "eliminar a referência"
#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr ""
-"atualizar a referência <nome-da-referência>, e não a referência aponta por "
-"esta"
+"atualizar a referência <nome-da-referência>, não a referência que esta aponta"
#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
@@ -11764,85 +12236,112 @@ msgid "git worktree add [<options>] <path> [<branch>]"
msgstr "git worktree add [<opções>] <caminho> [<ramo>]"
#: builtin/worktree.c:16
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<opções>]"
+
+#: builtin/worktree.c:17
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<opções>] <caminho>"
+
+#: builtin/worktree.c:18
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<opções>]"
-#: builtin/worktree.c:17
-msgid "git worktree list [<options>]"
-msgstr "git worktree list [<opções>]"
+#: builtin/worktree.c:19
+msgid "git worktree unlock <path>"
+msgstr "git worktree unlock <caminho>"
-#: builtin/worktree.c:40
+#: builtin/worktree.c:42
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "A remover worktrees/%s: diretório inválido"
-#: builtin/worktree.c:46
+#: builtin/worktree.c:48
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "A remover worktrees/%s: o ficheiro gitdir não existe"
-#: builtin/worktree.c:51
+#: builtin/worktree.c:53
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "A remover worktrees/%s: não é possível ler o ficheiro gitdir (%s)"
-#: builtin/worktree.c:62
+#: builtin/worktree.c:64
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "A remover worktrees/%s: ficheiro gitdir inválido"
-#: builtin/worktree.c:78
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"A remover worktrees/%s: o ficheiro gitdir aponta para uma localização "
"inexistente"
-#: builtin/worktree.c:113
-#, c-format
-msgid "failed to remove '%s'"
-msgstr "falha ao remover '%s'"
-
-#: builtin/worktree.c:202
+#: builtin/worktree.c:204
#, c-format
msgid "'%s' already exists"
msgstr "'%s' já existe"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:236
#, c-format
msgid "could not create directory of '%s'"
msgstr "não foi possível criar o diretório de '%s'"
-#: builtin/worktree.c:270
+#: builtin/worktree.c:272
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "A preparar %s (identificador %s)"
-#: builtin/worktree.c:322
+#: builtin/worktree.c:323
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"extrair o <ramo> mesmo se já tenha sido extraído noutra árvore de trabalho"
-#: builtin/worktree.c:324
+#: builtin/worktree.c:325
msgid "create a new branch"
msgstr "criar um novo ramo"
-#: builtin/worktree.c:326
+#: builtin/worktree.c:327
msgid "create or reset a branch"
msgstr "criar ou repor um ramo"
-#: builtin/worktree.c:327
-msgid "detach HEAD at named commit"
-msgstr "destacar HEAD no commit indicado"
-
-#: builtin/worktree.c:328
+#: builtin/worktree.c:329
msgid "populate the new working tree"
msgstr "povoar a nova árvore de trabalho"
-#: builtin/worktree.c:336
+#: builtin/worktree.c:337
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B e --detach são mutuamente exclusivos"
+#: builtin/worktree.c:470
+msgid "reason for locking"
+msgstr "razão de trancar"
+
+#: builtin/worktree.c:482 builtin/worktree.c:515
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr "'%s' não é uma árvore de trabalho"
+
+#: builtin/worktree.c:484 builtin/worktree.c:517
+msgid "The main working tree cannot be locked or unlocked"
+msgstr "A árvore de trabalho principal não pode ser trancada nem destrancada"
+
+#: builtin/worktree.c:489
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "'%s' já está trancada, razão: %s"
+
+#: builtin/worktree.c:491
+#, c-format
+msgid "'%s' is already locked"
+msgstr "'%s' já está trancada"
+
+#: builtin/worktree.c:519
+#, c-format
+msgid "'%s' is not locked"
+msgstr "'%s' não está trancada"
+
#: builtin/write-tree.c:13
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<prefixo>/]"
@@ -11859,6 +12358,26 @@ msgstr "escrever objeto árvore do subdiretório <prefixo>"
msgid "only useful for debugging"
msgstr "apenas útil para depuração"
+#: upload-pack.c:20
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<opções>] <dir>"
+
+#: upload-pack.c:837
+msgid "quit after a single request/response exchange"
+msgstr "terminar depois de uma única troca de pedido/resposta"
+
+#: upload-pack.c:839
+msgid "exit immediately after initial ref advertisement"
+msgstr "sair imediatamente depois do anúncio inicial da referência"
+
+#: upload-pack.c:841
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "não tentar <diretório>/.git/ se o <diretório> não for um diretório Git"
+
+#: upload-pack.c:843
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "interromper transferência depois de <n> segundos de inatividade"
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "imprimir mensagens de depuração no stderr"
@@ -11873,7 +12392,7 @@ msgstr ""
"guias de conceitos. Consulte 'git help <comando>' ou 'git help <conceito>'\n"
"para ler sobre um subcomando ou conceito específico."
-#: http.c:322
+#: http.c:323
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Não é suportado afixar chaves públicas com cURL < 7.44.0"
@@ -12007,58 +12526,60 @@ msgid "update the index with reused conflict resolution if possible"
msgstr ""
"atualizar o índice com resoluções de conflitos reutilizadas se possível"
-#: git-bisect.sh:55
+#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "Deve começar por executar \"git bisect start\""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:61
+#: git-bisect.sh:60
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Quer que o Git o faça por si [Y/n]? "
-#: git-bisect.sh:122
+#: git-bisect.sh:121
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "opção não reconhecida: '$arg'"
-#: git-bisect.sh:126
+#: git-bisect.sh:125
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "'$arg' não parecer ser uma revisão válida"
-#: git-bisect.sh:155
+#: git-bisect.sh:154
msgid "Bad HEAD - I need a HEAD"
msgstr "HEAD incorreta - é necessário uma HEAD"
-#: git-bisect.sh:168
+#: git-bisect.sh:167
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr "Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-válido>'."
+msgstr ""
+"Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-válido>'."
-#: git-bisect.sh:178
+#: git-bisect.sh:177
msgid "won't bisect on cg-seek'ed tree"
msgstr "não é possível bissetar numa árvore \"cg-seek'ed\""
-#: git-bisect.sh:182
+#: git-bisect.sh:181
msgid "Bad HEAD - strange symbolic ref"
msgstr "HEAD incorreta - referência simbólica desconhecida"
-#: git-bisect.sh:234
+#: git-bisect.sh:233
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "Argumento de bisect_write incorreto: $state"
-#: git-bisect.sh:263
+#: git-bisect.sh:262
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Revisão incorreta na entrada: $arg"
-#: git-bisect.sh:278
-msgid "Please call 'bisect_state' with at least one argument."
-msgstr "Invoque 'bisect_state' com pelo menos um argumento."
+#: git-bisect.sh:281
+#, sh-format
+msgid "Bad rev input: $bisected_head"
+msgstr "Revisão incorreta na entrada: $bisected_head"
#: git-bisect.sh:290
#, sh-format
@@ -12202,7 +12723,47 @@ msgstr ""
"argumento inválido $arg de 'git bisect terms'.\n"
"Opções suportadas: --term-good|--term-old e --term-bad|--term-new."
-#: git-rebase.sh:57
+#: git-merge-octopus.sh:46
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr ""
+"Erro: As suas alterações locais nos seguintes ficheiros seriam substituídas "
+"ao integrar"
+
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr "A integração automática não funcionou."
+
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an Octopus."
+msgstr "Não devia estar a fazer um Polvo."
+
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "Não é possível encontrar commit comum com $pretty_name"
+
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up-to-date with $pretty_name"
+msgstr "Já está atualizado com $pretty_name"
+
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "A avançar rapidamente para: $pretty_name"
+
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "A tentar integração simples com $pretty_name"
+
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
+msgstr "A integração simples não funcionou, a tentar integração automática."
+
+#: git-rebase.sh:56
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
@@ -12214,16 +12775,21 @@ msgstr ""
"Para extrair o ramo original e interromper o rebase, execute \"git rebase --"
"abort\"."
-#: git-rebase.sh:168
+#: git-rebase.sh:156 git-rebase.sh:395
+#, sh-format
+msgid "Could not move back to $head_name"
+msgstr "Não foi possível voltar para $head_name"
+
+#: git-rebase.sh:167
msgid "Applied autostash."
msgstr "Pilha automática (autostash) aplicada."
-#: git-rebase.sh:171
+#: git-rebase.sh:170
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Não é possível guardar $stash_sha1"
-#: git-rebase.sh:172
+#: git-rebase.sh:171
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
@@ -12233,27 +12799,27 @@ msgstr ""
"As suas alterações estão guardadas na pilha.\n"
"Pode executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n"
-#: git-rebase.sh:211
+#: git-rebase.sh:210
msgid "The pre-rebase hook refused to rebase."
msgstr "Rebase recusado pelo hook pre-rebase."
-#: git-rebase.sh:216
+#: git-rebase.sh:215
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Parece que o git-am está em curso. Não é possível efetuar rebase."
-#: git-rebase.sh:357
+#: git-rebase.sh:356
msgid "No rebase in progress?"
msgstr "Rebase não está em curso?"
-#: git-rebase.sh:368
+#: git-rebase.sh:367
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "A ação --edit-todo só pode ser usada durante um rebase interativo."
-#: git-rebase.sh:375
+#: git-rebase.sh:374
msgid "Cannot read HEAD"
msgstr "Não é possível ler HEAD"
-#: git-rebase.sh:378
+#: git-rebase.sh:377
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -12261,12 +12827,7 @@ msgstr ""
"Deve editar todos os conflitos da integração\n"
"e marcá-los como resolvidos usando git add"
-#: git-rebase.sh:396
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "Não foi possível voltar para $head_name"
-
-#: git-rebase.sh:415
+#: git-rebase.sh:414
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -12287,98 +12848,98 @@ msgstr ""
"e execute o comando de novo. A execução foi interrompida no caso de\n"
"ainda ter algo importante nesse sítio."
-#: git-rebase.sh:466
+#: git-rebase.sh:465
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "$upstream_name a montante inválido"
-#: git-rebase.sh:490
+#: git-rebase.sh:489
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: há mais do que uma base de integração"
-#: git-rebase.sh:493 git-rebase.sh:497
+#: git-rebase.sh:492 git-rebase.sh:496
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: não há nenhuma base de integração"
-#: git-rebase.sh:502
+#: git-rebase.sh:501
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Não aponta para um commit válido: $onto_name"
-#: git-rebase.sh:525
+#: git-rebase.sh:524
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal: ramo inexistente: $branch_name"
-#: git-rebase.sh:558
+#: git-rebase.sh:557
msgid "Cannot autostash"
msgstr "Não é possível empilhar automaticamente (autostash)"
-#: git-rebase.sh:563
+#: git-rebase.sh:562
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Pilha automática (autostash) criada: $stash_abbrev"
-#: git-rebase.sh:567
+#: git-rebase.sh:566
msgid "Please commit or stash them."
-msgstr "Submeta ou empilhe-as (stash)."
+msgstr "Submeta ou esconda-as."
-#: git-rebase.sh:587
+#: git-rebase.sh:586
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "O ramo atual $branch_name está atualizado."
-#: git-rebase.sh:591
+#: git-rebase.sh:590
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "O ramo atual $branch_name está atualizado, rebase forçado."
-#: git-rebase.sh:602
+#: git-rebase.sh:601
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Alterações de $mb para $onto:"
-#: git-rebase.sh:611
+#: git-rebase.sh:610
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Primeiro, a recuar a cabeça para replicar as suas alterações no topo desta..."
-#: git-rebase.sh:621
+#: git-rebase.sh:620
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name avançado rapidamente para $onto_name."
-#: git-stash.sh:51
+#: git-stash.sh:50
msgid "git stash clear with parameters is unimplemented"
msgstr "não está implementado git stash clear com parâmetros"
-#: git-stash.sh:74
+#: git-stash.sh:73
msgid "You do not have the initial commit yet"
msgstr "O commit inicial ainda não existe"
-#: git-stash.sh:89
+#: git-stash.sh:88
msgid "Cannot save the current index state"
msgstr "Não é possível guardar o estado atual do índice"
-#: git-stash.sh:124 git-stash.sh:137
+#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "Não é possível guardar o estado atual da árvore de trabalho"
-#: git-stash.sh:141
+#: git-stash.sh:140
msgid "No changes selected"
msgstr "Nenhuma alteração selecionada"
-#: git-stash.sh:144
+#: git-stash.sh:143
msgid "Cannot remove temporary index (can't happen)"
msgstr "Não é possível remover o índice temporário (não pode acontecer)"
-#: git-stash.sh:157
+#: git-stash.sh:156
msgid "Cannot record working tree state"
msgstr "Não é possível gravar o estado da árvore de trabalho"
-#: git-stash.sh:189
+#: git-stash.sh:188
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Não é possível atualizar $ref_stash com $w_commit"
@@ -12393,7 +12954,7 @@ msgstr "Não é possível atualizar $ref_stash com $w_commit"
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:239
+#: git-stash.sh:238
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -12402,110 +12963,119 @@ msgstr ""
"erro: opção desconhecida de 'stash save': $option\n"
" Para fornecer uma mensagem, use git stash save -- '$option'"
-#: git-stash.sh:260
+#: git-stash.sh:259
msgid "No local changes to save"
msgstr "Não há alterações locais para guardar"
-#: git-stash.sh:264
+#: git-stash.sh:263
msgid "Cannot initialize stash"
msgstr "Não é possível inicializar a pilha"
-#: git-stash.sh:268
+#: git-stash.sh:267
msgid "Cannot save the current status"
msgstr "Não é possível guardar o estado atual"
-#: git-stash.sh:286
+#: git-stash.sh:268
+#, sh-format
+msgid "Saved working directory and index state $stash_msg"
+msgstr "Diretório de trabalho e estado do índice $stash_msg guardados"
+
+#: git-stash.sh:285
msgid "Cannot remove worktree changes"
msgstr "Não é possível remover as alterações da árvore de trabalho"
-#: git-stash.sh:405
+#: git-stash.sh:404
#, sh-format
msgid "unknown option: $opt"
msgstr "opção desconhecido: $opt"
-#: git-stash.sh:415
+#: git-stash.sh:414
msgid "No stash found."
msgstr "Nenhuma pilha encontrada."
-#: git-stash.sh:422
+#: git-stash.sh:421
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Demasiadas revisões especificadas: $REV"
-#: git-stash.sh:428
+#: git-stash.sh:427
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference não é uma referência válida"
-#: git-stash.sh:456
+#: git-stash.sh:455
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' não é um commit semelhante a pilha"
-#: git-stash.sh:467
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' não é uma referência de pilha"
-#: git-stash.sh:475
+#: git-stash.sh:474
msgid "unable to refresh index"
msgstr "não foi possível refrescar o índice"
-#: git-stash.sh:479
+#: git-stash.sh:478
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Não é possível aplicar uma pilha durante uma integração"
-#: git-stash.sh:487
+#: git-stash.sh:486
msgid "Conflicts in index. Try without --index."
msgstr "Conflitos no índice. Tente sem --index."
-#: git-stash.sh:489
+#: git-stash.sh:488
msgid "Could not save index tree"
msgstr "Não foi possível guardar árvore do índice"
-#: git-stash.sh:523
+#: git-stash.sh:522
msgid "Cannot unstage modified files"
msgstr "Não é possível despreparar os ficheiros modificado"
-#: git-stash.sh:538
+#: git-stash.sh:537
msgid "Index was not unstashed."
msgstr "O índice não foi reposto."
-#: git-stash.sh:561
+#: git-stash.sh:551
+msgid "The stash is kept in case you need it again."
+msgstr "A pilha é guarda no caso de precisar dela de novo."
+
+#: git-stash.sh:560
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "A descartar ${REV} ($s)"
-#: git-stash.sh:562
+#: git-stash.sh:561
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Não foi possível descartar elemento da pilha"
-#: git-stash.sh:570
+#: git-stash.sh:569
msgid "No branch name specified"
msgstr "Nenhum nome de ramo especificado"
-#: git-stash.sh:642
+#: git-stash.sh:641
msgid "(To restore them type \"git stash apply\")"
msgstr "(Para os restaurar execute \"git stash apply\")"
-#: git-submodule.sh:219
+#: git-submodule.sh:183
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Os caminhos relativos só podem ser usados a partir do topo da árvore de "
"trabalho"
-#: git-submodule.sh:229
+#: git-submodule.sh:193
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "URL do repositório: '$repo' deve ser absoluto ou começar com ./|../"
-#: git-submodule.sh:246
+#: git-submodule.sh:210
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' já existe no índice"
-#: git-submodule.sh:250
+#: git-submodule.sh:214
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -12516,101 +13086,90 @@ msgstr ""
"$sm_path\n"
"Use -f se pretende mesmo adicioná-lo."
-#: git-submodule.sh:268
+#: git-submodule.sh:232
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "A adicionar repositório existente em '$sm_path' ao índice"
-#: git-submodule.sh:270
+#: git-submodule.sh:234
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' já existe e não é uma repositório git válido"
-#: git-submodule.sh:278
+#: git-submodule.sh:242
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Um diretório git de '$sm_name' foi encontrado localmente com os remotos:"
-#: git-submodule.sh:280
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from"
-msgstr ""
-"Se deseja reutilizar este diretório git local em vez de clonar de novo de"
-
-#: git-submodule.sh:282
-#, sh-format
-msgid ""
-"use the '--force' option. If the local git directory is not the correct repo"
-msgstr ""
-"use a opção '--force'. Se o diretório git local não é o repositório correto"
-
-#: git-submodule.sh:283
+#: git-submodule.sh:244
#, sh-format
msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+" $realrepo\n"
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr ""
-"ou se não tem a certeza do que isto significa, escolha outro nome com a "
-"opção '--name'."
+"Se quer reutilizar este diretório git local em vez de clonar de novo de\n"
+" $realrepo\n"
+"use a opção '--force'. Se o diretório git local não é o repo correto\n"
+"ou não tem a certeza o que isto significa escolha outro nome com a opção '--"
+"name'."
-#: git-submodule.sh:285
+#: git-submodule.sh:250
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "A reativar o diretório git local do submódulo '$sm_name'."
-#: git-submodule.sh:297
+#: git-submodule.sh:262
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Não foi possível extrair o submódulo '$sm_path'"
-#: git-submodule.sh:302
+#: git-submodule.sh:267
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Falha ao adicionar o submódulo '$sm_path'"
-#: git-submodule.sh:311
+#: git-submodule.sh:276
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Falha ao registar o submódulo '$sm_path'"
-#: git-submodule.sh:355
+#: git-submodule.sh:323
#, sh-format
msgid "Entering '$displaypath'"
msgstr "A entrar em '$displaypath'"
-#: git-submodule.sh:375
+#: git-submodule.sh:343
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
"Interrompido em '$displaypath'; o script retornou um valor diferente de zero."
-#: git-submodule.sh:448
+#: git-submodule.sh:414
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "especificador de caminho e --all são incompatíveis"
-#: git-submodule.sh:453
+#: git-submodule.sh:419
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Use '--all' se pretende mesmo anular a inicialização todos os submódulos"
-#: git-submodule.sh:470
-#, sh-format
-msgid "Submodule work tree '$displaypath' contains a .git directory"
-msgstr ""
-"A árvore de trabalho do submódulo '$displaypath' contém um diretório .git"
-
-#: git-submodule.sh:471
+#: git-submodule.sh:439
#, sh-format
msgid ""
+"Submodule work tree '$displaypath' contains a .git directory\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
+"A árvore de trabalho do submódulo '$displaypath' contem um diretório .git\n"
"(use 'rm -rf' se pretende mesmo removê-lo, incluindo todo o seu histórico)"
-#: git-submodule.sh:477
+#: git-submodule.sh:447
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -12619,127 +13178,145 @@ msgstr ""
"A árvore de trabalho do submódulo '$displaypath' contém alterações locais; "
"use '-f' para as descartar"
-#: git-submodule.sh:480
+#: git-submodule.sh:450
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Diretório '$displaypath' limpo"
-#: git-submodule.sh:481
+#: git-submodule.sh:451
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
"Não foi possível remover a árvore de trabalho do submódulo '$displaypath'"
-#: git-submodule.sh:484
+#: git-submodule.sh:454
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Não foi possível criar o diretório vazio do submódulo '$displaypath'"
-#: git-submodule.sh:493
+#: git-submodule.sh:463
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"O registo do submódulo '$name' ($url) foi removido do caminho '$displaypath'"
-#: git-submodule.sh:635
+#: git-submodule.sh:612
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"Não foi possível encontrar a revisão atual no caminho de submódulo "
"'$displaypath'"
-#: git-submodule.sh:644
+#: git-submodule.sh:622
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Não foi possível obter no caminho de submódulo '$sm_path'"
-#: git-submodule.sh:667
+#: git-submodule.sh:627
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr ""
+"Não foi possível encontrar a revisão atual ${remote_name}/${branch} no "
+"caminho de submódulo '$sm_path'"
+
+#: git-submodule.sh:645
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Não é possível obter no caminho de submódulo '$displaypath'"
-#: git-submodule.sh:680
+#: git-submodule.sh:651
+#, sh-format
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr ""
+"Obteve-se no caminho de submódulo '$displaypath', mas não continha $sha1. "
+"Falha ao obter aquele commit diretamente."
+
+#: git-submodule.sh:658
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Não é possível extrair '$sha1' no caminho de submódulo '$displaypath'"
-#: git-submodule.sh:681
+#: git-submodule.sh:659
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Caminho de submódulo '$displaypath': '$sha1' extraído"
-#: git-submodule.sh:685
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"Não foi possível efetuar rebase de '$sha1' no caminho de submódulo "
"'$displaypath'"
-#: git-submodule.sh:686
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Caminho de submódulo '$displaypath': rebase concluído em '$sha1'"
-#: git-submodule.sh:691
+#: git-submodule.sh:669
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Não é possível integrar '$sha1' no caminho de submódulo '$displaypath'"
-#: git-submodule.sh:692
+#: git-submodule.sh:670
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Caminho de submódulo '$displaypath': integrado em '$sha1'"
-#: git-submodule.sh:697
+#: git-submodule.sh:675
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Falha ao executar '$command $sha1' no caminho de submódulo '$displaypath'"
-#: git-submodule.sh:698
+#: git-submodule.sh:676
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Caminho de submódulo '$displaypath': '$command $sha1'"
-#: git-submodule.sh:729
+#: git-submodule.sh:707
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Falha ao percorrer o caminho de submódulo '$displaypath'"
-#: git-submodule.sh:837
+#: git-submodule.sh:815
msgid "The --cached option cannot be used with the --files option"
msgstr "A opção --cached não pode ser usada com a opção --files"
-#: git-submodule.sh:889
+#: git-submodule.sh:867
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "modo inesperado $mod_dst"
-#: git-submodule.sh:909
+#: git-submodule.sh:887
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Aviso: $display_name não contém o commit $sha1_src"
-#: git-submodule.sh:912
+#: git-submodule.sh:890
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Warn: $display_name não contém o commit $sha1_dst"
-#: git-submodule.sh:915
+#: git-submodule.sh:893
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Warn: $display_name contém os commits $sha1_src e $sha1_dst"
-#: git-submodule.sh:940
+#: git-submodule.sh:918
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:1059
+#: git-submodule.sh:1040
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Falha ao percorrer recursivamente o caminho de submódulo '$sm_path'"
-#: git-submodule.sh:1123
+#: git-submodule.sh:1107
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "A sincronizar o URL do submódulo '$displaypath'"
@@ -12749,6 +13326,687 @@ msgstr "A sincronizar o URL do submódulo '$displaypath'"
msgid "See git-${cmd}(1) for details."
msgstr "Consulte git-${cmd}(1) para obter mais detalhes."
+#: git-rebase--interactive.sh:131
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr "A rebasear ($new_count/$total)"
+
+#: git-rebase--interactive.sh:147
+msgid ""
+"\n"
+"Commands:\n"
+" p, pick = use commit\n"
+" r, reword = use commit, but edit the commit message\n"
+" e, edit = use commit, but stop for amending\n"
+" s, squash = use commit, but meld into previous commit\n"
+" f, fixup = like \"squash\", but discard this commit's log message\n"
+" x, exec = run command (the rest of the line) using shell\n"
+" d, drop = remove commit\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+"\n"
+"Comandos:\n"
+" p, pick = usar commit\n"
+" r, reword = usar commit, mas editar a mensagem de commit\n"
+" e, edit = usar commit, mas parar para emendar\n"
+" s, squash = usar commit, mas fundir com o commit anterior\n"
+" f, fixup = como \"squash\", mas descartar a mensagem deste commit\n"
+" x, exec = executar o comando (o resto da linha) usando a shell\n"
+" d, drop = remover commit\n"
+"\n"
+"Estas linhas pode ser reordenadas; são executadas de cima para baixo.\n"
+
+#: git-rebase--interactive.sh:162
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"Não remover nenhum linha. Use 'drop' explicitamente para remover um commit.\n"
+
+#: git-rebase--interactive.sh:166
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Se remover uma linha daqui AQUELE COMMIT SERÃ PERDIDO.\n"
+
+#: git-rebase--interactive.sh:202
+#, sh-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Pode emendar o commit agora, com\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Assim que estiver satisfeito com as alterações, execute\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:227
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
+msgstr "$sha1: não é um commit que se possa apanhar"
+
+#: git-rebase--interactive.sh:266
+#, sh-format
+msgid "Invalid commit name: $sha1"
+msgstr "Nome de commit inválido: $sha1"
+
+#: git-rebase--interactive.sh:308
+msgid "Cannot write current commit's replacement sha1"
+msgstr "Não é possível escrever o sha1 substituto do commit"
+
+#: git-rebase--interactive.sh:360
+#, sh-format
+msgid "Fast-forward to $sha1"
+msgstr "Avanço-rápido para $sha1"
+
+#: git-rebase--interactive.sh:362
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
+msgstr "Não é possível avançar rapidamente para $sha1"
+
+#: git-rebase--interactive.sh:371
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
+msgstr "Não é possível mover HEAD para $first_parent"
+
+#: git-rebase--interactive.sh:376
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
+msgstr "Recusa-se a esmagar uma integração: $sha1"
+
+#: git-rebase--interactive.sh:390
+#, sh-format
+msgid "Error redoing merge $sha1"
+msgstr "Erro ao refazer integração $sha1"
+
+#: git-rebase--interactive.sh:398
+#, sh-format
+msgid "Could not pick $sha1"
+msgstr "Não foi possível apanhar $sha1"
+
+#: git-rebase--interactive.sh:407
+#, sh-format
+msgid "This is the commit message #${n}:"
+msgstr "Esta é a mensagem de commit nº${n}:"
+
+#: git-rebase--interactive.sh:412
+#, sh-format
+msgid "The commit message #${n} will be skipped:"
+msgstr "A mensagem de commit nº${n} será ignorada:"
+
+#: git-rebase--interactive.sh:423
+#, sh-format
+msgid "This is a combination of $count commit."
+msgid_plural "This is a combination of $count commits."
+msgstr[0] "Isto é a combinação de $count commit."
+msgstr[1] "Isto é a combinação de $count commits."
+
+#: git-rebase--interactive.sh:431
+#, sh-format
+msgid "Cannot write $fixup_msg"
+msgstr "Não é possível escrever $fixup_msg"
+
+#: git-rebase--interactive.sh:434
+msgid "This is a combination of 2 commits."
+msgstr "Isto é a combinação de 2 commits."
+
+#: git-rebase--interactive.sh:435
+msgid "This is the 1st commit message:"
+msgstr "Esta é a 1ª mensagem de commit:"
+
+#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
+#: git-rebase--interactive.sh:521
+#, sh-format
+msgid "Could not apply $sha1... $rest"
+msgstr "Não foi possível aplicar $sha1... $rest"
+
+#: git-rebase--interactive.sh:549
+#, sh-format
+msgid ""
+"Could not amend commit after successfully picking $sha1... $rest\n"
+"This is most likely due to an empty commit message, or the pre-commit hook\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue "
+"before\n"
+"you are able to reword the commit."
+msgstr ""
+"Não foi possível emendar o commit depois de apanhar com sucesso $sha1... "
+"$rest\n"
+"Deve-se provavelmente a uma mensagem de commit vazia ou o pre-commit hook "
+"falhou.\n"
+"Se o pre-commit hook falhou, pode precisar de resolver o problema ante de "
+"poder\n"
+"reformular a mensagem do commit."
+
+#: git-rebase--interactive.sh:564
+#, sh-format
+msgid "Stopped at $sha1_abbrev... $rest"
+msgstr "Parou em $sha1_abbrev... $rest"
+
+#: git-rebase--interactive.sh:579
+#, sh-format
+msgid "Cannot '$squash_style' without a previous commit"
+msgstr "Não é possível efetuar '$squash_style' sem um commit anterior"
+
+#: git-rebase--interactive.sh:621
+#, sh-format
+msgid "Executing: $rest"
+msgstr "A executar: $rest"
+
+#: git-rebase--interactive.sh:629
+#, sh-format
+msgid "Execution failed: $rest"
+msgstr "Falha ao executar: $rest"
+
+#: git-rebase--interactive.sh:631
+msgid "and made changes to the index and/or the working tree"
+msgstr "e fez alterações ao índice e/ou à árvore de trabalho"
+
+#: git-rebase--interactive.sh:633
+msgid ""
+"You can fix the problem, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Pode corrigir o problema e executar\n"
+"\n"
+"\tgit rebase --continue"
+
+#. TRANSLATORS: after these lines is a command to be issued by the user
+#: git-rebase--interactive.sh:646
+#, sh-format
+msgid ""
+"Execution succeeded: $rest\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Executado com sucesso: $rest\n"
+"mas deixou alterações no índice e/ou na árvore de trabalho\n"
+"Submeta ou esconda as alterações e execute\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:657
+#, sh-format
+msgid "Unknown command: $command $sha1 $rest"
+msgstr "Comando desconhecido: $command $sha1 $rest"
+
+#: git-rebase--interactive.sh:658
+msgid "Please fix this using 'git rebase --edit-todo'."
+msgstr "Corrija-o usando 'git rebase --edit-todo'."
+
+#: git-rebase--interactive.sh:693
+#, sh-format
+msgid "Successfully rebased and updated $head_name."
+msgstr "$head_name rebaseado e atualizado com sucesso."
+
+#: git-rebase--interactive.sh:740
+msgid "Could not skip unnecessary pick commands"
+msgstr "Não foi possível saltar comandos pick desnecessários"
+
+#: git-rebase--interactive.sh:898
+#, sh-format
+msgid ""
+"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+" - $line"
+msgstr ""
+"Aviso: falta o SHA-1 ou a seguinte linha não tem um commit:\n"
+" - $line"
+
+#: git-rebase--interactive.sh:931
+#, sh-format
+msgid ""
+"Warning: the command isn't recognized in the following line:\n"
+" - $line"
+msgstr ""
+"Aviso: o comando não é reconhecido na seguinte linha:\n"
+" - $line"
+
+#: git-rebase--interactive.sh:970
+msgid "could not detach HEAD"
+msgstr "não foi possível destacar HEAD"
+
+#: git-rebase--interactive.sh:1008
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):"
+msgstr ""
+"Aviso: alguns commits podem ter sido descartados acidentalmente.\n"
+"Commits descartados (mais novo para o mais velho):"
+
+#: git-rebase--interactive.sh:1016
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error."
+msgstr ""
+"Para evitar esta mensagem, use \"drop\" para remover um commit "
+"explicitamente.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' para mudar o nível de avisos.\n"
+"O comportamentos possíveis são: ignore, warn, error."
+
+#: git-rebase--interactive.sh:1027
+#, sh-format
+msgid ""
+"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
+"Ignoring."
+msgstr ""
+"Definição $check_level desconhecida da opção rebase.missingCommitsCheck. "
+"Ignorado."
+
+#: git-rebase--interactive.sh:1044
+msgid "You can fix this with 'git rebase --edit-todo'."
+msgstr "Pode corrí-lo com 'git rebase --edit-todo'."
+
+#: git-rebase--interactive.sh:1045
+msgid "Or you can abort the rebase with 'git rebase --abort'."
+msgstr "Ou pode abortar o rebase com 'git rebase --abort'."
+
+#: git-rebase--interactive.sh:1069
+msgid "Could not remove CHERRY_PICK_HEAD"
+msgstr "Não foi possível remover CHERRY_PICK_HEAD"
+
+#: git-rebase--interactive.sh:1074
+#, sh-format
+msgid ""
+"You have staged changes in your working tree.\n"
+"If these changes are meant to be\n"
+"squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In both case, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
+msgstr ""
+"Tem alterações preparadas na árvore de trabalho.\n"
+"Se tenciona esmagar estas alterações\n"
+"no commit anterior, execute:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Se tenciona pô-las num novo commit, execute:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"Em ambos os casos, quando estiver pronto, continue com:\n"
+"\n"
+" git rebase --continue\n"
+
+#: git-rebase--interactive.sh:1091
+msgid "Error trying to find the author identity to amend commit"
+msgstr "Erro ao tentar encontrar a identidade do autor para emendar o commit"
+
+#: git-rebase--interactive.sh:1096
+msgid ""
+"You have uncommitted changes in your working tree. Please commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"Tem alterações por submeter na árvore de trabalho. Submeta-as primeiro\n"
+"e execute 'git rebase --continue' de novo."
+
+#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
+msgid "Could not commit staged changes."
+msgstr "Não foi possível submeter as alterações preparadas."
+
+#: git-rebase--interactive.sh:1129
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Está a editar o ficheiro de tarefa de um rebase interativo em curso.\n"
+"Para continuar o rebase depois de editar, execute:\n"
+" git rebase --continue\n"
+"\n"
+
+#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+msgid "Could not execute editor"
+msgstr "Não foi possível executar o editor"
+
+#: git-rebase--interactive.sh:1145
+msgid "You need to set your committer info first"
+msgstr "Primeiro tem de definir a sua informação de committer"
+
+#: git-rebase--interactive.sh:1153
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr "Não foi possível extrair $switch_to"
+
+#: git-rebase--interactive.sh:1158
+msgid "No HEAD?"
+msgstr "Sem HEAD?"
+
+#: git-rebase--interactive.sh:1159
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr "Não foi possível criar $state_dir temporário"
+
+#: git-rebase--interactive.sh:1161
+msgid "Could not mark as interactive"
+msgstr "Não foi possível marcar como interativo"
+
+#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+msgid "Could not init rewritten commits"
+msgstr "Não foi possível inicializar commits reescritos"
+
+#: git-rebase--interactive.sh:1276
+#, sh-format
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] "Rebase $shortrevisions sobre $shortonto ($todocount comando)"
+msgstr[1] "Rebase $shortrevisions sobre $shortonto ($todocount comandos)"
+
+#: git-rebase--interactive.sh:1281
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"No entanto, se remover tudo, o rebase será abortado.\n"
+"\n"
+
+#: git-rebase--interactive.sh:1288
+msgid "Note that empty commits are commented out"
+msgstr "Note que commits vazios são comentados"
+
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "utilização: $dashless $USAGE"
+
+#: git-sh-setup.sh:190
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr ""
+"Não é possível mudar de diretório para $cdup, o topo da árvore de trabalho"
+
+#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr "fatal: $program_name não pode ser usado sem uma árvore de trabalho."
+
+#: git-sh-setup.sh:220
+msgid "Cannot rebase: You have unstaged changes."
+msgstr "Não é possível rebasear: tem alterações não preparadas."
+
+#: git-sh-setup.sh:223
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr "Não é possível reescrever ramos: tem alterações não preparadas."
+
+#: git-sh-setup.sh:229
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr "Não é possível efetuar $action: tem alterações não preparadas."
+
+#: git-sh-setup.sh:242
+msgid "Cannot rebase: Your index contains uncommitted changes."
+msgstr "Não é possível rebasear: o índice contém alterações não submetidas."
+
+#: git-sh-setup.sh:248
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr ""
+"Não é possível efetuar $action: o índice contém alterações não submetidas."
+
+#: git-sh-setup.sh:372
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr ""
+"Precisa de executar este comando a partir do topo da árvore de trabalho."
+
+#: git-sh-setup.sh:377
+msgid "Unable to determine absolute path of git directory"
+msgstr "Não é possível determinar o caminho absoluto do diretório git"
+
+#~ msgid "bad numeric config value '%s' for '%s': invalid unit"
+#~ msgstr ""
+#~ "valor numérico '%s' da configuração '%s' incorreto: unidade inválida"
+
+#~ msgid "bad numeric config value '%s' for '%s' in blob %s: invalid unit"
+#~ msgstr ""
+#~ "valor numérico '%s' da configuração '%s' incorreto no blob %s: unidade "
+#~ "inválida"
+
+#~ msgid "bad numeric config value '%s' for '%s' in file %s: invalid unit"
+#~ msgstr ""
+#~ "valor numérico '%s' da configuração '%s' incorreto no ficheiro %s: "
+#~ "unidade inválida"
+
+#~ msgid ""
+#~ "bad numeric config value '%s' for '%s' in standard input: invalid unit"
+#~ msgstr ""
+#~ "valor numérico '%s' da configuração '%s' incorreto na entrada padrão: "
+#~ "unidade inválida"
+
+#~ msgid ""
+#~ "bad numeric config value '%s' for '%s' in submodule-blob %s: invalid unit"
+#~ msgstr ""
+#~ "valor numérico '%s' da configuração '%s' incorreto no submódulo-blob %s: "
+#~ "unidade inválida"
+
+#~ msgid ""
+#~ "bad numeric config value '%s' for '%s' in command line %s: invalid unit"
+#~ msgstr ""
+#~ "valor numérico '%s' da configuração '%s' incorreto na linha de comandos "
+#~ "%s: unidade inválida"
+
+#~ msgid "bad numeric config value '%s' for '%s' in %s: invalid unit"
+#~ msgstr ""
+#~ "valor numérico '%s' da configuração '%s' incorreto em %s: unidade inválida"
+
+#~ msgid "This is the 2nd commit message:"
+#~ msgstr "Esta é a 2ª mensagem de commit:"
+
+#~ msgid "This is the 3rd commit message:"
+#~ msgstr "Esta é a 3ª mensagem de commit:"
+
+#~ msgid "This is the 4th commit message:"
+#~ msgstr "Esta é a 4ª mensagem de commit:"
+
+#~ msgid "This is the 5th commit message:"
+#~ msgstr "Esta é a 5ª mensagem de commit:"
+
+#~ msgid "This is the 6th commit message:"
+#~ msgstr "Esta é a 6ª mensagem de commit:"
+
+#~ msgid "This is the 7th commit message:"
+#~ msgstr "Esta é a 7ª mensagem de commit:"
+
+#~ msgid "This is the 8th commit message:"
+#~ msgstr "Esta é a 8ª mensagem de commit:"
+
+#~ msgid "This is the 9th commit message:"
+#~ msgstr "Esta é a 9ª mensagem de commit:"
+
+#~ msgid "This is the 10th commit message:"
+#~ msgstr "Esta é a 10ª mensagem de commit:"
+
+#~ msgid "This is the ${n}th commit message:"
+#~ msgstr "Esta é a ${n}ª mensagem de commit:"
+
+#~ msgid "This is the ${n}st commit message:"
+#~ msgstr "Está é a ${n}ª mensagem de commit:"
+
+#~ msgid "This is the ${n}nd commit message:"
+#~ msgstr "Esta é a ${n}ª mensagem de commit:"
+
+#~ msgid "This is the ${n}rd commit message:"
+#~ msgstr "Esta é a ${n}ª mensagem de commit:"
+
+#~ msgid "The 1st commit message will be skipped:"
+#~ msgstr "A 1ª mensagem de commit será ignorada:"
+
+#~ msgid "The 2nd commit message will be skipped:"
+#~ msgstr "A 2ª mensagem de commit será ignorada:"
+
+#~ msgid "The 3rd commit message will be skipped:"
+#~ msgstr "A 3ª mensagem de commit será ignorada:"
+
+#~ msgid "The 4th commit message will be skipped:"
+#~ msgstr "A 4ª mensagem de commit será ignorada:"
+
+#~ msgid "The 5th commit message will be skipped:"
+#~ msgstr "A 5ª mensagem de commit será ignorada:"
+
+#~ msgid "The 6th commit message will be skipped:"
+#~ msgstr "A 6ª mensagem de commit será ignorada:"
+
+#~ msgid "The 7th commit message will be skipped:"
+#~ msgstr "A 7ª mensagem de commit será ignorada:"
+
+#~ msgid "The 8th commit message will be skipped:"
+#~ msgstr "A 8ª mensagem de commit será ignorada:"
+
+#~ msgid "The 9th commit message will be skipped:"
+#~ msgstr "A 9ª mensagem de commit será ignorada:"
+
+#~ msgid "The 10th commit message will be skipped:"
+#~ msgstr "A 10ª mensagem de commit será ignorada:"
+
+#~ msgid "The ${n}th commit message will be skipped:"
+#~ msgstr "A ${n}ª mensagem de commit será ignorada:"
+
+#~ msgid "The ${n}st commit message will be skipped:"
+#~ msgstr "A ${n}ª mensagem de commit será ignorada:"
+
+#~ msgid "The ${n}nd commit message will be skipped:"
+#~ msgstr "A ${n}ª mensagem de commit será ignorada:"
+
+#~ msgid "The ${n}rd commit message will be skipped:"
+#~ msgstr "A ${n}ª mensagem de commit será ignorada:"
+
+#~ msgid "could not run gpg."
+#~ msgstr "não foi possível executar gpg."
+
+#~ msgid "gpg did not accept the data"
+#~ msgstr "gpg não aceitou os dados"
+
+#~ msgid "unsupported object type in the tree"
+#~ msgstr "tipo de objeto sem suporte encontrado na árvore"
+
+#~ msgid "Fatal merge failure, shouldn't happen."
+#~ msgstr "Falha de integração fatal, não devia acontecer."
+
+#~ msgid "Unprocessed path??? %s"
+#~ msgstr "Caminho não processado??? %s"
+
+#~ msgid "Error wrapping up %s"
+#~ msgstr "Erro ao rematar %s."
+
+#~ msgid "Cannot %s during a %s"
+#~ msgstr "Não foi possível efetuar %s durante %s"
+
+#~ msgid "Can't cherry-pick into empty head"
+#~ msgstr "Não é possível efetuar cherry-pick numa cabeça vazia"
+
+#~ msgid "could not open %s for writing"
+#~ msgstr "não foi possível abrir %s para escrita"
+
+#~ msgid "read of %s failed"
+#~ msgstr "falha ao ler %s"
+
+#~ msgid "could not write branch description template"
+#~ msgstr "não foi possível escrever o modelo da descrição do ramo"
+
+#~ msgid "corrupt index file"
+#~ msgstr "ficheiro de índice corrompido"
+
+#~ msgid "detach the HEAD at named commit"
+#~ msgstr "destacar HEAD no commit indicado"
+
+#~ msgid "Checking connectivity... "
+#~ msgstr "A verificar a conectividade... "
+
+#~ msgid " (unable to update local ref)"
+#~ msgstr " (não é possível atualizar a referência local)"
+
+#~ msgid "Reinitialized existing"
+#~ msgstr "existente reinicializado"
+
+#~ msgid "Initialized empty"
+#~ msgstr "vazio inicializado"
+
+#~ msgid " shared"
+#~ msgstr " partilhado"
+
+#~ msgid "Verify that the named commit has a valid GPG signature"
+#~ msgstr "verificar se o commit tem uma assinatura GPG válida"
+
+#~ msgid "Could not write to '%s'"
+#~ msgstr "Não foi possível escrever em '%s'"
+
+#~ msgid "Writing SQUASH_MSG"
+#~ msgstr "A escrever SQUASH_MSG"
+
+#~ msgid "Finishing SQUASH_MSG"
+#~ msgstr "A concluir SQUASH_MSG"
+
+#~ msgid " and with remote"
+#~ msgstr " e com o remoto"
+
+#~ msgid "removing '%s' failed"
+#~ msgstr "falha ao remover '%s'"
+
+#~ msgid "program error"
+#~ msgstr "erro do programa"
+
+#~ msgid "Please call 'bisect_state' with at least one argument."
+#~ msgstr "Invoque 'bisect_state' com pelo menos um argumento."
+
+#~ msgid ""
+#~ "If you want to reuse this local git directory instead of cloning again "
+#~ "from"
+#~ msgstr ""
+#~ "Se deseja reutilizar este diretório git local em vez de clonar de novo de"
+
+#~ msgid ""
+#~ "use the '--force' option. If the local git directory is not the correct "
+#~ "repo"
+#~ msgstr ""
+#~ "use a opção '--force'. Se o diretório git local não é o repositório "
+#~ "correto"
+
+#~ msgid ""
+#~ "or you are unsure what this means choose another name with the '--name' "
+#~ "option."
+#~ msgstr ""
+#~ "ou se não tem a certeza do que isto significa, escolha outro nome com a "
+#~ "opção '--name'."
+
+#~ msgid "Submodule work tree '$displaypath' contains a .git directory"
+#~ msgstr ""
+#~ "A árvore de trabalho do submódulo '$displaypath' contém um diretório .git"
+
+#~ msgid ""
+#~ "(use 'rm -rf' if you really want to remove it including all of its "
+#~ "history)"
+#~ msgstr ""
+#~ "(use 'rm -rf' se pretende mesmo removê-lo, incluindo todo o seu histórico)"
+
#~ msgid "'%s': %s"
#~ msgstr "'%s': %s"
@@ -12836,8 +14094,8 @@ msgstr "Consulte git-${cmd}(1) para obter mais detalhes."
#~ "Quando push.default está definido como 'matching', o Git publica\n"
#~ "os ramos locais nos ramos remotos que já existam com o mesmo nome.\n"
#~ "\n"
-#~ "Desde a versão 2.0, o Git assume o comportamento mais conservativo 'simple',"
-#~ "\n"
+#~ "Desde a versão 2.0, o Git assume o comportamento mais conservativo "
+#~ "'simple',\n"
#~ "publicando só o ramo atual no ramo remoto correspondente, que é usado\n"
#~ "para atualizar o ramo atual com 'git pull'.\n"
#~ "Consulte 'git help config' e procure por 'push.default' para mais "
diff --git a/po/ru.po b/po/ru.po
index 617e5f54..7feffd0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: Git Russian Localization Project\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2016-05-24 23:42+0800\n"
-"PO-Revision-Date: 2016-06-11 09:37+0000\n"
+"PO-Revision-Date: 2016-06-30 13:28+0000\n"
"Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -1440,11 +1440,11 @@ msgstr "Ошибка Ð¾Ð±Ð¾Ñ€Ð°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ %s"
#: sequencer.c:208
msgid "Your local changes would be overwritten by cherry-pick."
-msgstr "Ваши локальные изменение будут перезапиÑаны отбором лучшего."
+msgstr "Ваши локальные изменение будут перезапиÑаны копией коммита."
#: sequencer.c:210
msgid "Your local changes would be overwritten by revert."
-msgstr "Ваши локальные изменение будут перезапиÑаны возвратом коммита."
+msgstr "Ваши локальные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ перезапиÑаны обратными изменениÑми коммита."
#: sequencer.c:213
msgid "Commit your changes or stash them to proceed."
@@ -1508,7 +1508,7 @@ msgstr "Ðе удалоÑÑŒ получить Ñообщение коммита Ð
#: sequencer.c:594
#, c-format
msgid "could not revert %s... %s"
-msgstr "не удалоÑÑŒ возвратить коммит %s… %s"
+msgstr "не удалоÑÑŒ обратить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð° %s… %s"
#: sequencer.c:595
#, c-format
@@ -1575,7 +1575,7 @@ msgstr "ÐŸÐ¾Ð²Ñ€ÐµÐ¶Ð´Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð° Ñ Ð¾Ð¿Ñ†Ð¸Ñми: %s"
#: sequencer.c:814
msgid "a cherry-pick or revert is already in progress"
-msgstr "отбор лучшего или возврат коммита уже выполнÑетÑÑ"
+msgstr "копирование или обращение изменений коммита уже выполнÑÑŽÑ‚ÑÑ"
#: sequencer.c:815
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
@@ -1593,7 +1593,7 @@ msgstr "Ошибка Ð¾Ð±Ð¾Ñ€Ð°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ %s."
#: sequencer.c:854 sequencer.c:986
msgid "no cherry-pick or revert in progress"
-msgstr "отбор лучшего или возврат коммита не выполнÑетÑÑ"
+msgstr "копирование или обращение изменений коммита уже выполнÑÑŽÑ‚ÑÑ"
#: sequencer.c:856
msgid "cannot resolve HEAD"
@@ -1620,7 +1620,7 @@ msgstr "неожиданный конец файла"
#: sequencer.c:887
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr "Ñохраненный файл Ñ HEAD перед отбором лучшего «%s» поврежден"
+msgstr "Ñохраненный файл Ñ HEAD перед копированием коммита «%s» поврежден"
#: sequencer.c:909
#, c-format
@@ -1630,7 +1630,7 @@ msgstr "Ðе удалоÑÑŒ отформатировать %s."
#: sequencer.c:1054
#, c-format
msgid "%s: can't cherry-pick a %s"
-msgstr "%s: не удалоÑÑŒ отобрать %s"
+msgstr "%s: не удалоÑÑŒ Ñкопировать коммит %s"
#: sequencer.c:1057
#, c-format
@@ -1639,11 +1639,11 @@ msgstr "%s: Ð¿Ð»Ð¾Ñ…Ð°Ñ Ñ€ÐµÐ´Ð°ÐºÑ†Ð¸Ñ"
#: sequencer.c:1091
msgid "Can't revert as initial commit"
-msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð¸Ñ‚ÑŒ изначальный коммит"
+msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ð±Ñ€Ð°Ñ‚Ð¸Ñ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð½Ð°Ñ‡Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ коммита"
#: sequencer.c:1092
msgid "Can't cherry-pick into empty head"
-msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ñ‚ÑŒ лучшее в пуÑтую ветку"
+msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ñкопировать коммит в пуÑтую ветку"
#: setup.c:248
#, c-format
@@ -2297,7 +2297,7 @@ msgstr " (иÑпользуйте «git rebase --continue», когда буде
#: wt-status.c:1213
#, c-format
msgid "You are currently cherry-picking commit %s."
-msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð¾Ñ‚Ð±Ð¸Ñ€Ð°ÐµÑ‚Ðµ лучший коммит %s."
+msgstr "Вы копируете коммит %s."
#: wt-status.c:1218
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
@@ -2309,12 +2309,12 @@ msgstr " (вÑе конфликты разрешены: запуÑтите «gi
#: wt-status.c:1223
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr " (иÑпользуйте «git cherry-pick --abort», чтобы отменить операцию отбора лучшего)"
+msgstr " (иÑпользуйте «git cherry-pick --abort», чтобы отменить ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°)"
#: wt-status.c:1232
#, c-format
msgid "You are currently reverting commit %s."
-msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‰Ð°ÐµÑ‚Ðµ коммит %s."
+msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð¾Ð±Ñ€Ð°Ñ‰Ð°ÐµÑ‚Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð° %s."
#: wt-status.c:1237
msgid " (fix conflicts and run \"git revert --continue\")"
@@ -2326,7 +2326,7 @@ msgstr " (вÑе конфликты разрешены: запуÑтите «gi
#: wt-status.c:1242
msgid " (use \"git revert --abort\" to cancel the revert operation)"
-msgstr " (иÑпользуйте «git revert --abort», чтобы отменить операцию возврата)"
+msgstr " (иÑпользуйте «git revert --abort», чтобы отменить операцию Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ коммита)"
#: wt-status.c:1253
#, c-format
@@ -5091,7 +5091,7 @@ msgid ""
"\n"
" git commit --allow-empty\n"
"\n"
-msgstr "Предыдущий отбор лучшего теперь пуÑÑ‚, возможно поÑле Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð².\nЕÑли вы вÑе равно хотите Ñделать пуÑтой коммит, иÑпользуйте:\n\n git commit --allow-empty\n\n"
+msgstr "Копируемый коммит теперь пуÑÑ‚, возможно поÑле Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð².\nЕÑли вы вÑе равно хотите Ñделать пуÑтой коммит, иÑпользуйте:\n\n git commit --allow-empty\n\n"
#: builtin/commit.c:85
msgid "Otherwise, please use 'git reset'\n"
@@ -5105,7 +5105,7 @@ msgid ""
"\n"
"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
"the remaining commits.\n"
-msgstr "ЕÑли вы хотите пропуÑтит Ñтот коммит, иÑпользуйте команду:\n\n git reset\n\nПоÑле Ñтого «git cherry-pick --continue» продолжит отбор лучшего\nв оÑтавшихÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°Ñ….\n"
+msgstr "ЕÑли вы хотите пропуÑтит Ñтот коммит, иÑпользуйте команду:\n\n git reset\n\nПоÑле Ñтого «git cherry-pick --continue» продолжит копирование оÑтавшихÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð².\n"
#: builtin/commit.c:307
msgid "failed to unpack HEAD tree object"
@@ -5137,7 +5137,7 @@ msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ñоздать чаÑтичный коммит во вреÐ
#: builtin/commit.c:449
msgid "cannot do a partial commit during a cherry-pick."
-msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ñоздать чаÑтичный коммит во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð±Ð¾Ñ€Ð° лучшего коммита."
+msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ñоздать чаÑтичный коммит во Ð²Ñ€ÐµÐ¼Ñ ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°."
#: builtin/commit.c:458
msgid "cannot read the index"
@@ -5221,7 +5221,7 @@ msgid ""
"If this is not correct, please remove the file\n"
"\t%s\n"
"and try again.\n"
-msgstr "\nПохоже, что вы пытаетеÑÑŒ закоммитить отбор лучшего.\nЕÑли Ñто ошибка, пожалуйÑта удалите файл\n\t%s\nи попробуйте Ñнова.\n"
+msgstr "\nПохоже, что вы пытаетеÑÑŒ закоммитить при копировании коммита.\nЕÑли Ñто не так, то удалите файл\n\t%s\nи попробуйте Ñнова.\n"
#: builtin/commit.c:832
#, c-format
@@ -5294,7 +5294,7 @@ msgstr "Ð’Ñ‹ в процеÑÑе ÑлиÑÐ½Ð¸Ñ â€” ÑÐµÐ¹Ñ‡Ð°Ñ Ð½ÐµÐ»ÑŒÐ·Ñ Ð
#: builtin/commit.c:1162
msgid "You are in the middle of a cherry-pick -- cannot amend."
-msgstr "Ð’Ñ‹ в процеÑÑе отбора лучшего — ÑÐµÐ¹Ñ‡Ð°Ñ Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸ÑправлÑÑ‚ÑŒ."
+msgstr "Ð’Ñ‹ в процеÑÑе ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð° — ÑÐµÐ¹Ñ‡Ð°Ñ Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸ÑправлÑÑ‚ÑŒ."
#: builtin/commit.c:1165
msgid "Options --squash and --fixup cannot be used together"
@@ -7996,11 +7996,11 @@ msgstr "Ð’Ñ‹ не завершили ÑлиÑние (приÑутÑтвует Ñ„
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
-msgstr "Ð’Ñ‹ не завершили отбор лучшего (приÑутÑтвует файл CHERRY_PICK_HEAD).\nПожалуйÑта, выполните коммит ваших изменений, перед ÑлиÑнием."
+msgstr "Ð’Ñ‹ не завершили копирование коммита (приÑутÑтвует файл CHERRY_PICK_HEAD).\nПожалуйÑта, закоммитьте ваши изменениÑ, перед ÑлиÑнием."
#: builtin/merge.c:1245
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "Ð’Ñ‹ не завершили отбор лучшего (приÑутÑтвует файл CHERRY_PICK_HEAD)."
+msgstr "Ð’Ñ‹ не завершили копирование коммита (приÑутÑтвует файл CHERRY_PICK_HEAD)."
#: builtin/merge.c:1254
msgid "You cannot combine --squash with --no-ff."
@@ -10151,15 +10151,15 @@ msgstr "%s: %s Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ
#: builtin/revert.c:80
msgid "end revert or cherry-pick sequence"
-msgstr "конец поÑледовательноÑти отбора лучшего или возврата коммита"
+msgstr "конец поÑледовательноÑти ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ коммитов"
#: builtin/revert.c:81
msgid "resume revert or cherry-pick sequence"
-msgstr "продолжить поÑледовательноÑÑ‚ÑŒ отбора лучшего или возврата коммита"
+msgstr "продолжить поÑледовательноÑÑ‚ÑŒ ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ коммитов"
#: builtin/revert.c:82
msgid "cancel revert or cherry-pick sequence"
-msgstr "отмена поÑледовательноÑти отбора лучшего или возврата коммита"
+msgstr "отмена поÑледовательноÑти ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ коммитов"
#: builtin/revert.c:83
msgid "don't automatically commit"
@@ -10207,11 +10207,11 @@ msgstr "ошибка в программе"
#: builtin/revert.c:197
msgid "revert failed"
-msgstr "Ñбой возврата коммита"
+msgstr "Ñбой Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ коммита"
#: builtin/revert.c:212
msgid "cherry-pick failed"
-msgstr "Ñбой при отборе лучшего"
+msgstr "Ñбой при копировании коммита"
#: builtin/rm.c:17
msgid "git rm [<options>] [--] <file>..."
diff --git a/po/sv.po b/po/sv.po
index e7416af..9928603 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,12 +5,12 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: git 2.8.0\n"
+"Project-Id-Version: git 2.10.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-05-24 23:42+0800\n"
-"PO-Revision-Date: 2016-05-27 14:04+0100\n"
+"POT-Creation-Date: 2016-08-27 23:21+0800\n"
+"PO-Revision-Date: 2016-08-27 20:41+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
-"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +23,42 @@ msgstr ""
msgid "hint: %.*s\n"
msgstr "tips: %.*s\n"
-#: advice.c:88
+#: advice.c:83
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr ""
+"Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits "
+"samman."
+
+#: advice.c:85
+msgid "Committing is not possible because you have unmerged files."
+msgstr ""
+"Du kan inte utföra en incheckning eftersom du har filer som inte slagits "
+"samman."
+
+#: advice.c:87
+msgid "Merging is not possible because you have unmerged files."
+msgstr ""
+"Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits "
+"samman."
+
+#: advice.c:89
+msgid "Pulling is not possible because you have unmerged files."
+msgstr ""
+"Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman."
+
+#: advice.c:91
+msgid "Reverting is not possible because you have unmerged files."
+msgstr ""
+"Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits "
+"samman."
+
+#: advice.c:93
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
+msgstr ""
+"Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman."
+
+#: advice.c:101
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -31,18 +66,51 @@ msgstr ""
"Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
"som lämpligt för att ange lösning och checka in."
-#: advice.c:101 builtin/merge.c:1238
+#: advice.c:109
+msgid "Exiting because of an unresolved conflict."
+msgstr "Avslutar på grund av olöst konflikgt."
+
+#: advice.c:114 builtin/merge.c:1181
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
-#: advice.c:103
+#: advice.c:116
msgid "Please, commit your changes before merging."
msgstr "Checka in dina ändringar innan du utför sammanslagningen."
-#: advice.c:104
+#: advice.c:117
msgid "Exiting because of unfinished merge."
msgstr "Avslutar på grund av ofullbordad sammanslagning."
+#: advice.c:123
+#, c-format
+msgid ""
+"Note: checking out '%s'.\n"
+"\n"
+"You are in 'detached HEAD' state. You can look around, make experimental\n"
+"changes and commit them, and you can discard any commits you make in this\n"
+"state without impacting any branches by performing another checkout.\n"
+"\n"
+"If you want to create a new branch to retain commits you create, you may\n"
+"do so (now or later) by using -b with the checkout command again. Example:\n"
+"\n"
+" git checkout -b <new-branch-name>\n"
+"\n"
+msgstr ""
+"Observera: checkar ut \"%s\".\n"
+"\n"
+"Du har nu ett \"frånkopplat HEAD\". Du kan se dig omkring, experimentera\n"
+"med ändringar och checka in dem, och du kan kasta incheckningar du gör\n"
+"i det här läget utan att det påverkar grenar genom att checka ut på\n"
+"nytt.\n"
+"\n"
+"Om du vill skapa en ny gren för att behålla ändringarna du skapar, kan\n"
+"du göra det (nu eller senare) genom att använda checkout-kommandot igen\n"
+"med -b. Till exempel:\n"
+"\n"
+" git checkout -b <namn-på-ny-gren>\n"
+"\n"
+
#: archive.c:12
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]"
@@ -62,7 +130,7 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
-#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
@@ -75,7 +143,7 @@ msgstr "fmt"
msgid "archive format"
msgstr "arkivformat"
-#: archive.c:430 builtin/log.c:1395
+#: archive.c:430 builtin/log.c:1422
msgid "prefix"
msgstr "prefix"
@@ -83,11 +151,11 @@ msgstr "prefix"
msgid "prepend prefix to each pathname in the archive"
msgstr "lägg till prefix till varje sökväg i arkivet"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548
-#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553
+#: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987
#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
-#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
+#: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399
+#: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "fil"
@@ -120,7 +188,7 @@ msgid "list supported archive formats"
msgstr "visa understödda arkivformat"
#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:776
+#: builtin/submodule--helper.c:832
msgid "repo"
msgstr "arkiv"
@@ -128,7 +196,7 @@ msgstr "arkiv"
msgid "retrieve the archive from remote repository <repo>"
msgstr "hämta arkivet från fjärrarkivet <arkiv>"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
msgid "command"
msgstr "kommando"
@@ -136,6 +204,28 @@ msgstr "kommando"
msgid "path to the remote git-upload-archive command"
msgstr "sökväg till kommandot git-upload-archive på fjärren"
+#: archive.c:461
+msgid "Unexpected option --remote"
+msgstr "Oväntad flagga --remote"
+
+#: archive.c:463
+msgid "Option --exec can only be used together with --remote"
+msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
+
+#: archive.c:465
+msgid "Unexpected option --output"
+msgstr "Oväntad flagga --output"
+
+#: archive.c:487
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Okänt arkivformat \"%s\""
+
+#: archive.c:494
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argumentet stöd inte för formatet \"%s\": -%d"
+
#: attr.c:263
msgid ""
"Negative patterns are ignored in git attributes\n"
@@ -144,6 +234,130 @@ msgstr ""
"Negativa mönster ignoreras i git-attribut\n"
"Använd '\\!' för att inleda med ett utropstecken."
+#: bisect.c:441
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Kunde inte öppna filen \"%s\""
+
+#: bisect.c:446
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
+
+#: bisect.c:655
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "Det finns inte mer att göra \"bisect\" på!\n"
+
+#: bisect.c:708
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "Namnet på incheckningen är inte giltigt: %s"
+
+#: bisect.c:732
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+"Sammanslagningsbasen %s är trasig.\n"
+"Det betyder att felet har rättats mellan %s och [%s].\n"
+
+#: bisect.c:737
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"Sammanslagningsbasen %s är ny.\n"
+"Egenskapen har ändrats mellan %s och [%s].\n"
+
+#: bisect.c:742
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"Sammanslagningsbasen %s är %s.\n"
+"Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"
+
+#: bisect.c:750
+#, c-format
+msgid ""
+"Some %s revs are not ancestor of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
+msgstr ""
+"Några %s-revisioner är inte föräldrar till %s-revisionen.\n"
+"git bisect kan inte arbeta korrekt i detta fall.\n"
+"Kanske du skrev fel %s- och %s-revisioner?\n"
+
+#: bisect.c:763
+#, c-format
+msgid ""
+"the merge base between %s and [%s] must be skipped.\n"
+"So we cannot be sure the first %s commit is between %s and %s.\n"
+"We continue anyway."
+msgstr ""
+"sammanslagningsbasen mellan %s och [%s] måste hoppas över.\n"
+"Vi kan inte vara säkra på att den första %s incheckningen är mellan %s och "
+"%s.\n"
+"Vi fortsätter ändå."
+
+#: bisect.c:798
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "Bisect: en sammanslagningsbas måste testas\n"
+
+#: bisect.c:849
+#, c-format
+msgid "a %s revision is needed"
+msgstr "en %s-revision behövs"
+
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#, c-format
+msgid "could not create file '%s'"
+msgstr "kunde inte skapa filen \"%s\""
+
+#: bisect.c:917
+#, c-format
+msgid "could not read file '%s'"
+msgstr "kunde inte läsa filen \"%s\""
+
+#: bisect.c:947
+msgid "reading bisect refs failed"
+msgstr "misslyckades läsa bisect-referenser"
+
+#: bisect.c:967
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr "%s var både %s och %s\n"
+
+#: bisect.c:975
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+"Ingen testbar incheckning hittades.\n"
+"Kanske du startade med felaktiga sökvägsparametrar?\n"
+
+#: bisect.c:994
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(ungefär %d steg)"
+msgstr[1] "(ungefär %d steg)"
+
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:998
+#, c-format
+msgid "Bisecting: %d revision left to test after this %s\n"
+msgid_plural "Bisecting: %d revisions left to test after this %s\n"
+msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n"
+msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n"
+
#: branch.c:53
#, c-format
msgid ""
@@ -292,7 +506,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:777
+#: bundle.c:87 builtin/commit.c:778
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
@@ -301,10 +515,10 @@ msgstr "kunde inte öppna \"%s\""
msgid "Repository lacks these prerequisite commits:"
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
-#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
-#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
-#: builtin/merge.c:361 builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
+#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
+#: builtin/merge.c:356 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "misslyckades skapa revisionstraversering"
@@ -343,7 +557,7 @@ msgstr "rev-list dog"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
-#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
@@ -361,13 +575,13 @@ msgstr "kan inte skapa \"%s\""
msgid "index-pack died"
msgstr "index-pack dog"
-#: color.c:275
+#: color.c:290
#, c-format
msgid "invalid color value: %.*s"
msgstr "felaktigt färgvärde: %.*s"
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
-#: builtin/am.c:2134
+#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
+#: builtin/am.c:2119
#, c-format
msgid "could not parse %s"
msgstr "kunde inte tolka %s"
@@ -381,128 +595,199 @@ msgstr "%s %s är inte en incheckning!"
msgid "memory exhausted"
msgstr "minnet slut"
-#: config.c:475 config.c:477
+#: config.c:516
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
+
+#: config.c:520
#, c-format
-msgid "bad config line %d in %s %s"
-msgstr "felaktig konfigurationsfil rad %d i %s %s"
+msgid "bad config line %d in file %s"
+msgstr "felaktig konfigurationsfil rad %d i filen %s"
-#: config.c:593
+#: config.c:524
#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
-msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s %s: %s"
+msgid "bad config line %d in standard input"
+msgstr "felaktig konfigurationsfil rad %d i standard in"
-#: config.c:595
+#: config.c:528
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
+
+#: config.c:532
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
+
+#: config.c:536
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "felaktig konfigurationsfil rad %d i %s"
+
+#: config.c:655
+msgid "out of range"
+msgstr "utanför intervallet"
+
+#: config.c:655
+msgid "invalid unit"
+msgstr "ogiltig enhet"
+
+#: config.c:661
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
-#: config.c:680
+#: config.c:666
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr ""
+"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"
+
+#: config.c:669
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr ""
+"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"
+
+#: config.c:672
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr ""
+"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"
+
+#: config.c:675
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr ""
+"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"
+"en %s: %s"
+
+#: config.c:678
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr ""
+"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
+"%s: %s"
+
+#: config.c:681
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"
+
+#: config.c:768
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "misslyckades expandera användarkatalog i: \"%s\""
-#: config.c:761 config.c:772
+#: config.c:849 config.c:860
#, c-format
msgid "bad zlib compression level %d"
msgstr "felaktigt zlib-komprimeringsgrad %d"
-#: config.c:890
+#: config.c:978
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "felaktigt läge för skapande av objekt: %s"
-#: config.c:1228
+#: config.c:1312
msgid "unable to parse command-line config"
msgstr "kan inte tolka kommandoradskonfiguration"
-#: config.c:1284
-msgid "unknown error occured while reading the configuration files"
+#: config.c:1362
+msgid "unknown error occurred while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
-#: config.c:1629
+#: config.c:1716
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
-#: config.c:1631
+#: config.c:1718
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
-#: config.c:1690
+#: config.c:1777
#, c-format
msgid "%s has multiple values"
msgstr "%s har flera värden"
-#: config.c:2224
+#: config.c:2311
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "kunde inte ställa in \"%s\" till \"%s\""
-#: config.c:2226
+#: config.c:2313
#, c-format
msgid "could not unset '%s'"
msgstr "kunde inte ta bort inställning för \"%s\""
-#: connected.c:69
+# Vague original, not networking-related, but rather related to the actual
+# objects in the database.
+#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr "Kontrollerar konnektivitet"
+
+#: connected.c:74
msgid "Could not run 'git rev-list'"
msgstr "Kunde inte köra \"git rev-list\""
-#: connected.c:89
+#: connected.c:94
msgid "failed write to rev-list"
msgstr "kunde inte skriva till rev-list"
-#: connected.c:96
+#: connected.c:101
msgid "failed to close rev-list's stdin"
msgstr "kunde inte stänga rev-list:s standard in"
-#: date.c:95
+#: date.c:97
msgid "in the future"
msgstr "i framtiden"
-#: date.c:101
+#: date.c:103
#, c-format
msgid "%lu second ago"
msgid_plural "%lu seconds ago"
msgstr[0] "%lu sekund sedan"
msgstr[1] "%lu sekunder sedan"
-#: date.c:108
+#: date.c:110
#, c-format
msgid "%lu minute ago"
msgid_plural "%lu minutes ago"
msgstr[0] "%lu minut sedan"
msgstr[1] "%lu minuter sedan"
-#: date.c:115
+#: date.c:117
#, c-format
msgid "%lu hour ago"
msgid_plural "%lu hours ago"
msgstr[0] "%lu timme sedan"
msgstr[1] "%lu timmar sedan"
-#: date.c:122
+#: date.c:124
#, c-format
msgid "%lu day ago"
msgid_plural "%lu days ago"
msgstr[0] "%lu dag sedan"
msgstr[1] "%lu dagar sedan"
-#: date.c:128
+#: date.c:130
#, c-format
msgid "%lu week ago"
msgid_plural "%lu weeks ago"
msgstr[0] "%lu vecka sedan"
msgstr[1] "%lu veckor sedan"
-#: date.c:135
+#: date.c:137
#, c-format
msgid "%lu month ago"
msgid_plural "%lu months ago"
msgstr[0] "%lu månad sedan"
msgstr[1] "%lu månader sedan"
-#: date.c:146
+#: date.c:148
#, c-format
msgid "%lu year"
msgid_plural "%lu years"
@@ -510,14 +795,14 @@ msgstr[0] "%lu år"
msgstr[1] "%lu år"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:149
+#: date.c:151
#, c-format
msgid "%s, %lu month ago"
msgid_plural "%s, %lu months ago"
msgstr[0] "%s, %lu månad sedan"
msgstr[1] "%s, %lu månader sedan"
-#: date.c:154 date.c:159
+#: date.c:156 date.c:161
#, c-format
msgid "%lu year ago"
msgid_plural "%lu years ago"
@@ -529,7 +814,7 @@ msgstr[1] "%lu år sedan"
msgid "failed to read orderfile '%s'"
msgstr "kunde inte läsa orderfilen \"%s\""
-#: diffcore-rename.c:538
+#: diffcore-rename.c:540
msgid "Performing inexact rename detection"
msgstr "Utför onöjaktig namnbytesdetektering"
@@ -557,16 +842,16 @@ msgstr ""
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
-#: diff.c:3007
+#: diff.c:3017
#, c-format
msgid "external diff died, stopping at %s"
msgstr "extern diff dog, stannar vid %s"
-#: diff.c:3405
+#: diff.c:3415
msgid "--follow requires exactly one pathspec"
msgstr "--follow kräver exakt en sökvägsangivelse"
-#: diff.c:3568
+#: diff.c:3578
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -575,7 +860,7 @@ msgstr ""
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
"%s"
-#: diff.c:3582
+#: diff.c:3592
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""
@@ -588,39 +873,30 @@ msgstr "misslyckades hämta kärnans namn och information"
msgid "Untracked cache is disabled on this system or location."
msgstr "Ospårad cache är inaktiverad på systemet eller platsen."
-#: gpg-interface.c:166 gpg-interface.c:235
-msgid "could not run gpg."
-msgstr "kunde inte köra gpg."
-
#: gpg-interface.c:178
-msgid "gpg did not accept the data"
-msgstr "gpg godtog inte data"
-
-#: gpg-interface.c:189
msgid "gpg failed to sign the data"
msgstr "gpg misslyckades signera data"
-#: gpg-interface.c:222
-#, c-format
-msgid "could not create temporary file '%s'"
-msgstr "kunde inte skapa temporära filen \"%s\""
+#: gpg-interface.c:208
+msgid "could not create temporary file"
+msgstr "kunde inte skapa temporära fil"
-#: gpg-interface.c:224
+#: gpg-interface.c:210
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "misslyckades skriva fristående signatur till \"%s\""
-#: grep.c:1718
+#: grep.c:1792
#, c-format
msgid "'%s': unable to read %s"
msgstr "\"%s\" kunde inte läsa %s"
-#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
+#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
#, c-format
msgid "failed to stat '%s'"
msgstr "misslyckades ta status på \"%s\""
-#: grep.c:1746
+#: grep.c:1820
#, c-format
msgid "'%s': short read"
msgstr "\"%s\": kort läsning"
@@ -670,7 +946,7 @@ msgstr "automatiskt om %0.1f sekunder..."
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"."
-#: help.c:404 help.c:464
+#: help.c:404 help.c:470
msgid ""
"\n"
"Did you mean this?"
@@ -684,7 +960,7 @@ msgstr[1] ""
"\n"
"Menade du ett av dessa?"
-#: help.c:460
+#: help.c:466
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
@@ -718,83 +994,78 @@ msgstr "kunde inte skapa \"%s.lock\": %s"
msgid "failed to read the cache"
msgstr "misslyckades läsa cachen"
-#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
-#: builtin/checkout.c:586 builtin/clone.c:732
+#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
+#: builtin/checkout.c:589 builtin/clone.c:732
msgid "unable to write new index file"
msgstr "kunde inte skriva ny indexfil"
-#: merge-recursive.c:189
-#, c-format
+#: merge-recursive.c:209
msgid "(bad commit)\n"
msgstr "(felaktig incheckning)\n"
-#: merge-recursive.c:209
+#: merge-recursive.c:231
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "addinfo_cache misslyckades för sökvägen \"%s\""
-#: merge-recursive.c:270
+#: merge-recursive.c:301
msgid "error building trees"
msgstr "fel vid byggande av träd"
-#: merge-recursive.c:689
+#: merge-recursive.c:720
#, c-format
msgid "failed to create path '%s'%s"
msgstr "misslyckades skapa sökvägen \"%s\"%s"
-#: merge-recursive.c:700
+#: merge-recursive.c:731
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Tar bort %s för att göra plats för underkatalog\n"
-#: merge-recursive.c:714 merge-recursive.c:735
+#: merge-recursive.c:745 merge-recursive.c:764
msgid ": perhaps a D/F conflict?"
msgstr ": kanske en K/F-konflikt?"
-#: merge-recursive.c:725
+#: merge-recursive.c:754
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "vägrar förlora ospårad fil vid \"%s\""
-#: merge-recursive.c:765
+#: merge-recursive.c:796
#, c-format
msgid "cannot read object %s '%s'"
msgstr "kan inte läsa objektet %s: \"%s\""
-#: merge-recursive.c:767
+#: merge-recursive.c:798
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob förväntades för %s \"%s\""
-#: merge-recursive.c:790 builtin/clone.c:376
+#: merge-recursive.c:822
#, c-format
-msgid "failed to open '%s'"
-msgstr "misslyckades öppna \"%s\""
+msgid "failed to open '%s': %s"
+msgstr "misslyckades öppna \"%s\": %s"
-#: merge-recursive.c:798
+#: merge-recursive.c:833
#, c-format
-msgid "failed to symlink '%s'"
-msgstr "misslyckades skapa symboliska länken \"%s\""
+msgid "failed to symlink '%s': %s"
+msgstr "misslyckades skapa symboliska länken \"%s\": %s"
-#: merge-recursive.c:801
+#: merge-recursive.c:838
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "vet inte hur %06o %s \"%s\" skall hanteras"
-#: merge-recursive.c:939
+#: merge-recursive.c:978
msgid "Failed to execute internal merge"
msgstr "Misslyckades exekvera intern sammanslagning"
-#: merge-recursive.c:943
+#: merge-recursive.c:982
#, c-format
msgid "Unable to add %s to database"
msgstr "Kunde inte lägga till %s till databasen"
-#: merge-recursive.c:959
-msgid "unsupported object type in the tree"
-msgstr "objekttyp som ej stöds upptäcktes i trädet"
-
-#: merge-recursive.c:1034 merge-recursive.c:1048
+#: merge-recursive.c:1081 merge-recursive.c:1095
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -803,7 +1074,7 @@ msgstr ""
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet."
-#: merge-recursive.c:1040 merge-recursive.c:1053
+#: merge-recursive.c:1087 merge-recursive.c:1100
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -812,20 +1083,20 @@ msgstr ""
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet vid %s."
-#: merge-recursive.c:1094
+#: merge-recursive.c:1143
msgid "rename"
msgstr "namnbyte"
-#: merge-recursive.c:1094
+#: merge-recursive.c:1143
msgid "renamed"
msgstr "namnbytt"
-#: merge-recursive.c:1150
+#: merge-recursive.c:1200
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s är en katalog i %s lägger till som %s istället"
-#: merge-recursive.c:1172
+#: merge-recursive.c:1225
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -834,144 +1105,135 @@ msgstr ""
"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
"namnbyte \"%s\"->\"%s\" i \"%s\"%s"
-#: merge-recursive.c:1177
+#: merge-recursive.c:1230
msgid " (left unresolved)"
msgstr " (lämnad olöst)"
-#: merge-recursive.c:1231
+#: merge-recursive.c:1292
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1325
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Byter namn på %s till %s och %s till %s istället"
-#: merge-recursive.c:1460
+#: merge-recursive.c:1531
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s"
-#: merge-recursive.c:1470
+#: merge-recursive.c:1546
#, c-format
msgid "Adding merged %s"
msgstr "Lägger till sammanslagen %s"
-#: merge-recursive.c:1475 merge-recursive.c:1677
+#: merge-recursive.c:1553 merge-recursive.c:1766
#, c-format
msgid "Adding as %s instead"
msgstr "Lägger till som %s istället"
-#: merge-recursive.c:1526
+#: merge-recursive.c:1610
#, c-format
msgid "cannot read object %s"
msgstr "kan inte läsa objektet %s"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1613
#, c-format
msgid "object %s is not a blob"
msgstr "objektet %s är inte en blob"
-#: merge-recursive.c:1581
+#: merge-recursive.c:1666
msgid "modify"
msgstr "ändra"
-#: merge-recursive.c:1581
+#: merge-recursive.c:1666
msgid "modified"
msgstr "ändrad"
-#: merge-recursive.c:1591
+#: merge-recursive.c:1676
msgid "content"
msgstr "innehåll"
-#: merge-recursive.c:1598
+#: merge-recursive.c:1683
msgid "add/add"
msgstr "tillägg/tillägg"
-#: merge-recursive.c:1632
+#: merge-recursive.c:1718
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
-#: merge-recursive.c:1646
+#: merge-recursive.c:1732
#, c-format
msgid "Auto-merging %s"
msgstr "Slår ihop %s automatiskt"
-#: merge-recursive.c:1650 git-submodule.sh:941
+#: merge-recursive.c:1736 git-submodule.sh:919
msgid "submodule"
msgstr "undermodul"
-#: merge-recursive.c:1651
+#: merge-recursive.c:1737
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1831
#, c-format
msgid "Removing %s"
msgstr "Tar bort %s"
-#: merge-recursive.c:1762
+#: merge-recursive.c:1857
msgid "file/directory"
msgstr "fil/katalog"
-#: merge-recursive.c:1768
+#: merge-recursive.c:1863
msgid "directory/file"
msgstr "katalog/fil"
-#: merge-recursive.c:1773
+#: merge-recursive.c:1868
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"
-#: merge-recursive.c:1781
+#: merge-recursive.c:1877
#, c-format
msgid "Adding %s"
msgstr "Lägger till %s"
-#: merge-recursive.c:1798
-msgid "Fatal merge failure, shouldn't happen."
-msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa."
-
-#: merge-recursive.c:1817
+#: merge-recursive.c:1914
msgid "Already up-to-date!"
msgstr "Redan à jour!"
-#: merge-recursive.c:1826
+#: merge-recursive.c:1923
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "sammanslagning av träden %s och %s misslyckades"
-#: merge-recursive.c:1856
-#, c-format
-msgid "Unprocessed path??? %s"
-msgstr "Obehandlad sökväg??? %s"
-
-#: merge-recursive.c:1904
+#: merge-recursive.c:2006
msgid "Merging:"
msgstr "Slår ihop:"
-#: merge-recursive.c:1917
+#: merge-recursive.c:2019
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "hittade %u gemensam förfader:"
msgstr[1] "hittade %u gemensamma förfäder:"
-#: merge-recursive.c:1954
+#: merge-recursive.c:2058
msgid "merge returned no commit"
msgstr "sammanslagningen returnerade ingen incheckning"
-#: merge-recursive.c:2011
+#: merge-recursive.c:2121
#, c-format
msgid "Could not parse object '%s'"
msgstr "Kunde inte tolka objektet \"%s\""
-#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
+#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
msgid "Unable to write index."
msgstr "Kunde inte skriva indexet."
@@ -1031,7 +1293,7 @@ msgstr "-TAL"
msgid "malformed object name '%s'"
msgstr "felformat objektnamn \"%s\""
-#: path.c:796
+#: path.c:798
#, c-format
msgid "Could not make %s writable by group"
msgstr "Kunde inte göra %s skrivbar för gruppen"
@@ -1101,7 +1363,7 @@ msgstr ""
"Ingenting att exkludera från med :(exkludera)-mönster.\n"
"Glömde du kanske att antingen lägga till \":/\" eller \".\"?"
-#: pretty.c:971
+#: pretty.c:973
msgid "unable to parse --pretty format"
msgstr "kunde inte tolka format för --pretty"
@@ -1127,23 +1389,22 @@ msgstr ""
"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
-#: builtin/merge.c:995
+#: refs.c:551 builtin/merge.c:840
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Kunde inte öppna \"%s\" för skrivning"
-#: refs/files-backend.c:2243
+#: refs/files-backend.c:2534
#, c-format
msgid "could not delete reference %s: %s"
msgstr "kunde inte ta bort referensen %s: %s"
-#: refs/files-backend.c:2246
+#: refs/files-backend.c:2537
#, c-format
msgid "could not delete references: %s"
msgstr "kunde inte ta bort referenser: %s"
-#: refs/files-backend.c:2255
+#: refs/files-backend.c:2546
#, c-format
msgid "could not remove reference %s"
msgstr "kunde inte ta bort referensen %s"
@@ -1301,74 +1562,74 @@ msgstr "%s spårar både %s och %s"
msgid "Internal error"
msgstr "Internt fel"
-#: remote.c:1678 remote.c:1721
+#: remote.c:1677 remote.c:1720
msgid "HEAD does not point to a branch"
msgstr "HEAD pekar inte på en gren"
-#: remote.c:1687
+#: remote.c:1686
#, c-format
msgid "no such branch: '%s'"
msgstr "okänd gren: \"%s\""
-#: remote.c:1690
+#: remote.c:1689
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "ingen standarduppström angiven för grenen \"%s\""
-#: remote.c:1696
+#: remote.c:1695
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"
-#: remote.c:1711
+#: remote.c:1710
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren"
-#: remote.c:1726
+#: remote.c:1725
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "grenen \"%s\" har ingen fjärr för \"push\""
-#: remote.c:1737
+#: remote.c:1736
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
-#: remote.c:1750
+#: remote.c:1749
msgid "push has no destination (push.default is 'nothing')"
msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
-#: remote.c:1772
+#: remote.c:1771
msgid "cannot resolve 'simple' push to a single destination"
msgstr "\"enkel push\" motsvarar flera olika mål"
-#: remote.c:2074
+#: remote.c:2073
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n"
-#: remote.c:2078
+#: remote.c:2077
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"
-#: remote.c:2081
+#: remote.c:2080
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Din gren är à jour med \"%s\".\n"
-#: remote.c:2085
+#: remote.c:2084
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n"
msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"
-#: remote.c:2091
+#: remote.c:2090
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n"
-#: remote.c:2094
+#: remote.c:2093
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1378,11 +1639,11 @@ msgstr[0] ""
msgstr[1] ""
"Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
-#: remote.c:2102
+#: remote.c:2101
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n"
-#: remote.c:2105
+#: remote.c:2104
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1397,20 +1658,20 @@ msgstr[1] ""
"Din gren och \"%s\" har divergerat,\n"
"och har %d respektive %d olika incheckningar.\n"
-#: remote.c:2115
+#: remote.c:2114
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"
-#: revision.c:2142
+#: revision.c:2132
msgid "your current branch appears to be broken"
msgstr "din nuvarande gren verkar vara trasig"
-#: revision.c:2145
+#: revision.c:2135
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"
-#: revision.c:2339
+#: revision.c:2329
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent är inkompatibelt med --bisect"
@@ -1423,15 +1684,15 @@ msgstr "misslyckades öppna /dev/null"
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) misslyckades"
-#: send-pack.c:295
+#: send-pack.c:298
msgid "failed to sign the push certificate"
msgstr "misslyckades underteckna push-certifikatet"
-#: send-pack.c:404
+#: send-pack.c:411
msgid "the receiving end does not support --signed push"
msgstr "mottagarsidan stöder inte push med --signed"
-#: send-pack.c:406
+#: send-pack.c:413
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -1439,10 +1700,14 @@ msgstr ""
"sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
"signed"
-#: send-pack.c:418
+#: send-pack.c:425
msgid "the receiving end does not support --atomic push"
msgstr "mottagarsidan stöder inte push med --atomic"
+#: send-pack.c:430
+msgid "the receiving end does not support push options"
+msgstr "mottagarsidan stöder inte push-flaggor"
+
#: sequencer.c:174
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
@@ -1461,15 +1726,15 @@ msgstr ""
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
"och checka in resultatet med \"git commit\""
-#: sequencer.c:190 sequencer.c:833 sequencer.c:912
+#: sequencer.c:190 sequencer.c:841 sequencer.c:924
#, c-format
msgid "Could not write to %s"
msgstr "Kunde inte skriva till %s"
-#: sequencer.c:193
+#: sequencer.c:193 sequencer.c:843 sequencer.c:928
#, c-format
-msgid "Error wrapping up %s"
-msgstr "Fel vid ombrytning av %s"
+msgid "Error wrapping up %s."
+msgstr "Fel vid ombrytning av %s."
#: sequencer.c:208
msgid "Your local changes would be overwritten by cherry-pick."
@@ -1483,202 +1748,242 @@ msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"."
msgid "Commit your changes or stash them to proceed."
msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta."
+#: sequencer.c:228
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: snabbspola"
+
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:300
+#: sequencer.c:303
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Kunde inte skriva ny indexfil"
-#: sequencer.c:318
+#: sequencer.c:321
msgid "Could not resolve HEAD commit\n"
msgstr "Kunde inte bestämma HEAD:s incheckning\n"
-#: sequencer.c:338
+#: sequencer.c:341
msgid "Unable to update cache tree\n"
msgstr "Kan inte uppdatera cacheträd\n"
-#: sequencer.c:390
+#: sequencer.c:393
#, c-format
msgid "Could not parse commit %s\n"
msgstr "Kunde inte tolka incheckningen %s\n"
-#: sequencer.c:395
+#: sequencer.c:398
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "Kunde inte tolka föräldraincheckningen %s\n"
-#: sequencer.c:460
+#: sequencer.c:463
msgid "Your index file is unmerged."
msgstr "Din indexfil har inte slagits ihop."
-#: sequencer.c:479
+#: sequencer.c:482
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "Incheckning %s är en sammanslagning, men flaggan -m angavs inte."
-#: sequencer.c:487
+#: sequencer.c:490
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "Incheckning %s har inte förälder %d"
-#: sequencer.c:491
+#: sequencer.c:494
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning"
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:504
+#: sequencer.c:507
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
-#: sequencer.c:508
+#: sequencer.c:511
#, c-format
msgid "Cannot get commit message for %s"
msgstr "Kan inte hämta incheckningsmeddelande för %s"
-#: sequencer.c:594
+#: sequencer.c:597
#, c-format
msgid "could not revert %s... %s"
msgstr "kunde inte ångra %s... %s"
-#: sequencer.c:595
+#: sequencer.c:598
#, c-format
msgid "could not apply %s... %s"
msgstr "kunde inte tillämpa %s... %s"
-#: sequencer.c:630
+#: sequencer.c:633
msgid "empty commit set passed"
msgstr "den angivna uppsättningen incheckningar är tom"
-#: sequencer.c:638
+#: sequencer.c:641
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: misslyckades läsa indexet"
-#: sequencer.c:642
+#: sequencer.c:645
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
-#: sequencer.c:702
-#, c-format
-msgid "Cannot %s during a %s"
-msgstr "kan inte %s under en %s"
+#: sequencer.c:705
+msgid "Cannot revert during another revert."
+msgstr "Kan inte utföra \"revert\" under en annan \"revert\"."
+
+#: sequencer.c:706
+msgid "Cannot revert during a cherry-pick."
+msgstr "Kan inte utföra \"revert\" under en \"cherry-pick\"."
+
+#: sequencer.c:709
+msgid "Cannot cherry-pick during a revert."
+msgstr "Kan inte utföra \"cherry-pick\" under en \"revert\"."
+
+#: sequencer.c:710
+msgid "Cannot cherry-pick during another cherry-pick."
+msgstr "Kan inte utföra \"cherry-pick\" under en annan \"cherry-pick\"."
-#: sequencer.c:724
+#: sequencer.c:732
#, c-format
msgid "Could not parse line %d."
msgstr "Kan inte tolka rad %d."
-#: sequencer.c:729
+#: sequencer.c:737
msgid "No commits parsed."
msgstr "Inga incheckningar lästes."
-#: sequencer.c:741
+#: sequencer.c:749
#, c-format
msgid "Could not open %s"
msgstr "Kunde inte öppna %s"
-#: sequencer.c:745
+#: sequencer.c:753
#, c-format
msgid "Could not read %s."
msgstr "kunde inte läsa %s."
-#: sequencer.c:752
+#: sequencer.c:760
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "Oanvändbart manus: %s"
-#: sequencer.c:782
+#: sequencer.c:790
#, c-format
msgid "Invalid key: %s"
msgstr "Felaktig nyckel: %s"
-#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52
+#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Felaktigt värde för %s: %s"
-#: sequencer.c:795
+#: sequencer.c:803
#, c-format
msgid "Malformed options sheet: %s"
msgstr "Trasigt manus: %s"
-#: sequencer.c:814
+#: sequencer.c:822
msgid "a cherry-pick or revert is already in progress"
msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"
-#: sequencer.c:815
+#: sequencer.c:823
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:819
+#: sequencer.c:827
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: sequencer.c:835 sequencer.c:916
-#, c-format
-msgid "Error wrapping up %s."
-msgstr "Fel vid ombrytning av %s."
-
-#: sequencer.c:854 sequencer.c:986
+#: sequencer.c:862 sequencer.c:998
msgid "no cherry-pick or revert in progress"
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-#: sequencer.c:856
+#: sequencer.c:864
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
-#: sequencer.c:858
+#: sequencer.c:866 sequencer.c:900
msgid "cannot abort from a branch yet to be born"
msgstr "kan inte avbryta från en gren som ännu inte är född"
-#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
+#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
#, c-format
msgid "cannot open %s"
msgstr "kan inte öppna %s"
-#: sequencer.c:880
+#: sequencer.c:888
#, c-format
msgid "cannot read %s: %s"
msgstr "kan inte läsa %s: %s"
-#: sequencer.c:881
+#: sequencer.c:889
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:887
+#: sequencer.c:895
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"
-#: sequencer.c:909
+#: sequencer.c:921
#, c-format
msgid "Could not format %s."
msgstr "Kunde inte formatera %s."
-#: sequencer.c:1054
+#: sequencer.c:1066
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
-#: sequencer.c:1057
+#: sequencer.c:1069
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
-#: sequencer.c:1091
+#: sequencer.c:1102
msgid "Can't revert as initial commit"
msgstr "Kan inte ångra som första incheckning"
-#: sequencer.c:1092
-msgid "Can't cherry-pick into empty head"
-msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"
+#: setup.c:160
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s: sökvägen finns inte i arbetskatalogen.\n"
+"Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns "
+"lokalt."
+
+#: setup.c:173
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"tvetydigt argument \"%s\": okänd revision eller sökväg inte i "
+"arbetskatalogen.\n"
+"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
+"\"git <kommando> [<revision>...] -- [<fil>...]\""
+
+#: setup.c:223
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"tvetydigt argument \"%s\": både revision och filnamn\n"
+"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
+"\"git <kommando> [<revision>...] -- [<fil>...]\""
-#: setup.c:248
+#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
#, c-format
msgid "failed to read %s"
msgstr "misslyckades läsa %s"
@@ -1692,16 +1997,53 @@ msgstr "Förväntade git-arkivversion <= %d, hittade %d"
msgid "unknown repository extensions found:"
msgstr "okända arkivutökningar hittades:"
-#: sha1_file.c:1080
+#: setup.c:762
+#, c-format
+msgid "Not a git repository (or any of the parent directories): %s"
+msgstr "Inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"
+
+#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+msgid "Cannot come back to cwd"
+msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
+
+#: setup.c:845
+msgid "Unable to read current working directory"
+msgstr "Kan inte läsa aktuell arbetskatalog"
+
+#: setup.c:920
+#, c-format
+msgid ""
+"Not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgstr ""
+"Inte ett git-arkiv (eller någon av föräldrakatalogerna upp till "
+"monteringspunkten %s)\n"
+"Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."
+
+#: setup.c:927
+#, c-format
+msgid "Cannot change to '%s/..'"
+msgstr "kan inte byta till \"%s/..\""
+
+#: setup.c:989
+#, c-format
+msgid ""
+"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"Problem med filläges-värdet i core.sharedRepository (0%.3o).\n"
+"Ägaren av filerna måste alltid ha läs- och skrivbehörighet."
+
+#: sha1_file.c:1046
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset före slutet av packfilen (trasig .idx?)"
-#: sha1_file.c:2458
+#: sha1_file.c:2434
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset före slutet av packindex för %s (trasigt index?)"
-#: sha1_file.c:2462
+#: sha1_file.c:2438
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
@@ -1757,7 +2099,7 @@ msgstr "misslyckades köa uppdaterad .gitmodules"
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "negativa värden är inte tillåtna för submodule.fetchJobs"
-#: submodule-config.c:355
+#: submodule-config.c:358
#, c-format
msgid "invalid value for %s"
msgstr "ogiltigt värde för %s"
@@ -1816,6 +2158,56 @@ msgstr "kunde inte öppna temporär file"
msgid "could not rename temporary file to %s"
msgstr "kunde inte byta nman på temporära file till %s"
+#: transport.c:62
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"
+
+#: transport.c:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: ogiltig flagga för depth: %s"
+
+#: transport.c:771
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Följande undermodulsökvägar innehåller ändringar som\n"
+"inte kan hittas av fjärrarna:\n"
+
+#: transport.c:775
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Testa\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"eller cd till sökvägen och använd\n"
+"\n"
+"\tgit push\n"
+"\n"
+"för att sända dem till fjärren.\n"
+"\n"
+
+#: transport.c:783
+msgid "Aborting."
+msgstr "Avbryter."
+
#: transport-helper.c:1041
#, c-format
msgid "Could not read ref %s"
@@ -1825,7 +2217,7 @@ msgstr "Kunde inte läsa referensen %s"
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
-"%%sPlease commit your changes or stash them before you can switch branches."
+"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
@@ -1843,7 +2235,7 @@ msgstr ""
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you can merge."
+"%%sPlease commit your changes or stash them before you merge."
msgstr ""
"Dina lokala ändringar av följande filer skulle skrivas över av "
"sammanslagning:\n"
@@ -1863,11 +2255,10 @@ msgstr ""
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you can %s."
+"%%sPlease commit your changes or stash them before you %s."
msgstr ""
"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
-"%%sChecka in dina ändringar eller använd \"stash\" innan du kan utföra \"%s"
-"\"."
+"%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"."
#: unpack-trees.c:76
#, c-format
@@ -1892,7 +2283,7 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you can switch branches."
+"%%sPlease move or remove them before you switch branches."
msgstr ""
"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
@@ -1910,11 +2301,11 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you can merge."
+"%%sPlease move or remove them before you merge."
msgstr ""
"Följande ospårade filer i arbetskatalogen skulle tas bort av "
"sammanslagningen:\n"
-"%%sFlytta eller ta bort dem innan du byter gren."
+"%%sFlytta eller ta bort dem innan du slår samman."
#: unpack-trees.c:92
#, c-format
@@ -1930,10 +2321,10 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you can %s."
+"%%sPlease move or remove them before you %s."
msgstr ""
"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
-"%%sFlytta eller ta bort dem innan du kan utföra \"%s\"."
+"%%sFlytta eller ta bort dem innan du \"%s\"."
#: unpack-trees.c:97
#, c-format
@@ -1949,7 +2340,7 @@ msgstr ""
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
-"%%sPlease move or remove them before you can switch branches."
+"%%sPlease move or remove them before you switch branches."
msgstr ""
"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
"utcheckningen:\n"
@@ -1970,7 +2361,7 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you can merge."
+"%%sPlease move or remove them before you merge."
msgstr ""
"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
"sammanslagningen:\n"
@@ -1990,10 +2381,10 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you can %s."
+"%%sPlease move or remove them before you %s."
msgstr ""
"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
-"%%sFlytta eller ta bort dem innan du kan \"%s\"."
+"%%sFlytta eller ta bort dem innan du \"%s\"."
#: unpack-trees.c:114
#, c-format
@@ -2078,43 +2469,43 @@ msgstr "felaktigt portnummer"
msgid "invalid '..' path segment"
msgstr "felaktigt \"..\"-sökvägssegment"
-#: wrapper.c:222 wrapper.c:381
+#: worktree.c:282
+#, c-format
+msgid "failed to read '%s'"
+msgstr "misslyckades läsa \"%s\""
+
+#: wrapper.c:222 wrapper.c:392
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
-#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
#, c-format
msgid "could not open '%s' for writing"
msgstr "kunde inte öppna \"%s\" för skrivning"
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
-#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
+#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
#: builtin/pull.c:407
#, c-format
msgid "could not open '%s' for reading"
msgstr "kunde inte öppna \"%s\" för läsning"
-#: wrapper.c:594 wrapper.c:615
+#: wrapper.c:605 wrapper.c:626
#, c-format
msgid "unable to access '%s'"
msgstr "kan inte komma åt \"%s\""
-#: wrapper.c:623
+#: wrapper.c:634
msgid "unable to get current working directory"
msgstr "kan inte hämta aktuell arbetskatalog"
-#: wrapper.c:650
-#, c-format
-msgid "could not open %s for writing"
-msgstr "kunde inte öppna %s för skrivning"
-
-#: wrapper.c:661 builtin/am.c:410
+#: wrapper.c:658
#, c-format
msgid "could not write to %s"
msgstr "kunde inte skriva till %s"
-#: wrapper.c:667
+#: wrapper.c:660
#, c-format
msgid "could not close %s"
msgstr "kunde inte stänga %s"
@@ -2144,11 +2535,11 @@ msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
-#: wt-status.c:198 wt-status.c:881
+#: wt-status.c:198 wt-status.c:882
msgid "Changes to be committed:"
msgstr "Ändringar att checka in:"
-#: wt-status.c:216 wt-status.c:890
+#: wt-status.c:216 wt-status.c:891
msgid "Changes not staged for commit:"
msgstr "Ändringar ej i incheckningskön:"
@@ -2208,11 +2599,6 @@ msgstr "tillagt av bägge:"
msgid "both modified:"
msgstr "ändrat av bägge:"
-#: wt-status.c:266
-#, c-format
-msgid "bug: unhandled unmerged status %x"
-msgstr "programfel: ej hanterad \"unmerged\"-status %x"
-
#: wt-status.c:274
msgid "new file:"
msgstr "ny fil:"
@@ -2257,20 +2643,15 @@ msgstr "ändrat innehåll, "
msgid "untracked content, "
msgstr "ospårat innehåll, "
-#: wt-status.c:391
-#, c-format
-msgid "bug: unhandled diff status %c"
-msgstr "programfel: diff-status %c ej hanterad"
-
-#: wt-status.c:755
+#: wt-status.c:756
msgid "Submodules changed but not updated:"
msgstr "Undermoduler ändrade men inte uppdaterade:"
-#: wt-status.c:757
+#: wt-status.c:758
msgid "Submodule changes to be committed:"
msgstr "Undermodulers ändringar att checka in:"
-#: wt-status.c:838
+#: wt-status.c:839
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -2278,99 +2659,103 @@ msgstr ""
"Rör inte raden ovan.\n"
"Allt nedan kommer tas bort."
-#: wt-status.c:949
+#: wt-status.c:950
msgid "You have unmerged paths."
msgstr "Du har ej sammanslagna sökvägar."
-#: wt-status.c:952
+#: wt-status.c:953
msgid " (fix conflicts and run \"git commit\")"
msgstr " (rätta konflikter och kör \"git commit\")"
-#: wt-status.c:956
+#: wt-status.c:955
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)"
+
+#: wt-status.c:960
msgid "All conflicts fixed but you are still merging."
msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
-#: wt-status.c:959
+#: wt-status.c:963
msgid " (use \"git commit\" to conclude merge)"
msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
-#: wt-status.c:969
+#: wt-status.c:973
msgid "You are in the middle of an am session."
msgstr "Du är i mitten av en körning av \"git am\"."
-#: wt-status.c:972
+#: wt-status.c:976
msgid "The current patch is empty."
msgstr "Aktuell patch är tom."
-#: wt-status.c:976
+#: wt-status.c:980
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (rätta konflikter och kör sedan \"git am --continue\")"
-#: wt-status.c:978
+#: wt-status.c:982
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
-#: wt-status.c:980
+#: wt-status.c:984
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"
-#: wt-status.c:1105
+#: wt-status.c:1109
msgid "No commands done."
msgstr "Inga kommandon utförda."
-#: wt-status.c:1108
+#: wt-status.c:1112
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Sista kommandot utfört (%d kommando utfört):"
msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"
-#: wt-status.c:1119
+#: wt-status.c:1123
#, c-format
msgid " (see more in file %s)"
msgstr " (se fler i filen %s)"
-#: wt-status.c:1124
+#: wt-status.c:1128
msgid "No commands remaining."
msgstr "Inga kommandon återstår."
-#: wt-status.c:1127
+#: wt-status.c:1131
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"
msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"
-#: wt-status.c:1135
+#: wt-status.c:1139
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)"
-#: wt-status.c:1148
+#: wt-status.c:1152
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."
-#: wt-status.c:1153
+#: wt-status.c:1157
msgid "You are currently rebasing."
msgstr "Du håller på med en ombasering."
-#: wt-status.c:1167
+#: wt-status.c:1171
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
-#: wt-status.c:1169
+#: wt-status.c:1173
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
-#: wt-status.c:1171
+#: wt-status.c:1175
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
-#: wt-status.c:1177
+#: wt-status.c:1181
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
-#: wt-status.c:1181
+#: wt-status.c:1185
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -2378,122 +2763,122 @@ msgstr ""
"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:1186
+#: wt-status.c:1190
msgid "You are currently splitting a commit during a rebase."
msgstr "Du håller på att dela upp en incheckning i en ombasering."
-#: wt-status.c:1189
+#: wt-status.c:1193
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
-#: wt-status.c:1193
+#: wt-status.c:1197
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:1198
+#: wt-status.c:1202
msgid "You are currently editing a commit during a rebase."
msgstr "Du håller på att redigera en incheckning under en ombasering."
-#: wt-status.c:1201
+#: wt-status.c:1205
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"
-#: wt-status.c:1203
+#: wt-status.c:1207
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"
-#: wt-status.c:1213
+#: wt-status.c:1217
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."
-#: wt-status.c:1218
+#: wt-status.c:1222
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
-#: wt-status.c:1221
+#: wt-status.c:1225
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"
-#: wt-status.c:1223
+#: wt-status.c:1227
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"
"operationen)"
-#: wt-status.c:1232
+#: wt-status.c:1236
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Du håller på med att ångra incheckningen %s."
-#: wt-status.c:1237
+#: wt-status.c:1241
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"
-#: wt-status.c:1240
+#: wt-status.c:1244
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alla konflikter rättade: kör \"git revert --continue\")"
-#: wt-status.c:1242
+#: wt-status.c:1246
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"
-#: wt-status.c:1253
+#: wt-status.c:1257
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."
-#: wt-status.c:1257
+#: wt-status.c:1261
msgid "You are currently bisecting."
msgstr "Du håller på med en \"bisect\"."
-#: wt-status.c:1260
+#: wt-status.c:1264
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
-#: wt-status.c:1460
+#: wt-status.c:1464
msgid "On branch "
msgstr "PÃ¥ grenen "
-#: wt-status.c:1466
+#: wt-status.c:1470
msgid "interactive rebase in progress; onto "
msgstr "interaktiv ombasering pågår; ovanpå"
-#: wt-status.c:1468
+#: wt-status.c:1472
msgid "rebase in progress; onto "
msgstr "ombasering pågår; ovanpå"
-#: wt-status.c:1473
+#: wt-status.c:1477
msgid "HEAD detached at "
msgstr "HEAD frånkopplad vid "
-#: wt-status.c:1475
+#: wt-status.c:1479
msgid "HEAD detached from "
msgstr "HEAD frånkopplad från "
-#: wt-status.c:1478
+#: wt-status.c:1482
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
-#: wt-status.c:1496
+#: wt-status.c:1500
msgid "Initial commit"
msgstr "Första incheckning"
-#: wt-status.c:1510
+#: wt-status.c:1514
msgid "Untracked files"
msgstr "Ospårade filer"
-#: wt-status.c:1512
+#: wt-status.c:1516
msgid "Ignored files"
msgstr "Ignorerade filer"
-#: wt-status.c:1516
+#: wt-status.c:1520
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2505,32 +2890,32 @@ msgstr ""
"lägga till nya filer själv (se \"git help status\")."
# %s är nästa sträng eller tom.
-#: wt-status.c:1522
+#: wt-status.c:1526
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
-#: wt-status.c:1524
+#: wt-status.c:1528
msgid " (use -u option to show untracked files)"
msgstr " (använd flaggan -u för att visa ospårade filer)"
-#: wt-status.c:1530
+#: wt-status.c:1534
msgid "No changes"
msgstr "Inga ändringar"
-#: wt-status.c:1535
+#: wt-status.c:1539
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"
"\")\n"
-#: wt-status.c:1538
+#: wt-status.c:1542
#, c-format
msgid "no changes added to commit\n"
msgstr "inga ändringar att checka in\n"
-#: wt-status.c:1541
+#: wt-status.c:1545
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -2539,48 +2924,48 @@ msgstr ""
"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
"\")\n"
-#: wt-status.c:1544
+#: wt-status.c:1548
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "inget köat för incheckning, men ospårade filer finns\n"
-#: wt-status.c:1547
+#: wt-status.c:1551
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"
-#: wt-status.c:1550 wt-status.c:1555
+#: wt-status.c:1554 wt-status.c:1559
#, c-format
msgid "nothing to commit\n"
msgstr "inget att checka in\n"
-#: wt-status.c:1553
+#: wt-status.c:1557
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
-#: wt-status.c:1557
+#: wt-status.c:1561
#, c-format
-msgid "nothing to commit, working directory clean\n"
+msgid "nothing to commit, working tree clean\n"
msgstr "inget att checka in, arbetskatalogen ren\n"
-#: wt-status.c:1664
+#: wt-status.c:1668
msgid "Initial commit on "
msgstr "Första incheckning på "
-#: wt-status.c:1668
+#: wt-status.c:1672
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
-#: wt-status.c:1697
+#: wt-status.c:1701
msgid "gone"
msgstr "försvunnen"
-#: wt-status.c:1699 wt-status.c:1707
+#: wt-status.c:1703 wt-status.c:1711
msgid "behind "
msgstr "efter "
-#: wt-status.c:1702 wt-status.c:1705
+#: wt-status.c:1706 wt-status.c:1709
msgid "ahead "
msgstr "före "
@@ -2598,254 +2983,268 @@ msgstr "git add [<flaggor>] [--] <sökväg>..."
msgid "unexpected diff status %c"
msgstr "diff-status %c förväntades inte"
-#: builtin/add.c:70 builtin/commit.c:280
+#: builtin/add.c:71 builtin/commit.c:281
msgid "updating files failed"
msgstr "misslyckades uppdatera filer"
-#: builtin/add.c:80
+#: builtin/add.c:81
#, c-format
msgid "remove '%s'\n"
msgstr "ta bort \"%s\"\n"
-#: builtin/add.c:134
+#: builtin/add.c:136
msgid "Unstaged changes after refreshing the index:"
msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
-#: builtin/add.c:194 builtin/rev-parse.c:811
+#: builtin/add.c:196 builtin/rev-parse.c:811
msgid "Could not read the index"
msgstr "Kunde inte läsa indexet"
-#: builtin/add.c:205
+#: builtin/add.c:207
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Kunde inte öppna \"%s\" för skrivning"
-#: builtin/add.c:209
+#: builtin/add.c:211
msgid "Could not write patch"
msgstr "Kunde inte skriva patch"
-#: builtin/add.c:212
+#: builtin/add.c:214
msgid "editing patch failed"
msgstr "redigering av patch misslyckades"
-#: builtin/add.c:215
+#: builtin/add.c:217
#, c-format
msgid "Could not stat '%s'"
msgstr "Kunde inte ta status på \"%s\""
-#: builtin/add.c:217
+#: builtin/add.c:219
msgid "Empty patch. Aborted."
msgstr "Tom patch. Avbryter."
-#: builtin/add.c:222
+#: builtin/add.c:224
#, c-format
msgid "Could not apply '%s'"
msgstr "Kunde inte tillämpa \"%s\""
-#: builtin/add.c:232
+#: builtin/add.c:234
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
-#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
-#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
+#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "testkörning"
-#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
-#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
-#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
+#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
+#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
msgid "be verbose"
msgstr "var pratsam"
-#: builtin/add.c:252
+#: builtin/add.c:256
msgid "interactive picking"
msgstr "plocka interaktivt"
-#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
+#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "välj stycken interaktivt"
-#: builtin/add.c:254
+#: builtin/add.c:258
msgid "edit current diff and apply"
msgstr "redigera aktuell diff och applicera"
-#: builtin/add.c:255
+#: builtin/add.c:259
msgid "allow adding otherwise ignored files"
msgstr "tillåt lägga till annars ignorerade filer"
-#: builtin/add.c:256
+#: builtin/add.c:260
msgid "update tracked files"
msgstr "uppdatera spårade filer"
-#: builtin/add.c:257
+#: builtin/add.c:261
msgid "record only the fact that the path will be added later"
msgstr "registrera endast att sökvägen kommer läggas till senare"
-#: builtin/add.c:258
+#: builtin/add.c:262
msgid "add changes from all tracked and untracked files"
msgstr "lägg till ändringar från alla spårade och ospårade filer"
-#: builtin/add.c:261
+#: builtin/add.c:265
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)"
-#: builtin/add.c:263
+#: builtin/add.c:267
msgid "don't add, only refresh the index"
msgstr "lägg inte till, uppdatera endast indexet"
-#: builtin/add.c:264
+#: builtin/add.c:268
msgid "just skip files which cannot be added because of errors"
msgstr "hoppa bara över filer som inte kan läggas till på grund av fel"
-#: builtin/add.c:265
+#: builtin/add.c:269
msgid "check if - even missing - files are ignored in dry run"
msgstr "se om - även saknade - filer ignoreras i testkörning"
-#: builtin/add.c:287
+#: builtin/add.c:270 builtin/update-index.c:958
+msgid "(+/-)x"
+msgstr "(+/-)x"
+
+#: builtin/add.c:270 builtin/update-index.c:959
+msgid "override the executable bit of the listed files"
+msgstr "överstyr exekveringsbiten för angivna filer"
+
+#: builtin/add.c:292
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Använd -f om du verkligen vill lägga till dem.\n"
-#: builtin/add.c:294
+#: builtin/add.c:300
msgid "adding files failed"
msgstr "misslyckades lägga till filer"
-#: builtin/add.c:330
+#: builtin/add.c:336
msgid "-A and -u are mutually incompatible"
msgstr "-A och -u är ömsesidigt inkompatibla"
-#: builtin/add.c:337
+#: builtin/add.c:343
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
#: builtin/add.c:352
#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"
+
+#: builtin/add.c:367
+#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Inget angivet, inget tillagt.\n"
-#: builtin/add.c:353
+#: builtin/add.c:368
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Kanske menade du att skriva \"git add .\"?\n"
-#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
+#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
#: builtin/submodule--helper.c:240
msgid "index file corrupt"
msgstr "indexfilen trasig"
-#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
+#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
-#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
+#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
#, c-format
msgid "could not read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: builtin/am.c:430
+#: builtin/am.c:426
msgid "could not parse author script"
msgstr "kunde inte tolka författarskript"
-#: builtin/am.c:507
+#: builtin/am.c:503
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "\"%s\" togs bort av kroken applypatch-msg"
-#: builtin/am.c:548 builtin/notes.c:300
+#: builtin/am.c:544 builtin/notes.c:301
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Felaktig indatarad: \"%s\"."
-#: builtin/am.c:585 builtin/notes.c:315
+#: builtin/am.c:581 builtin/notes.c:316
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
-#: builtin/am.c:611
+#: builtin/am.c:607
msgid "fseek failed"
msgstr "\"fseek\" misslyckades"
-#: builtin/am.c:788
+#: builtin/am.c:787
#, c-format
msgid "could not parse patch '%s'"
msgstr "kunde inte tolka patchen \"%s\""
-#: builtin/am.c:853
+#: builtin/am.c:852
msgid "Only one StGIT patch series can be applied at once"
msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"
-#: builtin/am.c:900
+#: builtin/am.c:899
msgid "invalid timestamp"
msgstr "ogiltig tidsstämpel"
-#: builtin/am.c:903 builtin/am.c:911
+#: builtin/am.c:902 builtin/am.c:910
msgid "invalid Date line"
msgstr "ogiltig \"Date\"-rad"
-#: builtin/am.c:908
+#: builtin/am.c:907
msgid "invalid timezone offset"
msgstr "ogiltig tidszons-offset"
-#: builtin/am.c:995
+#: builtin/am.c:996
msgid "Patch format detection failed."
msgstr "Misslyckades detektera patchformat."
-#: builtin/am.c:1000 builtin/clone.c:380
+#: builtin/am.c:1001 builtin/clone.c:380
#, c-format
msgid "failed to create directory '%s'"
msgstr "misslyckades skapa katalogen \"%s\""
-#: builtin/am.c:1004
+#: builtin/am.c:1005
msgid "Failed to split patches."
msgstr "Misslyckades dela patchar."
-#: builtin/am.c:1136 builtin/commit.c:365
+#: builtin/am.c:1137 builtin/commit.c:366
msgid "unable to write index file"
msgstr "kan inte skriva indexfil"
-#: builtin/am.c:1187
+#: builtin/am.c:1188
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "När du har löst problemet, kör \"%s --continue\"."
-#: builtin/am.c:1188
+#: builtin/am.c:1189
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället."
-#: builtin/am.c:1189
+#: builtin/am.c:1190
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"."
-#: builtin/am.c:1327
+#: builtin/am.c:1328
msgid "Patch is empty. Was it split wrong?"
msgstr "Patchen är tom. Delades den upp felaktigt?"
-#: builtin/am.c:1401 builtin/log.c:1516
+#: builtin/am.c:1402 builtin/log.c:1543
#, c-format
msgid "invalid ident line: %s"
msgstr "ogiltig ident-rad: %s"
-#: builtin/am.c:1428
+#: builtin/am.c:1429
#, c-format
msgid "unable to parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: builtin/am.c:1630
+#: builtin/am.c:1602
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Arkivet saknar objekt som behövs för att falla tillbaka på 3-"
"vägssammanslagning."
-#: builtin/am.c:1632
+#: builtin/am.c:1604
msgid "Using index info to reconstruct a base tree..."
msgstr "Använder indexinfo för att återskapa ett basträd..."
-#: builtin/am.c:1651
+#: builtin/am.c:1623
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2853,39 +3252,39 @@ msgstr ""
"Har du handredigerat din patch?\n"
"Den kan inte tillämpas på blobbar som antecknats i dess index."
-#: builtin/am.c:1657
+#: builtin/am.c:1629
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
-#: builtin/am.c:1672
+#: builtin/am.c:1654
msgid "Failed to merge in the changes."
msgstr "Misslyckades slå ihop ändringarna."
-#: builtin/am.c:1696 builtin/merge.c:636
+#: builtin/am.c:1679 builtin/merge.c:628
msgid "git write-tree failed to write a tree"
msgstr "git write-tree misslyckades skriva ett träd"
-#: builtin/am.c:1703
+#: builtin/am.c:1686
msgid "applying to an empty history"
msgstr "tillämpar på en tom historik"
-#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
-#: builtin/merge.c:866
+#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
+#: builtin/merge.c:823
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
-#: builtin/am.c:1748 builtin/am.c:1752
+#: builtin/am.c:1731 builtin/am.c:1735
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "kan inte återuppta: %s finns inte."
-#: builtin/am.c:1768
+#: builtin/am.c:1751
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"kan inte vara interaktiv om standard in inte är ansluten till en terminal."
-#: builtin/am.c:1773
+#: builtin/am.c:1756
msgid "Commit Body is:"
msgstr "Incheckningskroppen är:"
@@ -2893,35 +3292,35 @@ msgstr "Incheckningskroppen är:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1783
+#: builtin/am.c:1766
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "
-#: builtin/am.c:1833
+#: builtin/am.c:1816
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
-#: builtin/am.c:1868 builtin/am.c:1940
+#: builtin/am.c:1853 builtin/am.c:1925
#, c-format
msgid "Applying: %.*s"
msgstr "Tillämpar: %.*s"
-#: builtin/am.c:1884
+#: builtin/am.c:1869
msgid "No changes -- Patch already applied."
msgstr "Inga ändringar -- Patchen har redan tillämpats."
-#: builtin/am.c:1892
+#: builtin/am.c:1877
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch misslyckades på %s %.*s"
-#: builtin/am.c:1898
+#: builtin/am.c:1883
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "En kopia av patchen som misslyckades finns i: %s"
-#: builtin/am.c:1943
+#: builtin/am.c:1928
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2931,7 +3330,7 @@ msgstr ""
"Om det inte är något kvar att köa kan det hända att något annat redan\n"
"introducerat samma ändringar; kanske du bör hoppa över patchen."
-#: builtin/am.c:1950
+#: builtin/am.c:1935
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2939,17 +3338,17 @@ msgstr ""
"Du har fortfarande sökvägar som inte slagits samman i ditt index.\n"
"Glömde du använda \"git add\"?"
-#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
+#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Kan inte tolka objektet \"%s\""
-#: builtin/am.c:2110
+#: builtin/am.c:2095
msgid "failed to clean index"
msgstr "misslyckades städa upp indexet"
-#: builtin/am.c:2144
+#: builtin/am.c:2129
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -2957,154 +3356,154 @@ msgstr ""
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
"Återställer inte till ORIG_HEAD"
-#: builtin/am.c:2205
+#: builtin/am.c:2192
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Felaktigt värde för --patch-format: %s"
-#: builtin/am.c:2238
+#: builtin/am.c:2225
msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr "git am [<flaggor>] [(<mbox>|<Maildir>)...]"
-#: builtin/am.c:2239
+#: builtin/am.c:2226
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
-#: builtin/am.c:2245
+#: builtin/am.c:2232
msgid "run interactively"
msgstr "kör interaktivt"
-#: builtin/am.c:2247
+#: builtin/am.c:2234
msgid "historical option -- no-op"
msgstr "historisk flagga -- no-op"
-#: builtin/am.c:2249
+#: builtin/am.c:2236
msgid "allow fall back on 3way merging if needed"
msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
-#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
-#: builtin/repack.c:171
+#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
+#: builtin/repack.c:172
msgid "be quiet"
msgstr "var tyst"
-#: builtin/am.c:2252
+#: builtin/am.c:2239
msgid "add a Signed-off-by line to the commit message"
msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
-#: builtin/am.c:2255
+#: builtin/am.c:2242
msgid "recode into utf8 (default)"
msgstr "koda om till utf8 (standard)"
-#: builtin/am.c:2257
+#: builtin/am.c:2244
msgid "pass -k flag to git-mailinfo"
msgstr "sänd flaggan -k till git-mailinfo"
-#: builtin/am.c:2259
+#: builtin/am.c:2246
msgid "pass -b flag to git-mailinfo"
msgstr "sänd flaggan -b till git-mailinfo"
-#: builtin/am.c:2261
+#: builtin/am.c:2248
msgid "pass -m flag to git-mailinfo"
msgstr "sänd flaggan -m till git-mailinfo"
-#: builtin/am.c:2263
+#: builtin/am.c:2250
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"
-#: builtin/am.c:2266
+#: builtin/am.c:2253
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"
-#: builtin/am.c:2269
+#: builtin/am.c:2256
msgid "strip everything before a scissors line"
msgstr "ta bort allting före en saxlinje"
-#: builtin/am.c:2270 builtin/apply.c:4546
+#: builtin/am.c:2257 builtin/apply.c:4837
msgid "action"
msgstr "åtgärd"
-#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
-#: builtin/am.c:2298
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
+#: builtin/am.c:2285
msgid "pass it through git-apply"
msgstr "sänd det genom git-apply"
-#: builtin/am.c:2279 builtin/apply.c:4570
+#: builtin/am.c:2266 builtin/apply.c:4861
msgid "root"
msgstr "rot"
-#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
-#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
+#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
-#: builtin/submodule--helper.c:770
+#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:826
msgid "path"
msgstr "sökväg"
-#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134
-#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182
+#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134
+#: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185
#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
#: parse-options.h:132 parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2291 builtin/apply.c:4514
+#: builtin/am.c:2278 builtin/apply.c:4805
msgid "num"
msgstr "antal"
-#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "format"
-#: builtin/am.c:2295
+#: builtin/am.c:2282
msgid "format the patch(es) are in"
msgstr "format för patch(ar)"
-#: builtin/am.c:2301
+#: builtin/am.c:2288
msgid "override error message when patch failure occurs"
msgstr "överstyr felmeddelanden när patchfel uppstår"
-#: builtin/am.c:2303
+#: builtin/am.c:2290
msgid "continue applying patches after resolving a conflict"
msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
-#: builtin/am.c:2306
+#: builtin/am.c:2293
msgid "synonyms for --continue"
msgstr "synonymer till --continue"
-#: builtin/am.c:2309
+#: builtin/am.c:2296
msgid "skip the current patch"
msgstr "hoppa över den aktuella grenen"
-#: builtin/am.c:2312
+#: builtin/am.c:2299
msgid "restore the original branch and abort the patching operation."
msgstr "återställ originalgrenen och avbryt patchningen."
-#: builtin/am.c:2316
+#: builtin/am.c:2303
msgid "lie about committer date"
msgstr "ljug om incheckningsdatum"
-#: builtin/am.c:2318
+#: builtin/am.c:2305
msgid "use current timestamp for author date"
msgstr "använd nuvarande tidsstämpel för författardatum"
-#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "nyckel-id"
-#: builtin/am.c:2321
+#: builtin/am.c:2308
msgid "GPG-sign commits"
msgstr "GPG-signera incheckningar"
-#: builtin/am.c:2324
+#: builtin/am.c:2311
msgid "(internal use for git-rebase)"
msgstr "(används internt av git-rebase)"
-#: builtin/am.c:2339
+#: builtin/am.c:2326
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -3112,16 +3511,16 @@ msgstr ""
"Flaggan -b/--binary har varit utan funktion länge, och\n"
"kommer tas bort. Vi ber dig att inte använda den längre."
-#: builtin/am.c:2346
+#: builtin/am.c:2333
msgid "failed to read the index"
msgstr "misslyckades läsa indexet"
-#: builtin/am.c:2361
+#: builtin/am.c:2348
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."
-#: builtin/am.c:2385
+#: builtin/am.c:2372
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -3130,70 +3529,70 @@ msgstr ""
"Kvarbliven katalog %s hittades.\n"
"Använd \"git am --abort\" för att ta bort den."
-#: builtin/am.c:2391
+#: builtin/am.c:2378
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
-#: builtin/apply.c:59
+#: builtin/apply.c:122
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<flaggor>] [<patch>...]"
-#: builtin/apply.c:111
+#: builtin/apply.c:153
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "okänt alternativ för whitespace: \"%s\""
-#: builtin/apply.c:126
+#: builtin/apply.c:169
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "okänt alternativ för ignore-whitespace: \"%s\""
-#: builtin/apply.c:818
+#: builtin/apply.c:854
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
-#: builtin/apply.c:827
+#: builtin/apply.c:863
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec returnerade %d för indata: %s"
-#: builtin/apply.c:908
+#: builtin/apply.c:947
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "kan inte hitta filnamn i patchen på rad %d"
-#: builtin/apply.c:937
+#: builtin/apply.c:984
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d"
-#: builtin/apply.c:942
+#: builtin/apply.c:989
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d"
-#: builtin/apply.c:943
+#: builtin/apply.c:990
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"
-#: builtin/apply.c:949
+#: builtin/apply.c:995
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"
-#: builtin/apply.c:1406
+#: builtin/apply.c:1489
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: förväntade rad: %.*s"
-#: builtin/apply.c:1463
+#: builtin/apply.c:1550
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "patch-fragment utan huvud på rad %d: %.*s"
-#: builtin/apply.c:1480
+#: builtin/apply.c:1567
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -3209,77 +3608,77 @@ msgstr[1] ""
"sökvägskomponenter\n"
"tas bort (rad %d)"
-#: builtin/apply.c:1646
+#: builtin/apply.c:1743
msgid "new file depends on old contents"
msgstr "ny fil beror på gammalt innehåll"
-#: builtin/apply.c:1648
+#: builtin/apply.c:1745
msgid "deleted file still has contents"
msgstr "borttagen fil har fortfarande innehåll"
-#: builtin/apply.c:1674
+#: builtin/apply.c:1774
#, c-format
msgid "corrupt patch at line %d"
msgstr "trasig patch på rad %d"
-#: builtin/apply.c:1710
+#: builtin/apply.c:1810
#, c-format
msgid "new file %s depends on old contents"
msgstr "nya filen %s beror på gammalt innehåll"
-#: builtin/apply.c:1712
+#: builtin/apply.c:1812
#, c-format
msgid "deleted file %s still has contents"
msgstr "borttagna filen %s har fortfarande innehåll"
-#: builtin/apply.c:1715
+#: builtin/apply.c:1815
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** varning: filen %s blir tom men har inte tagits bort"
-#: builtin/apply.c:1861
+#: builtin/apply.c:1962
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "trasig binärpatch på rad %d: %.*s"
-#: builtin/apply.c:1895
+#: builtin/apply.c:1999
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "binärpatchen på rad %d känns inte igen"
-#: builtin/apply.c:2048
+#: builtin/apply.c:2154
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch med bara skräp på rad %d"
-#: builtin/apply.c:2138
+#: builtin/apply.c:2244
#, c-format
msgid "unable to read symlink %s"
msgstr "kunde inte läsa symboliska länken %s"
-#: builtin/apply.c:2142
+#: builtin/apply.c:2248
#, c-format
msgid "unable to open or read %s"
msgstr "kunde inte öppna eller läsa %s"
-#: builtin/apply.c:2775
+#: builtin/apply.c:2901
#, c-format
msgid "invalid start of line: '%c'"
msgstr "felaktig inledning på rad: \"%c\""
-#: builtin/apply.c:2894
+#: builtin/apply.c:3020
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Stycke %d lyckades på %d (offset %d rad)."
msgstr[1] "Stycke %d lyckades på %d (offset %d rader)."
-#: builtin/apply.c:2906
+#: builtin/apply.c:3032
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d"
-#: builtin/apply.c:2912
+#: builtin/apply.c:3038
#, c-format
msgid ""
"while searching for:\n"
@@ -3288,335 +3687,330 @@ msgstr ""
"vid sökning efter:\n"
"%.*s"
-#: builtin/apply.c:2932
+#: builtin/apply.c:3060
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "saknar binära patchdata för \"%s\""
-#: builtin/apply.c:3033
+#: builtin/apply.c:3163
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "binärpatchen kan inte tillämpas på \"%s\""
-#: builtin/apply.c:3039
+#: builtin/apply.c:3169
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)"
-#: builtin/apply.c:3060
+#: builtin/apply.c:3190
#, c-format
msgid "patch failed: %s:%ld"
msgstr "patch misslyckades: %s:%ld"
-#: builtin/apply.c:3184
+#: builtin/apply.c:3314
#, c-format
msgid "cannot checkout %s"
msgstr "kan inte checka ut %s"
-#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
-#, c-format
-msgid "read of %s failed"
-msgstr "misslyckades läsa %s"
-
-#: builtin/apply.c:3237
+#: builtin/apply.c:3370
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"
-#: builtin/apply.c:3265 builtin/apply.c:3487
+#: builtin/apply.c:3399 builtin/apply.c:3630
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "sökvägen %s har ändrat namn/tagits bort"
-#: builtin/apply.c:3346 builtin/apply.c:3501
+#: builtin/apply.c:3482 builtin/apply.c:3644
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: finns inte i indexet"
-#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
+#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3355 builtin/apply.c:3509
+#: builtin/apply.c:3491 builtin/apply.c:3652
#, c-format
msgid "%s: does not match index"
msgstr "%s: motsvarar inte indexet"
-#: builtin/apply.c:3457
+#: builtin/apply.c:3597
msgid "removal patch leaves file contents"
msgstr "patch för borttagning lämnar kvar filinnehåll"
-#: builtin/apply.c:3526
+#: builtin/apply.c:3669
#, c-format
msgid "%s: wrong type"
msgstr "%s: fel typ"
-#: builtin/apply.c:3528
+#: builtin/apply.c:3671
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s har typen %o, förväntade %o"
-#: builtin/apply.c:3687 builtin/apply.c:3689
+#: builtin/apply.c:3822 builtin/apply.c:3824
#, c-format
msgid "invalid path '%s'"
msgstr "ogiltig sökväg: %s"
-#: builtin/apply.c:3744
+#: builtin/apply.c:3879
#, c-format
msgid "%s: already exists in index"
msgstr "%s: finns redan i indexet"
-#: builtin/apply.c:3747
+#: builtin/apply.c:3882
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: finns redan i arbetskatalogen"
-#: builtin/apply.c:3767
+#: builtin/apply.c:3902
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"
-#: builtin/apply.c:3772
+#: builtin/apply.c:3907
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"
-#: builtin/apply.c:3792
+#: builtin/apply.c:3927
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk"
-#: builtin/apply.c:3796
+#: builtin/apply.c:3931
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: patchen kan inte tillämpas"
-#: builtin/apply.c:3810
+#: builtin/apply.c:3945
#, c-format
msgid "Checking patch %s..."
msgstr "Kontrollerar patchen %s..."
-#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
-#: builtin/apply.c:4046
+#: builtin/apply.c:4182
#, c-format
msgid "unable to remove %s from index"
msgstr "kan inte ta bort %s från indexet"
-#: builtin/apply.c:4075
+#: builtin/apply.c:4215
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "trasig patch för undermodulen %s"
-#: builtin/apply.c:4079
+#: builtin/apply.c:4219
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "kan inte ta status på nyligen skapade filen \"%s\""
-#: builtin/apply.c:4084
+#: builtin/apply.c:4224
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"
-#: builtin/apply.c:4087 builtin/apply.c:4195
+#: builtin/apply.c:4227 builtin/apply.c:4340
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kan inte lägga till cachepost för %s"
-#: builtin/apply.c:4120
+#: builtin/apply.c:4260
#, c-format
msgid "closing file '%s'"
msgstr "stänger filen \"%s\""
-#: builtin/apply.c:4169
+#: builtin/apply.c:4313
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "kan inte skriva filen \"%s\" läge %o"
-#: builtin/apply.c:4256
+#: builtin/apply.c:4403
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Tillämpade patchen %s rent."
-#: builtin/apply.c:4264
+#: builtin/apply.c:4411
msgid "internal error"
msgstr "internt fel"
-#: builtin/apply.c:4267
+#: builtin/apply.c:4414
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Tillämpade patchen %%s med %d refuserad..."
msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
-#: builtin/apply.c:4277
+#: builtin/apply.c:4424
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
-#: builtin/apply.c:4285
+#: builtin/apply.c:4432
#, c-format
msgid "cannot open %s: %s"
msgstr "kan inte öppna %s: %s"
-#: builtin/apply.c:4298
+#: builtin/apply.c:4445
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Stycke %d tillämpades rent."
-#: builtin/apply.c:4301
+#: builtin/apply.c:4448
#, c-format
msgid "Rejected hunk #%d."
msgstr "Refuserar stycke %d."
-#: builtin/apply.c:4387
+#: builtin/apply.c:4537
#, c-format
msgid "Skipped patch '%s'."
msgstr "Ignorerar patch \"%s\"."
-#: builtin/apply.c:4395
+#: builtin/apply.c:4545
msgid "unrecognized input"
msgstr "indata känns inte igen"
-#: builtin/apply.c:4406
+#: builtin/apply.c:4556
msgid "unable to read index file"
msgstr "kan inte läsa indexfilen"
-#: builtin/apply.c:4509
+#: builtin/apply.c:4701
+msgid "--3way outside a repository"
+msgstr "--3way utanför arkiv"
+
+#: builtin/apply.c:4709
+msgid "--index outside a repository"
+msgstr "--index utanför arkiv"
+
+#: builtin/apply.c:4712
+msgid "--cached outside a repository"
+msgstr "--cached utanför arkiv"
+
+#: builtin/apply.c:4745
+#, c-format
+msgid "can't open patch '%s'"
+msgstr "kan inte öppna patchen \"%s\""
+
+#: builtin/apply.c:4760
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "undertryckte %d fel i blanksteg"
+msgstr[1] "undertryckte %d fel i blanksteg"
+
+#: builtin/apply.c:4766 builtin/apply.c:4776
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d rad lägger till fel i blanksteg."
+msgstr[1] "%d rader lägger till fel i blanksteg."
+
+#: builtin/apply.c:4800
msgid "don't apply changes matching the given path"
msgstr "tillämpa inte ändringar som motsvarar given sökväg"
-#: builtin/apply.c:4512
+#: builtin/apply.c:4803
msgid "apply changes matching the given path"
msgstr "tillämpa ändringar som motsvarar given sökväg"
-#: builtin/apply.c:4515
+#: builtin/apply.c:4806
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
-#: builtin/apply.c:4518
+#: builtin/apply.c:4809
msgid "ignore additions made by the patch"
msgstr "ignorera tillägg gjorda av patchen"
-#: builtin/apply.c:4520
+#: builtin/apply.c:4811
msgid "instead of applying the patch, output diffstat for the input"
msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
-#: builtin/apply.c:4524
+#: builtin/apply.c:4815
msgid "show number of added and deleted lines in decimal notation"
msgstr "visa antal tillagda och borttagna rader decimalt"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4817
msgid "instead of applying the patch, output a summary for the input"
msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
-#: builtin/apply.c:4528
+#: builtin/apply.c:4819
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
-#: builtin/apply.c:4530
+#: builtin/apply.c:4821
msgid "make sure the patch is applicable to the current index"
msgstr "se till att patchen kan tillämpas på aktuellt index"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4823
msgid "apply a patch without touching the working tree"
msgstr "tillämpa en patch utan att röra arbetskatalogen"
-#: builtin/apply.c:4534
+#: builtin/apply.c:4825
msgid "accept a patch that touches outside the working area"
msgstr "godta en patch som rör filer utanför arbetskatalogen"
-#: builtin/apply.c:4536
+#: builtin/apply.c:4827
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
-#: builtin/apply.c:4538
+#: builtin/apply.c:4829
msgid "attempt three-way merge if a patch does not apply"
msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
-#: builtin/apply.c:4540
+#: builtin/apply.c:4831
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
-#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4836
msgid "ensure at least <n> lines of context match"
msgstr "se till att åtminstone <n> rader sammanhang är lika"
-#: builtin/apply.c:4547
+#: builtin/apply.c:4838
msgid "detect new or modified lines that have whitespace errors"
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
-#: builtin/apply.c:4550 builtin/apply.c:4553
+#: builtin/apply.c:4841 builtin/apply.c:4844
msgid "ignore changes in whitespace when finding context"
msgstr "ignorera ändringar i blanktecken för sammanhang"
-#: builtin/apply.c:4556
+#: builtin/apply.c:4847
msgid "apply the patch in reverse"
msgstr "tillämpa patchen baklänges"
-#: builtin/apply.c:4558
+#: builtin/apply.c:4849
msgid "don't expect at least one line of context"
msgstr "förvänta inte minst en rad sammanhang"
-#: builtin/apply.c:4560
+#: builtin/apply.c:4851
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
-#: builtin/apply.c:4562
+#: builtin/apply.c:4853
msgid "allow overlapping hunks"
msgstr "tillåt överlappande stycken"
-#: builtin/apply.c:4565
+#: builtin/apply.c:4856
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
-#: builtin/apply.c:4568
+#: builtin/apply.c:4859
msgid "do not trust the line counts in the hunk headers"
msgstr "lite inte på antalet linjer i styckehuvuden"
-#: builtin/apply.c:4571
+#: builtin/apply.c:4862
msgid "prepend <root> to all filenames"
msgstr "lägg till <rot> i alla filnamn"
-#: builtin/apply.c:4593
-msgid "--3way outside a repository"
-msgstr "--3way utanför arkiv"
-
-#: builtin/apply.c:4601
-msgid "--index outside a repository"
-msgstr "--index utanför arkiv"
-
-#: builtin/apply.c:4604
-msgid "--cached outside a repository"
-msgstr "--cached utanför arkiv"
-
-#: builtin/apply.c:4623
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "kan inte öppna patchen \"%s\""
-
-#: builtin/apply.c:4637
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] "undertryckte %d fel i blanksteg"
-msgstr[1] "undertryckte %d fel i blanksteg"
-
-#: builtin/apply.c:4643 builtin/apply.c:4653
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] "%d rad lägger till fel i blanksteg."
-msgstr[1] "%d rader lägger till fel i blanksteg."
-
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
@@ -3672,103 +4066,103 @@ msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"
-#: builtin/blame.c:1782
+#: builtin/blame.c:1781
msgid "Blaming lines"
msgstr "Klandra rader"
-#: builtin/blame.c:2531
+#: builtin/blame.c:2536
msgid "Show blame entries as we find them, incrementally"
msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
-#: builtin/blame.c:2532
+#: builtin/blame.c:2537
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"
-#: builtin/blame.c:2533
+#: builtin/blame.c:2538
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
-#: builtin/blame.c:2534
+#: builtin/blame.c:2539
msgid "Show work cost statistics"
msgstr "Visa statistik över arbetskostnad"
-#: builtin/blame.c:2535
+#: builtin/blame.c:2540
msgid "Force progress reporting"
msgstr "Tvinga förloppsrapportering"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2541
msgid "Show output score for blame entries"
msgstr "Visa utdatapoäng för klandringsposter"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2542
msgid "Show original filename (Default: auto)"
msgstr "Visa originalfilnamn (Standard: auto)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2543
msgid "Show original linenumber (Default: off)"
msgstr "Visa ursprungligt radnummer (Standard: av)"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2544
msgid "Show in a format designed for machine consumption"
msgstr "Visa i ett format avsett för maskinkonsumtion"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2545
msgid "Show porcelain format with per-line commit information"
msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2546
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Använd samma utdataläge som git-annotate (Standard: av)"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2547
msgid "Show raw timestamp (Default: off)"
msgstr "Visa rå tidsstämpel (Standard: av)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2548
msgid "Show long commit SHA1 (Default: off)"
msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2549
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2550
msgid "Show author email instead of name (Default: off)"
msgstr "Visa författarens e-post istället för namn (Standard: av)"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2551
msgid "Ignore whitespace differences"
msgstr "Ignorera ändringar i blanksteg"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2552
msgid "Spend extra cycles to find better match"
msgstr "Slösa extra cykler med att hitta bättre träff"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2553
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2554
msgid "Use <file>'s contents as the final image"
msgstr "Använd <fil>s innehåll som slutgiltig bild"
-#: builtin/blame.c:2550 builtin/blame.c:2551
+#: builtin/blame.c:2555 builtin/blame.c:2556
msgid "score"
msgstr "poäng"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2555
msgid "Find line copies within and across files"
msgstr "Hitta kopierade rader inuti och mellan filer"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2556
msgid "Find line movements within and across files"
msgstr "Hitta flyttade rader inuti och mellan filer"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2557
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2557
msgid "Process only line range n,m, counting from 1"
msgstr "Behandla endast radintervallet n,m, med början på 1"
@@ -3778,7 +4172,7 @@ msgstr "Behandla endast radintervallet n,m, med början på 1"
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2641
+#: builtin/blame.c:2649
msgid "4 years, 11 months ago"
msgstr "4 år, 11 månader sedan"
@@ -3881,119 +4275,126 @@ msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"
msgid "Deleted branch %s (was %s).\n"
msgstr "Tog bort grenen %s (var %s).\n"
-#: builtin/branch.c:309
+#: builtin/branch.c:312
#, c-format
msgid "[%s: gone]"
msgstr "[%s: försvunnen]"
-#: builtin/branch.c:314
+#: builtin/branch.c:317
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:319
+#: builtin/branch.c:322
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: bakom %d] "
-#: builtin/branch.c:321
+#: builtin/branch.c:324
#, c-format
msgid "[behind %d]"
msgstr "[bakom %d] "
-#: builtin/branch.c:325
+#: builtin/branch.c:328
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: före %d] "
-#: builtin/branch.c:327
+#: builtin/branch.c:330
#, c-format
msgid "[ahead %d]"
msgstr "[före %d] "
-#: builtin/branch.c:330
+#: builtin/branch.c:333
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: före %d, bakom %d] "
-#: builtin/branch.c:333
+#: builtin/branch.c:336
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[före %d, bakom %d] "
-#: builtin/branch.c:346
+#: builtin/branch.c:349
msgid " **** invalid ref ****"
msgstr " **** ogiltig ref ****"
-#: builtin/branch.c:372
+#: builtin/branch.c:375
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(ingen gren, ombaserar %s)"
-#: builtin/branch.c:375
+#: builtin/branch.c:378
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(ingen gren, \"bisect\" startad på %s)"
#. TRANSLATORS: make sure this matches
#. "HEAD detached at " in wt-status.c
-#: builtin/branch.c:381
+#: builtin/branch.c:384
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD frånkopplat vid %s)"
#. TRANSLATORS: make sure this matches
#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:386
+#: builtin/branch.c:389
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD frånkopplat från %s)"
-#: builtin/branch.c:390
+#: builtin/branch.c:393
msgid "(no branch)"
msgstr "(ingen gren)"
-#: builtin/branch.c:541
+#: builtin/branch.c:544
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Grenen %s ombaseras på %s"
-#: builtin/branch.c:545
+#: builtin/branch.c:548
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Grenen %s är i en \"bisect\" på %s"
-#: builtin/branch.c:560
+#: builtin/branch.c:563
msgid "cannot rename the current branch while not on any."
msgstr ""
"kunde inte byta namn på aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:570
+#: builtin/branch.c:573
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Felaktigt namn på gren: \"%s\""
-#: builtin/branch.c:587
+#: builtin/branch.c:590
msgid "Branch rename failed"
msgstr "Misslyckades byta namn på gren"
-#: builtin/branch.c:591
+#: builtin/branch.c:594
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:594
+#: builtin/branch.c:597
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"
-#: builtin/branch.c:601
+#: builtin/branch.c:604
msgid "Branch is renamed, but update of config-file failed"
msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:623
-msgid "could not write branch description template"
-msgstr "kunde inte skriva grenbeskrivningsmall"
+#: builtin/branch.c:620
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+"Redigera beskrivningen för grenen\n"
+" %s\n"
+"Rader som inleds med \"%c\" ignoreras.\n"
#: builtin/branch.c:651
msgid "Generic options"
@@ -4095,8 +4496,8 @@ msgstr "nyckel"
msgid "field name to sort on"
msgstr "fältnamn att sortera på"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
-#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
+#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
#: builtin/tag.c:369
msgid "object"
msgstr "objekt"
@@ -4221,7 +4622,7 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."
msgid "Need a repository to unbundle."
msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
-#: builtin/cat-file.c:428
+#: builtin/cat-file.c:443
msgid ""
"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
"<type>|--textconv) <object>"
@@ -4229,56 +4630,56 @@ msgstr ""
"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
"<typ>|--textconv) <objekt>"
-#: builtin/cat-file.c:429
+#: builtin/cat-file.c:444
msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-#: builtin/cat-file.c:466
+#: builtin/cat-file.c:481
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<typ> kan vara en av: blob, tree, commit, tag"
-#: builtin/cat-file.c:467
+#: builtin/cat-file.c:482
msgid "show object type"
msgstr "visa objekttyp"
-#: builtin/cat-file.c:468
+#: builtin/cat-file.c:483
msgid "show object size"
msgstr "visa objektstorlek"
-#: builtin/cat-file.c:470
+#: builtin/cat-file.c:485
msgid "exit with zero when there's no error"
msgstr "avsluta med noll när det inte uppstått något fel"
-#: builtin/cat-file.c:471
+#: builtin/cat-file.c:486
msgid "pretty-print object's content"
msgstr "visa objektets innehåll snyggt"
-#: builtin/cat-file.c:473
+#: builtin/cat-file.c:488
msgid "for blob objects, run textconv on object's content"
msgstr "för blob-objekt, kör textconv på objektets innehåll"
-#: builtin/cat-file.c:475
+#: builtin/cat-file.c:490
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt"
-#: builtin/cat-file.c:476
+#: builtin/cat-file.c:491
msgid "buffer --batch output"
msgstr "buffra utdata från --batch"
-#: builtin/cat-file.c:478
+#: builtin/cat-file.c:493
msgid "show info and content of objects fed from the standard input"
msgstr "visa information och innehåll för objekt som listas på standard in"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:496
msgid "show info about objects fed from the standard input"
msgstr "visa information för objekt som listas på standard in"
-#: builtin/cat-file.c:484
+#: builtin/cat-file.c:499
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"följ symboliska länkar i trädet (använd med --batch eller --batch-check)"
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:501
msgid "show all objects with --batch or --batch-check"
msgstr "visa alla objekt med --batch eller --batch-check"
@@ -4306,7 +4707,7 @@ msgstr "läs filnamn från standard in"
msgid "terminate input and output records by a NUL character"
msgstr "avsluta in- och utdataposter med NUL-tecken"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "undertryck förloppsrapportering"
@@ -4396,9 +4797,9 @@ msgid "write the content to temporary files"
msgstr "skriv innehåll till temporära filer"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
-#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
-#: builtin/submodule--helper.c:774
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
+#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
+#: builtin/submodule--helper.c:830 builtin/worktree.c:469
msgid "string"
msgstr "sträng"
@@ -4464,10 +4865,6 @@ msgstr "\"%s\" kan inte användas med %s"
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."
-#: builtin/checkout.c:279 builtin/checkout.c:473
-msgid "corrupt index file"
-msgstr "indexfilen är trasig"
-
#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
@@ -4477,50 +4874,50 @@ msgstr "sökvägen \"%s\" har inte slagits ihop"
msgid "you need to resolve your current index first"
msgstr "du måste lösa ditt befintliga index först"
-#: builtin/checkout.c:622
+#: builtin/checkout.c:625
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
-#: builtin/checkout.c:660
+#: builtin/checkout.c:664
msgid "HEAD is now at"
msgstr "HEAD är nu på"
-#: builtin/checkout.c:664 builtin/clone.c:661
+#: builtin/checkout.c:668 builtin/clone.c:661
msgid "unable to update HEAD"
msgstr "kan inte uppdatera HEAD"
-#: builtin/checkout.c:668
+#: builtin/checkout.c:672
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Återställ gren \"%s\"\n"
-#: builtin/checkout.c:671
+#: builtin/checkout.c:675
#, c-format
msgid "Already on '%s'\n"
msgstr "Redan på \"%s\"\n"
-#: builtin/checkout.c:675
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Växlade till och nollställde grenen \"%s\"\n"
-#: builtin/checkout.c:677 builtin/checkout.c:1067
+#: builtin/checkout.c:681 builtin/checkout.c:1070
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Växlade till en ny gren \"%s\"\n"
-#: builtin/checkout.c:679
+#: builtin/checkout.c:683
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Växlade till grenen \"%s\"\n"
-#: builtin/checkout.c:731
+#: builtin/checkout.c:734
#, c-format
msgid " ... and %d more.\n"
msgstr " ... och %d till.\n"
-#: builtin/checkout.c:737
+#: builtin/checkout.c:740
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4543,7 +4940,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:756
+#: builtin/checkout.c:759
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4570,151 +4967,151 @@ msgstr[1] ""
" git branch <nytt_grennamn> %s\n"
"\n"
-#: builtin/checkout.c:792
+#: builtin/checkout.c:795
msgid "internal error in revision walk"
msgstr "internt fel vid genomgång av revisioner (revision walk)"
-#: builtin/checkout.c:796
+#: builtin/checkout.c:799
msgid "Previous HEAD position was"
msgstr "Tidigare position för HEAD var"
-#: builtin/checkout.c:823 builtin/checkout.c:1062
+#: builtin/checkout.c:826 builtin/checkout.c:1065
msgid "You are on a branch yet to be born"
msgstr "Du är på en gren som ännu inte är född"
-#: builtin/checkout.c:968
+#: builtin/checkout.c:971
#, c-format
msgid "only one reference expected, %d given."
msgstr "endast en referens förväntades, %d gavs."
-#: builtin/checkout.c:1008 builtin/worktree.c:212
+#: builtin/checkout.c:1011 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "felaktig referens: %s"
-#: builtin/checkout.c:1037
+#: builtin/checkout.c:1040
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensen är inte ett träd: %s"
-#: builtin/checkout.c:1076
+#: builtin/checkout.c:1079
msgid "paths cannot be used with switching branches"
msgstr "sökvägar kan inte användas vid byte av gren"
-#: builtin/checkout.c:1079 builtin/checkout.c:1083
+#: builtin/checkout.c:1082 builtin/checkout.c:1086
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "\"%s\" kan inte användas vid byte av gren"
-#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
-#: builtin/checkout.c:1098
+#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
+#: builtin/checkout.c:1101
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "\"%s\" kan inte användas med \"%s\""
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1106
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
-#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
-#: builtin/worktree.c:325
+#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
+#: builtin/worktree.c:326
msgid "branch"
msgstr "gren"
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1140
msgid "create and checkout a new branch"
msgstr "skapa och checka ut en ny gren"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1142
msgid "create/reset and checkout a branch"
msgstr "skapa/nollställ och checka ut en gren"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1143
msgid "create reflog for new branch"
msgstr "skapa reflogg för ny gren"
-#: builtin/checkout.c:1141
-msgid "detach the HEAD at named commit"
+#: builtin/checkout.c:1144 builtin/worktree.c:328
+msgid "detach HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1145
msgid "set upstream info for new branch"
msgstr "sätt uppströmsinformation för ny gren"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1147
msgid "new-branch"
msgstr "ny-gren"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1147
msgid "new unparented branch"
msgstr "ny gren utan förälder"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1148
msgid "checkout our version for unmerged files"
msgstr "checka ut vår version för ej sammanslagna filer"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1150
msgid "checkout their version for unmerged files"
msgstr "checka ut deras version för ej sammanslagna filer"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1152
msgid "force checkout (throw away local modifications)"
msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1153
msgid "perform a 3-way merge with the new branch"
msgstr "utför en 3-vägssammanslagning för den nya grenen"
-#: builtin/checkout.c:1151 builtin/merge.c:230
+#: builtin/checkout.c:1154 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr "uppdatera ignorerade filer (standard)"
-#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
+#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1156
msgid "conflict style (merge or diff3)"
msgstr "konfliktstil (merge eller diff3)"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1159
msgid "do not limit pathspecs to sparse entries only"
msgstr "begränsa inte sökvägar till endast glesa poster"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1161
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "förutspå \"git checkout <gren-saknas>\""
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1163
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"kontrollera inte om en annan arbetskatalog håller den angivna referensen"
-#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
-#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
+#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117
+#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "tvinga förloppsrapportering"
-#: builtin/checkout.c:1192
+#: builtin/checkout.c:1195
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1212
msgid "--track needs a branch name"
msgstr "--track behöver ett namn på en gren"
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1217
msgid "Missing branch name; try -b"
msgstr "Grennamn saknas; försök med -b"
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1253
msgid "invalid path specification"
msgstr "felaktig sökvägsangivelse"
-#: builtin/checkout.c:1257
+#: builtin/checkout.c:1260
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4723,12 +5120,12 @@ msgstr ""
"Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"
"Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1265
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""
-#: builtin/checkout.c:1266
+#: builtin/checkout.c:1269
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4882,7 +5279,7 @@ msgid "remove whole directories"
msgstr "ta bort hela kataloger"
#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
msgid "pattern"
msgstr "mönster"
@@ -4926,7 +5323,7 @@ msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"
msgid "don't create a checkout"
msgstr "skapa inte någon utcheckning"
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
msgid "create a bare repository"
msgstr "skapa ett naket (\"bare\") arkiv"
@@ -4954,16 +5351,16 @@ msgstr "initiera undermoduler i klonen"
msgid "number of submodules cloned in parallel"
msgstr "antal undermoduler som klonas parallellt"
-#: builtin/clone.c:80 builtin/init-db.c:470
+#: builtin/clone.c:80 builtin/init-db.c:473
msgid "template-directory"
msgstr "mallkatalog"
-#: builtin/clone.c:81 builtin/init-db.c:471
+#: builtin/clone.c:81 builtin/init-db.c:474
msgid "directory from which templates will be used"
msgstr "katalog att använda mallar från"
-#: builtin/clone.c:83 builtin/submodule--helper.c:498
-#: builtin/submodule--helper.c:777
+#: builtin/clone.c:83 builtin/submodule--helper.c:495
+#: builtin/submodule--helper.c:833
msgid "reference repository"
msgstr "referensarkiv"
@@ -4987,7 +5384,7 @@ msgstr "checka ut <gren> istället för fjärrens HEAD"
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667
+#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667
#: builtin/pull.c:201
msgid "depth"
msgstr "djup"
@@ -5004,11 +5401,11 @@ msgstr "klona endast en gren, HEAD eller --branch"
msgid "any cloned submodules will be shallow"
msgstr "klonade undermoduler kommer vara grunda"
-#: builtin/clone.c:98 builtin/init-db.c:479
+#: builtin/clone.c:98 builtin/init-db.c:482
msgid "gitdir"
msgstr "gitkat"
-#: builtin/clone.c:99 builtin/init-db.c:480
+#: builtin/clone.c:99 builtin/init-db.c:483
msgid "separate git dir from working tree"
msgstr "separera gitkatalogen från arbetskatalogen"
@@ -5020,11 +5417,11 @@ msgstr "nyckel=värde"
msgid "set config inside the new repository"
msgstr "ställ in konfiguration i det nya arkivet"
-#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "använd endast IPv4-adresser"
-#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "använd endast IPv6-adresser"
@@ -5056,6 +5453,11 @@ msgstr "referensarkivet \"%s\" är grunt"
msgid "reference repository '%s' is grafted"
msgstr "referensarkivet \"%s\" är ympat"
+#: builtin/clone.c:376
+#, c-format
+msgid "failed to open '%s'"
+msgstr "misslyckades öppna \"%s\""
+
#: builtin/clone.c:384
#, c-format
msgid "%s exists and is not a directory"
@@ -5076,7 +5478,7 @@ msgstr "misslyckades skapa länken \"%s\""
msgid "failed to copy file to '%s'"
msgstr "misslyckades kopiera filen till \"%s\""
-#: builtin/clone.c:449 builtin/clone.c:633
+#: builtin/clone.c:449
#, c-format
msgid "done.\n"
msgstr "klart.\n"
@@ -5096,14 +5498,7 @@ msgstr ""
msgid "Could not find remote branch %s to clone."
msgstr "Kunde inte hitta fjärrgrenen %s för att klona."
-# Vague original, not networking-related, but rather related to the actual
-# objects downloaded.
-#: builtin/clone.c:628
-#, c-format
-msgid "Checking connectivity... "
-msgstr "Kontrollerar om vi fick alla objekt..."
-
-#: builtin/clone.c:631
+#: builtin/clone.c:633
msgid "remote did not send all necessary objects"
msgstr "fjärren sände inte alla nödvändiga objekt"
@@ -5121,99 +5516,99 @@ msgstr ""
msgid "unable to checkout working tree"
msgstr "kunde inte checka ut arbetskatalogen"
-#: builtin/clone.c:767
+#: builtin/clone.c:766
msgid "unable to write parameters to config file"
msgstr "kunde inte skriva parametrar till konfigurationsfilen"
-#: builtin/clone.c:830
+#: builtin/clone.c:829
msgid "cannot repack to clean up"
msgstr "kan inte packa om för att städa upp"
-#: builtin/clone.c:832
+#: builtin/clone.c:831
msgid "cannot unlink temporary alternates file"
msgstr "kunde inte ta bort temporär \"alternates\"-fil"
-#: builtin/clone.c:864 builtin/receive-pack.c:1731
+#: builtin/clone.c:863 builtin/receive-pack.c:1855
msgid "Too many arguments."
msgstr "För många argument."
-#: builtin/clone.c:868
+#: builtin/clone.c:867
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
-#: builtin/clone.c:879
+#: builtin/clone.c:878
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "flaggorna --bare och --origin %s är inkompatibla."
-#: builtin/clone.c:882
+#: builtin/clone.c:881
msgid "--bare and --separate-git-dir are incompatible."
msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
-#: builtin/clone.c:895
+#: builtin/clone.c:894
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:901 builtin/fetch.c:1174
+#: builtin/clone.c:900 builtin/fetch.c:1293
#, c-format
msgid "depth %s is not a positive number"
msgstr "djupet %s är inte ett positivt tal"
-#: builtin/clone.c:911
+#: builtin/clone.c:910
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."
-#: builtin/clone.c:921
+#: builtin/clone.c:920
#, c-format
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
-#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
-#: builtin/worktree.c:220 builtin/worktree.c:247
+#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
-#: builtin/clone.c:939
+#: builtin/clone.c:938
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "kunde inte skapa arbetskatalogen \"%s\""
-#: builtin/clone.c:957
+#: builtin/clone.c:956
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
-#: builtin/clone.c:959
+#: builtin/clone.c:958
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
-#: builtin/clone.c:998
+#: builtin/clone.c:997
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"
-#: builtin/clone.c:1001
+#: builtin/clone.c:1000
msgid "source repository is shallow, ignoring --local"
msgstr "källarkivet är grunt, ignorerar --local"
-#: builtin/clone.c:1006
+#: builtin/clone.c:1005
msgid "--local is ignored"
msgstr "--local ignoreras"
-#: builtin/clone.c:1010
+#: builtin/clone.c:1009
#, c-format
msgid "Don't know how to clone %s"
msgstr "Vet inte hur man klonar %s"
-#: builtin/clone.c:1059 builtin/clone.c:1067
+#: builtin/clone.c:1058 builtin/clone.c:1066
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
-#: builtin/clone.c:1070
+#: builtin/clone.c:1069
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
@@ -5353,66 +5748,66 @@ msgstr ""
"\"git cherry-pick --continue\" kommer därefter att återuppta\n"
"cherry-pick för återstående incheckningar.\n"
-#: builtin/commit.c:307
+#: builtin/commit.c:308
msgid "failed to unpack HEAD tree object"
msgstr "misslyckades packa upp HEAD:s trädobjekt"
-#: builtin/commit.c:348
+#: builtin/commit.c:349
msgid "unable to create temporary index"
msgstr "kunde inte skapa temporär indexfil"
-#: builtin/commit.c:354
+#: builtin/commit.c:355
msgid "interactive add failed"
msgstr "interaktiv tilläggning misslyckades"
-#: builtin/commit.c:367
+#: builtin/commit.c:368
msgid "unable to update temporary index"
msgstr "kan inte uppdatera temporärt index"
-#: builtin/commit.c:369
+#: builtin/commit.c:370
msgid "Failed to update main cache tree"
msgstr "Misslyckades uppdatera huvud-cacheträdet"
-#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
+#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
msgid "unable to write new_index file"
msgstr "kunde inte skriva filen new_index"
-#: builtin/commit.c:447
+#: builtin/commit.c:448
msgid "cannot do a partial commit during a merge."
msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
-#: builtin/commit.c:449
+#: builtin/commit.c:450
msgid "cannot do a partial commit during a cherry-pick."
msgstr "kan inte utföra en delvis incheckning under en cherry-pick."
-#: builtin/commit.c:458
+#: builtin/commit.c:459
msgid "cannot read the index"
msgstr "kan inte läsa indexet"
-#: builtin/commit.c:477
+#: builtin/commit.c:478
msgid "unable to write temporary index file"
msgstr "kunde inte skriva temporär indexfil"
-#: builtin/commit.c:582
+#: builtin/commit.c:583
#, c-format
msgid "commit '%s' lacks author header"
msgstr "incheckningen \"%s\" saknar författarhuvud"
-#: builtin/commit.c:584
+#: builtin/commit.c:585
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
-#: builtin/commit.c:603
+#: builtin/commit.c:604
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
-#: builtin/commit.c:611
+#: builtin/commit.c:612
#, c-format
msgid "invalid date format: %s"
msgstr "felaktigt datumformat: %s"
-#: builtin/commit.c:655
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -5420,38 +5815,38 @@ msgstr ""
"kunde inte välja ett kommentarstecken som inte använts\n"
"i det befintliga incheckningsmeddelandet"
-#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
+#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
#, c-format
msgid "could not lookup commit %s"
msgstr "kunde inte slå upp incheckningen %s"
-#: builtin/commit.c:704 builtin/shortlog.c:285
+#: builtin/commit.c:705 builtin/shortlog.c:286
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
-#: builtin/commit.c:706
+#: builtin/commit.c:707
msgid "could not read log from standard input"
msgstr "kunde inte läsa logg från standard in"
-#: builtin/commit.c:710
+#: builtin/commit.c:711
#, c-format
msgid "could not read log file '%s'"
msgstr "kunde inte läsa loggfilen \"%s\""
-#: builtin/commit.c:737 builtin/commit.c:745
+#: builtin/commit.c:738 builtin/commit.c:746
msgid "could not read SQUASH_MSG"
msgstr "kunde inte läsa SQUASH_MSG"
-#: builtin/commit.c:742
+#: builtin/commit.c:743
msgid "could not read MERGE_MSG"
msgstr "kunde inte läsa MERGE_MSG"
-#: builtin/commit.c:796
+#: builtin/commit.c:797
msgid "could not write commit template"
msgstr "kunde inte skriva incheckningsmall"
-#: builtin/commit.c:814
+#: builtin/commit.c:815
#, c-format
msgid ""
"\n"
@@ -5466,7 +5861,7 @@ msgstr ""
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:819
+#: builtin/commit.c:820
#, c-format
msgid ""
"\n"
@@ -5481,7 +5876,7 @@ msgstr ""
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:832
+#: builtin/commit.c:833
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5491,7 +5886,7 @@ msgstr ""
"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
"incheckningen.\n"
-#: builtin/commit.c:839
+#: builtin/commit.c:840
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5502,146 +5897,146 @@ msgstr ""
"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
"Ett tomt meddelande avbryter incheckningen.\n"
-#: builtin/commit.c:859
+#: builtin/commit.c:860
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sFörfattare: %.*s <%.*s>"
-#: builtin/commit.c:867
+#: builtin/commit.c:868
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:874
+#: builtin/commit.c:875
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sIncheckare: %.*s <%.*s>"
-#: builtin/commit.c:892
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
-#: builtin/commit.c:949
+#: builtin/commit.c:950
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:964 builtin/tag.c:266
+#: builtin/commit.c:965 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
-#: builtin/commit.c:1066
+#: builtin/commit.c:1067
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"
-#: builtin/commit.c:1081 builtin/commit.c:1321
+#: builtin/commit.c:1082 builtin/commit.c:1322
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
-#: builtin/commit.c:1118
+#: builtin/commit.c:1119
msgid "--long and -z are incompatible"
msgstr "--long och -z är inkompatibla"
-#: builtin/commit.c:1148
+#: builtin/commit.c:1149
msgid "Using both --reset-author and --author does not make sense"
msgstr "Kan inte använda både --reset-author och --author"
-#: builtin/commit.c:1157
+#: builtin/commit.c:1158
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
-#: builtin/commit.c:1160
+#: builtin/commit.c:1161
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."
-#: builtin/commit.c:1162
+#: builtin/commit.c:1163
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1166
msgid "Options --squash and --fixup cannot be used together"
msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
-#: builtin/commit.c:1175
+#: builtin/commit.c:1176
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Endast en av -c/-C/-F/--fixup kan användas."
-#: builtin/commit.c:1177
+#: builtin/commit.c:1178
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."
-#: builtin/commit.c:1185
+#: builtin/commit.c:1186
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author kan endast användas med -C, -c eller --amend."
-#: builtin/commit.c:1202
+#: builtin/commit.c:1203
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Endast en av --include/--only/--all/--interactive/--patch kan användas."
-#: builtin/commit.c:1204
+#: builtin/commit.c:1205
msgid "No paths with --include/--only does not make sense."
msgstr "Du måste ange sökvägar tillsammans med --include/--only."
-#: builtin/commit.c:1206
+#: builtin/commit.c:1207
msgid "Clever... amending the last one with dirty index."
msgstr "Smart... utöka den senaste med smutsigt index."
-#: builtin/commit.c:1208
+#: builtin/commit.c:1209
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."
-#: builtin/commit.c:1220 builtin/tag.c:474
+#: builtin/commit.c:1221 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
-#: builtin/commit.c:1225
+#: builtin/commit.c:1226
msgid "Paths with -a does not make sense."
msgstr "Kan inte ange sökvägar med -a."
-#: builtin/commit.c:1335 builtin/commit.c:1621
+#: builtin/commit.c:1336 builtin/commit.c:1622
msgid "show status concisely"
msgstr "visa koncis status"
-#: builtin/commit.c:1337 builtin/commit.c:1623
+#: builtin/commit.c:1338 builtin/commit.c:1624
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
-#: builtin/worktree.c:437
+#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
-#: builtin/commit.c:1342 builtin/commit.c:1627
+#: builtin/commit.c:1343 builtin/commit.c:1628
msgid "show status in long format (default)"
msgstr "visa status i långt format (standard)"
-#: builtin/commit.c:1345 builtin/commit.c:1630
+#: builtin/commit.c:1346 builtin/commit.c:1631
msgid "terminate entries with NUL"
msgstr "terminera poster med NUL"
-#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
+#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "läge"
-#: builtin/commit.c:1348 builtin/commit.c:1633
+#: builtin/commit.c:1349 builtin/commit.c:1634
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"
-#: builtin/commit.c:1351
+#: builtin/commit.c:1352
msgid "show ignored files"
msgstr "visa ignorerade filer"
-#: builtin/commit.c:1352 parse-options.h:155
+#: builtin/commit.c:1353 parse-options.h:155
msgid "when"
msgstr "när"
-#: builtin/commit.c:1353
+#: builtin/commit.c:1354
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -5649,201 +6044,201 @@ msgstr ""
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:1355
+#: builtin/commit.c:1356
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
-#: builtin/commit.c:1441
+#: builtin/commit.c:1442
msgid "couldn't look up newly created commit"
msgstr "kunde inte slå upp en precis skapad incheckning"
-#: builtin/commit.c:1443
+#: builtin/commit.c:1444
msgid "could not parse newly created commit"
msgstr "kunde inte tolka en precis skapad incheckning"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1489
msgid "detached HEAD"
msgstr "frånkopplad HEAD"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1492
msgid " (root-commit)"
msgstr " (rotincheckning)"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1592
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1593
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1595
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:1595 builtin/tag.c:351
+#: builtin/commit.c:1596 builtin/tag.c:351
msgid "read message from file"
msgstr "läs meddelande från fil"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1597
msgid "author"
msgstr "författare"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1597
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1597 builtin/gc.c:326
+#: builtin/commit.c:1598 builtin/gc.c:326
msgid "date"
msgstr "datum"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1598
msgid "override date for commit"
msgstr "överstyr datum för incheckningen"
-#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
-#: builtin/notes.c:558 builtin/tag.c:349
+#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
+#: builtin/notes.c:559 builtin/tag.c:349
msgid "message"
msgstr "meddelande"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1599
msgid "commit message"
msgstr "incheckningsmeddelande"
-#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
-#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
+#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
msgid "commit"
msgstr "incheckning"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1600
msgid "reuse and edit message from specified commit"
msgstr "återanvänd och redigera meddelande från angiven incheckning"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1601
msgid "reuse message from specified commit"
msgstr "återanvänd meddelande från angiven incheckning"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1602
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att fixa angiven incheckning"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1603
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att slå ihop med angiven "
"incheckning"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1604
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"
-#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
+#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "lägg till Signed-off-by:"
-#: builtin/commit.c:1605
+#: builtin/commit.c:1606
msgid "use specified template file"
msgstr "använd angiven mallfil"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1607
msgid "force edit of commit"
msgstr "tvinga redigering av incheckning"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1608
msgid "default"
msgstr "standard"
-#: builtin/commit.c:1607 builtin/tag.c:354
+#: builtin/commit.c:1608 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1609
msgid "include status in commit message template"
msgstr "inkludera status i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
+#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "GPG-signera incheckning"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1614
msgid "Commit contents options"
msgstr "Alternativ för incheckningens innehåll"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1615
msgid "commit all changed files"
msgstr "checka in alla ändrade filer"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1616
msgid "add specified files to index for commit"
msgstr "lägg till angivna filer till indexet för incheckning"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1617
msgid "interactively add files"
msgstr "lägg till filer interaktivt"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1618
msgid "interactively add changes"
msgstr "lägg till ändringar interaktivt"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1619
msgid "commit only specified files"
msgstr "checka endast in angivna filer"
-#: builtin/commit.c:1619
-msgid "bypass pre-commit hook"
-msgstr "förbigå pre-commit-krok"
-
#: builtin/commit.c:1620
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "förbigå pre-commit- och commit-msg-krokar"
+
+#: builtin/commit.c:1621
msgid "show what would be committed"
msgstr "visa vad som skulle checkas in"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1632
msgid "amend previous commit"
msgstr "lägg till föregående incheckning"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1633
msgid "bypass post-rewrite hook"
msgstr "förbigå post-rewrite-krok"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1638
msgid "ok to record an empty change"
msgstr "ok att registrera en tom ändring"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
msgid "ok to record a change with an empty message"
msgstr "ok att registrera en ändring med tomt meddelande"
-#: builtin/commit.c:1668
+#: builtin/commit.c:1669
msgid "could not parse HEAD commit"
msgstr "kunde inte tolka HEAD:s incheckning"
-#: builtin/commit.c:1718
+#: builtin/commit.c:1719
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
-#: builtin/commit.c:1725
+#: builtin/commit.c:1726
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
-#: builtin/commit.c:1744
+#: builtin/commit.c:1745
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
-#: builtin/commit.c:1755
+#: builtin/commit.c:1756
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
-#: builtin/commit.c:1760
+#: builtin/commit.c:1761
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
-#: builtin/commit.c:1808
+#: builtin/commit.c:1809
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5858,139 +6253,139 @@ msgstr ""
msgid "git config [<options>]"
msgstr "git config [<flaggor>]"
-#: builtin/config.c:56
+#: builtin/config.c:55
msgid "Config file location"
msgstr "Konfigurationsfilens plats"
-#: builtin/config.c:57
+#: builtin/config.c:56
msgid "use global config file"
msgstr "använd global konfigurationsfil"
-#: builtin/config.c:58
+#: builtin/config.c:57
msgid "use system config file"
msgstr "använd systemets konfigurationsfil"
-#: builtin/config.c:59
+#: builtin/config.c:58
msgid "use repository config file"
msgstr "använd arkivets konfigurationsfil"
-#: builtin/config.c:60
+#: builtin/config.c:59
msgid "use given config file"
msgstr "använd angiven konfigurationsfil"
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "read config from given blob object"
msgstr "läs konfiguration från givet blob-objekt"
-#: builtin/config.c:62
+#: builtin/config.c:61
msgid "Action"
msgstr "Åtgärd"
-#: builtin/config.c:63
+#: builtin/config.c:62
msgid "get value: name [value-regex]"
msgstr "hämta värde: namn [värde-reguttr]"
-#: builtin/config.c:64
+#: builtin/config.c:63
msgid "get all values: key [value-regex]"
msgstr "hämta alla värden: nyckel [värde-reguttr]"
-#: builtin/config.c:65
+#: builtin/config.c:64
msgid "get values for regexp: name-regex [value-regex]"
msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]"
-#: builtin/config.c:66
+#: builtin/config.c:65
msgid "get value specific for the URL: section[.var] URL"
msgstr "hämta värde specifikt URL:en: sektion[.var] URL"
-#: builtin/config.c:67
+#: builtin/config.c:66
msgid "replace all matching variables: name value [value_regex]"
msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]"
-#: builtin/config.c:68
+#: builtin/config.c:67
msgid "add a new variable: name value"
msgstr "lägg till en ny variabel: namn värde"
-#: builtin/config.c:69
+#: builtin/config.c:68
msgid "remove a variable: name [value-regex]"
msgstr "ta bort en variabel: namn [värde-reguttr]"
-#: builtin/config.c:70
+#: builtin/config.c:69
msgid "remove all matches: name [value-regex]"
msgstr "ta bort alla träffar: namn [värde-reguttr]"
-#: builtin/config.c:71
+#: builtin/config.c:70
msgid "rename section: old-name new-name"
msgstr "byt namn på sektion: gammalt-namn nytt-namn"
-#: builtin/config.c:72
+#: builtin/config.c:71
msgid "remove a section: name"
msgstr "ta bort en sektion: namn"
-#: builtin/config.c:73
+#: builtin/config.c:72
msgid "list all"
msgstr "visa alla"
-#: builtin/config.c:74
+#: builtin/config.c:73
msgid "open an editor"
msgstr "öppna textredigeringsprogram"
-#: builtin/config.c:75
+#: builtin/config.c:74
msgid "find the color configured: slot [default]"
msgstr "hitta den inställda färgen: slot [default]"
-#: builtin/config.c:76
+#: builtin/config.c:75
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "hitta färginställningen: slot [stdout-is-tty]"
-#: builtin/config.c:77
+#: builtin/config.c:76
msgid "Type"
msgstr "Typ"
-#: builtin/config.c:78
+#: builtin/config.c:77
msgid "value is \"true\" or \"false\""
msgstr "värdet är \"true\" eller \"false\""
-#: builtin/config.c:79
+#: builtin/config.c:78
msgid "value is decimal number"
msgstr "värdet är ett decimalt tal"
-#: builtin/config.c:80
+#: builtin/config.c:79
msgid "value is --bool or --int"
msgstr "värdet är --bool eller --int"
-#: builtin/config.c:81
+#: builtin/config.c:80
msgid "value is a path (file or directory name)"
msgstr "värdet är en sökväg (fil- eller katalognamn)"
-#: builtin/config.c:82
+#: builtin/config.c:81
msgid "Other"
msgstr "Andra"
-#: builtin/config.c:83
+#: builtin/config.c:82
msgid "terminate values with NUL byte"
msgstr "terminera värden med NUL-byte"
-#: builtin/config.c:84
+#: builtin/config.c:83
msgid "show variable names only"
msgstr "visa endast variabelnamn"
-#: builtin/config.c:85
+#: builtin/config.c:84
msgid "respect include directives on lookup"
msgstr "respektera inkluderingsdirektiv vid uppslag"
-#: builtin/config.c:86
+#: builtin/config.c:85
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)"
-#: builtin/config.c:328
+#: builtin/config.c:327
msgid "unable to parse default color value"
msgstr "kan inte tolka standardfärgvärde"
-#: builtin/config.c:472
+#: builtin/config.c:471
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -6005,7 +6400,7 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:614
+#: builtin/config.c:613
#, c-format
msgid "cannot create configuration file %s"
msgstr "kan inte skapa konfigurationsfilen \"%s\""
@@ -6041,7 +6436,7 @@ msgstr "den annoterade taggen %s har inget inbäddat namn"
msgid "tag '%s' is really '%s' here"
msgstr "taggen \"%s\" är i verkligheten \"%s\" här"
-#: builtin/describe.c:250 builtin/log.c:465
+#: builtin/describe.c:250 builtin/log.c:480
#, c-format
msgid "Not a valid object name %s"
msgstr "Objektnamnet är inte giltigt: %s"
@@ -6239,176 +6634,177 @@ msgstr "Applicera referensspecifikation på exporterade referenser"
msgid "anonymize output"
msgstr "anonymisera utdata"
-#: builtin/fetch.c:20
+#: builtin/fetch.c:21
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/fetch.c:21
+#: builtin/fetch.c:22
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<flaggor>] <grupp>"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<flaggor>]"
-#: builtin/fetch.c:92 builtin/pull.c:174
+#: builtin/fetch.c:93 builtin/pull.c:174
msgid "fetch from all remotes"
msgstr "hämta från alla fjärrar"
-#: builtin/fetch.c:94 builtin/pull.c:177
+#: builtin/fetch.c:95 builtin/pull.c:177
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"
-#: builtin/fetch.c:96 builtin/pull.c:180
+#: builtin/fetch.c:97 builtin/pull.c:180
msgid "path to upload pack on remote end"
msgstr "sökväg till upload pack på fjärren"
-#: builtin/fetch.c:97 builtin/pull.c:182
+#: builtin/fetch.c:98 builtin/pull.c:182
msgid "force overwrite of local branch"
msgstr "tvinga överskrivning av lokal gren"
-#: builtin/fetch.c:99
+#: builtin/fetch.c:100
msgid "fetch from multiple remotes"
msgstr "hämta från flera fjärrar"
-#: builtin/fetch.c:101 builtin/pull.c:184
+#: builtin/fetch.c:102 builtin/pull.c:184
msgid "fetch all tags and associated objects"
msgstr "hämta alla taggar och associerade objekt"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:104
msgid "do not fetch all tags (--no-tags)"
msgstr "hämta inte alla taggar (--no-tags)"
-#: builtin/fetch.c:105
+#: builtin/fetch.c:106
msgid "number of submodules fetched in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/fetch.c:107 builtin/pull.c:187
+#: builtin/fetch.c:108 builtin/pull.c:187
msgid "prune remote-tracking branches no longer on remote"
msgstr "rensa fjärrspårande grenar ej längre på fjärren"
-#: builtin/fetch.c:108 builtin/pull.c:190
+#: builtin/fetch.c:109 builtin/pull.c:190
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:109 builtin/pull.c:191
+#: builtin/fetch.c:110 builtin/pull.c:191
msgid "control recursive fetching of submodules"
msgstr "styr rekursiv hämtning av undermoduler"
-#: builtin/fetch.c:113 builtin/pull.c:199
+#: builtin/fetch.c:114 builtin/pull.c:199
msgid "keep downloaded pack"
msgstr "behåll hämtade paket"
-#: builtin/fetch.c:115
+#: builtin/fetch.c:116
msgid "allow updating of HEAD ref"
msgstr "tillåt uppdatering av HEAD-referens"
-#: builtin/fetch.c:118 builtin/pull.c:202
+#: builtin/fetch.c:119 builtin/pull.c:202
msgid "deepen history of shallow clone"
msgstr "fördjupa historik för grund klon"
-#: builtin/fetch.c:120 builtin/pull.c:205
+#: builtin/fetch.c:121 builtin/pull.c:205
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
-#: builtin/fetch.c:122 builtin/log.c:1399
+#: builtin/fetch.c:123 builtin/log.c:1426
msgid "dir"
msgstr "kat"
-#: builtin/fetch.c:123
+#: builtin/fetch.c:124
msgid "prepend this to submodule path output"
msgstr "lägg till i början av undermodulens sökvägsutdata"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:127
msgid "default mode for recursion"
msgstr "standardläge för rekursion"
-#: builtin/fetch.c:128 builtin/pull.c:208
+#: builtin/fetch.c:129 builtin/pull.c:208
msgid "accept refs that update .git/shallow"
msgstr "tar emot referenser som uppdaterar .git/shallow"
-#: builtin/fetch.c:129 builtin/pull.c:210
+#: builtin/fetch.c:130 builtin/pull.c:210
msgid "refmap"
msgstr "referenskarta"
-#: builtin/fetch.c:130 builtin/pull.c:211
+#: builtin/fetch.c:131 builtin/pull.c:211
msgid "specify fetch refmap"
msgstr "ange referenskarta för \"fetch\""
-#: builtin/fetch.c:386
+#: builtin/fetch.c:387
msgid "Couldn't find remote ref HEAD"
msgstr "Kunde inte hitta fjärr-referensen HEAD"
-#: builtin/fetch.c:466
+#: builtin/fetch.c:503
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s"
+
+#: builtin/fetch.c:592
#, c-format
msgid "object %s not found"
msgstr "objektet %s hittades inte"
-#: builtin/fetch.c:471
+#: builtin/fetch.c:596
msgid "[up to date]"
msgstr "[àjour]"
-#: builtin/fetch.c:485
-#, c-format
-msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
-msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)"
-
-#: builtin/fetch.c:486 builtin/fetch.c:574
+#: builtin/fetch.c:609 builtin/fetch.c:689
msgid "[rejected]"
msgstr "[refuserad]"
-#: builtin/fetch.c:497
+#: builtin/fetch.c:610
+msgid "can't fetch in current branch"
+msgstr "kan inte hämta i aktuell gren"
+
+#: builtin/fetch.c:619
msgid "[tag update]"
msgstr "[uppdaterad tagg]"
-#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
-msgid " (unable to update local ref)"
-msgstr " (kunde inte uppdatera lokal ref)"
+#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
+#: builtin/fetch.c:684
+msgid "unable to update local ref"
+msgstr "kunde inte uppdatera lokal ref"
-#: builtin/fetch.c:517
+#: builtin/fetch.c:639
msgid "[new tag]"
msgstr "[ny tagg]"
-#: builtin/fetch.c:520
+#: builtin/fetch.c:642
msgid "[new branch]"
msgstr "[ny gren]"
-#: builtin/fetch.c:523
+#: builtin/fetch.c:645
msgid "[new ref]"
msgstr "[ny ref]"
-#: builtin/fetch.c:569
-msgid "unable to update local ref"
-msgstr "kunde inte uppdatera lokal ref"
-
-#: builtin/fetch.c:569
+#: builtin/fetch.c:684
msgid "forced update"
msgstr "tvingad uppdatering"
-#: builtin/fetch.c:576
-msgid "(non-fast-forward)"
-msgstr "(ej snabbspolad)"
+#: builtin/fetch.c:689
+msgid "non-fast-forward"
+msgstr "ej snabbspolad"
-#: builtin/fetch.c:619
+#: builtin/fetch.c:733
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s sände inte alla nödvändiga objekt\n"
-#: builtin/fetch.c:637
+#: builtin/fetch.c:753
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "avvisa %s då grunda rötter inte kan uppdateras"
-#: builtin/fetch.c:724 builtin/fetch.c:816
+#: builtin/fetch.c:839 builtin/fetch.c:934
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
-#: builtin/fetch.c:735
+#: builtin/fetch.c:850
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -6417,55 +6813,55 @@ msgstr ""
"vissa lokala referenser kunde inte uppdateras; testa att köra\n"
" \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
-#: builtin/fetch.c:787
+#: builtin/fetch.c:904
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
-#: builtin/fetch.c:788
+#: builtin/fetch.c:905
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
-#: builtin/fetch.c:820
+#: builtin/fetch.c:937
msgid "[deleted]"
msgstr "[borttagen]"
-#: builtin/fetch.c:821 builtin/remote.c:1025
+#: builtin/fetch.c:938 builtin/remote.c:1020
msgid "(none)"
msgstr "(ingen)"
-#: builtin/fetch.c:841
+#: builtin/fetch.c:960
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:979
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"
-#: builtin/fetch.c:863
+#: builtin/fetch.c:982
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Flaggan \"%s\" ignoreras för %s\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1039
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Vet inte hur man hämtar från %s"
-#: builtin/fetch.c:1080
+#: builtin/fetch.c:1199
#, c-format
msgid "Fetching %s\n"
msgstr "Hämtar %s\n"
-#: builtin/fetch.c:1082 builtin/remote.c:96
+#: builtin/fetch.c:1201 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "Kunde inte hämta %s"
-#: builtin/fetch.c:1100
+#: builtin/fetch.c:1219
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -6473,32 +6869,32 @@ msgstr ""
"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
"fjärrarkiv som nya incheckningar skall hämtas från."
-#: builtin/fetch.c:1123
+#: builtin/fetch.c:1242
msgid "You need to specify a tag name."
msgstr "Du måste ange namnet på en tagg."
-#: builtin/fetch.c:1165
+#: builtin/fetch.c:1284
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth och --unshallow kan inte användas samtidigt"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1286
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow kan inte användas på ett komplett arkiv"
-#: builtin/fetch.c:1187
+#: builtin/fetch.c:1306
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
-#: builtin/fetch.c:1189
+#: builtin/fetch.c:1308
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
-#: builtin/fetch.c:1200
+#: builtin/fetch.c:1319
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Fjärren eller fjärrgruppen finns inte: %s"
-#: builtin/fetch.c:1208
+#: builtin/fetch.c:1327
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
@@ -6584,67 +6980,65 @@ msgstr "visa endast referenser som ej slagits samman"
msgid "print only refs which contain the commit"
msgstr "visa endast referenser som innehåller incheckningen"
-# Vague original, not networking-related, but rather related to the actual
-# objects in the database.
-#: builtin/fsck.c:156 builtin/prune.c:140
-msgid "Checking connectivity"
-msgstr "Kontrollerar konnektivitet"
-
-#: builtin/fsck.c:486
+#: builtin/fsck.c:519
msgid "Checking object directories"
msgstr "Kontrollerar objektkataloger"
-#: builtin/fsck.c:552
+#: builtin/fsck.c:588
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<flaggor>] [<objekt>...]"
-#: builtin/fsck.c:558
+#: builtin/fsck.c:594
msgid "show unreachable objects"
msgstr "visa onåbara objekt"
-#: builtin/fsck.c:559
+#: builtin/fsck.c:595
msgid "show dangling objects"
msgstr "visa dinglande objekt"
-#: builtin/fsck.c:560
+#: builtin/fsck.c:596
msgid "report tags"
msgstr "rapportera taggar"
-#: builtin/fsck.c:561
+#: builtin/fsck.c:597
msgid "report root nodes"
msgstr "rapportera rotnoder"
-#: builtin/fsck.c:562
+#: builtin/fsck.c:598
msgid "make index objects head nodes"
msgstr "gör indexojekt till huvudnoder"
-#: builtin/fsck.c:563
+#: builtin/fsck.c:599
msgid "make reflogs head nodes (default)"
msgstr "gör refloggar till huvudnoder (standard)"
-#: builtin/fsck.c:564
+#: builtin/fsck.c:600
msgid "also consider packs and alternate objects"
msgstr "ta även hänsyn till paket och alternativa objekt"
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: builtin/fsck.c:565
+#: builtin/fsck.c:601
msgid "check only connectivity"
msgstr "kontrollera endast konnektivitet"
-#: builtin/fsck.c:566
+#: builtin/fsck.c:602
msgid "enable more strict checking"
msgstr "aktivera striktare kontroll"
-#: builtin/fsck.c:568
+#: builtin/fsck.c:604
msgid "write dangling objects in .git/lost-found"
msgstr "skriv dinglande objekt i .git/lost-found"
-#: builtin/fsck.c:569 builtin/prune.c:107
+#: builtin/fsck.c:605 builtin/prune.c:107
msgid "show progress"
msgstr "visa förlopp"
-#: builtin/fsck.c:630
+#: builtin/fsck.c:606
+msgid "show verbose names for reachable objects"
+msgstr "visa ordrika namn för nåbara objekt"
+
+#: builtin/fsck.c:671
msgid "Checking objects"
msgstr "Kontrollerar objekt"
@@ -6933,7 +7327,7 @@ msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
msgid "no pattern given."
msgstr "inget mönster angavs."
-#: builtin/grep.c:845 builtin/index-pack.c:1477
+#: builtin/grep.c:845 builtin/index-pack.c:1479
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "felaktigt antal trådar angivet (%d)"
@@ -7078,334 +7472,330 @@ msgstr "ingen man-visare hanterade förfrågan"
msgid "no info viewer handled the request"
msgstr "ingen info-visare hanterade förfrågan"
-#: builtin/help.c:408
+#: builtin/help.c:401
msgid "Defining attributes per path"
msgstr "Definierar attribut per sökväg"
-#: builtin/help.c:409
+#: builtin/help.c:402
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git för dagligt bruk i ungefär 20 kommandon"
-#: builtin/help.c:410
+#: builtin/help.c:403
msgid "A Git glossary"
msgstr "En Git-ordlista"
-#: builtin/help.c:411
+#: builtin/help.c:404
msgid "Specifies intentionally untracked files to ignore"
msgstr "Ange avsiktligen ospårade filer att ignorera"
-#: builtin/help.c:412
+#: builtin/help.c:405
msgid "Defining submodule properties"
msgstr "Ange egenskaper för undermoduler"
-#: builtin/help.c:413
+#: builtin/help.c:406
msgid "Specifying revisions and ranges for Git"
msgstr "Ange versioner och intervall i Git"
-#: builtin/help.c:414
+#: builtin/help.c:407
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Introduktion till Git (för version 1.5.1 och senare)"
-#: builtin/help.c:415
+#: builtin/help.c:408
msgid "An overview of recommended workflows with Git"
msgstr "Översikt över rekommenderade arbetsflöden med Git"
-#: builtin/help.c:427
+#: builtin/help.c:420
msgid "The common Git guides are:\n"
msgstr "De vanliga Git-vägledningarna är:\n"
-#: builtin/help.c:448 builtin/help.c:465
+#: builtin/help.c:441 builtin/help.c:458
#, c-format
msgid "usage: %s%s"
msgstr "användning: %s%s"
-#: builtin/help.c:481
+#: builtin/help.c:474
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "\"git %s\" är ett alias för \"%s\""
-#: builtin/index-pack.c:152
+#: builtin/index-pack.c:153
#, c-format
msgid "unable to open %s"
msgstr "kunde inte öppna %s"
-#: builtin/index-pack.c:202
+#: builtin/index-pack.c:203
#, c-format
msgid "object type mismatch at %s"
msgstr "objekttyp stämmer inte överens vid %s"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:223
#, c-format
msgid "did not receive expected object %s"
msgstr "emottog inte det förväntade objektet %s"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objektet %s: förväntad typ %s, såg %s"
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:268
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "kan inte fylla %d byte"
msgstr[1] "kan inte fylla %d byte"
-#: builtin/index-pack.c:277
+#: builtin/index-pack.c:278
msgid "early EOF"
msgstr "tidigt filslut"
-#: builtin/index-pack.c:278
+#: builtin/index-pack.c:279
msgid "read error on input"
msgstr "indataläsfel"
-#: builtin/index-pack.c:290
+#: builtin/index-pack.c:291
msgid "used more bytes than were available"
msgstr "använde fler byte än tillgängligt"
-#: builtin/index-pack.c:297
+#: builtin/index-pack.c:298
msgid "pack too large for current definition of off_t"
msgstr "paket för stort för nuvarande definition av off_t"
-#: builtin/index-pack.c:313
+#: builtin/index-pack.c:314
#, c-format
msgid "unable to create '%s'"
msgstr "kunde inte skapa \"%s\""
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "cannot open packfile '%s'"
msgstr "kan inte öppna paketfilen \"%s\""
-#: builtin/index-pack.c:332
+#: builtin/index-pack.c:333
msgid "pack signature mismatch"
msgstr "paketsignatur stämmer inte överens"
-#: builtin/index-pack.c:334
+#: builtin/index-pack.c:335
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "paketversion %<PRIu32> stöds ej"
-#: builtin/index-pack.c:352
+#: builtin/index-pack.c:353
#, c-format
-msgid "pack has bad object at offset %lu: %s"
-msgstr "paketet har felaktigt objekt vid index %lu: %s"
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s"
-#: builtin/index-pack.c:473
+#: builtin/index-pack.c:475
#, c-format
msgid "inflate returned %d"
msgstr "inflate returnerade %d"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:524
msgid "offset value overflow for delta base object"
msgstr "indexvärdespill för deltabasobjekt"
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:532
msgid "delta base offset is out of bound"
msgstr "deltabasindex utanför gränsen"
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:540
#, c-format
msgid "unknown object type %d"
msgstr "okänd objekttyp %d"
-#: builtin/index-pack.c:569
+#: builtin/index-pack.c:571
msgid "cannot pread pack file"
msgstr "kan inte utföra \"pread\" på paketfil"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:573
#, c-format
-msgid "premature end of pack file, %lu byte missing"
-msgid_plural "premature end of pack file, %lu bytes missing"
-msgstr[0] "för tidigt slut på paketfilen, %lu byte saknas"
-msgstr[1] "för tidigt slut på paketfilen, %lu byte saknas"
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+msgstr[0] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
+msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
-#: builtin/index-pack.c:597
+#: builtin/index-pack.c:599
msgid "serious inflate inconsistency"
msgstr "allvarlig inflate-inkonsekvens"
-#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
-#: builtin/index-pack.c:806 builtin/index-pack.c:815
+#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
+#: builtin/index-pack.c:808 builtin/index-pack.c:817
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
-#: builtin/index-pack.c:746 builtin/pack-objects.c:162
-#: builtin/pack-objects.c:254
+#: builtin/index-pack.c:748 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:256
#, c-format
msgid "unable to read %s"
msgstr "kunde inte läsa %s"
-#: builtin/index-pack.c:812
+#: builtin/index-pack.c:814
#, c-format
msgid "cannot read existing object %s"
msgstr "kan inte läsa befintligt objekt %s"
-#: builtin/index-pack.c:826
+#: builtin/index-pack.c:828
#, c-format
msgid "invalid blob object %s"
msgstr "ogiltigt blob-objekt %s"
-#: builtin/index-pack.c:840
+#: builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr "ogiltigt %s"
-#: builtin/index-pack.c:843
+#: builtin/index-pack.c:845
msgid "Error in object"
msgstr "Fel i objekt"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Inte alla barnobjekt för %s kan nås"
-#: builtin/index-pack.c:917 builtin/index-pack.c:948
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "misslyckades tillämpa delta"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1120
msgid "Receiving objects"
msgstr "Tar emot objekt"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1120
msgid "Indexing objects"
msgstr "Skapar index för objekt"
-#: builtin/index-pack.c:1150
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paketet är trasigt (SHA1 stämmer inte)"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "kan inte utföra \"fstat\" på paketfil"
-#: builtin/index-pack.c:1158
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "paket har skräp i slutet"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1171
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "förvirrad bortom vanvett i parse_pack_objects()"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1196
msgid "Resolving deltas"
msgstr "Analyserar delta"
-#: builtin/index-pack.c:1205
+#: builtin/index-pack.c:1207
#, c-format
msgid "unable to create thread: %s"
msgstr "kunde inte skapa tråd: %s"
-#: builtin/index-pack.c:1247
+#: builtin/index-pack.c:1249
msgid "confusion beyond insanity"
msgstr "förvirrad bortom vanvett"
-#: builtin/index-pack.c:1253
+#: builtin/index-pack.c:1255
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "slutfördes med %d lokalt objekt"
msgstr[1] "slutfördes med %d lokala objekt"
-#: builtin/index-pack.c:1265
+#: builtin/index-pack.c:1267
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Oväntad svanschecksumma för %s (trasig disk?)"
-#: builtin/index-pack.c:1269
+#: builtin/index-pack.c:1271
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "paketet har %d oanalyserat delta"
msgstr[1] "paketet har %d oanalyserade delta"
-#: builtin/index-pack.c:1293
+#: builtin/index-pack.c:1295
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
-#: builtin/index-pack.c:1369
+#: builtin/index-pack.c:1371
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalt objekt %s är trasigt"
-#: builtin/index-pack.c:1393
+#: builtin/index-pack.c:1395
msgid "error while closing pack file"
msgstr "fel vid stängning av paketfil"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1408
#, c-format
msgid "cannot write keep file '%s'"
msgstr "kan inte ta skriva \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:1414
+#: builtin/index-pack.c:1416
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1429
msgid "cannot store pack file"
msgstr "kan inte spara paketfil"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1440
msgid "cannot store index file"
msgstr "kan inte spara indexfil"
-#: builtin/index-pack.c:1471
+#: builtin/index-pack.c:1473
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "felaktig pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
+#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr "trådstöd saknas, ignorerar %s"
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kan inte öppna befintlig paketfil \"%s\""
-#: builtin/index-pack.c:1542
+#: builtin/index-pack.c:1544
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""
-#: builtin/index-pack.c:1589
+#: builtin/index-pack.c:1591
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "icke-delta: %d objekt"
msgstr[1] "icke-delta: %d objekt"
-#: builtin/index-pack.c:1596
+#: builtin/index-pack.c:1598
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "kedjelängd = %d: %lu objekt"
msgstr[1] "kedjelängd = %d: %lu objekt"
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1611
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
-#: builtin/index-pack.c:1638
-msgid "Cannot come back to cwd"
-msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
-
-#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
-#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
+#: builtin/index-pack.c:1693 builtin/index-pack.c:1696
+#: builtin/index-pack.c:1712 builtin/index-pack.c:1716
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
-#: builtin/index-pack.c:1723
+#: builtin/index-pack.c:1730
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kan inte användas med --stdin"
-#: builtin/index-pack.c:1731
+#: builtin/index-pack.c:1738
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
@@ -7469,27 +7859,27 @@ msgstr "kan inte hantera filtyp %d"
msgid "unable to move %s to %s"
msgstr "kan inte flytta %s till %s"
-#. TRANSLATORS: The first '%s' is either "Reinitialized
-#. existing" or "Initialized empty", the second " shared" or
-#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:403
+#: builtin/init-db.c:402
#, c-format
-msgid "%s%s Git repository in %s%s\n"
-msgstr "%s%s Git-arkiv i %s%s\n"
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "Ominitierade befintligt delat Git-arkiv i %s%s\n"
-#: builtin/init-db.c:404
-msgid "Reinitialized existing"
-msgstr "Ominitierade befintligt"
+#: builtin/init-db.c:403
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "Ominitierade befintligt Git-arkiv i %s%s\n"
-#: builtin/init-db.c:404
-msgid "Initialized empty"
-msgstr "Initierade tomt"
+#: builtin/init-db.c:407
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "Initierade tomt delat Git-arkiv i %s%s\n"
-#: builtin/init-db.c:405
-msgid " shared"
-msgstr " delat"
+#: builtin/init-db.c:408
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "Initierade tomt Git-arkiv i %s%s\n"
-#: builtin/init-db.c:452
+#: builtin/init-db.c:455
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7497,25 +7887,25 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
"shared[=<behörigheter>]] [<katalog>]"
-#: builtin/init-db.c:475
+#: builtin/init-db.c:478
msgid "permissions"
msgstr "behörigheter"
-#: builtin/init-db.c:476
+#: builtin/init-db.c:479
msgid "specify that the git repository is to be shared amongst several users"
msgstr "ange att git-arkivet skall delas bland flera användare"
-#: builtin/init-db.c:510 builtin/init-db.c:515
+#: builtin/init-db.c:513 builtin/init-db.c:518
#, c-format
msgid "cannot mkdir %s"
msgstr "kan inte skapa katalogen (mkdir) %s"
-#: builtin/init-db.c:519
+#: builtin/init-db.c:522
#, c-format
msgid "cannot chdir to %s"
msgstr "kan inte byta katalog (chdir) till %s"
-#: builtin/init-db.c:540
+#: builtin/init-db.c:543
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7524,7 +7914,7 @@ msgstr ""
"%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"
"dir=<katalog>)"
-#: builtin/init-db.c:568
+#: builtin/init-db.c:571
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Kan inte komma åt arbetskatalogen \"%s\""
@@ -7557,115 +7947,115 @@ msgstr "släprad(er) att lägga till"
msgid "no input file given for in-place editing"
msgstr "ingen indatafil angiven för redigering på plats"
-#: builtin/log.c:43
+#: builtin/log.c:44
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
-#: builtin/log.c:44
+#: builtin/log.c:45
msgid "git show [<options>] <object>..."
msgstr "git show [<flaggor>] <objekt>..."
-#: builtin/log.c:83
+#: builtin/log.c:84
#, c-format
msgid "invalid --decorate option: %s"
msgstr "ogiltig flagga för --decorate: %s"
-#: builtin/log.c:137
+#: builtin/log.c:139
msgid "suppress diff output"
msgstr "undertryck diff-utdata"
-#: builtin/log.c:138
+#: builtin/log.c:140
msgid "show source"
msgstr "visa källkod"
-#: builtin/log.c:139
+#: builtin/log.c:141
msgid "Use mail map file"
msgstr "Använd e-postmappningsfil"
-#: builtin/log.c:140
+#: builtin/log.c:142
msgid "decorate options"
msgstr "dekoreringsflaggor"
-#: builtin/log.c:143
+#: builtin/log.c:145
msgid "Process line range n,m in file, counting from 1"
msgstr "Behandla radintervallet n,m i filen, med början på 1"
-#: builtin/log.c:239
+#: builtin/log.c:241
#, c-format
msgid "Final output: %d %s\n"
msgstr "Slututdata: %d %s\n"
-#: builtin/log.c:471
+#: builtin/log.c:486
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: felaktig fil"
-#: builtin/log.c:485 builtin/log.c:578
+#: builtin/log.c:500 builtin/log.c:594
#, c-format
msgid "Could not read object %s"
msgstr "Kunde inte läsa objektet %s"
-#: builtin/log.c:602
+#: builtin/log.c:618
#, c-format
msgid "Unknown type: %d"
msgstr "Okänd typ: %d"
-#: builtin/log.c:722
+#: builtin/log.c:739
msgid "format.headers without value"
msgstr "format.headers utan värde"
-#: builtin/log.c:812
+#: builtin/log.c:839
msgid "name of output directory is too long"
msgstr "namnet på utdatakatalogen är för långt"
-#: builtin/log.c:827
+#: builtin/log.c:854
#, c-format
msgid "Cannot open patch file %s"
msgstr "Kan inte öppna patchfilen %s"
-#: builtin/log.c:841
+#: builtin/log.c:868
msgid "Need exactly one range."
msgstr "Behöver precis ett intervall."
-#: builtin/log.c:851
+#: builtin/log.c:878
msgid "Not a range."
msgstr "Inte ett intervall."
-#: builtin/log.c:957
+#: builtin/log.c:984
msgid "Cover letter needs email format"
msgstr "Omslagsbrevet behöver e-postformat"
-#: builtin/log.c:1036
+#: builtin/log.c:1064
#, c-format
msgid "insane in-reply-to: %s"
msgstr "tokigt in-reply-to: %s"
-#: builtin/log.c:1064
+#: builtin/log.c:1092
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
-#: builtin/log.c:1109
+#: builtin/log.c:1137
msgid "Two output directories?"
msgstr "Två utdatakataloger?"
-#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
#, c-format
msgid "Unknown commit %s"
msgstr "Okänd incheckning %s"
-#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
-#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
-#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
-#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
+#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
+#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
+#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
-#: builtin/log.c:1231
+#: builtin/log.c:1259
msgid "Could not find exact merge base."
msgstr "Kunde inte hitta exakt sammanslagningsbas."
-#: builtin/log.c:1235
+#: builtin/log.c:1263
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -7676,307 +8066,307 @@ msgstr ""
"Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> "
"manuellt."
-#: builtin/log.c:1255
+#: builtin/log.c:1283
msgid "Failed to find exact merge base"
msgstr "Kunde inte hitta exakt sammanslagningsbas"
-#: builtin/log.c:1266
+#: builtin/log.c:1294
msgid "base commit should be the ancestor of revision list"
msgstr "basincheckningen bör vara förfader till revisionslistan"
-#: builtin/log.c:1270
+#: builtin/log.c:1298
msgid "base commit shouldn't be in revision list"
msgstr "basincheckningen bör inte vara i revisionslistan"
-#: builtin/log.c:1319
+#: builtin/log.c:1347
msgid "cannot get patch id"
msgstr "kan inte hämta patch-id"
-#: builtin/log.c:1377
+#: builtin/log.c:1404
msgid "use [PATCH n/m] even with a single patch"
msgstr "använd [PATCH n/m] även för en ensam patch"
-#: builtin/log.c:1380
+#: builtin/log.c:1407
msgid "use [PATCH] even with multiple patches"
msgstr "använd [PATCH] även för flera patchar"
-#: builtin/log.c:1384
+#: builtin/log.c:1411
msgid "print patches to standard out"
msgstr "skriv patcharna på standard ut"
-#: builtin/log.c:1386
+#: builtin/log.c:1413
msgid "generate a cover letter"
msgstr "generera ett följebrev"
-#: builtin/log.c:1388
+#: builtin/log.c:1415
msgid "use simple number sequence for output file names"
msgstr "använd enkel nummersekvens för utdatafilnamn"
-#: builtin/log.c:1389
+#: builtin/log.c:1416
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1390
+#: builtin/log.c:1417
msgid "use <sfx> instead of '.patch'"
msgstr "använd <sfx> istället för \".patch\""
-#: builtin/log.c:1392
+#: builtin/log.c:1419
msgid "start numbering patches at <n> instead of 1"
msgstr "börja numrera patchar på <n> istället för 1"
-#: builtin/log.c:1394
+#: builtin/log.c:1421
msgid "mark the series as Nth re-roll"
msgstr "markera serien som N:te försök"
-#: builtin/log.c:1396
+#: builtin/log.c:1423
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Använd [<prefix>] istället för [PATCH]"
-#: builtin/log.c:1399
+#: builtin/log.c:1426
msgid "store resulting files in <dir>"
msgstr "spara filerna i <katalog>"
-#: builtin/log.c:1402
+#: builtin/log.c:1429
msgid "don't strip/add [PATCH]"
msgstr "ta inte bort eller lägg till [PATCH]"
-#: builtin/log.c:1405
+#: builtin/log.c:1432
msgid "don't output binary diffs"
msgstr "skriv inte binära diffar"
-#: builtin/log.c:1407
+#: builtin/log.c:1434
msgid "output all-zero hash in From header"
msgstr "använd hashvärde med nollor i From-huvud"
-#: builtin/log.c:1409
+#: builtin/log.c:1436
msgid "don't include a patch matching a commit upstream"
msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
-#: builtin/log.c:1411
+#: builtin/log.c:1438
msgid "show patch format instead of default (patch + stat)"
msgstr "visa patchformat istället för standard (patch + stat)"
-#: builtin/log.c:1413
+#: builtin/log.c:1440
msgid "Messaging"
msgstr "E-post"
-#: builtin/log.c:1414
+#: builtin/log.c:1441
msgid "header"
msgstr "huvud"
-#: builtin/log.c:1415
+#: builtin/log.c:1442
msgid "add email header"
msgstr "lägg till e-posthuvud"
-#: builtin/log.c:1416 builtin/log.c:1418
+#: builtin/log.c:1443 builtin/log.c:1445
msgid "email"
msgstr "epost"
-#: builtin/log.c:1416
+#: builtin/log.c:1443
msgid "add To: header"
msgstr "Lägg till mottagarhuvud (\"To:\")"
-#: builtin/log.c:1418
+#: builtin/log.c:1445
msgid "add Cc: header"
msgstr "Lägg till kopiehuvud (\"Cc:\")"
-#: builtin/log.c:1420
+#: builtin/log.c:1447
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1421
+#: builtin/log.c:1448
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)"
-#: builtin/log.c:1423
+#: builtin/log.c:1450
msgid "message-id"
msgstr "meddelande-id"
-#: builtin/log.c:1424
+#: builtin/log.c:1451
msgid "make first mail a reply to <message-id>"
msgstr "Gör det första brevet ett svar till <meddelande-id>"
-#: builtin/log.c:1425 builtin/log.c:1428
+#: builtin/log.c:1452 builtin/log.c:1455
msgid "boundary"
msgstr "gräns"
-#: builtin/log.c:1426
+#: builtin/log.c:1453
msgid "attach the patch"
msgstr "bifoga patchen"
-#: builtin/log.c:1429
+#: builtin/log.c:1456
msgid "inline the patch"
msgstr "gör patchen ett inline-objekt"
-#: builtin/log.c:1433
+#: builtin/log.c:1460
msgid "enable message threading, styles: shallow, deep"
msgstr "aktivera brevtrådning, typer: shallow, deep"
-#: builtin/log.c:1435
+#: builtin/log.c:1462
msgid "signature"
msgstr "signatur"
-#: builtin/log.c:1436
+#: builtin/log.c:1463
msgid "add a signature"
msgstr "lägg till signatur"
-#: builtin/log.c:1437
+#: builtin/log.c:1464
msgid "base-commit"
msgstr "basincheckning"
-#: builtin/log.c:1438
+#: builtin/log.c:1465
msgid "add prerequisite tree info to the patch series"
msgstr "lägg till förhandskrävd trädinfo i patchserien"
-#: builtin/log.c:1440
+#: builtin/log.c:1467
msgid "add a signature from a file"
msgstr "lägg till signatur från fil"
-#: builtin/log.c:1441
+#: builtin/log.c:1468
msgid "don't print the patch filenames"
msgstr "visa inte filnamn för patchar"
-#: builtin/log.c:1531
+#: builtin/log.c:1558
msgid "-n and -k are mutually exclusive."
msgstr "-n och -k kan inte användas samtidigt."
-#: builtin/log.c:1533
+#: builtin/log.c:1560
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix och -k kan inte användas samtidigt."
-#: builtin/log.c:1541
+#: builtin/log.c:1568
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
-#: builtin/log.c:1543
+#: builtin/log.c:1570
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
-#: builtin/log.c:1545
+#: builtin/log.c:1572
msgid "--check does not make sense"
msgstr "kan inte använda --check"
-#: builtin/log.c:1573
+#: builtin/log.c:1602
msgid "standard output, or directory, which one?"
msgstr "standard ut, eller katalog, vilken skall det vara?"
-#: builtin/log.c:1575
+#: builtin/log.c:1604
#, c-format
msgid "Could not create directory '%s'"
msgstr "Kunde inte skapa katalogen \"%s\""
-#: builtin/log.c:1672
+#: builtin/log.c:1698
#, c-format
msgid "unable to read signature file '%s'"
msgstr "kunde inte läsa signaturfil \"%s\""
-#: builtin/log.c:1743
+#: builtin/log.c:1769
msgid "Failed to create output files"
msgstr "Misslyckades skapa utdatafiler"
-#: builtin/log.c:1792
+#: builtin/log.c:1818
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
-#: builtin/log.c:1846
+#: builtin/log.c:1872
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
-#: builtin/ls-files.c:378
+#: builtin/ls-files.c:379
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<flaggor>] [<fil>...]"
-#: builtin/ls-files.c:427
+#: builtin/ls-files.c:428
msgid "identify the file status with tags"
msgstr "identifiera filstatus med taggar"
-#: builtin/ls-files.c:429
+#: builtin/ls-files.c:430
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "använd små bokstäver för \"anta oförändrade\"-filer"
-#: builtin/ls-files.c:431
+#: builtin/ls-files.c:432
msgid "show cached files in the output (default)"
msgstr "visa cachade filer i utdata (standard)"
-#: builtin/ls-files.c:433
+#: builtin/ls-files.c:434
msgid "show deleted files in the output"
msgstr "visa borttagna filer i utdata"
-#: builtin/ls-files.c:435
+#: builtin/ls-files.c:436
msgid "show modified files in the output"
msgstr "visa modifierade filer i utdata"
-#: builtin/ls-files.c:437
+#: builtin/ls-files.c:438
msgid "show other files in the output"
msgstr "visa andra filer i utdata"
-#: builtin/ls-files.c:439
+#: builtin/ls-files.c:440
msgid "show ignored files in the output"
msgstr "visa ignorerade filer i utdata"
-#: builtin/ls-files.c:442
+#: builtin/ls-files.c:443
msgid "show staged contents' object name in the output"
msgstr "visa köat innehålls objektnamn i utdata"
-#: builtin/ls-files.c:444
+#: builtin/ls-files.c:445
msgid "show files on the filesystem that need to be removed"
msgstr "visa filer i filsystemet som behöver tas bort"
-#: builtin/ls-files.c:446
+#: builtin/ls-files.c:447
msgid "show 'other' directories' names only"
msgstr "visa endast namn för \"andra\" kataloger"
-#: builtin/ls-files.c:448
+#: builtin/ls-files.c:449
msgid "show line endings of files"
msgstr "visa radslut i filer"
-#: builtin/ls-files.c:450
+#: builtin/ls-files.c:451
msgid "don't show empty directories"
msgstr "visa inte tomma kataloger"
-#: builtin/ls-files.c:453
+#: builtin/ls-files.c:454
msgid "show unmerged files in the output"
msgstr "visa ej sammanslagna filer i utdata"
-#: builtin/ls-files.c:455
+#: builtin/ls-files.c:456
msgid "show resolve-undo information"
msgstr "visa \"resolve-undo\"-information"
-#: builtin/ls-files.c:457
+#: builtin/ls-files.c:458
msgid "skip files matching pattern"
msgstr "hoppa över filer som motsvarar mönster"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:461
msgid "exclude patterns are read from <file>"
msgstr "exkludera mönster som läses från <fil>"
-#: builtin/ls-files.c:463
+#: builtin/ls-files.c:464
msgid "read additional per-directory exclude patterns in <file>"
msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:466
msgid "add the standard git exclusions"
msgstr "lägg till git:s standardexkluderingar"
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:469
msgid "make the output relative to the project top directory"
msgstr "gör utdata relativ till projektets toppkatalog"
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:472
msgid "if any <file> is not in the index, treat this as an error"
msgstr "om en <fil> inte är indexet, betrakta det som ett fel"
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:473
msgid "tree-ish"
msgstr "träd-igt"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:474
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns"
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:476
msgid "show debugging data"
msgstr "visa felsökningsutdata"
@@ -8062,189 +8452,175 @@ msgstr "använd fullständiga sökvägsnamn"
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)"
-#: builtin/merge.c:45
+#: builtin/merge.c:46
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<flaggor>] [<incheckning>...]"
-#: builtin/merge.c:46
+#: builtin/merge.c:47
msgid "git merge [<options>] <msg> HEAD <commit>"
msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:101
+#: builtin/merge.c:102
msgid "switch `m' requires a value"
msgstr "flaggan \"m\" behöver ett värde"
-#: builtin/merge.c:138
+#: builtin/merge.c:139
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
-#: builtin/merge.c:139
+#: builtin/merge.c:140
#, c-format
msgid "Available strategies are:"
msgstr "Tillgängliga strategier är:"
-#: builtin/merge.c:144
+#: builtin/merge.c:145
#, c-format
msgid "Available custom strategies are:"
msgstr "Tillgängliga skräddarsydda strategier är:"
-#: builtin/merge.c:194 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:126
msgid "do not show a diffstat at the end of the merge"
msgstr "visa inte en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:129
msgid "show a diffstat at the end of the merge"
msgstr "visa en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:198 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:132
msgid "(synonym to --stat)"
msgstr "(synonym till --stat)"
-#: builtin/merge.c:200 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:135
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"
-#: builtin/merge.c:203 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:138
msgid "create a single commit instead of doing a merge"
msgstr "skapa en ensam incheckning istället för en sammanslagning"
-#: builtin/merge.c:205 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:141
msgid "perform a commit if the merge succeeds (default)"
msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
-#: builtin/merge.c:207 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:144
msgid "edit message before committing"
msgstr "redigera meddelande innan incheckning"
-#: builtin/merge.c:208
+#: builtin/merge.c:209
msgid "allow fast-forward (default)"
msgstr "tillåt snabbspolning (standard)"
-#: builtin/merge.c:210 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:150
msgid "abort if fast-forward is not possible"
msgstr "avbryt om snabbspolning inte är möjlig"
-#: builtin/merge.c:214
-msgid "Verify that the named commit has a valid GPG signature"
-msgstr "Bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
+#: builtin/merge.c:215 builtin/pull.c:153
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
-#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157
#: builtin/revert.c:89
msgid "strategy"
msgstr "strategi"
-#: builtin/merge.c:216 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:158
msgid "merge strategy to use"
msgstr "sammanslagningsstrategi att använda"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:161
msgid "option=value"
msgstr "alternativ=värde"
-#: builtin/merge.c:218 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:162
msgid "option for selected merge strategy"
msgstr "alternativ för vald sammanslagningsstrategi"
-#: builtin/merge.c:220
+#: builtin/merge.c:221
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
-#: builtin/merge.c:224
+#: builtin/merge.c:225
msgid "abort the current in-progress merge"
msgstr "avbryt den pågående sammanslagningen"
-#: builtin/merge.c:226 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:169
msgid "allow merging unrelated histories"
msgstr "tillåt sammanslagning av orelaterade historier"
-#: builtin/merge.c:254
+#: builtin/merge.c:255
msgid "could not run stash."
msgstr "kunde köra stash."
-#: builtin/merge.c:259
+#: builtin/merge.c:260
msgid "stash failed"
msgstr "stash misslyckades"
-#: builtin/merge.c:264
+#: builtin/merge.c:265
#, c-format
msgid "not a valid object: %s"
msgstr "inte ett giltigt objekt: %s"
-#: builtin/merge.c:283 builtin/merge.c:300
+#: builtin/merge.c:284 builtin/merge.c:301
msgid "read-tree failed"
msgstr "read-tree misslyckades"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
msgid " (nothing to squash)"
msgstr " (inget att platta till)"
-#: builtin/merge.c:343
+#: builtin/merge.c:342
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
-#: builtin/merge.c:1000
-#, c-format
-msgid "Could not write to '%s'"
-msgstr "Kunde inte skriva till \"%s\""
-
-#: builtin/merge.c:375
-msgid "Writing SQUASH_MSG"
-msgstr "Skriver SQUASH_MSG"
-
-#: builtin/merge.c:377
-msgid "Finishing SQUASH_MSG"
-msgstr "Avslutar SQUASH_MSG"
-
-#: builtin/merge.c:400
+#: builtin/merge.c:392
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:451
+#: builtin/merge.c:443
#, c-format
msgid "'%s' does not point to a commit"
msgstr "\"%s\" verkar inte peka på en incheckning"
-#: builtin/merge.c:541
+#: builtin/merge.c:533
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
-#: builtin/merge.c:660
+#: builtin/merge.c:652
msgid "Not handling anything other than two heads merge."
msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
-#: builtin/merge.c:674
+#: builtin/merge.c:666
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Felaktig flagga för merge-recursive: -X%s"
-#: builtin/merge.c:687
+#: builtin/merge.c:681
#, c-format
msgid "unable to write %s"
msgstr "kunde inte skriva %s"
-#: builtin/merge.c:776
+#: builtin/merge.c:733
#, c-format
msgid "Could not read from '%s'"
msgstr "Kunde inte läsa från \"%s\""
-#: builtin/merge.c:785
+#: builtin/merge.c:742
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "
"den.\n"
-#: builtin/merge.c:791
+#: builtin/merge.c:748
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -8260,53 +8636,67 @@ msgstr ""
"Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
"avbryter incheckningen.\n"
-#: builtin/merge.c:815
+#: builtin/merge.c:772
msgid "Empty commit message."
msgstr "Tomt incheckningsmeddelande."
-#: builtin/merge.c:835
+#: builtin/merge.c:792
#, c-format
msgid "Wonderful.\n"
msgstr "Underbart.\n"
-#: builtin/merge.c:890
+#: builtin/merge.c:847
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"
-#: builtin/merge.c:906
+#: builtin/merge.c:863
#, c-format
msgid "'%s' is not a commit"
msgstr "\"%s\" är inte en incheckning"
-#: builtin/merge.c:947
+#: builtin/merge.c:904
msgid "No current branch."
msgstr "Inte på någon gren."
-#: builtin/merge.c:949
+#: builtin/merge.c:906
msgid "No remote for the current branch."
msgstr "Ingen fjärr för aktuell gren."
-#: builtin/merge.c:951
+#: builtin/merge.c:908
msgid "No default upstream defined for the current branch."
msgstr "Ingen standarduppström angiven för aktuell gren."
-#: builtin/merge.c:956
+#: builtin/merge.c:913
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Ingen fjärrspårande gren för %s från %s"
-#: builtin/merge.c:1091
+#: builtin/merge.c:960
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
+
+#: builtin/merge.c:1034
#, c-format
msgid "could not close '%s'"
msgstr "kunde inte stänga \"%s\""
-#: builtin/merge.c:1219
+#: builtin/merge.c:1061
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "inte något vi kan slå ihop med %s: %s"
+
+#: builtin/merge.c:1095
+msgid "not something we can merge"
+msgstr "inte något vi kan slå ihop"
+
+#: builtin/merge.c:1162
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
-#: builtin/merge.c:1235
+#: builtin/merge.c:1178
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8314,7 +8704,7 @@ msgstr ""
"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1242
+#: builtin/merge.c:1185
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8322,106 +8712,114 @@ msgstr ""
"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1245
+#: builtin/merge.c:1188
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."
-#: builtin/merge.c:1254
+#: builtin/merge.c:1197
msgid "You cannot combine --squash with --no-ff."
msgstr "Du kan inte kombinera --squash med --no-ff."
-#: builtin/merge.c:1262
+#: builtin/merge.c:1205
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
-#: builtin/merge.c:1279
+#: builtin/merge.c:1222
msgid "Squash commit into empty head not supported yet"
msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
-#: builtin/merge.c:1281
+#: builtin/merge.c:1224
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"
-#: builtin/merge.c:1286
+#: builtin/merge.c:1229
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - inte något vi kan slå ihop"
-#: builtin/merge.c:1288
+#: builtin/merge.c:1231
msgid "Can merge only exactly one commit into empty head"
msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."
-#: builtin/merge.c:1344
+#: builtin/merge.c:1287
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."
-#: builtin/merge.c:1347
+#: builtin/merge.c:1290
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."
-#: builtin/merge.c:1350
+#: builtin/merge.c:1293
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Incheckning %s har inte någon GPG-signatur."
-#: builtin/merge.c:1353
+#: builtin/merge.c:1296
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
-#: builtin/merge.c:1415
+#: builtin/merge.c:1358
msgid "refusing to merge unrelated histories"
msgstr "vägrar slå samman orelaterad historik"
-#: builtin/merge.c:1439
+#: builtin/merge.c:1367
+msgid "Already up-to-date."
+msgstr "Redan à jour."
+
+#: builtin/merge.c:1382
#, c-format
msgid "Updating %s..%s\n"
msgstr "Uppdaterar %s..%s\n"
-#: builtin/merge.c:1476
+#: builtin/merge.c:1419
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
-#: builtin/merge.c:1483
+#: builtin/merge.c:1426
#, c-format
msgid "Nope.\n"
msgstr "Nej.\n"
-#: builtin/merge.c:1515
+#: builtin/merge.c:1451
+msgid "Already up-to-date. Yeeah!"
+msgstr "Redan à jour. Toppen!"
+
+#: builtin/merge.c:1457
msgid "Not possible to fast-forward, aborting."
msgstr "Kan inte snabbspola, avbryter."
-#: builtin/merge.c:1538 builtin/merge.c:1617
+#: builtin/merge.c:1480 builtin/merge.c:1559
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Återspolar trädet till orört...\n"
-#: builtin/merge.c:1542
+#: builtin/merge.c:1484
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Försöker sammanslagningsstrategin %s...\n"
-#: builtin/merge.c:1608
+#: builtin/merge.c:1550
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
-#: builtin/merge.c:1610
+#: builtin/merge.c:1552
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Sammanslagning med strategin %s misslyckades.\n"
-#: builtin/merge.c:1619
+#: builtin/merge.c:1561
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Använder %s för att förbereda lösning för hand.\n"
-#: builtin/merge.c:1631
+#: builtin/merge.c:1573
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -8550,68 +8948,68 @@ msgstr "tvinga flytta/ändra namn även om målet finns"
msgid "skip move/rename errors"
msgstr "hoppa över fel vid flytt/namnändring"
-#: builtin/mv.c:152
+#: builtin/mv.c:155
#, c-format
msgid "destination '%s' is not a directory"
msgstr "destinationen \"%s\" är ingen katalog"
-#: builtin/mv.c:163
+#: builtin/mv.c:166
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n"
-#: builtin/mv.c:167
+#: builtin/mv.c:170
msgid "bad source"
msgstr "felaktig källa"
-#: builtin/mv.c:170
+#: builtin/mv.c:173
msgid "can not move directory into itself"
msgstr "kan inte flytta katalog till sig själv"
-#: builtin/mv.c:173
+#: builtin/mv.c:176
msgid "cannot move directory over file"
msgstr "kan inte flytta katalog över fil"
-#: builtin/mv.c:182
+#: builtin/mv.c:185
msgid "source directory is empty"
msgstr "källkatalogen är tom"
-#: builtin/mv.c:207
+#: builtin/mv.c:210
msgid "not under version control"
msgstr "inte versionshanterad"
-#: builtin/mv.c:210
+#: builtin/mv.c:213
msgid "destination exists"
msgstr "destinationen finns"
-#: builtin/mv.c:218
+#: builtin/mv.c:221
#, c-format
msgid "overwriting '%s'"
msgstr "skriver över \"%s\""
-#: builtin/mv.c:221
+#: builtin/mv.c:224
msgid "Cannot overwrite"
msgstr "Kan inte skriva över"
-#: builtin/mv.c:224
+#: builtin/mv.c:227
msgid "multiple sources for the same target"
msgstr "flera källor för samma mål"
-#: builtin/mv.c:226
+#: builtin/mv.c:229
msgid "destination directory does not exist"
msgstr "destinationskatalogen finns inte"
-#: builtin/mv.c:233
+#: builtin/mv.c:236
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, källa=%s, mål=%s"
-#: builtin/mv.c:254
+#: builtin/mv.c:257
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Byter namn på %s till %s\n"
-#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
#, c-format
msgid "renaming '%s' failed"
msgstr "misslyckades byta namn på \"%s\""
@@ -8768,6 +9166,10 @@ msgstr "git notes prune [<flaggor>]"
msgid "git notes get-ref"
msgstr "git notes get-ref"
+#: builtin/notes.c:94
+msgid "Write/edit the notes for the following object:"
+msgstr "Skriv/redigera anteckningar för följande objekt:"
+
#: builtin/notes.c:147
#, c-format
msgid "unable to start 'show' for object '%s'"
@@ -8782,80 +9184,75 @@ msgstr "kunde inte läsa utdata från \"show\""
msgid "failed to finish 'show' for object '%s'"
msgstr "kunde inte avsluta \"show\" för objektet \"%s\""
-#: builtin/notes.c:174 builtin/tag.c:248
-#, c-format
-msgid "could not create file '%s'"
-msgstr "kunde inte skapa filen \"%s\""
-
-#: builtin/notes.c:193
+#: builtin/notes.c:194
msgid "Please supply the note contents using either -m or -F option"
msgstr "Ange innehåll för anteckningen med antingen -m eller -F"
-#: builtin/notes.c:202
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "kunde inte skriva anteckningsobjekt"
-#: builtin/notes.c:204
+#: builtin/notes.c:205
#, c-format
msgid "The note contents have been left in %s"
msgstr "Anteckningens innehåll har lämnats kvar i %s"
-#: builtin/notes.c:232 builtin/tag.c:439
+#: builtin/notes.c:233 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: builtin/notes.c:234 builtin/tag.c:442
+#: builtin/notes.c:235 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr "kunde inte öppna eller läsa \"%s\""
-#: builtin/notes.c:256
+#: builtin/notes.c:257
#, c-format
msgid "Failed to read object '%s'."
msgstr "Kunde inte läsa objektet \"%s\"."
-#: builtin/notes.c:260
+#: builtin/notes.c:261
#, c-format
msgid "Cannot read note data from non-blob object '%s'."
msgstr "kan inte läsa anteckningsdata från icke-blob-objektet \"%s\"."
-#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
-#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:946
+#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
+#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
+#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
msgid "too many parameters"
msgstr "för många parametrar"
-#: builtin/notes.c:375 builtin/notes.c:662
+#: builtin/notes.c:376 builtin/notes.c:663
#, c-format
msgid "No note found for object %s."
msgstr "Inga anteckningar hittades för objektet %s."
-#: builtin/notes.c:396 builtin/notes.c:559
+#: builtin/notes.c:397 builtin/notes.c:560
msgid "note contents as a string"
msgstr "anteckningsinnehåll som sträng"
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:400 builtin/notes.c:563
msgid "note contents in a file"
msgstr "anteckningsinnehåll i en fil"
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "reuse and edit specified note object"
msgstr "återanvänd och redigera angivet anteckningsobjekt"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "reuse specified note object"
msgstr "återanvänd angivet anteckningsobjekt"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "allow storing empty note"
msgstr "tillåt lagra tom anteckning"
-#: builtin/notes.c:409 builtin/notes.c:480
+#: builtin/notes.c:410 builtin/notes.c:481
msgid "replace existing notes"
msgstr "ersätt befintliga anteckningar"
-#: builtin/notes.c:434
+#: builtin/notes.c:435
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -8864,29 +9261,29 @@ msgstr ""
"Kan inte lägga till anteckningar. Hittade befintliga anteckningar för "
"objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar"
-#: builtin/notes.c:449 builtin/notes.c:528
+#: builtin/notes.c:450 builtin/notes.c:529
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Skriver över befintliga anteckningar för objektet %s\n"
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
+#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
#, c-format
msgid "Removing note for object %s\n"
msgstr "Tar bort anteckning för objektet %s\n"
-#: builtin/notes.c:481
+#: builtin/notes.c:482
msgid "read objects from stdin"
msgstr "läs objekt från standard in"
-#: builtin/notes.c:483
+#: builtin/notes.c:484
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)"
-#: builtin/notes.c:501
+#: builtin/notes.c:502
msgid "too few parameters"
msgstr "för få parametrar"
-#: builtin/notes.c:522
+#: builtin/notes.c:523
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -8895,12 +9292,12 @@ msgstr ""
"Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet "
"%s. Använd \"-f\" för att skriva över befintliga anteckningar"
-#: builtin/notes.c:534
+#: builtin/notes.c:535
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera."
-#: builtin/notes.c:586
+#: builtin/notes.c:587
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -8909,15 +9306,20 @@ msgstr ""
"Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"
"Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"
-#: builtin/notes.c:768
+#: builtin/notes.c:753
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "okänd sammanslagningsstrategi för anteckningar: %s"
+
+#: builtin/notes.c:769
msgid "General options"
msgstr "Allmänna flaggor"
-#: builtin/notes.c:770
+#: builtin/notes.c:771
msgid "Merge options"
msgstr "Flaggor för sammanslagning"
-#: builtin/notes.c:772
+#: builtin/notes.c:773
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -8925,51 +9327,88 @@ msgstr ""
"läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"
"cat_sort_uniq)"
-#: builtin/notes.c:774
+#: builtin/notes.c:775
msgid "Committing unmerged notes"
msgstr "Checkar in ej sammanslagna anteckningar"
-#: builtin/notes.c:776
+#: builtin/notes.c:777
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"färdigställ sammanslagning av anteckningar genom att checka in ej "
"sammanslagna anteckningar"
-#: builtin/notes.c:778
+#: builtin/notes.c:779
msgid "Aborting notes merge resolution"
msgstr "Avbryt lösning av sammanslagning av anteckningar"
-#: builtin/notes.c:780
+#: builtin/notes.c:781
msgid "abort notes merge"
msgstr "avbryt sammanslagning av anteckningar"
-#: builtin/notes.c:857
+#: builtin/notes.c:792
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "kan inte blanda --commit, --abort eller -s/--strategy"
+
+#: builtin/notes.c:797
+msgid "Must specify a notes ref to merge"
+msgstr "Måste ange en antecknings-referens att slå ihop"
+
+#: builtin/notes.c:821
+#, c-format
+msgid "Unknown -s/--strategy: %s"
+msgstr "Okänd -s/--strategy: %s"
+
+#: builtin/notes.c:858
#, c-format
msgid "A notes merge into %s is already in-progress at %s"
msgstr "Sammanslagning av anteckningar till %s är redan igångsatt på %s"
-#: builtin/notes.c:884
+#: builtin/notes.c:861
+#, c-format
+msgid "Failed to store link to current notes ref (%s)"
+msgstr "Kunde inte lagra länk till aktuell anteckningsreferens (%s)"
+
+#: builtin/notes.c:863
+#, c-format
+msgid ""
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
+msgstr ""
+"Automatisk sammanslagning av anteckningar misslyckades. Rätta konflikter i "
+"%s och checka in resultatet med \"git notes merge --commit\", eller avbryt "
+"sammanslagningen med \"git notes merge --abort\".\n"
+
+#: builtin/notes.c:885
#, c-format
msgid "Object %s has no note\n"
msgstr "Objektet %s har ingen anteckning\n"
-#: builtin/notes.c:896
+#: builtin/notes.c:897
msgid "attempt to remove non-existent note is not an error"
msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel"
-#: builtin/notes.c:899
+#: builtin/notes.c:900
msgid "read object names from the standard input"
msgstr "läs objektnamn från standard in"
-#: builtin/notes.c:980
+#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+msgid "do not remove, show only"
+msgstr "ta inte bort, bara visa"
+
+#: builtin/notes.c:939
+msgid "report pruned notes"
+msgstr "rapportera borttagna anteckningar"
+
+#: builtin/notes.c:981
msgid "notes-ref"
msgstr "anteckningar-ref"
-#: builtin/notes.c:981
+#: builtin/notes.c:982
msgid "use notes from <notes-ref>"
msgstr "använd anteckningar från <anteckningsref>"
-#: builtin/notes.c:1016 builtin/remote.c:1628
+#: builtin/notes.c:1017 builtin/remote.c:1623
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Okänt underkommando: %s"
@@ -8986,175 +9425,179 @@ msgid ""
msgstr ""
"git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]"
-#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
+#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
#, c-format
msgid "deflate error (%d)"
msgstr "fel i deflate (%d)"
-#: builtin/pack-objects.c:763
+#: builtin/pack-objects.c:766
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:779
msgid "Writing objects"
msgstr "Skriver objekt"
-#: builtin/pack-objects.c:1017
+#: builtin/pack-objects.c:1037
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas"
-#: builtin/pack-objects.c:2177
+#: builtin/pack-objects.c:2197
msgid "Compressing objects"
msgstr "Komprimerar objekt"
-#: builtin/pack-objects.c:2563
+#: builtin/pack-objects.c:2611
#, c-format
msgid "unsupported index version %s"
msgstr "indexversionen %s stöds ej"
-#: builtin/pack-objects.c:2567
+#: builtin/pack-objects.c:2615
#, c-format
msgid "bad index version '%s'"
msgstr "felaktig indexversion \"%s\""
-#: builtin/pack-objects.c:2597
+#: builtin/pack-objects.c:2645
msgid "do not show progress meter"
msgstr "visa inte förloppsindikator"
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2647
msgid "show progress meter"
msgstr "visa förloppsindikator"
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2649
msgid "show progress meter during object writing phase"
msgstr "visa förloppsindikator under objektskrivningsfasen"
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2652
msgid "similar to --all-progress when progress meter is shown"
msgstr "som --all-progress när förloppsindikatorn visas"
-#: builtin/pack-objects.c:2605
+#: builtin/pack-objects.c:2653
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2654
msgid "write the pack index file in the specified idx format version"
msgstr "skriv paketindexfilen i angiven indexformatversion"
-#: builtin/pack-objects.c:2609
+#: builtin/pack-objects.c:2657
msgid "maximum size of each output pack file"
msgstr "maximal storlek på varje utdatapaketfil"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2659
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorera lånade objekt från alternativa objektlager"
-#: builtin/pack-objects.c:2613
+#: builtin/pack-objects.c:2661
msgid "ignore packed objects"
msgstr "ignorera packade objekt"
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2663
msgid "limit pack window by objects"
msgstr "begränsa paketfönster efter objekt"
-#: builtin/pack-objects.c:2617
+#: builtin/pack-objects.c:2665
msgid "limit pack window by memory in addition to object limit"
msgstr "begränsa paketfönster efter minne förutom objektgräns"
-#: builtin/pack-objects.c:2619
+#: builtin/pack-objects.c:2667
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "maximal längd på deltakedja tillåten i slutligt paket"
-#: builtin/pack-objects.c:2621
+#: builtin/pack-objects.c:2669
msgid "reuse existing deltas"
msgstr "återanvänd befintliga delta"
-#: builtin/pack-objects.c:2623
+#: builtin/pack-objects.c:2671
msgid "reuse existing objects"
msgstr "återanvänd befintliga objekt"
-#: builtin/pack-objects.c:2625
+#: builtin/pack-objects.c:2673
msgid "use OFS_DELTA objects"
msgstr "använd OFS_DELTA-objekt"
-#: builtin/pack-objects.c:2627
+#: builtin/pack-objects.c:2675
msgid "use threads when searching for best delta matches"
msgstr "använd trådar vid sökning efter bästa deltaträffar"
-#: builtin/pack-objects.c:2629
+#: builtin/pack-objects.c:2677
msgid "do not create an empty pack output"
msgstr "försök inte skapa tom paketutdata"
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2679
msgid "read revision arguments from standard input"
msgstr "läs revisionsargument från standard in"
-#: builtin/pack-objects.c:2633
+#: builtin/pack-objects.c:2681
msgid "limit the objects to those that are not yet packed"
msgstr "begränsa objekt till de som ännu inte packats"
-#: builtin/pack-objects.c:2636
+#: builtin/pack-objects.c:2684
msgid "include objects reachable from any reference"
msgstr "inkludera objekt som kan nås från någon referens"
-#: builtin/pack-objects.c:2639
+#: builtin/pack-objects.c:2687
msgid "include objects referred by reflog entries"
msgstr "inkludera objekt som refereras från referensloggposter"
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2690
msgid "include objects referred to by the index"
msgstr "inkludera objekt som refereras från indexet"
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2693
msgid "output pack to stdout"
msgstr "skriv paket på standard ut"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2695
msgid "include tag objects that refer to objects to be packed"
msgstr "inkludera taggobjekt som refererar objekt som skall packas"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2697
msgid "keep unreachable objects"
msgstr "behåll onåbara objekt"
-#: builtin/pack-objects.c:2650 parse-options.h:142
+#: builtin/pack-objects.c:2699
+msgid "pack loose unreachable objects"
+msgstr "packa lösa onåbara objekt"
+
+#: builtin/pack-objects.c:2700 parse-options.h:142
msgid "time"
msgstr "tid"
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2701
msgid "unpack unreachable objects newer than <time>"
msgstr "packa upp onåbara objekt nyare än <tid>"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2704
msgid "create thin packs"
msgstr "skapa tunna paket"
-#: builtin/pack-objects.c:2656
+#: builtin/pack-objects.c:2706
msgid "create packs suitable for shallow fetches"
msgstr "skapa packfiler lämpade för grunda hämtningar"
-#: builtin/pack-objects.c:2658
+#: builtin/pack-objects.c:2708
msgid "ignore packs that have companion .keep file"
msgstr "ignorera paket som har tillhörande .keep-fil"
-#: builtin/pack-objects.c:2660
+#: builtin/pack-objects.c:2710
msgid "pack compression level"
msgstr "komprimeringsgrad för paket"
-#: builtin/pack-objects.c:2662
+#: builtin/pack-objects.c:2712
msgid "do not hide commits by grafts"
msgstr "göm inte incheckningar med ympningar (\"grafts\")"
-#: builtin/pack-objects.c:2664
+#: builtin/pack-objects.c:2714
msgid "use a bitmap index if available to speed up counting objects"
msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare"
-#: builtin/pack-objects.c:2666
+#: builtin/pack-objects.c:2716
msgid "write a bitmap index together with the pack index"
msgstr "använd bitkartindex tillsammans med packindexet"
-#: builtin/pack-objects.c:2757
+#: builtin/pack-objects.c:2829
msgid "Counting objects"
msgstr "Räknar objekt"
@@ -9182,15 +9625,11 @@ msgstr "Tar bort duplicerade objekt"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]"
-#: builtin/prune.c:105 builtin/worktree.c:125
-msgid "do not remove, show only"
-msgstr "ta inte bort, bara visa"
-
-#: builtin/prune.c:106 builtin/worktree.c:126
+#: builtin/prune.c:106 builtin/worktree.c:128
msgid "report pruned objects"
msgstr "rapportera borttagna objekt"
-#: builtin/prune.c:109 builtin/worktree.c:128
+#: builtin/prune.c:109 builtin/worktree.c:130
msgid "expire objects older than <time>"
msgstr "låt tid gå ut för objekt äldre än <tid>"
@@ -9210,14 +9649,10 @@ msgstr "Alternativ gällande sammanslagning"
msgid "incorporate changes by rebasing rather than merging"
msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
-#: builtin/pull.c:147 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "tillåt snabbspolning"
-#: builtin/pull.c:153
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
-
#: builtin/pull.c:156
msgid "automatically stash/stash pop before and after rebase"
msgstr "utför automatiskt stash/stash pop före och efter ombasering"
@@ -9235,15 +9670,15 @@ msgstr "antal undermoduler som hämtas parallellt"
msgid "Invalid value for pull.ff: %s"
msgstr "Felaktigt värde för pull.ff: %s"
-#: builtin/pull.c:379
+#: builtin/pull.c:379 git-sh-setup.sh:226
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr "Kan inte hämta med ombasering: Du har oköade ändringar."
-#: builtin/pull.c:385
+#: builtin/pull.c:385 git-sh-setup.sh:252
msgid "Additionally, your index contains uncommitted changes."
msgstr "Dessutom innehåller dit index ändringar som inte har checkats in."
-#: builtin/pull.c:387
+#: builtin/pull.c:387 git-sh-setup.sh:245
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
"Kan inte hämta med ombasering: Ditt index innehåller oincheckade ändringar."
@@ -9303,7 +9738,7 @@ msgstr "Se git-pull(1) för detaljer."
msgid "<remote>"
msgstr "<fjärr>"
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<gren>"
@@ -9326,15 +9761,19 @@ msgstr ""
"Dina inställningar anger sammanslagning med referensen \"%s\"\n"
"från fjärren, men någon sådan referens togs inte emot."
-#: builtin/pull.c:864
+#: builtin/pull.c:820
+msgid "ignoring --verify-signatures for rebase"
+msgstr "ignorera --verify-signatures för ombasering"
+
+#: builtin/pull.c:867
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash är endast giltig med --rebase."
-#: builtin/pull.c:872
+#: builtin/pull.c:875
msgid "Updating an unborn branch with changes added to the index."
msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet."
-#: builtin/pull.c:900
+#: builtin/pull.c:903
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -9345,7 +9784,7 @@ msgstr ""
"snabbspolar din arbetskatalog från\n"
"incheckningen %s."
-#: builtin/pull.c:905
+#: builtin/pull.c:908
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -9362,11 +9801,11 @@ msgstr ""
"$ git reset --hard\n"
"för att återgå."
-#: builtin/pull.c:920
+#: builtin/pull.c:923
msgid "Cannot merge multiple branches into empty head."
msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
-#: builtin/pull.c:924
+#: builtin/pull.c:927
msgid "Cannot rebase onto multiple branches."
msgstr "Kan inte ombasera ovanpå flera grenar."
@@ -9530,12 +9969,12 @@ msgstr "Sänder till %s\n"
msgid "failed to push some refs to '%s'"
msgstr "misslyckades sända vissa referenser till \"%s\""
-#: builtin/push.c:365
+#: builtin/push.c:366
#, c-format
msgid "bad repository '%s'"
msgstr "felaktigt arkiv \"%s\""
-#: builtin/push.c:366
+#: builtin/push.c:367
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -9556,103 +9995,117 @@ msgstr ""
"\n"
" git push <namn>\n"
-#: builtin/push.c:381
+#: builtin/push.c:385
msgid "--all and --tags are incompatible"
msgstr "--all och --tags är inkompatibla"
-#: builtin/push.c:382
+#: builtin/push.c:386
msgid "--all can't be combined with refspecs"
msgstr "--all kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:387
+#: builtin/push.c:391
msgid "--mirror and --tags are incompatible"
msgstr "--mirror och --tags är inkompatibla"
-#: builtin/push.c:388
+#: builtin/push.c:392
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:393
+#: builtin/push.c:397
msgid "--all and --mirror are incompatible"
msgstr "--all och --mirror är inkompatibla"
-#: builtin/push.c:505
+#: builtin/push.c:515
msgid "repository"
msgstr "arkiv"
-#: builtin/push.c:506 builtin/send-pack.c:161
+#: builtin/push.c:516 builtin/send-pack.c:161
msgid "push all refs"
msgstr "sänd alla referenser"
-#: builtin/push.c:507 builtin/send-pack.c:163
+#: builtin/push.c:517 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "spegla alla referenser"
-#: builtin/push.c:509
+#: builtin/push.c:519
msgid "delete refs"
msgstr "ta bort referenser"
-#: builtin/push.c:510
+#: builtin/push.c:520
msgid "push tags (can't be used with --all or --mirror)"
msgstr "sänd taggar (kan inte användas med --all eller --mirror)"
-#: builtin/push.c:513 builtin/send-pack.c:164
+#: builtin/push.c:523 builtin/send-pack.c:164
msgid "force updates"
msgstr "tvinga uppdateringar"
-#: builtin/push.c:515 builtin/send-pack.c:175
+#: builtin/push.c:525 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "refnamn>:<förvänta"
-#: builtin/push.c:516 builtin/send-pack.c:176
+#: builtin/push.c:526 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "kräv att ref:s tidigare värde är detta"
-#: builtin/push.c:519
+#: builtin/push.c:529
msgid "control recursive pushing of submodules"
msgstr "styr rekursiv insändning av undermoduler"
-#: builtin/push.c:521 builtin/send-pack.c:169
+#: builtin/push.c:531 builtin/send-pack.c:169
msgid "use thin pack"
msgstr "använd tunna paket"
-#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
+#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "program för att ta emot paket"
-#: builtin/push.c:524
+#: builtin/push.c:534
msgid "set upstream for git pull/status"
msgstr "ställ in uppström för git pull/status"
-#: builtin/push.c:527
+#: builtin/push.c:537
msgid "prune locally removed refs"
msgstr "ta bort lokalt borttagna referenser"
-#: builtin/push.c:529
+#: builtin/push.c:539
msgid "bypass pre-push hook"
msgstr "förbigå pre-push-krok"
-#: builtin/push.c:530
+#: builtin/push.c:540
msgid "push missing but relevant tags"
msgstr "sänd in saknade men relevanta taggar"
-#: builtin/push.c:533 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "GPG-signera insändningen"
-#: builtin/push.c:535 builtin/send-pack.c:170
+#: builtin/push.c:545 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "begär atomiska transaktioner på fjärrsidan"
-#: builtin/push.c:549
+#: builtin/push.c:546
+msgid "server-specific"
+msgstr "serverspecifik"
+
+#: builtin/push.c:546
+msgid "option to transmit"
+msgstr ""
+"inget att checka in\n"
+"flagga att sända"
+
+#: builtin/push.c:560
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete är inkompatibel med --all, --mirror och --tags"
-#: builtin/push.c:551
+#: builtin/push.c:562
msgid "--delete doesn't make sense without any refs"
msgstr "--delete kan inte användas utan referenser"
+#: builtin/push.c:579
+msgid "push options must not have new line characters"
+msgstr "push-flaggor kan inte innehålla radbrytning"
+
#: builtin/read-tree.c:37
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
@@ -9731,11 +10184,11 @@ msgstr "felsök unpack-trees"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-katalog>"
-#: builtin/receive-pack.c:1719
+#: builtin/receive-pack.c:1843
msgid "quiet"
msgstr "tyst"
-#: builtin/receive-pack.c:1733
+#: builtin/receive-pack.c:1857
msgid "You must specify a directory."
msgstr "Du måste ange en katalog."
@@ -9885,12 +10338,12 @@ msgstr "att ange en master-gren ger ingen mening med --mirror"
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar"
-#: builtin/remote.c:190 builtin/remote.c:633
+#: builtin/remote.c:190 builtin/remote.c:629
#, c-format
msgid "remote %s already exists."
msgstr "fjärrarkivet %s finns redan."
-#: builtin/remote.c:194 builtin/remote.c:637
+#: builtin/remote.c:194 builtin/remote.c:633
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv"
@@ -9913,17 +10366,17 @@ msgstr "(matchande)"
msgid "(delete)"
msgstr "(ta bort)"
-#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
#, c-format
msgid "No such remote: %s"
msgstr "Inget sådant fjärrarkiv: %s"
-#: builtin/remote.c:643
+#: builtin/remote.c:639
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\""
-#: builtin/remote.c:663
+#: builtin/remote.c:659
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -9934,17 +10387,17 @@ msgstr ""
"\t%s\n"
"\tUppdatera konfigurationen manuellt om nödvändigt."
-#: builtin/remote.c:699
+#: builtin/remote.c:695
#, c-format
msgid "deleting '%s' failed"
msgstr "misslyckades ta bort \"%s\""
-#: builtin/remote.c:733
+#: builtin/remote.c:729
#, c-format
msgid "creating '%s' failed"
msgstr "misslyckades skapa \"%s\""
-#: builtin/remote.c:796
+#: builtin/remote.c:792
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -9958,282 +10411,292 @@ msgstr[1] ""
"Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n"
"för att ta bort dem, använd:"
-#: builtin/remote.c:810
+#: builtin/remote.c:806
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Kunde inte ta bort konfigurationssektionen \"%s\""
-#: builtin/remote.c:911
+#: builtin/remote.c:907
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " ny (nästa hämtning sparar i remotes/%s)"
-#: builtin/remote.c:914
+#: builtin/remote.c:910
msgid " tracked"
msgstr " spårad"
-#: builtin/remote.c:916
+#: builtin/remote.c:912
msgid " stale (use 'git remote prune' to remove)"
msgstr " förlegad (använd \"git remote prune\" för att ta bort)"
-#: builtin/remote.c:918
+#: builtin/remote.c:914
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:959
+#: builtin/remote.c:955
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren"
-#: builtin/remote.c:967
+#: builtin/remote.c:963
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "ombaseras interaktivt på fjärren %s"
-#: builtin/remote.c:971
+#: builtin/remote.c:964
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "ombaseras på fjärren %s"
+
+#: builtin/remote.c:967
#, c-format
msgid " merges with remote %s"
msgstr " sammanslås med fjärren %s"
-#: builtin/remote.c:972
-msgid " and with remote"
-msgstr " och med fjärren"
-
-#: builtin/remote.c:974
+#: builtin/remote.c:970
#, c-format
msgid "merges with remote %s"
msgstr "sammanslås med fjärren %s"
-#: builtin/remote.c:975
-msgid " and with remote"
-msgstr " och med fjärren"
+#: builtin/remote.c:973
+#, c-format
+msgid "%-*s and with remote %s\n"
+msgstr "%-*s och med fjärren %s\n"
-#: builtin/remote.c:1021
+#: builtin/remote.c:1016
msgid "create"
msgstr "skapa"
-#: builtin/remote.c:1024
+#: builtin/remote.c:1019
msgid "delete"
msgstr "ta bort"
-#: builtin/remote.c:1028
+#: builtin/remote.c:1023
msgid "up to date"
msgstr "àjour"
-#: builtin/remote.c:1031
+#: builtin/remote.c:1026
msgid "fast-forwardable"
msgstr "kan snabbspolas"
-#: builtin/remote.c:1034
+#: builtin/remote.c:1029
msgid "local out of date"
msgstr "lokal föråldrad"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1036
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s tvingar till %-*s (%s)"
-#: builtin/remote.c:1044
+#: builtin/remote.c:1039
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s sänder till %-*s (%s)"
-#: builtin/remote.c:1048
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s tvingar till %s"
-#: builtin/remote.c:1051
+#: builtin/remote.c:1046
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s sänder till %s"
-#: builtin/remote.c:1119
+#: builtin/remote.c:1114
msgid "do not query remotes"
msgstr "fråga inte fjärrar"
-#: builtin/remote.c:1146
+#: builtin/remote.c:1141
#, c-format
msgid "* remote %s"
msgstr "* fjärr %s"
-#: builtin/remote.c:1147
+#: builtin/remote.c:1142
#, c-format
msgid " Fetch URL: %s"
msgstr " Hämt-URL: %s"
-#: builtin/remote.c:1148 builtin/remote.c:1301
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
msgid "(no URL)"
msgstr "(ingen URL)"
#. TRANSLATORS: the colon ':' should align with
#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1159 builtin/remote.c:1161
+#: builtin/remote.c:1154 builtin/remote.c:1156
#, c-format
msgid " Push URL: %s"
msgstr " Sänd-URL: %s"
-#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
+#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD-gren: %s"
-#: builtin/remote.c:1169
+#: builtin/remote.c:1158
+msgid "(not queried)"
+msgstr "(inte förfrågad)"
+
+#: builtin/remote.c:1160
+msgid "(unknown)"
+msgstr "(okänd)"
+
+#: builtin/remote.c:1164
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n"
-#: builtin/remote.c:1181
+#: builtin/remote.c:1176
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Fjärrgren:%s"
msgstr[1] " Fjärrgrenar:%s"
-#: builtin/remote.c:1184 builtin/remote.c:1211
+#: builtin/remote.c:1179 builtin/remote.c:1206
msgid " (status not queried)"
msgstr " (status inte förfrågad)"
-#: builtin/remote.c:1193
+#: builtin/remote.c:1188
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Lokal gren konfigurerad för \"git pull\":"
msgstr[1] " Lokala grenar konfigurerade för \"git pull\":"
-#: builtin/remote.c:1201
+#: builtin/remote.c:1196
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokala referenser speglas av \"git push\""
-#: builtin/remote.c:1208
+#: builtin/remote.c:1203
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:"
msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1224
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1226
msgid "delete refs/remotes/<name>/HEAD"
msgstr "ta bort refs/remotes/<namn>/HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1241
msgid "Cannot determine remote HEAD"
msgstr "Kan inte bestämma HEAD på fjärren"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1243
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:"
-#: builtin/remote.c:1258
+#: builtin/remote.c:1253
#, c-format
msgid "Could not delete %s"
msgstr "Kunde inte ta bort %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1261
#, c-format
msgid "Not a valid ref: %s"
msgstr "Inte en giltig referens: %s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1263
#, c-format
msgid "Could not setup %s"
msgstr "Kunde inte ställa in %s"
-#: builtin/remote.c:1286
+#: builtin/remote.c:1281
#, c-format
msgid " %s will become dangling!"
msgstr " %s kommer bli dinglande!"
-#: builtin/remote.c:1287
+#: builtin/remote.c:1282
#, c-format
msgid " %s has become dangling!"
msgstr " %s har blivit dinglande!"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1292
#, c-format
msgid "Pruning %s"
msgstr "Rensar %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1293
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1309
#, c-format
msgid " * [would prune] %s"
msgstr " * [skulle rensa] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1312
#, c-format
msgid " * [pruned] %s"
msgstr " * [rensad] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1357
msgid "prune remotes after fetching"
msgstr "rensa fjärrar efter hämtning"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
#, c-format
msgid "No such remote '%s'"
msgstr "Ingen sådan fjärr \"%s\""
-#: builtin/remote.c:1441
+#: builtin/remote.c:1436
msgid "add branch"
msgstr "lägg till gren"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1443
msgid "no remote specified"
msgstr "ingen fjärr angavs"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1460
msgid "query push URLs rather than fetch URLs"
msgstr "fråga sänd-URL:er istället för hämta-URL:er"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1462
msgid "return all URLs"
msgstr "returnera alla URL:er"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1490
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "ingen URL:er angivna för fjärren \"%s\""
-#: builtin/remote.c:1521
+#: builtin/remote.c:1516
msgid "manipulate push URLs"
msgstr "manipulera URL:ar för sändning"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1518
msgid "add URL"
msgstr "lägg till URL"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1520
msgid "delete URLs"
msgstr "ta bort URL:ar"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1527
msgid "--add --delete doesn't make sense"
msgstr "--add --delete ger ingen mening"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1568
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Felaktig gammalt URL-mönster: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1576
#, c-format
msgid "No such URL found: %s"
msgstr "Ingen sådan URL hittades: %s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1578
msgid "Will not delete all non-push URLs"
msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1592
msgid "be verbose; must be placed before a subcommand"
msgstr "var pratsam; måste skrivas före ett underkommando"
@@ -10241,77 +10704,85 @@ msgstr "var pratsam; måste skrivas före ett underkommando"
msgid "git repack [<options>]"
msgstr "git repack [<flaggor>]"
-#: builtin/repack.c:159
+#: builtin/repack.c:160
msgid "pack everything in a single pack"
msgstr "packa allt i ett enda paket"
-#: builtin/repack.c:161
+#: builtin/repack.c:162
msgid "same as -a, and turn unreachable objects loose"
msgstr "samma som -a, och gör onåbara objekt lösa"
-#: builtin/repack.c:164
+#: builtin/repack.c:165
msgid "remove redundant packs, and run git-prune-packed"
msgstr "ta bort överflödiga paket, och kör git-prune-packed"
-#: builtin/repack.c:166
+#: builtin/repack.c:167
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "sänd --no-reuse-delta till git-pack-objects"
-#: builtin/repack.c:168
+#: builtin/repack.c:169
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "sänd --no-reuse-object till git-pack-objects"
-#: builtin/repack.c:170
+#: builtin/repack.c:171
msgid "do not run git-update-server-info"
msgstr "kör inte git-update-server-info"
-#: builtin/repack.c:173
+#: builtin/repack.c:174
msgid "pass --local to git-pack-objects"
msgstr "sänd --local till git-pack-objects"
-#: builtin/repack.c:175
+#: builtin/repack.c:176
msgid "write bitmap index"
msgstr "skriv bitkartindex"
-#: builtin/repack.c:176
+#: builtin/repack.c:177
msgid "approxidate"
msgstr "cirkadatum"
-#: builtin/repack.c:177
+#: builtin/repack.c:178
msgid "with -A, do not loosen objects older than this"
msgstr "med -A, lös inte upp objekt äldre än detta"
-#: builtin/repack.c:179
+#: builtin/repack.c:180
+msgid "with -a, repack unreachable objects"
+msgstr "med -a, packa om onåbara objekt"
+
+#: builtin/repack.c:182
msgid "size of the window used for delta compression"
msgstr "storlek på fönster använt för deltakomprimering"
-#: builtin/repack.c:180 builtin/repack.c:184
+#: builtin/repack.c:183 builtin/repack.c:187
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:181
+#: builtin/repack.c:184
msgid "same as the above, but limit memory size instead of entries count"
msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal"
-#: builtin/repack.c:183
+#: builtin/repack.c:186
msgid "limits the maximum delta depth"
msgstr "begränsa maximalt deltadjup"
-#: builtin/repack.c:185
+#: builtin/repack.c:188
msgid "maximum size of each packfile"
msgstr "maximal storlek på varje paketfil"
-#: builtin/repack.c:187
+#: builtin/repack.c:190
msgid "repack objects in packs marked with .keep"
msgstr "packa om objekt i paket märkta med .keep"
-#: builtin/repack.c:197
+#: builtin/repack.c:200
msgid "cannot delete packs in a precious-objects repo"
msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv"
-#: builtin/repack.c:381
+#: builtin/repack.c:204
+msgid "--keep-unreachable and -A are incompatible"
+msgstr "--keep-unreachable och -A kan inte användas samtidigt"
+
+#: builtin/repack.c:391 builtin/worktree.c:115
#, c-format
-msgid "removing '%s' failed"
+msgid "failed to remove '%s'"
msgstr "misslyckades ta bort \"%s\""
#: builtin/replace.c:19
@@ -10535,7 +11006,7 @@ msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
msgid "Could not write new index file."
msgstr "Kunde inte skriva ny indexfil."
-#: builtin/rev-list.c:350
+#: builtin/rev-list.c:362
msgid "rev-list does not support display of notes"
msgstr "rev-list stöder inte visning av anteckningar"
@@ -10627,31 +11098,27 @@ msgstr "alternativ"
msgid "option for merge strategy"
msgstr "alternativ för sammanslagningsstrategi"
-#: builtin/revert.c:104
+#: builtin/revert.c:100
msgid "append commit name"
msgstr "lägg till incheckningsnamn"
-#: builtin/revert.c:106
+#: builtin/revert.c:102
msgid "preserve initially empty commits"
msgstr "behåll incheckningar som börjar som tomma"
-#: builtin/revert.c:107
+#: builtin/revert.c:103
msgid "allow commits with empty messages"
msgstr "tillåt incheckningar med tomt meddelande"
-#: builtin/revert.c:108
+#: builtin/revert.c:104
msgid "keep redundant, empty commits"
msgstr "behåll redundanta, tomma incheckningar"
-#: builtin/revert.c:112
-msgid "program error"
-msgstr "programfel"
-
-#: builtin/revert.c:197
+#: builtin/revert.c:192
msgid "revert failed"
msgstr "\"revert\" misslyckades"
-#: builtin/revert.c:212
+#: builtin/revert.c:207
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" misslyckades"
@@ -10943,12 +11410,12 @@ msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken"
msgid "prepend comment character and space to each line"
msgstr "lägg in kommentarstecken och blanksteg först på varje rad"
-#: builtin/submodule--helper.c:24
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923
#, c-format
msgid "No such ref: %s"
msgstr "Ingen sådan referens: %s"
-#: builtin/submodule--helper.c:31
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Förväntade fullt referensnamn, fick %s"
@@ -10958,8 +11425,8 @@ msgstr "Förväntade fullt referensnamn, fick %s"
msgid "cannot strip one component off url '%s'"
msgstr "kan inte ta bort en komponent från url:en \"%s\""
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
-#: builtin/submodule--helper.c:486
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
+#: builtin/submodule--helper.c:483
msgid "alternative anchor for relative paths"
msgstr "alternativa ankare för relativa sökvägar"
@@ -10967,65 +11434,65 @@ msgstr "alternativa ankare för relativa sökvägar"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules"
-#: builtin/submodule--helper.c:366
+#: builtin/submodule--helper.c:364
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Misslyckades registrera url för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:370
+#: builtin/submodule--helper.c:368
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
-#: builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:378
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n"
-#: builtin/submodule--helper.c:387
+#: builtin/submodule--helper.c:385
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:404
msgid "Suppress output for initializing a submodule"
msgstr "Dölj utdata från initiering av undermodul"
-#: builtin/submodule--helper.c:411
+#: builtin/submodule--helper.c:409
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<sökväg>]"
-#: builtin/submodule--helper.c:432
+#: builtin/submodule--helper.c:430
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <sökväg>"
-#: builtin/submodule--helper.c:438
+#: builtin/submodule--helper.c:436
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\""
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:486
msgid "where the new submodule will be cloned to"
msgstr "var den nya undermodulen skall klonas till"
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:489
msgid "name of the new submodule"
msgstr "namn på den nya undermodulen"
-#: builtin/submodule--helper.c:495
+#: builtin/submodule--helper.c:492
msgid "url where to clone the submodule from"
msgstr "URL att klona undermodulen från"
-#: builtin/submodule--helper.c:501
+#: builtin/submodule--helper.c:498
msgid "depth for shallow clones"
msgstr "djup för grunda kloner"
-#: builtin/submodule--helper.c:507
+#: builtin/submodule--helper.c:504
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -11033,87 +11500,110 @@ msgstr ""
"git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference "
"<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>"
-#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
+#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
#, c-format
msgid "could not create directory '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: builtin/submodule--helper.c:534
+#: builtin/submodule--helper.c:531
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:547
#, c-format
msgid "cannot open file '%s'"
msgstr "kan inte öppna filen \"%s\""
-#: builtin/submodule--helper.c:555
+#: builtin/submodule--helper.c:552
#, c-format
msgid "could not close file %s"
msgstr "kunde inte stänga filen %s"
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:559
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
-#: builtin/submodule--helper.c:609
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Undermodulsökvägen \"%s\" har inte initierats"
-#: builtin/submodule--helper.c:613
+#: builtin/submodule--helper.c:615
msgid "Maybe you want to use 'update --init'?"
msgstr "Kanske menade du att använda \"update --init\"?"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:641
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Hoppar över ej sammanslagen undermodul %s"
-#: builtin/submodule--helper.c:660
+#: builtin/submodule--helper.c:662
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Hoppar över undermodulen \"%s\""
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:792
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
+
+#: builtin/submodule--helper.c:803
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "Misslyckades klona \"%s\" för andra gången, avbryter"
+
+#: builtin/submodule--helper.c:824
msgid "path into the working tree"
msgstr "sökväg inuti arbetskatalogen"
-#: builtin/submodule--helper.c:771
+#: builtin/submodule--helper.c:827
msgid "path into the working tree, across nested submodule boundaries"
msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser"
-#: builtin/submodule--helper.c:775
+#: builtin/submodule--helper.c:831
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout eller none"
-#: builtin/submodule--helper.c:779
+#: builtin/submodule--helper.c:835
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Skapa en grund klon trunkerad till angivet antal revisioner"
-#: builtin/submodule--helper.c:782
+#: builtin/submodule--helper.c:838
msgid "parallel jobs"
msgstr "parallella jobb"
-#: builtin/submodule--helper.c:783
+#: builtin/submodule--helper.c:840
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "om den första klonen skall följa rekommendation för grund kloning"
+
+#: builtin/submodule--helper.c:841
msgid "don't print cloning progress"
msgstr "skriv inte klonförlopp"
-#: builtin/submodule--helper.c:788
+#: builtin/submodule--helper.c:846
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:798
+#: builtin/submodule--helper.c:856
msgid "bad value for update parameter"
msgstr "felaktigt värde för parametern update"
-#: builtin/submodule--helper.c:855
+#: builtin/submodule--helper.c:927
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+"Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men "
+"huvudprojektet är inte på någon gren"
+
+#: builtin/submodule--helper.c:977
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "underkommandot submodule--helper måste anropas med ett underkommando"
-#: builtin/submodule--helper.c:862
+#: builtin/submodule--helper.c:984
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
@@ -11459,14 +11949,6 @@ msgstr "<läge>,<objekt>,<sökväg>"
msgid "add the specified entry to the index"
msgstr "lägg till angiven post i indexet"
-#: builtin/update-index.c:958
-msgid "(+/-)x"
-msgstr "(+/-)x"
-
-#: builtin/update-index.c:959
-msgid "override the executable bit of the listed files"
-msgstr "överstyr exekveringsbiten för angivna filer"
-
#: builtin/update-index.c:963
msgid "mark files as \"not changing\""
msgstr "markera filer som \"ändras inte\""
@@ -11625,83 +12107,110 @@ msgid "git worktree add [<options>] <path> [<branch>]"
msgstr "git worktree add [<flaggor>] <sökväg> [<gren>]"
#: builtin/worktree.c:16
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<flaggor>]"
+
+#: builtin/worktree.c:17
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<flaggor>] <sökväg>"
+
+#: builtin/worktree.c:18
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<flaggor>]"
-#: builtin/worktree.c:17
-msgid "git worktree list [<options>]"
-msgstr "git worktree list [<flaggor>]"
+#: builtin/worktree.c:19
+msgid "git worktree unlock <path>"
+msgstr "git worktree unlock <sökväg>"
-#: builtin/worktree.c:40
+#: builtin/worktree.c:42
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Tar bort worktrees/%s: inte en giltig katalog"
-#: builtin/worktree.c:46
+#: builtin/worktree.c:48
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
-#: builtin/worktree.c:51
+#: builtin/worktree.c:53
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"
-#: builtin/worktree.c:62
+#: builtin/worktree.c:64
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
-#: builtin/worktree.c:78
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"
-#: builtin/worktree.c:113
-#, c-format
-msgid "failed to remove '%s'"
-msgstr "misslyckades ta bort \"%s\""
-
-#: builtin/worktree.c:202
+#: builtin/worktree.c:204
#, c-format
msgid "'%s' already exists"
msgstr "\"%s\" finns redan"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:236
#, c-format
msgid "could not create directory of '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: builtin/worktree.c:270
+#: builtin/worktree.c:272
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Förbereder %s (identifieraren %s)"
-#: builtin/worktree.c:322
+#: builtin/worktree.c:323
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"
-#: builtin/worktree.c:324
+#: builtin/worktree.c:325
msgid "create a new branch"
msgstr "skapa en ny gren"
-#: builtin/worktree.c:326
+#: builtin/worktree.c:327
msgid "create or reset a branch"
msgstr "skapa eller återställ en gren"
-#: builtin/worktree.c:327
-msgid "detach HEAD at named commit"
-msgstr "koppla från HEAD vid namngiven incheckning"
-
-#: builtin/worktree.c:328
+#: builtin/worktree.c:329
msgid "populate the new working tree"
msgstr "befolka den nya arbetskatalogen"
-#: builtin/worktree.c:336
+#: builtin/worktree.c:337
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B och --detach är ömsesidigt uteslutande"
+#: builtin/worktree.c:470
+msgid "reason for locking"
+msgstr "orsak till lås"
+
+#: builtin/worktree.c:482 builtin/worktree.c:515
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr "\"%s\" är inte en arbetskatalog"
+
+#: builtin/worktree.c:484 builtin/worktree.c:517
+msgid "The main working tree cannot be locked or unlocked"
+msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp"
+
+#: builtin/worktree.c:489
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "\"%s\" är redan låst, orsak: %s"
+
+#: builtin/worktree.c:491
+#, c-format
+msgid "'%s' is already locked"
+msgstr "\"%s\" är redan låst"
+
+#: builtin/worktree.c:519
+#, c-format
+msgid "'%s' is not locked"
+msgstr "\"%s\" är inte låst"
+
#: builtin/write-tree.c:13
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"
@@ -11718,6 +12227,26 @@ msgstr "visa trädobjekt för underkatalogen <prefix>"
msgid "only useful for debugging"
msgstr "endast användbart vid felsökning"
+#: upload-pack.c:20
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<flaggor>] <katalog>"
+
+#: upload-pack.c:837
+msgid "quit after a single request/response exchange"
+msgstr "avsluta omedelbart efter första anrop/svar-utväxling"
+
+#: upload-pack.c:839
+msgid "exit immediately after initial ref advertisement"
+msgstr "avsluta omedelbart efter inledande kungörelse av referenser"
+
+#: upload-pack.c:841
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog"
+
+#: upload-pack.c:843
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "avbryt överföringen efter <n> sekunders inaktivitet"
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "skriv felsökningsmeddelanden på standard fel"
@@ -11732,7 +12261,7 @@ msgstr ""
"några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"
"<koncept>\" för att läsa mer om specifika underkommandon och koncept."
-#: http.c:322
+#: http.c:323
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0"
@@ -11864,32 +12393,32 @@ msgstr "använd <n> siffror för att visa SHA-1:or"
msgid "update the index with reused conflict resolution if possible"
msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt"
-#: git-bisect.sh:55
+#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "Du måste starta med \"git bisect start\""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:61
+#: git-bisect.sh:60
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Vill du att jag ska göra det åt dig [Y=ja/N=nej]?"
-#: git-bisect.sh:122
+#: git-bisect.sh:121
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "flaggan känns inte igen: \"$arg\""
-#: git-bisect.sh:126
+#: git-bisect.sh:125
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "\"$arg\" verkar inte vara en giltig revision"
-#: git-bisect.sh:155
+#: git-bisect.sh:154
msgid "Bad HEAD - I need a HEAD"
msgstr "Felaktigt HEAD - Jag behöver ett HEAD"
-#: git-bisect.sh:168
+#: git-bisect.sh:167
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
@@ -11898,27 +12427,28 @@ msgstr ""
"<giltig_gren>\""
# cogito-relaterat
-#: git-bisect.sh:178
+#: git-bisect.sh:177
msgid "won't bisect on cg-seek'ed tree"
msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts"
-#: git-bisect.sh:182
+#: git-bisect.sh:181
msgid "Bad HEAD - strange symbolic ref"
msgstr "Felaktigt HEAD - konstig symbolisk referens"
-#: git-bisect.sh:234
+#: git-bisect.sh:233
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "Felaktigt argument till bisect_write: $state"
-#: git-bisect.sh:263
+#: git-bisect.sh:262
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Felaktig rev-indata: $arg"
-#: git-bisect.sh:278
-msgid "Please call 'bisect_state' with at least one argument."
-msgstr "Anropa \"bisect_state\" med minst ett argument."
+#: git-bisect.sh:281
+#, sh-format
+msgid "Bad rev input: $bisected_head"
+msgstr "Felaktig rev-indata: $bisected_head"
#: git-bisect.sh:290
#, sh-format
@@ -12067,7 +12597,47 @@ msgstr ""
"ogiltigt argument $arg för \"git bisect terms\".\n"
"Flaggor som stöds är: --term-good|--term-old och --term-bad|--term-new."
-#: git-rebase.sh:57
+#: git-merge-octopus.sh:46
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr ""
+"Fel: Dina lokala ändringar av följande filer skulle skrivas över av "
+"sammanslagning"
+
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr "Automatisk sammanslagning misslyckades."
+
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an Octopus."
+msgstr "Borde inte använda Octopus."
+
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "Kunde inte hitta gemensam incheckning med $pretty_name"
+
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up-to-date with $pretty_name"
+msgstr "Redan à jour med $pretty_name"
+
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "Snabbspolar till: $pretty_name"
+
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "Försök enkel sammanslagning med $pretty_name"
+
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
+msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning."
+
+#: git-rebase.sh:56
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
@@ -12078,16 +12648,21 @@ msgstr ""
"Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n"
"För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"."
-#: git-rebase.sh:168
+#: git-rebase.sh:156 git-rebase.sh:395
+#, sh-format
+msgid "Could not move back to $head_name"
+msgstr "Kunde inte flytta tillbaka till $head_name"
+
+#: git-rebase.sh:167
msgid "Applied autostash."
msgstr "Tillämpade autostash."
-#: git-rebase.sh:171
+#: git-rebase.sh:170
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Kan inte spara $stash_sha1"
-#: git-rebase.sh:172
+#: git-rebase.sh:171
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
@@ -12097,27 +12672,27 @@ msgstr ""
"Dina ändringar är säkra i stashen.\n"
"Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
-#: git-rebase.sh:211
+#: git-rebase.sh:210
msgid "The pre-rebase hook refused to rebase."
msgstr "Kroken pre-rebase vägrade ombaseringen."
-#: git-rebase.sh:216
+#: git-rebase.sh:215
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Det verkar som en git-am körs. Kan inte ombasera."
-#: git-rebase.sh:357
+#: git-rebase.sh:356
msgid "No rebase in progress?"
msgstr "Ingen ombasering pågår?"
-#: git-rebase.sh:368
+#: git-rebase.sh:367
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."
-#: git-rebase.sh:375
+#: git-rebase.sh:374
msgid "Cannot read HEAD"
msgstr "Kan inte läsa HEAD"
-#: git-rebase.sh:378
+#: git-rebase.sh:377
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -12125,12 +12700,7 @@ msgstr ""
"Du måste redigera alla sammanslagningskonflikter och\n"
"därefter markera dem som lösta med git add"
-#: git-rebase.sh:396
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "Kunde inte flytta tillbaka till $head_name"
-
-#: git-rebase.sh:415
+#: git-rebase.sh:414
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -12151,98 +12721,98 @@ msgstr ""
"och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
"något av värde där."
-#: git-rebase.sh:466
+#: git-rebase.sh:465
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "ogiltig uppström $upstream_name"
-#: git-rebase.sh:490
+#: git-rebase.sh:489
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: mer än en sammanslagningsbas finns"
-#: git-rebase.sh:493 git-rebase.sh:497
+#: git-rebase.sh:492 git-rebase.sh:496
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: ingen sammanslagningsbas finns"
-#: git-rebase.sh:502
+#: git-rebase.sh:501
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Peka på en giltig incheckning: $onto_name"
-#: git-rebase.sh:525
+#: git-rebase.sh:524
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "ödesdigert: ingen sådan gren: $branch_name"
-#: git-rebase.sh:558
+#: git-rebase.sh:557
msgid "Cannot autostash"
msgstr "Kan inte utföra \"autostash\""
-#: git-rebase.sh:563
+#: git-rebase.sh:562
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Skapade autostash: $stash_abbrev"
-#: git-rebase.sh:567
+#: git-rebase.sh:566
msgid "Please commit or stash them."
msgstr "Checka in eller använd \"stash\" på dem."
-#: git-rebase.sh:587
+#: git-rebase.sh:586
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Aktuell gren $branch_name är à jour."
-#: git-rebase.sh:591
+#: git-rebase.sh:590
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."
-#: git-rebase.sh:602
+#: git-rebase.sh:601
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Ändringar från $mb till $onto:"
-#: git-rebase.sh:611
+#: git-rebase.sh:610
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
-#: git-rebase.sh:621
+#: git-rebase.sh:620
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Snabbspolade $branch_name till $onto_name."
-#: git-stash.sh:51
+#: git-stash.sh:50
msgid "git stash clear with parameters is unimplemented"
msgstr "\"git stash clear\" med parametrar har inte implementerats"
-#: git-stash.sh:74
+#: git-stash.sh:73
msgid "You do not have the initial commit yet"
msgstr "Du har inte den första incheckningen ännu"
-#: git-stash.sh:89
+#: git-stash.sh:88
msgid "Cannot save the current index state"
msgstr "Kan inte spara aktuellt tillstånd för indexet"
-#: git-stash.sh:124 git-stash.sh:137
+#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"
-#: git-stash.sh:141
+#: git-stash.sh:140
msgid "No changes selected"
msgstr "Inga ändringar valda"
-#: git-stash.sh:144
+#: git-stash.sh:143
msgid "Cannot remove temporary index (can't happen)"
msgstr "Kan inte ta bort temporärt index (kan inte inträffa)"
-#: git-stash.sh:157
+#: git-stash.sh:156
msgid "Cannot record working tree state"
msgstr "Kan inte registrera tillstånd för arbetskatalog"
-#: git-stash.sh:189
+#: git-stash.sh:188
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Kan inte uppdatera $ref_stash med $w_commit"
@@ -12257,7 +12827,7 @@ msgstr "Kan inte uppdatera $ref_stash med $w_commit"
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:239
+#: git-stash.sh:238
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -12266,108 +12836,117 @@ msgstr ""
"fel: felaktig flagga för \"stash save\": $option\n"
" För att ange ett meddelande, använd git stash save -- \"$option\""
-#: git-stash.sh:260
+#: git-stash.sh:259
msgid "No local changes to save"
msgstr "Inga lokala ändringar att spara"
-#: git-stash.sh:264
+#: git-stash.sh:263
msgid "Cannot initialize stash"
msgstr "Kan inte initiera \"stash\""
-#: git-stash.sh:268
+#: git-stash.sh:267
msgid "Cannot save the current status"
msgstr "Kan inte spara aktuell status"
-#: git-stash.sh:286
+#: git-stash.sh:268
+#, sh-format
+msgid "Saved working directory and index state $stash_msg"
+msgstr "Sparade arbetskatalogen och indexstatus $stash_msg"
+
+#: git-stash.sh:285
msgid "Cannot remove worktree changes"
msgstr "Kan inte ta bort ändringar i arbetskatalogen"
-#: git-stash.sh:405
+#: git-stash.sh:404
#, sh-format
msgid "unknown option: $opt"
msgstr "okänd flagga: $opt"
-#: git-stash.sh:415
+#: git-stash.sh:414
msgid "No stash found."
msgstr "Ingen \"stash\" hittades."
-#: git-stash.sh:422
+#: git-stash.sh:421
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "För många revisioner angivna: $REV"
-#: git-stash.sh:428
+#: git-stash.sh:427
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference är inte en giltig referens"
-#: git-stash.sh:456
+#: git-stash.sh:455
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "\"$args\" är inte en \"stash\"-liknande incheckning"
-#: git-stash.sh:467
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "\"$args\" är inte en \"stash\"-referens"
-#: git-stash.sh:475
+#: git-stash.sh:474
msgid "unable to refresh index"
msgstr "kan inte uppdatera indexet"
-#: git-stash.sh:479
+#: git-stash.sh:478
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning"
-#: git-stash.sh:487
+#: git-stash.sh:486
msgid "Conflicts in index. Try without --index."
msgstr "Konflikter i indexet. Testa utan --index."
-#: git-stash.sh:489
+#: git-stash.sh:488
msgid "Could not save index tree"
msgstr "Kunde inte spara indexträd"
-#: git-stash.sh:523
+#: git-stash.sh:522
msgid "Cannot unstage modified files"
msgstr "Kan inte ta bort ändrade filer ur kön"
-#: git-stash.sh:538
+#: git-stash.sh:537
msgid "Index was not unstashed."
msgstr "Indexet har inte tagits ur kön."
-#: git-stash.sh:561
+#: git-stash.sh:551
+msgid "The stash is kept in case you need it again."
+msgstr "\"Stash\":en behålls ifall du behöver den igen."
+
+#: git-stash.sh:560
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Kastade ${REV} ($s)"
-#: git-stash.sh:562
+#: git-stash.sh:561
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Kunde inte kasta \"stash\"-post"
-#: git-stash.sh:570
+#: git-stash.sh:569
msgid "No branch name specified"
msgstr "Inget grennamn angavs"
-#: git-stash.sh:642
+#: git-stash.sh:641
msgid "(To restore them type \"git stash apply\")"
msgstr "(För att återställa dem, skriv \"git stash apply\")"
-#: git-submodule.sh:219
+#: git-submodule.sh:183
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå"
-#: git-submodule.sh:229
+#: git-submodule.sh:193
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"
-#: git-submodule.sh:246
+#: git-submodule.sh:210
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "\"$sm_path\" finns redan i indexet"
-#: git-submodule.sh:250
+#: git-submodule.sh:214
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -12378,100 +12957,90 @@ msgstr ""
"$sm_path\n"
"Använd -f om du verkligen vill lägga till den"
-#: git-submodule.sh:268
+#: git-submodule.sh:232
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"
-#: git-submodule.sh:270
+#: git-submodule.sh:234
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"
-#: git-submodule.sh:278
+#: git-submodule.sh:242
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):"
-#: git-submodule.sh:280
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from"
-msgstr ""
-"För att återanvända den lokala git-katalogen istället för att på nytt klona "
-"från"
-
-#: git-submodule.sh:282
-#, sh-format
-msgid ""
-"use the '--force' option. If the local git directory is not the correct repo"
-msgstr ""
-"använd flaggan \"--force\". Om den lokala git-katalogen inte är riktigt arkiv"
-
-#: git-submodule.sh:283
+#: git-submodule.sh:244
#, sh-format
msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+" $realrepo\n"
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr ""
-"eller om du är osäker på vad det innebär, välj nytt namn med flaggan \"--name"
-"\"."
+"Om du vill återanvända den lokala git-katalogen instället för att klona på "
+"nytt från\n"
+" $realrepo\n"
+"kan du använda flaggan \"--force\". Om den lokala git-katalogen inte är "
+"korrekt\n"
+"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n"
+"flaggan \"--name\"."
-#: git-submodule.sh:285
+#: git-submodule.sh:250
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt."
-#: git-submodule.sh:297
+#: git-submodule.sh:262
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Kan inte checka ut undermodulen \"$sm_path\""
-#: git-submodule.sh:302
+#: git-submodule.sh:267
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
-#: git-submodule.sh:311
+#: git-submodule.sh:276
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Misslyckades registrera undermodulen \"$sm_path\""
-#: git-submodule.sh:355
+#: git-submodule.sh:323
#, sh-format
msgid "Entering '$displaypath'"
msgstr "GÃ¥r in i \"$displaypath\""
-#: git-submodule.sh:375
+#: git-submodule.sh:343
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
"Stoppar på \"$displaypath\"; skriptet returnerade en status skild från noll."
-#: git-submodule.sh:448
+#: git-submodule.sh:414
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "sökvägsangivelse och --all är inkompatibla"
-#: git-submodule.sh:453
+#: git-submodule.sh:419
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler"
-#: git-submodule.sh:470
-#, sh-format
-msgid "Submodule work tree '$displaypath' contains a .git directory"
-msgstr ""
-"Undermodulens arbetskatalog \"$displaypath\" innehåller katalogen \".git\""
-
-#: git-submodule.sh:471
+#: git-submodule.sh:439
#, sh-format
msgid ""
+"Submodule work tree '$displaypath' contains a .git directory\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
+"Undermodulsarbetskatalogen \"$displaypath\" innehåller en .git-katalog\n"
"(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"
-#: git-submodule.sh:477
+#: git-submodule.sh:447
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -12480,124 +13049,142 @@ msgstr ""
"Undermodulens arbetskatalog \"$displaypath\" har lokala ändringar; \"-f\" "
"kastar bort dem"
-#: git-submodule.sh:480
+#: git-submodule.sh:450
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Rensade katalogen \"$displaypath\""
-#: git-submodule.sh:481
+#: git-submodule.sh:451
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\""
-#: git-submodule.sh:484
+#: git-submodule.sh:454
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\""
-#: git-submodule.sh:493
+#: git-submodule.sh:463
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\""
-#: git-submodule.sh:635
+#: git-submodule.sh:612
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:644
+#: git-submodule.sh:622
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""
-#: git-submodule.sh:667
+#: git-submodule.sh:627
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr ""
+"Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
+"undermodulsökvägen \"$sm_path\""
+
+#: git-submodule.sh:645
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\""
-#: git-submodule.sh:680
+#: git-submodule.sh:651
+#, sh-format
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr ""
+"Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. "
+"Direkt hämtning av incheckningen misslyckades."
+
+#: git-submodule.sh:658
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:681
+#: git-submodule.sh:659
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
-#: git-submodule.sh:685
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:686
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
-#: git-submodule.sh:691
+#: git-submodule.sh:669
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:692
+#: git-submodule.sh:670
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
-#: git-submodule.sh:697
+#: git-submodule.sh:675
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:698
+#: git-submodule.sh:676
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
-#: git-submodule.sh:729
+#: git-submodule.sh:707
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:837
+#: git-submodule.sh:815
msgid "The --cached option cannot be used with the --files option"
msgstr "Flaggan --cached kan inte användas med flaggan --files"
-#: git-submodule.sh:889
+#: git-submodule.sh:867
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "oväntat läge $mod_dst"
-#: git-submodule.sh:909
+#: git-submodule.sh:887
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src"
-#: git-submodule.sh:912
+#: git-submodule.sh:890
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst"
-#: git-submodule.sh:915
+#: git-submodule.sh:893
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Varning: $display_name innehåller inte incheckningarna $sha1_src och "
"$sha1_dst"
-#: git-submodule.sh:940
+#: git-submodule.sh:918
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:1059
+#: git-submodule.sh:1040
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:1123
+#: git-submodule.sh:1107
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synkroniserar undermodul-url för \"$displaypath\""
@@ -12607,6 +13194,696 @@ msgstr "Synkroniserar undermodul-url för \"$displaypath\""
msgid "See git-${cmd}(1) for details."
msgstr "Se git-${cmd}(1) för detaljer."
+#: git-rebase--interactive.sh:131
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr "Ombaserar ($new_count/$total)"
+
+#: git-rebase--interactive.sh:147
+msgid ""
+"\n"
+"Commands:\n"
+" p, pick = use commit\n"
+" r, reword = use commit, but edit the commit message\n"
+" e, edit = use commit, but stop for amending\n"
+" s, squash = use commit, but meld into previous commit\n"
+" f, fixup = like \"squash\", but discard this commit's log message\n"
+" x, exec = run command (the rest of the line) using shell\n"
+" d, drop = remove commit\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+"\n"
+"Kommandon:\n"
+" p, pick = använd incheckning\n"
+" r, reword = använd incheckning, men redigera incheckningsmeddelandet\n"
+" e, edit = använd incheckning, men stanna för tillägg\n"
+" s, squash = använd incheckning, men infoga i föregående incheckning\n"
+" f, fixup = som \"squash\", men förkasta incheckningsmeddelandet\n"
+" x, exec = kör kommando (resten av raden) i skalet\n"
+" d, drop = ta bort incheckning\n"
+"\n"
+"Du kan byta ordning på raderna, de utförs uppifrån och ned.\n"
+
+#: git-rebase--interactive.sh:162
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en "
+"incheckning.\n"
+
+#: git-rebase--interactive.sh:166
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n"
+
+#: git-rebase--interactive.sh:202
+#, sh-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Du kan utöka incheckningen nu, med\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"När du är nöjd med dina ändringar kör du\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:227
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
+msgstr "$sha1: inte en incheckning som kan väljas"
+
+#: git-rebase--interactive.sh:266
+#, sh-format
+msgid "Invalid commit name: $sha1"
+msgstr "Felaktigt incheckningsnamn: $sha1"
+
+#: git-rebase--interactive.sh:308
+msgid "Cannot write current commit's replacement sha1"
+msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning"
+
+#: git-rebase--interactive.sh:360
+#, sh-format
+msgid "Fast-forward to $sha1"
+msgstr "Snabbspolade till $sha1"
+
+#: git-rebase--interactive.sh:362
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
+msgstr "Kan inte snabbspola till $sha1"
+
+#: git-rebase--interactive.sh:371
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
+msgstr "Kan inte flytta HEAD till $first_parent"
+
+#: git-rebase--interactive.sh:376
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
+msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1"
+
+#: git-rebase--interactive.sh:390
+#, sh-format
+msgid "Error redoing merge $sha1"
+msgstr "Fel när sammanslagningen $sha1 skulle göras om"
+
+#: git-rebase--interactive.sh:398
+#, sh-format
+msgid "Could not pick $sha1"
+msgstr "Kunde inte välja $sha1"
+
+#: git-rebase--interactive.sh:407
+#, sh-format
+msgid "This is the commit message #${n}:"
+msgstr "Det här är incheckningsmeddelande ${n}:"
+
+#: git-rebase--interactive.sh:412
+#, sh-format
+msgid "The commit message #${n} will be skipped:"
+msgstr "Incheckningsmeddelande ${n} kommer hoppas över:"
+
+#: git-rebase--interactive.sh:423
+#, sh-format
+msgid "This is a combination of $count commit."
+msgid_plural "This is a combination of $count commits."
+msgstr[0] "Det här är en kombination av $count incheckning."
+msgstr[1] "Det här är en kombination av $count incheckningar."
+
+#: git-rebase--interactive.sh:431
+#, sh-format
+msgid "Cannot write $fixup_msg"
+msgstr "Kan inte skriva $fixup_msg"
+
+#: git-rebase--interactive.sh:434
+msgid "This is a combination of 2 commits."
+msgstr "Det här är en kombination av 2 incheckningar."
+
+#: git-rebase--interactive.sh:435
+msgid "This is the 1st commit message:"
+msgstr "Det här är 1:a incheckningsmeddelandet:"
+
+#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
+#: git-rebase--interactive.sh:521
+#, sh-format
+msgid "Could not apply $sha1... $rest"
+msgstr "kunde inte tillämpa $sha1... $rest"
+
+#: git-rebase--interactive.sh:549
+#, sh-format
+msgid ""
+"Could not amend commit after successfully picking $sha1... $rest\n"
+"This is most likely due to an empty commit message, or the pre-commit hook\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue "
+"before\n"
+"you are able to reword the commit."
+msgstr ""
+"Kunde inte utöka incheckning efter att ha lyckats välja $sha1... $rest\n"
+"Det är antagligen på grund av ett tomt incheckningsmeddelande, eller att\n"
+"pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n"
+"du måste lösa problemet innan du kan skriva om incheckningsmeddelandet."
+
+#: git-rebase--interactive.sh:564
+#, sh-format
+msgid "Stopped at $sha1_abbrev... $rest"
+msgstr "Stoppade på $sha1_abbrev... $rest"
+
+#: git-rebase--interactive.sh:579
+#, sh-format
+msgid "Cannot '$squash_style' without a previous commit"
+msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning"
+
+#: git-rebase--interactive.sh:621
+#, sh-format
+msgid "Executing: $rest"
+msgstr "Kör: $rest"
+
+#: git-rebase--interactive.sh:629
+#, sh-format
+msgid "Execution failed: $rest"
+msgstr "Körning misslyckades: $rest"
+
+#: git-rebase--interactive.sh:631
+msgid "and made changes to the index and/or the working tree"
+msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen"
+
+#: git-rebase--interactive.sh:633
+msgid ""
+"You can fix the problem, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Du kan rätta problemet och sedan köra\n"
+"\n"
+"\tgit rebase --continue\""
+
+#. TRANSLATORS: after these lines is a command to be issued by the user
+#: git-rebase--interactive.sh:646
+#, sh-format
+msgid ""
+"Execution succeeded: $rest\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Körningen lyckades: $rest\n"
+"men lämnade kvar ändringar i indexet och/eller arbetskatalogen\n"
+"Checka in eller utför \"stash\" på ändringarna och kör sedan\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:657
+#, sh-format
+msgid "Unknown command: $command $sha1 $rest"
+msgstr "Okänt kommando: $command $sha1 $rest"
+
+#: git-rebase--interactive.sh:658
+msgid "Please fix this using 'git rebase --edit-todo'."
+msgstr "Rätta det med \"git rebase --edit-todo\"."
+
+#: git-rebase--interactive.sh:693
+#, sh-format
+msgid "Successfully rebased and updated $head_name."
+msgstr "Lyckades ombasera och uppdatera $head_name."
+
+#: git-rebase--interactive.sh:740
+msgid "Could not skip unnecessary pick commands"
+msgstr "Kunde inte hoppa över onödiga \"pick\"-kommandon"
+
+#: git-rebase--interactive.sh:898
+#, sh-format
+msgid ""
+"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+" - $line"
+msgstr ""
+"Varning: SHA-1 saknas eller inte en incheckning på följande rad:\n"
+" - $line"
+
+#: git-rebase--interactive.sh:931
+#, sh-format
+msgid ""
+"Warning: the command isn't recognized in the following line:\n"
+" - $line"
+msgstr ""
+"Varning: kommandot kändes inte igen på följande rad:\n"
+" - $line"
+
+#: git-rebase--interactive.sh:970
+msgid "could not detach HEAD"
+msgstr "kunde inte koppla från HEAD"
+
+#: git-rebase--interactive.sh:1008
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):"
+msgstr ""
+"Varning: vissa incheckningar kan av misstag ha tappats.\n"
+"Tappade incheckningar (nyaste först):"
+
+#: git-rebase--interactive.sh:1016
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error."
+msgstr ""
+"För att undvika det här meddelandet kan du använda \"drop\" för att "
+"explicit\n"
+"kasta en incheckning.\n"
+"\n"
+"Använd \"git config rebase.missingCommitsCheck\" för att ändra "
+"varningsnivån.\n"
+"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error"
+"\" (fel)."
+
+#: git-rebase--interactive.sh:1027
+#, sh-format
+msgid ""
+"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
+"Ignoring."
+msgstr ""
+"Okänt val $check_level för flaggan rebase.missingCommitsCheck. Ignorerar."
+
+#: git-rebase--interactive.sh:1044
+msgid "You can fix this with 'git rebase --edit-todo'."
+msgstr "Du kan rätta detta med \"git rebase --edit-todo\"."
+
+#: git-rebase--interactive.sh:1045
+msgid "Or you can abort the rebase with 'git rebase --abort'."
+msgstr "Eller så kan du avbryta ombaseringen med \"git rebase --abort\"."
+
+#: git-rebase--interactive.sh:1069
+msgid "Could not remove CHERRY_PICK_HEAD"
+msgstr "Kunde inte ta bort CHERRY_PICK_HEAD"
+
+#: git-rebase--interactive.sh:1074
+#, sh-format
+msgid ""
+"You have staged changes in your working tree.\n"
+"If these changes are meant to be\n"
+"squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In both case, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
+msgstr ""
+"Du har köade ändringar i din arbetskatalog.\n"
+"Om det är meningen att ändringarna\n"
+"skall läggas in i föregående incheckning, kör:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Om de skall checkas in i en egen incheckning, kör:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"Oavsett vilket, när du är färdig fortsätter du med:\n"
+"\n"
+" git rebase --continue\n"
+
+#: git-rebase--interactive.sh:1091
+msgid "Error trying to find the author identity to amend commit"
+msgstr "Fel vid försök att hitta författaridentitet för att utöka incheckning"
+
+#: git-rebase--interactive.sh:1096
+msgid ""
+"You have uncommitted changes in your working tree. Please commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
+"först och kör sedan \"git rebase --continute\" igen."
+
+#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
+msgid "Could not commit staged changes."
+msgstr "Kunde inte checka in köade ändringar."
+
+#: git-rebase--interactive.sh:1129
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Du redigerar \"todo\"-filen för en pågående interaktiv ombasering.\n"
+"För att forsätta ombasera efter redigeringen, kör:\n"
+" git rebase --continue\n"
+"\n"
+
+#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+msgid "Could not execute editor"
+msgstr "Kunde inte starta textredigerare"
+
+#: git-rebase--interactive.sh:1145
+msgid "You need to set your committer info first"
+msgstr "Du måste ställa in din incheckarinformation först"
+
+#: git-rebase--interactive.sh:1153
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr "Kunde inte checka ut $switch_to"
+
+#: git-rebase--interactive.sh:1158
+msgid "No HEAD?"
+msgstr "Inget HEAD?"
+
+#: git-rebase--interactive.sh:1159
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr "Kunde inte skapa temporär $state_dir"
+
+#: git-rebase--interactive.sh:1161
+msgid "Could not mark as interactive"
+msgstr "Kunde inte markera som interaktiv"
+
+#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+msgid "Could not init rewritten commits"
+msgstr "Kunde inte initiera omskrivna incheckningar"
+
+#: git-rebase--interactive.sh:1276
+#, sh-format
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)"
+msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)"
+
+#: git-rebase--interactive.sh:1281
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
+"\n"
+
+#: git-rebase--interactive.sh:1288
+msgid "Note that empty commits are commented out"
+msgstr "Observera att tomma incheckningar är utkommenterade"
+
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "använd: $dashless $USAGE"
+
+#: git-sh-setup.sh:190
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr "Kunde inte byta katalog till $cdup, toppnivån på arbetskatalogen"
+
+#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr "ödesdigetrt: $program_name kan inte användas utan arbetskatalog."
+
+#: git-sh-setup.sh:220
+msgid "Cannot rebase: You have unstaged changes."
+msgstr "Kan inte ombasera: Du har oköade ändringar."
+
+#: git-sh-setup.sh:223
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr "Kan inte skriva om grenar: Du har oköade ändringar."
+
+#: git-sh-setup.sh:229
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr "Kan inte $action: Du har oköade ändringar."
+
+#: git-sh-setup.sh:242
+msgid "Cannot rebase: Your index contains uncommitted changes."
+msgstr ""
+"Kan inte ombasera: Ditt index innehåller ändringar som inte checkats in."
+
+#: git-sh-setup.sh:248
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr ""
+"Kan inte $action: Ditt index innehåller ändringar som inte checkats in."
+
+#: git-sh-setup.sh:372
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr "Du måste köra kommandot från arbetskatalogens toppnivå."
+
+#: git-sh-setup.sh:377
+msgid "Unable to determine absolute path of git directory"
+msgstr "Kunde inte bestämma absolut sökväg till git-katalogen"
+
+#~ msgid "bad numeric config value '%s' for '%s': invalid unit"
+#~ msgstr ""
+#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": ogiltig enhet"
+
+#~ msgid "bad numeric config value '%s' for '%s' in blob %s: invalid unit"
+#~ msgstr ""
+#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: "
+#~ "ogiltig enhet"
+
+#~ msgid "bad numeric config value '%s' for '%s' in file %s: invalid unit"
+#~ msgstr ""
+#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: "
+#~ "ogiltig enhet"
+
+#~ msgid ""
+#~ "bad numeric config value '%s' for '%s' in standard input: invalid unit"
+#~ msgstr ""
+#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: "
+#~ "ogiltig enhet"
+
+#~ msgid ""
+#~ "bad numeric config value '%s' for '%s' in submodule-blob %s: invalid unit"
+#~ msgstr ""
+#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-"
+#~ "blob:en %s: ogiltig enhet"
+
+#~ msgid ""
+#~ "bad numeric config value '%s' for '%s' in command line %s: invalid unit"
+#~ msgstr ""
+#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
+#~ "%s: ogiltig enhet"
+
+#~ msgid "bad numeric config value '%s' for '%s' in %s: invalid unit"
+#~ msgstr ""
+#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: ogiltig "
+#~ "enhet"
+
+#~ msgid "This is the 2nd commit message:"
+#~ msgstr "Det här är 2:a incheckningsmeddelandet:"
+
+#~ msgid "This is the 3rd commit message:"
+#~ msgstr "Det här är 3:e incheckningsmeddelandet:"
+
+#~ msgid "This is the 4th commit message:"
+#~ msgstr "Det här är 4:e incheckningsmeddelandet:"
+
+#~ msgid "This is the 5th commit message:"
+#~ msgstr "Det här är 5:e incheckningsmeddelandet:"
+
+#~ msgid "This is the 6th commit message:"
+#~ msgstr "Det här är 6:e incheckningsmeddelandet:"
+
+#~ msgid "This is the 7th commit message:"
+#~ msgstr "Det här är 7:e incheckningsmeddelandet:"
+
+#~ msgid "This is the 8th commit message:"
+#~ msgstr "Det här är 8:e incheckningsmeddelandet:"
+
+#~ msgid "This is the 9th commit message:"
+#~ msgstr "Det här är 9:e incheckningsmeddelandet:"
+
+#~ msgid "This is the 10th commit message:"
+#~ msgstr "Det här är 10:e incheckningsmeddelandet:"
+
+#~ msgid "This is the ${n}th commit message:"
+#~ msgstr "Det här är ${n}:e incheckningsmeddelandet:"
+
+#~ msgid "This is the ${n}st commit message:"
+#~ msgstr "Det här är ${n}:a incheckningsmeddelandet:"
+
+#~ msgid "This is the ${n}nd commit message:"
+#~ msgstr "Det här är ${n}:a incheckningsmeddelandet:"
+
+#~ msgid "This is the ${n}rd commit message:"
+#~ msgstr "Det här är ${n}:e incheckningsmeddelandet:"
+
+#~ msgid "The 1st commit message will be skipped:"
+#~ msgstr "1:a incheckningsmeddelandet kommer hoppas över:"
+
+#~ msgid "The 2nd commit message will be skipped:"
+#~ msgstr "2:a incheckningsmeddelandet kommer hoppas över:"
+
+#~ msgid "The 3rd commit message will be skipped:"
+#~ msgstr "3:e incheckningsmeddelandet kommer hoppas över:"
+
+#~ msgid "The 4th commit message will be skipped:"
+#~ msgstr "4:e incheckningsmeddelandet kommer hoppas över:"
+
+#~ msgid "The 5th commit message will be skipped:"
+#~ msgstr "5:e incheckningsmeddelandet kommer hoppas över:"
+
+#~ msgid "The 6th commit message will be skipped:"
+#~ msgstr "6:e incheckningsmeddelandet kommer hoppas över:"
+
+#~ msgid "The 7th commit message will be skipped:"
+#~ msgstr "7:e incheckningsmeddelandet kommer hoppas över:"
+
+#~ msgid "The 8th commit message will be skipped:"
+#~ msgstr "8:e incheckningsmeddelandet kommer hoppas över:"
+
+#~ msgid "The 9th commit message will be skipped:"
+#~ msgstr "9:e incheckningsmeddelandet kommer hoppas över:"
+
+#~ msgid "The 10th commit message will be skipped:"
+#~ msgstr "10:e incheckningsmeddelandet kommer hoppas över:"
+
+#~ msgid "The ${n}th commit message will be skipped:"
+#~ msgstr "${n}:e incheckningsmeddelandet kommer hoppas över:"
+
+#~ msgid "The ${n}st commit message will be skipped:"
+#~ msgstr "${n}:a incheckningsmeddelandet kommer hoppas över:"
+
+#~ msgid "The ${n}nd commit message will be skipped:"
+#~ msgstr "${n}:a incheckningsmeddelandet kommer hoppas över:"
+
+#~ msgid "The ${n}rd commit message will be skipped:"
+#~ msgstr "${n}:e incheckningsmeddelandet kommer hoppas över:"
+
+#~ msgid "could not run gpg."
+#~ msgstr "kunde inte köra gpg."
+
+#~ msgid "gpg did not accept the data"
+#~ msgstr "gpg godtog inte data"
+
+#~ msgid "unsupported object type in the tree"
+#~ msgstr "objekttyp som ej stöds upptäcktes i trädet"
+
+#~ msgid "Fatal merge failure, shouldn't happen."
+#~ msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa."
+
+#~ msgid "Unprocessed path??? %s"
+#~ msgstr "Obehandlad sökväg??? %s"
+
+#~ msgid "Error wrapping up %s"
+#~ msgstr "Fel vid ombrytning av %s"
+
+#~ msgid "Cannot %s during a %s"
+#~ msgstr "kan inte %s under en %s"
+
+#~ msgid "Can't cherry-pick into empty head"
+#~ msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"
+
+#~ msgid "could not open %s for writing"
+#~ msgstr "kunde inte öppna %s för skrivning"
+
+#~ msgid "bug: unhandled unmerged status %x"
+#~ msgstr "programfel: ej hanterad \"unmerged\"-status %x"
+
+#~ msgid "bug: unhandled diff status %c"
+#~ msgstr "programfel: diff-status %c ej hanterad"
+
+#~ msgid "read of %s failed"
+#~ msgstr "misslyckades läsa %s"
+
+#~ msgid "could not write branch description template"
+#~ msgstr "kunde inte skriva grenbeskrivningsmall"
+
+#~ msgid "corrupt index file"
+#~ msgstr "indexfilen är trasig"
+
+#~ msgid "detach the HEAD at named commit"
+#~ msgstr "koppla från HEAD vid namngiven incheckning"
+
+# Vague original, not networking-related, but rather related to the actual
+# objects downloaded.
+#~ msgid "Checking connectivity... "
+#~ msgstr "Kontrollerar om vi fick alla objekt..."
+
+#~ msgid " (unable to update local ref)"
+#~ msgstr " (kunde inte uppdatera lokal ref)"
+
+#~ msgid "Reinitialized existing"
+#~ msgstr "Ominitierade befintligt"
+
+#~ msgid "Initialized empty"
+#~ msgstr "Initierade tomt"
+
+#~ msgid " shared"
+#~ msgstr " delat"
+
+#~ msgid "Verify that the named commit has a valid GPG signature"
+#~ msgstr "Bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
+
+#~ msgid "Could not write to '%s'"
+#~ msgstr "Kunde inte skriva till \"%s\""
+
+#~ msgid "Writing SQUASH_MSG"
+#~ msgstr "Skriver SQUASH_MSG"
+
+#~ msgid "Finishing SQUASH_MSG"
+#~ msgstr "Avslutar SQUASH_MSG"
+
+#~ msgid " and with remote"
+#~ msgstr " och med fjärren"
+
+#~ msgid "removing '%s' failed"
+#~ msgstr "misslyckades ta bort \"%s\""
+
+#~ msgid "program error"
+#~ msgstr "programfel"
+
+#~ msgid "Please call 'bisect_state' with at least one argument."
+#~ msgstr "Anropa \"bisect_state\" med minst ett argument."
+
+#~ msgid ""
+#~ "If you want to reuse this local git directory instead of cloning again "
+#~ "from"
+#~ msgstr ""
+#~ "För att återanvända den lokala git-katalogen istället för att på nytt "
+#~ "klona från"
+
+#~ msgid ""
+#~ "use the '--force' option. If the local git directory is not the correct "
+#~ "repo"
+#~ msgstr ""
+#~ "använd flaggan \"--force\". Om den lokala git-katalogen inte är riktigt "
+#~ "arkiv"
+
+#~ msgid ""
+#~ "or you are unsure what this means choose another name with the '--name' "
+#~ "option."
+#~ msgstr ""
+#~ "eller om du är osäker på vad det innebär, välj nytt namn med flaggan \"--"
+#~ "name\"."
+
+#~ msgid "Submodule work tree '$displaypath' contains a .git directory"
+#~ msgstr ""
+#~ "Undermodulens arbetskatalog \"$displaypath\" innehåller katalogen \".git\""
+
+#~ msgid ""
+#~ "(use 'rm -rf' if you really want to remove it including all of its "
+#~ "history)"
+#~ msgstr ""
+#~ "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"
+
#~ msgid "'%s': %s"
#~ msgstr "\"%s\": %s"
@@ -12793,9 +14070,6 @@ msgstr "Se git-${cmd}(1) för detaljer."
#~ msgid "-b and -B are mutually exclusive"
#~ msgstr "-b och -B kan inte användas samtidigt"
-#~ msgid "You need to set your committer info first"
-#~ msgstr "Du måste ställa in din incheckarinformation först"
-
#~ msgid ""
#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
@@ -12839,10 +14113,6 @@ msgstr "Se git-${cmd}(1) för detaljer."
#~ "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
#~ "där det är lämpligt för att ange lösning och checka in."
-#~ msgid "Pull is not possible because you have unmerged files."
-#~ msgstr ""
-#~ "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in."
-
#~ msgid "no branch specified"
#~ msgstr "inget grennamn angavs"
@@ -12894,9 +14164,6 @@ msgstr "Se git-${cmd}(1) för detaljer."
#~ msgid "Failed to lock HEAD during fast_forward_to"
#~ msgstr "Misslyckades låsa HEAD under \"fast_forward_to\""
-#~ msgid "invalid commit: %s"
-#~ msgstr "felaktig incheckning: %s"
-
#~ msgid "cannot lock HEAD ref"
#~ msgstr "kunde inte låsa HEAD-referens"
@@ -13063,15 +14330,6 @@ msgstr "Se git-${cmd}(1) för detaljer."
#~ msgstr "Du kan inte kombinera --no-ff med --ff-only."
#~ msgid ""
-#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "undermodulen \"%s\" (eller en av dess undermoduler) använder en .git-"
-#~ "katalog\n"
-#~ "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"
-
-#~ msgid ""
#~ "'%s' has changes staged in the index\n"
#~ "(use --cached to keep the file, or -f to force removal)"
#~ msgstr ""
@@ -13138,9 +14396,6 @@ msgstr "Se git-${cmd}(1) för detaljer."
#~ msgid "Not removing %s\n"
#~ msgstr "Tar inte bort %s\n"
-#~ msgid "Could not read index"
-#~ msgstr "Kunde inte läsa indexet"
-
#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
#~ msgstr "git remote set-head <namn> (-a | -d | <gren>])"
@@ -13232,6 +14487,3 @@ msgstr "Se git-${cmd}(1) för detaljer."
#~ msgid "%s; will overwrite!"
#~ msgstr "%s; kommer skriva över!"
-
-#~ msgid "Failed to write current notes tree to database"
-#~ msgstr "Kunde inte skriva aktuellt anteckningsträd till databasen"
diff --git a/po/vi.po b/po/vi.po
index f048244..0ea7d87 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: git v2.9.0\n"
+"Project-Id-Version: git v2.10.0-rc2\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-05-24 23:42+0800\n"
-"PO-Revision-Date: 2016-05-25 07:39+0700\n"
+"POT-Creation-Date: 2016-08-27 23:21+0800\n"
+"PO-Revision-Date: 2016-08-28 07:19+0700\n"
"Last-Translator: Trần Ngá»c Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
"Language: vi\n"
@@ -27,7 +27,39 @@ msgstr ""
msgid "hint: %.*s\n"
msgstr "gợi ý: %.*s\n"
-#: advice.c:88
+#: advice.c:83
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr ""
+"Cherry là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
+
+#: advice.c:85
+msgid "Committing is not possible because you have unmerged files."
+msgstr ""
+"Commit là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
+
+#: advice.c:87
+msgid "Merging is not possible because you have unmerged files."
+msgstr ""
+"Merge là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
+
+#: advice.c:89
+msgid "Pulling is not possible because you have unmerged files."
+msgstr ""
+"Pull là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
+
+#: advice.c:91
+msgid "Reverting is not possible because you have unmerged files."
+msgstr ""
+"Revert là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
+
+#: advice.c:93
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
+msgstr ""
+"Nó là không thể thực hiện với %s bởi vì bạn có những tập tin chưa được hòa "
+"trá»™n."
+
+#: advice.c:101
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -36,18 +68,51 @@ msgstr ""
"và sau đó dùng lệnh “git add/rm <tập-tin>â€\n"
"dành riêng cho việc đánh dấu cần giải quyết và tạo lần chuyển giao."
-#: advice.c:101 builtin/merge.c:1238
+#: advice.c:109
+msgid "Exiting because of an unresolved conflict."
+msgstr "Thoát ra bởi vì xung đột không thể giải quyết."
+
+#: advice.c:114 builtin/merge.c:1181
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại)."
-#: advice.c:103
+#: advice.c:116
msgid "Please, commit your changes before merging."
msgstr "Vui lòng chuyển giao các thay đổi trước khi hòa trộn."
-#: advice.c:104
+#: advice.c:117
msgid "Exiting because of unfinished merge."
msgstr "Thoát ra bởi vì việc hòa trộn không hoàn tất."
+#: advice.c:123
+#, c-format
+msgid ""
+"Note: checking out '%s'.\n"
+"\n"
+"You are in 'detached HEAD' state. You can look around, make experimental\n"
+"changes and commit them, and you can discard any commits you make in this\n"
+"state without impacting any branches by performing another checkout.\n"
+"\n"
+"If you want to create a new branch to retain commits you create, you may\n"
+"do so (now or later) by using -b with the checkout command again. Example:\n"
+"\n"
+" git checkout -b <new-branch-name>\n"
+"\n"
+msgstr ""
+"Chú ý: Ä‘ang lấy ra “%sâ€.\n"
+"\n"
+"Bạn Ä‘ang ở tình trạng “detached HEADâ€. Bạn có thể xem qua, tạo các thay\n"
+"đổi thử nghiệm và chuyển giao chúng, bạn có thể loại bỠbất kỳ lần chuyển\n"
+"giao nào trong tình trạng này mà không cần đụng chậm đến bất kỳ nhánh nào\n"
+"bằng cách thực hiện lần lấy ra khác nữa.\n"
+"\n"
+"Nếu bạn muốn tạo một nhánh mới để giữ lại các lần chuyển giao bạn tạo,\n"
+"bạn có thể làm thế (ngay bây giỠhay sau này) bằng cách chạy lệnh checkout\n"
+"lần nữa vá»›i tùy chá»n -b. Ví dụ:\n"
+"\n"
+" git checkout -b <tên-nhánh-mới>\n"
+"\n"
+
#: archive.c:12
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<các-tùy-chá»n>] <tree-ish> [<Ä‘Æ°á»ng-dẫn>…]"
@@ -67,7 +132,7 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <kho> [--exec <lệnh>] --list"
-#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "đặc tả Ä‘Æ°á»ng dẫn “%s†không khá»›p vá»›i bất kỳ tập tin nào"
@@ -80,7 +145,7 @@ msgstr "định_dạng"
msgid "archive format"
msgstr "định dạng lưu trữ"
-#: archive.c:430 builtin/log.c:1395
+#: archive.c:430 builtin/log.c:1422
msgid "prefix"
msgstr "tiá»n_tố"
@@ -88,10 +153,10 @@ msgstr "tiá»n_tố"
msgid "prepend prefix to each pathname in the archive"
msgstr "nối thêm tiá»n tố vào từng Ä‘Æ°á»ng dẫn tập tin trong kho lÆ°u"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549
-#: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459
-#: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 builtin/blame.c:2554
+#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989
+#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:460
+#: builtin/ls-files.c:463 builtin/notes.c:399 builtin/notes.c:562
#: builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "tập_tin"
@@ -125,7 +190,7 @@ msgid "list supported archive formats"
msgstr "liệt kê các kiểu nén được hỗ trợ"
#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:776
+#: builtin/submodule--helper.c:832
msgid "repo"
msgstr "kho"
@@ -133,7 +198,7 @@ msgstr "kho"
msgid "retrieve the archive from remote repository <repo>"
msgstr "nhận kho nén từ kho chứa <kho> trên máy chủ"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
msgid "command"
msgstr "lệnh"
@@ -141,6 +206,28 @@ msgstr "lệnh"
msgid "path to the remote git-upload-archive command"
msgstr "Ä‘Æ°á»ng dẫn đến lệnh git-upload-pack trên máy chủ"
+#: archive.c:461
+msgid "Unexpected option --remote"
+msgstr "Gặp tùy chá»n --remote không cần"
+
+#: archive.c:463
+msgid "Option --exec can only be used together with --remote"
+msgstr "Tùy chá»n --exec chỉ có thể được dùng cùng vá»›i --remote"
+
+#: archive.c:465
+msgid "Unexpected option --output"
+msgstr "Gặp tùy chá»n không cần --output"
+
+#: archive.c:487
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Không hiểu định dạng “%sâ€"
+
+#: archive.c:494
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Tham số không được há»— trợ cho định dạng “%sâ€: -%d"
+
#: attr.c:263
msgid ""
"Negative patterns are ignored in git attributes\n"
@@ -149,6 +236,128 @@ msgstr ""
"Các mẫu dạng phủ định bị cấm dùng cho các thuộc tính của git\n"
"Dùng “\\!†cho các chuỗi văn bản có dấu chấm than dẫn đầu."
+#: bisect.c:441
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Không thể mở tập tin “%sâ€"
+
+#: bisect.c:446
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "ná»™i dung được trích dẫn sai tập tin “%sâ€: %s"
+
+#: bisect.c:655
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "Chúng tôi không bisect thêm nữa!\n"
+
+#: bisect.c:708
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "Không phải tên đối tượng commit %s hợp lệ"
+
+#: bisect.c:732
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+"Hòa trộn trên %s là sai.\n"
+"Äiá»u đó có nghÄ©a là lá»—i đã được sá»­a chữa giữa %s và [%s].\n"
+
+#: bisect.c:737
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"Hòa trộn trên %s là mới.\n"
+"Gần như chắc chắn là có thay đổi giữa %s và [%s].\n"
+
+#: bisect.c:742
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"Hòa trộn trên %s là %s.\n"
+"Äiá»u đó có nghÄ©a là lần chuyển giao “%s†đầu tiên là giữa %s và [%s].\n"
+
+#: bisect.c:750
+#, c-format
+msgid ""
+"Some %s revs are not ancestor of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
+msgstr ""
+"Một số điểm xét duyệt %s không phải tổ tiên của %s.\n"
+"git bisect không thể làm việc đúng đắn trong trÆ°á»ng hợp này.\n"
+"Liệu có phải bạn nhầm lẫn các điểm %s và %s không?\n"
+
+#: bisect.c:763
+#, c-format
+msgid ""
+"the merge base between %s and [%s] must be skipped.\n"
+"So we cannot be sure the first %s commit is between %s and %s.\n"
+"We continue anyway."
+msgstr ""
+"hòa trộn trên cơ sở giữa %s và [%s] phải bị bỠqua.\n"
+"Do vậy chúng tôi không thể chắc lần chuyển giao đầu tiên %s là giữa %s và "
+"%s.\n"
+"Chúng tôi vẫn cứ tiếp tục."
+
+#: bisect.c:798
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "Bisecting: ná»n hòa trá»™n cần phải được kiểm tra\n"
+
+#: bisect.c:849
+#, c-format
+msgid "a %s revision is needed"
+msgstr "cần một điểm xét duyệt %s"
+
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#, c-format
+msgid "could not create file '%s'"
+msgstr "không thể tạo tập tin “%sâ€"
+
+#: bisect.c:917
+#, c-format
+msgid "could not read file '%s'"
+msgstr "không thể Ä‘á»c tập tin “%sâ€"
+
+#: bisect.c:947
+msgid "reading bisect refs failed"
+msgstr "việc Ä‘á»c tham chiếu bisect gặp lá»—i"
+
+#: bisect.c:967
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr "%s là cả %s và %s\n"
+
+#: bisect.c:975
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+"không tìm thấy lần chuyển giao kiểm tra được nào.\n"
+"Có lẽ bạn bắt đầu vá»›i các tham số Ä‘Æ°á»ng dẫn sai?\n"
+
+#: bisect.c:994
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(ước chừng %d bước)"
+
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:998
+#, c-format
+msgid "Bisecting: %d revision left to test after this %s\n"
+msgid_plural "Bisecting: %d revisions left to test after this %s\n"
+msgstr[0] "Bisecting: còn %d điểm xét duyệt để kiểm sau %s này\n"
+
#: branch.c:53
#, c-format
msgid ""
@@ -281,7 +490,7 @@ msgstr "Nhánh không hợp lệ: “%sâ€."
#: branch.c:345
#, c-format
msgid "'%s' is already checked out at '%s'"
-msgstr "“%s†đã sẵn được lấy ra tại “%sâ€"
+msgstr "“%s†đã được lấy ra tại “%s†rồi"
#: branch.c:364
#, c-format
@@ -298,7 +507,7 @@ msgstr "“%s†không giống nhÆ° tập tin v2 bundle (định dạng dump cá
msgid "unrecognized header: %s%s (%d)"
msgstr "phần đầu không được thừa nhận: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:777
+#: bundle.c:87 builtin/commit.c:778
#, c-format
msgid "could not open '%s'"
msgstr "không thể mở “%sâ€"
@@ -307,10 +516,10 @@ msgstr "không thể mở “%sâ€"
msgid "Repository lacks these prerequisite commits:"
msgstr "Kho chứa thiếu những lần chuyển giao tiên quyết này:"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
-#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
-#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
-#: builtin/merge.c:361 builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
+#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
+#: builtin/merge.c:356 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi"
@@ -347,7 +556,7 @@ msgstr "rev-list đã chết"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "th.chiếu “%s†bị loại trừ bởi các tùy chá»n rev-list"
-#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "đối số không được thừa nhận: %s"
@@ -365,13 +574,13 @@ msgstr "không thể tạo “%sâ€"
msgid "index-pack died"
msgstr "mục lục gói đã chết"
-#: color.c:275
+#: color.c:290
#, c-format
msgid "invalid color value: %.*s"
msgstr "giá trị màu không hợp lệ: %.*s"
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
-#: builtin/am.c:2134
+#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
+#: builtin/am.c:2119
#, c-format
msgid "could not parse %s"
msgstr "không thể phân tích cú pháp %s"
@@ -385,135 +594,199 @@ msgstr "%s %s không phải là một lần chuyển giao!"
msgid "memory exhausted"
msgstr "hết bộ nhớ"
-#: config.c:475 config.c:477
+#: config.c:516
#, c-format
-msgid "bad config line %d in %s %s"
-msgstr "tập tin cấu hình sai tại dòng %d trong %s %s"
+msgid "bad config line %d in blob %s"
+msgstr "tập tin cấu hình sai tại dòng %d trong blob %s"
-#: config.c:593
+#: config.c:520
#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
-msgstr "sai giá trị bằng số của cấu hình “%s†cho “%s†trong %s %s: %s"
+msgid "bad config line %d in file %s"
+msgstr "cấu hình sai tại dòng %d trong tập tin %s"
-#: config.c:595
+#: config.c:524
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "cấu hình sai tại dòng %d trong đầu vào tiêu chuẩn"
+
+#: config.c:528
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "cấu hình sai tại dòng %d trong blob-mô-đun-con %s"
+
+#: config.c:532
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "cấu hình sai tại dòng %d trong dòng lệnh %s"
+
+#: config.c:536
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "cấu hình sai tại dòng %d trong %s"
+
+#: config.c:655
+msgid "out of range"
+msgstr "nằm ngoài phạm vi"
+
+#: config.c:655
+msgid "invalid unit"
+msgstr "đơn vị không hợp lệ"
+
+#: config.c:661
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "sai giá trị bằng số của cấu hình “%s†cho “%sâ€: %s"
-#: config.c:680
+#: config.c:666
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "sai giá trị bằng số của cấu hình “%s†cho “%s†trong blob %s: %s"
+
+#: config.c:669
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "sai giá trị bằng số của cấu hình “%s†cho “%s†trong tập tin %s: %s"
+
+#: config.c:672
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr ""
+"sai giá trị bằng số của cấu hình “%s†cho “%s†trong đầu vào tiêu chuẩn: %s"
+
+#: config.c:675
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr ""
+"sai giá trị bằng số của cấu hình “%s†cho “%s†trong submodule-blob %s: %s"
+
+#: config.c:678
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr "sai giá trị bằng số của cấu hình “%s†cho “%s†trong dòng lệnh %s: %s"
+
+#: config.c:681
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "sai giá trị bằng số của cấu hình “%s†cho “%s†trong %s: %s"
+
+#: config.c:768
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "gặp lá»—i mở rá»™ng thÆ° mục ngÆ°á»i dùng trong: “%sâ€"
-#: config.c:761 config.c:772
+#: config.c:849 config.c:860
#, c-format
msgid "bad zlib compression level %d"
msgstr "mức nén zlib %d là sai"
-#: config.c:890
+#: config.c:978
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "chế độ không hợp lệ đối với việc tạo đối tượng: %s"
-#: config.c:1228
+#: config.c:1312
msgid "unable to parse command-line config"
msgstr "không thể phân tích cấu hình dòng lệnh"
-#: config.c:1284
-msgid "unknown error occured while reading the configuration files"
+#: config.c:1362
+msgid "unknown error occurred while reading the configuration files"
msgstr "đã có lá»—i chÆ°a biết xảy ra trong khi Ä‘á»c các tập tin cấu hình"
-#: config.c:1629
+#: config.c:1716
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "không thể phân tích “%s†từ cấu hình dòng lệnh"
-#: config.c:1631
+#: config.c:1718
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "sai biến cấu hình “%s†trong tập tin “%s†tại dòng %d"
-#: config.c:1690
+#: config.c:1777
#, c-format
msgid "%s has multiple values"
msgstr "%s có đa giá trị"
-#: config.c:2224
+#: config.c:2311
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "không thể đặt “%s†thành “%sâ€"
-#: config.c:2226
+#: config.c:2313
#, c-format
msgid "could not unset '%s'"
msgstr "không thể thôi đặt “%sâ€"
-#: connected.c:69
+#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr "Äang kiểm tra kết nối"
+
+#: connected.c:74
msgid "Could not run 'git rev-list'"
msgstr "Không thể chạy “git rev-listâ€"
-#: connected.c:89
+#: connected.c:94
msgid "failed write to rev-list"
msgstr "gặp lỗi khi ghi vào rev-list"
-#: connected.c:96
+#: connected.c:101
msgid "failed to close rev-list's stdin"
msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list"
-#: date.c:95
+#: date.c:97
msgid "in the future"
msgstr "trong tÆ°Æ¡ng lai"
-#: date.c:101
+#: date.c:103
#, c-format
msgid "%lu second ago"
msgid_plural "%lu seconds ago"
msgstr[0] "%lu giây trước"
-#: date.c:108
+#: date.c:110
#, c-format
msgid "%lu minute ago"
msgid_plural "%lu minutes ago"
msgstr[0] "%lu phút trước"
-#: date.c:115
+#: date.c:117
#, c-format
msgid "%lu hour ago"
msgid_plural "%lu hours ago"
msgstr[0] "%lu giá» trÆ°á»›c"
-#: date.c:122
+#: date.c:124
#, c-format
msgid "%lu day ago"
msgid_plural "%lu days ago"
msgstr[0] "%lu ngày trước"
-#: date.c:128
+#: date.c:130
#, c-format
msgid "%lu week ago"
msgid_plural "%lu weeks ago"
msgstr[0] "%lu tuần trước"
-#: date.c:135
+#: date.c:137
#, c-format
msgid "%lu month ago"
msgid_plural "%lu months ago"
msgstr[0] "%lu tháng trước"
-#: date.c:146
+#: date.c:148
#, c-format
msgid "%lu year"
msgid_plural "%lu years"
msgstr[0] "%lu năm"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:149
+#: date.c:151
#, c-format
msgid "%s, %lu month ago"
msgid_plural "%s, %lu months ago"
msgstr[0] "%s, %lu tháng trước"
-#: date.c:154 date.c:159
+#: date.c:156 date.c:161
#, c-format
msgid "%lu year ago"
msgid_plural "%lu years ago"
@@ -524,7 +797,7 @@ msgstr[0] "%lu năm trước"
msgid "failed to read orderfile '%s'"
msgstr "gặp lá»—i khi Ä‘á»c tập-tin-thứ-tá»± “%sâ€"
-#: diffcore-rename.c:538
+#: diffcore-rename.c:540
msgid "Performing inexact rename detection"
msgstr "Äang thá»±c hiện dò tìm đổi tên không chính xác"
@@ -552,16 +825,16 @@ msgstr ""
"Tìm thấy các lá»—i trong biến cấu hình “diff.dirstatâ€:\n"
"%s"
-#: diff.c:3007
+#: diff.c:3017
#, c-format
msgid "external diff died, stopping at %s"
msgstr "phần má»m diff ở bên ngoài đã chết, dừng tại %s"
-#: diff.c:3405
+#: diff.c:3415
msgid "--follow requires exactly one pathspec"
msgstr "--follow cần chính xác má»™t đặc tả Ä‘Æ°á»ng dẫn"
-#: diff.c:3568
+#: diff.c:3578
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -570,7 +843,7 @@ msgstr ""
"Gặp lá»—i khi phân tích đối số tùy chá»n --dirstat/-X:\n"
"%s"
-#: diff.c:3582
+#: diff.c:3592
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Gặp lá»—i khi phân tích đối số tùy chá»n --submodule: “%sâ€"
@@ -583,39 +856,30 @@ msgstr "gặp lỗi khi lấy tên và thông tin của nhân"
msgid "Untracked cache is disabled on this system or location."
msgstr "Bộ nhớ tạm không theo vết bị tắt trên hệ thống hay vị trí này."
-#: gpg-interface.c:166 gpg-interface.c:235
-msgid "could not run gpg."
-msgstr "không thể chạy gpg."
-
#: gpg-interface.c:178
-msgid "gpg did not accept the data"
-msgstr "gpg đã không chấp nhận dữ liệu"
-
-#: gpg-interface.c:189
msgid "gpg failed to sign the data"
msgstr "gpg gặp lỗi khi ký dữ liệu"
-#: gpg-interface.c:222
-#, c-format
-msgid "could not create temporary file '%s'"
-msgstr "không thể tạo tập tin tạm thá»i “%sâ€"
+#: gpg-interface.c:208
+msgid "could not create temporary file"
+msgstr "không thể tạo tập tin tạm thá»i"
-#: gpg-interface.c:224
+#: gpg-interface.c:210
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "gặp lá»—i khi ghi chữ ký đính kèm vào “%sâ€"
-#: grep.c:1718
+#: grep.c:1792
#, c-format
msgid "'%s': unable to read %s"
msgstr "“%sâ€: không thể Ä‘á»c %s"
-#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
+#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
#, c-format
msgid "failed to stat '%s'"
msgstr "gặp lá»—i khi lấy thống kê vỠ“%sâ€"
-#: grep.c:1746
+#: grep.c:1820
#, c-format
msgid "'%s': short read"
msgstr "“%sâ€: Ä‘á»c ngắn"
@@ -665,7 +929,7 @@ msgstr "trong %0.1f giây một cách tự động…"
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: “%s†không phải là má»™t lệnh của git. Xem “git --helpâ€."
-#: help.c:404 help.c:464
+#: help.c:404 help.c:470
msgid ""
"\n"
"Did you mean this?"
@@ -676,7 +940,7 @@ msgstr[0] ""
"\n"
"Có phải ý bạn là một trong số những cái này không?"
-#: help.c:460
+#: help.c:466
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
@@ -709,83 +973,78 @@ msgstr "Không thể tạo “%s.lockâ€: %s"
msgid "failed to read the cache"
msgstr "gặp lá»—i khi Ä‘á»c bá»™ nhá»› đệm"
-#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
-#: builtin/checkout.c:586 builtin/clone.c:732
+#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
+#: builtin/checkout.c:589 builtin/clone.c:732
msgid "unable to write new index file"
msgstr "không thể ghi tập tin lưu bảng mục lục mới"
-#: merge-recursive.c:189
-#, c-format
+#: merge-recursive.c:209
msgid "(bad commit)\n"
msgstr "(commit sai)\n"
-#: merge-recursive.c:209
+#: merge-recursive.c:231
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "addinfo_cache gặp lá»—i đối vá»›i Ä‘Æ°á»ng dẫn “%sâ€"
-#: merge-recursive.c:270
+#: merge-recursive.c:301
msgid "error building trees"
msgstr "gặp lỗi khi xây dựng cây"
-#: merge-recursive.c:689
+#: merge-recursive.c:720
#, c-format
msgid "failed to create path '%s'%s"
msgstr "gặp lá»—i khi tạo Ä‘Æ°á»ng dẫn “%sâ€%s"
-#: merge-recursive.c:700
+#: merge-recursive.c:731
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Gỡ bỠ%s để tạo chỗ (room) cho thư mục con\n"
-#: merge-recursive.c:714 merge-recursive.c:735
+#: merge-recursive.c:745 merge-recursive.c:764
msgid ": perhaps a D/F conflict?"
msgstr ": có lẽ là một xung đột D/F?"
-#: merge-recursive.c:725
+#: merge-recursive.c:754
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "từ chối đóng tập tin không được theo dõi tại “%sâ€"
-#: merge-recursive.c:765
+#: merge-recursive.c:796
#, c-format
msgid "cannot read object %s '%s'"
msgstr "không thể Ä‘á»c đối tượng %s “%sâ€"
-#: merge-recursive.c:767
+#: merge-recursive.c:798
#, c-format
msgid "blob expected for %s '%s'"
msgstr "đối tượng blob được mong đợi cho %s “%sâ€"
-#: merge-recursive.c:790 builtin/clone.c:376
+#: merge-recursive.c:822
#, c-format
-msgid "failed to open '%s'"
-msgstr "gặp lá»—i khi mở “%sâ€"
+msgid "failed to open '%s': %s"
+msgstr "gặp lá»—i khi mở “%sâ€: %s"
-#: merge-recursive.c:798
+#: merge-recursive.c:833
#, c-format
-msgid "failed to symlink '%s'"
-msgstr "gặp lá»—i khi tạo liên kết má»m (symlink) “%sâ€"
+msgid "failed to symlink '%s': %s"
+msgstr "gặp lá»—i khi tạo liên kết má»m (symlink) “%sâ€: %s"
-#: merge-recursive.c:801
+#: merge-recursive.c:838
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "không hiểu phải làm gì vá»›i %06o %s “%sâ€"
-#: merge-recursive.c:939
+#: merge-recursive.c:978
msgid "Failed to execute internal merge"
msgstr "Gặp lỗi khi thực hiện trộn nội bộ"
-#: merge-recursive.c:943
+#: merge-recursive.c:982
#, c-format
msgid "Unable to add %s to database"
msgstr "Không thể thêm %s vào cơ sở dữ liệu"
-#: merge-recursive.c:959
-msgid "unsupported object type in the tree"
-msgstr "kiểu đối tượng không được hỗ trợ trong cây (tree)"
-
-#: merge-recursive.c:1034 merge-recursive.c:1048
+#: merge-recursive.c:1081 merge-recursive.c:1095
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -794,7 +1053,7 @@ msgstr ""
"XUNG ÄỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
"còn lại trong cây (tree)."
-#: merge-recursive.c:1040 merge-recursive.c:1053
+#: merge-recursive.c:1087 merge-recursive.c:1100
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -803,20 +1062,20 @@ msgstr ""
"XUNG ÄỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
"còn lại trong cây (tree) tại %s."
-#: merge-recursive.c:1094
+#: merge-recursive.c:1143
msgid "rename"
msgstr "đổi tên"
-#: merge-recursive.c:1094
+#: merge-recursive.c:1143
msgid "renamed"
msgstr "đã đổi tên"
-#: merge-recursive.c:1150
+#: merge-recursive.c:1200
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s là một thư mục trong %s thay vào đó thêm vào như là %s"
-#: merge-recursive.c:1172
+#: merge-recursive.c:1225
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -825,145 +1084,136 @@ msgstr ""
"XUNG ÄỘT (đổi-tên/đổi-tên): Äổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi "
"tên \"%s\"->\"%s\" trong \"%s\"%s"
-#: merge-recursive.c:1177
+#: merge-recursive.c:1230
msgid " (left unresolved)"
msgstr " (cần giải quyết)"
-#: merge-recursive.c:1231
+#: merge-recursive.c:1292
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"XUNG ÄỘT (đổi-tên/đổi-tên): Äổi tên %s->%s trong %s. Äổi tên %s->%s trong %s"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1325
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Äang đổi tên %s thành %s thay vì %s thành %s"
-#: merge-recursive.c:1460
+#: merge-recursive.c:1531
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"XUNG ÄỘT (đổi-tên/thêm): Äổi tên %s->%s trong %s. %s được thêm vào trong %s"
-#: merge-recursive.c:1470
+#: merge-recursive.c:1546
#, c-format
msgid "Adding merged %s"
msgstr "Thêm hòa trộn %s"
-#: merge-recursive.c:1475 merge-recursive.c:1677
+#: merge-recursive.c:1553 merge-recursive.c:1766
#, c-format
msgid "Adding as %s instead"
msgstr "Thay vào đó thêm vào %s"
-#: merge-recursive.c:1526
+#: merge-recursive.c:1610
#, c-format
msgid "cannot read object %s"
msgstr "không thể Ä‘á»c đối tượng %s"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1613
#, c-format
msgid "object %s is not a blob"
msgstr "đối tượng %s không phải là một blob"
-#: merge-recursive.c:1581
+#: merge-recursive.c:1666
msgid "modify"
msgstr "sửa đổi"
-#: merge-recursive.c:1581
+#: merge-recursive.c:1666
msgid "modified"
msgstr "đã sửa"
-#: merge-recursive.c:1591
+#: merge-recursive.c:1676
msgid "content"
msgstr "ná»™i dung"
-#: merge-recursive.c:1598
+#: merge-recursive.c:1683
msgid "add/add"
msgstr "thêm/thêm"
-#: merge-recursive.c:1632
+#: merge-recursive.c:1718
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Äã bá» qua %s (đã có sẵn lần hòa trá»™n này)"
-#: merge-recursive.c:1646
+#: merge-recursive.c:1732
#, c-format
msgid "Auto-merging %s"
msgstr "Tự-động-hòa-trộn %s"
-#: merge-recursive.c:1650 git-submodule.sh:941
+#: merge-recursive.c:1736 git-submodule.sh:919
msgid "submodule"
msgstr "mô-đun-con"
-#: merge-recursive.c:1651
+#: merge-recursive.c:1737
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "XUNG ÄỘT (%s): Xung Ä‘á»™t hòa trá»™n trong %s"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1831
#, c-format
msgid "Removing %s"
msgstr "Äang xóa %s"
-#: merge-recursive.c:1762
+#: merge-recursive.c:1857
msgid "file/directory"
msgstr "tập-tin/thư-mục"
-#: merge-recursive.c:1768
+#: merge-recursive.c:1863
msgid "directory/file"
msgstr "thư-mục/tập-tin"
-#: merge-recursive.c:1773
+#: merge-recursive.c:1868
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"XUNG ÄỘT (%s): Ở đây không có thÆ° mục nào có tên %s trong %s. Thêm %s nhÆ° là "
"%s"
-#: merge-recursive.c:1781
+#: merge-recursive.c:1877
#, c-format
msgid "Adding %s"
msgstr "Thêm \"%s\""
-#: merge-recursive.c:1798
-msgid "Fatal merge failure, shouldn't happen."
-msgstr "Việc hòa trá»™n há»ng nghiêm trá»ng, không nên để xảy ra."
-
-#: merge-recursive.c:1817
+#: merge-recursive.c:1914
msgid "Already up-to-date!"
msgstr "Äã cập nhật rồi!"
-#: merge-recursive.c:1826
+#: merge-recursive.c:1923
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "hòa trộn các cây %s và %s gặp lỗi"
-#: merge-recursive.c:1856
-#, c-format
-msgid "Unprocessed path??? %s"
-msgstr "ÄÆ°á»ng dẫn chÆ°a được xá»­ lý??? %s"
-
-#: merge-recursive.c:1904
+#: merge-recursive.c:2006
msgid "Merging:"
msgstr "Äang trá»™n:"
-#: merge-recursive.c:1917
+#: merge-recursive.c:2019
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "tìm thấy %u tổ tiên chung:"
-#: merge-recursive.c:1954
+#: merge-recursive.c:2058
msgid "merge returned no commit"
msgstr "hòa trộn không trả vỠlần chuyển giao nào"
-#: merge-recursive.c:2011
+#: merge-recursive.c:2121
#, c-format
msgid "Could not parse object '%s'"
msgstr "Không thể phân tích đối tượng “%sâ€"
-#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
+#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
msgid "Unable to write index."
msgstr "Không thể ghi bảng mục lục"
@@ -1025,7 +1275,7 @@ msgstr "-Sá»"
msgid "malformed object name '%s'"
msgstr "tên đối tượng dị hình “%sâ€"
-#: path.c:796
+#: path.c:798
#, c-format
msgid "Could not make %s writable by group"
msgstr "Không thể làm %s được ghi bởi nhóm"
@@ -1095,7 +1345,7 @@ msgstr ""
"Ở đây không có gì bị loại trừ bởi: các mẫu (loại trừ).\n"
"Có lẽ bạn đã quên thêm hoặc là “:/†hoặc là “.�"
-#: pretty.c:971
+#: pretty.c:973
msgid "unable to parse --pretty format"
msgstr "không thể phân tích định dạng --pretty"
@@ -1121,23 +1371,22 @@ msgstr ""
"GIT_INDEX_VERSION được đặt, nhưng giá trị của nó lại không hợp lệ.\n"
"Dùng phiên bản %i"
-#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
-#: builtin/merge.c:995
+#: refs.c:551 builtin/merge.c:840
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Không thể mở “%s†để ghi"
-#: refs/files-backend.c:2243
+#: refs/files-backend.c:2534
#, c-format
msgid "could not delete reference %s: %s"
msgstr "không thể xóa bỠtham chiếu %s: %s"
-#: refs/files-backend.c:2246
+#: refs/files-backend.c:2537
#, c-format
msgid "could not delete references: %s"
msgstr "không thể xóa bỠtham chiếu: %s"
-#: refs/files-backend.c:2255
+#: refs/files-backend.c:2546
#, c-format
msgid "could not remove reference %s"
msgstr "không thể gỡ bỠtham chiếu: %s"
@@ -1295,75 +1544,75 @@ msgstr "%s theo dõi cả %s và %s"
msgid "Internal error"
msgstr "Lá»—i ná»™i bá»™"
-#: remote.c:1678 remote.c:1721
+#: remote.c:1677 remote.c:1720
msgid "HEAD does not point to a branch"
msgstr "HEAD không chỉ đến một nhánh nào cả"
-#: remote.c:1687
+#: remote.c:1686
#, c-format
msgid "no such branch: '%s'"
msgstr "không có nhánh nào nhÆ° thế: “%sâ€"
-#: remote.c:1690
+#: remote.c:1689
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "không có thượng nguồn được cấu hình cho nhánh “%sâ€"
-#: remote.c:1696
+#: remote.c:1695
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
"nhánh thượng nguồn “%s†không được lưu lại như là một nhánh theo dõi máy chủ"
-#: remote.c:1711
+#: remote.c:1710
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "đẩy lên đích “%s†trên máy chủ “%s†không có nhánh theo dõi nội bộ"
-#: remote.c:1726
+#: remote.c:1725
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "nhánh “%s†không có máy chủ để đẩy lên"
-#: remote.c:1737
+#: remote.c:1736
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "đẩy refspecs cho “%s†không bao gồm “%sâ€"
-#: remote.c:1750
+#: remote.c:1749
msgid "push has no destination (push.default is 'nothing')"
msgstr "đẩy lên mà không có đích (push.default là “nothingâ€)"
-#: remote.c:1772
+#: remote.c:1771
msgid "cannot resolve 'simple' push to a single destination"
msgstr "không thể phân giải đẩy “đơn giản†đến một đích đơn"
-#: remote.c:2074
+#: remote.c:2073
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
"Nhánh của bạn dá»±a trên cÆ¡ sở là “%sâ€, nhÆ°ng trên thượng nguồn không còn.\n"
-#: remote.c:2078
+#: remote.c:2077
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (dùng \" git branch --unset-upstream\" để sửa)\n"
-#: remote.c:2081
+#: remote.c:2080
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Nhánh của bạn đã cập nhật vá»›i “%sâ€.\n"
-#: remote.c:2085
+#: remote.c:2084
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Nhánh của bạn đứng trước “%s†%d lần chuyển giao.\n"
-#: remote.c:2091
+#: remote.c:2090
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (dùng \"git push\" để xuất bản các lần chuyển giao nội bộ của bạn)\n"
-#: remote.c:2094
+#: remote.c:2093
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1372,11 +1621,11 @@ msgstr[0] ""
"Nhánh của bạn đứng đằng sau “%s†%d lần chuyển giao, và có thể được chuyển-"
"tiếp-nhanh.\n"
-#: remote.c:2102
+#: remote.c:2101
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (dùng \"git pull\" để cập nhật nhánh nội bộ của bạn)\n"
-#: remote.c:2105
+#: remote.c:2104
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1389,22 +1638,22 @@ msgstr[0] ""
"và có %d và %d lần chuyển giao khác nhau cho từng cái,\n"
"tương ứng với mỗi lần.\n"
-#: remote.c:2115
+#: remote.c:2114
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của "
"bạn)\n"
-#: revision.c:2142
+#: revision.c:2132
msgid "your current branch appears to be broken"
msgstr "nhánh hiện tại của bạn có vẻ nhÆ° bị há»ng"
-#: revision.c:2145
+#: revision.c:2135
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "nhánh hiện tại của bạn “%s†không có một lần chuyển giao nào cả"
-#: revision.c:2339
+#: revision.c:2329
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent xung khắc với --bisect"
@@ -1417,15 +1666,15 @@ msgstr "gặp lá»—i khi mở “/dev/nullâ€"
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) gặp lỗi"
-#: send-pack.c:295
+#: send-pack.c:298
msgid "failed to sign the push certificate"
msgstr "gặp lỗi khi ký chứng thực đẩy"
-#: send-pack.c:404
+#: send-pack.c:411
msgid "the receiving end does not support --signed push"
msgstr "kết thúc nhận không hỗ trợ đẩy --signed"
-#: send-pack.c:406
+#: send-pack.c:413
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -1433,10 +1682,14 @@ msgstr ""
"đừng gửi giấy chứng nhận đẩy trước khi kết thúc nhận không hỗ trợ đẩy --"
"signed"
-#: send-pack.c:418
+#: send-pack.c:425
msgid "the receiving end does not support --atomic push"
msgstr "kết thúc nhận không hỗ trợ đẩy --atomic"
+#: send-pack.c:430
+msgid "the receiving end does not support push options"
+msgstr "kết thúc nhận không há»— trợ các tùy chá»n của lệnh push"
+
#: sequencer.c:174
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
@@ -1455,15 +1708,15 @@ msgstr ""
"vá»›i lệnh “git add <Ä‘Æ°á»ng_dẫn>†hoặc “git rm <Ä‘Æ°á»ng_dẫn>â€\n"
"và chuyển giao kết quả bằng lệnh “git commitâ€"
-#: sequencer.c:190 sequencer.c:833 sequencer.c:912
+#: sequencer.c:190 sequencer.c:841 sequencer.c:924
#, c-format
msgid "Could not write to %s"
msgstr "Không thể ghi vào %s"
-#: sequencer.c:193
+#: sequencer.c:193 sequencer.c:843 sequencer.c:928
#, c-format
-msgid "Error wrapping up %s"
-msgstr "Lá»—i bao bá»c %s"
+msgid "Error wrapping up %s."
+msgstr "Lá»—i bao bá»c %s."
#: sequencer.c:208
msgid "Your local changes would be overwritten by cherry-pick."
@@ -1477,45 +1730,50 @@ msgstr "Các thay đổi ná»™i bá»™ của bạn có thể bị ghi đè bởi lá
msgid "Commit your changes or stash them to proceed."
msgstr "Chuyển giao các thay đổi của bạn hay tạm cất (stash) chúng để xử lý."
+#: sequencer.c:228
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: chuyển-tiếp-nhanh"
+
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:300
+#: sequencer.c:303
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Không thể ghi tập tin lưu bảng mục lục mới"
-#: sequencer.c:318
+#: sequencer.c:321
msgid "Could not resolve HEAD commit\n"
msgstr "Không thể phân giải lần chuyển giao HEAD\n"
-#: sequencer.c:338
+#: sequencer.c:341
msgid "Unable to update cache tree\n"
msgstr "Không thể cập nhật cây bộ nhớ đệm\n"
-#: sequencer.c:390
+#: sequencer.c:393
#, c-format
msgid "Could not parse commit %s\n"
msgstr "Không thể phân tích lần chuyển giao %s\n"
-#: sequencer.c:395
+#: sequencer.c:398
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "Không thể phân tích lần chuyển giao cha mẹ “%sâ€\n"
-#: sequencer.c:460
+#: sequencer.c:463
msgid "Your index file is unmerged."
msgstr "Tập tin lưu mục lục của bạn không được hòa trộn."
-#: sequencer.c:479
+#: sequencer.c:482
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "Lần chuyển giao %s là má»™t lần hòa trá»™n nhÆ°ng không Ä‘Æ°a ra tùy chá»n -m."
-#: sequencer.c:487
+#: sequencer.c:490
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "Lần chuyển giao %s không có cha mẹ %d"
-#: sequencer.c:491
+#: sequencer.c:494
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr ""
@@ -1524,157 +1782,193 @@ msgstr ""
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:504
+#: sequencer.c:507
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: không thể phân tích lần chuyển giao mẹ của %s"
-#: sequencer.c:508
+#: sequencer.c:511
#, c-format
msgid "Cannot get commit message for %s"
msgstr "Không thể lấy ghi chú lần chuyển giao cho %s"
-#: sequencer.c:594
+#: sequencer.c:597
#, c-format
msgid "could not revert %s... %s"
msgstr "không thể hoàn nguyên %s… %s"
-#: sequencer.c:595
+#: sequencer.c:598
#, c-format
msgid "could not apply %s... %s"
msgstr "không thể áp dụng miếng vá %s… %s"
-#: sequencer.c:630
+#: sequencer.c:633
msgid "empty commit set passed"
msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách"
-#: sequencer.c:638
+#: sequencer.c:641
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: gặp lá»—i Ä‘á»c bảng mục lục"
-#: sequencer.c:642
+#: sequencer.c:645
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: gặp lỗi khi làm tươi mới bảng mục lục"
-#: sequencer.c:702
-#, c-format
-msgid "Cannot %s during a %s"
-msgstr "Không thể %s trong khi %s"
+#: sequencer.c:705
+msgid "Cannot revert during another revert."
+msgstr "Không thể hoàn nguyên trong khi có hoàn nguyên khác."
-#: sequencer.c:724
+#: sequencer.c:706
+msgid "Cannot revert during a cherry-pick."
+msgstr "không thể thực hiện việc hoàn nguyên trong khi đang cherry-pick."
+
+#: sequencer.c:709
+msgid "Cannot cherry-pick during a revert."
+msgstr "Không thể cherry-pick trong khi hoàn nguyên."
+
+#: sequencer.c:710
+msgid "Cannot cherry-pick during another cherry-pick."
+msgstr ""
+"Không thể thực hiện việc cherry-pick trong khi khi đang cherry-pick khác."
+
+#: sequencer.c:732
#, c-format
msgid "Could not parse line %d."
msgstr "Không phân tích được dòng %d."
-#: sequencer.c:729
+#: sequencer.c:737
msgid "No commits parsed."
msgstr "Không có lần chuyển giao nào được phân tích."
-#: sequencer.c:741
+#: sequencer.c:749
#, c-format
msgid "Could not open %s"
msgstr "Không thể mở %s"
-#: sequencer.c:745
+#: sequencer.c:753
#, c-format
msgid "Could not read %s."
msgstr "Không thể Ä‘á»c %s."
-#: sequencer.c:752
+#: sequencer.c:760
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "Bảng chỉ thị không thể dùng được: %s"
-#: sequencer.c:782
+#: sequencer.c:790
#, c-format
msgid "Invalid key: %s"
msgstr "Khóa không đúng: %s"
-#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52
+#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Giá trị không hợp lệ %s: %s"
-#: sequencer.c:795
+#: sequencer.c:803
#, c-format
msgid "Malformed options sheet: %s"
msgstr "Bảng tùy chá»n dị hình: %s"
-#: sequencer.c:814
+#: sequencer.c:822
msgid "a cherry-pick or revert is already in progress"
msgstr "có một thao tác “cherry-pick†hoặc “revert†đang được thực hiện"
-#: sequencer.c:815
+#: sequencer.c:823
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:819
+#: sequencer.c:827
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "Không thể tạo thư mục xếp dãy %s"
-#: sequencer.c:835 sequencer.c:916
-#, c-format
-msgid "Error wrapping up %s."
-msgstr "Lá»—i bao bá»c %s."
-
-#: sequencer.c:854 sequencer.c:986
+#: sequencer.c:862 sequencer.c:998
msgid "no cherry-pick or revert in progress"
msgstr "không cherry-pick hay hoàn nguyên trong tiến trình"
-#: sequencer.c:856
+#: sequencer.c:864
msgid "cannot resolve HEAD"
msgstr "không thể phân giải HEAD"
-#: sequencer.c:858
+#: sequencer.c:866 sequencer.c:900
msgid "cannot abort from a branch yet to be born"
msgstr "không thể hủy bỠtừ một nhánh mà nó còn chưa được tạo ra"
-#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
+#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
#, c-format
msgid "cannot open %s"
msgstr "không mở được “%sâ€"
-#: sequencer.c:880
+#: sequencer.c:888
#, c-format
msgid "cannot read %s: %s"
msgstr "không thể Ä‘á»c %s: %s"
-#: sequencer.c:881
+#: sequencer.c:889
msgid "unexpected end of file"
msgstr "gặp kết thúc tập tin đột xuất"
-#: sequencer.c:887
+#: sequencer.c:895
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "tập tin HEAD “pre-cherry-pick†đã lÆ°u “%s†bị há»ng"
-#: sequencer.c:909
+#: sequencer.c:921
#, c-format
msgid "Could not format %s."
msgstr "Không thể định dạng “%sâ€."
-#: sequencer.c:1054
+#: sequencer.c:1066
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: không thể cherry-pick một %s"
-#: sequencer.c:1057
+#: sequencer.c:1069
#, c-format
msgid "%s: bad revision"
msgstr "%s: điểm xét duyệt sai"
-#: sequencer.c:1091
+#: sequencer.c:1102
msgid "Can't revert as initial commit"
msgstr "Không thể hoàn nguyên một lần chuyển giao khởi tạo"
-#: sequencer.c:1092
-msgid "Can't cherry-pick into empty head"
-msgstr "Không thể cherry-pick vào một đầu (head) trống rỗng"
+#: setup.c:160
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s: không có Ä‘Æ°á»ng dẫn nào nhÆ° thế ở trong cây làm việc.\n"
+"Dùng “git <lệnh> -- <Ä‘Æ°á»ng/dẫn>…†để chỉ định Ä‘Æ°á»ng dẫn mà nó không tồn tại "
+"một cách nội bộ."
+
+#: setup.c:173
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"tham số chÆ°a rõ ràng “%sâ€: chÆ°a biết Ä‘iểm xem xét hay Ä‘Æ°á»ng dẫn không trong "
+"cây làm việc.\n"
+"Dùng “--†để ngăn cách các Ä‘Æ°á»ng dẫn khá»i Ä‘iểm xem xét, nhÆ° thế này:\n"
+"“git <lệnh> [<Ä‘iểm xem xét>…] -- [<tập tin>…]â€"
-#: setup.c:248
+#: setup.c:223
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"tham số chÆ°a rõ ràng “%sâ€: cả Ä‘iểm xem xét và tên tập tin.\n"
+"Dùng “--†để ngăn cách các Ä‘Æ°á»ng dẫn khá»i Ä‘iểm xem xét, nhÆ° thế này:\n"
+"“git <lệnh> [<Ä‘iểm xem xét>…] -- [<tập tin>…]â€"
+
+#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
#, c-format
msgid "failed to read %s"
msgstr "gặp lá»—i khi Ä‘á»c %s"
@@ -1688,16 +1982,53 @@ msgstr "Cần phiên bản kho git <= %d, nhưng lại nhận được %d"
msgid "unknown repository extensions found:"
msgstr "tìm thấy phần mở rộng kho chưa biết:"
-#: sha1_file.c:1080
+#: setup.c:762
+#, c-format
+msgid "Not a git repository (or any of the parent directories): %s"
+msgstr "Không phải là kho git (hoặc bất kỳ thư mục cha mẹ nào): %s"
+
+#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+msgid "Cannot come back to cwd"
+msgstr "Không thể quay lại cwd"
+
+#: setup.c:845
+msgid "Unable to read current working directory"
+msgstr "Không thể Ä‘á»c thÆ° mục làm việc hiện hành"
+
+#: setup.c:920
+#, c-format
+msgid ""
+"Not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgstr ""
+"Không phải là kho git (hay bất kỳ cha mẹ nào đến điểm gắn kết %s)\n"
+"Dừng tại biên của hệ thống tập tin (GIT_DISCOVERY_ACROSS_FILESYSTEM chưa "
+"đặt)."
+
+#: setup.c:927
+#, c-format
+msgid "Cannot change to '%s/..'"
+msgstr "Không thể chuyển sang “%s/..â€"
+
+#: setup.c:989
+#, c-format
+msgid ""
+"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"Gặp vấn đỠvới gía trị chế độ tập tin core.sharedRepository (0%.3o).\n"
+"ngÆ°á»i sở hữu tập tin phải luôn có quyá»n Ä‘á»c và ghi."
+
+#: sha1_file.c:1046
msgid "offset before end of packfile (broken .idx?)"
msgstr "vị trí tÆ°Æ¡ng đối trÆ°á»›c Ä‘iểm kết thúc của tập tin gói (.idx há»ng à?)"
-#: sha1_file.c:2458
+#: sha1_file.c:2434
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "vị trí tÆ°Æ¡ng đối nằm trÆ°á»›c chỉ mục gói cho %s (mục lục bị há»ng à?)"
-#: sha1_file.c:2462
+#: sha1_file.c:2438
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
@@ -1756,7 +2087,7 @@ msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật"
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "không cho phép giá trị âm ở submodule.fetchJobs"
-#: submodule-config.c:355
+#: submodule-config.c:358
#, c-format
msgid "invalid value for %s"
msgstr "giá trị cho %s không hợp lệ"
@@ -1815,6 +2146,56 @@ msgstr "không thể tạo tập tin tạm thá»i"
msgid "could not rename temporary file to %s"
msgstr "không thể đổi tên tập tin tạm thá»i thành %s"
+#: transport.c:62
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Không thể đặt thượng nguồn của “%s†thành “%s†của “%sâ€\n"
+
+#: transport.c:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "vận chuyển: tùy chá»n Ä‘á»™ sâu “%s†không hợp lệ"
+
+#: transport.c:771
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Các Ä‘Æ°á»ng dẫn mô-Ä‘un-con sau đây có chứa các thay đổi cái mà\n"
+"có thể được tìm thấy trên má»i máy phục vụ:\n"
+
+#: transport.c:775
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Hãy thử\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"hoặc cd đến Ä‘Æ°á»ng dẫn và dùng\n"
+"\n"
+"\tgit push\n"
+"\n"
+"để đẩy chúng lên máy phục vụ.\n"
+"\n"
+
+#: transport.c:783
+msgid "Aborting."
+msgstr "Bãi bá»."
+
#: transport-helper.c:1041
#, c-format
msgid "Could not read ref %s"
@@ -1824,12 +2205,12 @@ msgstr "Không thể Ä‘á»c tham chiếu %s"
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
-"%%sPlease commit your changes or stash them before you can switch branches."
+"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
"checkout:\n"
-"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn có "
-"thể chuyển nhánh."
+"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn "
+"chuyển nhánh."
#: unpack-trees.c:66
#, c-format
@@ -1845,12 +2226,12 @@ msgstr ""
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you can merge."
+"%%sPlease commit your changes or stash them before you merge."
msgstr ""
"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
"hòa trộn:\n"
-"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn có "
-"thể hòa trộn."
+"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn hòa "
+"trá»™n."
#: unpack-trees.c:71
#, c-format
@@ -1866,12 +2247,11 @@ msgstr ""
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you can %s."
+"%%sPlease commit your changes or stash them before you %s."
msgstr ""
"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
"%s:\n"
-"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn có "
-"thể %s."
+"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn %s."
#: unpack-trees.c:76
#, c-format
@@ -1897,11 +2277,11 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you can switch branches."
+"%%sPlease move or remove them before you switch branches."
msgstr ""
"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỠbởi lệnh "
"checkout:\n"
-"%%sVui lòng di chuyển hay gỡ bỠchúng trước khi bạn có thể chuyển nhánh."
+"%%sVui lòng di chuyển hay gỡ bỠchúng trước khi bạn chuyển nhánh."
#: unpack-trees.c:87
#, c-format
@@ -1917,11 +2297,11 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you can merge."
+"%%sPlease move or remove them before you merge."
msgstr ""
"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỠbởi lệnh hòa "
"trá»™n:\n"
-"%%sVui lòng di chuyển hay gỡ bỠchúng trước khi bạn có thể hòa trộn."
+"%%sVui lòng di chuyển hay gỡ bỠchúng trước khi bạn hòa trộn."
#: unpack-trees.c:92
#, c-format
@@ -1937,10 +2317,10 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you can %s."
+"%%sPlease move or remove them before you %s."
msgstr ""
"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỠbởi %s:\n"
-"%%sVui lòng di chuyển hay gỡ bỠchúng trước khi bạn có thể %s."
+"%%sVui lòng di chuyển hay gỡ bỠchúng trước khi bạn %s."
#: unpack-trees.c:97
#, c-format
@@ -1956,11 +2336,11 @@ msgstr ""
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
-"%%sPlease move or remove them before you can switch branches."
+"%%sPlease move or remove them before you switch branches."
msgstr ""
"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
"checkout:\n"
-"%%sVui lòng di chuyển hay gỡ bỠchúng trước khi bạn có thể chuyển nhánh."
+"%%sVui lòng di chuyển hay gỡ bỠchúng trước khi bạn chuyển nhánh."
#: unpack-trees.c:104
#, c-format
@@ -1977,11 +2357,11 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you can merge."
+"%%sPlease move or remove them before you merge."
msgstr ""
"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
"hòa trộn:\n"
-"%%sVui lòng di chuyển hay gỡ bỠchúng trước khi bạn có thể hòa trộn."
+"%%sVui lòng di chuyển hay gỡ bỠchúng trước khi bạn hòa trộn."
#: unpack-trees.c:109
#, c-format
@@ -1997,11 +2377,11 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you can %s."
+"%%sPlease move or remove them before you %s."
msgstr ""
"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
"%s:\n"
-"%%sVui lòng di chuyển hay gỡ bỠchúng trước khi bạn có thể %s."
+"%%sVui lòng di chuyển hay gỡ bỠchúng trước khi bạn %s."
#: unpack-trees.c:114
#, c-format
@@ -2087,43 +2467,43 @@ msgstr "tên cổng không hợp lệ"
msgid "invalid '..' path segment"
msgstr "Ä‘oạn Ä‘Æ°á»ng dẫn “..†không hợp lệ"
-#: wrapper.c:222 wrapper.c:381
+#: worktree.c:282
+#, c-format
+msgid "failed to read '%s'"
+msgstr "gặp lá»—i khi Ä‘á»c “%sâ€"
+
+#: wrapper.c:222 wrapper.c:392
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "không thể mở “%s†để Ä‘á»c và ghi"
-#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
#, c-format
msgid "could not open '%s' for writing"
msgstr "không thể mở “%s†để ghi"
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
-#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
+#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
#: builtin/pull.c:407
#, c-format
msgid "could not open '%s' for reading"
msgstr "không thể mở “%s†để Ä‘á»c"
-#: wrapper.c:594 wrapper.c:615
+#: wrapper.c:605 wrapper.c:626
#, c-format
msgid "unable to access '%s'"
msgstr "không thể truy cập “%sâ€"
-#: wrapper.c:623
+#: wrapper.c:634
msgid "unable to get current working directory"
msgstr "Không thể lấy thư mục làm việc hiện hành"
-#: wrapper.c:650
-#, c-format
-msgid "could not open %s for writing"
-msgstr "không thể mở %s để ghi"
-
-#: wrapper.c:661 builtin/am.c:410
+#: wrapper.c:658
#, c-format
msgid "could not write to %s"
msgstr "không thể ghi vào %s"
-#: wrapper.c:667
+#: wrapper.c:660
#, c-format
msgid "could not close %s"
msgstr "không thể đóng %s"
@@ -2155,11 +2535,11 @@ msgstr ""
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (dùng \"git rm <tập-tin>…\" để đánh dấu là cần giải quyết)"
-#: wt-status.c:198 wt-status.c:881
+#: wt-status.c:198 wt-status.c:882
msgid "Changes to be committed:"
msgstr "Những thay đổi sẽ được chuyển giao:"
-#: wt-status.c:216 wt-status.c:890
+#: wt-status.c:216 wt-status.c:891
msgid "Changes not staged for commit:"
msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:"
@@ -2219,11 +2599,6 @@ msgstr "được thêm vào bởi cả hai:"
msgid "both modified:"
msgstr "bị sửa bởi cả hai:"
-#: wt-status.c:266
-#, c-format
-msgid "bug: unhandled unmerged status %x"
-msgstr "lỗi: không thể tiếp nhận trạng thái chưa hòa trộn %x"
-
#: wt-status.c:274
msgid "new file:"
msgstr "tập tin mới:"
@@ -2268,20 +2643,15 @@ msgstr "nội dung bị sửa đổi, "
msgid "untracked content, "
msgstr "nội dung chưa được theo dõi, "
-#: wt-status.c:391
-#, c-format
-msgid "bug: unhandled diff status %c"
-msgstr "lỗi: không thể tiếp nhận trạng thái lệnh diff %c"
-
-#: wt-status.c:755
+#: wt-status.c:756
msgid "Submodules changed but not updated:"
msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:"
-#: wt-status.c:757
+#: wt-status.c:758
msgid "Submodule changes to be committed:"
msgstr "Những mô-đun-con thay đổi đã được chuyển giao:"
-#: wt-status.c:838
+#: wt-status.c:839
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -2289,101 +2659,105 @@ msgstr ""
"Không Ä‘á»™ng đến Ä‘Æ°á»ng ở trên.\n"
"Má»i thứ phía dÆ°á»›i sẽ được xóa bá»."
-#: wt-status.c:949
+#: wt-status.c:950
msgid "You have unmerged paths."
msgstr "Bạn có những Ä‘Æ°á»ng dẫn chÆ°a được hòa trá»™n."
-#: wt-status.c:952
+#: wt-status.c:953
msgid " (fix conflicts and run \"git commit\")"
msgstr " (sửa các xung đột rồi chạy \"git commit\")"
-#: wt-status.c:956
+#: wt-status.c:955
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (dùng \"git merge --abort\" để bãi bỠviệc hòa trộn)"
+
+#: wt-status.c:960
msgid "All conflicts fixed but you are still merging."
msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn."
-#: wt-status.c:959
+#: wt-status.c:963
msgid " (use \"git commit\" to conclude merge)"
msgstr " (dùng \"git commit\" để hoàn tất việc hòa trộn)"
-#: wt-status.c:969
+#: wt-status.c:973
msgid "You are in the middle of an am session."
msgstr "Bạn Ä‘ang ở giữa của má»™t phiên “amâ€."
-#: wt-status.c:972
+#: wt-status.c:976
msgid "The current patch is empty."
msgstr "Miếng vá hiện tại bị trống rỗng."
-#: wt-status.c:976
+#: wt-status.c:980
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --continue\")"
-#: wt-status.c:978
+#: wt-status.c:982
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (dùng \"git am --skip\" để bỠqua miếng vá này)"
-#: wt-status.c:980
+#: wt-status.c:984
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)"
-#: wt-status.c:1105
+#: wt-status.c:1109
msgid "No commands done."
msgstr "Không thực hiện lệnh nào."
-#: wt-status.c:1108
+#: wt-status.c:1112
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Lệnh thực hiện cuối (%d lệnh được thực thi):"
-#: wt-status.c:1119
+#: wt-status.c:1123
#, c-format
msgid " (see more in file %s)"
msgstr " (xem thêm trong %s)"
-#: wt-status.c:1124
+#: wt-status.c:1128
msgid "No commands remaining."
msgstr "Không có lệnh nào còn lại."
-#: wt-status.c:1127
+#: wt-status.c:1131
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Lệnh cần làm kế tiếp (%d lệnh còn lại):"
-#: wt-status.c:1135
+#: wt-status.c:1139
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (dùng lệnh \"git rebase --edit-todo\" để xem và sửa)"
-#: wt-status.c:1148
+#: wt-status.c:1152
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Bạn hiện nay Ä‘ang thá»±c hiện việc “rebase†nhánh “%s†trên “%sâ€."
-#: wt-status.c:1153
+#: wt-status.c:1157
msgid "You are currently rebasing."
msgstr "Bạn hiện nay Ä‘ang thá»±c hiện việc “rebase†(“cải tổâ€)."
-#: wt-status.c:1167
+#: wt-status.c:1171
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
" (sửa các xung đột và sau đó chạy lệnh “cải tổ†\"git rebase --continue\")"
-#: wt-status.c:1169
+#: wt-status.c:1173
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (dùng lệnh “cải tổ†\"git rebase --skip\" để bỠqua lần vá này)"
-#: wt-status.c:1171
+#: wt-status.c:1175
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (dùng lệnh “cải tổ†\"git rebase --abort\" để check-out nhánh nguyên thủy)"
-#: wt-status.c:1177
+#: wt-status.c:1181
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
" (khi tất cả các xung đột đã sửa xong: chạy lệnh “cải tổ†\"git rebase --"
"continue\")"
-#: wt-status.c:1181
+#: wt-status.c:1185
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -2391,130 +2765,130 @@ msgstr ""
"Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao trong khi "
"Ä‘ang “rebase†nhánh “%s†trên “%sâ€."
-#: wt-status.c:1186
+#: wt-status.c:1190
msgid "You are currently splitting a commit during a rebase."
msgstr ""
"Bạn hiện tại đang cắt đôi một lần chuyển giao trong khi đang thực hiện việc "
"rebase."
-#: wt-status.c:1189
+#: wt-status.c:1193
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Má»™t khi thÆ° mục làm việc của bạn đã gá»n gàng, chạy lệnh “cải tổ†\"git "
"rebase --continue\")"
-#: wt-status.c:1193
+#: wt-status.c:1197
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Bạn hiện nay đang thực hiện việc sửa chữa một lần chuyển giao trong khi đang "
"rebase nhánh “%s†trên “%sâ€."
-#: wt-status.c:1198
+#: wt-status.c:1202
msgid "You are currently editing a commit during a rebase."
msgstr "Bạn hiện đang sửa một lần chuyển giao trong khi bạn thực hiện rebase."
-#: wt-status.c:1201
+#: wt-status.c:1205
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (dùng \"git commit --amend\" để “tu bổ†lần chuyển giao hiện tại)"
-#: wt-status.c:1203
+#: wt-status.c:1207
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (chạy lệnh “cải tổ†\"git rebase --continue\" một khi bạn cảm thấy hài "
"lòng vỠnhững thay đổi của mình)"
-#: wt-status.c:1213
+#: wt-status.c:1217
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Bạn hiện nay đang thực hiện việc cherry-pick lần chuyển giao %s."
-#: wt-status.c:1218
+#: wt-status.c:1222
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
" (sửa các xung đột và sau đó chạy lệnh \"git cherry-pick --continue\")"
-#: wt-status.c:1221
+#: wt-status.c:1225
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git cherry-pick --"
"continue\")"
-#: wt-status.c:1223
+#: wt-status.c:1227
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (dùng \"git cherry-pick --abort\" để hủy bỠthao tác cherry-pick)"
-#: wt-status.c:1232
+#: wt-status.c:1236
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Bạn hiện nay Ä‘ang thá»±c hiện thao tác hoàn nguyên lần chuyển giao “%sâ€."
-#: wt-status.c:1237
+#: wt-status.c:1241
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (sửa các xung đột và sau đó chạy lệnh \"git revert --continue\")"
-#: wt-status.c:1240
+#: wt-status.c:1244
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")"
-#: wt-status.c:1242
+#: wt-status.c:1246
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (dùng \"git revert --abort\" để hủy bỠthao tác hoàn nguyên)"
-#: wt-status.c:1253
+#: wt-status.c:1257
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
"Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect), bắt đầu từ "
"nhánh “%sâ€."
-#: wt-status.c:1257
+#: wt-status.c:1261
msgid "You are currently bisecting."
msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa bước)."
-#: wt-status.c:1260
+#: wt-status.c:1264
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)"
-#: wt-status.c:1460
+#: wt-status.c:1464
msgid "On branch "
msgstr "Trên nhánh "
-#: wt-status.c:1466
+#: wt-status.c:1470
msgid "interactive rebase in progress; onto "
msgstr "rebase ở chế độ tương tác đang được thực hiện; lên trên "
-#: wt-status.c:1468
+#: wt-status.c:1472
msgid "rebase in progress; onto "
msgstr "rebase đang được thực hiện: lên trên "
-#: wt-status.c:1473
+#: wt-status.c:1477
msgid "HEAD detached at "
msgstr "HEAD được tách rá»i tại "
-#: wt-status.c:1475
+#: wt-status.c:1479
msgid "HEAD detached from "
msgstr "HEAD được tách rá»i từ "
-#: wt-status.c:1478
+#: wt-status.c:1482
msgid "Not currently on any branch."
msgstr "Hiện tại chẳng ở nhánh nào cả."
-#: wt-status.c:1496
+#: wt-status.c:1500
msgid "Initial commit"
msgstr "Lần chuyển giao khởi tạo"
-#: wt-status.c:1510
+#: wt-status.c:1514
msgid "Untracked files"
msgstr "Những tập tin chưa được theo dõi"
-#: wt-status.c:1512
+#: wt-status.c:1516
msgid "Ignored files"
msgstr "Những tập tin bị lỠđi"
-#: wt-status.c:1516
+#: wt-status.c:1520
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2526,32 +2900,32 @@ msgstr ""
"có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n"
"tá»± thêm các tập tin má»›i (xem “git help statusâ€.."
-#: wt-status.c:1522
+#: wt-status.c:1526
#, c-format
msgid "Untracked files not listed%s"
msgstr "Những tập tin chưa được theo dõi không được liệt kê ra %s"
-#: wt-status.c:1524
+#: wt-status.c:1528
msgid " (use -u option to show untracked files)"
msgstr " (dùng tùy chá»n -u để hiển thị các tập tin chÆ°a được theo dõi)"
-#: wt-status.c:1530
+#: wt-status.c:1534
msgid "No changes"
msgstr "Không có thay đổi nào"
-#: wt-status.c:1535
+#: wt-status.c:1539
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"không có thay đổi nào được thêm vào để chuyển giao (dùng \"git add\" và/hoặc "
"\"git commit -a\")\n"
-#: wt-status.c:1538
+#: wt-status.c:1542
#, c-format
msgid "no changes added to commit\n"
msgstr "không có thay đổi nào được thêm vào để chuyển giao\n"
-#: wt-status.c:1541
+#: wt-status.c:1545
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -2560,53 +2934,53 @@ msgstr ""
"không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
"theo dõi hiện diện (dùng \"git add\" để đưa vào theo dõi)\n"
-#: wt-status.c:1544
+#: wt-status.c:1548
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
"theo dõi hiện diện\n"
-#: wt-status.c:1547
+#: wt-status.c:1551
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"không có gì để chuyển giao (tạo/sao-chép các tập tin và dùng \"git add\" để "
"đưa vào theo dõi)\n"
-#: wt-status.c:1550 wt-status.c:1555
+#: wt-status.c:1554 wt-status.c:1559
#, c-format
msgid "nothing to commit\n"
msgstr "không có gì để chuyển giao\n"
-#: wt-status.c:1553
+#: wt-status.c:1557
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"không có gì để chuyển giao (dùng -u xem các tập tin chưa được theo dõi)\n"
-#: wt-status.c:1557
+#: wt-status.c:1561
#, c-format
-msgid "nothing to commit, working directory clean\n"
+msgid "nothing to commit, working tree clean\n"
msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n"
-#: wt-status.c:1664
+#: wt-status.c:1668
msgid "Initial commit on "
msgstr "Lần chuyển giao khởi tạo trên "
-#: wt-status.c:1668
+#: wt-status.c:1672
msgid "HEAD (no branch)"
msgstr "HEAD (không nhánh)"
-#: wt-status.c:1697
+#: wt-status.c:1701
msgid "gone"
msgstr "đã ra đi"
-#: wt-status.c:1699 wt-status.c:1707
+#: wt-status.c:1703 wt-status.c:1711
msgid "behind "
msgstr "đằng sau "
-#: wt-status.c:1702 wt-status.c:1705
+#: wt-status.c:1706 wt-status.c:1709
msgid "ahead "
msgstr "phía trước "
@@ -2624,260 +2998,274 @@ msgstr "git add [<các-tùy-chá»n>] [--] <pathspec>…"
msgid "unexpected diff status %c"
msgstr "trạng thái lệnh diff không như mong đợi %c"
-#: builtin/add.c:70 builtin/commit.c:280
+#: builtin/add.c:71 builtin/commit.c:281
msgid "updating files failed"
msgstr "Cập nhật tập tin gặp lỗi"
-#: builtin/add.c:80
+#: builtin/add.c:81
#, c-format
msgid "remove '%s'\n"
msgstr "gỡ bỠ“%sâ€\n"
-#: builtin/add.c:134
+#: builtin/add.c:136
msgid "Unstaged changes after refreshing the index:"
msgstr ""
"ÄÆ°a ra khá»i bệ phóng các thay đổi sau khi làm tÆ°Æ¡i má»›i lại bảng mục lục:"
-#: builtin/add.c:194 builtin/rev-parse.c:811
+#: builtin/add.c:196 builtin/rev-parse.c:811
msgid "Could not read the index"
msgstr "Không thể Ä‘á»c bảng mục lục"
-#: builtin/add.c:205
+#: builtin/add.c:207
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Không thể mở “%s†để ghi."
-#: builtin/add.c:209
+#: builtin/add.c:211
msgid "Could not write patch"
msgstr "Không thể ghi ra miếng vá"
-#: builtin/add.c:212
+#: builtin/add.c:214
msgid "editing patch failed"
msgstr "gặp lỗi khi sửa miếng vá"
-#: builtin/add.c:215
+#: builtin/add.c:217
#, c-format
msgid "Could not stat '%s'"
msgstr "không thể lấy thông tin thống kê vỠ“%sâ€"
-#: builtin/add.c:217
+#: builtin/add.c:219
msgid "Empty patch. Aborted."
msgstr "Miếng vá trống rỗng. Nên bỠqua."
-#: builtin/add.c:222
+#: builtin/add.c:224
#, c-format
msgid "Could not apply '%s'"
msgstr "Không thể áp dụng miếng vá “%sâ€"
-#: builtin/add.c:232
+#: builtin/add.c:234
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Các Ä‘Æ°á»ng dẫn theo sau đây sẽ bị lá» Ä‘i bởi má»™t trong các tập tin .gitignore "
"của bạn:\n"
-#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
-#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
+#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "chạy thử"
-#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
-#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
-#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
+#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
+#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
msgid "be verbose"
msgstr "chi tiết"
-#: builtin/add.c:252
+#: builtin/add.c:256
msgid "interactive picking"
msgstr "sửa bằng cách tương tác"
-#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
+#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "chá»n “hunks†theo kiểu tÆ°Æ¡ng tác"
-#: builtin/add.c:254
+#: builtin/add.c:258
msgid "edit current diff and apply"
msgstr "sửa diff hiện nay và áp dụng nó"
-#: builtin/add.c:255
+#: builtin/add.c:259
msgid "allow adding otherwise ignored files"
msgstr "cho phép thêm các tập tin bị bỠqua khác"
-#: builtin/add.c:256
+#: builtin/add.c:260
msgid "update tracked files"
msgstr "cập nhật các tập tin được theo dõi"
-#: builtin/add.c:257
+#: builtin/add.c:261
msgid "record only the fact that the path will be added later"
msgstr "chỉ ghi lại sá»± việc mà Ä‘Æ°á»ng dẫn sẽ được thêm vào sau"
-#: builtin/add.c:258
+#: builtin/add.c:262
msgid "add changes from all tracked and untracked files"
msgstr ""
"thêm các thay đổi từ tất cả các tập tin có cũng như không được theo dõi dấu "
"vết"
-#: builtin/add.c:261
+#: builtin/add.c:265
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"lá» Ä‘i các Ä‘Æ°á»ng dẫn bị gỡ bá» trong cây thÆ° mục làm việc (giống vá»›i --no-all)"
-#: builtin/add.c:263
+#: builtin/add.c:267
msgid "don't add, only refresh the index"
msgstr "không thêm, chỉ làm tươi mới bảng mục lục"
-#: builtin/add.c:264
+#: builtin/add.c:268
msgid "just skip files which cannot be added because of errors"
msgstr "chie bỠqua những tập tin mà nó không thể được thêm vào bởi vì gặp lỗi"
-#: builtin/add.c:265
+#: builtin/add.c:269
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"kiểm tra xem - thậm chí thiếu - tập tin bị bỠqua trong quá trình chạy thử"
-#: builtin/add.c:287
+#: builtin/add.c:270 builtin/update-index.c:958
+msgid "(+/-)x"
+msgstr "(+/-)x"
+
+#: builtin/add.c:270 builtin/update-index.c:959
+msgid "override the executable bit of the listed files"
+msgstr "ghi đè lên bít thi hành của các tập tin được liệt kê"
+
+#: builtin/add.c:292
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Sá»­ dụng tùy chá»n -f nếu bạn thá»±c sá»± muốn thêm chúng vào.\n"
-#: builtin/add.c:294
+#: builtin/add.c:300
msgid "adding files failed"
msgstr "thêm tập tin gặp lỗi"
-#: builtin/add.c:330
+#: builtin/add.c:336
msgid "-A and -u are mutually incompatible"
msgstr "-A và -u xung khắc nhau"
-#: builtin/add.c:337
+#: builtin/add.c:343
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Tùy chá»n --ignore-missing chỉ có thể được dùng cùng vá»›i --dry-run"
#: builtin/add.c:352
#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "--chmod tham số “%s†phải hoặc là -x hay +x"
+
+#: builtin/add.c:367
+#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Không có gì được chỉ ra, không có gì được thêm vào.\n"
-#: builtin/add.c:353
+#: builtin/add.c:368
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Có lẽ ý bạn là “git add .†phải không?\n"
-#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
+#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
#: builtin/submodule--helper.c:240
msgid "index file corrupt"
msgstr "tập tin ghi bảng mục lục bị há»ng"
-#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
+#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
msgid "Unable to write new index file"
msgstr "Không thể ghi tập tin lưu bảng mục lục mới"
-#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
+#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
#, c-format
msgid "could not read '%s'"
msgstr "Không thể Ä‘á»c “%sâ€."
-#: builtin/am.c:430
+#: builtin/am.c:426
msgid "could not parse author script"
msgstr "không thể phân tích cú pháp văn lệnh tác giả"
-#: builtin/am.c:507
+#: builtin/am.c:503
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "“%s†bị xóa bởi móc applypatch-msg"
-#: builtin/am.c:548 builtin/notes.c:300
+#: builtin/am.c:544 builtin/notes.c:301
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Dòng đầu vào dị hình: “%sâ€."
-#: builtin/am.c:585 builtin/notes.c:315
+#: builtin/am.c:581 builtin/notes.c:316
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Gặp lá»—i khi sao chép ghi chú (note) từ “%s†tá»›i “%sâ€"
-#: builtin/am.c:611
+#: builtin/am.c:607
msgid "fseek failed"
msgstr "fseek gặp lỗi"
-#: builtin/am.c:788
+#: builtin/am.c:787
#, c-format
msgid "could not parse patch '%s'"
msgstr "không thể phân tích cú pháp “%sâ€"
-#: builtin/am.c:853
+#: builtin/am.c:852
msgid "Only one StGIT patch series can be applied at once"
msgstr "Chỉ có một sê-ri miếng vá StGIT được áp dụng một lúc"
-#: builtin/am.c:900
+#: builtin/am.c:899
msgid "invalid timestamp"
msgstr "dấu thá»i gian không hợp lệ"
-#: builtin/am.c:903 builtin/am.c:911
+#: builtin/am.c:902 builtin/am.c:910
msgid "invalid Date line"
msgstr "dòng Ngày tháng không hợp lệ"
-#: builtin/am.c:908
+#: builtin/am.c:907
msgid "invalid timezone offset"
msgstr "độ lệch múi giỠkhông hợp lệ"
-#: builtin/am.c:995
+#: builtin/am.c:996
msgid "Patch format detection failed."
msgstr "Dò tìm định dạng miếng vá gặp lỗi."
-#: builtin/am.c:1000 builtin/clone.c:380
+#: builtin/am.c:1001 builtin/clone.c:380
#, c-format
msgid "failed to create directory '%s'"
msgstr "tạo thư mục \"%s\" gặp lỗi"
-#: builtin/am.c:1004
+#: builtin/am.c:1005
msgid "Failed to split patches."
msgstr "Gặp lỗi khi chia nhỠcác miếng vá."
-#: builtin/am.c:1136 builtin/commit.c:365
+#: builtin/am.c:1137 builtin/commit.c:366
msgid "unable to write index file"
msgstr "không thể ghi tập tin lưu mục lục"
-#: builtin/am.c:1187
+#: builtin/am.c:1188
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Khi bạn đã phân giải xong trục trặc này, hãy chạy \"%s --continue\"."
-#: builtin/am.c:1188
+#: builtin/am.c:1189
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
"Nếu bạn muốn bỠqua miếng vá này, hãy chạy lệnh \"%s --skip\" để thay thế."
-#: builtin/am.c:1189
+#: builtin/am.c:1190
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "Äể phục hồi lại nhánh gốc và dừng vá, hãy chạy \"%s --abort\"."
-#: builtin/am.c:1327
+#: builtin/am.c:1328
msgid "Patch is empty. Was it split wrong?"
msgstr "Miếng vá trống rỗng. Quá trình chia nhỠmiếng vá có lỗi?"
-#: builtin/am.c:1401 builtin/log.c:1516
+#: builtin/am.c:1402 builtin/log.c:1543
#, c-format
msgid "invalid ident line: %s"
msgstr "dòng thụt lỠkhông hợp lệ: %s"
-#: builtin/am.c:1428
+#: builtin/am.c:1429
#, c-format
msgid "unable to parse commit %s"
msgstr "không thể phân tích lần chuyển giao “%sâ€"
-#: builtin/am.c:1630
+#: builtin/am.c:1602
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "Kho thiếu đối tượng blob cần thiết để trở vá» trên “3-way mergeâ€."
-#: builtin/am.c:1632
+#: builtin/am.c:1604
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Sử dụng thông tin trong bảng mục lục để cấu trúc lại một cây (tree) cơ sở…"
-#: builtin/am.c:1651
+#: builtin/am.c:1623
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2885,38 +3273,38 @@ msgstr ""
"Bạn đã sửa miếng vá của mình bằng cách thủ công à?\n"
"Nó không thể áp dụng các blob đã được ghi lại trong bảng mục lục của nó."
-#: builtin/am.c:1657
+#: builtin/am.c:1629
msgid "Falling back to patching base and 3-way merge..."
msgstr "Äang trở lại để vá cÆ¡ sở và “hòa trá»™n 3-Ä‘Æ°á»ngâ€â€¦"
-#: builtin/am.c:1672
+#: builtin/am.c:1654
msgid "Failed to merge in the changes."
msgstr "Gặp lỗi khi trộn vào các thay đổi."
-#: builtin/am.c:1696 builtin/merge.c:636
+#: builtin/am.c:1679 builtin/merge.c:628
msgid "git write-tree failed to write a tree"
msgstr "lệnh git write-tree gặp lỗi khi ghi một cây"
-#: builtin/am.c:1703
+#: builtin/am.c:1686
msgid "applying to an empty history"
msgstr "áp dụng vào một lịch sử trống rỗng"
-#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
-#: builtin/merge.c:866
+#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
+#: builtin/merge.c:823
msgid "failed to write commit object"
msgstr "gặp lỗi khi ghi đối tượng chuyển giao"
-#: builtin/am.c:1748 builtin/am.c:1752
+#: builtin/am.c:1731 builtin/am.c:1735
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "không thể phục hồi: %s không tồn tại."
-#: builtin/am.c:1768
+#: builtin/am.c:1751
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"không thể được tương tác mà không có stdin kết nối với một thiết bị cuối"
-#: builtin/am.c:1773
+#: builtin/am.c:1756
msgid "Commit Body is:"
msgstr "Thân của lần chuyển giao là:"
@@ -2924,37 +3312,37 @@ msgstr "Thân của lần chuyển giao là:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1783
+#: builtin/am.c:1766
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Ãp dụng? đồng ý [y]/khô[n]g/chỉnh sá»­a [e]/hiển thị miếng [v]á/chấp nhận tất "
"cả [a]: "
-#: builtin/am.c:1833
+#: builtin/am.c:1816
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Bảng mục lục bẩn: không thể áp dụng các miếng vá (bẩn: %s)"
-#: builtin/am.c:1868 builtin/am.c:1940
+#: builtin/am.c:1853 builtin/am.c:1925
#, c-format
msgid "Applying: %.*s"
msgstr "Ãp dụng: %.*s"
-#: builtin/am.c:1884
+#: builtin/am.c:1869
msgid "No changes -- Patch already applied."
msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi."
-#: builtin/am.c:1892
+#: builtin/am.c:1877
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Gặp lỗi khi vá tại %s %.*s"
-#: builtin/am.c:1898
+#: builtin/am.c:1883
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "Bản sao chép của miếng vá mà nó gặp lỗi thì được tìm thấy trong: %s"
-#: builtin/am.c:1943
+#: builtin/am.c:1928
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2965,7 +3353,7 @@ msgstr ""
"đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn bỠqua miếng "
"vá này."
-#: builtin/am.c:1950
+#: builtin/am.c:1935
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2973,17 +3361,17 @@ msgstr ""
"Bạn vẫn có những Ä‘Æ°á»ng dẫn chÆ°a được hòa trá»™n trong bảng mục lục của mình.\n"
"Bạn đã quên sử dụng lệnh “git add†à?"
-#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
+#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "không thể phân tích đối tượng “%sâ€."
-#: builtin/am.c:2110
+#: builtin/am.c:2095
msgid "failed to clean index"
msgstr "gặp lá»—i khi dá»n bảng mục lục"
-#: builtin/am.c:2144
+#: builtin/am.c:2129
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -2991,155 +3379,155 @@ msgstr ""
"Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần “am†thất bại cuối cùng.\n"
"Không thể chuyển tới ORIG_HEAD"
-#: builtin/am.c:2205
+#: builtin/am.c:2192
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Giá trị không hợp lệ cho --patch-format: %s"
-#: builtin/am.c:2238
+#: builtin/am.c:2225
msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr "git am [<các-tùy-chá»n>] [(<mbox>|<Maildir>)…]"
-#: builtin/am.c:2239
+#: builtin/am.c:2226
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<các-tùy-chá»n>] (--continue | --skip | --abort)"
-#: builtin/am.c:2245
+#: builtin/am.c:2232
msgid "run interactively"
msgstr "chạy kiểu tương tác"
-#: builtin/am.c:2247
+#: builtin/am.c:2234
msgid "historical option -- no-op"
msgstr "tùy chá»n lịch sá»­ -- không-toán-tá»­"
-#: builtin/am.c:2249
+#: builtin/am.c:2236
msgid "allow fall back on 3way merging if needed"
msgstr "cho phép quay trở lại để hòa trộn kiểu “3way†nếu cần"
-#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
-#: builtin/repack.c:171
+#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
+#: builtin/repack.c:172
msgid "be quiet"
msgstr "im lặng"
-#: builtin/am.c:2252
+#: builtin/am.c:2239
msgid "add a Signed-off-by line to the commit message"
msgstr "Thêm dòng Signed-off-by cho ghi chú của lần chuyển giao"
-#: builtin/am.c:2255
+#: builtin/am.c:2242
msgid "recode into utf8 (default)"
msgstr "chuyển mã thành utf8 (mặc định)"
-#: builtin/am.c:2257
+#: builtin/am.c:2244
msgid "pass -k flag to git-mailinfo"
msgstr "chuyển cỠ-k cho git-mailinfo"
-#: builtin/am.c:2259
+#: builtin/am.c:2246
msgid "pass -b flag to git-mailinfo"
msgstr "chuyển cỠ-b cho git-mailinfo"
-#: builtin/am.c:2261
+#: builtin/am.c:2248
msgid "pass -m flag to git-mailinfo"
msgstr "chuyển cỠ-m cho git-mailinfo"
-#: builtin/am.c:2263
+#: builtin/am.c:2250
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "chuyển cỠ--keep-cr cho git-mailsplit với định dạng mbox"
-#: builtin/am.c:2266
+#: builtin/am.c:2253
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"đừng chuyển cỠ--keep-cr cho git-mailsplit không phụ thuộc vào am.keepcr"
-#: builtin/am.c:2269
+#: builtin/am.c:2256
msgid "strip everything before a scissors line"
msgstr "cắt má»i thứ trÆ°á»›c dòng scissors"
-#: builtin/am.c:2270 builtin/apply.c:4546
+#: builtin/am.c:2257 builtin/apply.c:4837
msgid "action"
msgstr "hành động"
-#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
-#: builtin/am.c:2298
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
+#: builtin/am.c:2285
msgid "pass it through git-apply"
msgstr "chuyển nó qua git-apply"
-#: builtin/am.c:2279 builtin/apply.c:4570
+#: builtin/am.c:2266 builtin/apply.c:4861
msgid "root"
msgstr "gốc"
-#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
-#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
+#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
-#: builtin/submodule--helper.c:770
+#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:826
msgid "path"
msgstr "Ä‘Æ°á»ng-dẫn"
-#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193
-#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 builtin/pull.c:193
+#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:645
#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2291 builtin/apply.c:4514
+#: builtin/am.c:2278 builtin/apply.c:4805
msgid "num"
msgstr "số"
-#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "định dạng"
-#: builtin/am.c:2295
+#: builtin/am.c:2282
msgid "format the patch(es) are in"
msgstr "định dạng (các) miếng vá theo"
-#: builtin/am.c:2301
+#: builtin/am.c:2288
msgid "override error message when patch failure occurs"
msgstr "đè lên các lá»i nhắn lá»—i khi xảy ra lá»—i vá nghiêm trá»ng"
-#: builtin/am.c:2303
+#: builtin/am.c:2290
msgid "continue applying patches after resolving a conflict"
msgstr "tiếp tục áp dụng các miếng vá sau khi giải quyết xung đột"
-#: builtin/am.c:2306
+#: builtin/am.c:2293
msgid "synonyms for --continue"
msgstr "đồng nghĩa với --continue"
-#: builtin/am.c:2309
+#: builtin/am.c:2296
msgid "skip the current patch"
msgstr "bỠqua miếng vá hiện hành"
-#: builtin/am.c:2312
+#: builtin/am.c:2299
msgid "restore the original branch and abort the patching operation."
msgstr "phục hồi lại nhánh gốc và loại bỠthao tác vá."
-#: builtin/am.c:2316
+#: builtin/am.c:2303
msgid "lie about committer date"
msgstr "nói dối vỠngày chuyển giao"
-#: builtin/am.c:2318
+#: builtin/am.c:2305
msgid "use current timestamp for author date"
msgstr "dùng dấu thá»i gian hiện tại cho ngày tác giả"
-#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "mã-số-khóa"
-#: builtin/am.c:2321
+#: builtin/am.c:2308
msgid "GPG-sign commits"
msgstr "lần chuyển giao ký-GPG"
-#: builtin/am.c:2324
+#: builtin/am.c:2311
msgid "(internal use for git-rebase)"
msgstr "(dùng nội bộ cho git-rebase)"
-#: builtin/am.c:2339
+#: builtin/am.c:2326
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -3147,16 +3535,16 @@ msgstr ""
"Tùy chá»n -b/--binary đã không dùng từ lâu rồi, và\n"
"nó sẽ được bỠđi. Xin đừng sử dụng nó thêm nữa."
-#: builtin/am.c:2346
+#: builtin/am.c:2333
msgid "failed to read the index"
msgstr "gặp lá»—i Ä‘á»c bảng mục lục"
-#: builtin/am.c:2361
+#: builtin/am.c:2348
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "thư mục rebase trước %s không sẵn có nhưng mbox lại đưa ra."
-#: builtin/am.c:2385
+#: builtin/am.c:2372
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -3165,73 +3553,73 @@ msgstr ""
"Tìm thấy thư mục lạc %s.\n"
"Dùng \"git am --abort\" để loại bỠnó đi."
-#: builtin/am.c:2391
+#: builtin/am.c:2378
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Thao tác phân giải không được tiến hành, chúng ta không phục hồi lại."
-#: builtin/apply.c:59
+#: builtin/apply.c:122
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<các-tùy-chá»n>] [<miếng-vá>…]"
-#: builtin/apply.c:111
+#: builtin/apply.c:153
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "không nhận ra tùy chá»n vá» khoảng trắng “%sâ€"
-#: builtin/apply.c:126
+#: builtin/apply.c:169
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "không nhận ra tùy chá»n bá» qua khoảng trắng “%sâ€"
-#: builtin/apply.c:818
+#: builtin/apply.c:854
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
"Không thể chuẩn bị biểu thức chính qui dấu vết thá»i gian (timestamp regexp) "
"%s"
-#: builtin/apply.c:827
+#: builtin/apply.c:863
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "thi hành biểu thức chính quy trả vỠ%d cho đầu vào: %s"
-#: builtin/apply.c:908
+#: builtin/apply.c:947
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "không thể tìm thấy tên tập tin trong miếng vá tại dòng %d"
-#: builtin/apply.c:937
+#: builtin/apply.c:984
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: git-diff sai - cần /dev/null, nhưng lại nhận được %s trên dòng %d"
-#: builtin/apply.c:942
+#: builtin/apply.c:989
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: git-diff sai - tên tập tin mới không nhất quán trên dòng %d"
-#: builtin/apply.c:943
+#: builtin/apply.c:990
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: git-diff sai - tên tập tin cũ không nhất quán trên dòng %d"
-#: builtin/apply.c:949
+#: builtin/apply.c:995
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff sai - cần “/dev/null†trên dòng %d"
-#: builtin/apply.c:1406
+#: builtin/apply.c:1489
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "chi tiết: dòng không cần: %.*s"
-#: builtin/apply.c:1463
+#: builtin/apply.c:1550
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s"
-#: builtin/apply.c:1480
+#: builtin/apply.c:1567
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -3243,76 +3631,76 @@ msgstr[0] ""
"phần đầu diff cho git thiếu thông tin tên tập tin khi gỡ bỠđi %d trong "
"thành phần dẫn đầu tên của Ä‘Æ°á»ng dẫn (dòng %d)"
-#: builtin/apply.c:1646
+#: builtin/apply.c:1743
msgid "new file depends on old contents"
msgstr "tập tin mới phụ thuộc vào nội dung cũ"
-#: builtin/apply.c:1648
+#: builtin/apply.c:1745
msgid "deleted file still has contents"
msgstr "tập tin đã xóa vẫn còn nội dung"
-#: builtin/apply.c:1674
+#: builtin/apply.c:1774
#, c-format
msgid "corrupt patch at line %d"
msgstr "miếng vá há»ng tại dòng %d"
-#: builtin/apply.c:1710
+#: builtin/apply.c:1810
#, c-format
msgid "new file %s depends on old contents"
msgstr "tập tin mới %s phụ thuộc vào nội dung cũ"
-#: builtin/apply.c:1712
+#: builtin/apply.c:1812
#, c-format
msgid "deleted file %s still has contents"
msgstr "tập tin đã xóa %s vẫn còn nội dung"
-#: builtin/apply.c:1715
+#: builtin/apply.c:1815
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa"
-#: builtin/apply.c:1861
+#: builtin/apply.c:1962
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "miếng vá định dạng nhị phân sai há»ng tại dòng %d: %.*s"
-#: builtin/apply.c:1895
+#: builtin/apply.c:1999
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "miếng vá định dạng nhị phân không được nhận ra tại dòng %d"
-#: builtin/apply.c:2048
+#: builtin/apply.c:2154
#, c-format
msgid "patch with only garbage at line %d"
msgstr "vá chỉ với “rác†tại dòng %d"
-#: builtin/apply.c:2138
+#: builtin/apply.c:2244
#, c-format
msgid "unable to read symlink %s"
msgstr "không thể Ä‘á»c liên kết má»m %s"
-#: builtin/apply.c:2142
+#: builtin/apply.c:2248
#, c-format
msgid "unable to open or read %s"
msgstr "không thể mở hay Ä‘á»c %s"
-#: builtin/apply.c:2775
+#: builtin/apply.c:2901
#, c-format
msgid "invalid start of line: '%c'"
msgstr "sai khởi đầu dòng: “%câ€"
-#: builtin/apply.c:2894
+#: builtin/apply.c:3020
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)."
-#: builtin/apply.c:2906
+#: builtin/apply.c:3032
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Nội dung bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d"
-#: builtin/apply.c:2912
+#: builtin/apply.c:3038
#, c-format
msgid ""
"while searching for:\n"
@@ -3321,339 +3709,334 @@ msgstr ""
"trong khi đang tìm kiếm cho:\n"
"%.*s"
-#: builtin/apply.c:2932
+#: builtin/apply.c:3060
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho “%sâ€"
-#: builtin/apply.c:3033
+#: builtin/apply.c:3163
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "miếng vá định dạng nhị phân không được áp dụng cho “%sâ€"
-#: builtin/apply.c:3039
+#: builtin/apply.c:3169
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"vá nhị phân cho “%s†tạo ra kết quả không chính xác (mong chỠ%s, lại nhận "
"%s)"
-#: builtin/apply.c:3060
+#: builtin/apply.c:3190
#, c-format
msgid "patch failed: %s:%ld"
msgstr "gặp lỗi khi vá: %s:%ld"
-#: builtin/apply.c:3184
+#: builtin/apply.c:3314
#, c-format
msgid "cannot checkout %s"
msgstr "không thể lấy ra %s"
-#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
-#, c-format
-msgid "read of %s failed"
-msgstr "Ä‘á»c %s gặp lá»—i"
-
-#: builtin/apply.c:3237
+#: builtin/apply.c:3370
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "Ä‘á»c từ “%s†vượt ra ngoài liên kết má»m"
-#: builtin/apply.c:3265 builtin/apply.c:3487
+#: builtin/apply.c:3399 builtin/apply.c:3630
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "Ä‘Æ°á»ng dẫn %s đã bị xóa hoặc đổi tên"
-#: builtin/apply.c:3346 builtin/apply.c:3501
+#: builtin/apply.c:3482 builtin/apply.c:3644
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: không tồn tại trong bảng mục lục"
-#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
+#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3355 builtin/apply.c:3509
+#: builtin/apply.c:3491 builtin/apply.c:3652
#, c-format
msgid "%s: does not match index"
msgstr "%s: không khớp trong mục lục"
-#: builtin/apply.c:3457
+#: builtin/apply.c:3597
msgid "removal patch leaves file contents"
msgstr "loại bỠmiếng vá để lại nội dung tập tin"
-#: builtin/apply.c:3526
+#: builtin/apply.c:3669
#, c-format
msgid "%s: wrong type"
msgstr "%s: sai kiểu"
-#: builtin/apply.c:3528
+#: builtin/apply.c:3671
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s có kiểu %o, cần %o"
-#: builtin/apply.c:3687 builtin/apply.c:3689
+#: builtin/apply.c:3822 builtin/apply.c:3824
#, c-format
msgid "invalid path '%s'"
msgstr "Ä‘Æ°á»ng dẫn không hợp lệ “%sâ€"
-#: builtin/apply.c:3744
+#: builtin/apply.c:3879
#, c-format
msgid "%s: already exists in index"
msgstr "%s: đã có từ trước trong bảng mục lục"
-#: builtin/apply.c:3747
+#: builtin/apply.c:3882
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: đã sẵn có trong thư mục đang làm việc"
-#: builtin/apply.c:3767
+#: builtin/apply.c:3902
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o)"
-#: builtin/apply.c:3772
+#: builtin/apply.c:3907
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o) của %s"
-#: builtin/apply.c:3792
+#: builtin/apply.c:3927
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "tập tin chịu tác Ä‘á»™ng “%s†vượt ra ngoài liên kết má»m"
-#: builtin/apply.c:3796
+#: builtin/apply.c:3931
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: miếng vá không được áp dụng"
-#: builtin/apply.c:3810
+#: builtin/apply.c:3945
#, c-format
msgid "Checking patch %s..."
msgstr "Äang kiểm tra miếng vá %s…"
-#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry gặp lá»—i đối vá»›i Ä‘Æ°á»ng dẫn “%sâ€"
-#: builtin/apply.c:4046
+#: builtin/apply.c:4182
#, c-format
msgid "unable to remove %s from index"
msgstr "không thể gỡ bỠ%s từ mục lục"
-#: builtin/apply.c:4075
+#: builtin/apply.c:4215
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "miếng vá sai há»ng cho mô-Ä‘un-con %s"
-#: builtin/apply.c:4079
+#: builtin/apply.c:4219
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "không thể lấy thống kỠvỠtập tin %s mới hơn đã được tạo"
-#: builtin/apply.c:4084
+#: builtin/apply.c:4224
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "không thể tạo “kho lưu đằng sau†cho tập tin được tạo mới hơn %s"
-#: builtin/apply.c:4087 builtin/apply.c:4195
+#: builtin/apply.c:4227 builtin/apply.c:4340
#, c-format
msgid "unable to add cache entry for %s"
msgstr "không thể thêm mục nhớ đệm cho %s"
-#: builtin/apply.c:4120
+#: builtin/apply.c:4260
#, c-format
msgid "closing file '%s'"
msgstr "Ä‘ang đóng tập tin “%sâ€"
-#: builtin/apply.c:4169
+#: builtin/apply.c:4313
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "không thể ghi vào tập tin “%s†chế độ %o"
-#: builtin/apply.c:4256
+#: builtin/apply.c:4403
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Äã áp dụng miếng vá %s má»™t cách sạch sẽ."
-#: builtin/apply.c:4264
+#: builtin/apply.c:4411
msgid "internal error"
msgstr "lá»—i ná»™i bá»™"
-#: builtin/apply.c:4267
+#: builtin/apply.c:4414
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Äang áp dụng miếng vá %%s vá»›i %d lần từ chối…"
-#: builtin/apply.c:4277
+#: builtin/apply.c:4424
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "đang cắt ngắn tên tập tin .rej thành %.*s.rej"
-#: builtin/apply.c:4285
+#: builtin/apply.c:4432
#, c-format
msgid "cannot open %s: %s"
msgstr "không thể mở %s: %s"
-#: builtin/apply.c:4298
+#: builtin/apply.c:4445
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Khối nhá»› #%d được áp dụng gá»n gàng."
-#: builtin/apply.c:4301
+#: builtin/apply.c:4448
#, c-format
msgid "Rejected hunk #%d."
msgstr "đoạn dữ liệu #%d bị từ chối."
-#: builtin/apply.c:4387
+#: builtin/apply.c:4537
#, c-format
msgid "Skipped patch '%s'."
msgstr "bá» qua Ä‘Æ°á»ng dẫn “%sâ€."
-#: builtin/apply.c:4395
+#: builtin/apply.c:4545
msgid "unrecognized input"
msgstr "không thừa nhận đầu vào"
-#: builtin/apply.c:4406
+#: builtin/apply.c:4556
msgid "unable to read index file"
msgstr "không thể Ä‘á»c tập tin lÆ°u bảng mục lục"
-#: builtin/apply.c:4509
+#: builtin/apply.c:4701
+msgid "--3way outside a repository"
+msgstr "--3way ở ngoài một kho chứa"
+
+#: builtin/apply.c:4709
+msgid "--index outside a repository"
+msgstr "--index ở ngoài một kho chứa"
+
+#: builtin/apply.c:4712
+msgid "--cached outside a repository"
+msgstr "--cached ở ngoài một kho chứa"
+
+#: builtin/apply.c:4745
+#, c-format
+msgid "can't open patch '%s'"
+msgstr "không thể mở miếng vá “%sâ€"
+
+#: builtin/apply.c:4760
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "đã chấm dứt %d lỗi khoảng trắng"
+
+#: builtin/apply.c:4766 builtin/apply.c:4776
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d dòng thêm khoảng trắng lỗi."
+
+#: builtin/apply.c:4800
msgid "don't apply changes matching the given path"
msgstr "không áp dụng các thay đổi khá»›p vá»›i Ä‘Æ°á»ng dẫn đã cho"
-#: builtin/apply.c:4512
+#: builtin/apply.c:4803
msgid "apply changes matching the given path"
msgstr "áp dụng các thay đổi khá»›p vá»›i Ä‘Æ°á»ng dẫn đã cho"
-#: builtin/apply.c:4515
+#: builtin/apply.c:4806
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "gỡ bá» <số> dấu gạch chéo dẫn đầu từ Ä‘Æ°á»ng dẫn diff cổ Ä‘iển"
-#: builtin/apply.c:4518
+#: builtin/apply.c:4809
msgid "ignore additions made by the patch"
msgstr "lỠđi phần bổ xung được tạo ra bởi miếng vá"
-#: builtin/apply.c:4520
+#: builtin/apply.c:4811
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra"
-#: builtin/apply.c:4524
+#: builtin/apply.c:4815
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4817
msgid "instead of applying the patch, output a summary for the input"
msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào"
-#: builtin/apply.c:4528
+#: builtin/apply.c:4819
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không"
-#: builtin/apply.c:4530
+#: builtin/apply.c:4821
msgid "make sure the patch is applicable to the current index"
msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4823
msgid "apply a patch without touching the working tree"
msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc"
-#: builtin/apply.c:4534
+#: builtin/apply.c:4825
msgid "accept a patch that touches outside the working area"
msgstr "chấp nhận một miếng vá mà không động chạm đến cây làm việc"
-#: builtin/apply.c:4536
+#: builtin/apply.c:4827
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
"đồng thá»i áp dụng miếng vá (dùng vá»›i tùy chá»n --stat/--summary/--check)"
-#: builtin/apply.c:4538
+#: builtin/apply.c:4829
msgid "attempt three-way merge if a patch does not apply"
msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được"
-#: builtin/apply.c:4540
+#: builtin/apply.c:4831
msgid "build a temporary index based on embedded index information"
msgstr ""
"xây dá»±ng bảng mục lục tạm thá»i trên cÆ¡ sở thông tin bảng mục lục được nhúng"
-#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
msgid "paths are separated with NUL character"
msgstr "các Ä‘Æ°á»ng dẫn bị ngăn cách bởi ký tá»± NULL"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4836
msgid "ensure at least <n> lines of context match"
msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp"
-#: builtin/apply.c:4547
+#: builtin/apply.c:4838
msgid "detect new or modified lines that have whitespace errors"
msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng"
-#: builtin/apply.c:4550 builtin/apply.c:4553
+#: builtin/apply.c:4841 builtin/apply.c:4844
msgid "ignore changes in whitespace when finding context"
msgstr "lỠđi sự thay đổi do khoảng trắng gây ra khi quét nội dung"
-#: builtin/apply.c:4556
+#: builtin/apply.c:4847
msgid "apply the patch in reverse"
msgstr "áp dụng miếng vá theo chiá»u ngược"
-#: builtin/apply.c:4558
+#: builtin/apply.c:4849
msgid "don't expect at least one line of context"
msgstr "đừng hy vá»ng có ít nhất má»™t dòng ná»™i dung"
-#: builtin/apply.c:4560
+#: builtin/apply.c:4851
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng"
-#: builtin/apply.c:4562
+#: builtin/apply.c:4853
msgid "allow overlapping hunks"
msgstr "cho phép chồng khối nhớ"
-#: builtin/apply.c:4565
+#: builtin/apply.c:4856
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin"
-#: builtin/apply.c:4568
+#: builtin/apply.c:4859
msgid "do not trust the line counts in the hunk headers"
msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu"
-#: builtin/apply.c:4571
+#: builtin/apply.c:4862
msgid "prepend <root> to all filenames"
msgstr "treo thêm <root> vào tất cả các tên tập tin"
-#: builtin/apply.c:4593
-msgid "--3way outside a repository"
-msgstr "--3way ở ngoài một kho chứa"
-
-#: builtin/apply.c:4601
-msgid "--index outside a repository"
-msgstr "--index ở ngoài một kho chứa"
-
-#: builtin/apply.c:4604
-msgid "--cached outside a repository"
-msgstr "--cached ở ngoài một kho chứa"
-
-#: builtin/apply.c:4623
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "không thể mở miếng vá “%sâ€"
-
-#: builtin/apply.c:4637
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] "đã chấm dứt %d lỗi khoảng trắng"
-
-#: builtin/apply.c:4643 builtin/apply.c:4653
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] "%d dòng thêm khoảng trắng lỗi."
-
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
@@ -3710,105 +4093,105 @@ msgstr "git blame [<các-tùy-chá»n>] [<rev-opts>] [<rev>] [--] <tập-tin>"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opts> được mô tả trong tài liệu git-rev-list(1)"
-#: builtin/blame.c:1782
+#: builtin/blame.c:1781
msgid "Blaming lines"
msgstr "Các dòng blame"
-#: builtin/blame.c:2531
+#: builtin/blame.c:2536
msgid "Show blame entries as we find them, incrementally"
msgstr "Hiển thị các mục “blame†như là chúng ta thấy chúng, tăng dần"
-#: builtin/blame.c:2532
+#: builtin/blame.c:2537
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
"Hiển thị SHA-1 trắng cho những lần chuyển giao biên giới (Mặc định: off)"
-#: builtin/blame.c:2533
+#: builtin/blame.c:2538
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Không coi các lần chuyển giao gốc là giới hạn (Mặc định: off)"
-#: builtin/blame.c:2534
+#: builtin/blame.c:2539
msgid "Show work cost statistics"
msgstr "Hiển thị thống kê công sức làm việc"
-#: builtin/blame.c:2535
+#: builtin/blame.c:2540
msgid "Force progress reporting"
msgstr "Ép buộc báo cáo tiến triển công việc"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2541
msgid "Show output score for blame entries"
msgstr "Hiển thị kết xuất Ä‘iểm số có các mục tin “blameâ€"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2542
msgid "Show original filename (Default: auto)"
msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2543
msgid "Show original linenumber (Default: off)"
msgstr "Hiển thị số dòng gốc (Mặc định: off)"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2544
msgid "Show in a format designed for machine consumption"
msgstr "Hiển thị ở định dạng đã thiết kế cho sự tiêu dùng bằng máy"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2545
msgid "Show porcelain format with per-line commit information"
msgstr "Hiển thị định dạng “porcelain†với thông tin chuyển giao mỗi dòng"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2546
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Dùng cùng chế độ xuất ra với git-annotate (Mặc định: off)"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2547
msgid "Show raw timestamp (Default: off)"
msgstr "Hiển thị dấu vết thá»i gian dạng thô (Mặc định: off)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2548
msgid "Show long commit SHA1 (Default: off)"
msgstr "Hiển thị SHA1 của lần chuyển giao dạng dài (Mặc định: off)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2549
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Không hiển thị tên tác giả và dấu vết thá»i gian (Mặc định: off)"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2550
msgid "Show author email instead of name (Default: off)"
msgstr "Hiển thị thư điện tử của tác giả thay vì tên (Mặc định: off)"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2551
msgid "Ignore whitespace differences"
msgstr "BỠqua các khác biệt do khoảng trắng gây ra"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2552
msgid "Spend extra cycles to find better match"
msgstr "Tiêu thụ thêm năng tài nguyên máy móc để tìm kiếm tốt hơn nữa"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2553
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
"Sá»­ dụng Ä‘iểm xét duyệt (revision) từ <tập tin> thay vì gá»i “git-rev-listâ€"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2554
msgid "Use <file>'s contents as the final image"
msgstr "Sử dụng nội dung của <tập tin> như là ảnh cuối cùng"
-#: builtin/blame.c:2550 builtin/blame.c:2551
+#: builtin/blame.c:2555 builtin/blame.c:2556
msgid "score"
msgstr "điểm số"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2555
msgid "Find line copies within and across files"
msgstr "Tìm các bản sao chép dòng trong và ngang qua tập tin"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2556
msgid "Find line movements within and across files"
msgstr "Tìm các di chuyển dòng trong và ngang qua tập tin"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2557
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2557
msgid "Process only line range n,m, counting from 1"
msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1"
@@ -3818,7 +4201,7 @@ msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1"
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2641
+#: builtin/blame.c:2649
msgid "4 years, 11 months ago"
msgstr "4 năm, 11 tháng trước"
@@ -3921,118 +4304,125 @@ msgstr "Äã xóa nhánh theo dõi máy chủ \"%s\" (từng là %s).\n"
msgid "Deleted branch %s (was %s).\n"
msgstr "Nhánh “%s†đã bị xóa (từng là %s)\n"
-#: builtin/branch.c:309
+#: builtin/branch.c:312
#, c-format
msgid "[%s: gone]"
msgstr "[%s: đã ra đi]"
-#: builtin/branch.c:314
+#: builtin/branch.c:317
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:319
+#: builtin/branch.c:322
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: đứng sau %d]"
-#: builtin/branch.c:321
+#: builtin/branch.c:324
#, c-format
msgid "[behind %d]"
msgstr "[đằng sau %d]"
-#: builtin/branch.c:325
+#: builtin/branch.c:328
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: phía trước %d]"
-#: builtin/branch.c:327
+#: builtin/branch.c:330
#, c-format
msgid "[ahead %d]"
msgstr "[phía trước %d]"
-#: builtin/branch.c:330
+#: builtin/branch.c:333
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: trÆ°á»›c %d, sau %d]"
-#: builtin/branch.c:333
+#: builtin/branch.c:336
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[trÆ°á»›c %d, sau %d]"
-#: builtin/branch.c:346
+#: builtin/branch.c:349
msgid " **** invalid ref ****"
msgstr " **** tham chiếu không hợp lệ ****"
-#: builtin/branch.c:372
+#: builtin/branch.c:375
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(không nhánh, đang cải tổ %s)"
-#: builtin/branch.c:375
+#: builtin/branch.c:378
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(không nhánh, di chuyển nửa bước được bắt đầu tại %s)"
#. TRANSLATORS: make sure this matches
#. "HEAD detached at " in wt-status.c
-#: builtin/branch.c:381
+#: builtin/branch.c:384
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD được tách rá»i tại %s)"
#. TRANSLATORS: make sure this matches
#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:386
+#: builtin/branch.c:389
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD được tách rá»i từ %s)"
-#: builtin/branch.c:390
+#: builtin/branch.c:393
msgid "(no branch)"
msgstr "(không nhánh)"
-#: builtin/branch.c:541
+#: builtin/branch.c:544
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Nhánh %s đang được cải tổ lại tại %s"
-#: builtin/branch.c:545
+#: builtin/branch.c:548
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Nhánh %s đang được di chuyển phân đôi (bisect) tại %s"
-#: builtin/branch.c:560
+#: builtin/branch.c:563
msgid "cannot rename the current branch while not on any."
msgstr "không thể đổi tên nhánh hiện hành trong khi nó chẳng ở đâu cả."
-#: builtin/branch.c:570
+#: builtin/branch.c:573
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Tên nhánh không hợp lệ: “%sâ€"
-#: builtin/branch.c:587
+#: builtin/branch.c:590
msgid "Branch rename failed"
msgstr "Gặp lỗi khi đổi tên nhánh"
-#: builtin/branch.c:591
+#: builtin/branch.c:594
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Äã đổi tên nhánh khuyết danh “%s†đi"
-#: builtin/branch.c:594
+#: builtin/branch.c:597
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Nhánh bị đổi tên thành %s, nhưng HEAD lại không được cập nhật!"
-#: builtin/branch.c:601
+#: builtin/branch.c:604
msgid "Branch is renamed, but update of config-file failed"
msgstr "Nhánh bị đổi tên, nhưng cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:623
-msgid "could not write branch description template"
-msgstr "không thể ghi mẫu mô tả nhánh"
+#: builtin/branch.c:620
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+"Viết các ghi chú cho nhánh:\n"
+" %s\n"
+"Những dòng được bắt đầu bằng “%c†sẽ được cắt bá».\n"
#: builtin/branch.c:651
msgid "Generic options"
@@ -4134,8 +4524,8 @@ msgstr "khóa"
msgid "field name to sort on"
msgstr "tên trÆ°á»ng cần sắp xếp"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
-#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
+#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
#: builtin/tag.c:369
msgid "object"
msgstr "đối tượng"
@@ -4260,7 +4650,7 @@ msgstr "Cần một kho chứa để có thể tạo một bundle."
msgid "Need a repository to unbundle."
msgstr "Cần một kho chứa để có thể giải nén một bundle."
-#: builtin/cat-file.c:428
+#: builtin/cat-file.c:443
msgid ""
"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
"<type>|--textconv) <object>"
@@ -4268,56 +4658,56 @@ msgstr ""
"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
"<kiểu>|--textconv) <đối_tượng>"
-#: builtin/cat-file.c:429
+#: builtin/cat-file.c:444
msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-#: builtin/cat-file.c:466
+#: builtin/cat-file.c:481
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<kiểu> là một trong số: blob, tree, commit hoặc tag"
-#: builtin/cat-file.c:467
+#: builtin/cat-file.c:482
msgid "show object type"
msgstr "hiển thị kiểu đối tượng"
-#: builtin/cat-file.c:468
+#: builtin/cat-file.c:483
msgid "show object size"
msgstr "hiển thị kích thước đối tượng"
-#: builtin/cat-file.c:470
+#: builtin/cat-file.c:485
msgid "exit with zero when there's no error"
msgstr "thoát với 0 khi không có lỗi"
-#: builtin/cat-file.c:471
+#: builtin/cat-file.c:486
msgid "pretty-print object's content"
msgstr "in ná»™i dung đối tượng dạng dá»… Ä‘á»c"
-#: builtin/cat-file.c:473
+#: builtin/cat-file.c:488
msgid "for blob objects, run textconv on object's content"
msgstr "với đối tượng blob, chạy lệnh textconv trên nội dung của đối tượng"
-#: builtin/cat-file.c:475
+#: builtin/cat-file.c:490
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "cho phép -s và -t để làm việc vá»›i các đối tượng sai/há»ng"
-#: builtin/cat-file.c:476
+#: builtin/cat-file.c:491
msgid "buffer --batch output"
msgstr "đệm kết xuất --batch"
-#: builtin/cat-file.c:478
+#: builtin/cat-file.c:493
msgid "show info and content of objects fed from the standard input"
msgstr ""
"hiển thị thông tin và nội dung của các đối tượng lấy từ đầu vào tiêu chuẩn"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:496
msgid "show info about objects fed from the standard input"
msgstr "hiển thị các thông tin vỠđối tượng fed từ đầu vào tiêu chuẩn"
-#: builtin/cat-file.c:484
+#: builtin/cat-file.c:499
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "theo liên kết má»m trong-cây (được dùng vá»›i --batch hay --batch-check)"
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:501
msgid "show all objects with --batch or --batch-check"
msgstr "hiển thị má»i đối tượng vá»›i --batch hay --batch-check"
@@ -4345,7 +4735,7 @@ msgstr "Ä‘á»c tên tập tin từ đầu vào tiêu chuẩn"
msgid "terminate input and output records by a NUL character"
msgstr "chấm dứt các bản ghi vào và ra bằng ký tự NULL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "chặn các báo cáo tiến trình hoạt động"
@@ -4436,9 +4826,9 @@ msgid "write the content to temporary files"
msgstr "ghi nội dung vào tập tin tạm"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
-#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
-#: builtin/submodule--helper.c:774
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
+#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
+#: builtin/submodule--helper.c:830 builtin/worktree.c:469
msgid "string"
msgstr "chuá»—i"
@@ -4505,10 +4895,6 @@ msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Không thể cập nhật các Ä‘Æ°á»ng dẫn và chuyển đến nhánh “%s†cùng má»™t lúc."
-#: builtin/checkout.c:279 builtin/checkout.c:473
-msgid "corrupt index file"
-msgstr "tập tin ghi bảng mục lục bị há»ng"
-
#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
@@ -4518,50 +4904,50 @@ msgstr "Ä‘Æ°á»ng dẫn “%s†không được hòa trá»™n"
msgid "you need to resolve your current index first"
msgstr "bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã"
-#: builtin/checkout.c:622
+#: builtin/checkout.c:625
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Không thể thá»±c hiện reflog cho “%sâ€: %s\n"
-#: builtin/checkout.c:660
+#: builtin/checkout.c:664
msgid "HEAD is now at"
msgstr "HEAD hiện giỠtại"
-#: builtin/checkout.c:664 builtin/clone.c:661
+#: builtin/checkout.c:668 builtin/clone.c:661
msgid "unable to update HEAD"
msgstr "không thể cập nhật HEAD"
-#: builtin/checkout.c:668
+#: builtin/checkout.c:672
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Äặt lại nhánh “%sâ€\n"
-#: builtin/checkout.c:671
+#: builtin/checkout.c:675
#, c-format
msgid "Already on '%s'\n"
msgstr "Äã sẵn sàng trên “%sâ€\n"
-#: builtin/checkout.c:675
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Äã chuyển tá»›i và đặt lại nhánh “%sâ€\n"
-#: builtin/checkout.c:677 builtin/checkout.c:1067
+#: builtin/checkout.c:681 builtin/checkout.c:1070
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Äã chuyển đến nhánh má»›i “%sâ€\n"
-#: builtin/checkout.c:679
+#: builtin/checkout.c:683
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Äã chuyển đến nhánh “%sâ€\n"
-#: builtin/checkout.c:731
+#: builtin/checkout.c:734
#, c-format
msgid " ... and %d more.\n"
msgstr " … và nhiá»u hÆ¡n %d.\n"
-#: builtin/checkout.c:737
+#: builtin/checkout.c:740
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4580,7 +4966,7 @@ msgstr[0] ""
"\n"
"%s\n"
-#: builtin/checkout.c:756
+#: builtin/checkout.c:759
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4601,152 +4987,152 @@ msgstr[0] ""
" git branch <tên_nhánh_mới> %s\n"
"\n"
-#: builtin/checkout.c:792
+#: builtin/checkout.c:795
msgid "internal error in revision walk"
msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét duyệt"
-#: builtin/checkout.c:796
+#: builtin/checkout.c:799
msgid "Previous HEAD position was"
msgstr "Vị trí trước kia của HEAD là"
-#: builtin/checkout.c:823 builtin/checkout.c:1062
+#: builtin/checkout.c:826 builtin/checkout.c:1065
msgid "You are on a branch yet to be born"
msgstr "Bạn tại nhánh mà nó chưa hỠđược sinh ra"
-#: builtin/checkout.c:968
+#: builtin/checkout.c:971
#, c-format
msgid "only one reference expected, %d given."
msgstr "chỉ cần một tham chiếu, nhưng lại đưa ra %d."
-#: builtin/checkout.c:1008 builtin/worktree.c:212
+#: builtin/checkout.c:1011 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "tham chiếu không hợp lệ: %s"
-#: builtin/checkout.c:1037
+#: builtin/checkout.c:1040
#, c-format
msgid "reference is not a tree: %s"
msgstr "tham chiếu không phải là một cây:%s"
-#: builtin/checkout.c:1076
+#: builtin/checkout.c:1079
msgid "paths cannot be used with switching branches"
msgstr "các Ä‘Æ°á»ng dẫn không thể dùng cùng vá»›i các nhánh chuyển"
-#: builtin/checkout.c:1079 builtin/checkout.c:1083
+#: builtin/checkout.c:1082 builtin/checkout.c:1086
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "“%s†không thể được sử dụng với các nhánh chuyển"
-#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
-#: builtin/checkout.c:1098
+#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
+#: builtin/checkout.c:1101
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "“%s†không thể được dùng vá»›i “%sâ€"
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1106
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Không thể chuyển nhánh đến má»™t thứ không phải là lần chuyển giao “%sâ€"
-#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
-#: builtin/worktree.c:325
+#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
+#: builtin/worktree.c:326
msgid "branch"
msgstr "nhánh"
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1140
msgid "create and checkout a new branch"
msgstr "tạo và checkout một nhánh mới"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1142
msgid "create/reset and checkout a branch"
msgstr "tạo/đặt_lại và checkout một nhánh"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1143
msgid "create reflog for new branch"
msgstr "tạo reflog cho nhánh mới"
-#: builtin/checkout.c:1141
-msgid "detach the HEAD at named commit"
-msgstr "rá»i bá» HEAD tại lần chuyển giao danh nghÄ©a"
+#: builtin/checkout.c:1144 builtin/worktree.c:328
+msgid "detach HEAD at named commit"
+msgstr "rá»i bá» HEAD tại lần chuyển giao theo tên"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1145
msgid "set upstream info for new branch"
msgstr "đặt thông tin thượng nguồn cho nhánh mới"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1147
msgid "new-branch"
msgstr "nhánh-mới"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1147
msgid "new unparented branch"
msgstr "nhánh không cha mới"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1148
msgid "checkout our version for unmerged files"
msgstr ""
"lấy ra (checkout) phiên bản của chúng ta cho các tập tin chưa được hòa trộn"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1150
msgid "checkout their version for unmerged files"
msgstr ""
"lấy ra (checkout) phiên bản của chúng hỠcho các tập tin chưa được hòa trộn"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1152
msgid "force checkout (throw away local modifications)"
msgstr "ép buộc lấy ra (bỠđi những thay đổi nội bộ)"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1153
msgid "perform a 3-way merge with the new branch"
msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới"
-#: builtin/checkout.c:1151 builtin/merge.c:230
+#: builtin/checkout.c:1154 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr "cập nhật các tập tin bị bỠqua (mặc định)"
-#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
+#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
msgid "style"
msgstr "kiểu"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1156
msgid "conflict style (merge or diff3)"
msgstr "xung đột kiểu (hòa trộn hoặc diff3)"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1159
msgid "do not limit pathspecs to sparse entries only"
msgstr "không giá»›i hạn đặc tả Ä‘Æ°á»ng dẫn thành chỉ các mục thÆ°a thá»›t"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1161
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\""
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1163
msgid "do not check if another worktree is holding the given ref"
msgstr "không kiểm tra nếu cây làm việc khác đang giữ tham chiếu đã cho"
-#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
-#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
+#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117
+#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "ép buộc báo cáo tiến triển công việc"
-#: builtin/checkout.c:1192
+#: builtin/checkout.c:1195
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Các tùy chá»n -b, -B và --orphan loại từ lẫn nhau"
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1212
msgid "--track needs a branch name"
msgstr "--track cần tên một nhánh"
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1217
msgid "Missing branch name; try -b"
msgstr "Thiếu tên nhánh; hãy thử -b"
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1253
msgid "invalid path specification"
msgstr "Ä‘Æ°á»ng dẫn đã cho không hợp lệ"
-#: builtin/checkout.c:1257
+#: builtin/checkout.c:1260
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4756,12 +5142,12 @@ msgstr ""
"Bạn đã có ý định checkout “%s†cái mà không thể được phân giải như là lần "
"chuyển giao?"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1265
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach không nhận má»™t đối số Ä‘Æ°á»ng dẫn “%sâ€"
-#: builtin/checkout.c:1266
+#: builtin/checkout.c:1269
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4913,7 +5299,7 @@ msgid "remove whole directories"
msgstr "gỡ bỠtoàn bộ thư mục"
#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
msgid "pattern"
msgstr "mẫu"
@@ -4957,7 +5343,7 @@ msgstr "git clone [<các-tùy-chá»n>] [--] <kho> [<t.mục>]"
msgid "don't create a checkout"
msgstr "không tạo một checkout"
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
msgid "create a bare repository"
msgstr "tạo kho thuần"
@@ -4985,16 +5371,16 @@ msgstr "khởi tạo mô-đun-con trong bản sao"
msgid "number of submodules cloned in parallel"
msgstr "số lượng mô-Ä‘un-con được nhân bản đồng thá»i"
-#: builtin/clone.c:80 builtin/init-db.c:470
+#: builtin/clone.c:80 builtin/init-db.c:473
msgid "template-directory"
msgstr "thư-mục-mẫu"
-#: builtin/clone.c:81 builtin/init-db.c:471
+#: builtin/clone.c:81 builtin/init-db.c:474
msgid "directory from which templates will be used"
msgstr "thư mục mà tại đó các mẫu sẽ được dùng"
-#: builtin/clone.c:83 builtin/submodule--helper.c:498
-#: builtin/submodule--helper.c:777
+#: builtin/clone.c:83 builtin/submodule--helper.c:495
+#: builtin/submodule--helper.c:833
msgid "reference repository"
msgstr "kho tham chiếu"
@@ -5018,7 +5404,7 @@ msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ"
msgid "path to git-upload-pack on the remote"
msgstr "Ä‘Æ°á»ng dẫn đến git-upload-pack trên máy chủ"
-#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201
+#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 builtin/pull.c:201
msgid "depth"
msgstr "độ-sâu"
@@ -5034,11 +5420,11 @@ msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch"
msgid "any cloned submodules will be shallow"
msgstr "má»i mô-Ä‘un-con nhân bản sẽ là shallow (nông)"
-#: builtin/clone.c:98 builtin/init-db.c:479
+#: builtin/clone.c:98 builtin/init-db.c:482
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:99 builtin/init-db.c:480
+#: builtin/clone.c:99 builtin/init-db.c:483
msgid "separate git dir from working tree"
msgstr "không dùng chung thư mục dành riêng cho git và thư mục làm việc"
@@ -5050,11 +5436,11 @@ msgstr "khóa=giá_trị"
msgid "set config inside the new repository"
msgstr "đặt cấu hình bên trong một kho chứa mới"
-#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "chỉ dùng địa chỉ IPv4"
-#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "chỉ dùng địa chỉ IPv6"
@@ -5086,6 +5472,11 @@ msgstr "kho tham chiếu “%s†là nông"
msgid "reference repository '%s' is grafted"
msgstr "kho tham chiếu “%s†bị cấy ghép"
+#: builtin/clone.c:376
+#, c-format
+msgid "failed to open '%s'"
+msgstr "gặp lá»—i khi mở “%sâ€"
+
#: builtin/clone.c:384
#, c-format
msgid "%s exists and is not a directory"
@@ -5106,7 +5497,7 @@ msgstr "gặp lá»—i khi tạo được liên kết má»m %s"
msgid "failed to copy file to '%s'"
msgstr "gặp lá»—i khi sao chép tập tin và “%sâ€"
-#: builtin/clone.c:449 builtin/clone.c:633
+#: builtin/clone.c:449
#, c-format
msgid "done.\n"
msgstr "hoàn tất.\n"
@@ -5126,12 +5517,7 @@ msgstr ""
msgid "Could not find remote branch %s to clone."
msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)."
-#: builtin/clone.c:628
-#, c-format
-msgid "Checking connectivity... "
-msgstr "Äang kiểm tra kết nối… "
-
-#: builtin/clone.c:631
+#: builtin/clone.c:633
msgid "remote did not send all necessary objects"
msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết"
@@ -5148,99 +5534,99 @@ msgstr "refers HEAD máy chủ chỉ đến ref không tồn tại, không thá»
msgid "unable to checkout working tree"
msgstr "không thể lấy ra (checkout) cây làm việc"
-#: builtin/clone.c:767
+#: builtin/clone.c:766
msgid "unable to write parameters to config file"
msgstr "không thể ghi các tham số vào tập tin cấu hình"
-#: builtin/clone.c:830
+#: builtin/clone.c:829
msgid "cannot repack to clean up"
msgstr "không thể đóng gói để dá»n dẹp"
-#: builtin/clone.c:832
+#: builtin/clone.c:831
msgid "cannot unlink temporary alternates file"
msgstr "không thể bá» liên kết tập tin thay thế tạm thá»i"
-#: builtin/clone.c:864 builtin/receive-pack.c:1731
+#: builtin/clone.c:863 builtin/receive-pack.c:1855
msgid "Too many arguments."
msgstr "Có quá nhiá»u đối số."
-#: builtin/clone.c:868
+#: builtin/clone.c:867
msgid "You must specify a repository to clone."
msgstr "Bạn phải chỉ định một kho để mà nhân bản (clone)."
-#: builtin/clone.c:879
+#: builtin/clone.c:878
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "tùy chá»n --bare và --origin %s xung khắc nhau."
-#: builtin/clone.c:882
+#: builtin/clone.c:881
msgid "--bare and --separate-git-dir are incompatible."
msgstr "tùy chá»n --bare và --separate-git-dir xung khắc nhau."
-#: builtin/clone.c:895
+#: builtin/clone.c:894
#, c-format
msgid "repository '%s' does not exist"
msgstr "kho chứa “%s†chưa tồn tại"
-#: builtin/clone.c:901 builtin/fetch.c:1174
+#: builtin/clone.c:900 builtin/fetch.c:1293
#, c-format
msgid "depth %s is not a positive number"
msgstr "độ sâu %s không phải là một số nguyên dương"
-#: builtin/clone.c:911
+#: builtin/clone.c:910
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "Ä‘Æ°á»ng dẫn đích “%s†đã có từ trÆ°á»›c và không phải là má»™t thÆ° mục rá»—ng."
-#: builtin/clone.c:921
+#: builtin/clone.c:920
#, c-format
msgid "working tree '%s' already exists."
msgstr "cây làm việc “%s†đã sẵn tồn tại rồi."
-#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
-#: builtin/worktree.c:220 builtin/worktree.c:247
+#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "không thể tạo các thÆ° mục dẫn đầu của “%sâ€"
-#: builtin/clone.c:939
+#: builtin/clone.c:938
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "không thể tạo cây thÆ° mục làm việc dir “%sâ€"
-#: builtin/clone.c:957
+#: builtin/clone.c:956
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Äang nhân bản thành kho chứa bare “%sâ€â€¦\n"
-#: builtin/clone.c:959
+#: builtin/clone.c:958
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Äang nhân bản thành “%sâ€â€¦\n"
-#: builtin/clone.c:998
+#: builtin/clone.c:997
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth bị lỠđi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế."
-#: builtin/clone.c:1001
+#: builtin/clone.c:1000
msgid "source repository is shallow, ignoring --local"
msgstr "kho nguồn là nông, nên bỠqua --local"
-#: builtin/clone.c:1006
+#: builtin/clone.c:1005
msgid "--local is ignored"
msgstr "--local bị lỠđi"
-#: builtin/clone.c:1010
+#: builtin/clone.c:1009
#, c-format
msgid "Don't know how to clone %s"
msgstr "Không biết làm cách nào để nhân bản (clone) %s"
-#: builtin/clone.c:1059 builtin/clone.c:1067
+#: builtin/clone.c:1058 builtin/clone.c:1066
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s"
-#: builtin/clone.c:1070
+#: builtin/clone.c:1069
msgid "You appear to have cloned an empty repository."
msgstr "Bạn hình như là đã nhân bản một kho trống rỗng."
@@ -5391,68 +5777,68 @@ msgstr ""
"Thế thì \"git cherry-pick --continue\" sẽ phục hồi lại việc cherry-pick\n"
"những lần chuyển giao còn lại.\n"
-#: builtin/commit.c:307
+#: builtin/commit.c:308
msgid "failed to unpack HEAD tree object"
msgstr "gặp lỗi khi tháo dỡ HEAD đối tượng cây"
-#: builtin/commit.c:348
+#: builtin/commit.c:349
msgid "unable to create temporary index"
msgstr "không thể tạo bảng mục lục tạm thá»i"
-#: builtin/commit.c:354
+#: builtin/commit.c:355
msgid "interactive add failed"
msgstr "gặp lỗi khi thêm bằng cách tương"
-#: builtin/commit.c:367
+#: builtin/commit.c:368
msgid "unable to update temporary index"
msgstr "không thể cập nhật bảng mục lục tạm thá»i"
-#: builtin/commit.c:369
+#: builtin/commit.c:370
msgid "Failed to update main cache tree"
msgstr "Gặp lỗi khi cập nhật cây bộ nhớ đệm"
-#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
+#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
msgid "unable to write new_index file"
msgstr "không thể ghi tập tin lưu bảng mục lục mới (new_index)"
-#: builtin/commit.c:447
+#: builtin/commit.c:448
msgid "cannot do a partial commit during a merge."
msgstr ""
"không thể thực hiện việc chuyển giao cục bộ trong khi đang được hòa trộn."
-#: builtin/commit.c:449
+#: builtin/commit.c:450
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
"không thể thực hiện việc chuyển giao bộ phận trong khi đang cherry-pick."
-#: builtin/commit.c:458
+#: builtin/commit.c:459
msgid "cannot read the index"
msgstr "không Ä‘á»c được bảng mục lục"
-#: builtin/commit.c:477
+#: builtin/commit.c:478
msgid "unable to write temporary index file"
msgstr "không thể ghi tập tin lÆ°u bảng mục lục tạm thá»i"
-#: builtin/commit.c:582
+#: builtin/commit.c:583
#, c-format
msgid "commit '%s' lacks author header"
msgstr "lần chuyển giao “%s†thiếu phần tác giả ở đầu"
-#: builtin/commit.c:584
+#: builtin/commit.c:585
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "lần chuyển giao “%s†có phần tác giả ở đầu dị dạng"
-#: builtin/commit.c:603
+#: builtin/commit.c:604
msgid "malformed --author parameter"
msgstr "đối số cho --author bị dị hình"
-#: builtin/commit.c:611
+#: builtin/commit.c:612
#, c-format
msgid "invalid date format: %s"
msgstr "ngày tháng không hợp lệ: %s"
-#: builtin/commit.c:655
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -5460,38 +5846,38 @@ msgstr ""
"không thể chá»n má»™t ký tá»± ghi chú cái mà không được dùng\n"
"trong phần ghi chú hiện tại"
-#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
+#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
#, c-format
msgid "could not lookup commit %s"
msgstr "không thể tìm kiếm commit (lần chuyển giao) %s"
-#: builtin/commit.c:704 builtin/shortlog.c:285
+#: builtin/commit.c:705 builtin/shortlog.c:286
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(Ä‘ang Ä‘á»c thông Ä‘iệp nhật ký từ đầu vào tiêu chuẩn)\n"
-#: builtin/commit.c:706
+#: builtin/commit.c:707
msgid "could not read log from standard input"
msgstr "không thể Ä‘á»c nhật ký từ đầu vào tiêu chuẩn"
-#: builtin/commit.c:710
+#: builtin/commit.c:711
#, c-format
msgid "could not read log file '%s'"
msgstr "không Ä‘á»c được tệp nhật ký “%sâ€"
-#: builtin/commit.c:737 builtin/commit.c:745
+#: builtin/commit.c:738 builtin/commit.c:746
msgid "could not read SQUASH_MSG"
msgstr "không thể Ä‘á»c SQUASH_MSG"
-#: builtin/commit.c:742
+#: builtin/commit.c:743
msgid "could not read MERGE_MSG"
msgstr "không thể Ä‘á»c MERGE_MSG"
-#: builtin/commit.c:796
+#: builtin/commit.c:797
msgid "could not write commit template"
msgstr "không thể ghi mẫu chuyển giao"
-#: builtin/commit.c:814
+#: builtin/commit.c:815
#, c-format
msgid ""
"\n"
@@ -5506,7 +5892,7 @@ msgstr ""
"\t%s\n"
"và thử lại.\n"
-#: builtin/commit.c:819
+#: builtin/commit.c:820
#, c-format
msgid ""
"\n"
@@ -5521,7 +5907,7 @@ msgstr ""
"\t%s\n"
"và thử lại.\n"
-#: builtin/commit.c:832
+#: builtin/commit.c:833
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5532,7 +5918,7 @@ msgstr ""
"bắt đầu bằng “%c†sẽ được bỠqua, nếu phần chú thích rỗng sẽ hủy bỠlần "
"chuyển giao.\n"
-#: builtin/commit.c:839
+#: builtin/commit.c:840
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5544,157 +5930,157 @@ msgstr ""
"bắt đầu bằng “%c†sẽ được bỠqua; bạn có thể xóa chúng đi nếu muốn thế.\n"
"Phần chú thích này nếu trống rỗng sẽ hủy bỠlần chuyển giao.\n"
-#: builtin/commit.c:859
+#: builtin/commit.c:860
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sTác giả: %.*s <%.*s>"
-#: builtin/commit.c:867
+#: builtin/commit.c:868
#, c-format
msgid "%sDate: %s"
msgstr "%sNgày tháng: %s"
-#: builtin/commit.c:874
+#: builtin/commit.c:875
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sNgÆ°á»i chuyển giao: %.*s <%.*s>"
-#: builtin/commit.c:892
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "Không Ä‘á»c được bảng mục lục"
-#: builtin/commit.c:949
+#: builtin/commit.c:950
msgid "Error building trees"
msgstr "Gặp lỗi khi xây dựng cây"
-#: builtin/commit.c:964 builtin/tag.c:266
+#: builtin/commit.c:965 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Xin hãy cung cấp lá»i chú giải hoặc là dùng tùy chá»n -m hoặc là -F.\n"
-#: builtin/commit.c:1066
+#: builtin/commit.c:1067
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author “%s†không phải là “HỠvà tên <thư điện tửl>†và không khớp bất kỳ "
"tác giả nào sẵn có"
-#: builtin/commit.c:1081 builtin/commit.c:1321
+#: builtin/commit.c:1082 builtin/commit.c:1322
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Chế Ä‘á»™ cho các tập tin chÆ°a được theo dõi không hợp lệ “%sâ€"
-#: builtin/commit.c:1118
+#: builtin/commit.c:1119
msgid "--long and -z are incompatible"
msgstr "hai tùy chá»n -long và -z không tÆ°Æ¡ng thích vá»›i nhau"
-#: builtin/commit.c:1148
+#: builtin/commit.c:1149
msgid "Using both --reset-author and --author does not make sense"
msgstr "Sá»­ dụng cả hai tùy chá»n --reset-author và --author không hợp lý"
-#: builtin/commit.c:1157
+#: builtin/commit.c:1158
msgid "You have nothing to amend."
msgstr "Không có gì để mà “tu bổ†cả."
-#: builtin/commit.c:1160
+#: builtin/commit.c:1161
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
"Bạn Ä‘ang ở giữa của quá trình hòa trá»™n -- không thể thá»±c hiện việc “tu bổâ€."
-#: builtin/commit.c:1162
+#: builtin/commit.c:1163
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
"Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc “tu "
"bổâ€."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1166
msgid "Options --squash and --fixup cannot be used together"
msgstr "Các tùy chá»n --squash và --fixup không thể sá»­ dụng cùng vá»›i nhau"
-#: builtin/commit.c:1175
+#: builtin/commit.c:1176
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
"Chỉ được dùng má»™t trong số tùy chá»n trong số các tùy chá»n -c/-C/-F/--fixup"
-#: builtin/commit.c:1177
+#: builtin/commit.c:1178
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Tùy chá»n -m không thể được tổ hợp cùng vá»›i -c/-C/-F/--fixup."
-#: builtin/commit.c:1185
+#: builtin/commit.c:1186
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"--reset-author chỉ có thể được sá»­ dụng vá»›i tùy chá»n -C, -c hay --amend."
-#: builtin/commit.c:1202
+#: builtin/commit.c:1203
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Chỉ má»™t trong các tùy chá»n --include/--only/--all/--interactive/--patch được "
"sử dụng."
-#: builtin/commit.c:1204
+#: builtin/commit.c:1205
msgid "No paths with --include/--only does not make sense."
msgstr "Không Ä‘Æ°á»ng dẫn vá»›i các tùy chá»n --include/--only không hợp lý."
-#: builtin/commit.c:1206
+#: builtin/commit.c:1207
msgid "Clever... amending the last one with dirty index."
msgstr "Giá»i… “tu bổ†cái cuối vá»›i bảng mục lục bẩn."
-#: builtin/commit.c:1208
+#: builtin/commit.c:1209
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
"Những Ä‘Æ°á»ng dẫn rõ ràng được chỉ ra không có tùy chá»n -i cÅ©ng không -o; coi "
"là --only những Ä‘Æ°á»ng dẫn"
-#: builtin/commit.c:1220 builtin/tag.c:474
+#: builtin/commit.c:1221 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Chế Ä‘á»™ dá»n dẹp không hợp lệ %s"
-#: builtin/commit.c:1225
+#: builtin/commit.c:1226
msgid "Paths with -a does not make sense."
msgstr "Các Ä‘Æ°á»ng dẫn vá»›i tùy chá»n -a không hợp lý."
-#: builtin/commit.c:1335 builtin/commit.c:1621
+#: builtin/commit.c:1336 builtin/commit.c:1622
msgid "show status concisely"
msgstr "hiển thị trạng thái ở dạng súc tích"
-#: builtin/commit.c:1337 builtin/commit.c:1623
+#: builtin/commit.c:1338 builtin/commit.c:1624
msgid "show branch information"
msgstr "hiển thị thông tin nhánh"
-#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
-#: builtin/worktree.c:437
+#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "kết xuất dạng máy-có-thể-Ä‘á»c"
-#: builtin/commit.c:1342 builtin/commit.c:1627
+#: builtin/commit.c:1343 builtin/commit.c:1628
msgid "show status in long format (default)"
msgstr "hiển thị trạng thái ở định dạng dài (mặc định)"
-#: builtin/commit.c:1345 builtin/commit.c:1630
+#: builtin/commit.c:1346 builtin/commit.c:1631
msgid "terminate entries with NUL"
msgstr "chấm dứt các mục bằng NUL"
-#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
+#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "chế độ"
-#: builtin/commit.c:1348 builtin/commit.c:1633
+#: builtin/commit.c:1349 builtin/commit.c:1634
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"hiển thị các tập tin chÆ°a được theo dõi dấu vết, các chế Ä‘á»™ tùy chá»n: all, "
"normal, no. (Mặc định: all)"
-#: builtin/commit.c:1351
+#: builtin/commit.c:1352
msgid "show ignored files"
msgstr "hiển thị các tập tin ẩn"
-#: builtin/commit.c:1352 parse-options.h:155
+#: builtin/commit.c:1353 parse-options.h:155
msgid "when"
msgstr "khi"
-#: builtin/commit.c:1353
+#: builtin/commit.c:1354
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -5702,205 +6088,205 @@ msgstr ""
"bá» qua các thay đổi trong mô-Ä‘un-con, tùy chá»n khi: all, dirty, untracked. "
"(Mặc định: all)"
-#: builtin/commit.c:1355
+#: builtin/commit.c:1356
msgid "list untracked files in columns"
msgstr "hiển thị danh sách các tập-tin chưa được theo dõi trong các cột"
-#: builtin/commit.c:1441
+#: builtin/commit.c:1442
msgid "couldn't look up newly created commit"
msgstr "không thể tìm thấy lần chuyển giao mới hơn đã được tạo"
-#: builtin/commit.c:1443
+#: builtin/commit.c:1444
msgid "could not parse newly created commit"
msgstr ""
"không thể phân tích cú pháp của đối tượng chuyển giao mới hơn đã được tạo"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1489
msgid "detached HEAD"
msgstr "đã rá»i khá»i HEAD"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1492
msgid " (root-commit)"
msgstr " (root-commit)"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1592
msgid "suppress summary after successful commit"
msgstr "không hiển thị tổng kết sau khi chuyển giao thành công"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1593
msgid "show diff in commit message template"
msgstr "hiển thị sự khác biệt trong mẫu tin nhắn chuyển giao"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1595
msgid "Commit message options"
msgstr "Các tùy chá»n ghi chú commit"
-#: builtin/commit.c:1595 builtin/tag.c:351
+#: builtin/commit.c:1596 builtin/tag.c:351
msgid "read message from file"
msgstr "Ä‘á»c chú thích từ tập tin"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1597
msgid "author"
msgstr "tác giả"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1597
msgid "override author for commit"
msgstr "ghi đè tác giả cho commit"
-#: builtin/commit.c:1597 builtin/gc.c:326
+#: builtin/commit.c:1598 builtin/gc.c:326
msgid "date"
msgstr "ngày tháng"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1598
msgid "override date for commit"
msgstr "ghi đè ngày tháng cho lần chuyển giao"
-#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
-#: builtin/notes.c:558 builtin/tag.c:349
+#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
+#: builtin/notes.c:559 builtin/tag.c:349
msgid "message"
msgstr "chú thích"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1599
msgid "commit message"
msgstr "chú thích của lần chuyển giao"
-#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
-#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
+#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
msgid "commit"
msgstr "lần_chuyển_giao"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1600
msgid "reuse and edit message from specified commit"
msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho nhưng có cho sửa chữa"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1601
msgid "reuse message from specified commit"
msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1602
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"dùng ghi chú có định dạng autosquash để sửa chữa lần chuyển giao đã chỉ ra"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1603
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"dùng lá»i nhắn có định dạng tá»± Ä‘á»™ng nén để nén lại các lần chuyển giao đã chỉ "
"ra"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1604
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"lần chuyển giao nhận tôi là tác giả (được dùng vá»›i tùy chá»n -C/-c/--amend)"
-#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
+#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "(nên dùng) thêm dòng Signed-off-by:"
-#: builtin/commit.c:1605
+#: builtin/commit.c:1606
msgid "use specified template file"
msgstr "sử dụng tập tin mẫu đã cho"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1607
msgid "force edit of commit"
msgstr "ép buộc sửa lần commit"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1608
msgid "default"
msgstr "mặc định"
-#: builtin/commit.c:1607 builtin/tag.c:354
+#: builtin/commit.c:1608 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "làm thế nào để cắt bỠkhoảng trắng và #ghichú từ mẩu tin nhắn"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1609
msgid "include status in commit message template"
msgstr "bao gồm các trạng thái trong mẫu ghi chú chuyển giao"
-#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
+#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "ký lần chuyển giao dùng GPG"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1614
msgid "Commit contents options"
msgstr "Các tùy nội dung ghi chú commit"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1615
msgid "commit all changed files"
msgstr "chuyển giao tất cả các tập tin có thay đổi"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1616
msgid "add specified files to index for commit"
msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục để chuyển giao"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1617
msgid "interactively add files"
msgstr "thêm các tập-tin bằng tương tác"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1618
msgid "interactively add changes"
msgstr "thêm các thay đổi bằng tương tác"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1619
msgid "commit only specified files"
msgstr "chỉ chuyển giao các tập tin đã chỉ ra"
-#: builtin/commit.c:1619
-msgid "bypass pre-commit hook"
-msgstr "vòng qua móc (hook) pre-commit"
-
#: builtin/commit.c:1620
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "vòng qua móc (hook) pre-commit và commit-msg"
+
+#: builtin/commit.c:1621
msgid "show what would be committed"
msgstr "hiển thị xem cái gì có thể được chuyển giao"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1632
msgid "amend previous commit"
msgstr "“tu bổ†(amend) lần commit trước"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1633
msgid "bypass post-rewrite hook"
msgstr "vòng qua móc (hook) post-rewrite"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1638
msgid "ok to record an empty change"
msgstr "ok để ghi lại một thay đổi trống rỗng"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
msgid "ok to record a change with an empty message"
msgstr "ok để ghi các thay đổi vá»›i lá»i nhắn trống rá»—ng"
-#: builtin/commit.c:1668
+#: builtin/commit.c:1669
msgid "could not parse HEAD commit"
msgstr "không thể phân tích commit (lần chuyển giao) HEAD"
-#: builtin/commit.c:1718
+#: builtin/commit.c:1719
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Tập tin MERGE_HEAD sai há»ng (%s)"
-#: builtin/commit.c:1725
+#: builtin/commit.c:1726
msgid "could not read MERGE_MODE"
msgstr "không thể Ä‘á»c MERGE_MODE"
-#: builtin/commit.c:1744
+#: builtin/commit.c:1745
#, c-format
msgid "could not read commit message: %s"
msgstr "không thể Ä‘á»c phần chú thích (message) của llần chuyển giao: %s"
-#: builtin/commit.c:1755
+#: builtin/commit.c:1756
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
"Äang bá» qua việc chuyển giao; bạn đã không biên soạn phần chú thích "
"(message).\n"
-#: builtin/commit.c:1760
+#: builtin/commit.c:1761
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Bãi bỠviệc chuyển giao bởi vì phần chú thích của nó trống rỗng.\n"
-#: builtin/commit.c:1808
+#: builtin/commit.c:1809
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5915,141 +6301,141 @@ msgstr ""
msgid "git config [<options>]"
msgstr "git config [<các-tùy-chá»n>]"
-#: builtin/config.c:56
+#: builtin/config.c:55
msgid "Config file location"
msgstr "Vị trí tập tin cấu hình"
-#: builtin/config.c:57
+#: builtin/config.c:56
msgid "use global config file"
msgstr "dùng tập tin cấu hình toàn cục"
-#: builtin/config.c:58
+#: builtin/config.c:57
msgid "use system config file"
msgstr "sử dụng tập tin cấu hình hệ thống"
-#: builtin/config.c:59
+#: builtin/config.c:58
msgid "use repository config file"
msgstr "dùng tập tin cấu hình của kho"
-#: builtin/config.c:60
+#: builtin/config.c:59
msgid "use given config file"
msgstr "sử dụng tập tin cấu hình đã cho"
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "read config from given blob object"
msgstr "Ä‘á»c cấu hình từ đối tượng blob đã cho"
-#: builtin/config.c:62
+#: builtin/config.c:61
msgid "Action"
msgstr "Hành động"
-#: builtin/config.c:63
+#: builtin/config.c:62
msgid "get value: name [value-regex]"
msgstr "lấy giá-trị: tên [value-regex]"
-#: builtin/config.c:64
+#: builtin/config.c:63
msgid "get all values: key [value-regex]"
msgstr "lấy tất cả giá-trị: khóa [value-regex]"
-#: builtin/config.c:65
+#: builtin/config.c:64
msgid "get values for regexp: name-regex [value-regex]"
msgstr "lấy giá trị cho regexp: name-regex [value-regex]"
-#: builtin/config.c:66
+#: builtin/config.c:65
msgid "get value specific for the URL: section[.var] URL"
msgstr "lấy đặc tả giá trị cho URL: phần[.biến] URL"
-#: builtin/config.c:67
+#: builtin/config.c:66
msgid "replace all matching variables: name value [value_regex]"
msgstr "thay thế tất cả các biến khớp mẫu: tên giá-trị [value_regex]"
-#: builtin/config.c:68
+#: builtin/config.c:67
msgid "add a new variable: name value"
msgstr "thêm biến mới: tên giá-trị"
-#: builtin/config.c:69
+#: builtin/config.c:68
msgid "remove a variable: name [value-regex]"
msgstr "gỡ bỠbiến: tên [value-regex]"
-#: builtin/config.c:70
+#: builtin/config.c:69
msgid "remove all matches: name [value-regex]"
msgstr "gỡ bá» má»i cái khá»›p: tên [value-regex]"
-#: builtin/config.c:71
+#: builtin/config.c:70
msgid "rename section: old-name new-name"
msgstr "đổi tên phần: tên-cũ tên-mới"
-#: builtin/config.c:72
+#: builtin/config.c:71
msgid "remove a section: name"
msgstr "gỡ bỠphần: tên"
-#: builtin/config.c:73
+#: builtin/config.c:72
msgid "list all"
msgstr "liệt kê tất"
-#: builtin/config.c:74
+#: builtin/config.c:73
msgid "open an editor"
msgstr "mở một trình biên soạn"
-#: builtin/config.c:75
+#: builtin/config.c:74
msgid "find the color configured: slot [default]"
msgstr "tìm cấu hình màu sắc: slot [mặc định]"
-#: builtin/config.c:76
+#: builtin/config.c:75
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "tìm các cài đặt vỠmàu sắc: slot [stdout-là-tty]"
-#: builtin/config.c:77
+#: builtin/config.c:76
msgid "Type"
msgstr "Kiểu"
-#: builtin/config.c:78
+#: builtin/config.c:77
msgid "value is \"true\" or \"false\""
msgstr "giá trị là \"true\" hoặc \"false\""
-#: builtin/config.c:79
+#: builtin/config.c:78
msgid "value is decimal number"
msgstr "giá trị ở dạng số thập phân"
-#: builtin/config.c:80
+#: builtin/config.c:79
msgid "value is --bool or --int"
msgstr "giá trị là --bool hoặc --int"
-#: builtin/config.c:81
+#: builtin/config.c:80
msgid "value is a path (file or directory name)"
msgstr "giá trị là Ä‘Æ°á»ng dẫn (tên tập tin hay thÆ° mục)"
-#: builtin/config.c:82
+#: builtin/config.c:81
msgid "Other"
msgstr "Khác"
-#: builtin/config.c:83
+#: builtin/config.c:82
msgid "terminate values with NUL byte"
msgstr "chấm dứt giá trị với byte NUL"
-#: builtin/config.c:84
+#: builtin/config.c:83
msgid "show variable names only"
msgstr "chỉ hiển thị các tên biến"
-#: builtin/config.c:85
+#: builtin/config.c:84
msgid "respect include directives on lookup"
msgstr "tôn trá»ng kể cà các hÆ°á»›ng trong tìm kiếm"
-#: builtin/config.c:86
+#: builtin/config.c:85
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"hiển thị nguyên gốc của cấu hình (tập tin, đầu vào tiêu chuẩn, blob, dòng "
"lệnh)"
-#: builtin/config.c:328
+#: builtin/config.c:327
msgid "unable to parse default color value"
msgstr "không thể phân tích giá trị màu mặc định"
-#: builtin/config.c:472
+#: builtin/config.c:471
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -6064,7 +6450,7 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:614
+#: builtin/config.c:613
#, c-format
msgid "cannot create configuration file %s"
msgstr "không thể tạo tập tin cấu hình “%sâ€"
@@ -6100,7 +6486,7 @@ msgstr "thẻ được chú giải %s không có tên nhúng"
msgid "tag '%s' is really '%s' here"
msgstr "thẻ “%s†đã thực sự ở đây “%s†rồi"
-#: builtin/describe.c:250 builtin/log.c:465
+#: builtin/describe.c:250 builtin/log.c:480
#, c-format
msgid "Not a valid object name %s"
msgstr "Không phải tên đối tượng %s hợp lệ"
@@ -6298,178 +6684,179 @@ msgstr "Ãp dụng refspec cho refs đã xuất"
msgid "anonymize output"
msgstr "kết xuất anonymize"
-#: builtin/fetch.c:20
+#: builtin/fetch.c:21
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<các-tùy-chá»n>] [<kho-chứa> [<refspec>…]]"
-#: builtin/fetch.c:21
+#: builtin/fetch.c:22
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<các-tùy-chá»n>] [<nhóm>"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<các-tùy-chá»n>] [(<kho> | <nhóm>)…]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<các-tùy-chá»n>]"
-#: builtin/fetch.c:92 builtin/pull.c:174
+#: builtin/fetch.c:93 builtin/pull.c:174
msgid "fetch from all remotes"
msgstr "lấy vỠtừ tất cả các máy chủ"
-#: builtin/fetch.c:94 builtin/pull.c:177
+#: builtin/fetch.c:95 builtin/pull.c:177
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "nối thêm vào .git/FETCH_HEAD thay vì ghi đè lên nó"
-#: builtin/fetch.c:96 builtin/pull.c:180
+#: builtin/fetch.c:97 builtin/pull.c:180
msgid "path to upload pack on remote end"
msgstr "Ä‘Æ°á»ng dẫn đến gói tải lên trên máy chủ cuối"
-#: builtin/fetch.c:97 builtin/pull.c:182
+#: builtin/fetch.c:98 builtin/pull.c:182
msgid "force overwrite of local branch"
msgstr "ép buộc ghi đè lên nhánh nội bộ"
-#: builtin/fetch.c:99
+#: builtin/fetch.c:100
msgid "fetch from multiple remotes"
msgstr "lấy từ nhiá»u máy chủ cùng lúc"
-#: builtin/fetch.c:101 builtin/pull.c:184
+#: builtin/fetch.c:102 builtin/pull.c:184
msgid "fetch all tags and associated objects"
msgstr "lấy tất cả các thẻ cùng với các đối tượng liên quan đến nó"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:104
msgid "do not fetch all tags (--no-tags)"
msgstr "không lấy tất cả các thẻ (--no-tags)"
-#: builtin/fetch.c:105
+#: builtin/fetch.c:106
msgid "number of submodules fetched in parallel"
msgstr "số lượng mô-Ä‘un-con được lấy đồng thá»i"
-#: builtin/fetch.c:107 builtin/pull.c:187
+#: builtin/fetch.c:108 builtin/pull.c:187
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"cắt cụt (prune) các nhánh “remote-tracking†không còn tồn tại trên máy chủ "
"nữa"
-#: builtin/fetch.c:108 builtin/pull.c:190
+#: builtin/fetch.c:109 builtin/pull.c:190
msgid "on-demand"
msgstr "khi-cần"
-#: builtin/fetch.c:109 builtin/pull.c:191
+#: builtin/fetch.c:110 builtin/pull.c:191
msgid "control recursive fetching of submodules"
msgstr "Ä‘iá»u khiển việc lấy vỠđệ quy trong các mô-Ä‘un-con"
-#: builtin/fetch.c:113 builtin/pull.c:199
+#: builtin/fetch.c:114 builtin/pull.c:199
msgid "keep downloaded pack"
msgstr "giữ lại gói đã tải vá»"
-#: builtin/fetch.c:115
+#: builtin/fetch.c:116
msgid "allow updating of HEAD ref"
msgstr "cho phép cập nhật th.chiếu HEAD"
-#: builtin/fetch.c:118 builtin/pull.c:202
+#: builtin/fetch.c:119 builtin/pull.c:202
msgid "deepen history of shallow clone"
msgstr "làm sâu hơn lịch sử của bản sao"
-#: builtin/fetch.c:120 builtin/pull.c:205
+#: builtin/fetch.c:121 builtin/pull.c:205
msgid "convert to a complete repository"
msgstr "chuyển đổi hoàn toàn sang kho git"
-#: builtin/fetch.c:122 builtin/log.c:1399
+#: builtin/fetch.c:123 builtin/log.c:1426
msgid "dir"
msgstr "tmục"
-#: builtin/fetch.c:123
+#: builtin/fetch.c:124
msgid "prepend this to submodule path output"
msgstr "soạn sẵn cái này cho kết xuất Ä‘Æ°á»ng dẫn mô-Ä‘un-con"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:127
msgid "default mode for recursion"
msgstr "chế độ mặc định cho đệ qui"
-#: builtin/fetch.c:128 builtin/pull.c:208
+#: builtin/fetch.c:129 builtin/pull.c:208
msgid "accept refs that update .git/shallow"
msgstr "chấp nhận tham chiếu cập nhật .git/shallow"
-#: builtin/fetch.c:129 builtin/pull.c:210
+#: builtin/fetch.c:130 builtin/pull.c:210
msgid "refmap"
msgstr "refmap"
-#: builtin/fetch.c:130 builtin/pull.c:211
+#: builtin/fetch.c:131 builtin/pull.c:211
msgid "specify fetch refmap"
msgstr "chỉ ra refmap cần lấy vá»"
-#: builtin/fetch.c:386
+#: builtin/fetch.c:387
msgid "Couldn't find remote ref HEAD"
msgstr "Không thể tìm thấy máy chủ cho tham chiếu HEAD"
-#: builtin/fetch.c:466
+#: builtin/fetch.c:503
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "phần cấu hình fetch.output có chứa giá-trị không hợp lệ %s"
+
+#: builtin/fetch.c:592
#, c-format
msgid "object %s not found"
msgstr "Không tìm thấy đối tượng %s"
-#: builtin/fetch.c:471
+#: builtin/fetch.c:596
msgid "[up to date]"
msgstr "[đã cập nhật]"
-#: builtin/fetch.c:485
-#, c-format
-msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
-msgstr "! %-*s %-*s -> %s (không thể fetch (lấy) vỠnhánh hiện hành)"
-
-#: builtin/fetch.c:486 builtin/fetch.c:574
+#: builtin/fetch.c:609 builtin/fetch.c:689
msgid "[rejected]"
msgstr "[Bị từ chối]"
-#: builtin/fetch.c:497
+#: builtin/fetch.c:610
+msgid "can't fetch in current branch"
+msgstr "không thể fetch (lấy) vỠnhánh hiện hành"
+
+#: builtin/fetch.c:619
msgid "[tag update]"
msgstr "[cập nhật thẻ]"
-#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
-msgid " (unable to update local ref)"
-msgstr " (không thể cập nhật tham chiếu nội bộ)"
+#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
+#: builtin/fetch.c:684
+msgid "unable to update local ref"
+msgstr "không thể cập nhật tham chiếu nội bộ"
-#: builtin/fetch.c:517
+#: builtin/fetch.c:639
msgid "[new tag]"
msgstr "[thẻ mới]"
-#: builtin/fetch.c:520
+#: builtin/fetch.c:642
msgid "[new branch]"
msgstr "[nhánh mới]"
-#: builtin/fetch.c:523
+#: builtin/fetch.c:645
msgid "[new ref]"
msgstr "[ref (tham chiếu) mới]"
-#: builtin/fetch.c:569
-msgid "unable to update local ref"
-msgstr "không thể cập nhật tham chiếu nội bộ"
-
-#: builtin/fetch.c:569
+#: builtin/fetch.c:684
msgid "forced update"
msgstr "cưỡng bức cập nhật"
-#: builtin/fetch.c:576
-msgid "(non-fast-forward)"
-msgstr "(không-chuyển-tiếp-nhanh)"
+#: builtin/fetch.c:689
+msgid "non-fast-forward"
+msgstr "không-phải-chuyển-tiếp-nhanh"
-#: builtin/fetch.c:619
+#: builtin/fetch.c:733
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s đã không gửi tất cả các đối tượng cần thiết\n"
-#: builtin/fetch.c:637
+#: builtin/fetch.c:753
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "từ chối %s bởi vì các gốc nông thì không được phép cập nhật"
-#: builtin/fetch.c:724 builtin/fetch.c:816
+#: builtin/fetch.c:839 builtin/fetch.c:934
#, c-format
msgid "From %.*s\n"
msgstr "Từ %.*s\n"
-#: builtin/fetch.c:735
+#: builtin/fetch.c:850
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -6478,57 +6865,57 @@ msgstr ""
"một số tham chiếu nội bộ không thể được cập nhật; hãy thử chạy\n"
" “git remote prune %s†để bỠđi những nhánh cũ, hay bị xung đột"
-#: builtin/fetch.c:787
+#: builtin/fetch.c:904
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sẽ trở thành không đầu (không được quản lý))"
-#: builtin/fetch.c:788
+#: builtin/fetch.c:905
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s đã trở thành không đầu (không được quản lý))"
-#: builtin/fetch.c:820
+#: builtin/fetch.c:937
msgid "[deleted]"
msgstr "[đã xóa]"
-#: builtin/fetch.c:821 builtin/remote.c:1025
+#: builtin/fetch.c:938 builtin/remote.c:1020
msgid "(none)"
msgstr "(không)"
-#: builtin/fetch.c:841
+#: builtin/fetch.c:960
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
"Từ chối việc lấy vào trong nhánh hiện tại %s của một kho chứa không phải kho "
"trần (bare)"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:979
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Tùy chá»n \"%s\" có giá trị \"%s\" là không hợp lệ cho %s"
-#: builtin/fetch.c:863
+#: builtin/fetch.c:982
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Tùy chá»n \"%s\" bị bá» qua vá»›i %s\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1039
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Không biết làm cách nào để lấy vỠtừ %s"
-#: builtin/fetch.c:1080
+#: builtin/fetch.c:1199
#, c-format
msgid "Fetching %s\n"
msgstr "Äang lấy “%s†vá»\n"
-#: builtin/fetch.c:1082 builtin/remote.c:96
+#: builtin/fetch.c:1201 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "không thể “%s†vá»"
-#: builtin/fetch.c:1100
+#: builtin/fetch.c:1219
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -6536,32 +6923,32 @@ msgstr ""
"Chưa chỉ ra kho chứa máy chủ. Xin hãy chỉ định hoặc là URL hoặc\n"
"tên máy chủ từ cái mà những Ä‘iểm xét duyệt má»›i có thể được fetch (lấy vá»)."
-#: builtin/fetch.c:1123
+#: builtin/fetch.c:1242
msgid "You need to specify a tag name."
msgstr "Bạn phải định rõ tên thẻ."
-#: builtin/fetch.c:1165
+#: builtin/fetch.c:1284
msgid "--depth and --unshallow cannot be used together"
msgstr "tùy chá»n --depth và --unshallow không thể sá»­ dụng cùng vá»›i nhau"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1286
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow trên kho hoàn chỉnh là không hợp lý"
-#: builtin/fetch.c:1187
+#: builtin/fetch.c:1306
msgid "fetch --all does not take a repository argument"
msgstr "lệnh lấy vỠ\"fetch --all\" không lấy đối số kho chứa"
-#: builtin/fetch.c:1189
+#: builtin/fetch.c:1308
msgid "fetch --all does not make sense with refspecs"
msgstr "lệnh lấy vỠ\"fetch --all\" không hợp lý với refspecs"
-#: builtin/fetch.c:1200
+#: builtin/fetch.c:1319
#, c-format
msgid "No such remote or remote group: %s"
msgstr "không có nhóm máy chủ hay máy chủ như thế: %s"
-#: builtin/fetch.c:1208
+#: builtin/fetch.c:1327
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Việc lấy vỠcả một nhóm và chỉ định refspecs không hợp lý"
@@ -6648,63 +7035,63 @@ msgstr "chỉ hiển thị những tham chiếu mà nó không được hòa trá
msgid "print only refs which contain the commit"
msgstr "chỉ hiển thị những tham chiếu mà nó chứa lần chuyển giao"
-#: builtin/fsck.c:156 builtin/prune.c:140
-msgid "Checking connectivity"
-msgstr "Äang kiểm tra kết nối"
-
-#: builtin/fsck.c:486
+#: builtin/fsck.c:519
msgid "Checking object directories"
msgstr "Äang kiểm tra các thÆ° mục đối tượng"
-#: builtin/fsck.c:552
+#: builtin/fsck.c:588
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<các-tùy-chá»n>] [<đối-tượng>…]"
-#: builtin/fsck.c:558
+#: builtin/fsck.c:594
msgid "show unreachable objects"
msgstr "hiển thị các đối tượng không thể Ä‘á»c được"
-#: builtin/fsck.c:559
+#: builtin/fsck.c:595
msgid "show dangling objects"
msgstr "hiển thị các đối tượng không được quản lý"
-#: builtin/fsck.c:560
+#: builtin/fsck.c:596
msgid "report tags"
msgstr "báo cáo các thẻ"
-#: builtin/fsck.c:561
+#: builtin/fsck.c:597
msgid "report root nodes"
msgstr "báo cáo node gốc"
-#: builtin/fsck.c:562
+#: builtin/fsck.c:598
msgid "make index objects head nodes"
msgstr "tạo “index objects head nodesâ€"
-#: builtin/fsck.c:563
+#: builtin/fsck.c:599
msgid "make reflogs head nodes (default)"
msgstr "tạo “reflogs head nodes†(mặc định)"
-#: builtin/fsck.c:564
+#: builtin/fsck.c:600
msgid "also consider packs and alternate objects"
msgstr "cũng cân nhắc đến các đối tượng gói và thay thế"
-#: builtin/fsck.c:565
+#: builtin/fsck.c:601
msgid "check only connectivity"
msgstr "chỉ kiểm tra kết nối"
-#: builtin/fsck.c:566
+#: builtin/fsck.c:602
msgid "enable more strict checking"
msgstr "cho phép kiểm tra hạn chế hơn"
-#: builtin/fsck.c:568
+#: builtin/fsck.c:604
msgid "write dangling objects in .git/lost-found"
msgstr "ghi các đối tượng không được quản lý trong .git/lost-found"
-#: builtin/fsck.c:569 builtin/prune.c:107
+#: builtin/fsck.c:605 builtin/prune.c:107
msgid "show progress"
msgstr "hiển thị quá trình"
-#: builtin/fsck.c:630
+#: builtin/fsck.c:606
+msgid "show verbose names for reachable objects"
+msgstr "hiển thị tên chi tiết cho các đối tượng Ä‘á»c được"
+
+#: builtin/fsck.c:671
msgid "Checking objects"
msgstr "Äang kiểm tra các đối tượng"
@@ -6996,7 +7383,7 @@ msgstr "cho phép gá»i grep(1) (bị bá» qua bởi lần dịch này)"
msgid "no pattern given."
msgstr "chưa chỉ ra mẫu."
-#: builtin/grep.c:845 builtin/index-pack.c:1477
+#: builtin/grep.c:845 builtin/index-pack.c:1479
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "số tuyến chỉ ra không hợp lệ (%d)"
@@ -7142,328 +7529,324 @@ msgstr "không có trình xem trợ giúp dạng manpage tiếp hợp với yêu
msgid "no info viewer handled the request"
msgstr "không có trình xem trợ giúp dạng info tiếp hợp với yêu cầu"
-#: builtin/help.c:408
+#: builtin/help.c:401
msgid "Defining attributes per path"
msgstr "Äịnh nghÄ©a các thuá»™c tính cho má»—i Ä‘Æ°á»ng dẫn"
-#: builtin/help.c:409
+#: builtin/help.c:402
msgid "Everyday Git With 20 Commands Or So"
msgstr "Má»—i ngày há»c 20 lệnh Git hay hÆ¡n"
-#: builtin/help.c:410
+#: builtin/help.c:403
msgid "A Git glossary"
msgstr "Thuật ngữ chuyên môn Git"
-#: builtin/help.c:411
+#: builtin/help.c:404
msgid "Specifies intentionally untracked files to ignore"
msgstr "Chỉ định các tập tin không cần theo dõi"
-#: builtin/help.c:412
+#: builtin/help.c:405
msgid "Defining submodule properties"
msgstr "Äịnh nghÄ©a thuá»™c tính mô-Ä‘un-con"
-#: builtin/help.c:413
+#: builtin/help.c:406
msgid "Specifying revisions and ranges for Git"
msgstr "Chỉ định điểm xét duyệt và vùng cho Git"
-#: builtin/help.c:414
+#: builtin/help.c:407
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Hướng dẫn cách dùng Git ở mức cơ bản (bản 1.5.1 hay mới hơn)"
-#: builtin/help.c:415
+#: builtin/help.c:408
msgid "An overview of recommended workflows with Git"
msgstr "Tổng quan vỠluồng công việc khuyến nghị nên dùng với Git."
-#: builtin/help.c:427
+#: builtin/help.c:420
msgid "The common Git guides are:\n"
msgstr "Các chỉ dẫn chung vỠcách dùng Git là:\n"
-#: builtin/help.c:448 builtin/help.c:465
+#: builtin/help.c:441 builtin/help.c:458
#, c-format
msgid "usage: %s%s"
msgstr "cách dùng: %s%s"
-#: builtin/help.c:481
+#: builtin/help.c:474
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "“git %s†được đặt bí danh thành “%sâ€"
-#: builtin/index-pack.c:152
+#: builtin/index-pack.c:153
#, c-format
msgid "unable to open %s"
msgstr "không thể mở %s"
-#: builtin/index-pack.c:202
+#: builtin/index-pack.c:203
#, c-format
msgid "object type mismatch at %s"
msgstr "kiểu đối tượng không khớp tại %s"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:223
#, c-format
msgid "did not receive expected object %s"
msgstr "Không thể lấy vỠđối tượng cần %s"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "đối tượng %s: cần kiểu %s nhưng lại nhận được %s"
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:268
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "không thể Ä‘iá»n thêm vào %d byte"
-#: builtin/index-pack.c:277
+#: builtin/index-pack.c:278
msgid "early EOF"
msgstr "gặp kết thúc tập tin EOF quá sớm"
-#: builtin/index-pack.c:278
+#: builtin/index-pack.c:279
msgid "read error on input"
msgstr "lá»—i Ä‘á»c ở đầu vào"
-#: builtin/index-pack.c:290
+#: builtin/index-pack.c:291
msgid "used more bytes than were available"
msgstr "sá»­ dụng nhiá»u hÆ¡n số lượng byte mà nó sẵn có"
-#: builtin/index-pack.c:297
+#: builtin/index-pack.c:298
msgid "pack too large for current definition of off_t"
msgstr "gói quá lớn so với định nghĩa hiện tại của kiểu off_t"
-#: builtin/index-pack.c:313
+#: builtin/index-pack.c:314
#, c-format
msgid "unable to create '%s'"
msgstr "không thể tạo “%sâ€"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "cannot open packfile '%s'"
msgstr "không thể mở packfile “%sâ€"
-#: builtin/index-pack.c:332
+#: builtin/index-pack.c:333
msgid "pack signature mismatch"
msgstr "chữ ký cho gói không khớp"
-#: builtin/index-pack.c:334
+#: builtin/index-pack.c:335
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "không hỗ trợ phiên bản gói %<PRIu32>"
-#: builtin/index-pack.c:352
+#: builtin/index-pack.c:353
#, c-format
-msgid "pack has bad object at offset %lu: %s"
-msgstr "gói có đối tượng sai khoảng bù (offset) %lu: %s"
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "gói có đối tượng sai tại khoảng bù %<PRIuMAX>: %s"
-#: builtin/index-pack.c:473
+#: builtin/index-pack.c:475
#, c-format
msgid "inflate returned %d"
msgstr "xả nén trả vỠ%d"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:524
msgid "offset value overflow for delta base object"
msgstr "tràn giá trị khoảng bù cho đối tượng delta cơ sở"
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:532
msgid "delta base offset is out of bound"
msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm vi"
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:540
#, c-format
msgid "unknown object type %d"
msgstr "không hiểu kiểu đối tượng %d"
-#: builtin/index-pack.c:569
+#: builtin/index-pack.c:571
msgid "cannot pread pack file"
msgstr "không thể chạy hàm pread cho tập tin gói"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:573
#, c-format
-msgid "premature end of pack file, %lu byte missing"
-msgid_plural "premature end of pack file, %lu bytes missing"
-msgstr[0] "tập tin gói bị kết thúc sớm, thiếu %lu byte"
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+msgstr[0] "tập tin gói bị kết thúc sớm, thiếu %<PRIuMAX> byte"
-#: builtin/index-pack.c:597
+#: builtin/index-pack.c:599
msgid "serious inflate inconsistency"
msgstr "sá»± mâu thuẫn xả nén nghiêm trá»ng"
-#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
-#: builtin/index-pack.c:806 builtin/index-pack.c:815
+#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
+#: builtin/index-pack.c:808 builtin/index-pack.c:817
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "Sá»° VA CHẠM SHA1 ÄÃ XẢY RA VỚI %s!"
-#: builtin/index-pack.c:746 builtin/pack-objects.c:162
-#: builtin/pack-objects.c:254
+#: builtin/index-pack.c:748 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:256
#, c-format
msgid "unable to read %s"
msgstr "không thể Ä‘á»c %s"
-#: builtin/index-pack.c:812
+#: builtin/index-pack.c:814
#, c-format
msgid "cannot read existing object %s"
msgstr "không thể Ä‘á»c đối tượng đã tồn tại %s"
-#: builtin/index-pack.c:826
+#: builtin/index-pack.c:828
#, c-format
msgid "invalid blob object %s"
msgstr "đối tượng blob không hợp lệ %s"
-#: builtin/index-pack.c:840
+#: builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr "%s không hợp lệ"
-#: builtin/index-pack.c:843
+#: builtin/index-pack.c:845
msgid "Error in object"
msgstr "Lỗi trong đối tượng"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Không phải tất cả các đối tượng con của %s là có thể với tới được"
-#: builtin/index-pack.c:917 builtin/index-pack.c:948
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "gặp lỗi khi áp dụng delta"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1120
msgid "Receiving objects"
msgstr "Äang nhận vá» các đối tượng"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1120
msgid "Indexing objects"
msgstr "Các đối tượng bảng mục lục"
-#: builtin/index-pack.c:1150
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "gói bị sai há»ng (SHA1 không khá»›p)"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "không thể lấy thông tin thống kê packfile"
-#: builtin/index-pack.c:1158
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "pack có phần thừa ở cuối"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1171
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "lộn xộn hơn cả điên rồ khi chạy hàm parse_pack_objects()"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1196
msgid "Resolving deltas"
msgstr "Äang phân giải các delta"
-#: builtin/index-pack.c:1205
+#: builtin/index-pack.c:1207
#, c-format
msgid "unable to create thread: %s"
msgstr "không thể tạo tuyến: %s"
-#: builtin/index-pack.c:1247
+#: builtin/index-pack.c:1249
msgid "confusion beyond insanity"
msgstr "lộn xộn hơn cả điên rồ"
-#: builtin/index-pack.c:1253
+#: builtin/index-pack.c:1255
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "đầy đủ với %d đối tượng nội bộ"
-#: builtin/index-pack.c:1265
+#: builtin/index-pack.c:1267
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Gặp tổng kiểm tra tail không cần cho %s (Ä‘Ä©a há»ng?)"
-#: builtin/index-pack.c:1269
+#: builtin/index-pack.c:1271
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "gói có %d delta chưa được giải quyết"
-#: builtin/index-pack.c:1293
+#: builtin/index-pack.c:1295
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "không thể xả nén đối tượng nối thêm (%d)"
-#: builtin/index-pack.c:1369
+#: builtin/index-pack.c:1371
#, c-format
msgid "local object %s is corrupt"
msgstr "đối tượng ná»™i bá»™ %s bị há»ng"
-#: builtin/index-pack.c:1393
+#: builtin/index-pack.c:1395
msgid "error while closing pack file"
msgstr "gặp lỗi trong khi đóng tập tin gói"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1408
#, c-format
msgid "cannot write keep file '%s'"
msgstr "không thể ghi tập tin giữ lại “%sâ€"
-#: builtin/index-pack.c:1414
+#: builtin/index-pack.c:1416
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "không thể đóng tập tin giữ lại đã được ghi “%sâ€"
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1429
msgid "cannot store pack file"
msgstr "không thể lưu tập tin gói"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1440
msgid "cannot store index file"
msgstr "không thể lưu trữ tập tin ghi mục lục"
-#: builtin/index-pack.c:1471
+#: builtin/index-pack.c:1473
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "sai pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
+#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr "không hỗ trợ đa tuyến, bỠqua %s"
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Không thể mở tập tin gói đã sẵn có “%sâ€"
-#: builtin/index-pack.c:1542
+#: builtin/index-pack.c:1544
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Không thể mở tập tin idx của gói cho “%sâ€"
-#: builtin/index-pack.c:1589
+#: builtin/index-pack.c:1591
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "không delta: %d đối tượng"
-#: builtin/index-pack.c:1596
+#: builtin/index-pack.c:1598
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "chiá»u dài xích = %d: %lu đối tượng"
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1611
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "tên tập tin tập tin gói “%s†không được kết thúc bằng Ä‘uôi “.packâ€"
-#: builtin/index-pack.c:1638
-msgid "Cannot come back to cwd"
-msgstr "Không thể quay lại cwd"
-
-#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
-#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
+#: builtin/index-pack.c:1693 builtin/index-pack.c:1696
+#: builtin/index-pack.c:1712 builtin/index-pack.c:1716
#, c-format
msgid "bad %s"
msgstr "%s sai"
-#: builtin/index-pack.c:1723
+#: builtin/index-pack.c:1730
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin không thể được dùng mà không có --stdin"
-#: builtin/index-pack.c:1731
+#: builtin/index-pack.c:1738
msgid "--verify with no packfile name given"
msgstr "dùng tùy chá»n --verify mà không Ä‘Æ°a ra tên packfile"
@@ -7527,27 +7910,27 @@ msgstr "không thể xử lý (handle) tập tin kiểu %d"
msgid "unable to move %s to %s"
msgstr "không di chuyển được %s vào %s"
-#. TRANSLATORS: The first '%s' is either "Reinitialized
-#. existing" or "Initialized empty", the second " shared" or
-#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:403
+#: builtin/init-db.c:402
#, c-format
-msgid "%s%s Git repository in %s%s\n"
-msgstr "%s%s kho Git trong %s%s\n"
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "Äã khởi tạo lại kho Git chia sẻ sẵn có trong %s%s\n"
-#: builtin/init-db.c:404
-msgid "Reinitialized existing"
-msgstr "Khởi tạo lại đã sẵn có rồi"
+#: builtin/init-db.c:403
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "Äã khởi tạo lại kho Git sẵn có trong %s%s\n"
-#: builtin/init-db.c:404
-msgid "Initialized empty"
-msgstr "Khởi tạo trống rỗng"
+#: builtin/init-db.c:407
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "Äã khởi tạo lại kho Git chia sẻ trống rá»—ng sẵn có trong %s%s\n"
-#: builtin/init-db.c:405
-msgid " shared"
-msgstr " đã chia sẻ"
+#: builtin/init-db.c:408
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "Äã khởi tạo lại kho Git trống rá»—ng sẵn có trong %s%s\n"
-#: builtin/init-db.c:452
+#: builtin/init-db.c:455
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7555,25 +7938,25 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<thư-mục-tạm>] [--shared[=<các-"
"quyá»n>]] [thÆ°-mục]"
-#: builtin/init-db.c:475
+#: builtin/init-db.c:478
msgid "permissions"
msgstr "các quyá»n"
-#: builtin/init-db.c:476
+#: builtin/init-db.c:479
msgid "specify that the git repository is to be shared amongst several users"
msgstr "chỉ ra cái mà kho git được chia sẻ giữa nhiá»u ngÆ°á»i dùng"
-#: builtin/init-db.c:510 builtin/init-db.c:515
+#: builtin/init-db.c:513 builtin/init-db.c:518
#, c-format
msgid "cannot mkdir %s"
msgstr "không thể mkdir (tạo thư mục): %s"
-#: builtin/init-db.c:519
+#: builtin/init-db.c:522
#, c-format
msgid "cannot chdir to %s"
msgstr "không thể chdir (chuyển đổi thư mục) sang %s"
-#: builtin/init-db.c:540
+#: builtin/init-db.c:543
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7582,7 +7965,7 @@ msgstr ""
"%s (hoặc --work-tree=<thư-mục>) không cho phép không chỉ định %s (hoặc --git-"
"dir=<thư-mục>)"
-#: builtin/init-db.c:568
+#: builtin/init-db.c:571
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "không thể truy cập cây (tree) làm việc “%sâ€"
@@ -7615,115 +7998,115 @@ msgstr "bộ dò vết cần thêm"
msgid "no input file given for in-place editing"
msgstr "không đưa ra tập tin đầu vào để sửa tại-chỗ"
-#: builtin/log.c:43
+#: builtin/log.c:44
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<các-tùy-chá»n>] [<vùng-xem-xét>] [[--] <Ä‘Æ°á»ng-dẫn>…]"
-#: builtin/log.c:44
+#: builtin/log.c:45
msgid "git show [<options>] <object>..."
msgstr "git show [<các-tùy-chá»n>] <đối-tượng>…"
-#: builtin/log.c:83
+#: builtin/log.c:84
#, c-format
msgid "invalid --decorate option: %s"
msgstr "tùy chá»n--decorate không hợp lệ: %s"
-#: builtin/log.c:137
+#: builtin/log.c:139
msgid "suppress diff output"
msgstr "chặn má»i kết xuất từ diff"
-#: builtin/log.c:138
+#: builtin/log.c:140
msgid "show source"
msgstr "hiển thị mã nguồn"
-#: builtin/log.c:139
+#: builtin/log.c:141
msgid "Use mail map file"
msgstr "Sử dụng tập tin ánh xạ thư"
-#: builtin/log.c:140
+#: builtin/log.c:142
msgid "decorate options"
msgstr "các tùy chá»n trang trí"
-#: builtin/log.c:143
+#: builtin/log.c:145
msgid "Process line range n,m in file, counting from 1"
msgstr "Xử lý chỉ dòng vùng n,m trong tập tin, tính từ 1"
-#: builtin/log.c:239
+#: builtin/log.c:241
#, c-format
msgid "Final output: %d %s\n"
msgstr "Kết xuất cuối cùng: %d %s\n"
-#: builtin/log.c:471
+#: builtin/log.c:486
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: sai tập tin"
-#: builtin/log.c:485 builtin/log.c:578
+#: builtin/log.c:500 builtin/log.c:594
#, c-format
msgid "Could not read object %s"
msgstr "Không thể Ä‘á»c đối tượng %s"
-#: builtin/log.c:602
+#: builtin/log.c:618
#, c-format
msgid "Unknown type: %d"
msgstr "Không nhận ra kiểu: %d"
-#: builtin/log.c:722
+#: builtin/log.c:739
msgid "format.headers without value"
msgstr "format.headers không có giá trị cụ thể"
-#: builtin/log.c:812
+#: builtin/log.c:839
msgid "name of output directory is too long"
msgstr "tên của thư mục kết xuất quá dài"
-#: builtin/log.c:827
+#: builtin/log.c:854
#, c-format
msgid "Cannot open patch file %s"
msgstr "Không thể mở tập tin miếng vá: %s"
-#: builtin/log.c:841
+#: builtin/log.c:868
msgid "Need exactly one range."
msgstr "Cần chính xác một vùng."
-#: builtin/log.c:851
+#: builtin/log.c:878
msgid "Not a range."
msgstr "Không phải là một vùng."
-#: builtin/log.c:957
+#: builtin/log.c:984
msgid "Cover letter needs email format"
msgstr "“Cover letter†cần cho định dạng thư"
-#: builtin/log.c:1036
+#: builtin/log.c:1064
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to điên rồ: %s"
-#: builtin/log.c:1064
+#: builtin/log.c:1092
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<các-tùy-chá»n>] [<kể-từ> | <vùng-xem-xét>]"
-#: builtin/log.c:1109
+#: builtin/log.c:1137
msgid "Two output directories?"
msgstr "Hai thư mục kết xuất?"
-#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
#, c-format
msgid "Unknown commit %s"
msgstr "Không hiểu lần chuyển giao %s"
-#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
-#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
-#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
-#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
+#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
+#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
+#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Gặp lỗi khi phân giải “%s†như là một tham chiếu hợp lệ."
-#: builtin/log.c:1231
+#: builtin/log.c:1259
msgid "Could not find exact merge base."
msgstr "Không tìm thấy ná»n hòa trá»™n chính xác."
-#: builtin/log.c:1235
+#: builtin/log.c:1263
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -7734,210 +8117,210 @@ msgstr ""
"nhánh máy chủ. Hoặc là bạn có thể chỉ định lần chuyển giao ná»n bằng\n"
"\"--base=<base-commit-id>\" một cách thủ công."
-#: builtin/log.c:1255
+#: builtin/log.c:1283
msgid "Failed to find exact merge base"
msgstr "Gặp lá»—i khi tìm ná»n hòa trá»™n chính xác."
-#: builtin/log.c:1266
+#: builtin/log.c:1294
msgid "base commit should be the ancestor of revision list"
msgstr "lần chuyển giao ná»n không là tổ tiên của danh sách Ä‘iểm xét duyệt"
-#: builtin/log.c:1270
+#: builtin/log.c:1298
msgid "base commit shouldn't be in revision list"
msgstr "lần chuyển giao ná»n không được trong danh sách Ä‘iểm xét duyệt"
-#: builtin/log.c:1319
+#: builtin/log.c:1347
msgid "cannot get patch id"
msgstr "không thể lấy mã miếng vá"
-#: builtin/log.c:1377
+#: builtin/log.c:1404
msgid "use [PATCH n/m] even with a single patch"
msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn"
-#: builtin/log.c:1380
+#: builtin/log.c:1407
msgid "use [PATCH] even with multiple patches"
msgstr "dùng [VÃ] ngay cả vá»›i các miếng vá phức tạp"
-#: builtin/log.c:1384
+#: builtin/log.c:1411
msgid "print patches to standard out"
msgstr "hiển thị miếng vá ra đầu ra chuẩn"
-#: builtin/log.c:1386
+#: builtin/log.c:1413
msgid "generate a cover letter"
msgstr "tạo bì thư"
-#: builtin/log.c:1388
+#: builtin/log.c:1415
msgid "use simple number sequence for output file names"
msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra"
-#: builtin/log.c:1389
+#: builtin/log.c:1416
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1390
+#: builtin/log.c:1417
msgid "use <sfx> instead of '.patch'"
msgstr "sá»­ dụng <sfx> thay cho “.patchâ€"
-#: builtin/log.c:1392
+#: builtin/log.c:1419
msgid "start numbering patches at <n> instead of 1"
msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1"
-#: builtin/log.c:1394
+#: builtin/log.c:1421
msgid "mark the series as Nth re-roll"
msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll"
-#: builtin/log.c:1396
+#: builtin/log.c:1423
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Dùng [<tiá»n-tố>] thay cho [VÃ]"
-#: builtin/log.c:1399
+#: builtin/log.c:1426
msgid "store resulting files in <dir>"
msgstr "lưu các tập tin kết quả trong <t.mục>"
-#: builtin/log.c:1402
+#: builtin/log.c:1429
msgid "don't strip/add [PATCH]"
msgstr "không strip/add [VÃ]"
-#: builtin/log.c:1405
+#: builtin/log.c:1432
msgid "don't output binary diffs"
msgstr "không kết xuất diff (những khác biệt) nhị phân"
-#: builtin/log.c:1407
+#: builtin/log.c:1434
msgid "output all-zero hash in From header"
msgstr "xuất má»i mã băm all-zero trong phần đầu From"
-#: builtin/log.c:1409
+#: builtin/log.c:1436
msgid "don't include a patch matching a commit upstream"
msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn"
-#: builtin/log.c:1411
+#: builtin/log.c:1438
msgid "show patch format instead of default (patch + stat)"
msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)"
-#: builtin/log.c:1413
+#: builtin/log.c:1440
msgid "Messaging"
msgstr "Lá»i nhắn"
-#: builtin/log.c:1414
+#: builtin/log.c:1441
msgid "header"
msgstr "đầu đỠthư"
-#: builtin/log.c:1415
+#: builtin/log.c:1442
msgid "add email header"
msgstr "thêm đầu đỠthư"
-#: builtin/log.c:1416 builtin/log.c:1418
+#: builtin/log.c:1443 builtin/log.c:1445
msgid "email"
msgstr "thư điện tử"
-#: builtin/log.c:1416
+#: builtin/log.c:1443
msgid "add To: header"
msgstr "thêm To: đầu đỠthư"
-#: builtin/log.c:1418
+#: builtin/log.c:1445
msgid "add Cc: header"
msgstr "thêm Cc: đầu đỠthư"
-#: builtin/log.c:1420
+#: builtin/log.c:1447
msgid "ident"
msgstr "thụt lá»"
-#: builtin/log.c:1421
+#: builtin/log.c:1448
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"đặt “Äịa chỉ gá»­i†thành <thụ lá»> (hoặc thụt lá» ngÆ°á»i commit nếu bá» quên)"
-#: builtin/log.c:1423
+#: builtin/log.c:1450
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1424
+#: builtin/log.c:1451
msgid "make first mail a reply to <message-id>"
msgstr "dùng thÆ° đầu tiên để trả lá»i <message-id>"
-#: builtin/log.c:1425 builtin/log.c:1428
+#: builtin/log.c:1452 builtin/log.c:1455
msgid "boundary"
msgstr "ranh giá»›i"
-#: builtin/log.c:1426
+#: builtin/log.c:1453
msgid "attach the patch"
msgstr "đính kèm miếng vá"
-#: builtin/log.c:1429
+#: builtin/log.c:1456
msgid "inline the patch"
msgstr "dùng miếng vá làm nội dung"
-#: builtin/log.c:1433
+#: builtin/log.c:1460
msgid "enable message threading, styles: shallow, deep"
msgstr "cho phép luồng lá»i nhắn, kiểu: “shallowâ€, “deepâ€"
-#: builtin/log.c:1435
+#: builtin/log.c:1462
msgid "signature"
msgstr "chữ ký"
-#: builtin/log.c:1436
+#: builtin/log.c:1463
msgid "add a signature"
msgstr "thêm chữ ký"
-#: builtin/log.c:1437
+#: builtin/log.c:1464
msgid "base-commit"
msgstr "lần_chuyển_giao_ná»n"
-#: builtin/log.c:1438
+#: builtin/log.c:1465
msgid "add prerequisite tree info to the patch series"
msgstr "add trÆ°á»›c hết đòi há»i thông tin cây tá»›i sê-ri miếng vá"
-#: builtin/log.c:1440
+#: builtin/log.c:1467
msgid "add a signature from a file"
msgstr "thêm chữ ký từ một tập tin"
-#: builtin/log.c:1441
+#: builtin/log.c:1468
msgid "don't print the patch filenames"
msgstr "không hiển thị các tên tập tin của miếng vá"
-#: builtin/log.c:1531
+#: builtin/log.c:1558
msgid "-n and -k are mutually exclusive."
msgstr "-n và -k loại từ lẫn nhau."
-#: builtin/log.c:1533
+#: builtin/log.c:1560
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix và -k xung khắc nhau."
-#: builtin/log.c:1541
+#: builtin/log.c:1568
msgid "--name-only does not make sense"
msgstr "--name-only không hợp lý"
-#: builtin/log.c:1543
+#: builtin/log.c:1570
msgid "--name-status does not make sense"
msgstr "--name-status không hợp lý"
-#: builtin/log.c:1545
+#: builtin/log.c:1572
msgid "--check does not make sense"
msgstr "--check không hợp lý"
-#: builtin/log.c:1573
+#: builtin/log.c:1602
msgid "standard output, or directory, which one?"
msgstr "đầu ra chuẩn, hay thÆ° mục, chá»n cái nào?"
-#: builtin/log.c:1575
+#: builtin/log.c:1604
#, c-format
msgid "Could not create directory '%s'"
msgstr "Không thể tạo thÆ° mục “%sâ€"
-#: builtin/log.c:1672
+#: builtin/log.c:1698
#, c-format
msgid "unable to read signature file '%s'"
msgstr "không thể Ä‘á»c tập tin chữ ký “%sâ€"
-#: builtin/log.c:1743
+#: builtin/log.c:1769
msgid "Failed to create output files"
msgstr "Gặp lỗi khi tạo các tập tin kết xuất"
-#: builtin/log.c:1792
+#: builtin/log.c:1818
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]"
-#: builtin/log.c:1846
+#: builtin/log.c:1872
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7945,102 +8328,102 @@ msgstr ""
"Không tìm thấy nhánh mạng được theo dõi, hãy chỉ định <thượng-nguồn> một "
"cách thủ công.\n"
-#: builtin/ls-files.c:378
+#: builtin/ls-files.c:379
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<các-tùy-chá»n>] [<tập-tin>…]"
-#: builtin/ls-files.c:427
+#: builtin/ls-files.c:428
msgid "identify the file status with tags"
msgstr "nhận dạng các trạng thái tập tin với thẻ"
-#: builtin/ls-files.c:429
+#: builtin/ls-files.c:430
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
"dùng chữ cái viết thÆ°á»ng cho các tập tin “assume unchanged†(giả định không "
"thay đổi)"
-#: builtin/ls-files.c:431
+#: builtin/ls-files.c:432
msgid "show cached files in the output (default)"
msgstr "hiển thị các tập tin được nhớ tạm vào đầu ra (mặc định)"
-#: builtin/ls-files.c:433
+#: builtin/ls-files.c:434
msgid "show deleted files in the output"
msgstr "hiển thị các tập tin đã xóa trong kết xuất"
-#: builtin/ls-files.c:435
+#: builtin/ls-files.c:436
msgid "show modified files in the output"
msgstr "hiển thị các tập tin đã bị sửa đổi ra kết xuất"
-#: builtin/ls-files.c:437
+#: builtin/ls-files.c:438
msgid "show other files in the output"
msgstr "hiển thị các tập tin khác trong kết xuất"
-#: builtin/ls-files.c:439
+#: builtin/ls-files.c:440
msgid "show ignored files in the output"
msgstr "hiển thị các tập tin bị bỠqua trong kết xuất"
-#: builtin/ls-files.c:442
+#: builtin/ls-files.c:443
msgid "show staged contents' object name in the output"
msgstr "hiển thị tên đối tượng của nội dung được đặt lên bệ phóng ra kết xuất"
-#: builtin/ls-files.c:444
+#: builtin/ls-files.c:445
msgid "show files on the filesystem that need to be removed"
msgstr "hiển thị các tập tin trên hệ thống tập tin mà nó cần được gỡ bá»"
-#: builtin/ls-files.c:446
+#: builtin/ls-files.c:447
msgid "show 'other' directories' names only"
msgstr "chỉ hiển thị tên của các thÆ° mục “khácâ€"
-#: builtin/ls-files.c:448
+#: builtin/ls-files.c:449
msgid "show line endings of files"
msgstr "hiển thị kết thúc dòng của các tập tin"
-#: builtin/ls-files.c:450
+#: builtin/ls-files.c:451
msgid "don't show empty directories"
msgstr "không hiển thị thư mục rỗng"
-#: builtin/ls-files.c:453
+#: builtin/ls-files.c:454
msgid "show unmerged files in the output"
msgstr "hiển thị các tập tin chưa hòa trộn trong kết xuất"
-#: builtin/ls-files.c:455
+#: builtin/ls-files.c:456
msgid "show resolve-undo information"
msgstr "hiển thị thông tin resolve-undo"
-#: builtin/ls-files.c:457
+#: builtin/ls-files.c:458
msgid "skip files matching pattern"
msgstr "bỠqua những tập tin khớp với một mẫu"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:461
msgid "exclude patterns are read from <file>"
msgstr "mẫu loại trừ được Ä‘á»c từ <tập tin>"
-#: builtin/ls-files.c:463
+#: builtin/ls-files.c:464
msgid "read additional per-directory exclude patterns in <file>"
msgstr "Ä‘á»c thêm các mẫu ngoại trừ má»—i thÆ° mục trong <tập tin>"
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:466
msgid "add the standard git exclusions"
msgstr "thêm loại trừ tiêu chuẩn kiểu git"
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:469
msgid "make the output relative to the project top directory"
msgstr "làm cho kết xuất liên quan đến thư mục ở mức cao nhất (gốc) của dự án"
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:472
msgid "if any <file> is not in the index, treat this as an error"
msgstr "nếu <tập tin> bất kỳ không ở trong bảng mục lục, xử lý nó như một lỗi"
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:473
msgid "tree-ish"
msgstr "tree-ish"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:474
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"giả định rằng các Ä‘Æ°á»ng dẫn đã bị gỡ bá» kể từ <tree-ish> nay vẫn hiện diện"
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:476
msgid "show debugging data"
msgstr "hiển thị dữ liệu gỡ lỗi"
@@ -8126,190 +8509,176 @@ msgstr "dùng tên Ä‘Æ°á»ng dẫn đầy đủ"
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "liệt kê cây mục tin; không chỉ thư mục hiện hành (ngụ ý --full-name)"
-#: builtin/merge.c:45
+#: builtin/merge.c:46
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<các-tùy-chá»n>] [<commit>…]"
-#: builtin/merge.c:46
+#: builtin/merge.c:47
msgid "git merge [<options>] <msg> HEAD <commit>"
msgstr "git merge [<các-tùy-chá»n>] <tin-nhắn> HEAD <commit>"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:101
+#: builtin/merge.c:102
msgid "switch `m' requires a value"
msgstr "switch “m†yêu cầu một giá trị"
-#: builtin/merge.c:138
+#: builtin/merge.c:139
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Không tìm thấy chiến lược hòa trá»™n “%sâ€.\n"
-#: builtin/merge.c:139
+#: builtin/merge.c:140
#, c-format
msgid "Available strategies are:"
msgstr "Các chiến lược sẵn sàng là:"
-#: builtin/merge.c:144
+#: builtin/merge.c:145
#, c-format
msgid "Available custom strategies are:"
msgstr "Các chiến lược tùy chỉnh sẵn sàng là:"
-#: builtin/merge.c:194 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:126
msgid "do not show a diffstat at the end of the merge"
msgstr "không hiển thị thống kê khác biệt tại cuối của lần hòa trộn"
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:129
msgid "show a diffstat at the end of the merge"
msgstr "hiển thị thống kê khác biệt tại cuối của hòa trộn"
-#: builtin/merge.c:198 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:132
msgid "(synonym to --stat)"
msgstr "(đồng nghĩa với --stat)"
-#: builtin/merge.c:200 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:135
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "thêm (ít nhất <n>) mục từ shortlog cho ghi chú chuyển giao hòa trộn"
-#: builtin/merge.c:203 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:138
msgid "create a single commit instead of doing a merge"
msgstr "tạo một lần chuyển giao đưon thay vì thực hiện việc hòa trộn"
-#: builtin/merge.c:205 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:141
msgid "perform a commit if the merge succeeds (default)"
msgstr "thực hiện chuyển giao nếu hòa trộn thành công (mặc định)"
-#: builtin/merge.c:207 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:144
msgid "edit message before committing"
msgstr "sửa chú thích trước khi chuyển giao"
-#: builtin/merge.c:208
+#: builtin/merge.c:209
msgid "allow fast-forward (default)"
msgstr "cho phép chuyển-tiếp-nhanh (mặc định)"
-#: builtin/merge.c:210 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:150
msgid "abort if fast-forward is not possible"
msgstr "bỠqua nếu chuyển-tiếp-nhanh không thể được"
-#: builtin/merge.c:214
-msgid "Verify that the named commit has a valid GPG signature"
-msgstr "Thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không"
+#: builtin/merge.c:215 builtin/pull.c:153
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không"
-#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157
#: builtin/revert.c:89
msgid "strategy"
msgstr "chiến lược"
-#: builtin/merge.c:216 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:158
msgid "merge strategy to use"
msgstr "chiến lược hòa trộn sẽ dùng"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:161
msgid "option=value"
msgstr "tùy_chá»n=giá_trị"
-#: builtin/merge.c:218 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:162
msgid "option for selected merge strategy"
msgstr "tùy chá»n cho chiến lược hòa trá»™n đã chá»n"
-#: builtin/merge.c:220
+#: builtin/merge.c:221
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"hòa trộn ghi chú của lần chuyển giao (dành cho hòa trộn không-chuyển-tiếp-"
"nhanh)"
-#: builtin/merge.c:224
+#: builtin/merge.c:225
msgid "abort the current in-progress merge"
msgstr "bãi bỠquá trình hòa trộn hiện tại đang thực hiện"
-#: builtin/merge.c:226 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:169
msgid "allow merging unrelated histories"
msgstr "cho phép hòa trộn lịch sử không liên quan"
-#: builtin/merge.c:254
+#: builtin/merge.c:255
msgid "could not run stash."
msgstr "không thể chạy stash."
-#: builtin/merge.c:259
+#: builtin/merge.c:260
msgid "stash failed"
msgstr "lệnh tạm cất gặp lỗi"
-#: builtin/merge.c:264
+#: builtin/merge.c:265
#, c-format
msgid "not a valid object: %s"
msgstr "không phải là một đối tượng hợp lệ: %s"
-#: builtin/merge.c:283 builtin/merge.c:300
+#: builtin/merge.c:284 builtin/merge.c:301
msgid "read-tree failed"
msgstr "read-tree gặp lỗi"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
msgid " (nothing to squash)"
msgstr " (không có gì để squash)"
-#: builtin/merge.c:343
+#: builtin/merge.c:342
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Squash commit -- không cập nhật HEAD\n"
-#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
-#: builtin/merge.c:1000
-#, c-format
-msgid "Could not write to '%s'"
-msgstr "Không thể ghi vào “%sâ€"
-
-#: builtin/merge.c:375
-msgid "Writing SQUASH_MSG"
-msgstr "Äang ghi SQUASH_MSG"
-
-#: builtin/merge.c:377
-msgid "Finishing SQUASH_MSG"
-msgstr "Hoàn thành SQUASH_MSG"
-
-#: builtin/merge.c:400
+#: builtin/merge.c:392
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Không có lá»i chú thích hòa trá»™n -- nên không cập nhật HEAD\n"
-#: builtin/merge.c:451
+#: builtin/merge.c:443
#, c-format
msgid "'%s' does not point to a commit"
msgstr "“%s†không chỉ đến một lần chuyển giao nào cả"
-#: builtin/merge.c:541
+#: builtin/merge.c:533
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Chuá»—i branch.%s.mergeoptions sai: %s"
-#: builtin/merge.c:660
+#: builtin/merge.c:652
msgid "Not handling anything other than two heads merge."
msgstr "Không cầm nắm gì ngoài hai head hòa trộn"
-#: builtin/merge.c:674
+#: builtin/merge.c:666
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Không hiểu tùy chá»n cho merge-recursive: -X%s"
-#: builtin/merge.c:687
+#: builtin/merge.c:681
#, c-format
msgid "unable to write %s"
msgstr "không thể ghi %s"
-#: builtin/merge.c:776
+#: builtin/merge.c:733
#, c-format
msgid "Could not read from '%s'"
msgstr "Không thể Ä‘á»c từ “%sâ€"
-#: builtin/merge.c:785
+#: builtin/merge.c:742
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Vẫn chưa hòa trộn các lần chuyển giao; sử dụng lệnh “git commit†để hoàn tất "
"việc hòa trộn.\n"
-#: builtin/merge.c:791
+#: builtin/merge.c:748
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -8327,55 +8696,69 @@ msgstr ""
"rá»—ng\n"
"sẽ hủy bỠlần chuyển giao.\n"
-#: builtin/merge.c:815
+#: builtin/merge.c:772
msgid "Empty commit message."
msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng."
-#: builtin/merge.c:835
+#: builtin/merge.c:792
#, c-format
msgid "Wonderful.\n"
msgstr "Tuyệt vá»i.\n"
-#: builtin/merge.c:890
+#: builtin/merge.c:847
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Việc tự động hòa trộn gặp lỗi; hãy sửa các xung đột sau đó chuyển giao kết "
"quả.\n"
-#: builtin/merge.c:906
+#: builtin/merge.c:863
#, c-format
msgid "'%s' is not a commit"
msgstr "%s không phải là một lần commit (chuyển giao)"
-#: builtin/merge.c:947
+#: builtin/merge.c:904
msgid "No current branch."
msgstr "không phải nhánh hiện hành"
-#: builtin/merge.c:949
+#: builtin/merge.c:906
msgid "No remote for the current branch."
msgstr "Không có máy chủ cho nhánh hiện hành."
-#: builtin/merge.c:951
+#: builtin/merge.c:908
msgid "No default upstream defined for the current branch."
msgstr "Không có thượng nguồn mặc định được định nghĩa cho nhánh hiện hành."
-#: builtin/merge.c:956
+#: builtin/merge.c:913
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Không nhánh mạng theo dõi cho %s từ %s"
-#: builtin/merge.c:1091
+#: builtin/merge.c:960
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Giá trị sai “%s†trong biến môi trÆ°á»ng “%sâ€"
+
+#: builtin/merge.c:1034
#, c-format
msgid "could not close '%s'"
msgstr "không thể đóng “%sâ€"
-#: builtin/merge.c:1219
+#: builtin/merge.c:1061
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "không phải là một số thứ chúng tôi có thể hòa trộn trong %s: %s"
+
+#: builtin/merge.c:1095
+msgid "not something we can merge"
+msgstr "không phải là một số thứ chúng tôi có thể hòa trộn"
+
+#: builtin/merge.c:1162
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
"Ở đây không có lần hòa trộn nào được hủy bỠgiữa chừng cả (thiếu MERGE_HEAD)."
-#: builtin/merge.c:1235
+#: builtin/merge.c:1178
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8383,7 +8766,7 @@ msgstr ""
"Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại).\n"
"Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
-#: builtin/merge.c:1242
+#: builtin/merge.c:1185
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8391,107 +8774,115 @@ msgstr ""
"Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n"
"Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
-#: builtin/merge.c:1245
+#: builtin/merge.c:1188
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại)."
-#: builtin/merge.c:1254
+#: builtin/merge.c:1197
msgid "You cannot combine --squash with --no-ff."
msgstr "Bạn không thể kết hợp --squash với --no-ff."
-#: builtin/merge.c:1262
+#: builtin/merge.c:1205
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Không chỉ ra lần chuyển giao và merge.defaultToUpstream chưa được đặt."
-#: builtin/merge.c:1279
+#: builtin/merge.c:1222
msgid "Squash commit into empty head not supported yet"
msgstr "Squash commit vào một head trống rỗng vẫn chưa được hỗ trợ"
-#: builtin/merge.c:1281
+#: builtin/merge.c:1224
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Chuyển giao không-chuyển-tiếp-nhanh không hợp lý ở trong một head trống rỗng"
-#: builtin/merge.c:1286
+#: builtin/merge.c:1229
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - không phải là một số thứ chúng tôi có thể hòa trộn"
-#: builtin/merge.c:1288
+#: builtin/merge.c:1231
msgid "Can merge only exactly one commit into empty head"
msgstr ""
"Không thể hòa trộn một cách đúng đắn một lần chuyển giao vào một head rỗng"
-#: builtin/merge.c:1344
+#: builtin/merge.c:1287
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Lần chuyển giao %s có một chữ ký GPG không đáng tin, được cho là bởi %s."
-#: builtin/merge.c:1347
+#: builtin/merge.c:1290
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Lần chuyển giao %s có một chữ ký GPG sai, được cho là bởi %s."
-#: builtin/merge.c:1350
+#: builtin/merge.c:1293
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Lần chuyển giao %s không có chữ ký GPG."
-#: builtin/merge.c:1353
+#: builtin/merge.c:1296
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Lần chuyển giao %s có một chữ ký GPG tốt bởi %s\n"
-#: builtin/merge.c:1415
+#: builtin/merge.c:1358
msgid "refusing to merge unrelated histories"
msgstr "từ chối hòa trộn lịch sử không liên quan"
-#: builtin/merge.c:1439
+#: builtin/merge.c:1367
+msgid "Already up-to-date."
+msgstr "Äã cập nhật rồi."
+
+#: builtin/merge.c:1382
#, c-format
msgid "Updating %s..%s\n"
msgstr "Äang cập nhật %s..%s\n"
-#: builtin/merge.c:1476
+#: builtin/merge.c:1419
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Äang thá»­ hòa trá»™n kiểu “trivial in-indexâ€â€¦\n"
-#: builtin/merge.c:1483
+#: builtin/merge.c:1426
#, c-format
msgid "Nope.\n"
msgstr "Không.\n"
-#: builtin/merge.c:1515
+#: builtin/merge.c:1451
+msgid "Already up-to-date. Yeeah!"
+msgstr "Äã cập nhật rồi. Yeeah!"
+
+#: builtin/merge.c:1457
msgid "Not possible to fast-forward, aborting."
msgstr "Thực hiện lệnh chuyển-tiếp-nhanh là không thể được, đang bỠqua."
-#: builtin/merge.c:1538 builtin/merge.c:1617
+#: builtin/merge.c:1480 builtin/merge.c:1559
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Äang tua lại cây thành thá»i xa xÆ°a…\n"
-#: builtin/merge.c:1542
+#: builtin/merge.c:1484
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Äang thá»­ chiến lược hòa trá»™n %s…\n"
-#: builtin/merge.c:1608
+#: builtin/merge.c:1550
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Không có chiến lược hòa trộn nào được nắm giữ (handle) sự hòa trộn.\n"
-#: builtin/merge.c:1610
+#: builtin/merge.c:1552
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Hòa trộn với chiến lược %s gặp lỗi.\n"
-#: builtin/merge.c:1619
+#: builtin/merge.c:1561
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n"
-#: builtin/merge.c:1631
+#: builtin/merge.c:1573
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -8621,68 +9012,68 @@ msgstr "ép buộc di chuyển hay đổi tên thậm chí cả khi đích đã
msgid "skip move/rename errors"
msgstr "bỠqua các lỗi liên quan đến di chuyển, đổi tên"
-#: builtin/mv.c:152
+#: builtin/mv.c:155
#, c-format
msgid "destination '%s' is not a directory"
msgstr "có đích “%s†nhưng đây không phải là một thư mục"
-#: builtin/mv.c:163
+#: builtin/mv.c:166
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Äang kiểm tra việc đổi tên của “%s†thành “%sâ€\n"
-#: builtin/mv.c:167
+#: builtin/mv.c:170
msgid "bad source"
msgstr "nguồn sai"
-#: builtin/mv.c:170
+#: builtin/mv.c:173
msgid "can not move directory into itself"
msgstr "không thể di chuyển một thư mục vào trong chính nó được"
-#: builtin/mv.c:173
+#: builtin/mv.c:176
msgid "cannot move directory over file"
msgstr "không di chuyển được thư mục thông qua tập tin"
-#: builtin/mv.c:182
+#: builtin/mv.c:185
msgid "source directory is empty"
msgstr "thư mục nguồn là trống rỗng"
-#: builtin/mv.c:207
+#: builtin/mv.c:210
msgid "not under version control"
msgstr "không nằm dưới sự quản lý mã nguồn"
-#: builtin/mv.c:210
+#: builtin/mv.c:213
msgid "destination exists"
msgstr "đích đã tồn tại sẵn rồi"
-#: builtin/mv.c:218
+#: builtin/mv.c:221
#, c-format
msgid "overwriting '%s'"
msgstr "Ä‘ang ghi đè lên “%sâ€"
-#: builtin/mv.c:221
+#: builtin/mv.c:224
msgid "Cannot overwrite"
msgstr "Không thể ghi đè"
-#: builtin/mv.c:224
+#: builtin/mv.c:227
msgid "multiple sources for the same target"
msgstr "Nhiá»u nguồn cho cùng má»™t đích"
-#: builtin/mv.c:226
+#: builtin/mv.c:229
msgid "destination directory does not exist"
msgstr "thư mục đích không tồn tại"
-#: builtin/mv.c:233
+#: builtin/mv.c:236
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, nguồn=%s, đích=%s"
-#: builtin/mv.c:254
+#: builtin/mv.c:257
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Äổi tên %s thành %s\n"
-#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
#, c-format
msgid "renaming '%s' failed"
msgstr "gặp lá»—i khi đổi tên “%sâ€"
@@ -8838,6 +9229,10 @@ msgstr "git notes prune [<các-tùy-chá»n>]"
msgid "git notes get-ref"
msgstr "git notes get-ref"
+#: builtin/notes.c:94
+msgid "Write/edit the notes for the following object:"
+msgstr "Ghi hay sửa ghi chú cho đối tượng sau đây:"
+
#: builtin/notes.c:147
#, c-format
msgid "unable to start 'show' for object '%s'"
@@ -8852,81 +9247,76 @@ msgstr "không thể Ä‘á»c kết xuất “showâ€"
msgid "failed to finish 'show' for object '%s'"
msgstr "gặp lá»—i khi hoàn thành “show†cho đối tượng “%sâ€"
-#: builtin/notes.c:174 builtin/tag.c:248
-#, c-format
-msgid "could not create file '%s'"
-msgstr "không thể tạo tập tin “%sâ€"
-
-#: builtin/notes.c:193
+#: builtin/notes.c:194
msgid "Please supply the note contents using either -m or -F option"
msgstr ""
"Xin hãy áp dụng ná»™i dung của ghi chú sá»­ dụng hoặc là tùy chá»n -m hoặc là -F"
-#: builtin/notes.c:202
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "không thể ghi đối tượng ghi chú (note)"
-#: builtin/notes.c:204
+#: builtin/notes.c:205
#, c-format
msgid "The note contents have been left in %s"
msgstr "Nội dung ghi chú còn lại %s"
-#: builtin/notes.c:232 builtin/tag.c:439
+#: builtin/notes.c:233 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr "không thể Ä‘á»c “%sâ€"
-#: builtin/notes.c:234 builtin/tag.c:442
+#: builtin/notes.c:235 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr "không thể mở hay Ä‘á»c “%sâ€"
-#: builtin/notes.c:256
+#: builtin/notes.c:257
#, c-format
msgid "Failed to read object '%s'."
msgstr "Gặp lá»—i khi Ä‘á»c đối tượng “%sâ€."
-#: builtin/notes.c:260
+#: builtin/notes.c:261
#, c-format
msgid "Cannot read note data from non-blob object '%s'."
msgstr "không thể Ä‘á»c dữ liệu ghi chú từ đối tượng không-blob “%sâ€."
-#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
-#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:946
+#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
+#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
+#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
msgid "too many parameters"
msgstr "quá nhiá»u đối số"
-#: builtin/notes.c:375 builtin/notes.c:662
+#: builtin/notes.c:376 builtin/notes.c:663
#, c-format
msgid "No note found for object %s."
msgstr "không tìm thấy ghi chú cho đối tượng %s."
-#: builtin/notes.c:396 builtin/notes.c:559
+#: builtin/notes.c:397 builtin/notes.c:560
msgid "note contents as a string"
msgstr "nội dung ghi chú (note) nằm trong một chuỗi"
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:400 builtin/notes.c:563
msgid "note contents in a file"
msgstr "nội dung ghi chú (note) nằm trong một tập tin"
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "reuse and edit specified note object"
msgstr "dùng lại nhưng có sửa chữa đối tượng note đã chỉ ra"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "reuse specified note object"
msgstr "dùng lại đối tượng ghi chú (note) đã chỉ ra"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "allow storing empty note"
msgstr "cho lưu trữ ghi chú trống rỗng"
-#: builtin/notes.c:409 builtin/notes.c:480
+#: builtin/notes.c:410 builtin/notes.c:481
msgid "replace existing notes"
msgstr "thay thế ghi chú trước"
-#: builtin/notes.c:434
+#: builtin/notes.c:435
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -8935,29 +9325,29 @@ msgstr ""
"Không thể thêm các ghi chú. Äã tìm thấy các ghi chú đã có sẵn cho đối tượng "
"%s. Sá»­ dụng tùy chá»n “-f†để ghi đè lên các ghi chú cÅ©"
-#: builtin/notes.c:449 builtin/notes.c:528
+#: builtin/notes.c:450 builtin/notes.c:529
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Äang ghi đè lên ghi chú cÅ© cho đối tượng %s\n"
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
+#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
#, c-format
msgid "Removing note for object %s\n"
msgstr "Äang gỡ bá» ghi chú (note) cho đối tượng %s\n"
-#: builtin/notes.c:481
+#: builtin/notes.c:482
msgid "read objects from stdin"
msgstr "Ä‘á»c các đối tượng từ đầu vào tiêu chuẩn"
-#: builtin/notes.c:483
+#: builtin/notes.c:484
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "tải cấu hình chép lại cho <lệnh> (ngầm định là --stdin)"
-#: builtin/notes.c:501
+#: builtin/notes.c:502
msgid "too few parameters"
msgstr "quá ít đối số"
-#: builtin/notes.c:522
+#: builtin/notes.c:523
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -8966,12 +9356,12 @@ msgstr ""
"Không thể sao chép các ghi chú. Äã tìm thấy các ghi chú đã có sẵn cho đối "
"tượng %s. Sá»­ dụng tùy chá»n “-f†để ghi đè lên các ghi chú cÅ©"
-#: builtin/notes.c:534
+#: builtin/notes.c:535
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr "Thiếu ghi chú trên đối tượng nguồn %s. Không thể sao chép."
-#: builtin/notes.c:586
+#: builtin/notes.c:587
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -8980,15 +9370,20 @@ msgstr ""
"Các tùy chá»n -m/-F/-c/-C đã cổ không còn dùng nữa cho lệnh con “editâ€.\n"
"Xin hãy sá»­ dụng lệnh sau để thay thế: “git notes add -f -m/-F/-c/-Câ€.\n"
-#: builtin/notes.c:768
+#: builtin/notes.c:753
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "không hiểu chiến lược hòa trộn ghi chú %s"
+
+#: builtin/notes.c:769
msgid "General options"
msgstr "Tùy chá»n chung"
-#: builtin/notes.c:770
+#: builtin/notes.c:771
msgid "Merge options"
msgstr "Tùy chá»n vá» hòa trá»™n"
-#: builtin/notes.c:772
+#: builtin/notes.c:773
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -8996,51 +9391,88 @@ msgstr ""
"phân giải các xung đột “notes†sử dụng chiến lược đã đưa ra (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:774
+#: builtin/notes.c:775
msgid "Committing unmerged notes"
msgstr "Chuyển giao các note chưa được hòa trộn"
-#: builtin/notes.c:776
+#: builtin/notes.c:777
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"các note cuối cùng được hòa trộn bởi các note chưa hòa trộn của lần chuyển "
"giao"
-#: builtin/notes.c:778
+#: builtin/notes.c:779
msgid "Aborting notes merge resolution"
msgstr "Hủy bỠphân giải ghi chú (note) hòa trộn"
-#: builtin/notes.c:780
+#: builtin/notes.c:781
msgid "abort notes merge"
msgstr "bỠqua hòa trộn các ghi chú (note)"
-#: builtin/notes.c:857
+#: builtin/notes.c:792
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "không thể trộn lẫn --commit, --abort hay -s/--strategy"
+
+#: builtin/notes.c:797
+msgid "Must specify a notes ref to merge"
+msgstr "Bạn phải chỉ định tham chiếu ghi chú để hòa trộn"
+
+#: builtin/notes.c:821
+#, c-format
+msgid "Unknown -s/--strategy: %s"
+msgstr "Không hiểu -s/--strategy: %s"
+
+#: builtin/notes.c:858
#, c-format
msgid "A notes merge into %s is already in-progress at %s"
msgstr "Các ghi chú hòa trộn vào %s đã sẵn trong quá trình xử lý tại %s"
-#: builtin/notes.c:884
+#: builtin/notes.c:861
+#, c-format
+msgid "Failed to store link to current notes ref (%s)"
+msgstr "Gặp lỗi khi lưu liên kết đến tham chiếu ghi chú hiện tại (%s)"
+
+#: builtin/notes.c:863
+#, c-format
+msgid ""
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
+msgstr ""
+"Gặp lỗi khi hòa trộn các ghi chú tự động. Sửa các xung đột này trong %s và "
+"chuyển giao kết quả bằng “git notes merge --commitâ€, hoặc bãi bá» việc hòa "
+"trá»™n bằng “git notes merge --abortâ€.\n"
+
+#: builtin/notes.c:885
#, c-format
msgid "Object %s has no note\n"
msgstr "Äối tượng %s không có ghi chú (note)\n"
-#: builtin/notes.c:896
+#: builtin/notes.c:897
msgid "attempt to remove non-existent note is not an error"
msgstr "cố gắng gỡ bỠmột note chưa từng tồn tại không phải là một lỗi"
-#: builtin/notes.c:899
+#: builtin/notes.c:900
msgid "read object names from the standard input"
msgstr "Ä‘á»c tên đối tượng từ thiết bị nhập chuẩn"
-#: builtin/notes.c:980
+#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+msgid "do not remove, show only"
+msgstr "không gỡ bá», chỉ hiển thị"
+
+#: builtin/notes.c:939
+msgid "report pruned notes"
+msgstr "báo cáo các đối tượng đã prune"
+
+#: builtin/notes.c:981
msgid "notes-ref"
msgstr "notes-ref"
-#: builtin/notes.c:981
+#: builtin/notes.c:982
msgid "use notes from <notes-ref>"
msgstr "dùng “notes†từ <notes-ref>"
-#: builtin/notes.c:1016 builtin/remote.c:1628
+#: builtin/notes.c:1017 builtin/remote.c:1623
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Không hiểu câu lệnh con: %s"
@@ -9059,175 +9491,179 @@ msgstr ""
"git pack-objects [các-tùy-chá»n…] <base-name> [< <danh-sách-ref> | < <danh-"
"sách-đối-tượng>]"
-#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
+#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
#, c-format
msgid "deflate error (%d)"
msgstr "lỗi giải nén (%d)"
-#: builtin/pack-objects.c:763
+#: builtin/pack-objects.c:766
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "tắt ghi bitmap, các gói bị chia nhỠbởi vì pack.packSizeLimit"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:779
msgid "Writing objects"
msgstr "Äang ghi lại các đối tượng"
-#: builtin/pack-objects.c:1017
+#: builtin/pack-objects.c:1037
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "tắt ghi bitmap, như vậy một số đối tượng sẽ không được đóng gói"
-#: builtin/pack-objects.c:2177
+#: builtin/pack-objects.c:2197
msgid "Compressing objects"
msgstr "Äang nén các đối tượng"
-#: builtin/pack-objects.c:2563
+#: builtin/pack-objects.c:2611
#, c-format
msgid "unsupported index version %s"
msgstr "phiên bản mục lục không được hỗ trợ %s"
-#: builtin/pack-objects.c:2567
+#: builtin/pack-objects.c:2615
#, c-format
msgid "bad index version '%s'"
msgstr "phiên bản mục lục sai “%sâ€"
-#: builtin/pack-objects.c:2597
+#: builtin/pack-objects.c:2645
msgid "do not show progress meter"
msgstr "không hiển thị bộ đo tiến trình"
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2647
msgid "show progress meter"
msgstr "hiển thị bộ đo tiến trình"
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2649
msgid "show progress meter during object writing phase"
msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng"
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2652
msgid "similar to --all-progress when progress meter is shown"
msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện"
-#: builtin/pack-objects.c:2605
+#: builtin/pack-objects.c:2653
msgid "version[,offset]"
msgstr "phiên bản[,offset]"
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2654
msgid "write the pack index file in the specified idx format version"
msgstr "ghi tập tin bảng mục lục gói (pack) ở phiên bản định dạng idx đã cho"
-#: builtin/pack-objects.c:2609
+#: builtin/pack-objects.c:2657
msgid "maximum size of each output pack file"
msgstr "kcíh thước tối đa cho tập tin gói được tạo"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2659
msgid "ignore borrowed objects from alternate object store"
msgstr "bỠqua các đối tượng vay mượn từ kho đối tượng thay thế"
-#: builtin/pack-objects.c:2613
+#: builtin/pack-objects.c:2661
msgid "ignore packed objects"
msgstr "bỠqua các đối tượng đóng gói"
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2663
msgid "limit pack window by objects"
msgstr "giới hạn cửa sổ đóng gói theo đối tượng"
-#: builtin/pack-objects.c:2617
+#: builtin/pack-objects.c:2665
msgid "limit pack window by memory in addition to object limit"
msgstr "giới hạn cửa sổ đóng gói theo bộ nhớ cộng thêm với giới hạn đối tượng"
-#: builtin/pack-objects.c:2619
+#: builtin/pack-objects.c:2667
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "độ dài tối đa của chuỗi móc xích “delta†được phép trong gói kết quả"
-#: builtin/pack-objects.c:2621
+#: builtin/pack-objects.c:2669
msgid "reuse existing deltas"
msgstr "dùng lại các delta sẵn có"
-#: builtin/pack-objects.c:2623
+#: builtin/pack-objects.c:2671
msgid "reuse existing objects"
msgstr "dùng lại các đối tượng sẵn có"
-#: builtin/pack-objects.c:2625
+#: builtin/pack-objects.c:2673
msgid "use OFS_DELTA objects"
msgstr "dùng các đối tượng OFS_DELTA"
-#: builtin/pack-objects.c:2627
+#: builtin/pack-objects.c:2675
msgid "use threads when searching for best delta matches"
msgstr "sử dụng các tuyến trình khi tìm kiếm cho các mẫu khớp delta tốt nhất"
-#: builtin/pack-objects.c:2629
+#: builtin/pack-objects.c:2677
msgid "do not create an empty pack output"
msgstr "không thể tạo kết xuất gói trống rỗng"
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2679
msgid "read revision arguments from standard input"
msgstr " Ä‘á»c tham số “revision†từ thiết bị nhập chuẩn"
-#: builtin/pack-objects.c:2633
+#: builtin/pack-objects.c:2681
msgid "limit the objects to those that are not yet packed"
msgstr "giới hạn các đối tượng thành những cái mà chúng vẫn chưa được đóng gói"
-#: builtin/pack-objects.c:2636
+#: builtin/pack-objects.c:2684
msgid "include objects reachable from any reference"
msgstr "bao gồm các đối tượng có thể Ä‘á»c được từ bất kỳ tham chiếu nào"
-#: builtin/pack-objects.c:2639
+#: builtin/pack-objects.c:2687
msgid "include objects referred by reflog entries"
msgstr "bao gồm các đối tượng được tham chiếu bởi các mục reflog"
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2690
msgid "include objects referred to by the index"
msgstr "bao gồm các đối tượng được tham chiếu bởi mục lục"
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2693
msgid "output pack to stdout"
msgstr "xuất gói ra đầu ra tiêu chuẩn"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2695
msgid "include tag objects that refer to objects to be packed"
msgstr "bao gồm các đối tượng tham chiếu đến các đối tượng được đóng gói"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2697
msgid "keep unreachable objects"
msgstr "giữ lại các đối tượng không thể Ä‘á»c được"
-#: builtin/pack-objects.c:2650 parse-options.h:142
+#: builtin/pack-objects.c:2699
+msgid "pack loose unreachable objects"
+msgstr "pack mất các đối tượng không thể Ä‘á»c được"
+
+#: builtin/pack-objects.c:2700 parse-options.h:142
msgid "time"
msgstr "thá»i-gian"
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2701
msgid "unpack unreachable objects newer than <time>"
msgstr ""
"xả nén (gỡ khá»i gói) các đối tượng không thể Ä‘á»c được má»›i hÆ¡n <thá»i-gian>"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2704
msgid "create thin packs"
msgstr "tạo gói nhẹ"
-#: builtin/pack-objects.c:2656
+#: builtin/pack-objects.c:2706
msgid "create packs suitable for shallow fetches"
msgstr "tạo gói để phù hợp cho lấy vỠnông (shallow)"
-#: builtin/pack-objects.c:2658
+#: builtin/pack-objects.c:2708
msgid "ignore packs that have companion .keep file"
msgstr "bỠqua các gói mà nó có tập tin .keep đi kèm"
-#: builtin/pack-objects.c:2660
+#: builtin/pack-objects.c:2710
msgid "pack compression level"
msgstr "mức nén gói"
-#: builtin/pack-objects.c:2662
+#: builtin/pack-objects.c:2712
msgid "do not hide commits by grafts"
msgstr "không ẩn các lần chuyển giao bởi “graftsâ€"
-#: builtin/pack-objects.c:2664
+#: builtin/pack-objects.c:2714
msgid "use a bitmap index if available to speed up counting objects"
msgstr "dùng mục lục ánh xạ nếu có thể được để nâng cao tốc độ đếm đối tượng"
-#: builtin/pack-objects.c:2666
+#: builtin/pack-objects.c:2716
msgid "write a bitmap index together with the pack index"
msgstr "ghi một mục lục ánh xạ cùng với mục lục gói"
-#: builtin/pack-objects.c:2757
+#: builtin/pack-objects.c:2829
msgid "Counting objects"
msgstr "Äang đếm các đối tượng"
@@ -9255,15 +9691,11 @@ msgstr "Äang gỡ các đối tượng trùng lặp"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <thá»i-gian>] [--] [<head>…]"
-#: builtin/prune.c:105 builtin/worktree.c:125
-msgid "do not remove, show only"
-msgstr "không gỡ bá», chỉ hiển thị"
-
-#: builtin/prune.c:106 builtin/worktree.c:126
+#: builtin/prune.c:106 builtin/worktree.c:128
msgid "report pruned objects"
msgstr "báo cáo các đối tượng đã prune"
-#: builtin/prune.c:109 builtin/worktree.c:128
+#: builtin/prune.c:109 builtin/worktree.c:130
msgid "expire objects older than <time>"
msgstr "các đối tượng hết hạn cÅ© hÆ¡n khoảng <thá»i gian>"
@@ -9283,14 +9715,10 @@ msgstr "Các tùy chá»n liên quan đến hòa trá»™n"
msgid "incorporate changes by rebasing rather than merging"
msgstr "các thay đổi hợp nhất bằng cải tổ thay vì hòa trộn"
-#: builtin/pull.c:147 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "cho phép chuyển-tiếp-nhanh"
-#: builtin/pull.c:153
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không"
-
#: builtin/pull.c:156
msgid "automatically stash/stash pop before and after rebase"
msgstr "tự động stash/stash pop tước và sau tu bổ (rebase)"
@@ -9308,17 +9736,17 @@ msgstr "số lượng mô-Ä‘un-con được đẩy lên đồng thá»i"
msgid "Invalid value for pull.ff: %s"
msgstr "Giá trị không hợp lệ cho pull.ff: %s"
-#: builtin/pull.c:379
+#: builtin/pull.c:379 git-sh-setup.sh:226
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
"Không thể pull với cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: builtin/pull.c:385
+#: builtin/pull.c:385 git-sh-setup.sh:252
msgid "Additionally, your index contains uncommitted changes."
msgstr ""
"Thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
-#: builtin/pull.c:387
+#: builtin/pull.c:387 git-sh-setup.sh:245
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr "Không thể pull với cải tổ: Bạn có các thay đổi chưa được chuyển giao."
@@ -9379,7 +9807,7 @@ msgstr "Xem git-pull(1) để biết thêm chi tiết."
msgid "<remote>"
msgstr "<máy chủ>"
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<nhánh>"
@@ -9403,17 +9831,21 @@ msgstr ""
"Các đặc tả cấu hình của bạn để hòa trá»™n vá»›i tham chiếu “%sâ€\n"
"từ máy dịch vụ, nhÆ°ng không có nhánh nào nhÆ° thế được lấy vá»."
-#: builtin/pull.c:864
+#: builtin/pull.c:820
+msgid "ignoring --verify-signatures for rebase"
+msgstr "bá» qua --verify-signatures khi rebase"
+
+#: builtin/pull.c:867
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "tùy chá»n --[no-]autostash chỉ hợp lệ khi dùng vá»›i --rebase."
-#: builtin/pull.c:872
+#: builtin/pull.c:875
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Äang cập nhật má»™t nhánh chÆ°a được sinh ra vá»›i các thay đổi được thêm vào "
"bảng mục lục."
-#: builtin/pull.c:900
+#: builtin/pull.c:903
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -9424,7 +9856,7 @@ msgstr ""
"đang chuyển-tiếp-nhanh cây làm việc của bạn từ\n"
"lần chuyển giaot %s."
-#: builtin/pull.c:905
+#: builtin/pull.c:908
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -9442,11 +9874,11 @@ msgstr ""
"$ git reset --hard\n"
"để khôi phục lại."
-#: builtin/pull.c:920
+#: builtin/pull.c:923
msgid "Cannot merge multiple branches into empty head."
msgstr "Không thể hòa trá»™n nhiá»u nhánh vào trong má»™t head trống rá»—ng."
-#: builtin/pull.c:924
+#: builtin/pull.c:927
msgid "Cannot rebase onto multiple branches."
msgstr "Không thể thá»±c hiện lệnh rebase (cải tổ) trên nhiá»u nhánh."
@@ -9617,12 +10049,12 @@ msgstr "Äang đẩy lên %s\n"
msgid "failed to push some refs to '%s'"
msgstr "gặp lá»—i khi đẩy tá»›i má»™t số tham chiếu đến “%sâ€"
-#: builtin/push.c:365
+#: builtin/push.c:366
#, c-format
msgid "bad repository '%s'"
msgstr "repository (kho) sai “%sâ€"
-#: builtin/push.c:366
+#: builtin/push.c:367
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -9643,103 +10075,115 @@ msgstr ""
"\n"
" git push <tên>\n"
-#: builtin/push.c:381
+#: builtin/push.c:385
msgid "--all and --tags are incompatible"
msgstr "--all và --tags xung khắc nhau"
-#: builtin/push.c:382
+#: builtin/push.c:386
msgid "--all can't be combined with refspecs"
msgstr "--all không thể được tổ hợp cùng vá»›i đặc tả Ä‘Æ°á»ng dẫn"
-#: builtin/push.c:387
+#: builtin/push.c:391
msgid "--mirror and --tags are incompatible"
msgstr "--mirror và --tags xung khắc nhau"
-#: builtin/push.c:388
+#: builtin/push.c:392
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror không thể được tổ hợp cùng vá»›i đặc tả Ä‘Æ°á»ng dẫn"
-#: builtin/push.c:393
+#: builtin/push.c:397
msgid "--all and --mirror are incompatible"
msgstr "--all và --mirror xung khắc nhau"
-#: builtin/push.c:505
+#: builtin/push.c:515
msgid "repository"
msgstr "kho"
-#: builtin/push.c:506 builtin/send-pack.c:161
+#: builtin/push.c:516 builtin/send-pack.c:161
msgid "push all refs"
msgstr "đẩy tất cả các tham chiếu"
-#: builtin/push.c:507 builtin/send-pack.c:163
+#: builtin/push.c:517 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "mirror tất cả các tham chiếu"
-#: builtin/push.c:509
+#: builtin/push.c:519
msgid "delete refs"
msgstr "xóa các tham chiếu"
-#: builtin/push.c:510
+#: builtin/push.c:520
msgid "push tags (can't be used with --all or --mirror)"
msgstr "đẩy các thẻ (không dùng cùng với --all hay --mirror)"
-#: builtin/push.c:513 builtin/send-pack.c:164
+#: builtin/push.c:523 builtin/send-pack.c:164
msgid "force updates"
msgstr "ép buộc cập nhật"
-#: builtin/push.c:515 builtin/send-pack.c:175
+#: builtin/push.c:525 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "tên-tham-chiếu>:<cần"
-#: builtin/push.c:516 builtin/send-pack.c:176
+#: builtin/push.c:526 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "yêu cầu giá-trị cũ của tham chiếu thì là giá-trị này"
-#: builtin/push.c:519
+#: builtin/push.c:529
msgid "control recursive pushing of submodules"
msgstr "Ä‘iá»u khiển việc đẩy lên (push) đệ qui của mô-Ä‘un-con"
-#: builtin/push.c:521 builtin/send-pack.c:169
+#: builtin/push.c:531 builtin/send-pack.c:169
msgid "use thin pack"
msgstr "tạo gói nhẹ"
-#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
+#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "chương trình nhận gói"
-#: builtin/push.c:524
+#: builtin/push.c:534
msgid "set upstream for git pull/status"
msgstr "đặt thượng nguồn cho git pull/status"
-#: builtin/push.c:527
+#: builtin/push.c:537
msgid "prune locally removed refs"
msgstr "xén tỉa những tham chiếu bị gỡ bá»"
-#: builtin/push.c:529
+#: builtin/push.c:539
msgid "bypass pre-push hook"
msgstr "vòng qua móc tiá»n-đẩy (pre-push)"
-#: builtin/push.c:530
+#: builtin/push.c:540
msgid "push missing but relevant tags"
msgstr "push phần bị thiếu nhưng các thẻ lại thích hợp"
-#: builtin/push.c:533 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "ký lần đẩy dùng GPG"
-#: builtin/push.c:535 builtin/send-pack.c:170
+#: builtin/push.c:545 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "yêu cầu giao dịch hạt nhân bên phía máy chủ"
-#: builtin/push.c:549
+#: builtin/push.c:546
+msgid "server-specific"
+msgstr "đặc-tả-máy-phục-vụ"
+
+#: builtin/push.c:546
+msgid "option to transmit"
+msgstr "tùy chá»n để chuyển giao"
+
+#: builtin/push.c:560
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete là xung khắc vá»›i các tùy chá»n --all, --mirror và --tags"
-#: builtin/push.c:551
+#: builtin/push.c:562
msgid "--delete doesn't make sense without any refs"
msgstr "--delete không hợp lý nếu không có bất kỳ tham chiếu nào"
+#: builtin/push.c:579
+msgid "push options must not have new line characters"
+msgstr "các tùy chá»n push phải không có ký tá»± dòng má»›i"
+
#: builtin/read-tree.c:37
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
@@ -9820,11 +10264,11 @@ msgstr "gỡ lá»—i “unpack-treesâ€"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <thư-mục-git>"
-#: builtin/receive-pack.c:1719
+#: builtin/receive-pack.c:1843
msgid "quiet"
msgstr "im lặng"
-#: builtin/receive-pack.c:1733
+#: builtin/receive-pack.c:1857
msgid "You must specify a directory."
msgstr "Bạn phải chỉ định thư mục."
@@ -9974,12 +10418,12 @@ msgstr "Ä‘ang chỉ định má»™t nhánh master không hợp lý vá»›i tùy chá»
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "chỉ định những nhánh để theo dõi chỉ hợp lý vá»›i các “fetch mirrorâ€"
-#: builtin/remote.c:190 builtin/remote.c:633
+#: builtin/remote.c:190 builtin/remote.c:629
#, c-format
msgid "remote %s already exists."
msgstr "máy chủ %s đã tồn tại rồi."
-#: builtin/remote.c:194 builtin/remote.c:637
+#: builtin/remote.c:194 builtin/remote.c:633
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "“%s†không phải tên máy chủ hợp lệ"
@@ -10002,17 +10446,17 @@ msgstr "(khá»›p)"
msgid "(delete)"
msgstr "(xóa)"
-#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
#, c-format
msgid "No such remote: %s"
msgstr "Không có máy chủ nào như thế: %s"
-#: builtin/remote.c:643
+#: builtin/remote.c:639
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Không thể đổi tên phần của cấu hình từ “%s†thành “%sâ€"
-#: builtin/remote.c:663
+#: builtin/remote.c:659
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -10023,17 +10467,17 @@ msgstr ""
"\t%s\n"
"\tXin hãy cập nhật phần cấu hình một cách thủ công nếu thấy cần thiết."
-#: builtin/remote.c:699
+#: builtin/remote.c:695
#, c-format
msgid "deleting '%s' failed"
msgstr "gặp lá»—i khi xóa “%sâ€"
-#: builtin/remote.c:733
+#: builtin/remote.c:729
#, c-format
msgid "creating '%s' failed"
msgstr "gặp lá»—i khi tạo “%sâ€"
-#: builtin/remote.c:796
+#: builtin/remote.c:792
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -10045,279 +10489,289 @@ msgstr[0] ""
"Ä‘i;\n"
"để xóa đi, sử dụng:"
-#: builtin/remote.c:810
+#: builtin/remote.c:806
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Không thể gỡ bá» phần cấu hình “%sâ€"
-#: builtin/remote.c:911
+#: builtin/remote.c:907
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " mới (lần lấy vỠtiếp theo sẽ lưu trong remotes/%s)"
-#: builtin/remote.c:914
+#: builtin/remote.c:910
msgid " tracked"
msgstr " được theo dõi"
-#: builtin/remote.c:916
+#: builtin/remote.c:912
msgid " stale (use 'git remote prune' to remove)"
msgstr " cÅ© rích (dùng “git remote prune†để gỡ bá»)"
-#: builtin/remote.c:918
+#: builtin/remote.c:914
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:959
+#: builtin/remote.c:955
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "branch.%s.merge không hợp lệ; không thể cải tổ vỠphía > 1 nhánh"
-#: builtin/remote.c:967
+#: builtin/remote.c:963
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "thực hiện rebase một cách tương tác trên máy chủ %s"
-#: builtin/remote.c:971
+#: builtin/remote.c:964
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "thực hiện rebase trên máy chủ %s"
+
+#: builtin/remote.c:967
#, c-format
msgid " merges with remote %s"
msgstr " hòa trộn với máy chủ %s"
-#: builtin/remote.c:972
-msgid " and with remote"
-msgstr " và với máy chủ"
-
-#: builtin/remote.c:974
+#: builtin/remote.c:970
#, c-format
msgid "merges with remote %s"
msgstr "hòa trộn với máy chủ %s"
-#: builtin/remote.c:975
-msgid " and with remote"
-msgstr " và với máy chủ"
+#: builtin/remote.c:973
+#, c-format
+msgid "%-*s and with remote %s\n"
+msgstr "%-*s và với máy chủ %s\n"
-#: builtin/remote.c:1021
+#: builtin/remote.c:1016
msgid "create"
msgstr "tạo"
-#: builtin/remote.c:1024
+#: builtin/remote.c:1019
msgid "delete"
msgstr "xóa"
-#: builtin/remote.c:1028
+#: builtin/remote.c:1023
msgid "up to date"
msgstr "đã cập nhật"
-#: builtin/remote.c:1031
+#: builtin/remote.c:1026
msgid "fast-forwardable"
msgstr "có-thể-chuyển-tiếp-nhanh"
-#: builtin/remote.c:1034
+#: builtin/remote.c:1029
msgid "local out of date"
msgstr "dữ liệu nội bộ đã cũ"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1036
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s ép buộc thành %-*s (%s)"
-#: builtin/remote.c:1044
+#: builtin/remote.c:1039
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s đẩy lên thành %-*s (%s)"
-#: builtin/remote.c:1048
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s ép buộc thành %s"
-#: builtin/remote.c:1051
+#: builtin/remote.c:1046
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s đẩy lên thành %s"
-#: builtin/remote.c:1119
+#: builtin/remote.c:1114
msgid "do not query remotes"
msgstr "không truy vấn các máy chủ"
-#: builtin/remote.c:1146
+#: builtin/remote.c:1141
#, c-format
msgid "* remote %s"
msgstr "* máy chủ %s"
-#: builtin/remote.c:1147
+#: builtin/remote.c:1142
#, c-format
msgid " Fetch URL: %s"
msgstr " URL để lấy vá»: %s"
-#: builtin/remote.c:1148 builtin/remote.c:1301
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
msgid "(no URL)"
msgstr "(không có URL)"
#. TRANSLATORS: the colon ':' should align with
#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1159 builtin/remote.c:1161
+#: builtin/remote.c:1154 builtin/remote.c:1156
#, c-format
msgid " Push URL: %s"
msgstr " URL để đẩy lên: %s"
-#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
+#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
#, c-format
msgid " HEAD branch: %s"
msgstr " Nhánh HEAD: %s"
-#: builtin/remote.c:1169
+#: builtin/remote.c:1158
+msgid "(not queried)"
+msgstr "(không yêu cầu)"
+
+#: builtin/remote.c:1160
+msgid "(unknown)"
+msgstr "(không hiểu)"
+
+#: builtin/remote.c:1164
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " nhánh HEAD (HEAD máy chủ chưa rõ ràng, có lẽ là một trong số sau):\n"
-#: builtin/remote.c:1181
+#: builtin/remote.c:1176
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Những nhánh trên máy chủ:%s"
-#: builtin/remote.c:1184 builtin/remote.c:1211
+#: builtin/remote.c:1179 builtin/remote.c:1206
msgid " (status not queried)"
msgstr " (trạng thái không được yêu cầu)"
-#: builtin/remote.c:1193
+#: builtin/remote.c:1188
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Những nhánh ná»™i bá»™ đã được cấu hình cho lệnh “git pullâ€:"
-#: builtin/remote.c:1201
+#: builtin/remote.c:1196
msgid " Local refs will be mirrored by 'git push'"
msgstr " refs ná»™i bá»™ sẽ được phản chiếu bởi lệnh “git pushâ€"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1203
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Những tham chiếu ná»™i bá»™ được cấu hình cho lệnh “git pushâ€%s:"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1224
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "đặt refs/remotes/<tên>/HEAD cho phù hợp với máy chủ"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1226
msgid "delete refs/remotes/<name>/HEAD"
msgstr "xóa refs/remotes/<tên>/HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1241
msgid "Cannot determine remote HEAD"
msgstr "Không thể xác định được HEAD máy chủ"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1243
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Nhiá»u nhánh HEAD máy chủ. Hãy chá»n rõ ràng má»™t:"
-#: builtin/remote.c:1258
+#: builtin/remote.c:1253
#, c-format
msgid "Could not delete %s"
msgstr "Không thể xóa bỠ%s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1261
#, c-format
msgid "Not a valid ref: %s"
msgstr "Không phải là tham chiếu hợp lệ: %s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1263
#, c-format
msgid "Could not setup %s"
msgstr "Không thể cài đặt %s"
-#: builtin/remote.c:1286
+#: builtin/remote.c:1281
#, c-format
msgid " %s will become dangling!"
msgstr " %s sẽ trở thành không đầu (không được quản lý)!"
-#: builtin/remote.c:1287
+#: builtin/remote.c:1282
#, c-format
msgid " %s has become dangling!"
msgstr " %s đã trở thành không đầu (không được quản lý)!"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1292
#, c-format
msgid "Pruning %s"
msgstr "Äang xén bá»›t %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1293
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1309
#, c-format
msgid " * [would prune] %s"
msgstr " * [nên xén bớt] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1312
#, c-format
msgid " * [pruned] %s"
msgstr " * [đã bị xén] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1357
msgid "prune remotes after fetching"
msgstr "cắt máy chủ sau khi lấy vá»"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
#, c-format
msgid "No such remote '%s'"
msgstr "Không có máy chủ nào có tên “%sâ€"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1436
msgid "add branch"
msgstr "thêm nhánh"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1443
msgid "no remote specified"
msgstr "chưa chỉ ra máy chủ nào"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1460
msgid "query push URLs rather than fetch URLs"
msgstr "truy vấn đẩy URL thay vì lấy"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1462
msgid "return all URLs"
msgstr "trả vá» má»i URL"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1490
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "không có URL nào được cấu hình cho nhánh “%sâ€"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1516
msgid "manipulate push URLs"
msgstr "đẩy các “URL†bằng tay"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1518
msgid "add URL"
msgstr "thêm URL"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1520
msgid "delete URLs"
msgstr "xóa URLs"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1527
msgid "--add --delete doesn't make sense"
msgstr "--add --delete không hợp lý"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1568
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Kiểu mẫu URL cũ không hợp lệ: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1576
#, c-format
msgid "No such URL found: %s"
msgstr "Không tìm thấy URL như vậy: %s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1578
msgid "Will not delete all non-push URLs"
msgstr "Sẽ không xóa những địa chỉ URL không-push"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1592
msgid "be verbose; must be placed before a subcommand"
msgstr "chi tiết; phải được đặt trước một lệnh-con"
@@ -10325,78 +10779,86 @@ msgstr "chi tiết; phải được đặt trước một lệnh-con"
msgid "git repack [<options>]"
msgstr "git repack [<các-tùy-chá»n>]"
-#: builtin/repack.c:159
+#: builtin/repack.c:160
msgid "pack everything in a single pack"
msgstr "đóng gói má»i thứ trong má»™t gói Ä‘Æ¡n"
-#: builtin/repack.c:161
+#: builtin/repack.c:162
msgid "same as -a, and turn unreachable objects loose"
msgstr "giống vá»›i -a, và chỉnh sá»­a các đối tượng không Ä‘á»c được thiếu sót"
-#: builtin/repack.c:164
+#: builtin/repack.c:165
msgid "remove redundant packs, and run git-prune-packed"
msgstr "xóa bỠcác gói dư thừa, và chạy git-prune-packed"
-#: builtin/repack.c:166
+#: builtin/repack.c:167
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "chuyển --no-reuse-delta cho git-pack-objects"
-#: builtin/repack.c:168
+#: builtin/repack.c:169
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "chuyển --no-reuse-object cho git-pack-objects"
-#: builtin/repack.c:170
+#: builtin/repack.c:171
msgid "do not run git-update-server-info"
msgstr "không chạy git-update-server-info"
-#: builtin/repack.c:173
+#: builtin/repack.c:174
msgid "pass --local to git-pack-objects"
msgstr "chuyển --local cho git-pack-objects"
-#: builtin/repack.c:175
+#: builtin/repack.c:176
msgid "write bitmap index"
msgstr "ghi mục lục ánh xạ"
-#: builtin/repack.c:176
+#: builtin/repack.c:177
msgid "approxidate"
msgstr "ngày ước tính"
-#: builtin/repack.c:177
+#: builtin/repack.c:178
msgid "with -A, do not loosen objects older than this"
msgstr "vá»›i -A, các đối tượng cÅ© hÆ¡n khoảng thá»i gian này thì không bị mất"
-#: builtin/repack.c:179
+#: builtin/repack.c:180
+msgid "with -a, repack unreachable objects"
+msgstr "vá»›i -a, đóng gói lại các đối tượng không thể Ä‘á»c được"
+
+#: builtin/repack.c:182
msgid "size of the window used for delta compression"
msgstr "kích thÆ°á»›c cá»­a sổ được dùng cho nén “deltaâ€"
-#: builtin/repack.c:180 builtin/repack.c:184
+#: builtin/repack.c:183 builtin/repack.c:187
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:181
+#: builtin/repack.c:184
msgid "same as the above, but limit memory size instead of entries count"
msgstr "giống như trên, nhưng giới hạn kích thước bộ nhớ hay vì số lượng"
-#: builtin/repack.c:183
+#: builtin/repack.c:186
msgid "limits the maximum delta depth"
msgstr "giá»›i hạn Ä‘á»™ sâu tối Ä‘a của “deltaâ€"
-#: builtin/repack.c:185
+#: builtin/repack.c:188
msgid "maximum size of each packfile"
msgstr "kích thước tối đa cho từng tập tin gói"
-#: builtin/repack.c:187
+#: builtin/repack.c:190
msgid "repack objects in packs marked with .keep"
msgstr "đóng gói lại các đối tượng trong các gói đã đánh dấu bằng .keep"
-#: builtin/repack.c:197
+#: builtin/repack.c:200
msgid "cannot delete packs in a precious-objects repo"
msgstr "không thể xóa các gói trong một kho đối_tượng_vĩ_đại"
-#: builtin/repack.c:381
+#: builtin/repack.c:204
+msgid "--keep-unreachable and -A are incompatible"
+msgstr "--keep-unreachable và -A xung khắc nhau"
+
+#: builtin/repack.c:391 builtin/worktree.c:115
#, c-format
-msgid "removing '%s' failed"
-msgstr "gặp lá»—i khi xóa bỠ“%sâ€"
+msgid "failed to remove '%s'"
+msgstr "gặp lá»—i khi gỡ bỠ“%sâ€"
#: builtin/replace.c:19
msgid "git replace [-f] <object> <replacement>"
@@ -10621,7 +11083,7 @@ msgstr "Không thể đặt lại (reset) bảng mục lục thành điểm xét
msgid "Could not write new index file."
msgstr "Không thể ghi tập tin lưu bảng mục lục mới."
-#: builtin/rev-list.c:350
+#: builtin/rev-list.c:362
msgid "rev-list does not support display of notes"
msgstr "rev-list không hỗ trợ hiển thị các ghi chú"
@@ -10712,31 +11174,27 @@ msgstr "tùy chá»n"
msgid "option for merge strategy"
msgstr "tùy chá»n cho chiến lược hòa trá»™n"
-#: builtin/revert.c:104
+#: builtin/revert.c:100
msgid "append commit name"
msgstr "nối thêm tên lần chuyển giao"
-#: builtin/revert.c:106
+#: builtin/revert.c:102
msgid "preserve initially empty commits"
msgstr "cấm khởi tạo lần chuyển giao trống rỗng"
-#: builtin/revert.c:107
+#: builtin/revert.c:103
msgid "allow commits with empty messages"
msgstr "chấp nhận chuyển giao mà không ghi chú gì"
-#: builtin/revert.c:108
+#: builtin/revert.c:104
msgid "keep redundant, empty commits"
msgstr "giữ lại các lần chuyển giao dư thừa, rỗng"
-#: builtin/revert.c:112
-msgid "program error"
-msgstr "lỗi chương trình"
-
-#: builtin/revert.c:197
+#: builtin/revert.c:192
msgid "revert failed"
msgstr "hoàn nguyên gặp lỗi"
-#: builtin/revert.c:212
+#: builtin/revert.c:207
msgid "cherry-pick failed"
msgstr "cherry-pick gặp lỗi"
@@ -10772,8 +11230,8 @@ msgid_plural ""
"the following files have staged content different from both the\n"
"file and the HEAD:"
msgstr[0] ""
-"các tập tin sau đây có trạng thái khác biệt nội dung từ cả tập tin\n"
-"và cả HEAD:"
+"các tập tin sau đây có khác biệt nội dung đã đưa lên bệ phóng\n"
+"từ cả tập tin và cả HEAD:"
#: builtin/rm.c:235
msgid ""
@@ -11027,12 +11485,12 @@ msgstr "giữ và xóa bá» má»i dòng bắt đầu bằng ký tá»± ghi chú"
msgid "prepend comment character and space to each line"
msgstr "treo trước ký tự ghi chú và ký tự khoảng trắng cho từng dòng"
-#: builtin/submodule--helper.c:24
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923
#, c-format
msgid "No such ref: %s"
msgstr "Không có tham chiếu nào như thế: %s"
-#: builtin/submodule--helper.c:31
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Cần tên tham chiếu dạng đầy đủ, nhưng lại nhận được %s"
@@ -11042,8 +11500,8 @@ msgstr "Cần tên tham chiếu dạng đầy đủ, nhưng lại nhận đượ
msgid "cannot strip one component off url '%s'"
msgstr "không thể cắt bá» má»™t thành phần ra khá»i “%s†url"
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
-#: builtin/submodule--helper.c:486
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
+#: builtin/submodule--helper.c:483
msgid "alternative anchor for relative paths"
msgstr "Ä‘iểm neo thay thế cho các Ä‘Æ°á»ng dẫn tÆ°Æ¡ng đối"
@@ -11051,67 +11509,67 @@ msgstr "Ä‘iểm neo thay thế cho các Ä‘Æ°á»ng dẫn tÆ°Æ¡ng đối"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=</Ä‘Æ°á»ng/dẫn>] [</Ä‘Æ°á»ng/dẫn>…]"
-#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Không tìm thấy url cho Ä‘Æ°á»ng dẫn mô-Ä‘un-con “%s†trong .gitmodules"
-#: builtin/submodule--helper.c:366
+#: builtin/submodule--helper.c:364
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Gặp lá»—i khi đăng ký url cho Ä‘Æ°á»ng dẫn mô-Ä‘un-con “%sâ€"
-#: builtin/submodule--helper.c:370
+#: builtin/submodule--helper.c:368
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Mô-Ä‘un-con “%s†(%s) được đăng ký cho Ä‘Æ°á»ng dẫn “%sâ€\n"
-#: builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:378
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "cảnh báo: chế Ä‘á»™ lệnh cập nhật được gợi ý cho mô-Ä‘un-con “%sâ€\n"
-#: builtin/submodule--helper.c:387
+#: builtin/submodule--helper.c:385
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Gặp lá»—i khi đăng ký chế Ä‘á»™ cập nhật cho Ä‘Æ°á»ng dẫn mô-Ä‘un-con “%sâ€"
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:404
msgid "Suppress output for initializing a submodule"
msgstr "Chặn kết xuất cho khởi tạo một mô-đun-con"
-#: builtin/submodule--helper.c:411
+#: builtin/submodule--helper.c:409
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [</Ä‘Æ°á»ng/dẫn>]"
-#: builtin/submodule--helper.c:432
+#: builtin/submodule--helper.c:430
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name </Ä‘Æ°á»ng/dẫn>"
-#: builtin/submodule--helper.c:438
+#: builtin/submodule--helper.c:436
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"Không tìm thấy ánh xạ (mapping) mô-Ä‘un-con trong .gitmodules cho Ä‘Æ°á»ng dẫn "
"“%sâ€"
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:486
msgid "where the new submodule will be cloned to"
msgstr "nhân bản mô-đun-con mới vào chỗ nào"
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:489
msgid "name of the new submodule"
msgstr "tên của mô-đun-con mới"
-#: builtin/submodule--helper.c:495
+#: builtin/submodule--helper.c:492
msgid "url where to clone the submodule from"
msgstr "url nơi mà nhân bản mô-đun-con từ đó"
-#: builtin/submodule--helper.c:501
+#: builtin/submodule--helper.c:498
msgid "depth for shallow clones"
msgstr "chiá»u sâu lịch sá»­ khi tạo bản sao"
-#: builtin/submodule--helper.c:507
+#: builtin/submodule--helper.c:504
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -11119,89 +11577,112 @@ msgstr ""
"git submodule--helper clone [--prefix=</Ä‘Æ°á»ng/dẫn>] [--quiet] [--reference "
"<kho>] [--name <tên>] [--depth <sâu>] [--url <url>] [</Ä‘Æ°á»ng/dẫn>…]"
-#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
+#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
#, c-format
msgid "could not create directory '%s'"
msgstr "không thể tạo thÆ° mục “%sâ€"
-#: builtin/submodule--helper.c:534
+#: builtin/submodule--helper.c:531
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Nhân bản “%s†vào Ä‘Æ°á»ng dẫn mô-Ä‘un-con “%s†gặp lá»—i"
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:547
#, c-format
msgid "cannot open file '%s'"
msgstr "không thể mở tập tin “%sâ€"
-#: builtin/submodule--helper.c:555
+#: builtin/submodule--helper.c:552
#, c-format
msgid "could not close file %s"
msgstr "không thể đóng tập tin %s"
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:559
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "không thể lấy thÆ° mục mô-Ä‘un-con cho “%sâ€"
-#: builtin/submodule--helper.c:609
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "ÄÆ°á»ng dẫn mô-Ä‘un-con “%s†chÆ°a được khởi tạo"
-#: builtin/submodule--helper.c:613
+#: builtin/submodule--helper.c:615
msgid "Maybe you want to use 'update --init'?"
msgstr "Có lẽ bạn là bạn muốn dùng \"update --init\" phải không?"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:641
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "BỠqua các mô-đun-con chưa được hòa trộn %s"
-#: builtin/submodule--helper.c:660
+#: builtin/submodule--helper.c:662
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Bá» qua mô-Ä‘un-con “%sâ€"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:792
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "Gặp lá»—i khi nhân bản “%sâ€. Thá»­ lại lịch trình"
+
+#: builtin/submodule--helper.c:803
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "Gặp lá»—i khi nhân bản “%s†lần thứ hai nên bãi bá»"
+
+#: builtin/submodule--helper.c:824
msgid "path into the working tree"
msgstr "Ä‘Æ°á»ng dẫn đến cây làm việc"
-#: builtin/submodule--helper.c:771
+#: builtin/submodule--helper.c:827
msgid "path into the working tree, across nested submodule boundaries"
msgstr "Ä‘Æ°á»ng dẫn đến cây làm việc, chéo biên giá»›i mô-Ä‘un-con lồng nhau"
-#: builtin/submodule--helper.c:775
+#: builtin/submodule--helper.c:831
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout hoặc không làm gì cả"
-#: builtin/submodule--helper.c:779
+#: builtin/submodule--helper.c:835
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
"Tạo một bản sao nông được cắt ngắn thành số lượng điểm xét duyệt đã cho"
-#: builtin/submodule--helper.c:782
+#: builtin/submodule--helper.c:838
msgid "parallel jobs"
msgstr "công việc đồng thá»i"
-#: builtin/submodule--helper.c:783
+#: builtin/submodule--helper.c:840
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "nhân bản lần đầu có nên theo khuyến nghị là nông hay không"
+
+#: builtin/submodule--helper.c:841
msgid "don't print cloning progress"
msgstr "đừng in tiến trình nhân bản"
-#: builtin/submodule--helper.c:788
+#: builtin/submodule--helper.c:846
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
"git submodule--helper update_clone [--prefix=</Ä‘Æ°á»ng/dẫn>] [</Ä‘Æ°á»ng/dẫn>…]"
-#: builtin/submodule--helper.c:798
+#: builtin/submodule--helper.c:856
msgid "bad value for update parameter"
msgstr "giá trị cho tham số cập nhật bị sai"
-#: builtin/submodule--helper.c:855
+#: builtin/submodule--helper.c:927
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+"Nhánh mô-đun-con (%s) được cấu hình kế thừa nhánh từ siêu dự án, nhưng siêu "
+"dự án lại không trên bất kỳ nhánh nào"
+
+#: builtin/submodule--helper.c:977
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "lệnh con submodule--helper phải được gá»i vá»›i má»™t lệnh con"
-#: builtin/submodule--helper.c:862
+#: builtin/submodule--helper.c:984
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "“%s†không phải là lệnh con submodule--helper hợp lệ"
@@ -11547,14 +12028,6 @@ msgstr "<chế_Ä‘á»™>,<đối_tượng>,<Ä‘Æ°á»ng_dẫn>"
msgid "add the specified entry to the index"
msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục"
-#: builtin/update-index.c:958
-msgid "(+/-)x"
-msgstr "(+/-)x"
-
-#: builtin/update-index.c:959
-msgid "override the executable bit of the listed files"
-msgstr "ghi đè lên bít thi hành của các tập tin được liệt kê"
-
#: builtin/update-index.c:963
msgid "mark files as \"not changing\""
msgstr "Äánh dấu các tập tin là \"không thay đổi\""
@@ -11716,82 +12189,109 @@ msgid "git worktree add [<options>] <path> [<branch>]"
msgstr "git worktree add [<các-tùy-chá»n>] <Ä‘Æ°á»ng-dẫn> [<nhánh>]"
#: builtin/worktree.c:16
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<các-tùy-chá»n>]"
+
+#: builtin/worktree.c:17
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<các-tùy-chá»n>] </Ä‘Æ°á»ng/dẫn>"
+
+#: builtin/worktree.c:18
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<các-tùy-chá»n>]"
-#: builtin/worktree.c:17
-msgid "git worktree list [<options>]"
-msgstr "git worktree list [<các-tùy-chá»n>]"
+#: builtin/worktree.c:19
+msgid "git worktree unlock <path>"
+msgstr "git worktree unlock </Ä‘Æ°á»ng/dẫn>"
-#: builtin/worktree.c:40
+#: builtin/worktree.c:42
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Gỡ bỠcây làm việc/%s: không phải là thư mục hợp lệ"
-#: builtin/worktree.c:46
+#: builtin/worktree.c:48
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Gỡ bỠcây làm việc/%s: không có tập tin gitdir"
-#: builtin/worktree.c:51
+#: builtin/worktree.c:53
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Gỡ bá» cây làm việc/%s: không thể Ä‘á»c tập tin gitdir (%s)"
-#: builtin/worktree.c:62
+#: builtin/worktree.c:64
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Gỡ bỠcây làm việc/%s: tập tin gitdir không hợp lệ"
-#: builtin/worktree.c:78
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Gỡ bỠcây làm việc/%s: tập tin gitdir chỉ đến vị trí không tồn tại"
-#: builtin/worktree.c:113
-#, c-format
-msgid "failed to remove '%s'"
-msgstr "gặp lá»—i khi gỡ bỠ“%sâ€"
-
-#: builtin/worktree.c:202
+#: builtin/worktree.c:204
#, c-format
msgid "'%s' already exists"
msgstr "“%s†đã có từ trước rồi"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:236
#, c-format
msgid "could not create directory of '%s'"
msgstr "không thể tạo thÆ° mục của “%sâ€"
-#: builtin/worktree.c:270
+#: builtin/worktree.c:272
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Äang chuẩn bị %s (định danh %s)"
-#: builtin/worktree.c:322
+#: builtin/worktree.c:323
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "lấy ra <nhánh> ngay cả khi nó đã được lấy ra ở cây làm việc khác"
-#: builtin/worktree.c:324
+#: builtin/worktree.c:325
msgid "create a new branch"
msgstr "tạo nhánh mới"
-#: builtin/worktree.c:326
+#: builtin/worktree.c:327
msgid "create or reset a branch"
msgstr "tạo hay đặt lại một nhánh"
-#: builtin/worktree.c:327
-msgid "detach HEAD at named commit"
-msgstr "rá»i bá» HEAD tại lần chuyển giao theo tên"
-
-#: builtin/worktree.c:328
+#: builtin/worktree.c:329
msgid "populate the new working tree"
msgstr "di chuyển cây làm việc mới"
-#: builtin/worktree.c:336
+#: builtin/worktree.c:337
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "Các tùy chá»n -b, -B, và --detach loại từ lẫn nhau"
+#: builtin/worktree.c:470
+msgid "reason for locking"
+msgstr "lý do khóa"
+
+#: builtin/worktree.c:482 builtin/worktree.c:515
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr "%s không phải là cây làm việc"
+
+#: builtin/worktree.c:484 builtin/worktree.c:517
+msgid "The main working tree cannot be locked or unlocked"
+msgstr "Cây thư mục làm việc chính không thể khóa hay bỠkhóa được"
+
+#: builtin/worktree.c:489
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "“%s†đã được khóa rồi, lý do: %s"
+
+#: builtin/worktree.c:491
+#, c-format
+msgid "'%s' is already locked"
+msgstr "“%s†đã được khóa rồi"
+
+#: builtin/worktree.c:519
+#, c-format
+msgid "'%s' is not locked"
+msgstr "“%s†chưa bị khóa"
+
#: builtin/write-tree.c:13
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<tiá»n-tố>/]"
@@ -11808,6 +12308,26 @@ msgstr "ghi đối tượng cây (tree) cho <tiá»n tố> thÆ° mục con"
msgid "only useful for debugging"
msgstr "chỉ hữu ích khi cần gỡ lỗi"
+#: upload-pack.c:20
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<các-tùy-chá»n>] </Ä‘Æ°á»ng/dẫn>"
+
+#: upload-pack.c:837
+msgid "quit after a single request/response exchange"
+msgstr "thoát sau khi má»™t trao đổi yêu cầu hay trả lá»i Ä‘Æ¡n"
+
+#: upload-pack.c:839
+msgid "exit immediately after initial ref advertisement"
+msgstr "thoát ngay sau khi khởi tạo quảng cáo tham chiếu"
+
+#: upload-pack.c:841
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "đừng thử <thư_mục>/.git/ nếu <thư_mục> không phải là thư mục Git"
+
+#: upload-pack.c:843
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "ngắt truyá»n thông sau <n> giây không hoạt Ä‘á»™ng"
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "in thông tin gỡ lỗi ra đầu ra lỗi tiêu chuẩn"
@@ -11822,7 +12342,7 @@ msgstr ""
"hÆ°á»›ng dẫn vá» khái niệm. Xem “git help <lệnh>†hay “git help <khái-niệm>â€\n"
"để xem các đặc tả cho lệnh hay khái niệm cụ thể."
-#: http.c:322
+#: http.c:323
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Chốt khóa công không được hỗ trợ với cURL < 7.44.0"
@@ -11956,32 +12476,32 @@ msgstr "sử dụng <n> chữ số để hiển thị SHA-1s"
msgid "update the index with reused conflict resolution if possible"
msgstr "cập nhật bảng mục lục với phân giải xung đột dùng lại nếu được"
-#: git-bisect.sh:55
+#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "Bạn cần khởi đầu bằng \"git bisect start\""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:61
+#: git-bisect.sh:60
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Bạn có muốn tôi thá»±c hiện Ä‘iá»u này cho bạn không [Y/n]? "
-#: git-bisect.sh:122
+#: git-bisect.sh:121
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "không công nhận tùy chá»n: “$argâ€"
-#: git-bisect.sh:126
+#: git-bisect.sh:125
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "â€$arg†không có vẻ nhÆ° là má»™t Ä‘iểm xét duyệt hợp lệ"
-#: git-bisect.sh:155
+#: git-bisect.sh:154
msgid "Bad HEAD - I need a HEAD"
msgstr "HEAD sai - Tôi cần một HEAD"
-#: git-bisect.sh:168
+#: git-bisect.sh:167
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
@@ -11989,27 +12509,28 @@ msgstr ""
"Việc lấy “$start_head†ra gặp lỗi. Hãy thử \"git bisect reset <nhánh_hợp_lệ>"
"\"."
-#: git-bisect.sh:178
+#: git-bisect.sh:177
msgid "won't bisect on cg-seek'ed tree"
msgstr "sẽ không di chuyển nửa bước trên cây được cg-seek"
-#: git-bisect.sh:182
+#: git-bisect.sh:181
msgid "Bad HEAD - strange symbolic ref"
msgstr "HEAD sai - tham chiếu má»m kỳ lạ"
-#: git-bisect.sh:234
+#: git-bisect.sh:233
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "Äối số bisect_write sai: $state"
-#: git-bisect.sh:263
+#: git-bisect.sh:262
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Äầu vào rev sai: $arg"
-#: git-bisect.sh:278
-msgid "Please call 'bisect_state' with at least one argument."
-msgstr "Hãy gá»i lệnhl “bisect_state†vá»›i ít nhất má»™t đối số."
+#: git-bisect.sh:281
+#, sh-format
+msgid "Bad rev input: $bisected_head"
+msgstr "Äầu vào rev sai: $bisected_head"
#: git-bisect.sh:290
#, sh-format
@@ -12155,7 +12676,47 @@ msgstr ""
"tham số không hợp lệ $arg cho “git bisect termsâ€.\n"
"Các tùy chá»n há»— trợ là: --term-good|--term-old và --term-bad|--term-new."
-#: git-rebase.sh:57
+#: git-merge-octopus.sh:46
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr ""
+"Lỗi: Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi "
+"lệnh hòa trộn"
+
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr "Hòa trộn một cách tự động không làm việc."
+
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an Octopus."
+msgstr "Không thể thực hiện một Octopus."
+
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "Không thể tìm thấy lần chuyển giao chung với $pretty_name"
+
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up-to-date with $pretty_name"
+msgstr "Äã cập nhật vá»›i $pretty_name rồi"
+
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "Chuyển-tiếp-nhanh đến: $pretty_name"
+
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "Äang thá»­ hòa trá»™n Ä‘Æ¡n giản vá»›i $pretty_name"
+
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
+msgstr "Hòa trộn đơn giản không làm việc, thử hòa trộn tự động."
+
+#: git-rebase.sh:56
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
@@ -12168,16 +12729,21 @@ msgstr ""
"Äể phục hồi lại thành nhánh nguyên thủy và dừng việc vá lại thì chạy \"git "
"rebase --abort\"."
-#: git-rebase.sh:168
+#: git-rebase.sh:156 git-rebase.sh:395
+#, sh-format
+msgid "Could not move back to $head_name"
+msgstr "Không thể quay trở lại $head_name"
+
+#: git-rebase.sh:167
msgid "Applied autostash."
msgstr "Äã áp dụng autostash."
-#: git-rebase.sh:171
+#: git-rebase.sh:170
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Không thể lưu $stash_sha1"
-#: git-rebase.sh:172
+#: git-rebase.sh:171
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
@@ -12188,31 +12754,31 @@ msgstr ""
"Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc "
"nào.\n"
-#: git-rebase.sh:211
+#: git-rebase.sh:210
msgid "The pre-rebase hook refused to rebase."
msgstr "Móc (hook) pre-rebase từ chối rebase."
-#: git-rebase.sh:216
+#: git-rebase.sh:215
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
"Hình như đang trong quá trình thực hiện lệnh git-am. Không thể chạy lệnh "
"rebase."
-#: git-rebase.sh:357
+#: git-rebase.sh:356
msgid "No rebase in progress?"
msgstr "Không có tiến trình rebase nào phải không?"
-#: git-rebase.sh:368
+#: git-rebase.sh:367
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Hành động “--edit-todo†chỉ có thể dùng trong quá trình “rebase†(sửa lịch "
"sử) tương tác."
-#: git-rebase.sh:375
+#: git-rebase.sh:374
msgid "Cannot read HEAD"
msgstr "Không thể Ä‘á»c HEAD"
-#: git-rebase.sh:378
+#: git-rebase.sh:377
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -12220,12 +12786,7 @@ msgstr ""
"Bạn phải sửa tất cả các lần hòa trộn xung đột và sau\n"
"đó đánh dấu chúng là cần xử lý sử dụng lệnh git add"
-#: git-rebase.sh:396
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "Không thể quay trở lại $head_name"
-
-#: git-rebase.sh:415
+#: git-rebase.sh:414
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -12246,98 +12807,98 @@ msgstr ""
"và chạy TÔI lần nữa. TÔI dừng lại trong trÆ°á»ng hợp bạn vẫn\n"
"có một số thứ quý giá ở đây."
-#: git-rebase.sh:466
+#: git-rebase.sh:465
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "thượng nguồn không hợp lệ $upstream_name"
-#: git-rebase.sh:490
+#: git-rebase.sh:489
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: ở đây có nhiá»u hÆ¡n má»™t ná»n móng hòa trá»™n"
-#: git-rebase.sh:493 git-rebase.sh:497
+#: git-rebase.sh:492 git-rebase.sh:496
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: ở đây không có ná»n móng hòa trá»™n nào"
-#: git-rebase.sh:502
+#: git-rebase.sh:501
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Không chỉ đến một lần chuyển giao không hợp lệ: $onto_name"
-#: git-rebase.sh:525
+#: git-rebase.sh:524
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "nghiêm trá»ng: không có nhánh nhÆ° thế: $branch_name"
-#: git-rebase.sh:558
+#: git-rebase.sh:557
msgid "Cannot autostash"
msgstr "Không thể autostash"
-#: git-rebase.sh:563
+#: git-rebase.sh:562
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Äã tạo autostash: $stash_abbrev"
-#: git-rebase.sh:567
+#: git-rebase.sh:566
msgid "Please commit or stash them."
msgstr "Xin hãy chuyển giao hoặc tạm cất (stash) chúng."
-#: git-rebase.sh:587
+#: git-rebase.sh:586
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi."
-#: git-rebase.sh:591
+#: git-rebase.sh:590
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi, lệnh rebase ép buộc."
-#: git-rebase.sh:602
+#: git-rebase.sh:601
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Thay đổi từ $mb thành $onto:"
-#: git-rebase.sh:611
+#: git-rebase.sh:610
msgid "First, rewinding head to replay your work on top of it..."
msgstr "Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó…"
-#: git-rebase.sh:621
+#: git-rebase.sh:620
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Chuyển-tiếp-nhanh $branch_name thành $onto_name."
-#: git-stash.sh:51
+#: git-stash.sh:50
msgid "git stash clear with parameters is unimplemented"
msgstr ""
"git stash clear với các tham số là chưa được thực hiện (không nhận đối số)"
-#: git-stash.sh:74
+#: git-stash.sh:73
msgid "You do not have the initial commit yet"
msgstr "Bạn chưa còn có lần chuyển giao khởi tạo"
-#: git-stash.sh:89
+#: git-stash.sh:88
msgid "Cannot save the current index state"
msgstr "Không thể ghi lại trạng thái bảng mục lục hiện hành"
-#: git-stash.sh:124 git-stash.sh:137
+#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "Không thể ghi lại trạng thái cây-làm-việc hiện hành"
-#: git-stash.sh:141
+#: git-stash.sh:140
msgid "No changes selected"
msgstr "ChÆ°a có thay đổi nào được chá»n"
-#: git-stash.sh:144
+#: git-stash.sh:143
msgid "Cannot remove temporary index (can't happen)"
msgstr "Không thể gỡ bá» bảng mục lục tạm thá»i (không thể xảy ra)"
-#: git-stash.sh:157
+#: git-stash.sh:156
msgid "Cannot record working tree state"
msgstr "Không thể ghi lại trạng thái cây làm việc hiện hành"
-#: git-stash.sh:189
+#: git-stash.sh:188
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Không thể cập nhật $ref_stash với $w_commit"
@@ -12352,7 +12913,7 @@ msgstr "Không thể cập nhật $ref_stash với $w_commit"
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:239
+#: git-stash.sh:238
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -12362,111 +12923,120 @@ msgstr ""
" Äể có thể dùng lá»i chú thích có chứa -- ở đầu,\n"
" dùng git stash save -- \"$option\""
-#: git-stash.sh:260
+#: git-stash.sh:259
msgid "No local changes to save"
msgstr "Không có thay đổi nội bộ nào được ghi lại"
-#: git-stash.sh:264
+#: git-stash.sh:263
msgid "Cannot initialize stash"
msgstr "Không thể khởi tạo stash"
-#: git-stash.sh:268
+#: git-stash.sh:267
msgid "Cannot save the current status"
msgstr "Không thể ghi lại trạng thái hiện hành"
-#: git-stash.sh:286
+#: git-stash.sh:268
+#, sh-format
+msgid "Saved working directory and index state $stash_msg"
+msgstr "Äã ghi lại thÆ° mục làm việc và trạng thái mục lục $stash_msg"
+
+#: git-stash.sh:285
msgid "Cannot remove worktree changes"
msgstr "Không thể gỡ bỠcác thay đổi cây-làm-việc"
-#: git-stash.sh:405
+#: git-stash.sh:404
#, sh-format
msgid "unknown option: $opt"
msgstr "không hiểu tùy chá»n: $opt"
-#: git-stash.sh:415
+#: git-stash.sh:414
msgid "No stash found."
msgstr "Không tìm thấy lần chuyển giao cất đi (stash) nào."
-#: git-stash.sh:422
+#: git-stash.sh:421
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Chỉ ra quá nhiá»u Ä‘iểm xét duyệt: $REV"
-#: git-stash.sh:428
+#: git-stash.sh:427
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference không phải là tham chiếu hợp lệ"
-#: git-stash.sh:456
+#: git-stash.sh:455
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "“$args†không phải là lần chuyển giao kiểu-stash (cất đi)"
-#: git-stash.sh:467
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "â€$args†không phải tham chiếu đến stash"
-#: git-stash.sh:475
+#: git-stash.sh:474
msgid "unable to refresh index"
msgstr "không thể làm tươi mới bảng mục lục"
-#: git-stash.sh:479
+#: git-stash.sh:478
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Không thể áp dụng một stash ở giữa của quá trình hòa trộn"
-#: git-stash.sh:487
+#: git-stash.sh:486
msgid "Conflicts in index. Try without --index."
msgstr "Xung Ä‘á»™t trong bảng mục lục. Hãy thá»­ mà không dùng tùy chá»n --index."
-#: git-stash.sh:489
+#: git-stash.sh:488
msgid "Could not save index tree"
msgstr "Không thể ghi lại cây chỉ mục"
-#: git-stash.sh:523
+#: git-stash.sh:522
msgid "Cannot unstage modified files"
msgstr "Không thể bá» ra khá»i bệ phóng các tập tin đã được sá»­a chữa"
-#: git-stash.sh:538
+#: git-stash.sh:537
msgid "Index was not unstashed."
msgstr "Bảng mục lục đã không được bỠstash."
-#: git-stash.sh:561
+#: git-stash.sh:551
+msgid "The stash is kept in case you need it again."
+msgstr "stash được giữ trong trÆ°á»ng hợp bạn lại cần nó."
+
+#: git-stash.sh:560
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Äã xóa ${REV} ($s)"
-#: git-stash.sh:562
+#: git-stash.sh:561
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Không thể xóa bỠmục stash"
-#: git-stash.sh:570
+#: git-stash.sh:569
msgid "No branch name specified"
msgstr "Chưa chỉ ra tên của nhánh"
-#: git-stash.sh:642
+#: git-stash.sh:641
msgid "(To restore them type \"git stash apply\")"
msgstr "(Äể phục hồi lại chúng hãy gõ \"git stash apply\")"
-#: git-submodule.sh:219
+#: git-submodule.sh:183
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"ÄÆ°á»ng dẫn tÆ°Æ¡ng đối chỉ có thể dùng từ thÆ° mục ở mức cao nhất của cây làm "
"việc"
-#: git-submodule.sh:229
+#: git-submodule.sh:193
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
"repo URL: “$repo†phải là Ä‘Æ°á»ng dẫn tuyệt đối hoặc là bắt đầu bằng ./|../"
-#: git-submodule.sh:246
+#: git-submodule.sh:210
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "â€$sm_path†thá»±c sá»± đã tồn tại ở bảng mục lục rồi"
-#: git-submodule.sh:250
+#: git-submodule.sh:214
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -12478,99 +13048,90 @@ msgstr ""
"$sm_path\n"
"Sử dụng -f nếu bạn thực sự muốn thêm nó vào."
-#: git-submodule.sh:268
+#: git-submodule.sh:232
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Äang thêm repo có sẵn tại “$sm_path†vào bảng mục lục"
-#: git-submodule.sh:270
+#: git-submodule.sh:234
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "â€$sm_path†đã tồn tại từ trÆ°á»›c và không phải là má»™t kho git hợp lệ"
-#: git-submodule.sh:278
+#: git-submodule.sh:242
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Thư mục git cho “$sm_name†được tìm thấy một cách cục bộ với các máy chủ:"
-#: git-submodule.sh:280
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from"
-msgstr "Nếu bạn muốn dùng lại thư mục git nội bộ này thay vì nhân bản từ nó"
-
-#: git-submodule.sh:282
-#, sh-format
-msgid ""
-"use the '--force' option. If the local git directory is not the correct repo"
-msgstr ""
-"dùng tùy chá»n “--forceâ€. Nếu thÆ° mục git ná»™i bá»™ không phải là repo (kho) đúng"
-
-#: git-submodule.sh:283
+#: git-submodule.sh:244
#, sh-format
msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+" $realrepo\n"
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr ""
-"hay bạn không chắc chắn Ä‘iá»u đó có nghÄ©a gì chá»n tên khác vá»›i tùy chá»n “--"
-"nameâ€."
+"Nếu bạn muốn sử dụng lại thư mục nội bộ này thay vì nhân bản lại lần nữa từ\n"
+" $realrepo\n"
+"dùng tùy chá»n “--forceâ€. Nếu thÆ° mục git ná»™i bá»™ không phải là má»™t kho đúng\n"
+"hoặc là bạn không chắc chắn Ä‘iá»u đó nghÄ©a là gì thì chá»n tên khác vá»›i tùy "
+"chá»n “--nameâ€."
-#: git-submodule.sh:285
+#: git-submodule.sh:250
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
"Phục hồi sá»± hoạt Ä‘á»™ng của thÆ° mục git ná»™i bá»™ cho mô-Ä‘un-con “$sm_nameâ€."
-#: git-submodule.sh:297
+#: git-submodule.sh:262
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Không thể lấy ra mô-Ä‘un-con “$sm_pathâ€"
-#: git-submodule.sh:302
+#: git-submodule.sh:267
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Gặp lá»—i khi thêm mô-Ä‘un-con “$sm_pathâ€"
-#: git-submodule.sh:311
+#: git-submodule.sh:276
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Gặp lá»—i khi đăng ký vá»›i hệ thống mô-Ä‘un-con “$sm_pathâ€"
-#: git-submodule.sh:355
+#: git-submodule.sh:323
#, sh-format
msgid "Entering '$displaypath'"
msgstr "Äang vào “$displaypathâ€"
-#: git-submodule.sh:375
+#: git-submodule.sh:343
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr "Dừng lại tại “$displaypathâ€; script trả vá» trạng thái khác không."
-#: git-submodule.sh:448
+#: git-submodule.sh:414
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "đặc tả Ä‘Æ°á»ng dẫn và --all xung khắc nhau"
-#: git-submodule.sh:453
+#: git-submodule.sh:419
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Dùng “--all†nếu bạn thá»±c sá»± muốn hủy khởi tạo má»i mô-Ä‘un-con"
-#: git-submodule.sh:470
-#, sh-format
-msgid "Submodule work tree '$displaypath' contains a .git directory"
-msgstr "Cây làm việc mô-đun-con “$displaypath†có chứa thư mục .git"
-
-#: git-submodule.sh:471
+#: git-submodule.sh:439
#, sh-format
msgid ""
+"Submodule work tree '$displaypath' contains a .git directory\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
+"Cây làm việc mô-đun-con “$displaypath†có chứa thư mục .git\n"
"(dùng “rm -rf†nếu bạn thực sự muốn gỡ bỠnó cùng với tất cả lịch sử của "
"chúng)"
-#: git-submodule.sh:477
+#: git-submodule.sh:447
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -12579,127 +13140,145 @@ msgstr ""
"Cây làm việc mô-đun-con “$displaypath†chứa các thay đổi nội bộ; hãy dùng “-"
"f†để loại bỠchúng đi"
-#: git-submodule.sh:480
+#: git-submodule.sh:450
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Äã tạo thÆ° mục “$displaypathâ€"
-#: git-submodule.sh:481
+#: git-submodule.sh:451
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "Không thể gỡ bá» cây làm việc mô-Ä‘un-con “$displaypathâ€"
-#: git-submodule.sh:484
+#: git-submodule.sh:454
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Không thể tạo thÆ° mục mô-Ä‘un-con rá»—ng “$displaypathâ€"
-#: git-submodule.sh:493
+#: git-submodule.sh:463
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "Mô-Ä‘un-con “$name†($url) được bỠđăng ký cho Ä‘Æ°á»ng dẫn “$displaypathâ€"
-#: git-submodule.sh:635
+#: git-submodule.sh:612
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"Không tìm thấy Ä‘iểm xét duyệt hiện hành trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con "
"“$displaypathâ€"
-#: git-submodule.sh:644
+#: git-submodule.sh:622
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Không thể lấy vá» trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$sm_pathâ€"
-#: git-submodule.sh:667
+#: git-submodule.sh:627
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr ""
+"Không thể tìm thấy điểm xét duyệt hiện hành ${remote_name}/${branch} trong "
+"Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$sm_pathâ€"
+
+#: git-submodule.sh:645
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Không thể lấy vá» trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€"
-#: git-submodule.sh:680
+#: git-submodule.sh:651
+#, sh-format
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr ""
+"Äã lấy vá» từ Ä‘Æ°á»ng dẫn mô-Ä‘un con “$displaypathâ€, nhÆ°ng nó không chứa $sha1. "
+"Lấy vỠtheo định hướng của lần chuyển giao đó gặp lỗi."
+
+#: git-submodule.sh:658
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Không thể lấy ra “$sha1†trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€"
-#: git-submodule.sh:681
+#: git-submodule.sh:659
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "ÄÆ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€: đã checkout “$sha1â€"
-#: git-submodule.sh:685
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Không thể cải tổ “$sha1†trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€"
-#: git-submodule.sh:686
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "ÄÆ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€: được rebase vào trong “$sha1â€"
-#: git-submodule.sh:691
+#: git-submodule.sh:669
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"Không thể hòa trá»™n (merge) “$sha1†trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€"
-#: git-submodule.sh:692
+#: git-submodule.sh:670
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "ÄÆ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€: được hòa trá»™n vào “$sha1â€"
-#: git-submodule.sh:697
+#: git-submodule.sh:675
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Thá»±c hiện không thành công lệnh “$command $sha1†trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con "
"“$displaypathâ€"
-#: git-submodule.sh:698
+#: git-submodule.sh:676
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "ÄÆ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€: “$command $sha1â€"
-#: git-submodule.sh:729
+#: git-submodule.sh:707
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Gặp lá»—i khi đệ quy vào trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€"
-#: git-submodule.sh:837
+#: git-submodule.sh:815
msgid "The --cached option cannot be used with the --files option"
msgstr "Tùy chá»n --cached không thể dùng cùng vá»›i tùy chá»n --files"
-#: git-submodule.sh:889
+#: git-submodule.sh:867
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "chế độ không như mong chỠ$mod_dst"
-#: git-submodule.sh:909
+#: git-submodule.sh:887
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_src"
-#: git-submodule.sh:912
+#: git-submodule.sh:890
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_dst"
-#: git-submodule.sh:915
+#: git-submodule.sh:893
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Cảnh báo: $display_name không chứa những lần chuyển giao $sha1_src và "
"$sha1_dst"
-#: git-submodule.sh:940
+#: git-submodule.sh:918
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:1059
+#: git-submodule.sh:1040
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Gặp lá»—i khi đệ quy vào trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$sm_pathâ€"
-#: git-submodule.sh:1123
+#: git-submodule.sh:1107
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Url Mô-Ä‘un-con đồng bá»™ hóa cho “$displaypathâ€"
@@ -12709,6 +13288,698 @@ msgstr "Url Mô-Ä‘un-con đồng bá»™ hóa cho “$displaypathâ€"
msgid "See git-${cmd}(1) for details."
msgstr "Xem git-${cmd}(1) để biết thêm chi tiết."
+#: git-rebase--interactive.sh:131
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr "Äang rebase ($new_count/$total)"
+
+#: git-rebase--interactive.sh:147
+msgid ""
+"\n"
+"Commands:\n"
+" p, pick = use commit\n"
+" r, reword = use commit, but edit the commit message\n"
+" e, edit = use commit, but stop for amending\n"
+" s, squash = use commit, but meld into previous commit\n"
+" f, fixup = like \"squash\", but discard this commit's log message\n"
+" x, exec = run command (the rest of the line) using shell\n"
+" d, drop = remove commit\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+"\n"
+"Các lệnh:\n"
+" p, pick = dùng lần chuyển giao\n"
+" r, reword = dùng lần chuyển giao, nhưng sửa lại phần chú thích\n"
+" e, edit = dùng lần chuyển giao, nhưng dừng lại để tu bổ (amend)\n"
+" s, squash = dùng lần chuyển giao, nhưng meld vào lần chuyển giao kế trước\n"
+" f, fixup = giống như \"squash\", nhưng loại bỠchú thích của lần chuyển "
+"giao này\n"
+" x, exec = chạy lệnh (phần còn lại của dòng) dùng hệ vá»\n"
+" d, drop = xóa lần chuyển giao\n"
+"\n"
+"Những dòng này có thể đảo ngược thứ tự; chúng chạy từ trên đỉnh xuống dưới "
+"đáy.\n"
+
+#: git-rebase--interactive.sh:162
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"Äừng xóa bất kỳ dòng nào. Dùng “drop†má»™t cách rõ ràng để xóa bá» má»™t lần "
+"chuyển giao.\n"
+
+#: git-rebase--interactive.sh:166
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Nếu bạn xóa bá» má»™t dòng ở đây thì LẦN CHUYỂN GIAO ÄÓ SẼ MẤT.\n"
+
+#: git-rebase--interactive.sh:202
+#, sh-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Bạn có thể tu bổ lần chuyển giao ngay bây giỠbằng:\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Một khi đã hài lòng với những thay đổi của mình, thì chạy:\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:227
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
+msgstr "$sha1: không phải là lần chuyển giao mà có thể lấy ra được"
+
+#: git-rebase--interactive.sh:266
+#, sh-format
+msgid "Invalid commit name: $sha1"
+msgstr "Tên lần chuyển giao không hợp lệ: $sha1"
+
+#: git-rebase--interactive.sh:308
+msgid "Cannot write current commit's replacement sha1"
+msgstr "Không thể ghi lại sha1 thay thế của lần chuyển giao"
+
+#: git-rebase--interactive.sh:360
+#, sh-format
+msgid "Fast-forward to $sha1"
+msgstr "Chuyển-tiếp-nhanh đến $sha1"
+
+#: git-rebase--interactive.sh:362
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
+msgstr "Không thể chuyển-tiếp-nhanh đến $sha1"
+
+#: git-rebase--interactive.sh:371
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
+msgstr "Không thể di chuyển HEAD đến $first_parent"
+
+#: git-rebase--interactive.sh:376
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
+msgstr "Từ chối squash lần hòa trộn: $sha1"
+
+#: git-rebase--interactive.sh:390
+#, sh-format
+msgid "Error redoing merge $sha1"
+msgstr "Gặp lỗi khi hoàn lại bước hòa trộn $sha1"
+
+#: git-rebase--interactive.sh:398
+#, sh-format
+msgid "Could not pick $sha1"
+msgstr "Không thể lấy ra $sha1"
+
+#: git-rebase--interactive.sh:407
+#, sh-format
+msgid "This is the commit message #${n}:"
+msgstr "Äây là chú thích cho lần chuyển giao thứ #${n}:"
+
+#: git-rebase--interactive.sh:412
+#, sh-format
+msgid "The commit message #${n} will be skipped:"
+msgstr "Chú thích cho lần chuyển giao thứ #${n} sẽ bị bỠqua:"
+
+#: git-rebase--interactive.sh:423
+#, sh-format
+msgid "This is a combination of $count commit."
+msgid_plural "This is a combination of $count commits."
+msgstr[0] "Äây là tổ hợp của $count lần chuyển giao."
+
+#: git-rebase--interactive.sh:431
+#, sh-format
+msgid "Cannot write $fixup_msg"
+msgstr "Không thể $fixup_msg"
+
+#: git-rebase--interactive.sh:434
+msgid "This is a combination of 2 commits."
+msgstr "Äây là tổ hợp của 2 lần chuyển giao."
+
+#: git-rebase--interactive.sh:435
+msgid "This is the 1st commit message:"
+msgstr "Äây là chú thích cho lần chuyển giao thứ nhất:"
+
+#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
+#: git-rebase--interactive.sh:521
+#, sh-format
+msgid "Could not apply $sha1... $rest"
+msgstr "Không thể áp dụng $sha1… $rest"
+
+#: git-rebase--interactive.sh:549
+#, sh-format
+msgid ""
+"Could not amend commit after successfully picking $sha1... $rest\n"
+"This is most likely due to an empty commit message, or the pre-commit hook\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue "
+"before\n"
+"you are able to reword the commit."
+msgstr ""
+"Không thể tu bổ lần chuyển giao sau khi lấy ra $sha1… $rest thành công\n"
+"Việc này có thể là do một ghi chú cho lần chuyển giao là trống rỗng, hoặc "
+"móc pre-commit\n"
+"gặp lỗi. Nếu là móc pre-commit bị lỗi, Bạn có lẽ cần giải quyết trục trặc "
+"này\n"
+"trước khi bạn có thể làm việc lại với lần chuyển giao."
+
+#: git-rebase--interactive.sh:564
+#, sh-format
+msgid "Stopped at $sha1_abbrev... $rest"
+msgstr "Bị dừng tại $sha1_abbrev… $rest"
+
+#: git-rebase--interactive.sh:579
+#, sh-format
+msgid "Cannot '$squash_style' without a previous commit"
+msgstr "Không “$squash_style†thể mà không có lần chuyển giao kế trước"
+
+#: git-rebase--interactive.sh:621
+#, sh-format
+msgid "Executing: $rest"
+msgstr "Thá»±c thi: $rest"
+
+#: git-rebase--interactive.sh:629
+#, sh-format
+msgid "Execution failed: $rest"
+msgstr "Thực thi gặp lỗi: $rest"
+
+#: git-rebase--interactive.sh:631
+msgid "and made changes to the index and/or the working tree"
+msgstr "và tạo các thay đổi bảng mục lục và/hay cây làm việc"
+
+#: git-rebase--interactive.sh:633
+msgid ""
+"You can fix the problem, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Bạn có thể sá»­a các trục trặc, và sau đó chạy lệnh “cải tổâ€:\n"
+"\n"
+"\tgit rebase --continue"
+
+#. TRANSLATORS: after these lines is a command to be issued by the user
+#: git-rebase--interactive.sh:646
+#, sh-format
+msgid ""
+"Execution succeeded: $rest\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Thực thi thành công: $rest\n"
+"nhưng còn các thay đổi trong mục lục và/hoặc cây làm việc\n"
+"Chuyển giao hay tạm cất các thay đổi này đi, rồi chạy\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:657
+#, sh-format
+msgid "Unknown command: $command $sha1 $rest"
+msgstr "Lệnh chưa biết: $command $sha1 $rest"
+
+#: git-rebase--interactive.sh:658
+msgid "Please fix this using 'git rebase --edit-todo'."
+msgstr "Vui lòng sá»­a lá»—i này bằng cách dùng “git rebase --edit-todoâ€."
+
+#: git-rebase--interactive.sh:693
+#, sh-format
+msgid "Successfully rebased and updated $head_name."
+msgstr "Cài tổ và cập nhật $head_name một cách thành công."
+
+#: git-rebase--interactive.sh:740
+msgid "Could not skip unnecessary pick commands"
+msgstr "Không thể bỠqua các lệnh cậy (pick) không cần thiết"
+
+#: git-rebase--interactive.sh:898
+#, sh-format
+msgid ""
+"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+" - $line"
+msgstr ""
+"Cảnh báo: SHA-1 bị thiếu hoặc không phải là một lần chuyển giao trong dòng "
+"sau đây:\n"
+" - $line"
+
+#: git-rebase--interactive.sh:931
+#, sh-format
+msgid ""
+"Warning: the command isn't recognized in the following line:\n"
+" - $line"
+msgstr ""
+"Cảnh báo: lệnh không nhận ra trong dòng sau đây:\n"
+" - $line"
+
+#: git-rebase--interactive.sh:970
+msgid "could not detach HEAD"
+msgstr "không thể tách rá»i HEAD"
+
+#: git-rebase--interactive.sh:1008
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):"
+msgstr ""
+"Cảnh báo: má»™t số lần chuyển giao có lẽ đã bị xóa má»™t cách tình cá».\n"
+"Các lần chuyển giao bị xóa (từ mới đến cũ):"
+
+#: git-rebase--interactive.sh:1016
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error."
+msgstr ""
+"Äể tránh thông báo này, dùng \"drop\" má»™t cách rõ ràng để xóa bá» má»™t lần "
+"chuyển giao.\n"
+"\n"
+"Dùng “git config rebase.missingCommitsCheck†để thay đổi mức độ của cảnh "
+"báo.\n"
+"Cánh ứng xử có thể là: ignore, warn, error."
+
+#: git-rebase--interactive.sh:1027
+#, sh-format
+msgid ""
+"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
+"Ignoring."
+msgstr ""
+"Không thừa nhận cài đặt $check_level for option rebase.missingCommitsCheck. "
+"Nên bỠqua."
+
+#: git-rebase--interactive.sh:1044
+msgid "You can fix this with 'git rebase --edit-todo'."
+msgstr "Bạn có thể sá»­a nó bằng “git rebase --edit-todoâ€."
+
+#: git-rebase--interactive.sh:1045
+msgid "Or you can abort the rebase with 'git rebase --abort'."
+msgstr "Hoặc là bạn có thể bãi bá» lần cải tổ vá»›i lệnh “git rebase --abortâ€."
+
+#: git-rebase--interactive.sh:1069
+msgid "Could not remove CHERRY_PICK_HEAD"
+msgstr "Không thể xóa bỠCHERRY_PICK_HEAD"
+
+#: git-rebase--interactive.sh:1074
+#, sh-format
+msgid ""
+"You have staged changes in your working tree.\n"
+"If these changes are meant to be\n"
+"squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In both case, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
+msgstr ""
+"Bạn có các thay đổi so với trong bệ phóng trong thư mục làm việc của bạn.\n"
+"Nếu các thay đổi này là muốn\n"
+"squash vào lần chuyển giao kế trước, chạy:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Nếu chúng có ý là đi đến lần chuyển giao mới, thì chạy:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"Trong cả hai trÆ°á»ng hợp, má»™t khi bạn làm xong, tiếp tục bằng:\n"
+"\n"
+" git rebase --continue\n"
+
+#: git-rebase--interactive.sh:1091
+msgid "Error trying to find the author identity to amend commit"
+msgstr "Lỗi khi cố tìm định danh của tác giả để tu bổ lần chuyển giao"
+
+#: git-rebase--interactive.sh:1096
+msgid ""
+"You have uncommitted changes in your working tree. Please commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"Bạn có các thay đổi chưa chuyển giao trong thư mục làm việc.\n"
+"Vui lòng chuyển giao chúng và sau đó chạy lệnh “git rebase --continue†lần "
+"nữa."
+
+#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
+msgid "Could not commit staged changes."
+msgstr "Không thể chuyển giao các thay đổi đã đưa lên bệ phóng."
+
+#: git-rebase--interactive.sh:1129
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Bạn đang sửa tập tin todo của một lần cải tổ tương tác đang thực hiện.\n"
+"Äể tiếp tục cải tổ sau khi sá»­a, chạy:\n"
+" git rebase --continue\n"
+"\n"
+
+#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+msgid "Could not execute editor"
+msgstr "Không thể thực thi trình biên soạn"
+
+#: git-rebase--interactive.sh:1145
+msgid "You need to set your committer info first"
+msgstr "Bạn cần đặt thông tin vá» ngÆ°á»i chuyển giao mã nguồn trÆ°á»›c đã"
+
+#: git-rebase--interactive.sh:1153
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr "Không thể checkout $switch_to"
+
+#: git-rebase--interactive.sh:1158
+msgid "No HEAD?"
+msgstr "Không HEAD?"
+
+#: git-rebase--interactive.sh:1159
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr "Không thể tạo thÆ° mục tạm thá»i $state_dir"
+
+#: git-rebase--interactive.sh:1161
+msgid "Could not mark as interactive"
+msgstr "Không thể đánh dấu là tương tác"
+
+#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+msgid "Could not init rewritten commits"
+msgstr "Không thể khởi tạo các lần chuyển giao ghi lại"
+
+#: git-rebase--interactive.sh:1276
+#, sh-format
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] "Cải tổ $shortrevisions vào $shortonto (các lệnh $todocount)"
+
+#: git-rebase--interactive.sh:1281
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"Tuy nhiên, nếu bạn xóa bá» má»i thứ, việc cải tổ sẽ bị bãi bá».\n"
+
+#: git-rebase--interactive.sh:1288
+msgid "Note that empty commits are commented out"
+msgstr "Chú ý rằng lần chuyển giao trống rỗng là ghi chú"
+
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "cách dùng: $dashless $USAGE"
+
+#: git-sh-setup.sh:190
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr ""
+"Không thể chuyển thư mục (chdir) sang $cdup, thư mục ở mức cao nhất của cây "
+"làm việc"
+
+#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr ""
+"lá»—i nghiêm trá»ng: $program_name không thể được dùng ngoaoif thÆ° mục làm việc."
+
+#: git-sh-setup.sh:220
+msgid "Cannot rebase: You have unstaged changes."
+msgstr "Không thể cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
+
+#: git-sh-setup.sh:223
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr ""
+"Không thể ghi lại các nhánh: Bạn có các thay đổi chưa được đưa lên bệ phóng."
+
+#: git-sh-setup.sh:229
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr "Không thể $action: Bạn có các thay đổi chưa được đưa lên bệ phóng."
+
+#: git-sh-setup.sh:242
+msgid "Cannot rebase: Your index contains uncommitted changes."
+msgstr ""
+"Không thể cải tổ: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
+
+#: git-sh-setup.sh:248
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr ""
+"Không thể $action: Mục lục của bạn có chứa các thay đổi chưa được chuyển "
+"giao."
+
+#: git-sh-setup.sh:372
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr "Bạn cần chạy lệnh này từ thư mục ở mức cao nhất của cây làm việc."
+
+#: git-sh-setup.sh:377
+msgid "Unable to determine absolute path of git directory"
+msgstr "Không thể dò tìm Ä‘Æ°á»ng dẫn tuyệt đối của thÆ° mục git"
+
+#~ msgid "bad numeric config value '%s' for '%s': invalid unit"
+#~ msgstr "sai giá trị bằng số của cấu hình “%s†cho “%sâ€: Ä‘Æ¡n vị sai"
+
+#~ msgid "bad numeric config value '%s' for '%s' in blob %s: invalid unit"
+#~ msgstr ""
+#~ "sai giá trị bằng số của cấu hình “%s†cho “%s†trong blob %s: đơn vị sai"
+
+#~ msgid "bad numeric config value '%s' for '%s' in file %s: invalid unit"
+#~ msgstr ""
+#~ "sai giá trị bằng số của cấu hình “%s†cho “%s†trong tập tin %s: đơn vị "
+#~ "sai"
+
+#~ msgid ""
+#~ "bad numeric config value '%s' for '%s' in standard input: invalid unit"
+#~ msgstr ""
+#~ "sai giá trị bằng số của cấu hình “%s†cho “%s†trong đầu vào tiêu chuẩn: "
+#~ "đơn vị không hợp lệ"
+
+#~ msgid ""
+#~ "bad numeric config value '%s' for '%s' in submodule-blob %s: invalid unit"
+#~ msgstr ""
+#~ "sai giá trị bằng số của cấu hình “%s†cho “%s†trong submodule-blob %s: "
+#~ "đơn vị không hợp lệ"
+
+#~ msgid ""
+#~ "bad numeric config value '%s' for '%s' in command line %s: invalid unit"
+#~ msgstr ""
+#~ "sai giá trị bằng số của cấu hình “%s†cho “%s†trong dòng lệnh %s: đơn vị "
+#~ "không hợp lệ"
+
+#~ msgid "bad numeric config value '%s' for '%s' in %s: invalid unit"
+#~ msgstr ""
+#~ "sai giá trị bằng số của cấu hình “%s†cho “%s†trong %s: đơn vị không hợp "
+#~ "lệ"
+
+#~ msgid "This is the 2nd commit message:"
+#~ msgstr "Äây là chú thích cho lần chuyển giao thứ 2:"
+
+#~ msgid "This is the 3rd commit message:"
+#~ msgstr "Äây là chú thích cho lần chuyển giao thứ 3:"
+
+#~ msgid "This is the 4th commit message:"
+#~ msgstr "Äây là chú thích cho lần chuyển giao thứ 4:"
+
+#~ msgid "This is the 5th commit message:"
+#~ msgstr "Äây là chú thích cho lần chuyển giao thứ 5:"
+
+#~ msgid "This is the 6th commit message:"
+#~ msgstr "Äây là chú thích cho lần chuyển giao thứ 6:"
+
+#~ msgid "This is the 7th commit message:"
+#~ msgstr "Äây là chú thích cho lần chuyển giao thứ 7:"
+
+#~ msgid "This is the 8th commit message:"
+#~ msgstr "Äây là chú thích cho lần chuyển giao thứ 8:"
+
+#~ msgid "This is the 9th commit message:"
+#~ msgstr "Äây là chú thích cho lần chuyển giao thứ 9:"
+
+#~ msgid "This is the 10th commit message:"
+#~ msgstr "Äây là chú thích cho lần chuyển giao thứ 10:"
+
+#~ msgid "This is the ${n}th commit message:"
+#~ msgstr "Äây là chú thích cho lần chuyển giao thứ ${n}:"
+
+#~ msgid "This is the ${n}st commit message:"
+#~ msgstr "Äây là chú thích cho lần chuyển giao thứ ${n}:"
+
+#~ msgid "This is the ${n}nd commit message:"
+#~ msgstr "Äây là chú thích cho lần chuyển giao thứ ${n}:"
+
+#~ msgid "This is the ${n}rd commit message:"
+#~ msgstr "Äây là chú thích cho lần chuyển giao thứ ${n}:"
+
+#~ msgid "The 1st commit message will be skipped:"
+#~ msgstr "Chú thích cho lần chuyển giao thứ nhất sẽ bị bỠqua:"
+
+#~ msgid "The 2nd commit message will be skipped:"
+#~ msgstr "Chú thích cho lần chuyển giao thứ 2 sẽ bị bỠqua:"
+
+#~ msgid "The 3rd commit message will be skipped:"
+#~ msgstr "Chú thích cho lần chuyển giao thứ 3 sẽ bị bỠqua:"
+
+#~ msgid "The 4th commit message will be skipped:"
+#~ msgstr "Chú thích cho lần chuyển giao thứ 4 sẽ bị bỠqua:"
+
+#~ msgid "The 5th commit message will be skipped:"
+#~ msgstr "Chú thích cho lần chuyển giao thứ 5 sẽ bị bỠqua:"
+
+#~ msgid "The 6th commit message will be skipped:"
+#~ msgstr "Chú thích cho lần chuyển giao thứ 6 sẽ bị bỠqua:"
+
+#~ msgid "The 7th commit message will be skipped:"
+#~ msgstr "Chú thích cho lần chuyển giao thứ 7 sẽ bị bỠqua:"
+
+#~ msgid "The 8th commit message will be skipped:"
+#~ msgstr "Chú thích cho lần chuyển giao thứ 8 sẽ bị bỠqua:"
+
+#~ msgid "The 9th commit message will be skipped:"
+#~ msgstr "Chú thích cho lần chuyển giao thứ 9 sẽ bị bỠqua:"
+
+#~ msgid "The 10th commit message will be skipped:"
+#~ msgstr "Chú thích cho lần chuyển giao thứ 10 sẽ bị bỠqua:"
+
+#~ msgid "The ${n}th commit message will be skipped:"
+#~ msgstr "Chú thích cho lần chuyển giao thứ ${n} sẽ bị bỠqua:"
+
+#~ msgid "The ${n}st commit message will be skipped:"
+#~ msgstr "Chú thích cho lần chuyển giao thứ ${n} sẽ bị bỠqua:"
+
+#~ msgid "The ${n}nd commit message will be skipped:"
+#~ msgstr "Chú thích cho lần chuyển giao thứ ${n} sẽ bị bỠqua:"
+
+#~ msgid "The ${n}rd commit message will be skipped:"
+#~ msgstr "Chú thích cho lần chuyển giao thứ ${n} sẽ bị bỠqua:"
+
+#~ msgid "could not run gpg."
+#~ msgstr "không thể chạy gpg."
+
+#~ msgid "gpg did not accept the data"
+#~ msgstr "gpg đã không chấp nhận dữ liệu"
+
+#~ msgid "unsupported object type in the tree"
+#~ msgstr "kiểu đối tượng không được hỗ trợ trong cây (tree)"
+
+#~ msgid "Fatal merge failure, shouldn't happen."
+#~ msgstr "Việc hòa trá»™n há»ng nghiêm trá»ng, không nên để xảy ra."
+
+#~ msgid "Unprocessed path??? %s"
+#~ msgstr "ÄÆ°á»ng dẫn chÆ°a được xá»­ lý??? %s"
+
+#~ msgid "Error wrapping up %s"
+#~ msgstr "Lá»—i bao bá»c %s"
+
+#~ msgid "Cannot %s during a %s"
+#~ msgstr "Không thể %s trong khi %s"
+
+#~ msgid "Can't cherry-pick into empty head"
+#~ msgstr "Không thể cherry-pick vào một đầu (head) trống rỗng"
+
+#~ msgid "could not open %s for writing"
+#~ msgstr "không thể mở %s để ghi"
+
+#~ msgid "bug: unhandled unmerged status %x"
+#~ msgstr "lỗi: không thể tiếp nhận trạng thái chưa hòa trộn %x"
+
+#~ msgid "bug: unhandled diff status %c"
+#~ msgstr "lỗi: không thể tiếp nhận trạng thái lệnh diff %c"
+
+#~ msgid "read of %s failed"
+#~ msgstr "Ä‘á»c %s gặp lá»—i"
+
+#~ msgid "could not write branch description template"
+#~ msgstr "không thể ghi mẫu mô tả nhánh"
+
+#~ msgid "corrupt index file"
+#~ msgstr "tập tin ghi bảng mục lục bị há»ng"
+
+#~ msgid "detach the HEAD at named commit"
+#~ msgstr "rá»i bá» HEAD tại lần chuyển giao danh nghÄ©a"
+
+#~ msgid "Checking connectivity... "
+#~ msgstr "Äang kiểm tra kết nối… "
+
+#~ msgid " (unable to update local ref)"
+#~ msgstr " (không thể cập nhật tham chiếu nội bộ)"
+
+#~ msgid "Reinitialized existing"
+#~ msgstr "Khởi tạo lại đã sẵn có rồi"
+
+#~ msgid "Initialized empty"
+#~ msgstr "Khởi tạo trống rỗng"
+
+#~ msgid " shared"
+#~ msgstr " đã chia sẻ"
+
+#~ msgid "Verify that the named commit has a valid GPG signature"
+#~ msgstr ""
+#~ "Thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không"
+
+#~ msgid "Could not write to '%s'"
+#~ msgstr "Không thể ghi vào “%sâ€"
+
+#~ msgid "Writing SQUASH_MSG"
+#~ msgstr "Äang ghi SQUASH_MSG"
+
+#~ msgid "Finishing SQUASH_MSG"
+#~ msgstr "Hoàn thành SQUASH_MSG"
+
+#~ msgid " and with remote"
+#~ msgstr " và với máy chủ"
+
+#~ msgid "removing '%s' failed"
+#~ msgstr "gặp lá»—i khi xóa bỠ“%sâ€"
+
+#~ msgid "program error"
+#~ msgstr "lỗi chương trình"
+
+#~ msgid "Please call 'bisect_state' with at least one argument."
+#~ msgstr "Hãy gá»i lệnhl “bisect_state†vá»›i ít nhất má»™t đối số."
+
+#~ msgid ""
+#~ "If you want to reuse this local git directory instead of cloning again "
+#~ "from"
+#~ msgstr "Nếu bạn muốn dùng lại thư mục git nội bộ này thay vì nhân bản từ nó"
+
+#~ msgid ""
+#~ "use the '--force' option. If the local git directory is not the correct "
+#~ "repo"
+#~ msgstr ""
+#~ "dùng tùy chá»n “--forceâ€. Nếu thÆ° mục git ná»™i bá»™ không phải là repo (kho) "
+#~ "đúng"
+
+#~ msgid ""
+#~ "or you are unsure what this means choose another name with the '--name' "
+#~ "option."
+#~ msgstr ""
+#~ "hay bạn không chắc chắn Ä‘iá»u đó có nghÄ©a gì chá»n tên khác vá»›i tùy chá»n “--"
+#~ "nameâ€."
+
+#~ msgid "Submodule work tree '$displaypath' contains a .git directory"
+#~ msgstr "Cây làm việc mô-đun-con “$displaypath†có chứa thư mục .git"
+
+#~ msgid ""
+#~ "(use 'rm -rf' if you really want to remove it including all of its "
+#~ "history)"
+#~ msgstr ""
+#~ "(dùng “rm -rf†nếu bạn thực sự muốn gỡ bỠnó cùng với tất cả lịch sử của "
+#~ "chúng)"
+
#~ msgid "'%s': %s"
#~ msgstr "“%sâ€: %s"
@@ -12892,9 +14163,6 @@ msgstr "Xem git-${cmd}(1) để biết thêm chi tiết."
#~ msgid "-b and -B are mutually exclusive"
#~ msgstr "-b và -B loại từ lẫn nhau."
-#~ msgid "You need to set your committer info first"
-#~ msgstr "Bạn cần đặt thông tin vá» ngÆ°á»i chuyển giao mã nguồn trÆ°á»›c đã"
-
#~ msgid ""
#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
@@ -12944,11 +14212,6 @@ msgstr "Xem git-${cmd}(1) để biết thêm chi tiết."
#~ "để phê chuẩn việc đánh dấu đây cần được giải quyết và tạo một lần chuyển "
#~ "giao."
-#~ msgid "Pull is not possible because you have unmerged files."
-#~ msgstr ""
-#~ "Full là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa "
-#~ "trá»™n."
-
#~ msgid "no branch specified"
#~ msgstr "chưa chỉ ra tên của nhánh"
@@ -13000,9 +14263,6 @@ msgstr "Xem git-${cmd}(1) để biết thêm chi tiết."
#~ msgid "Failed to write ref"
#~ msgstr "Gặp lỗi khi ghi tham chiếu"
-#~ msgid "invalid commit: %s"
-#~ msgstr "lần chuyển giao không hợp lệ: %s"
-
#~ msgid "commit has empty message"
#~ msgstr "lần chuyển giao có ghi chú trống rỗng"
@@ -13178,15 +14438,6 @@ msgstr "Xem git-${cmd}(1) để biết thêm chi tiết."
#~ msgstr "Bạn không thể kết hợp --no-ff với --ff-only."
#~ msgid ""
-#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "mô-đun-con “%s†(hoặc cái nằm trong các mô-đun-con) dùng thư mục .git\n"
-#~ "(dùng “rm -rf†nếu bạn thực sự muốn gỡ bỠnó cùng với tất cả lịch sử của "
-#~ "chúng)"
-
-#~ msgid ""
#~ "'%s' has changes staged in the index\n"
#~ "(use --cached to keep the file, or -f to force removal)"
#~ msgstr ""
@@ -13252,9 +14503,6 @@ msgstr "Xem git-${cmd}(1) để biết thêm chi tiết."
#~ msgid "Not removing %s\n"
#~ msgstr "Không xóa %s\n"
-#~ msgid "Could not read index"
-#~ msgstr "Không thể Ä‘á»c bảng mục lục"
-
#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
#~ msgstr "git remote set-head <tên> (-a | -d | <nhánh>])"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 36db9fe..dc31222 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -135,8 +135,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-05-24 23:42+0800\n"
-"PO-Revision-Date: 2016-06-06 23:05+0800\n"
+"POT-Creation-Date: 2016-08-27 23:21+0800\n"
+"PO-Revision-Date: 2016-09-05 23:36+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
@@ -150,7 +150,32 @@ msgstr ""
msgid "hint: %.*s\n"
msgstr "æ示:%.*s\n"
-#: advice.c:88
+#: advice.c:83
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr "无法拣选,因为您有未åˆå¹¶çš„文件。"
+
+#: advice.c:85
+msgid "Committing is not possible because you have unmerged files."
+msgstr "无法æ交,因为您有未åˆå¹¶çš„文件。"
+
+#: advice.c:87
+msgid "Merging is not possible because you have unmerged files."
+msgstr "无法åˆå¹¶ï¼Œå› ä¸ºæ‚¨æœ‰æœªåˆå¹¶çš„文件。"
+
+#: advice.c:89
+msgid "Pulling is not possible because you have unmerged files."
+msgstr "无法拉å–,因为您有未åˆå¹¶çš„文件。"
+
+#: advice.c:91
+msgid "Reverting is not possible because you have unmerged files."
+msgstr "无法回退,因为您有未åˆå¹¶çš„文件。"
+
+#: advice.c:93
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
+msgstr "无法 %s,因为您有未åˆå¹¶çš„文件。"
+
+#: advice.c:101
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -158,18 +183,48 @@ msgstr ""
"请在工作区改正文件,然åŽé…Œæƒ…使用 'git add/rm <文件>' 命令标记\n"
"解决方案并æ交。"
-#: advice.c:101 builtin/merge.c:1238
+#: advice.c:109
+msgid "Exiting because of an unresolved conflict."
+msgstr "因为存在未解决的冲çªè€Œé€€å‡ºã€‚"
+
+#: advice.c:114 builtin/merge.c:1181
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结æŸæ‚¨çš„åˆå¹¶ï¼ˆå­˜åœ¨ MERGE_HEAD)。"
-#: advice.c:103
+#: advice.c:116
msgid "Please, commit your changes before merging."
msgstr "请在åˆå¹¶å‰å…ˆæ交您的修改。"
-#: advice.c:104
+#: advice.c:117
msgid "Exiting because of unfinished merge."
msgstr "因为存在未完æˆçš„åˆå¹¶è€Œé€€å‡ºã€‚"
+#: advice.c:123
+#, c-format
+msgid ""
+"Note: checking out '%s'.\n"
+"\n"
+"You are in 'detached HEAD' state. You can look around, make experimental\n"
+"changes and commit them, and you can discard any commits you make in this\n"
+"state without impacting any branches by performing another checkout.\n"
+"\n"
+"If you want to create a new branch to retain commits you create, you may\n"
+"do so (now or later) by using -b with the checkout command again. Example:\n"
+"\n"
+" git checkout -b <new-branch-name>\n"
+"\n"
+msgstr ""
+"注æ„:正在检出 '%s'。\n"
+"\n"
+"您正处于分离头指针状æ€ã€‚您å¯ä»¥æŸ¥çœ‹ã€åšè¯•éªŒæ€§çš„修改åŠæ交,并且您å¯ä»¥é€šè¿‡å¦å¤–\n"
+"的检出分支æ“作丢弃在这个状æ€ä¸‹æ‰€åšçš„任何æ交。\n"
+"\n"
+"如果您想è¦é€šè¿‡åˆ›å»ºåˆ†æ”¯æ¥ä¿ç•™åœ¨æ­¤çŠ¶æ€ä¸‹æ‰€åšçš„æ交,您å¯ä»¥é€šè¿‡åœ¨æ£€å‡ºå‘½ä»¤æ·»åŠ \n"
+"å‚æ•° -b æ¥å®žçŽ°ï¼ˆçŽ°åœ¨æˆ–ç¨åŽï¼‰ã€‚例如:\n"
+"\n"
+" git checkout -b <new-branch-name>\n"
+"\n"
+
#: archive.c:12
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<选项>] <树或æ交> [<路径>...]"
@@ -188,7 +243,7 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <仓库> [--exec <命令>] --list"
-#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
+#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径规格 '%s' 未匹é…任何文件"
@@ -201,7 +256,7 @@ msgstr "æ ¼å¼"
msgid "archive format"
msgstr "归档格å¼"
-#: archive.c:430 builtin/log.c:1395
+#: archive.c:430 builtin/log.c:1422
msgid "prefix"
msgstr "å‰ç¼€"
@@ -209,11 +264,11 @@ msgstr "å‰ç¼€"
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中æ¯ä¸ªè·¯å¾„å加上å‰ç¼€"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548
-#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553
+#: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987
#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
-#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
+#: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399
+#: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "文件"
@@ -246,7 +301,7 @@ msgid "list supported archive formats"
msgstr "列出支æŒçš„归档格å¼"
#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:776
+#: builtin/submodule--helper.c:832
msgid "repo"
msgstr "仓库"
@@ -254,7 +309,7 @@ msgstr "仓库"
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程仓库(<仓库>)æå–归档文件"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
msgid "command"
msgstr "命令"
@@ -262,6 +317,28 @@ msgstr "命令"
msgid "path to the remote git-upload-archive command"
msgstr "远程 git-upload-archive 命令的路径"
+#: archive.c:461
+msgid "Unexpected option --remote"
+msgstr "未知å‚æ•° --remote"
+
+#: archive.c:463
+msgid "Option --exec can only be used together with --remote"
+msgstr "选项 --exec åªèƒ½å’Œ --remote åŒæ—¶ä½¿ç”¨"
+
+#: archive.c:465
+msgid "Unexpected option --output"
+msgstr "未知å‚æ•° --output"
+
+#: archive.c:487
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "æœªçŸ¥å½’æ¡£æ ¼å¼ '%s'"
+
+#: archive.c:494
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "å‚æ•°ä¸æ”¯æŒæ­¤æ ¼å¼ '%s':-%d"
+
#: attr.c:263
msgid ""
"Negative patterns are ignored in git attributes\n"
@@ -270,6 +347,129 @@ msgstr ""
"负值模版在 git attributes 中被忽略\n"
"当字符串确实è¦ä»¥æ„Ÿå¹å·å¼€å§‹æ—¶ï¼Œä½¿ç”¨ '\\!'。"
+#: bisect.c:441
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "ä¸èƒ½æ‰“开文件 '%s'"
+
+#: bisect.c:446
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "文件 '%s' 包å«é”™è¯¯çš„引用格å¼ï¼š%s"
+
+#: bisect.c:655
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "我们无法进行更多的二分查找ï¼\n"
+
+#: bisect.c:708
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„æ交å %s"
+
+#: bisect.c:732
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+"åˆå¹¶åŸºçº¿ %s 是å的。\n"
+"è¿™æ„味ç€ä»‹äºŽ %s å’Œ [%s] 之间的 bug å·²ç»è¢«ä¿®å¤ã€‚\n"
+
+#: bisect.c:737
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"åˆå¹¶åŸºçº¿ %s 是新的。\n"
+"介于 %s å’Œ [%s] 之间的属性已ç»è¢«ä¿®æ”¹ã€‚\n"
+
+#: bisect.c:742
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"åˆå¹¶åŸºçº¿ %s 是 %s。\n"
+"è¿™æ„味ç€ç¬¬ä¸€ä¸ª '%s' æ交ä½äºŽ %s å’Œ [%s] 之间。\n"
+
+#: bisect.c:750
+#, c-format
+msgid ""
+"Some %s revs are not ancestor of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
+msgstr ""
+"一些 %s 版本ä¸æ˜¯ %s 版本的祖先。\n"
+"è¿™ç§æƒ…况下 git 二分查找无法正常工作。\n"
+"您å¯èƒ½å¼„错了 %s å’Œ %s 版本?\n"
+
+#: bisect.c:763
+#, c-format
+msgid ""
+"the merge base between %s and [%s] must be skipped.\n"
+"So we cannot be sure the first %s commit is between %s and %s.\n"
+"We continue anyway."
+msgstr ""
+"介于 %s å’Œ [%s] çš„åˆå¹¶åŸºçº¿ä¸€å®šè¢«å¿½ç•¥äº†ã€‚\n"
+"所以我们无法确认第一个 %s æ交是å¦ä»‹äºŽ %s å’Œ %s 之间。\n"
+"我们ä»æ—§ç»§ç»­ã€‚"
+
+#: bisect.c:798
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "二分查找中:åˆå¹¶åŸºçº¿å¿…须是ç»è¿‡æµ‹è¯•çš„\n"
+
+#: bisect.c:849
+#, c-format
+msgid "a %s revision is needed"
+msgstr "需è¦ä¸€ä¸ª %s 版本"
+
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#, c-format
+msgid "could not create file '%s'"
+msgstr "ä¸èƒ½åˆ›å»ºæ–‡ä»¶ '%s'"
+
+#: bisect.c:917
+#, c-format
+msgid "could not read file '%s'"
+msgstr "ä¸èƒ½è¯»å–文件 '%s'"
+
+#: bisect.c:947
+msgid "reading bisect refs failed"
+msgstr "读å–二分查找引用失败"
+
+#: bisect.c:967
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr "%s åŒæ—¶ä¸º %s å’Œ %s\n"
+
+#: bisect.c:975
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+"没有å‘现å¯æµ‹è¯•çš„æ交。\n"
+"å¯èƒ½æ‚¨åœ¨è¿è¡Œæ—¶ä½¿ç”¨äº†é”™è¯¯çš„路径å‚数?\n"
+
+#: bisect.c:994
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(大概 %d 步)"
+msgstr[1] "(大概 %d 步)"
+
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:998
+#, c-format
+msgid "Bisecting: %d revision left to test after this %s\n"
+msgid_plural "Bisecting: %d revisions left to test after this %s\n"
+msgstr[0] "二分查找中:在此之åŽï¼Œè¿˜å‰© %d 个版本待测试 %s\n"
+msgstr[1] "二分查找中:在此之åŽï¼Œè¿˜å‰© %d 个版本待测试 %s\n"
+
#: branch.c:53
#, c-format
msgid ""
@@ -413,7 +613,7 @@ msgstr "'%s' ä¸åƒæ˜¯ä¸€ä¸ª v2 版本的包文件"
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头:%s%s (%d)"
-#: bundle.c:87 builtin/commit.c:777
+#: bundle.c:87 builtin/commit.c:778
#, c-format
msgid "could not open '%s'"
msgstr "ä¸èƒ½æ‰“å¼€ '%s'"
@@ -422,10 +622,10 @@ msgstr "ä¸èƒ½æ‰“å¼€ '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "仓库中缺少这些必备的æ交:"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
-#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
-#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
-#: builtin/merge.c:361 builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
+#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
+#: builtin/merge.c:356 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "版本é历设置失败"
@@ -464,7 +664,7 @@ msgstr "rev-list 终止"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"
-#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的å‚数:%s"
@@ -482,13 +682,13 @@ msgstr "ä¸èƒ½åˆ›å»º '%s'"
msgid "index-pack died"
msgstr "index-pack 终止"
-#: color.c:275
+#: color.c:290
#, c-format
msgid "invalid color value: %.*s"
msgstr "无效的颜色值:%.*s"
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
-#: builtin/am.c:2134
+#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
+#: builtin/am.c:2119
#, c-format
msgid "could not parse %s"
msgstr "ä¸èƒ½è§£æž %s"
@@ -502,128 +702,190 @@ msgstr "%s %s ä¸æ˜¯ä¸€ä¸ªæ交!"
msgid "memory exhausted"
msgstr "内存耗尽"
-#: config.c:475 config.c:477
+#: config.c:516
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "æ•°æ®å¯¹è±¡ %2$s 中错误的é…置行 %1$d"
+
+#: config.c:520
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "文件 %2$s 中错误的é…置行 %1$d"
+
+#: config.c:524
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "标准输入中错误的é…置行 %d"
+
+#: config.c:528
#, c-format
-msgid "bad config line %d in %s %s"
-msgstr "%2$s %3$s 出错于第 %1$d 行"
+msgid "bad config line %d in submodule-blob %s"
+msgstr "å­æ¨¡ç»„æ•°æ®å¯¹è±¡ %2$s 中错误的é…置行 %1$d"
-#: config.c:593
+#: config.c:532
#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
-msgstr "%3$s %4$s 中é…ç½®å˜é‡ '%2$s' çš„æ•°å­—å–值 '%1$s' 设置错误: %5$s"
+msgid "bad config line %d in command line %s"
+msgstr "命令行 %2$s 中错误的é…置行 %1$d"
-#: config.c:595
+#: config.c:536
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "在 %2$s 中错误的é…置行 %1$d"
+
+#: config.c:655
+msgid "out of range"
+msgstr "超出范围"
+
+#: config.c:655
+msgid "invalid unit"
+msgstr "无效的å•ä½"
+
+#: config.c:661
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "é…ç½®å˜é‡ '%2$s' çš„æ•°å­—å–值 '%1$s' 设置错误: %3$s"
+msgstr "é…ç½®å˜é‡ '%2$s' çš„æ•°å­—å–值 '%1$s' 设置错误:%3$s"
+
+#: config.c:666
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "æ•°æ®å¯¹è±¡ %3$s 中é…ç½®å˜é‡ '%2$s' 错误的å–值 '%1$s':%4$s"
-#: config.c:680
+#: config.c:669
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "文件 %3$s 中é…ç½®å˜é‡ '%2$s' 错误的å–值 '%1$s':%4$s"
+
+#: config.c:672
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr "标准输入中é…ç½®å˜é‡ '%2$s' 错误的å–值 '%1$s':%3$s"
+
+#: config.c:675
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr "å­æ¨¡ç»„æ•°æ® %3$s 中é…ç½®å˜é‡ '%2$s' 错误的å–值 '%1$s':%4$s"
+
+#: config.c:678
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr "命令行 %3$s 中é…ç½®å˜é‡ '%2$s' 错误的å–值 '%1$s':%4$s"
+
+#: config.c:681
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "在 %3$s 中é…ç½®å˜é‡ '%2$s' 错误的å–值 '%1$s':%4$s"
+
+#: config.c:768
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "无法扩展 '%s' 中的用户目录"
-#: config.c:761 config.c:772
+#: config.c:849 config.c:860
#, c-format
msgid "bad zlib compression level %d"
msgstr "错误的 zlib 压缩级别 %d"
-#: config.c:890
+#: config.c:978
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模å¼ï¼š%s"
-#: config.c:1228
+#: config.c:1312
msgid "unable to parse command-line config"
msgstr "无法解æžå‘½ä»¤è¡Œä¸­çš„é…ç½®"
-#: config.c:1284
-msgid "unknown error occured while reading the configuration files"
+#: config.c:1362
+msgid "unknown error occurred while reading the configuration files"
msgstr "在读å–é…置文件时é‡åˆ°æœªçŸ¥é”™è¯¯"
-#: config.c:1629
+#: config.c:1716
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "无法解æžå‘½ä»¤è¡Œé…置中的 '%s'"
-#: config.c:1631
+#: config.c:1718
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d è¡Œå‘现错误的é…ç½®å˜é‡ '%1$s'"
-#: config.c:1690
+#: config.c:1777
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个å–值"
-#: config.c:2224
+#: config.c:2311
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "ä¸èƒ½è®¾ç½® '%s' 为 '%s'"
-#: config.c:2226
+#: config.c:2313
#, c-format
msgid "could not unset '%s'"
msgstr "ä¸èƒ½å–消设置 '%s'"
-#: connected.c:69
+#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+msgid "Checking connectivity"
+msgstr "检查连接中"
+
+#: connected.c:74
msgid "Could not run 'git rev-list'"
msgstr "ä¸èƒ½æ‰§è¡Œ 'git rev-list'"
-#: connected.c:89
+#: connected.c:94
msgid "failed write to rev-list"
msgstr "无法写入 rev-list"
-#: connected.c:96
+#: connected.c:101
msgid "failed to close rev-list's stdin"
msgstr "无法关闭 rev-list 的标准输入"
-#: date.c:95
+#: date.c:97
msgid "in the future"
msgstr "在将æ¥"
-#: date.c:101
+#: date.c:103
#, c-format
msgid "%lu second ago"
msgid_plural "%lu seconds ago"
msgstr[0] "%lu 秒钟å‰"
msgstr[1] "%lu 秒钟å‰"
-#: date.c:108
+#: date.c:110
#, c-format
msgid "%lu minute ago"
msgid_plural "%lu minutes ago"
msgstr[0] "%lu 分钟å‰"
msgstr[1] "%lu 分钟å‰"
-#: date.c:115
+#: date.c:117
#, c-format
msgid "%lu hour ago"
msgid_plural "%lu hours ago"
msgstr[0] "%lu å°æ—¶å‰"
msgstr[1] "%lu å°æ—¶å‰"
-#: date.c:122
+#: date.c:124
#, c-format
msgid "%lu day ago"
msgid_plural "%lu days ago"
msgstr[0] "%lu 天å‰"
msgstr[1] "%lu 天å‰"
-#: date.c:128
+#: date.c:130
#, c-format
msgid "%lu week ago"
msgid_plural "%lu weeks ago"
msgstr[0] "%lu 周å‰"
msgstr[1] "%lu 周å‰"
-#: date.c:135
+#: date.c:137
#, c-format
msgid "%lu month ago"
msgid_plural "%lu months ago"
msgstr[0] "%lu 个月å‰"
msgstr[1] "%lu 个月å‰"
-#: date.c:146
+#: date.c:148
#, c-format
msgid "%lu year"
msgid_plural "%lu years"
@@ -631,14 +893,14 @@ msgstr[0] "%lu å¹´"
msgstr[1] "%lu å¹´"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:149
+#: date.c:151
#, c-format
msgid "%s, %lu month ago"
msgid_plural "%s, %lu months ago"
msgstr[0] "%s %lu 个月å‰"
msgstr[1] "%s %lu 个月å‰"
-#: date.c:154 date.c:159
+#: date.c:156 date.c:161
#, c-format
msgid "%lu year ago"
msgid_plural "%lu years ago"
@@ -650,7 +912,7 @@ msgstr[1] "%lu å¹´å‰"
msgid "failed to read orderfile '%s'"
msgstr "无法读å–排åºæ–‡ä»¶ '%s'"
-#: diffcore-rename.c:538
+#: diffcore-rename.c:540
msgid "Performing inexact rename detection"
msgstr "正在进行éžç²¾ç¡®çš„é‡å‘½å检测"
@@ -680,16 +942,16 @@ msgstr ""
"å‘现é…ç½®å˜é‡ 'diff.dirstat' 中的错误:\n"
"%s"
-#: diff.c:3007
+#: diff.c:3017
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出,åœæ­¢åœ¨ %s"
-#: diff.c:3405
+#: diff.c:3415
msgid "--follow requires exactly one pathspec"
-msgstr "--follow å‚æ•°åŽåªè·Ÿä¸€ä¸ª pathspec"
+msgstr "--follow 明确è¦æ±‚åªè·Ÿä¸€ä¸ªè·¯å¾„规格"
-#: diff.c:3568
+#: diff.c:3578
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -698,7 +960,7 @@ msgstr ""
"æ— æ³•è§£æž --dirstat/-X 选项的å‚数:\n"
"%s"
-#: diff.c:3582
+#: diff.c:3592
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "æ— æ³•è§£æž --submodule 选项的å‚数:'%s'"
@@ -711,39 +973,30 @@ msgstr "无法获得内核å称和信æ¯"
msgid "Untracked cache is disabled on this system or location."
msgstr "缓存未跟踪文件在本系统或ä½ç½®ä¸­è¢«ç¦ç”¨ã€‚"
-#: gpg-interface.c:166 gpg-interface.c:235
-msgid "could not run gpg."
-msgstr "ä¸èƒ½æ‰§è¡Œ gpg。"
-
#: gpg-interface.c:178
-msgid "gpg did not accept the data"
-msgstr "gpg 没有接å—æ•°æ®"
-
-#: gpg-interface.c:189
msgid "gpg failed to sign the data"
msgstr "gpg 无法为数æ®ç­¾å"
-#: gpg-interface.c:222
-#, c-format
-msgid "could not create temporary file '%s'"
-msgstr "ä¸èƒ½åˆ›å»ºä¸´æ—¶æ–‡ä»¶ '%s'"
+#: gpg-interface.c:208
+msgid "could not create temporary file"
+msgstr "ä¸èƒ½åˆ›å»ºä¸´æ—¶æ–‡ä»¶"
-#: gpg-interface.c:224
+#: gpg-interface.c:210
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "无法将分离å¼ç­¾å写入 '%s'"
-#: grep.c:1718
+#: grep.c:1792
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s'ï¼šæ— æ³•è¯»å– %s"
-#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
+#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
#, c-format
msgid "failed to stat '%s'"
msgstr "无法枚举 '%s' 状æ€"
-#: grep.c:1746
+#: grep.c:1820
#, c-format
msgid "'%s': short read"
msgstr "'%s':读å–ä¸å®Œæ•´"
@@ -780,7 +1033,7 @@ msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
"Continuing under the assumption that you meant '%s'"
msgstr ""
-"警告:您è¿è¡Œä¸€ä¸ªä¸å­˜åœ¨çš„ Git 命令 '%s'。继续执行å‡å®šæ‚¨è¦è¦è¿è¡Œçš„\n"
+"警告:您è¿è¡Œä¸€ä¸ªä¸å­˜åœ¨çš„ Git 命令 '%s'。继续执行å‡å®šæ‚¨è¦è¿è¡Œçš„\n"
"是 '%s'"
#: help.c:393
@@ -793,7 +1046,7 @@ msgstr "在 %0.1f 秒钟åŽè‡ªåŠ¨è¿è¡Œ..."
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git:'%s' ä¸æ˜¯ä¸€ä¸ª git 命令。å‚è§ 'git --help'。"
-#: help.c:404 help.c:464
+#: help.c:404 help.c:470
msgid ""
"\n"
"Did you mean this?"
@@ -807,7 +1060,7 @@ msgstr[1] ""
"\n"
"您指的是这其中的æŸä¸€ä¸ªä¹ˆï¼Ÿ"
-#: help.c:460
+#: help.c:466
#, c-format
msgid "%s: %s - %s"
msgstr "%s:%s - %s"
@@ -839,83 +1092,78 @@ msgstr "ä¸èƒ½åˆ›å»º '%s.lock':%s"
msgid "failed to read the cache"
msgstr "无法读å–缓存"
-#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
-#: builtin/checkout.c:586 builtin/clone.c:732
+#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
+#: builtin/checkout.c:589 builtin/clone.c:732
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
-#: merge-recursive.c:189
-#, c-format
+#: merge-recursive.c:209
msgid "(bad commit)\n"
msgstr "(åæ交)\n"
-#: merge-recursive.c:209
+#: merge-recursive.c:231
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "为路径 '%s' addinfo_cache 失败"
-#: merge-recursive.c:270
+#: merge-recursive.c:301
msgid "error building trees"
msgstr "无法创建树"
-#: merge-recursive.c:689
+#: merge-recursive.c:720
#, c-format
msgid "failed to create path '%s'%s"
msgstr "无法创建路径 '%s'%s"
-#: merge-recursive.c:700
+#: merge-recursive.c:731
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "删除 %s 以便为å­ç›®å½•ç•™å‡ºç©ºé—´\n"
-#: merge-recursive.c:714 merge-recursive.c:735
+#: merge-recursive.c:745 merge-recursive.c:764
msgid ": perhaps a D/F conflict?"
msgstr ":å¯èƒ½æ˜¯ä¸€ä¸ªç›®å½•/文件冲çªï¼Ÿ"
-#: merge-recursive.c:725
+#: merge-recursive.c:754
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "æ‹’ç»ä¸¢å¼ƒ '%s' 中的未跟踪文件"
-#: merge-recursive.c:765
+#: merge-recursive.c:796
#, c-format
msgid "cannot read object %s '%s'"
msgstr "ä¸èƒ½è¯»å–对象 %s '%s'"
-#: merge-recursive.c:767
+#: merge-recursive.c:798
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为数æ®å¯¹è±¡"
-#: merge-recursive.c:790 builtin/clone.c:376
+#: merge-recursive.c:822
#, c-format
-msgid "failed to open '%s'"
-msgstr "无法打开 '%s'"
+msgid "failed to open '%s': %s"
+msgstr "无法打开 '%s':%s"
-#: merge-recursive.c:798
+#: merge-recursive.c:833
#, c-format
-msgid "failed to symlink '%s'"
-msgstr "无法创建符å·é“¾æŽ¥ '%s'"
+msgid "failed to symlink '%s': %s"
+msgstr "无法创建符å·é“¾æŽ¥ '%s':%s"
-#: merge-recursive.c:801
+#: merge-recursive.c:838
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "ä¸çŸ¥é“å¦‚ä½•å¤„ç† %06o %s '%s'"
-#: merge-recursive.c:939
+#: merge-recursive.c:978
msgid "Failed to execute internal merge"
msgstr "无法执行内部åˆå¹¶"
-#: merge-recursive.c:943
+#: merge-recursive.c:982
#, c-format
msgid "Unable to add %s to database"
msgstr "ä¸èƒ½æ·»åŠ  %s 至对象库"
-#: merge-recursive.c:959
-msgid "unsupported object type in the tree"
-msgstr "在树中有ä¸æ”¯æŒçš„对象类型"
-
-#: merge-recursive.c:1034 merge-recursive.c:1048
+#: merge-recursive.c:1081 merge-recursive.c:1095
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -924,7 +1172,7 @@ msgstr ""
"冲çªï¼ˆ%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
"的版本被ä¿ç•™ã€‚"
-#: merge-recursive.c:1040 merge-recursive.c:1053
+#: merge-recursive.c:1087 merge-recursive.c:1100
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -933,20 +1181,20 @@ msgstr ""
"冲çªï¼ˆ%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
"的版本ä¿ç•™äºŽ %8$s 中。"
-#: merge-recursive.c:1094
+#: merge-recursive.c:1143
msgid "rename"
msgstr "é‡å‘½å"
-#: merge-recursive.c:1094
+#: merge-recursive.c:1143
msgid "renamed"
msgstr "é‡å‘½å"
-#: merge-recursive.c:1150
+#: merge-recursive.c:1200
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为å被添加"
-#: merge-recursive.c:1172
+#: merge-recursive.c:1225
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -955,144 +1203,135 @@ msgstr ""
"冲çªï¼ˆé‡å‘½å/é‡å‘½å):在分支 \"%3$s\" 中é‡å‘½å \"%1$s\"->\"%2$s\",在分支 "
"\"%6$s\" 中é‡å‘½å \"%4$s\"->\"%5$s\"%7$s"
-#: merge-recursive.c:1177
+#: merge-recursive.c:1230
msgid " (left unresolved)"
msgstr "(留下未解决)"
-#: merge-recursive.c:1231
+#: merge-recursive.c:1292
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"冲çªï¼ˆé‡å‘½å/é‡å‘½å):在 %3$s 中é‡å‘½å %1$s->%2$s,在 %6$s 中é‡å‘½å %4$s->"
"%5$s"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1325
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "而是é‡å‘½å %s 至 %sï¼Œä»¥åŠ %s 至 %s"
-#: merge-recursive.c:1460
+#: merge-recursive.c:1531
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "冲çªï¼ˆé‡å‘½å/添加):在 %3$s 中é‡å‘½å %1$s->%2$s。在 %5$s 中添加 %4$s"
-#: merge-recursive.c:1470
+#: merge-recursive.c:1546
#, c-format
msgid "Adding merged %s"
msgstr "添加åˆå¹¶åŽçš„ %s"
-#: merge-recursive.c:1475 merge-recursive.c:1677
+#: merge-recursive.c:1553 merge-recursive.c:1766
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为å添加"
-#: merge-recursive.c:1526
+#: merge-recursive.c:1610
#, c-format
msgid "cannot read object %s"
msgstr "ä¸èƒ½è¯»å–对象 %s"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1613
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s ä¸æ˜¯ä¸€ä¸ªæ•°æ®å¯¹è±¡"
-#: merge-recursive.c:1581
+#: merge-recursive.c:1666
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:1581
+#: merge-recursive.c:1666
msgid "modified"
msgstr "修改"
-#: merge-recursive.c:1591
+#: merge-recursive.c:1676
msgid "content"
msgstr "内容"
-#: merge-recursive.c:1598
+#: merge-recursive.c:1683
msgid "add/add"
msgstr "添加/添加"
-#: merge-recursive.c:1632
+#: merge-recursive.c:1718
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s(已ç»åšè¿‡ç›¸åŒåˆå¹¶ï¼‰"
-#: merge-recursive.c:1646
+#: merge-recursive.c:1732
#, c-format
msgid "Auto-merging %s"
msgstr "自动åˆå¹¶ %s"
-#: merge-recursive.c:1650 git-submodule.sh:941
+#: merge-recursive.c:1736 git-submodule.sh:919
msgid "submodule"
msgstr "å­æ¨¡ç»„"
-#: merge-recursive.c:1651
+#: merge-recursive.c:1737
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲çªï¼ˆ%s):åˆå¹¶å†²çªäºŽ %s"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1831
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
-#: merge-recursive.c:1762
+#: merge-recursive.c:1857
msgid "file/directory"
msgstr "文件/目录"
-#: merge-recursive.c:1768
+#: merge-recursive.c:1863
msgid "directory/file"
msgstr "目录/文件"
-#: merge-recursive.c:1773
+#: merge-recursive.c:1868
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr "冲çªï¼ˆ%1$s):在 %3$s 中有一个å为 %2$s 的目录。以 %5$s 为å添加 %4$s"
-#: merge-recursive.c:1781
+#: merge-recursive.c:1877
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
-#: merge-recursive.c:1798
-msgid "Fatal merge failure, shouldn't happen."
-msgstr "严é‡çš„åˆå¹¶é”™è¯¯ï¼Œä¸åº”å‘生。"
-
-#: merge-recursive.c:1817
+#: merge-recursive.c:1914
msgid "Already up-to-date!"
msgstr "å·²ç»æ˜¯æœ€æ–°çš„ï¼"
-#: merge-recursive.c:1826
+#: merge-recursive.c:1923
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法åˆå¹¶æ ‘ %s å’Œ %s"
-#: merge-recursive.c:1856
-#, c-format
-msgid "Unprocessed path??? %s"
-msgstr "未处ç†çš„路径??? %s"
-
-#: merge-recursive.c:1904
+#: merge-recursive.c:2006
msgid "Merging:"
msgstr "åˆå¹¶ï¼š"
-#: merge-recursive.c:1917
+#: merge-recursive.c:2019
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "å‘现 %u 个共åŒç¥–先:"
msgstr[1] "å‘现 %u 个共åŒç¥–先:"
-#: merge-recursive.c:1954
+#: merge-recursive.c:2058
msgid "merge returned no commit"
msgstr "åˆå¹¶æœªè¿”回æ交"
-#: merge-recursive.c:2011
+#: merge-recursive.c:2121
#, c-format
msgid "Could not parse object '%s'"
msgstr "ä¸èƒ½è§£æžå¯¹è±¡ '%s'"
-#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
+#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
msgid "Unable to write index."
msgstr "ä¸èƒ½å†™å…¥ç´¢å¼•ã€‚"
@@ -1153,7 +1392,7 @@ msgstr "-æ•°å­—"
msgid "malformed object name '%s'"
msgstr "éžæ³•çš„对象å '%s'"
-#: path.c:796
+#: path.c:798
#, c-format
msgid "Could not make %s writable by group"
msgstr "ä¸èƒ½è®¾ç½® %s 为组å¯å†™"
@@ -1220,7 +1459,7 @@ msgstr ""
"没有为 :(exclude) 模å¼æä¾›è¦å¿½ç•¥çš„内容。也许您忘记了\n"
"添加 ':/' 或 '.' ?"
-#: pretty.c:971
+#: pretty.c:973
msgid "unable to parse --pretty format"
msgstr "ä¸èƒ½è§£æž --pretty æ ¼å¼"
@@ -1246,23 +1485,22 @@ msgstr ""
"设置了 GIT_INDEX_VERSION,但是å–值无效。\n"
"使用版本 %i"
-#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
-#: builtin/merge.c:995
+#: refs.c:551 builtin/merge.c:840
#, c-format
msgid "Could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: refs/files-backend.c:2243
+#: refs/files-backend.c:2534
#, c-format
msgid "could not delete reference %s: %s"
msgstr "无法删除引用 %s:%s"
-#: refs/files-backend.c:2246
+#: refs/files-backend.c:2537
#, c-format
msgid "could not delete references: %s"
msgstr "无法删除引用:%s"
-#: refs/files-backend.c:2255
+#: refs/files-backend.c:2546
#, c-format
msgid "could not remove reference %s"
msgstr "无法删除引用 %s"
@@ -1420,74 +1658,74 @@ msgstr "%s åŒæ—¶è·Ÿè¸ª %s å’Œ %s"
msgid "Internal error"
msgstr "内部错误"
-#: remote.c:1678 remote.c:1721
+#: remote.c:1677 remote.c:1720
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指å‘一个分支"
-#: remote.c:1687
+#: remote.c:1686
#, c-format
msgid "no such branch: '%s'"
msgstr "没有此分支:'%s'"
-#: remote.c:1690
+#: remote.c:1689
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "尚未给分支 '%s' 设置上游"
-#: remote.c:1696
+#: remote.c:1695
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
-#: remote.c:1711
+#: remote.c:1710
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "推é€ç›®æ ‡ '%s' 至远程 '%s' 没有本地跟踪分支"
-#: remote.c:1726
+#: remote.c:1725
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "分支 '%s' 没有设置è¦æŽ¨é€çš„远程æœåŠ¡å™¨"
-#: remote.c:1737
+#: remote.c:1736
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "å‘ '%s' 推é€å¼•ç”¨è§„æ ¼æœªåŒ…å« '%s'"
-#: remote.c:1750
+#: remote.c:1749
msgid "push has no destination (push.default is 'nothing')"
msgstr "推é€æ— ç›®æ ‡ï¼ˆpush.default 是 'nothing')"
-#: remote.c:1772
+#: remote.c:1771
msgid "cannot resolve 'simple' push to a single destination"
msgstr "æ— æ³•è§£æž 'simple' 推é€è‡³ä¸€ä¸ªå•ç‹¬çš„目标"
-#: remote.c:2074
+#: remote.c:2073
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基于 '%s',但此上游分支已ç»ä¸å­˜åœ¨ã€‚\n"
-#: remote.c:2078
+#: remote.c:2077
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (使用 \"git branch --unset-upstream\" æ¥ä¿®å¤ï¼‰\n"
-#: remote.c:2081
+#: remote.c:2080
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "您的分支与上游分支 '%s' 一致。\n"
-#: remote.c:2085
+#: remote.c:2084
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "您的分支领先 '%s' å…± %d 个æ交。\n"
msgstr[1] "您的分支领先 '%s' å…± %d 个æ交。\n"
-#: remote.c:2091
+#: remote.c:2090
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (使用 \"git push\" æ¥å‘布您的本地æ交)\n"
-#: remote.c:2094
+#: remote.c:2093
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1496,11 +1734,11 @@ msgstr[0] "您的分支è½åŽ '%s' å…± %d 个æ交,并且å¯ä»¥å¿«è¿›ã€‚\n"
msgstr[1] "您的分支è½åŽ '%s' å…± %d 个æ交,并且å¯ä»¥å¿«è¿›ã€‚\n"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: remote.c:2102
+#: remote.c:2101
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (使用 \"git pull\" æ¥æ›´æ–°æ‚¨çš„本地分支)\n"
-#: remote.c:2105
+#: remote.c:2104
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1516,20 +1754,20 @@ msgstr[1] ""
"并且分别有 %d å’Œ %d 处ä¸åŒçš„æ交。\n"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: remote.c:2115
+#: remote.c:2114
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (使用 \"git pull\" æ¥åˆå¹¶è¿œç¨‹åˆ†æ”¯ï¼‰\n"
-#: revision.c:2142
+#: revision.c:2132
msgid "your current branch appears to be broken"
msgstr "您的当å‰åˆ†æ”¯å¥½åƒè¢«æŸå"
-#: revision.c:2145
+#: revision.c:2135
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的当å‰åˆ†æ”¯ '%s' 尚无任何æ交"
-#: revision.c:2339
+#: revision.c:2329
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent 与 --bisect ä¸å…¼å®¹"
@@ -1542,24 +1780,28 @@ msgstr "ä¸èƒ½æ‰“å¼€ /dev/null"
msgid "dup2(%d,%d) failed"
msgstr "ä¸èƒ½è°ƒç”¨ dup2(%d,%d)"
-#: send-pack.c:295
+#: send-pack.c:298
msgid "failed to sign the push certificate"
msgstr "无法为推é€è¯ä¹¦ç­¾å"
-#: send-pack.c:404
+#: send-pack.c:411
msgid "the receiving end does not support --signed push"
msgstr "接收端ä¸æ”¯æŒç­¾å推é€"
-#: send-pack.c:406
+#: send-pack.c:413
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr "未å‘é€æŽ¨é€è¯ä¹¦ï¼Œå› ä¸ºæŽ¥æ”¶ç«¯ä¸æ”¯æŒç­¾å推é€"
-#: send-pack.c:418
+#: send-pack.c:425
msgid "the receiving end does not support --atomic push"
msgstr "接收端ä¸æ”¯æŒåŽŸå­æŽ¨é€"
+#: send-pack.c:430
+msgid "the receiving end does not support push options"
+msgstr "接收端ä¸æ”¯æŒæŽ¨é€é€‰é¡¹"
+
#: sequencer.c:174
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
@@ -1577,15 +1819,15 @@ msgstr ""
"冲çªè§£å†³å®Œæ¯•åŽï¼Œç”¨ 'git add <路径>' 或 'git rm <路径>'\n"
"对修正åŽçš„文件åšæ ‡è®°ï¼Œç„¶åŽç”¨ 'git commit' æ交"
-#: sequencer.c:190 sequencer.c:833 sequencer.c:912
+#: sequencer.c:190 sequencer.c:841 sequencer.c:924
#, c-format
msgid "Could not write to %s"
msgstr "ä¸èƒ½å†™å…¥ %s"
-#: sequencer.c:193
+#: sequencer.c:193 sequencer.c:843 sequencer.c:928
#, c-format
-msgid "Error wrapping up %s"
-msgstr "错误收尾 %s"
+msgid "Error wrapping up %s."
+msgstr "错误收尾 %s。"
#: sequencer.c:208
msgid "Your local changes would be overwritten by cherry-pick."
@@ -1599,202 +1841,240 @@ msgstr "您的本地修改将被还原æ“作覆盖。"
msgid "Commit your changes or stash them to proceed."
msgstr "æ交您的修改或ä¿å­˜è¿›åº¦åŽå†ç»§ç»­ã€‚"
+#: sequencer.c:228
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s:快进"
+
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:300
+#: sequencer.c:303
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s:无法写入新索引文件"
-#: sequencer.c:318
+#: sequencer.c:321
msgid "Could not resolve HEAD commit\n"
msgstr "ä¸èƒ½è§£æž HEAD æ交\n"
-#: sequencer.c:338
+#: sequencer.c:341
msgid "Unable to update cache tree\n"
msgstr "ä¸èƒ½æ›´æ–°ç¼“å­˜\n"
-#: sequencer.c:390
+#: sequencer.c:393
#, c-format
msgid "Could not parse commit %s\n"
msgstr "ä¸èƒ½è§£æžæ交 %s\n"
-#: sequencer.c:395
+#: sequencer.c:398
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "ä¸èƒ½è§£æžçˆ¶æ交 %s\n"
-#: sequencer.c:460
+#: sequencer.c:463
msgid "Your index file is unmerged."
msgstr "您的索引文件未完æˆåˆå¹¶ã€‚"
-#: sequencer.c:479
+#: sequencer.c:482
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "æ交 %s 是一个åˆå¹¶æ交但未æä¾› -m 选项。"
-#: sequencer.c:487
+#: sequencer.c:490
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "æ交 %s 没有父æ交 %d"
-#: sequencer.c:491
+#: sequencer.c:494
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr "指定了主线但æ交 %s ä¸æ˜¯ä¸€ä¸ªåˆå¹¶ã€‚"
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:504
+#: sequencer.c:507
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s:ä¸èƒ½è§£æžçˆ¶æ交 %s"
-#: sequencer.c:508
+#: sequencer.c:511
#, c-format
msgid "Cannot get commit message for %s"
msgstr "ä¸èƒ½å¾—到 %s çš„æ交说明"
-#: sequencer.c:594
+#: sequencer.c:597
#, c-format
msgid "could not revert %s... %s"
msgstr "ä¸èƒ½è¿˜åŽŸ %s... %s"
-#: sequencer.c:595
+#: sequencer.c:598
#, c-format
msgid "could not apply %s... %s"
msgstr "ä¸èƒ½åº”用 %s... %s"
-#: sequencer.c:630
+#: sequencer.c:633
msgid "empty commit set passed"
msgstr "æ供了空的æ交集"
-#: sequencer.c:638
+#: sequencer.c:641
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s:无法读å–索引"
-#: sequencer.c:642
+#: sequencer.c:645
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s:无法刷新索引"
-#: sequencer.c:702
-#, c-format
-msgid "Cannot %s during a %s"
-msgstr "无法 %s 在一个 %s 过程中"
+#: sequencer.c:705
+msgid "Cannot revert during another revert."
+msgstr "ä¸èƒ½åœ¨å›žé€€ä¸­æ‰§è¡Œå¦ä¸€å›žé€€ã€‚"
+
+#: sequencer.c:706
+msgid "Cannot revert during a cherry-pick."
+msgstr "ä¸èƒ½åœ¨æ‹£é€‰ä¸­æ‰§è¡Œå›žé€€ã€‚"
+
+#: sequencer.c:709
+msgid "Cannot cherry-pick during a revert."
+msgstr "ä¸èƒ½åœ¨å›žé€€ä¸­æ‰§è¡Œæ‹£é€‰ã€‚"
-#: sequencer.c:724
+#: sequencer.c:710
+msgid "Cannot cherry-pick during another cherry-pick."
+msgstr "ä¸èƒ½åœ¨æ‹£é€‰è¿‡ç¨‹ä¸­æ‰§è¡Œå¦ä¸€æ‹£é€‰ã€‚"
+
+#: sequencer.c:732
#, c-format
msgid "Could not parse line %d."
msgstr "ä¸èƒ½è§£æžç¬¬ %d 行。"
-#: sequencer.c:729
+#: sequencer.c:737
msgid "No commits parsed."
msgstr "没有æ交被解æžã€‚"
-#: sequencer.c:741
+#: sequencer.c:749
#, c-format
msgid "Could not open %s"
msgstr "ä¸èƒ½æ‰“å¼€ %s"
-#: sequencer.c:745
+#: sequencer.c:753
#, c-format
msgid "Could not read %s."
msgstr "ä¸èƒ½è¯»å– %s。"
-#: sequencer.c:752
+#: sequencer.c:760
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "无用的指令表å•ï¼š%s"
-#: sequencer.c:782
+#: sequencer.c:790
#, c-format
msgid "Invalid key: %s"
msgstr "无效键å:%s"
-#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52
+#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
#, c-format
msgid "Invalid value for %s: %s"
msgstr "%s 的值无效:%s"
-#: sequencer.c:795
+#: sequencer.c:803
#, c-format
msgid "Malformed options sheet: %s"
msgstr "éžæ³•çš„选项表å•ï¼š%s"
-#: sequencer.c:814
+#: sequencer.c:822
msgid "a cherry-pick or revert is already in progress"
msgstr "一个拣选或还原æ“作已在进行"
-#: sequencer.c:815
+#: sequencer.c:823
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "å°è¯• \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:819
+#: sequencer.c:827
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "ä¸èƒ½åˆ›å»ºåºåˆ—目录 %s"
-#: sequencer.c:835 sequencer.c:916
-#, c-format
-msgid "Error wrapping up %s."
-msgstr "错误收尾 %s。"
-
-#: sequencer.c:854 sequencer.c:986
+#: sequencer.c:862 sequencer.c:998
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原æ“作并未进行"
-#: sequencer.c:856
+#: sequencer.c:864
msgid "cannot resolve HEAD"
msgstr "ä¸èƒ½è§£æž HEAD"
-#: sequencer.c:858
+#: sequencer.c:866 sequencer.c:900
msgid "cannot abort from a branch yet to be born"
msgstr "ä¸èƒ½ä»Žå°šæœªå»ºç«‹çš„分支终止"
-#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
+#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
#, c-format
msgid "cannot open %s"
msgstr "ä¸èƒ½æ‰“å¼€ %s"
-#: sequencer.c:880
+#: sequencer.c:888
#, c-format
msgid "cannot read %s: %s"
msgstr "ä¸èƒ½è¯»å– %s:%s"
-#: sequencer.c:881
+#: sequencer.c:889
msgid "unexpected end of file"
msgstr "æ„外的文件结æŸ"
-#: sequencer.c:887
+#: sequencer.c:895
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "ä¿å­˜æ‹£é€‰æ交å‰çš„ HEAD 文件 '%s' æŸå"
-#: sequencer.c:909
+#: sequencer.c:921
#, c-format
msgid "Could not format %s."
msgstr "ä¸èƒ½æ ¼å¼åŒ– %s。"
-#: sequencer.c:1054
+#: sequencer.c:1066
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s:ä¸èƒ½æ‹£é€‰ä¸€ä¸ª%s"
-#: sequencer.c:1057
+#: sequencer.c:1069
#, c-format
msgid "%s: bad revision"
msgstr "%s:错误的版本"
-#: sequencer.c:1091
+#: sequencer.c:1102
msgid "Can't revert as initial commit"
msgstr "ä¸èƒ½ä½œä¸ºåˆå§‹æ交还原"
-#: sequencer.c:1092
-msgid "Can't cherry-pick into empty head"
-msgstr "ä¸èƒ½æ‹£é€‰åˆ°ç©ºåˆ†æ”¯"
+#: setup.c:160
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s:工作区中无此路径。\n"
+"使用命令 'git <command> -- <path>...' æ¥æŒ‡å®šæœ¬åœ°ä¸å­˜åœ¨çš„路径。"
+
+#: setup.c:173
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"有歧义的å‚æ•° '%s':未知的版本或路径ä¸å­˜åœ¨äºŽå·¥ä½œåŒºä¸­ã€‚\n"
+"使用 '--' æ¥åˆ†éš”版本和路径,例如:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+
+#: setup.c:223
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"有歧义的å‚æ•° '%s':å¯åŒæ—¶æ˜¯ç‰ˆæœ¬å’Œæ–‡ä»¶\n"
+"使用 '--' æ¥åˆ†éš”版本和路径,例如:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
-#: setup.c:248
+#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
#, c-format
msgid "failed to read %s"
msgstr "æ— æ³•è¯»å– %s"
@@ -1808,16 +2088,52 @@ msgstr "期望 git 仓库版本 <= %d,å´å¾—到 %d"
msgid "unknown repository extensions found:"
msgstr "å‘现未知的仓库扩展:"
-#: sha1_file.c:1080
+#: setup.c:762
+#, c-format
+msgid "Not a git repository (or any of the parent directories): %s"
+msgstr "ä¸æ˜¯ä¸€ä¸ª git 仓库(或者任何父目录):%s"
+
+#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+msgid "Cannot come back to cwd"
+msgstr "无法返回当å‰å·¥ä½œç›®å½•"
+
+#: setup.c:845
+msgid "Unable to read current working directory"
+msgstr "ä¸èƒ½è¯»å–当å‰å·¥ä½œç›®å½•"
+
+#: setup.c:920
+#, c-format
+msgid ""
+"Not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgstr ""
+"ä¸æ˜¯ä¸€ä¸ª git 仓库(或者å‘上递归至挂载点 %s 的任何祖先目录)\n"
+"åœæ­¢åœ¨æ–‡ä»¶ç³»ç»Ÿè¾¹ç•Œï¼ˆæœªè®¾ç½® GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
+
+#: setup.c:927
+#, c-format
+msgid "Cannot change to '%s/..'"
+msgstr "ä¸èƒ½åˆ‡æ¢åˆ° '%s/..'"
+
+#: setup.c:989
+#, c-format
+msgid ""
+"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"å‚æ•° core.sharedRepository 的文件æƒé™å€¼æœ‰é”™ï¼ˆ0%.3o)。\n"
+"文件属主必须始终拥有读写æƒé™ã€‚"
+
+#: sha1_file.c:1046
msgid "offset before end of packfile (broken .idx?)"
msgstr "å移é‡åœ¨åŒ…文件结æŸä¹‹å‰ï¼ˆæŸåçš„ .idx?)"
-#: sha1_file.c:2458
+#: sha1_file.c:2434
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "å移é‡åœ¨ %s 的包索引开始之å‰ï¼ˆæŸå的索引?)"
-#: sha1_file.c:2462
+#: sha1_file.c:2438
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "å移é‡è¶Šè¿‡äº† %s 的包索引的结尾(被截断的索引?)"
@@ -1870,7 +2186,7 @@ msgstr "å°†æ›´æ–°åŽ .gitmodules 添加暂存区失败"
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "submodule.fetchJobs ä¸å…许为负值"
-#: submodule-config.c:355
+#: submodule-config.c:358
#, c-format
msgid "invalid value for %s"
msgstr "%s 的值无效"
@@ -1929,6 +2245,54 @@ msgstr "ä¸èƒ½æ‰“开临时文件"
msgid "could not rename temporary file to %s"
msgstr "ä¸èƒ½é‡å‘½å临时文件为 %s"
+#: transport.c:62
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "å°†è¦è®¾ç½® '%1$s' 的上游为 '%3$s' çš„ '%2$s'\n"
+
+#: transport.c:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "传输:无效的深度选项 '%s'"
+
+#: transport.c:771
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr "下列å­æ¨¡ç»„路径所包å«çš„修改在任何远程æºä¸­éƒ½æ‰¾ä¸åˆ°ï¼š\n"
+
+#: transport.c:775
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"请å°è¯•\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"或者进入到å­ç›®å½•æ‰§è¡Œ\n"
+"\n"
+"\tgit push\n"
+"\n"
+"以推é€è‡³è¿œç¨‹ã€‚\n"
+"\n"
+
+#: transport.c:783
+msgid "Aborting."
+msgstr "正在终止。"
+
#: transport-helper.c:1041
#, c-format
msgid "Could not read ref %s"
@@ -1938,7 +2302,7 @@ msgstr "ä¸èƒ½è¯»å–引用 %s"
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
-"%%sPlease commit your changes or stash them before you can switch branches."
+"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
"您对下列文件的本地修改将被检出æ“作覆盖:\n"
"%%s请在切æ¢åˆ†æ”¯å‰æ交您的修改或者ä¿å­˜è¿›åº¦ã€‚"
@@ -1956,7 +2320,7 @@ msgstr ""
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you can merge."
+"%%sPlease commit your changes or stash them before you merge."
msgstr ""
"您对下列文件的本地修改将被åˆå¹¶æ“作覆盖:\n"
"%%s请在åˆå¹¶å‰æ交您的修改或者ä¿å­˜è¿›åº¦ã€‚"
@@ -1974,7 +2338,7 @@ msgstr ""
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you can %s."
+"%%sPlease commit your changes or stash them before you %s."
msgstr ""
"您对下列文件的本地修改将被 %s 覆盖:\n"
"%%s请在 %s 之å‰æ交您的修改或者ä¿å­˜è¿›åº¦ã€‚"
@@ -2001,7 +2365,7 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you can switch branches."
+"%%sPlease move or remove them before you switch branches."
msgstr ""
"工作区中下列未跟踪的文件将会因为检出æ“作而被删除:\n"
"%%s请在切æ¢åˆ†æ”¯ä¹‹å‰ç§»åŠ¨æˆ–删除。"
@@ -2019,7 +2383,7 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you can merge."
+"%%sPlease move or remove them before you merge."
msgstr ""
"工作区中下列未跟踪的文件将会因为åˆå¹¶æ“作而被删除:\n"
"%%s请在åˆå¹¶å‰ç§»åŠ¨æˆ–删除。"
@@ -2037,7 +2401,7 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you can %s."
+"%%sPlease move or remove them before you %s."
msgstr ""
"工作区中下列未跟踪的文件将会因为 %s æ“作而被删除:\n"
"%%s请在 %s å‰ç§»åŠ¨æˆ–删除。"
@@ -2056,7 +2420,7 @@ msgstr ""
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
-"%%sPlease move or remove them before you can switch branches."
+"%%sPlease move or remove them before you switch branches."
msgstr ""
"工作区中下列未跟踪的文件将会因为检出æ“作而被覆盖:\n"
"%%s请在切æ¢åˆ†æ”¯å‰ç§»åŠ¨æˆ–删除。"
@@ -2075,7 +2439,7 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you can merge."
+"%%sPlease move or remove them before you merge."
msgstr ""
"工作区中下列未跟踪的文件将会因为åˆå¹¶æ“作而被覆盖:\n"
"%%s请在åˆå¹¶å‰ç§»åŠ¨æˆ–删除。"
@@ -2093,7 +2457,7 @@ msgstr ""
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you can %s."
+"%%sPlease move or remove them before you %s."
msgstr ""
"工作区中下列未跟踪的文件将会因为 %s æ“作而被覆盖:\n"
"%%s请在 %s å‰ç§»åŠ¨æˆ–删除。"
@@ -2179,43 +2543,43 @@ msgstr "无效的端å£å·"
msgid "invalid '..' path segment"
msgstr "无效的 '..' 路径片段"
-#: wrapper.c:222 wrapper.c:381
+#: worktree.c:282
+#, c-format
+msgid "failed to read '%s'"
+msgstr "æ— æ³•è¯»å– '%s'"
+
+#: wrapper.c:222 wrapper.c:392
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "无法打开 '%s' 进行读写"
-#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
#, c-format
msgid "could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
-#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
+#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
#: builtin/pull.c:407
#, c-format
msgid "could not open '%s' for reading"
msgstr "无法打开 '%s' 进行读å–"
-#: wrapper.c:594 wrapper.c:615
+#: wrapper.c:605 wrapper.c:626
#, c-format
msgid "unable to access '%s'"
msgstr "ä¸èƒ½è®¿é—® '%s'"
-#: wrapper.c:623
+#: wrapper.c:634
msgid "unable to get current working directory"
msgstr "ä¸èƒ½èŽ·å–当å‰å·¥ä½œç›®å½•"
-#: wrapper.c:650
-#, c-format
-msgid "could not open %s for writing"
-msgstr "ä¸èƒ½å†™å…¥ %s"
-
-#: wrapper.c:661 builtin/am.c:410
+#: wrapper.c:658
#, c-format
msgid "could not write to %s"
msgstr "ä¸èƒ½å†™å…¥ %s"
-#: wrapper.c:667
+#: wrapper.c:660
#, c-format
msgid "could not close %s"
msgstr "ä¸èƒ½å…³é—­ %s"
@@ -2250,11 +2614,11 @@ msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
-#: wt-status.c:198 wt-status.c:881
+#: wt-status.c:198 wt-status.c:882
msgid "Changes to be committed:"
msgstr "è¦æ交的å˜æ›´ï¼š"
-#: wt-status.c:216 wt-status.c:890
+#: wt-status.c:216 wt-status.c:891
msgid "Changes not staged for commit:"
msgstr "尚未暂存以备æ交的å˜æ›´ï¼š"
@@ -2313,11 +2677,6 @@ msgstr "åŒæ–¹æ·»åŠ ï¼š"
msgid "both modified:"
msgstr "åŒæ–¹ä¿®æ”¹ï¼š"
-#: wt-status.c:266
-#, c-format
-msgid "bug: unhandled unmerged status %x"
-msgstr "bug:无法处ç†çš„未åˆå¹¶çŠ¶æ€ %x"
-
#: wt-status.c:274
msgid "new file:"
msgstr "新文件:"
@@ -2365,20 +2724,15 @@ msgstr "修改的内容, "
msgid "untracked content, "
msgstr "未跟踪的内容, "
-#: wt-status.c:391
-#, c-format
-msgid "bug: unhandled diff status %c"
-msgstr "bug:无法处ç†çš„å·®å¼‚çŠ¶æ€ %c"
-
-#: wt-status.c:755
+#: wt-status.c:756
msgid "Submodules changed but not updated:"
msgstr "å­æ¨¡ç»„已修改但尚未更新:"
-#: wt-status.c:757
+#: wt-status.c:758
msgid "Submodule changes to be committed:"
msgstr "è¦æ交的å­æ¨¡ç»„å˜æ›´ï¼š"
-#: wt-status.c:838
+#: wt-status.c:839
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -2386,68 +2740,73 @@ msgstr ""
"ä¸è¦æ”¹åŠ¨ä¸Šé¢çš„一行。\n"
"下é¢çš„所有内容å‡å°†è¢«åˆ é™¤ã€‚"
-#: wt-status.c:949
+#: wt-status.c:950
msgid "You have unmerged paths."
msgstr "您有尚未åˆå¹¶çš„路径。"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:952
+#: wt-status.c:953
msgid " (fix conflicts and run \"git commit\")"
msgstr " (解决冲çªå¹¶è¿è¡Œ \"git commit\")"
-#: wt-status.c:956
+# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
+#: wt-status.c:955
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (使用 \"git merge --abort\" 终止åˆå¹¶ï¼‰"
+
+#: wt-status.c:960
msgid "All conflicts fixed but you are still merging."
msgstr "所有冲çªå·²è§£å†³ä½†æ‚¨ä»å¤„于åˆå¹¶ä¸­ã€‚"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:959
+#: wt-status.c:963
msgid " (use \"git commit\" to conclude merge)"
msgstr " (使用 \"git commit\" 结æŸåˆå¹¶ï¼‰"
-#: wt-status.c:969
+#: wt-status.c:973
msgid "You are in the middle of an am session."
msgstr "您正处于 am æ“作过程中。"
-#: wt-status.c:972
+#: wt-status.c:976
msgid "The current patch is empty."
msgstr "当å‰çš„è¡¥ä¸ä¸ºç©ºã€‚"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:976
+#: wt-status.c:980
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (解决冲çªï¼Œç„¶åŽè¿è¡Œ \"git am --continue\")"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:978
+#: wt-status.c:982
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (使用 \"git am --skip\" 跳过此补ä¸ï¼‰"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:980
+#: wt-status.c:984
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (使用 \"git am --abort\" æ¢å¤åŽŸæœ‰åˆ†æ”¯ï¼‰"
-#: wt-status.c:1105
+#: wt-status.c:1109
msgid "No commands done."
msgstr "没有命令被执行。"
-#: wt-status.c:1108
+#: wt-status.c:1112
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "最åŽä¸€æ¡å‘½ä»¤å·²å®Œæˆï¼ˆ%d æ¡å‘½ä»¤è¢«æ‰§è¡Œï¼‰ï¼š"
msgstr[1] "最åŽçš„命令已完æˆï¼ˆ%d æ¡å‘½ä»¤è¢«æ‰§è¡Œï¼‰ï¼š"
-#: wt-status.c:1119
+#: wt-status.c:1123
#, c-format
msgid " (see more in file %s)"
msgstr " (更多å‚è§æ–‡ä»¶ %s)"
-#: wt-status.c:1124
+#: wt-status.c:1128
msgid "No commands remaining."
msgstr "未剩下任何命令。"
-#: wt-status.c:1127
+#: wt-status.c:1131
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
@@ -2455,165 +2814,165 @@ msgstr[0] "接下æ¥è¦æ‰§è¡Œçš„命令(剩余 %d æ¡å‘½ä»¤ï¼‰ï¼š"
msgstr[1] "接下æ¥è¦æ‰§è¡Œçš„命令(剩余 %d æ¡å‘½ä»¤ï¼‰ï¼š"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:1135
+#: wt-status.c:1139
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (使用 \"git rebase --edit-todo\" æ¥æŸ¥çœ‹å’Œç¼–辑)"
-#: wt-status.c:1148
+#: wt-status.c:1152
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' å˜åŸºåˆ° '%s' çš„æ“作。"
-#: wt-status.c:1153
+#: wt-status.c:1157
msgid "You are currently rebasing."
msgstr "您在执行å˜åŸºæ“作。"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:1167
+#: wt-status.c:1171
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (解决冲çªï¼Œç„¶åŽè¿è¡Œ \"git rebase --continue\")"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:1169
+#: wt-status.c:1173
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (使用 \"git rebase --skip\" 跳过此补ä¸ï¼‰"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:1171
+#: wt-status.c:1175
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:1177
+#: wt-status.c:1181
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (所有冲çªå·²è§£å†³ï¼šè¿è¡Œ \"git rebase --continue\")"
-#: wt-status.c:1181
+#: wt-status.c:1185
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' å˜åŸºåˆ° '%s' çš„æ“作时拆分æ交。"
-#: wt-status.c:1186
+#: wt-status.c:1190
msgid "You are currently splitting a commit during a rebase."
msgstr "您在执行å˜åŸºæ“作时拆分æ交。"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:1189
+#: wt-status.c:1193
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (一旦您工作目录æ交干净åŽï¼Œè¿è¡Œ \"git rebase --continue\")"
-#: wt-status.c:1193
+#: wt-status.c:1197
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' å˜åŸºåˆ° '%s' çš„æ“作时编辑æ交。"
-#: wt-status.c:1198
+#: wt-status.c:1202
msgid "You are currently editing a commit during a rebase."
msgstr "您在执行å˜åŸºæ“作时编辑æ交。"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:1201
+#: wt-status.c:1205
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (使用 \"git commit --amend\" 修补当å‰æ交)"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:1203
+#: wt-status.c:1207
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (当您对您的修改满æ„åŽæ‰§è¡Œ \"git rebase --continue\")"
-#: wt-status.c:1213
+#: wt-status.c:1217
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "您在执行拣选æ交 %s çš„æ“作。"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:1218
+#: wt-status.c:1222
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (解决冲çªå¹¶è¿è¡Œ \"git cherry-pick --continue\")"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:1221
+#: wt-status.c:1225
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (所有冲çªå·²è§£å†³ï¼šè¿è¡Œ \"git cherry-pick --continue\")"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:1223
+#: wt-status.c:1227
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (使用 \"git cherry-pick --abort\" 以å–消拣选æ“作)"
-#: wt-status.c:1232
+#: wt-status.c:1236
#, c-format
msgid "You are currently reverting commit %s."
msgstr "您在执行å转æ交 %s çš„æ“作。"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:1237
+#: wt-status.c:1241
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (解决冲çªå¹¶è¿è¡Œ \"git revert --continue\")"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:1240
+#: wt-status.c:1244
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (所有冲çªå·²è§£å†³ï¼šè¿è¡Œ \"git revert --continue\")"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:1242
+#: wt-status.c:1246
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (使用 \"git revert --abort\" 以å–消å转æ交æ“作)"
-#: wt-status.c:1253
+#: wt-status.c:1257
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "您在执行从分支 '%s' 开始的二分查找æ“作。"
-#: wt-status.c:1257
+#: wt-status.c:1261
msgid "You are currently bisecting."
msgstr "您在执行二分查找æ“作。"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:1260
+#: wt-status.c:1264
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
-#: wt-status.c:1460
+#: wt-status.c:1464
msgid "On branch "
msgstr "ä½äºŽåˆ†æ”¯ "
-#: wt-status.c:1466
+#: wt-status.c:1470
msgid "interactive rebase in progress; onto "
msgstr "交互å¼å˜åŸºæ“作正在进行中;至 "
-#: wt-status.c:1468
+#: wt-status.c:1472
msgid "rebase in progress; onto "
msgstr "å˜åŸºæ“作正在进行中;至 "
-#: wt-status.c:1473
+#: wt-status.c:1477
msgid "HEAD detached at "
msgstr "头指针分离于 "
-#: wt-status.c:1475
+#: wt-status.c:1479
msgid "HEAD detached from "
msgstr "头指针分离自 "
-#: wt-status.c:1478
+#: wt-status.c:1482
msgid "Not currently on any branch."
msgstr "当å‰ä¸åœ¨ä»»ä½•åˆ†æ”¯ä¸Šã€‚"
-#: wt-status.c:1496
+#: wt-status.c:1500
msgid "Initial commit"
msgstr "åˆå§‹æ交"
-#: wt-status.c:1510
+#: wt-status.c:1514
msgid "Untracked files"
msgstr "未跟踪的文件"
-#: wt-status.c:1512
+#: wt-status.c:1516
msgid "Ignored files"
msgstr "忽略的文件"
-#: wt-status.c:1516
+#: wt-status.c:1520
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2623,84 +2982,84 @@ msgstr ""
"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能æ高速度,\n"
"但您需è¦å°å¿ƒä¸è¦å¿˜äº†æ·»åŠ æ–°æ–‡ä»¶ï¼ˆå‚è§ 'git help status')。"
-#: wt-status.c:1522
+#: wt-status.c:1526
#, c-format
msgid "Untracked files not listed%s"
msgstr "未跟踪的文件没有列出%s"
# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
-#: wt-status.c:1524
+#: wt-status.c:1528
msgid " (use -u option to show untracked files)"
msgstr "(使用 -u å‚数显示未跟踪的文件)"
-#: wt-status.c:1530
+#: wt-status.c:1534
msgid "No changes"
msgstr "没有修改"
-#: wt-status.c:1535
+#: wt-status.c:1539
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "修改尚未加入æ交(使用 \"git add\" å’Œ/或 \"git commit -a\")\n"
-#: wt-status.c:1538
+#: wt-status.c:1542
#, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入æ交\n"
-#: wt-status.c:1541
+#: wt-status.c:1545
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "æ交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
-#: wt-status.c:1544
+#: wt-status.c:1548
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "æ交为空,但是存在尚未跟踪的文件\n"
# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
-#: wt-status.c:1547
+#: wt-status.c:1551
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "无文件è¦æ交(创建/æ‹·è´æ–‡ä»¶å¹¶ä½¿ç”¨ \"git add\" 建立跟踪)\n"
-#: wt-status.c:1550 wt-status.c:1555
+#: wt-status.c:1554 wt-status.c:1559
#, c-format
msgid "nothing to commit\n"
msgstr "无文件è¦æ交\n"
# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
-#: wt-status.c:1553
+#: wt-status.c:1557
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "无文件è¦æ交(使用 -u 显示未跟踪的文件)\n"
# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
-#: wt-status.c:1557
+#: wt-status.c:1561
#, c-format
-msgid "nothing to commit, working directory clean\n"
+msgid "nothing to commit, working tree clean\n"
msgstr "无文件è¦æ交,干净的工作区\n"
# 译者:注æ„ä¿æŒå¥å°¾ç©ºæ ¼
-#: wt-status.c:1664
+#: wt-status.c:1668
msgid "Initial commit on "
msgstr "åˆå§‹æ交于 "
-#: wt-status.c:1668
+#: wt-status.c:1672
msgid "HEAD (no branch)"
msgstr "HEAD(éžåˆ†æ”¯ï¼‰"
-#: wt-status.c:1697
+#: wt-status.c:1701
msgid "gone"
msgstr "丢失"
# 译者:注æ„ä¿æŒå¥å°¾ç©ºæ ¼
-#: wt-status.c:1699 wt-status.c:1707
+#: wt-status.c:1703 wt-status.c:1711
msgid "behind "
msgstr "è½åŽ "
-#: wt-status.c:1702 wt-status.c:1705
+#: wt-status.c:1706 wt-status.c:1709
msgid "ahead "
msgstr "领先 "
@@ -2718,251 +3077,265 @@ msgstr "git add [<选项>] [--] <路径规格>..."
msgid "unexpected diff status %c"
msgstr "æ„å¤–çš„å·®å¼‚çŠ¶æ€ %c"
-#: builtin/add.c:70 builtin/commit.c:280
+#: builtin/add.c:71 builtin/commit.c:281
msgid "updating files failed"
msgstr "更新文件失败"
-#: builtin/add.c:80
+#: builtin/add.c:81
#, c-format
msgid "remove '%s'\n"
msgstr "删除 '%s'\n"
-#: builtin/add.c:134
+#: builtin/add.c:136
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之åŽå°šæœªè¢«æš‚存的å˜æ›´ï¼š"
-#: builtin/add.c:194 builtin/rev-parse.c:811
+#: builtin/add.c:196 builtin/rev-parse.c:811
msgid "Could not read the index"
msgstr "ä¸èƒ½è¯»å–索引"
-#: builtin/add.c:205
+#: builtin/add.c:207
#, c-format
msgid "Could not open '%s' for writing."
msgstr "无法打开 '%s' 进行写入。"
-#: builtin/add.c:209
+#: builtin/add.c:211
msgid "Could not write patch"
msgstr "ä¸èƒ½ç”Ÿæˆè¡¥ä¸"
-#: builtin/add.c:212
+#: builtin/add.c:214
msgid "editing patch failed"
msgstr "编辑补ä¸å¤±è´¥"
-#: builtin/add.c:215
+#: builtin/add.c:217
#, c-format
msgid "Could not stat '%s'"
msgstr "ä¸èƒ½æŸ¥çœ‹æ–‡ä»¶çŠ¶æ€ '%s'"
-#: builtin/add.c:217
+#: builtin/add.c:219
msgid "Empty patch. Aborted."
msgstr "空补ä¸ã€‚异常终止。"
-#: builtin/add.c:222
+#: builtin/add.c:224
#, c-format
msgid "Could not apply '%s'"
msgstr "ä¸èƒ½åº”用 '%s'"
-#: builtin/add.c:232
+#: builtin/add.c:234
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根æ®æ‚¨çš„一个 .gitignore 文件而被忽略:\n"
-#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
-#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
+#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "演习"
-#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
-#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
-#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
+#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
+#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
msgid "be verbose"
msgstr "冗长输出"
-#: builtin/add.c:252
+#: builtin/add.c:256
msgid "interactive picking"
msgstr "交互å¼æ‹£é€‰"
-#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
+#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "交互å¼æŒ‘选数æ®å—"
-#: builtin/add.c:254
+#: builtin/add.c:258
msgid "edit current diff and apply"
msgstr "编辑当å‰å·®å¼‚并应用"
-#: builtin/add.c:255
+#: builtin/add.c:259
msgid "allow adding otherwise ignored files"
msgstr "å…许添加忽略的文件"
-#: builtin/add.c:256
+#: builtin/add.c:260
msgid "update tracked files"
msgstr "更新已跟踪的文件"
-#: builtin/add.c:257
+#: builtin/add.c:261
msgid "record only the fact that the path will be added later"
msgstr "åªè®°å½•ï¼Œè¯¥è·¯å¾„ç¨åŽå†æ·»åŠ "
-#: builtin/add.c:258
+#: builtin/add.c:262
msgid "add changes from all tracked and untracked files"
msgstr "添加所有改å˜çš„已跟踪文件和未跟踪文件"
-#: builtin/add.c:261
+#: builtin/add.c:265
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "忽略工作区中移除的路径(和 --no-all 相åŒï¼‰"
-#: builtin/add.c:263
+#: builtin/add.c:267
msgid "don't add, only refresh the index"
msgstr "ä¸æ·»åŠ ï¼Œåªåˆ·æ–°ç´¢å¼•"
-#: builtin/add.c:264
+#: builtin/add.c:268
msgid "just skip files which cannot be added because of errors"
msgstr "跳过因出错ä¸èƒ½æ·»åŠ çš„文件"
-#: builtin/add.c:265
+#: builtin/add.c:269
msgid "check if - even missing - files are ignored in dry run"
msgstr "检查在演习模å¼ä¸‹æ–‡ä»¶ï¼ˆå³ä½¿ä¸å­˜åœ¨ï¼‰æ˜¯å¦è¢«å¿½ç•¥"
-#: builtin/add.c:287
+#: builtin/add.c:270 builtin/update-index.c:958
+msgid "(+/-)x"
+msgstr "(+/-)x"
+
+#: builtin/add.c:270 builtin/update-index.c:959
+msgid "override the executable bit of the listed files"
+msgstr "覆盖列表里文件的å¯æ‰§è¡Œä½"
+
+#: builtin/add.c:292
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "使用 -f å‚数如果您确实è¦æ·»åŠ å®ƒä»¬ã€‚\n"
-#: builtin/add.c:294
+#: builtin/add.c:300
msgid "adding files failed"
msgstr "添加文件失败"
-#: builtin/add.c:330
+#: builtin/add.c:336
msgid "-A and -u are mutually incompatible"
msgstr "-A 和 -u 选项互斥"
-#: builtin/add.c:337
+#: builtin/add.c:343
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "选项 --ignore-missing åªèƒ½å’Œ --dry-run åŒæ—¶ä½¿ç”¨"
#: builtin/add.c:352
#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "å‚æ•° --chmod å–值 '%s' 必须是 -x 或 +x"
+
+#: builtin/add.c:367
+#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "没有指定文件,也没有文件被添加。\n"
-#: builtin/add.c:353
+#: builtin/add.c:368
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "也许您想è¦æ‰§è¡Œ 'git add .'?\n"
-#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
+#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
#: builtin/submodule--helper.c:240
msgid "index file corrupt"
msgstr "索引文件æŸå"
-#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
+#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
-#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
+#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
#, c-format
msgid "could not read '%s'"
msgstr "ä¸èƒ½è¯»å– '%s'"
-#: builtin/am.c:430
+#: builtin/am.c:426
msgid "could not parse author script"
msgstr "ä¸èƒ½è§£æžä½œè€…脚本"
-#: builtin/am.c:507
+#: builtin/am.c:503
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg é’©å­åˆ é™¤"
-#: builtin/am.c:548 builtin/notes.c:300
+#: builtin/am.c:544 builtin/notes.c:301
#, c-format
msgid "Malformed input line: '%s'."
msgstr "éžæ³•çš„输入行:'%s'。"
-#: builtin/am.c:585 builtin/notes.c:315
+#: builtin/am.c:581 builtin/notes.c:316
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "从 '%s' æ‹·è´æ³¨è§£åˆ° '%s' 时失败"
-#: builtin/am.c:611
+#: builtin/am.c:607
msgid "fseek failed"
msgstr "fseek 失败"
-#: builtin/am.c:788
+#: builtin/am.c:787
#, c-format
msgid "could not parse patch '%s'"
msgstr "无法解æžè¡¥ä¸ '%s'"
-#: builtin/am.c:853
+#: builtin/am.c:852
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次åªèƒ½æœ‰ä¸€ä¸ª StGIT è¡¥ä¸é˜Ÿåˆ—被应用"
-#: builtin/am.c:900
+#: builtin/am.c:899
msgid "invalid timestamp"
msgstr "无效的时间戳"
-#: builtin/am.c:903 builtin/am.c:911
+#: builtin/am.c:902 builtin/am.c:910
msgid "invalid Date line"
msgstr "无效的日期行"
-#: builtin/am.c:908
+#: builtin/am.c:907
msgid "invalid timezone offset"
msgstr "无效的时区å移值"
-#: builtin/am.c:995
+#: builtin/am.c:996
msgid "Patch format detection failed."
msgstr "è¡¥ä¸æ ¼å¼æ£€æµ‹å¤±è´¥ã€‚"
-#: builtin/am.c:1000 builtin/clone.c:380
+#: builtin/am.c:1001 builtin/clone.c:380
#, c-format
msgid "failed to create directory '%s'"
msgstr "无法创建目录 '%s'"
-#: builtin/am.c:1004
+#: builtin/am.c:1005
msgid "Failed to split patches."
msgstr "无法拆分补ä¸ã€‚"
-#: builtin/am.c:1136 builtin/commit.c:365
+#: builtin/am.c:1137 builtin/commit.c:366
msgid "unable to write index file"
msgstr "无法写入索引文件"
-#: builtin/am.c:1187
+#: builtin/am.c:1188
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "当您解决这一问题,执行 \"%s --continue\"。"
-#: builtin/am.c:1188
+#: builtin/am.c:1189
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想è¦è·³è¿‡è¿™ä¸€è¡¥ä¸ï¼Œåˆ™æ‰§è¡Œ \"%s --skip\"。"
-#: builtin/am.c:1189
+#: builtin/am.c:1190
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "è‹¥è¦å¤åŽŸè‡³åŽŸå§‹åˆ†æ”¯å¹¶åœæ­¢è¡¥ä¸æ“作,执行 \"%s --abort\"。"
-#: builtin/am.c:1327
+#: builtin/am.c:1328
msgid "Patch is empty. Was it split wrong?"
msgstr "è¡¥ä¸ä¸ºç©ºã€‚是ä¸æ˜¯åˆ‡åˆ†é”™è¯¯ï¼Ÿ"
-#: builtin/am.c:1401 builtin/log.c:1516
+#: builtin/am.c:1402 builtin/log.c:1543
#, c-format
msgid "invalid ident line: %s"
msgstr "包å«æ— æ•ˆçš„身份标识:%s"
-#: builtin/am.c:1428
+#: builtin/am.c:1429
#, c-format
msgid "unable to parse commit %s"
msgstr "ä¸èƒ½è§£æžæ交 %s"
-#: builtin/am.c:1630
+#: builtin/am.c:1602
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "仓库缺ä¹å¿…è¦çš„æ•°æ®å¯¹è±¡ä»¥è¿›è¡Œä¸‰æ–¹åˆå¹¶ã€‚"
-#: builtin/am.c:1632
+#: builtin/am.c:1604
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引æ¥é‡å»ºä¸€ä¸ªï¼ˆä¸‰æ–¹åˆå¹¶çš„)基础目录树..."
-#: builtin/am.c:1651
+#: builtin/am.c:1623
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2970,37 +3343,37 @@ msgstr ""
"您是å¦æ›¾æ‰‹åŠ¨ç¼–辑过您的补ä¸ï¼Ÿ\n"
"无法应用补ä¸åˆ°ç´¢å¼•ä¸­çš„æ•°æ®å¯¹è±¡ä¸Šã€‚"
-#: builtin/am.c:1657
+#: builtin/am.c:1629
msgid "Falling back to patching base and 3-way merge..."
msgstr "回è½åˆ°åŸºç¡€ç‰ˆæœ¬ä¸Šæ‰“è¡¥ä¸åŠè¿›è¡Œä¸‰æ–¹åˆå¹¶..."
-#: builtin/am.c:1672
+#: builtin/am.c:1654
msgid "Failed to merge in the changes."
msgstr "无法åˆå¹¶å˜æ›´ã€‚"
-#: builtin/am.c:1696 builtin/merge.c:636
+#: builtin/am.c:1679 builtin/merge.c:628
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入一树对象"
-#: builtin/am.c:1703
+#: builtin/am.c:1686
msgid "applying to an empty history"
msgstr "正应用到一个空历å²ä¸Š"
-#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
-#: builtin/merge.c:866
+#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
+#: builtin/merge.c:823
msgid "failed to write commit object"
msgstr "无法写æ交对象"
-#: builtin/am.c:1748 builtin/am.c:1752
+#: builtin/am.c:1731 builtin/am.c:1735
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续:%s ä¸å­˜åœ¨ã€‚"
-#: builtin/am.c:1768
+#: builtin/am.c:1751
msgid "cannot be interactive without stdin connected to a terminal."
msgstr "标准输入没有和终端关è”,ä¸èƒ½è¿›è¡Œäº¤äº’å¼æ“作。"
-#: builtin/am.c:1773
+#: builtin/am.c:1756
msgid "Commit Body is:"
msgstr "æ交内容为:"
@@ -3009,35 +3382,35 @@ msgstr "æ交内容为:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1783
+#: builtin/am.c:1766
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "应用?是[y]/å¦[n]/编辑[e]/查看补ä¸[v]/应用所有[a]:"
-#: builtin/am.c:1833
+#: builtin/am.c:1816
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "è„索引:ä¸èƒ½åº”用补ä¸ï¼ˆè„文件:%s)"
-#: builtin/am.c:1868 builtin/am.c:1940
+#: builtin/am.c:1853 builtin/am.c:1925
#, c-format
msgid "Applying: %.*s"
msgstr "应用:%.*s"
-#: builtin/am.c:1884
+#: builtin/am.c:1869
msgid "No changes -- Patch already applied."
msgstr "没有å˜æ›´ —— è¡¥ä¸å·²ç»åº”用过。"
-#: builtin/am.c:1892
+#: builtin/am.c:1877
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补ä¸å¤±è´¥äºŽ %s %.*s"
-#: builtin/am.c:1898
+#: builtin/am.c:1883
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "失败的补ä¸æ–‡ä»¶å‰¯æœ¬ä½äºŽï¼š%s"
-#: builtin/am.c:1943
+#: builtin/am.c:1928
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -3047,7 +3420,7 @@ msgstr ""
"如果没有什么è¦æ·»åŠ åˆ°æš‚存区的,则很å¯èƒ½æ˜¯å…¶å®ƒæ交已ç»å¼•å…¥äº†ç›¸åŒçš„å˜æ›´ã€‚\n"
"您也许想è¦è·³è¿‡è¿™ä¸ªè¡¥ä¸ã€‚"
-#: builtin/am.c:1950
+#: builtin/am.c:1935
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -3055,170 +3428,170 @@ msgstr ""
"您的索引中ä»æœ‰æœªåˆå¹¶çš„路径。\n"
"您是å¦å¿˜äº†æ‰§è¡Œ 'git add'?"
-#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
+#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "ä¸èƒ½è§£æžå¯¹è±¡ '%s'。"
-#: builtin/am.c:2110
+#: builtin/am.c:2095
msgid "failed to clean index"
msgstr "无法清空索引"
-#: builtin/am.c:2144
+#: builtin/am.c:2129
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "您好åƒåœ¨ä¸Šä¸€æ¬¡ 'am' 失败åŽç§»åŠ¨äº† HEAD。未回退至 ORIG_HEAD"
-#: builtin/am.c:2205
+#: builtin/am.c:2192
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "无效的 --patch-format 值:%s"
-#: builtin/am.c:2238
+#: builtin/am.c:2225
msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"
-#: builtin/am.c:2239
+#: builtin/am.c:2226
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/am.c:2245
+#: builtin/am.c:2232
msgid "run interactively"
msgstr "以交互å¼æ–¹å¼è¿è¡Œ"
-#: builtin/am.c:2247
+#: builtin/am.c:2234
msgid "historical option -- no-op"
msgstr "è€çš„å‚æ•° —— 无作用"
-#: builtin/am.c:2249
+#: builtin/am.c:2236
msgid "allow fall back on 3way merging if needed"
msgstr "如果必è¦ï¼Œå…许使用三方åˆå¹¶ã€‚"
-#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
-#: builtin/repack.c:171
+#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
+#: builtin/repack.c:172
msgid "be quiet"
msgstr "é™é»˜æ¨¡å¼"
-#: builtin/am.c:2252
+#: builtin/am.c:2239
msgid "add a Signed-off-by line to the commit message"
msgstr "在æ交说明中添加一个 Signed-off-by ç­¾å"
-#: builtin/am.c:2255
+#: builtin/am.c:2242
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集(默认)"
-#: builtin/am.c:2257
+#: builtin/am.c:2244
msgid "pass -k flag to git-mailinfo"
msgstr "å‘ git-mailinfo 传递 -k å‚æ•°"
-#: builtin/am.c:2259
+#: builtin/am.c:2246
msgid "pass -b flag to git-mailinfo"
msgstr "å‘ git-mailinfo 传递 -b å‚æ•°"
-#: builtin/am.c:2261
+#: builtin/am.c:2248
msgid "pass -m flag to git-mailinfo"
msgstr "å‘ git-mailinfo 传递 -m å‚æ•°"
-#: builtin/am.c:2263
+#: builtin/am.c:2250
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox æ ¼å¼ï¼Œå‘ git-mailsplit 传递 --keep-cr å‚æ•°"
-#: builtin/am.c:2266
+#: builtin/am.c:2253
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "ä¸å‘ git-mailsplit 传递 --keep-cr å‚数,覆盖 am.keepcr 的设置"
-#: builtin/am.c:2269
+#: builtin/am.c:2256
msgid "strip everything before a scissors line"
msgstr "丢弃è£åˆ‡çº¿å‰çš„所有内容"
-#: builtin/am.c:2270 builtin/apply.c:4546
+#: builtin/am.c:2257 builtin/apply.c:4837
msgid "action"
msgstr "动作"
-#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
-#: builtin/am.c:2298
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
+#: builtin/am.c:2285
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
-#: builtin/am.c:2279 builtin/apply.c:4570
+#: builtin/am.c:2266 builtin/apply.c:4861
msgid "root"
msgstr "根目录"
-#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
-#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
+#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
-#: builtin/submodule--helper.c:770
+#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:826
msgid "path"
msgstr "路径"
-#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134
-#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182
+#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134
+#: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185
#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
#: parse-options.h:132 parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2291 builtin/apply.c:4514
+#: builtin/am.c:2278 builtin/apply.c:4805
msgid "num"
msgstr "æ•°å­—"
-#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "æ ¼å¼"
-#: builtin/am.c:2295
+#: builtin/am.c:2282
msgid "format the patch(es) are in"
msgstr "è¡¥ä¸çš„æ ¼å¼"
-#: builtin/am.c:2301
+#: builtin/am.c:2288
msgid "override error message when patch failure occurs"
msgstr "打补ä¸å¤±è´¥æ—¶æ˜¾ç¤ºçš„错误信æ¯"
-#: builtin/am.c:2303
+#: builtin/am.c:2290
msgid "continue applying patches after resolving a conflict"
msgstr "冲çªè§£å†³åŽç»§ç»­åº”用补ä¸"
-#: builtin/am.c:2306
+#: builtin/am.c:2293
msgid "synonyms for --continue"
msgstr "å’Œ --continue åŒä¹‰"
-#: builtin/am.c:2309
+#: builtin/am.c:2296
msgid "skip the current patch"
msgstr "跳过当å‰è¡¥ä¸"
-#: builtin/am.c:2312
+#: builtin/am.c:2299
msgid "restore the original branch and abort the patching operation."
msgstr "æ¢å¤åŽŸå§‹åˆ†æ”¯å¹¶ç»ˆæ­¢æ‰“è¡¥ä¸æ“作。"
-#: builtin/am.c:2316
+#: builtin/am.c:2303
msgid "lie about committer date"
msgstr "将作者日期作为æ交日期"
-#: builtin/am.c:2318
+#: builtin/am.c:2305
msgid "use current timestamp for author date"
msgstr "用当å‰æ—¶é—´ä½œä¸ºä½œè€…日期"
-#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2321
+#: builtin/am.c:2308
msgid "GPG-sign commits"
msgstr "使用 GPG ç­¾åæ交"
-#: builtin/am.c:2324
+#: builtin/am.c:2311
msgid "(internal use for git-rebase)"
msgstr "(内部使用,用于 git-rebase)"
-#: builtin/am.c:2339
+#: builtin/am.c:2326
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -3226,16 +3599,16 @@ msgstr ""
"å‚æ•° -b/--binary å·²ç»å¾ˆé•¿æ—¶é—´ä¸åšä»»ä½•å®žè´¨æ“作了,并且将被移除。\n"
"请ä¸è¦å†ä½¿ç”¨å®ƒäº†ã€‚"
-#: builtin/am.c:2346
+#: builtin/am.c:2333
msgid "failed to read the index"
msgstr "无法读å–索引"
-#: builtin/am.c:2361
+#: builtin/am.c:2348
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之å‰çš„å˜åŸºç›®å½• %s ä»ç„¶å­˜åœ¨ï¼Œä½†å´æ供了 mbox。"
-#: builtin/am.c:2385
+#: builtin/am.c:2372
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -3244,70 +3617,70 @@ msgstr ""
"å‘现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
-#: builtin/am.c:2391
+#: builtin/am.c:2378
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决æ“作未进行,我们ä¸ä¼šç»§ç»­ã€‚"
-#: builtin/apply.c:59
+#: builtin/apply.c:122
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<选项>] [<è¡¥ä¸>...]"
-#: builtin/apply.c:111
+#: builtin/apply.c:153
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "未能识别的空白字符选项 '%s'"
-#: builtin/apply.c:126
+#: builtin/apply.c:169
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "未能识别的空白字符忽略选项 '%s'"
-#: builtin/apply.c:818
+#: builtin/apply.c:854
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "æ— æ³•å‡†å¤‡æ—¶é—´æˆ³æ­£åˆ™è¡¨è¾¾å¼ %s"
-#: builtin/apply.c:827
+#: builtin/apply.c:863
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec 返回 %d,输入为:%s"
-#: builtin/apply.c:908
+#: builtin/apply.c:947
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "ä¸èƒ½åœ¨è¡¥ä¸çš„第 %d 行找到文件å"
-#: builtin/apply.c:937
+#: builtin/apply.c:984
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
-#: builtin/apply.c:942
+#: builtin/apply.c:989
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行上新文件åä¸ä¸€è‡´"
-#: builtin/apply.c:943
+#: builtin/apply.c:990
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件åä¸ä¸€è‡´"
-#: builtin/apply.c:949
+#: builtin/apply.c:995
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
-#: builtin/apply.c:1406
+#: builtin/apply.c:1489
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount:æ„外的行:%.*s"
-#: builtin/apply.c:1463
+#: builtin/apply.c:1550
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "第 %d 行的补ä¸ç‰‡æ®µæ²¡æœ‰å¤´ä¿¡æ¯ï¼š%.*s"
-#: builtin/apply.c:1480
+#: builtin/apply.c:1567
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -3318,77 +3691,77 @@ msgid_plural ""
msgstr[0] "当移除 %d 个å‰å¯¼è·¯å¾„åŽ git diff 头缺ä¹æ–‡ä»¶åä¿¡æ¯ï¼ˆç¬¬ %d 行)"
msgstr[1] "当移除 %d 个å‰å¯¼è·¯å¾„åŽ git diff 头缺ä¹æ–‡ä»¶åä¿¡æ¯ï¼ˆç¬¬ %d 行)"
-#: builtin/apply.c:1646
+#: builtin/apply.c:1743
msgid "new file depends on old contents"
msgstr "新文件ä¾èµ–旧内容"
-#: builtin/apply.c:1648
+#: builtin/apply.c:1745
msgid "deleted file still has contents"
msgstr "删除的文件ä»æœ‰å†…容"
-#: builtin/apply.c:1674
+#: builtin/apply.c:1774
#, c-format
msgid "corrupt patch at line %d"
msgstr "è¡¥ä¸åœ¨ç¬¬ %d è¡ŒæŸå"
-#: builtin/apply.c:1710
+#: builtin/apply.c:1810
#, c-format
msgid "new file %s depends on old contents"
msgstr "新文件 %s ä¾èµ–旧内容"
-#: builtin/apply.c:1712
+#: builtin/apply.c:1812
#, c-format
msgid "deleted file %s still has contents"
msgstr "删除的文件 %s ä»æœ‰å†…容"
-#: builtin/apply.c:1715
+#: builtin/apply.c:1815
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告:文件 %s æˆä¸ºç©ºæ–‡ä»¶ä½†å¹¶æœªåˆ é™¤"
-#: builtin/apply.c:1861
+#: builtin/apply.c:1962
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二进制补ä¸åœ¨ç¬¬ %d è¡ŒæŸå:%.*s"
-#: builtin/apply.c:1895
+#: builtin/apply.c:1999
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "未能识别的二进制补ä¸ä½äºŽç¬¬ %d è¡Œ"
-#: builtin/apply.c:2048
+#: builtin/apply.c:2154
#, c-format
msgid "patch with only garbage at line %d"
msgstr "è¡¥ä¸æ–‡ä»¶çš„第 %d è¡Œåªæœ‰åžƒåœ¾æ•°æ®"
-#: builtin/apply.c:2138
+#: builtin/apply.c:2244
#, c-format
msgid "unable to read symlink %s"
msgstr "无法读å–符å·é“¾æŽ¥ %s"
-#: builtin/apply.c:2142
+#: builtin/apply.c:2248
#, c-format
msgid "unable to open or read %s"
msgstr "ä¸èƒ½æ‰“å¼€æˆ–è¯»å– %s"
-#: builtin/apply.c:2775
+#: builtin/apply.c:2901
#, c-format
msgid "invalid start of line: '%c'"
msgstr "无效的行首字符:'%c'"
-#: builtin/apply.c:2894
+#: builtin/apply.c:3020
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "å— #%d æˆåŠŸåº”用于 %d(å移 %d 行)"
msgstr[1] "å— #%d æˆåŠŸåº”用于 %d(å移 %d 行)"
-#: builtin/apply.c:2906
+#: builtin/apply.c:3032
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文å‡å°‘到(%ld/%ld)以在第 %d 行应用补ä¸ç‰‡æ®µ"
-#: builtin/apply.c:2912
+#: builtin/apply.c:3038
#, c-format
msgid ""
"while searching for:\n"
@@ -3397,335 +3770,330 @@ msgstr ""
"当查询:\n"
"%.*s"
-#: builtin/apply.c:2932
+#: builtin/apply.c:3060
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺失 '%s' 的二进制补ä¸æ•°æ®"
-#: builtin/apply.c:3033
+#: builtin/apply.c:3163
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补ä¸æœªåº”用到 '%s'"
-#: builtin/apply.c:3039
+#: builtin/apply.c:3169
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二进制补ä¸äº§ç”Ÿäº†ä¸æ­£ç¡®çš„结果(应为 %s,å´ä¸º %s)"
-#: builtin/apply.c:3060
+#: builtin/apply.c:3190
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补ä¸å¤±è´¥ï¼š%s:%ld"
-#: builtin/apply.c:3184
+#: builtin/apply.c:3314
#, c-format
msgid "cannot checkout %s"
msgstr "ä¸èƒ½æ£€å‡º %s"
-#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
-#, c-format
-msgid "read of %s failed"
-msgstr "è¯»å– %s 失败"
-
-#: builtin/apply.c:3237
+#: builtin/apply.c:3370
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "读å–ä½äºŽç¬¦å·é“¾æŽ¥ä¸­çš„ '%s'"
-#: builtin/apply.c:3265 builtin/apply.c:3487
+#: builtin/apply.c:3399 builtin/apply.c:3630
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s å·²ç»è¢«é‡å‘½å/删除"
-#: builtin/apply.c:3346 builtin/apply.c:3501
+#: builtin/apply.c:3482 builtin/apply.c:3644
#, c-format
msgid "%s: does not exist in index"
msgstr "%s:ä¸å­˜åœ¨äºŽç´¢å¼•ä¸­"
-#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
+#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
#, c-format
msgid "%s: %s"
msgstr "%s:%s"
-#: builtin/apply.c:3355 builtin/apply.c:3509
+#: builtin/apply.c:3491 builtin/apply.c:3652
#, c-format
msgid "%s: does not match index"
msgstr "%s:和索引ä¸åŒ¹é…"
-#: builtin/apply.c:3457
+#: builtin/apply.c:3597
msgid "removal patch leaves file contents"
msgstr "移除补ä¸ä»ç•™ä¸‹äº†æ–‡ä»¶å†…容"
-#: builtin/apply.c:3526
+#: builtin/apply.c:3669
#, c-format
msgid "%s: wrong type"
msgstr "%s:错误类型"
-#: builtin/apply.c:3528
+#: builtin/apply.c:3671
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o,应为 %o"
-#: builtin/apply.c:3687 builtin/apply.c:3689
+#: builtin/apply.c:3822 builtin/apply.c:3824
#, c-format
msgid "invalid path '%s'"
msgstr "无效路径 '%s'"
-#: builtin/apply.c:3744
+#: builtin/apply.c:3879
#, c-format
msgid "%s: already exists in index"
msgstr "%s:已ç»å­˜åœ¨äºŽç´¢å¼•ä¸­"
-#: builtin/apply.c:3747
+#: builtin/apply.c:3882
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s:已ç»å­˜åœ¨äºŽå·¥ä½œåŒºä¸­"
-#: builtin/apply.c:3767
+#: builtin/apply.c:3902
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模å¼ï¼ˆ%1$o)和旧模å¼ï¼ˆ%3$o)ä¸åŒ¹é…"
-#: builtin/apply.c:3772
+#: builtin/apply.c:3907
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "%2$s 的新模å¼ï¼ˆ%1$o)和 %4$s 的旧模å¼ï¼ˆ%3$o)ä¸åŒ¹é…"
-#: builtin/apply.c:3792
+#: builtin/apply.c:3927
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "å—å½±å“的文件 '%s' ä½äºŽç¬¦å·é“¾æŽ¥ä¸­"
-#: builtin/apply.c:3796
+#: builtin/apply.c:3931
#, c-format
msgid "%s: patch does not apply"
msgstr "%s:补ä¸æœªåº”用"
-#: builtin/apply.c:3810
+#: builtin/apply.c:3945
#, c-format
msgid "Checking patch %s..."
msgstr "æ£€æŸ¥è¡¥ä¸ %s..."
-#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' çš„ make_cache_entry æ“作失败"
-#: builtin/apply.c:4046
+#: builtin/apply.c:4182
#, c-format
msgid "unable to remove %s from index"
msgstr "ä¸èƒ½ä»Žç´¢å¼•ä¸­ç§»é™¤ %s"
-#: builtin/apply.c:4075
+#: builtin/apply.c:4215
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "å­æ¨¡ç»„ %s æŸåçš„è¡¥ä¸"
-#: builtin/apply.c:4079
+#: builtin/apply.c:4219
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "ä¸èƒ½æžšä¸¾æ–°å»ºæ–‡ä»¶ '%s' 的状æ€"
-#: builtin/apply.c:4084
+#: builtin/apply.c:4224
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "ä¸èƒ½ä¸ºæ–°å»ºæ–‡ä»¶ %s 创建åŽç«¯å­˜å‚¨"
-#: builtin/apply.c:4087 builtin/apply.c:4195
+#: builtin/apply.c:4227 builtin/apply.c:4340
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存æ¡ç›®"
-#: builtin/apply.c:4120
+#: builtin/apply.c:4260
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
-#: builtin/apply.c:4169
+#: builtin/apply.c:4313
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "ä¸èƒ½å†™æ–‡ä»¶ '%s' æƒé™ %o"
-#: builtin/apply.c:4256
+#: builtin/apply.c:4403
#, c-format
msgid "Applied patch %s cleanly."
msgstr "æˆåŠŸåº”ç”¨è¡¥ä¸ %s。"
-#: builtin/apply.c:4264
+#: builtin/apply.c:4411
msgid "internal error"
msgstr "内部错误"
-#: builtin/apply.c:4267
+#: builtin/apply.c:4414
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "应用 %%s 个补ä¸ï¼Œå…¶ä¸­ %d 个被拒ç»..."
msgstr[1] "应用 %%s 个补ä¸ï¼Œå…¶ä¸­ %d 个被拒ç»..."
-#: builtin/apply.c:4277
+#: builtin/apply.c:4424
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件å为 %.*s.rej"
-#: builtin/apply.c:4285
+#: builtin/apply.c:4432
#, c-format
msgid "cannot open %s: %s"
msgstr "ä¸èƒ½æ‰“å¼€ %s:%s"
-#: builtin/apply.c:4298
+#: builtin/apply.c:4445
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段æˆåŠŸåº”用。"
-#: builtin/apply.c:4301
+#: builtin/apply.c:4448
#, c-format
msgid "Rejected hunk #%d."
msgstr "æ‹’ç»ç¬¬ #%d 个片段。"
-#: builtin/apply.c:4387
+#: builtin/apply.c:4537
#, c-format
msgid "Skipped patch '%s'."
msgstr "ç•¥è¿‡è¡¥ä¸ '%s'。"
-#: builtin/apply.c:4395
+#: builtin/apply.c:4545
msgid "unrecognized input"
msgstr "未能识别的输入"
-#: builtin/apply.c:4406
+#: builtin/apply.c:4556
msgid "unable to read index file"
msgstr "无法读å–索引文件"
-#: builtin/apply.c:4509
+#: builtin/apply.c:4701
+msgid "--3way outside a repository"
+msgstr "--3way 在一个仓库之外"
+
+#: builtin/apply.c:4709
+msgid "--index outside a repository"
+msgstr "--index 在一个仓库之外"
+
+#: builtin/apply.c:4712
+msgid "--cached outside a repository"
+msgstr "--cached 在一个仓库之外"
+
+#: builtin/apply.c:4745
+#, c-format
+msgid "can't open patch '%s'"
+msgstr "ä¸èƒ½æ‰“å¼€è¡¥ä¸ '%s'"
+
+#: builtin/apply.c:4760
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "抑制下ä»æœ‰ %d 个空白字符误用"
+msgstr[1] "抑制下ä»æœ‰ %d 个空白字符误用"
+
+#: builtin/apply.c:4766 builtin/apply.c:4776
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d 行有空白字符误用。"
+msgstr[1] "%d 行有空白字符误用。"
+
+#: builtin/apply.c:4800
msgid "don't apply changes matching the given path"
msgstr "ä¸è¦åº”用与给出路径å‘匹é…çš„å˜æ›´"
-#: builtin/apply.c:4512
+#: builtin/apply.c:4803
msgid "apply changes matching the given path"
msgstr "应用与给出路径å‘匹é…çš„å˜æ›´"
-#: builtin/apply.c:4515
+#: builtin/apply.c:4806
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数é‡çš„å‰å¯¼æ–œçº¿"
-#: builtin/apply.c:4518
+#: builtin/apply.c:4809
msgid "ignore additions made by the patch"
msgstr "忽略补ä¸ä¸­çš„添加的文件"
-#: builtin/apply.c:4520
+#: builtin/apply.c:4811
msgid "instead of applying the patch, output diffstat for the input"
msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的差异统计(diffstat)"
-#: builtin/apply.c:4524
+#: builtin/apply.c:4815
msgid "show number of added and deleted lines in decimal notation"
msgstr "以å进制数显示添加和删除的行数"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4817
msgid "instead of applying the patch, output a summary for the input"
msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的概è¦"
-#: builtin/apply.c:4528
+#: builtin/apply.c:4819
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æŸ¥çœ‹è¡¥ä¸æ˜¯å¦å¯åº”用"
-#: builtin/apply.c:4530
+#: builtin/apply.c:4821
msgid "make sure the patch is applicable to the current index"
msgstr "确认补ä¸å¯ä»¥åº”用到当å‰ç´¢å¼•"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4823
msgid "apply a patch without touching the working tree"
msgstr "应用补ä¸è€Œä¸ä¿®æ”¹å·¥ä½œåŒº"
-#: builtin/apply.c:4534
+#: builtin/apply.c:4825
msgid "accept a patch that touches outside the working area"
msgstr "接å—修改工作区之外文件的补ä¸"
-#: builtin/apply.c:4536
+#: builtin/apply.c:4827
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补ä¸ï¼ˆä¸Ž --stat/--summary/--check 选项åŒæ—¶ä½¿ç”¨ï¼‰"
-#: builtin/apply.c:4538
+#: builtin/apply.c:4829
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补ä¸ä¸èƒ½åº”用则å°è¯•ä¸‰æ–¹åˆå¹¶"
-#: builtin/apply.c:4540
+#: builtin/apply.c:4831
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信æ¯"
-#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4836
msgid "ensure at least <n> lines of context match"
msgstr "ç¡®ä¿è‡³å°‘åŒ¹é… <n> 行上下文"
-#: builtin/apply.c:4547
+#: builtin/apply.c:4838
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
-#: builtin/apply.c:4550 builtin/apply.c:4553
+#: builtin/apply.c:4841 builtin/apply.c:4844
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的å˜æ›´"
-#: builtin/apply.c:4556
+#: builtin/apply.c:4847
msgid "apply the patch in reverse"
msgstr "åå‘应用补ä¸"
-#: builtin/apply.c:4558
+#: builtin/apply.c:4849
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
-#: builtin/apply.c:4560
+#: builtin/apply.c:4851
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒ç»çš„è¡¥ä¸ç‰‡æ®µä¿å­˜åœ¨å¯¹åº”çš„ *.rej 文件中"
-#: builtin/apply.c:4562
+#: builtin/apply.c:4853
msgid "allow overlapping hunks"
msgstr "å…许é‡å çš„è¡¥ä¸ç‰‡æ®µ"
-#: builtin/apply.c:4565
+#: builtin/apply.c:4856
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "å…许ä¸æ­£ç¡®çš„文件末尾æ¢è¡Œç¬¦"
-#: builtin/apply.c:4568
+#: builtin/apply.c:4859
msgid "do not trust the line counts in the hunk headers"
msgstr "ä¸ä¿¡ä»»è¡¥ä¸ç‰‡æ®µçš„头信æ¯ä¸­çš„è¡Œå·"
-#: builtin/apply.c:4571
+#: builtin/apply.c:4862
msgid "prepend <root> to all filenames"
msgstr "为所有文件åå‰æ·»åŠ  <根目录>"
-#: builtin/apply.c:4593
-msgid "--3way outside a repository"
-msgstr "--3way 在一个仓库之外"
-
-#: builtin/apply.c:4601
-msgid "--index outside a repository"
-msgstr "--index 在一个仓库之外"
-
-#: builtin/apply.c:4604
-msgid "--cached outside a repository"
-msgstr "--cached 在一个仓库之外"
-
-#: builtin/apply.c:4623
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "ä¸èƒ½æ‰“å¼€è¡¥ä¸ '%s'"
-
-#: builtin/apply.c:4637
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] "抑制下ä»æœ‰ %d 个空白字符误用"
-msgstr[1] "抑制下ä»æœ‰ %d 个空白字符误用"
-
-#: builtin/apply.c:4643 builtin/apply.c:4653
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] "%d 行有空白字符误用。"
-msgstr[1] "%d 行有空白字符误用。"
-
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
@@ -3781,103 +4149,103 @@ msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
-#: builtin/blame.c:1782
+#: builtin/blame.c:1781
msgid "Blaming lines"
msgstr "追踪代ç è¡Œ"
-#: builtin/blame.c:2531
+#: builtin/blame.c:2536
msgid "Show blame entries as we find them, incrementally"
msgstr "增é‡å¼åœ°æ˜¾ç¤ºå‘现的 blame æ¡ç›®"
-#: builtin/blame.c:2532
+#: builtin/blame.c:2537
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "边界æ交显示空的 SHA-1(默认:关闭)"
-#: builtin/blame.c:2533
+#: builtin/blame.c:2538
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "ä¸æŠŠæ ¹æ交作为边界(默认:关闭)"
-#: builtin/blame.c:2534
+#: builtin/blame.c:2539
msgid "Show work cost statistics"
msgstr "显示命令消耗统计"
-#: builtin/blame.c:2535
+#: builtin/blame.c:2540
msgid "Force progress reporting"
msgstr "强制进度显示"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2541
msgid "Show output score for blame entries"
msgstr "显示判断 blame æ¡ç›®ä½ç§»çš„得分诊断信æ¯"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2542
msgid "Show original filename (Default: auto)"
msgstr "显示原始文件å(默认:自动)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2543
msgid "Show original linenumber (Default: off)"
msgstr "显示原始的行å·ï¼ˆé»˜è®¤ï¼šå…³é—­ï¼‰"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2544
msgid "Show in a format designed for machine consumption"
msgstr "显示为一个适åˆæœºå™¨è¯»å–çš„æ ¼å¼"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2545
msgid "Show porcelain format with per-line commit information"
msgstr "为æ¯ä¸€è¡Œæ˜¾ç¤ºæœºå™¨é€‚用的æ交信æ¯"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2546
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相åŒçš„输出模å¼ï¼ˆé»˜è®¤ï¼šå…³é—­ï¼‰"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2547
msgid "Show raw timestamp (Default: off)"
msgstr "显示原始时间戳(默认:关闭)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2548
msgid "Show long commit SHA1 (Default: off)"
msgstr "显示长的 SHA1 æ交å·ï¼ˆé»˜è®¤ï¼šå…³é—­ï¼‰"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2549
msgid "Suppress author name and timestamp (Default: off)"
msgstr "éšè—作者å字和时间戳(默认:关闭)"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2550
msgid "Show author email instead of name (Default: off)"
msgstr "显示作者的邮箱而ä¸æ˜¯å字(默认:关闭)"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2551
msgid "Ignore whitespace differences"
msgstr "忽略空白差异"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2552
msgid "Spend extra cycles to find better match"
msgstr "花费é¢å¤–的循环æ¥æ‰¾åˆ°æ›´å¥½çš„匹é…"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2553
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "使用æ¥è‡ª <文件> 的修订集而ä¸æ˜¯è°ƒç”¨ git-rev-list"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2554
msgid "Use <file>'s contents as the final image"
msgstr "使用 <文件> 的内容作为最终的图片"
-#: builtin/blame.c:2550 builtin/blame.c:2551
+#: builtin/blame.c:2555 builtin/blame.c:2556
msgid "score"
msgstr "得分"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2555
msgid "Find line copies within and across files"
msgstr "找到文件内åŠè·¨æ–‡ä»¶çš„行拷è´"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2556
msgid "Find line movements within and across files"
msgstr "找到文件内åŠè·¨æ–‡ä»¶çš„行移动"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2557
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2552
+#: builtin/blame.c:2557
msgid "Process only line range n,m, counting from 1"
msgstr "åªå¤„ç†è¡ŒèŒƒå›´åœ¨ n å’Œ m 之间的,从 1 开始"
@@ -3887,7 +4255,7 @@ msgstr "åªå¤„ç†è¡ŒèŒƒå›´åœ¨ n å’Œ m 之间的,从 1 开始"
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2641
+#: builtin/blame.c:2649
msgid "4 years, 11 months ago"
msgstr "4 å¹´ 11 个月å‰"
@@ -3992,118 +4360,125 @@ msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
msgid "Deleted branch %s (was %s).\n"
msgstr "已删除分支 %s(曾为 %s)。\n"
-#: builtin/branch.c:309
+#: builtin/branch.c:312
#, c-format
msgid "[%s: gone]"
msgstr "[%s: 丢失]"
-#: builtin/branch.c:314
+#: builtin/branch.c:317
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:319
+#: builtin/branch.c:322
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s:è½åŽ %d]"
-#: builtin/branch.c:321
+#: builtin/branch.c:324
#, c-format
msgid "[behind %d]"
msgstr "[è½åŽ %d]"
-#: builtin/branch.c:325
+#: builtin/branch.c:328
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s:领先 %d]"
-#: builtin/branch.c:327
+#: builtin/branch.c:330
#, c-format
msgid "[ahead %d]"
msgstr "[领先 %d]"
-#: builtin/branch.c:330
+#: builtin/branch.c:333
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s:领先 %d,è½åŽ %d]"
-#: builtin/branch.c:333
+#: builtin/branch.c:336
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[领先 %d,è½åŽ %d]"
-#: builtin/branch.c:346
+#: builtin/branch.c:349
msgid " **** invalid ref ****"
msgstr " **** 无效引用 ****"
-#: builtin/branch.c:372
+#: builtin/branch.c:375
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(éžåˆ†æ”¯ï¼Œæ­£å˜åŸº %s)"
-#: builtin/branch.c:375
+#: builtin/branch.c:378
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(éžåˆ†æ”¯ï¼ŒäºŒåˆ†æŸ¥æ‰¾å¼€å§‹äºŽ %s)"
#. TRANSLATORS: make sure this matches
#. "HEAD detached at " in wt-status.c
-#: builtin/branch.c:381
+#: builtin/branch.c:384
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(头指针分离于 %s)"
#. TRANSLATORS: make sure this matches
#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:386
+#: builtin/branch.c:389
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(头指针分离自 %s)"
-#: builtin/branch.c:390
+#: builtin/branch.c:393
msgid "(no branch)"
msgstr "(éžåˆ†æ”¯ï¼‰"
-#: builtin/branch.c:541
+#: builtin/branch.c:544
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "分支 %s 正被å˜åŸºåˆ° %s"
-#: builtin/branch.c:545
+#: builtin/branch.c:548
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "分支 %s 正被二分查找于 %s"
-#: builtin/branch.c:560
+#: builtin/branch.c:563
msgid "cannot rename the current branch while not on any."
msgstr "无法é‡å‘½å当å‰åˆ†æ”¯å› ä¸ºä¸å¤„于任何分支上。"
-#: builtin/branch.c:570
+#: builtin/branch.c:573
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支å:'%s'"
-#: builtin/branch.c:587
+#: builtin/branch.c:590
msgid "Branch rename failed"
msgstr "分支é‡å‘½å失败"
-#: builtin/branch.c:591
+#: builtin/branch.c:594
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "é‡å‘½å掉一个错误命å的旧分支 '%s'"
-#: builtin/branch.c:594
+#: builtin/branch.c:597
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支é‡å‘½å为 %s,但 HEAD 没有更新ï¼"
-#: builtin/branch.c:601
+#: builtin/branch.c:604
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被é‡å‘½å,但更新 config 文件失败"
-#: builtin/branch.c:623
-msgid "could not write branch description template"
-msgstr "ä¸èƒ½å†™åˆ†æ”¯æ述模版"
+#: builtin/branch.c:620
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+"请编辑分支的æè¿°\n"
+" %s\n"
+"以 '%c' 开头的行将被过滤。\n"
#: builtin/branch.c:651
msgid "Generic options"
@@ -4205,8 +4580,8 @@ msgstr "key"
msgid "field name to sort on"
msgstr "排åºçš„字段å"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
-#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
+#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
#: builtin/tag.c:369
msgid "object"
msgstr "对象"
@@ -4326,7 +4701,7 @@ msgstr "需è¦ä¸€ä¸ªä»“库æ¥åˆ›å»ºåŒ…。"
msgid "Need a repository to unbundle."
msgstr "需è¦ä¸€ä¸ªä»“库æ¥è§£åŒ…。"
-#: builtin/cat-file.c:428
+#: builtin/cat-file.c:443
msgid ""
"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
"<type>|--textconv) <object>"
@@ -4334,55 +4709,55 @@ msgstr ""
"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
">|--textconv) <对象>"
-#: builtin/cat-file.c:429
+#: builtin/cat-file.c:444
msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
-#: builtin/cat-file.c:466
+#: builtin/cat-file.c:481
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<类型> å¯ä»¥æ˜¯å…¶ä¸­ä¹‹ä¸€ï¼šblobã€treeã€commitã€tag"
-#: builtin/cat-file.c:467
+#: builtin/cat-file.c:482
msgid "show object type"
msgstr "显示对象类型"
-#: builtin/cat-file.c:468
+#: builtin/cat-file.c:483
msgid "show object size"
msgstr "显示对象大å°"
-#: builtin/cat-file.c:470
+#: builtin/cat-file.c:485
msgid "exit with zero when there's no error"
msgstr "当没有错误时退出并返回零"
-#: builtin/cat-file.c:471
+#: builtin/cat-file.c:486
msgid "pretty-print object's content"
msgstr "美观地打å°å¯¹è±¡çš„内容"
-#: builtin/cat-file.c:473
+#: builtin/cat-file.c:488
msgid "for blob objects, run textconv on object's content"
msgstr "对于数æ®å¯¹è±¡ï¼Œå¯¹å…¶å†…容执行 textconv"
-#: builtin/cat-file.c:475
+#: builtin/cat-file.c:490
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "å…许 -s å’Œ -t 对æŸå的对象生效"
-#: builtin/cat-file.c:476
+#: builtin/cat-file.c:491
msgid "buffer --batch output"
msgstr "缓冲 --batch 的输出"
-#: builtin/cat-file.c:478
+#: builtin/cat-file.c:493
msgid "show info and content of objects fed from the standard input"
msgstr "显示从标准输入æ供的对象的信æ¯å’Œå†…容"
-#: builtin/cat-file.c:481
+#: builtin/cat-file.c:496
msgid "show info about objects fed from the standard input"
msgstr "显示从标准输入æ供的对象的信æ¯"
-#: builtin/cat-file.c:484
+#: builtin/cat-file.c:499
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "è·Ÿéšæ ‘内符å·é“¾æŽ¥ï¼ˆå’Œ --batch 或 --batch-check 共用)"
-#: builtin/cat-file.c:486
+#: builtin/cat-file.c:501
msgid "show all objects with --batch or --batch-check"
msgstr "使用 --batch 或 --batch-check å‚数显示所有对象"
@@ -4410,7 +4785,7 @@ msgstr "从标准输入读出文件å"
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "ä¸æ˜¾ç¤ºè¿›åº¦æŠ¥å‘Š"
@@ -4500,9 +4875,9 @@ msgid "write the content to temporary files"
msgstr "将内容写入临时文件"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
-#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
-#: builtin/submodule--helper.c:774
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
+#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
+#: builtin/submodule--helper.c:830 builtin/worktree.c:469
msgid "string"
msgstr "字符串"
@@ -4568,10 +4943,6 @@ msgstr "'%s' ä¸èƒ½å’Œ %s åŒæ—¶ä½¿ç”¨"
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "ä¸èƒ½åŒæ—¶æ›´æ–°è·¯å¾„并切æ¢åˆ°åˆ†æ”¯'%s'。"
-#: builtin/checkout.c:279 builtin/checkout.c:473
-msgid "corrupt index file"
-msgstr "æŸå的索引文件"
-
#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
@@ -4581,51 +4952,51 @@ msgstr "路径 '%s' 未åˆå¹¶"
msgid "you need to resolve your current index first"
msgstr "您需è¦å…ˆè§£å†³å½“å‰ç´¢å¼•çš„冲çª"
-#: builtin/checkout.c:622
+#: builtin/checkout.c:625
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "ä¸èƒ½å¯¹ '%s' 执行 reflog æ“作:%s\n"
-#: builtin/checkout.c:660
+#: builtin/checkout.c:664
msgid "HEAD is now at"
msgstr "HEAD ç›®å‰ä½äºŽ"
-#: builtin/checkout.c:664 builtin/clone.c:661
+#: builtin/checkout.c:668 builtin/clone.c:661
msgid "unable to update HEAD"
msgstr "ä¸èƒ½æ›´æ–° HEAD"
-#: builtin/checkout.c:668
+#: builtin/checkout.c:672
#, c-format
msgid "Reset branch '%s'\n"
msgstr "é‡ç½®åˆ†æ”¯ '%s'\n"
-#: builtin/checkout.c:671
+#: builtin/checkout.c:675
#, c-format
msgid "Already on '%s'\n"
msgstr "å·²ç»ä½äºŽ '%s'\n"
-#: builtin/checkout.c:675
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切æ¢å¹¶é‡ç½®åˆ†æ”¯ '%s'\n"
-#: builtin/checkout.c:677 builtin/checkout.c:1067
+#: builtin/checkout.c:681 builtin/checkout.c:1070
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切æ¢åˆ°ä¸€ä¸ªæ–°åˆ†æ”¯ '%s'\n"
-#: builtin/checkout.c:679
+#: builtin/checkout.c:683
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切æ¢åˆ°åˆ†æ”¯ '%s'\n"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: builtin/checkout.c:731
+#: builtin/checkout.c:734
#, c-format
msgid " ... and %d more.\n"
msgstr " ... åŠå…¶å®ƒ %d 个。\n"
-#: builtin/checkout.c:737
+#: builtin/checkout.c:740
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4646,7 +5017,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:756
+#: builtin/checkout.c:759
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4673,150 +5044,150 @@ msgstr[1] ""
" git branch <新分支å> %s\n"
"\n"
-#: builtin/checkout.c:792
+#: builtin/checkout.c:795
msgid "internal error in revision walk"
msgstr "在版本é历时é‡åˆ°å†…部错误"
-#: builtin/checkout.c:796
+#: builtin/checkout.c:799
msgid "Previous HEAD position was"
msgstr "之å‰çš„ HEAD ä½ç½®æ˜¯"
-#: builtin/checkout.c:823 builtin/checkout.c:1062
+#: builtin/checkout.c:826 builtin/checkout.c:1065
msgid "You are on a branch yet to be born"
msgstr "您ä½äºŽä¸€ä¸ªå°šæœªåˆå§‹åŒ–的分支"
-#: builtin/checkout.c:968
+#: builtin/checkout.c:971
#, c-format
msgid "only one reference expected, %d given."
msgstr "åªè¦ä¸€ä¸ªå¼•ç”¨ï¼Œå´ç»™å‡ºäº† %d 个"
-#: builtin/checkout.c:1008 builtin/worktree.c:212
+#: builtin/checkout.c:1011 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用:%s"
-#: builtin/checkout.c:1037
+#: builtin/checkout.c:1040
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用ä¸æ˜¯ä¸€ä¸ªæ ‘:%s"
-#: builtin/checkout.c:1076
+#: builtin/checkout.c:1079
msgid "paths cannot be used with switching branches"
msgstr "路径ä¸èƒ½å’Œåˆ‡æ¢åˆ†æ”¯åŒæ—¶ä½¿ç”¨"
-#: builtin/checkout.c:1079 builtin/checkout.c:1083
+#: builtin/checkout.c:1082 builtin/checkout.c:1086
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' ä¸èƒ½å’Œåˆ‡æ¢åˆ†æ”¯åŒæ—¶ä½¿ç”¨"
-#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
-#: builtin/checkout.c:1098
+#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
+#: builtin/checkout.c:1101
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ä¸èƒ½å’Œ '%s' åŒæ—¶ä½¿ç”¨"
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1106
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "ä¸èƒ½åˆ‡æ¢åˆ†æ”¯åˆ°ä¸€ä¸ªéžæ交 '%s'"
-#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
-#: builtin/worktree.c:325
+#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
+#: builtin/worktree.c:326
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1140
msgid "create and checkout a new branch"
msgstr "创建并检出一个新的分支"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1142
msgid "create/reset and checkout a branch"
msgstr "创建/é‡ç½®å¹¶æ£€å‡ºä¸€ä¸ªåˆ†æ”¯"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1143
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
-#: builtin/checkout.c:1141
-msgid "detach the HEAD at named commit"
-msgstr "æˆä¸ºæŒ‡å‘该æ交的分离头指针"
+#: builtin/checkout.c:1144 builtin/worktree.c:328
+msgid "detach HEAD at named commit"
+msgstr "HEAD 从指定的æ交分离"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1145
msgid "set upstream info for new branch"
msgstr "为新的分支设置上游信æ¯"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1147
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1147
msgid "new unparented branch"
msgstr "新的没有父æ交的分支"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1148
msgid "checkout our version for unmerged files"
msgstr "对尚未åˆå¹¶çš„文件检出我们的版本"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1150
msgid "checkout their version for unmerged files"
msgstr "对尚未åˆå¹¶çš„文件检出他们的版本"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1152
msgid "force checkout (throw away local modifications)"
msgstr "强制检出(丢弃本地修改)"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1153
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支执行三方åˆå¹¶"
-#: builtin/checkout.c:1151 builtin/merge.c:230
+#: builtin/checkout.c:1154 builtin/merge.c:231
msgid "update ignored files (default)"
msgstr "更新忽略的文件(默认)"
-#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
+#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
msgid "style"
msgstr "风格"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1156
msgid "conflict style (merge or diff3)"
msgstr "冲çªè¾“出风格(merge 或 diff3)"
-#: builtin/checkout.c:1156
+#: builtin/checkout.c:1159
msgid "do not limit pathspecs to sparse entries only"
msgstr "对路径ä¸åšç¨€ç–检出的é™åˆ¶"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1161
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "二次猜测'git checkout <无此分支>'"
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1163
msgid "do not check if another worktree is holding the given ref"
msgstr "ä¸æ£€æŸ¥æŒ‡å®šçš„引用是å¦è¢«å…¶ä»–工作区所å ç”¨"
-#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
-#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
+#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117
+#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "强制显示进度报告"
-#: builtin/checkout.c:1192
+#: builtin/checkout.c:1195
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-bã€-B å’Œ --orphan 是互斥的"
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1212
msgid "--track needs a branch name"
msgstr "--track 需è¦ä¸€ä¸ªåˆ†æ”¯å"
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1217
msgid "Missing branch name; try -b"
msgstr "缺少分支åï¼›å°è¯• -b"
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1253
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1257
+#: builtin/checkout.c:1260
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4825,12 +5196,12 @@ msgstr ""
"ä¸èƒ½åŒæ—¶æ›´æ–°è·¯å¾„并切æ¢åˆ°åˆ†æ”¯'%s'。\n"
"您是想è¦æ£€å‡º '%s' 但其未能解æžä¸ºæ交么?"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1265
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout:--detach ä¸èƒ½æŽ¥æ”¶è·¯å¾„å‚æ•° '%s'"
-#: builtin/checkout.c:1266
+#: builtin/checkout.c:1269
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4982,7 +5353,7 @@ msgid "remove whole directories"
msgstr "删除整个目录"
#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
+#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
msgid "pattern"
msgstr "模å¼"
@@ -5024,7 +5395,7 @@ msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
msgid "don't create a checkout"
msgstr "ä¸åˆ›å»ºä¸€ä¸ªæ£€å‡º"
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
msgid "create a bare repository"
msgstr "创建一个纯仓库"
@@ -5052,16 +5423,16 @@ msgstr "在克隆时åˆå§‹åŒ–å­æ¨¡ç»„"
msgid "number of submodules cloned in parallel"
msgstr "并å‘克隆的å­æ¨¡ç»„çš„æ•°é‡"
-#: builtin/clone.c:80 builtin/init-db.c:470
+#: builtin/clone.c:80 builtin/init-db.c:473
msgid "template-directory"
msgstr "模æ¿ç›®å½•"
-#: builtin/clone.c:81 builtin/init-db.c:471
+#: builtin/clone.c:81 builtin/init-db.c:474
msgid "directory from which templates will be used"
msgstr "模æ¿ç›®å½•å°†è¢«ä½¿ç”¨"
-#: builtin/clone.c:83 builtin/submodule--helper.c:498
-#: builtin/submodule--helper.c:777
+#: builtin/clone.c:83 builtin/submodule--helper.c:495
+#: builtin/submodule--helper.c:833
msgid "reference repository"
msgstr "å‚考仓库"
@@ -5085,7 +5456,7 @@ msgstr "检出 <分支> 而ä¸æ˜¯è¿œç¨‹ HEAD"
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
-#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667
+#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667
#: builtin/pull.c:201
msgid "depth"
msgstr "深度"
@@ -5102,11 +5473,11 @@ msgstr "åªå…‹éš†ä¸€ä¸ªåˆ†æ”¯ã€HEAD 或 --branch"
msgid "any cloned submodules will be shallow"
msgstr "å­æ¨¡ç»„将以浅下载模å¼å…‹éš†"
-#: builtin/clone.c:98 builtin/init-db.c:479
+#: builtin/clone.c:98 builtin/init-db.c:482
msgid "gitdir"
msgstr "git目录"
-#: builtin/clone.c:99 builtin/init-db.c:480
+#: builtin/clone.c:99 builtin/init-db.c:483
msgid "separate git dir from working tree"
msgstr "git目录和工作区分离"
@@ -5118,11 +5489,11 @@ msgstr "key=value"
msgid "set config inside the new repository"
msgstr "在新仓库中设置é…置信æ¯"
-#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
msgid "use IPv4 addresses only"
msgstr "åªä½¿ç”¨ IPv4 地å€"
-#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
msgid "use IPv6 addresses only"
msgstr "åªä½¿ç”¨ IPv6 地å€"
@@ -5154,6 +5525,11 @@ msgstr "å‚考仓库 '%s' 是一个浅克隆"
msgid "reference repository '%s' is grafted"
msgstr "å‚考仓库 '%s' 已被å«æŽ¥"
+#: builtin/clone.c:376
+#, c-format
+msgid "failed to open '%s'"
+msgstr "无法打开 '%s'"
+
#: builtin/clone.c:384
#, c-format
msgid "%s exists and is not a directory"
@@ -5174,7 +5550,7 @@ msgstr "无法创建链接 '%s'"
msgid "failed to copy file to '%s'"
msgstr "无法拷è´æ–‡ä»¶è‡³ '%s'"
-#: builtin/clone.c:449 builtin/clone.c:633
+#: builtin/clone.c:449
#, c-format
msgid "done.\n"
msgstr "完æˆã€‚\n"
@@ -5194,12 +5570,7 @@ msgstr ""
msgid "Could not find remote branch %s to clone."
msgstr "ä¸èƒ½å‘现è¦å…‹éš†çš„远程分支 %s。"
-#: builtin/clone.c:628
-#, c-format
-msgid "Checking connectivity... "
-msgstr "检查连接... "
-
-#: builtin/clone.c:631
+#: builtin/clone.c:633
msgid "remote did not send all necessary objects"
msgstr "远程没有å‘é€æ‰€æœ‰å¿…须的对象"
@@ -5216,99 +5587,99 @@ msgstr "远程 HEAD 指å‘一个ä¸å­˜åœ¨çš„引用,无法检出。\n"
msgid "unable to checkout working tree"
msgstr "ä¸èƒ½æ£€å‡ºå·¥ä½œåŒº"
-#: builtin/clone.c:767
+#: builtin/clone.c:766
msgid "unable to write parameters to config file"
msgstr "无法将å‚数写入é…置文件"
-#: builtin/clone.c:830
+#: builtin/clone.c:829
msgid "cannot repack to clean up"
msgstr "无法执行 repack æ¥æ¸…ç†"
-#: builtin/clone.c:832
+#: builtin/clone.c:831
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:864 builtin/receive-pack.c:1731
+#: builtin/clone.c:863 builtin/receive-pack.c:1855
msgid "Too many arguments."
msgstr "太多å‚数。"
-#: builtin/clone.c:868
+#: builtin/clone.c:867
msgid "You must specify a repository to clone."
msgstr "您必须指定一个仓库æ¥å…‹éš†ã€‚"
-#: builtin/clone.c:879
+#: builtin/clone.c:878
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare å’Œ --origin %s 选项ä¸å…¼å®¹ã€‚"
-#: builtin/clone.c:882
+#: builtin/clone.c:881
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare å’Œ --separate-git-dir 选项ä¸å…¼å®¹ã€‚"
-#: builtin/clone.c:895
+#: builtin/clone.c:894
#, c-format
msgid "repository '%s' does not exist"
msgstr "仓库 '%s' ä¸å­˜åœ¨"
-#: builtin/clone.c:901 builtin/fetch.c:1174
+#: builtin/clone.c:900 builtin/fetch.c:1293
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s ä¸æ˜¯ä¸€ä¸ªæ­£æ•°"
-#: builtin/clone.c:911
+#: builtin/clone.c:910
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' å·²ç»å­˜åœ¨ï¼Œå¹¶ä¸”ä¸æ˜¯ä¸€ä¸ªç©ºç›®å½•ã€‚"
-#: builtin/clone.c:921
+#: builtin/clone.c:920
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' å·²ç»å­˜åœ¨ã€‚"
-#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
-#: builtin/worktree.c:220 builtin/worktree.c:247
+#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
+#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "ä¸èƒ½ä¸º '%s' 创建先导目录"
-#: builtin/clone.c:939
+#: builtin/clone.c:938
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "ä¸èƒ½åˆ›å»ºå·¥ä½œåŒºç›®å½• '%s'"
-#: builtin/clone.c:957
+#: builtin/clone.c:956
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到纯仓库 '%s'...\n"
-#: builtin/clone.c:959
+#: builtin/clone.c:958
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:998
+#: builtin/clone.c:997
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆被忽略,改为 file:// å议试试。"
-#: builtin/clone.c:1001
+#: builtin/clone.c:1000
msgid "source repository is shallow, ignoring --local"
msgstr "æºä»“库是浅克隆,忽略 --local"
-#: builtin/clone.c:1006
+#: builtin/clone.c:1005
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:1010
+#: builtin/clone.c:1009
#, c-format
msgid "Don't know how to clone %s"
msgstr "ä¸çŸ¥é“如何克隆 %s"
-#: builtin/clone.c:1059 builtin/clone.c:1067
+#: builtin/clone.c:1058 builtin/clone.c:1066
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未å‘现"
-#: builtin/clone.c:1070
+#: builtin/clone.c:1069
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空仓库。"
@@ -5442,103 +5813,103 @@ msgstr ""
"然åŽæ‰§è¡Œ \"git cherry-pick --continue\" 继续对其余æ交执行拣选\n"
"æ“作。\n"
-#: builtin/commit.c:307
+#: builtin/commit.c:308
msgid "failed to unpack HEAD tree object"
msgstr "无法解包 HEAD 树对象"
-#: builtin/commit.c:348
+#: builtin/commit.c:349
msgid "unable to create temporary index"
msgstr "ä¸èƒ½åˆ›å»ºä¸´æ—¶ç´¢å¼•"
-#: builtin/commit.c:354
+#: builtin/commit.c:355
msgid "interactive add failed"
msgstr "交互å¼æ·»åŠ å¤±è´¥"
-#: builtin/commit.c:367
+#: builtin/commit.c:368
msgid "unable to update temporary index"
msgstr "无法更新临时索引"
-#: builtin/commit.c:369
+#: builtin/commit.c:370
msgid "Failed to update main cache tree"
msgstr "ä¸èƒ½æ›´æ–°æ ‘的主缓存"
-#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
+#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
msgid "unable to write new_index file"
msgstr "无法写 new_index 文件"
-#: builtin/commit.c:447
+#: builtin/commit.c:448
msgid "cannot do a partial commit during a merge."
msgstr "在åˆå¹¶è¿‡ç¨‹ä¸­ä¸èƒ½åšéƒ¨åˆ†æ交。"
-#: builtin/commit.c:449
+#: builtin/commit.c:450
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在拣选过程中ä¸èƒ½åšéƒ¨åˆ†æ交。"
-#: builtin/commit.c:458
+#: builtin/commit.c:459
msgid "cannot read the index"
msgstr "无法读å–索引"
-#: builtin/commit.c:477
+#: builtin/commit.c:478
msgid "unable to write temporary index file"
msgstr "无法写临时索引文件"
-#: builtin/commit.c:582
+#: builtin/commit.c:583
#, c-format
msgid "commit '%s' lacks author header"
msgstr "æ交 '%s' 缺少作者信æ¯"
-#: builtin/commit.c:584
+#: builtin/commit.c:585
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "æ交 '%s' 有éžæ³•çš„作者信æ¯"
-#: builtin/commit.c:603
+#: builtin/commit.c:604
msgid "malformed --author parameter"
msgstr "éžæ³•çš„ --author å‚æ•°"
-#: builtin/commit.c:611
+#: builtin/commit.c:612
#, c-format
msgid "invalid date format: %s"
msgstr "无效的日期格å¼ï¼š%s"
-#: builtin/commit.c:655
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "无法选择一个未被当å‰æ交说明使用的注释字符"
-#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
+#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
#, c-format
msgid "could not lookup commit %s"
msgstr "ä¸èƒ½æŸ¥è¯¢æ交 %s"
-#: builtin/commit.c:704 builtin/shortlog.c:285
+#: builtin/commit.c:705 builtin/shortlog.c:286
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(正从标准输入中读å–日志信æ¯ï¼‰\n"
-#: builtin/commit.c:706
+#: builtin/commit.c:707
msgid "could not read log from standard input"
msgstr "ä¸èƒ½ä»Žæ ‡å‡†è¾“入中读å–日志信æ¯"
-#: builtin/commit.c:710
+#: builtin/commit.c:711
#, c-format
msgid "could not read log file '%s'"
msgstr "ä¸èƒ½è¯»å–日志文件 '%s'"
-#: builtin/commit.c:737 builtin/commit.c:745
+#: builtin/commit.c:738 builtin/commit.c:746
msgid "could not read SQUASH_MSG"
msgstr "ä¸èƒ½è¯»å– SQUASH_MSG"
-#: builtin/commit.c:742
+#: builtin/commit.c:743
msgid "could not read MERGE_MSG"
msgstr "ä¸èƒ½è¯»å– MERGE_MSG"
-#: builtin/commit.c:796
+#: builtin/commit.c:797
msgid "could not write commit template"
msgstr "ä¸èƒ½å†™æ交模版"
-#: builtin/commit.c:814
+#: builtin/commit.c:815
#, c-format
msgid ""
"\n"
@@ -5552,7 +5923,7 @@ msgstr ""
"\t%s\n"
"然åŽé‡è¯•ã€‚\n"
-#: builtin/commit.c:819
+#: builtin/commit.c:820
#, c-format
msgid ""
"\n"
@@ -5566,7 +5937,7 @@ msgstr ""
"\t%s\n"
"然åŽé‡è¯•ã€‚\n"
-#: builtin/commit.c:832
+#: builtin/commit.c:833
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5575,7 +5946,7 @@ msgstr ""
"请为您的å˜æ›´è¾“å…¥æ交说明。以 '%c' 开始的行将被忽略,而一个空的æ交\n"
"说明将会终止æ交。\n"
-#: builtin/commit.c:839
+#: builtin/commit.c:840
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5586,346 +5957,346 @@ msgstr ""
"也å¯ä»¥åˆ é™¤å®ƒä»¬ã€‚一个空的æ交说明将会终止æ交。\n"
# 译者:为ä¿è¯åœ¨è¾“出中对é½ï¼Œæ³¨æ„调整å¥ä¸­ç©ºæ ¼ï¼
-#: builtin/commit.c:859
+#: builtin/commit.c:860
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s作者: %.*s <%.*s>"
# 译者:为ä¿è¯åœ¨è¾“出中对é½ï¼Œæ³¨æ„调整å¥ä¸­ç©ºæ ¼ï¼
-#: builtin/commit.c:867
+#: builtin/commit.c:868
#, c-format
msgid "%sDate: %s"
msgstr "%s日期: %s"
# 译者:为ä¿è¯åœ¨è¾“出中对é½ï¼Œæ³¨æ„调整å¥ä¸­ç©ºæ ¼ï¼
-#: builtin/commit.c:874
+#: builtin/commit.c:875
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sæ交者:%.*s <%.*s>"
-#: builtin/commit.c:892
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "无法读å–索引"
-#: builtin/commit.c:949
+#: builtin/commit.c:950
msgid "Error building trees"
msgstr "无法创建树对象"
-#: builtin/commit.c:964 builtin/tag.c:266
+#: builtin/commit.c:965 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或 -F 选项æä¾›æ交说明。\n"
-#: builtin/commit.c:1066
+#: builtin/commit.c:1067
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author '%s' ä¸æ˜¯ 'Name <email>' æ ¼å¼ï¼Œä¸”未能在现有作者中找到匹é…"
-#: builtin/commit.c:1081 builtin/commit.c:1321
+#: builtin/commit.c:1082 builtin/commit.c:1322
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "无效的未追踪文件å‚æ•° '%s'"
-#: builtin/commit.c:1118
+#: builtin/commit.c:1119
msgid "--long and -z are incompatible"
msgstr "--long å’Œ -z 选项ä¸å…¼å®¹"
-#: builtin/commit.c:1148
+#: builtin/commit.c:1149
msgid "Using both --reset-author and --author does not make sense"
msgstr "åŒæ—¶ä½¿ç”¨ --reset-author å’Œ --author 没有æ„义"
-#: builtin/commit.c:1157
+#: builtin/commit.c:1158
msgid "You have nothing to amend."
msgstr "您没有å¯ä¿®è¡¥çš„æ交。"
-#: builtin/commit.c:1160
+#: builtin/commit.c:1161
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正处于一个åˆå¹¶è¿‡ç¨‹ä¸­ -- 无法修补æ交。"
-#: builtin/commit.c:1162
+#: builtin/commit.c:1163
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正处于一个拣选过程中 -- 无法修补æ交。"
-#: builtin/commit.c:1165
+#: builtin/commit.c:1166
msgid "Options --squash and --fixup cannot be used together"
msgstr "选项 --squash å’Œ --fixup ä¸èƒ½åŒæ—¶ä½¿ç”¨"
-#: builtin/commit.c:1175
+#: builtin/commit.c:1176
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "åªèƒ½ç”¨ä¸€ä¸ª -c/-C/-F/--fixup 选项。"
-#: builtin/commit.c:1177
+#: builtin/commit.c:1178
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "选项 -m ä¸èƒ½å’Œ -c/-C/-F/--fixup åŒæ—¶ä½¿ç”¨ã€‚"
-#: builtin/commit.c:1185
+#: builtin/commit.c:1186
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author åªèƒ½å’Œ -Cã€-c 或 --amend åŒæ—¶ä½¿ç”¨ã€‚"
-#: builtin/commit.c:1202
+#: builtin/commit.c:1203
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "åªèƒ½ç”¨ä¸€ä¸ª --include/--only/--all/--interactive/--patch 选项。"
-#: builtin/commit.c:1204
+#: builtin/commit.c:1205
msgid "No paths with --include/--only does not make sense."
msgstr "å‚æ•° --include/--only ä¸è·Ÿè·¯å¾„没有æ„义。"
-#: builtin/commit.c:1206
+#: builtin/commit.c:1207
msgid "Clever... amending the last one with dirty index."
msgstr "èªæ˜Ž... 用è„索引修补最åŽä¸€ä¸ªæ交。"
-#: builtin/commit.c:1208
+#: builtin/commit.c:1209
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
-#: builtin/commit.c:1220 builtin/tag.c:474
+#: builtin/commit.c:1221 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清ç†æ¨¡å¼ %s"
-#: builtin/commit.c:1225
+#: builtin/commit.c:1226
msgid "Paths with -a does not make sense."
msgstr "路径和 -a 选项åŒæ—¶ä½¿ç”¨æ²¡æœ‰æ„义。"
-#: builtin/commit.c:1335 builtin/commit.c:1621
+#: builtin/commit.c:1336 builtin/commit.c:1622
msgid "show status concisely"
msgstr "以简æ´çš„æ ¼å¼æ˜¾ç¤ºçŠ¶æ€"
-#: builtin/commit.c:1337 builtin/commit.c:1623
+#: builtin/commit.c:1338 builtin/commit.c:1624
msgid "show branch information"
msgstr "显示分支信æ¯"
-#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
-#: builtin/worktree.c:437
+#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
+#: builtin/worktree.c:440
msgid "machine-readable output"
msgstr "机器å¯è¯»çš„输出"
-#: builtin/commit.c:1342 builtin/commit.c:1627
+#: builtin/commit.c:1343 builtin/commit.c:1628
msgid "show status in long format (default)"
msgstr "以长格å¼æ˜¾ç¤ºçŠ¶æ€ï¼ˆé»˜è®¤ï¼‰"
-#: builtin/commit.c:1345 builtin/commit.c:1630
+#: builtin/commit.c:1346 builtin/commit.c:1631
msgid "terminate entries with NUL"
msgstr "æ¡ç›®ä»¥ NUL 字符结尾"
-#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
+#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "模å¼"
-#: builtin/commit.c:1348 builtin/commit.c:1633
+#: builtin/commit.c:1349 builtin/commit.c:1634
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "显示未跟踪的文件,“模å¼â€çš„å¯é€‰å‚数:allã€normalã€no。(默认:all)"
-#: builtin/commit.c:1351
+#: builtin/commit.c:1352
msgid "show ignored files"
msgstr "显示忽略的文件"
-#: builtin/commit.c:1352 parse-options.h:155
+#: builtin/commit.c:1353 parse-options.h:155
msgid "when"
msgstr "何时"
-#: builtin/commit.c:1353
+#: builtin/commit.c:1354
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略å­æ¨¡ç»„的更改,“何时â€çš„å¯é€‰å‚数:allã€dirtyã€untracked。(默认:all)"
-#: builtin/commit.c:1355
+#: builtin/commit.c:1356
msgid "list untracked files in columns"
msgstr "以列的方å¼æ˜¾ç¤ºæœªè·Ÿè¸ªçš„文件"
-#: builtin/commit.c:1441
+#: builtin/commit.c:1442
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的æ交"
-#: builtin/commit.c:1443
+#: builtin/commit.c:1444
msgid "could not parse newly created commit"
msgstr "ä¸èƒ½è§£æžæ–°åˆ›å»ºçš„æ交"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1489
msgid "detached HEAD"
msgstr "分离头指针"
# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
-#: builtin/commit.c:1491
+#: builtin/commit.c:1492
msgid " (root-commit)"
msgstr "(根æ交)"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1592
msgid "suppress summary after successful commit"
msgstr "æ交æˆåŠŸåŽä¸æ˜¾ç¤ºæ¦‚è¿°ä¿¡æ¯"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1593
msgid "show diff in commit message template"
msgstr "在æ交说明模æ¿é‡Œæ˜¾ç¤ºå·®å¼‚"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1595
msgid "Commit message options"
msgstr "æ交说明选项"
-#: builtin/commit.c:1595 builtin/tag.c:351
+#: builtin/commit.c:1596 builtin/tag.c:351
msgid "read message from file"
msgstr "从文件中读å–æ交说明"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1597
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1597
msgid "override author for commit"
msgstr "æ交时覆盖作者"
-#: builtin/commit.c:1597 builtin/gc.c:326
+#: builtin/commit.c:1598 builtin/gc.c:326
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1598
msgid "override date for commit"
msgstr "æ交时覆盖日期"
-#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
-#: builtin/notes.c:558 builtin/tag.c:349
+#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
+#: builtin/notes.c:559 builtin/tag.c:349
msgid "message"
msgstr "说明"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1599
msgid "commit message"
msgstr "æ交说明"
-#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
-#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
+#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
msgid "commit"
msgstr "æ交"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1600
msgid "reuse and edit message from specified commit"
msgstr "é‡ç”¨å¹¶ç¼–辑指定æ交的æ交说明"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1601
msgid "reuse message from specified commit"
msgstr "é‡ç”¨æŒ‡å®šæ交的æ交说明"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1602
msgid "use autosquash formatted message to fixup specified commit"
msgstr "使用 autosquash æ ¼å¼çš„æ交说明用以修正指定的æ交"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1603
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用 autosquash æ ¼å¼çš„æ交说明用以压缩至指定的æ交"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1604
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该æ交的作者改为我(和 -C/-c/--amend å‚数共用)"
-#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
+#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "添加 Signed-off-by: ç­¾å"
-#: builtin/commit.c:1605
+#: builtin/commit.c:1606
msgid "use specified template file"
msgstr "使用指定的模æ¿æ–‡ä»¶"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1607
msgid "force edit of commit"
msgstr "强制编辑æ交"
# 译者:å¯é€‰å€¼ï¼Œä¸èƒ½ç¿»è¯‘(或是原文中笔误,应为 mode)
-#: builtin/commit.c:1607
+#: builtin/commit.c:1608
msgid "default"
msgstr "default"
-#: builtin/commit.c:1607 builtin/tag.c:354
+#: builtin/commit.c:1608 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "设置如何删除æ交说明里的空格和#注释"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1609
msgid "include status in commit message template"
msgstr "在æ交说明模æ¿é‡ŒåŒ…å«çŠ¶æ€ä¿¡æ¯"
-#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
+#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "GPG æ交签å"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1614
msgid "Commit contents options"
msgstr "æ交内容选项"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1615
msgid "commit all changed files"
msgstr "æ交所有改动的文件"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1616
msgid "add specified files to index for commit"
msgstr "添加指定的文件到索引区等待æ交"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1617
msgid "interactively add files"
msgstr "交互å¼æ·»åŠ æ–‡ä»¶"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1618
msgid "interactively add changes"
msgstr "交互å¼æ·»åŠ å˜æ›´"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1619
msgid "commit only specified files"
msgstr "åªæ交指定的文件"
-#: builtin/commit.c:1619
-msgid "bypass pre-commit hook"
-msgstr "绕过 pre-commit é’©å­"
-
#: builtin/commit.c:1620
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "绕过 pre-commit å’Œ commit-msg é’©å­"
+
+#: builtin/commit.c:1621
msgid "show what would be committed"
msgstr "显示将è¦æ交的内容"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1632
msgid "amend previous commit"
msgstr "修改先å‰çš„æ交"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1633
msgid "bypass post-rewrite hook"
msgstr "绕过 post-rewrite é’©å­"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1638
msgid "ok to record an empty change"
msgstr "å…许一个空æ交"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
msgid "ok to record a change with an empty message"
msgstr "å…许空的æ交说明"
-#: builtin/commit.c:1668
+#: builtin/commit.c:1669
msgid "could not parse HEAD commit"
msgstr "ä¸èƒ½è§£æž HEAD æ交"
-#: builtin/commit.c:1718
+#: builtin/commit.c:1719
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "æŸåçš„ MERGE_HEAD 文件(%s)"
-#: builtin/commit.c:1725
+#: builtin/commit.c:1726
msgid "could not read MERGE_MODE"
msgstr "ä¸èƒ½è¯»å– MERGE_MODE"
-#: builtin/commit.c:1744
+#: builtin/commit.c:1745
#, c-format
msgid "could not read commit message: %s"
msgstr "ä¸èƒ½è¯»å–æ交说明:%s"
-#: builtin/commit.c:1755
+#: builtin/commit.c:1756
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "终止æ交;您未更改æ¥è‡ªæ¨¡ç‰ˆçš„æ交说明。\n"
-#: builtin/commit.c:1760
+#: builtin/commit.c:1761
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "终止æ交因为æ交说明为空。\n"
-#: builtin/commit.c:1808
+#: builtin/commit.c:1809
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5938,139 +6309,139 @@ msgstr ""
msgid "git config [<options>]"
msgstr "git config [<选项>]"
-#: builtin/config.c:56
+#: builtin/config.c:55
msgid "Config file location"
msgstr "é…置文件ä½ç½®"
-#: builtin/config.c:57
+#: builtin/config.c:56
msgid "use global config file"
msgstr "使用全局é…置文件"
-#: builtin/config.c:58
+#: builtin/config.c:57
msgid "use system config file"
msgstr "使用系统级é…置文件"
-#: builtin/config.c:59
+#: builtin/config.c:58
msgid "use repository config file"
msgstr "使用仓库级é…置文件"
-#: builtin/config.c:60
+#: builtin/config.c:59
msgid "use given config file"
msgstr "使用指定的é…置文件"
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "blob-id"
msgstr "æ•°æ®å¯¹è±¡ ID"
-#: builtin/config.c:61
+#: builtin/config.c:60
msgid "read config from given blob object"
msgstr "从给定的数æ®å¯¹è±¡è¯»å–é…ç½®"
-#: builtin/config.c:62
+#: builtin/config.c:61
msgid "Action"
msgstr "æ“作"
-#: builtin/config.c:63
+#: builtin/config.c:62
msgid "get value: name [value-regex]"
msgstr "获å–值:name [value-regex]"
-#: builtin/config.c:64
+#: builtin/config.c:63
msgid "get all values: key [value-regex]"
msgstr "获得所有的值:key [value-regex]"
-#: builtin/config.c:65
+#: builtin/config.c:64
msgid "get values for regexp: name-regex [value-regex]"
msgstr "æ ¹æ®æ­£åˆ™è¡¨è¾¾å¼èŽ·å¾—值:name-regex [value-regex]"
-#: builtin/config.c:66
+#: builtin/config.c:65
msgid "get value specific for the URL: section[.var] URL"
msgstr "获得 URL å–值:section[.var] URL"
-#: builtin/config.c:67
+#: builtin/config.c:66
msgid "replace all matching variables: name value [value_regex]"
msgstr "替æ¢æ‰€æœ‰åŒ¹é…çš„å˜é‡ï¼šname value [value_regex]"
-#: builtin/config.c:68
+#: builtin/config.c:67
msgid "add a new variable: name value"
msgstr "添加一个新的å˜é‡ï¼šname value"
-#: builtin/config.c:69
+#: builtin/config.c:68
msgid "remove a variable: name [value-regex]"
msgstr "删除一个å˜é‡ï¼šname [value-regex]"
-#: builtin/config.c:70
+#: builtin/config.c:69
msgid "remove all matches: name [value-regex]"
msgstr "删除所有匹é…项:name [value-regex]"
-#: builtin/config.c:71
+#: builtin/config.c:70
msgid "rename section: old-name new-name"
msgstr "é‡å‘½åå°èŠ‚:old-name new-name"
-#: builtin/config.c:72
+#: builtin/config.c:71
msgid "remove a section: name"
msgstr "删除一个å°èŠ‚:name"
-#: builtin/config.c:73
+#: builtin/config.c:72
msgid "list all"
msgstr "列出所有"
-#: builtin/config.c:74
+#: builtin/config.c:73
msgid "open an editor"
msgstr "打开一个编辑器"
-#: builtin/config.c:75
+#: builtin/config.c:74
msgid "find the color configured: slot [default]"
msgstr "获得é…置的颜色:é…ç½® [默认]"
-#: builtin/config.c:76
+#: builtin/config.c:75
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "获得颜色设置:é…ç½® [stdout-is-tty]"
-#: builtin/config.c:77
+#: builtin/config.c:76
msgid "Type"
msgstr "类型"
-#: builtin/config.c:78
+#: builtin/config.c:77
msgid "value is \"true\" or \"false\""
msgstr "值是 \"true\" 或 \"false\""
-#: builtin/config.c:79
+#: builtin/config.c:78
msgid "value is decimal number"
msgstr "值是å进制数"
-#: builtin/config.c:80
+#: builtin/config.c:79
msgid "value is --bool or --int"
msgstr "值是 --bool or --int"
-#: builtin/config.c:81
+#: builtin/config.c:80
msgid "value is a path (file or directory name)"
msgstr "值是一个路径(文件或目录å)"
-#: builtin/config.c:82
+#: builtin/config.c:81
msgid "Other"
msgstr "其它"
-#: builtin/config.c:83
+#: builtin/config.c:82
msgid "terminate values with NUL byte"
msgstr "终止值是 NUL 字节"
-#: builtin/config.c:84
+#: builtin/config.c:83
msgid "show variable names only"
msgstr "åªæ˜¾ç¤ºå˜é‡å"
-#: builtin/config.c:85
+#: builtin/config.c:84
msgid "respect include directives on lookup"
msgstr "查询时å‚ç…§ include 指令递归查找"
-#: builtin/config.c:86
+#: builtin/config.c:85
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "显示é…置的æ¥æºï¼ˆæ–‡ä»¶ã€æ ‡å‡†è¾“å…¥ã€æ•°æ®å¯¹è±¡ï¼Œæˆ–命令行)"
-#: builtin/config.c:328
+#: builtin/config.c:327
msgid "unable to parse default color value"
msgstr "ä¸èƒ½è§£æžé»˜è®¤é¢œè‰²å€¼"
-#: builtin/config.c:472
+#: builtin/config.c:471
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -6085,7 +6456,7 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:614
+#: builtin/config.c:613
#, c-format
msgid "cannot create configuration file %s"
msgstr "ä¸èƒ½åˆ›å»ºé…置文件 %s"
@@ -6121,7 +6492,7 @@ msgstr "附注标签 %s 没有嵌入å称"
msgid "tag '%s' is really '%s' here"
msgstr "标签 '%s' 的确是在 '%s'"
-#: builtin/describe.c:250 builtin/log.c:465
+#: builtin/describe.c:250 builtin/log.c:480
#, c-format
msgid "Not a valid object name %s"
msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„对象å %s"
@@ -6319,178 +6690,178 @@ msgstr "对导出的引用应用引用规格"
msgid "anonymize output"
msgstr "匿å输出"
-#: builtin/fetch.c:20
+#: builtin/fetch.c:21
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/fetch.c:21
+#: builtin/fetch.c:22
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<选项>] <组>"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<选项>]"
-#: builtin/fetch.c:92 builtin/pull.c:174
+#: builtin/fetch.c:93 builtin/pull.c:174
msgid "fetch from all remotes"
msgstr "从所有的远程抓å–"
-#: builtin/fetch.c:94 builtin/pull.c:177
+#: builtin/fetch.c:95 builtin/pull.c:177
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而ä¸æ˜¯è¦†ç›–它"
-#: builtin/fetch.c:96 builtin/pull.c:180
+#: builtin/fetch.c:97 builtin/pull.c:180
msgid "path to upload pack on remote end"
msgstr "上传包到远程的路径"
-#: builtin/fetch.c:97 builtin/pull.c:182
+#: builtin/fetch.c:98 builtin/pull.c:182
msgid "force overwrite of local branch"
msgstr "强制覆盖本地分支"
-#: builtin/fetch.c:99
+#: builtin/fetch.c:100
msgid "fetch from multiple remotes"
msgstr "从多个远程抓å–"
-#: builtin/fetch.c:101 builtin/pull.c:184
+#: builtin/fetch.c:102 builtin/pull.c:184
msgid "fetch all tags and associated objects"
msgstr "抓å–所有的标签和关è”对象"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:104
msgid "do not fetch all tags (--no-tags)"
msgstr "ä¸æŠ“å–任何标签(--no-tags)"
-#: builtin/fetch.c:105
+#: builtin/fetch.c:106
msgid "number of submodules fetched in parallel"
msgstr "å­æ¨¡ç»„获å–的并å‘æ•°"
-#: builtin/fetch.c:107 builtin/pull.c:187
+#: builtin/fetch.c:108 builtin/pull.c:187
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除远程已ç»ä¸å­˜åœ¨çš„分支的跟踪分支"
# 译者:å¯é€‰å€¼ï¼Œä¸èƒ½ç¿»è¯‘
-#: builtin/fetch.c:108 builtin/pull.c:190
+#: builtin/fetch.c:109 builtin/pull.c:190
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:109 builtin/pull.c:191
+#: builtin/fetch.c:110 builtin/pull.c:191
msgid "control recursive fetching of submodules"
msgstr "控制å­æ¨¡ç»„的递归抓å–"
-#: builtin/fetch.c:113 builtin/pull.c:199
+#: builtin/fetch.c:114 builtin/pull.c:199
msgid "keep downloaded pack"
msgstr "ä¿æŒä¸‹è½½åŒ…"
-#: builtin/fetch.c:115
+#: builtin/fetch.c:116
msgid "allow updating of HEAD ref"
msgstr "å…许更新 HEAD 引用"
-#: builtin/fetch.c:118 builtin/pull.c:202
+#: builtin/fetch.c:119 builtin/pull.c:202
msgid "deepen history of shallow clone"
msgstr "深化浅克隆的历å²"
-#: builtin/fetch.c:120 builtin/pull.c:205
+#: builtin/fetch.c:121 builtin/pull.c:205
msgid "convert to a complete repository"
msgstr "转æ¢ä¸ºä¸€ä¸ªå®Œæ•´çš„仓库"
-#: builtin/fetch.c:122 builtin/log.c:1399
+#: builtin/fetch.c:123 builtin/log.c:1426
msgid "dir"
msgstr "目录"
-#: builtin/fetch.c:123
+#: builtin/fetch.c:124
msgid "prepend this to submodule path output"
msgstr "在å­æ¨¡ç»„路径输出的å‰é¢åŠ ä¸Šæ­¤ç›®å½•"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:127
msgid "default mode for recursion"
msgstr "递归的默认模å¼"
-#: builtin/fetch.c:128 builtin/pull.c:208
+#: builtin/fetch.c:129 builtin/pull.c:208
msgid "accept refs that update .git/shallow"
msgstr "接å—æ›´æ–° .git/shallow 的引用"
-#: builtin/fetch.c:129 builtin/pull.c:210
+#: builtin/fetch.c:130 builtin/pull.c:210
msgid "refmap"
msgstr "引用映射"
-#: builtin/fetch.c:130 builtin/pull.c:211
+#: builtin/fetch.c:131 builtin/pull.c:211
msgid "specify fetch refmap"
msgstr "指定获å–æ“作的引用映射"
-#: builtin/fetch.c:386
+#: builtin/fetch.c:387
msgid "Couldn't find remote ref HEAD"
msgstr "无法å‘现远程 HEAD 引用"
-#: builtin/fetch.c:466
+#: builtin/fetch.c:503
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "é…ç½®å˜é‡ fetch.output 包å«æ— æ•ˆå€¼ %s"
+
+#: builtin/fetch.c:592
#, c-format
msgid "object %s not found"
msgstr "对象 %s 未å‘现"
-#: builtin/fetch.c:471
+#: builtin/fetch.c:596
msgid "[up to date]"
msgstr "[最新]"
-#: builtin/fetch.c:485
-#, c-format
-msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
-msgstr "! %-*s %-*s -> %s (在当å‰åˆ†æ”¯ä¸‹ä¸èƒ½èŽ·å–)"
-
-#: builtin/fetch.c:486 builtin/fetch.c:574
+#: builtin/fetch.c:609 builtin/fetch.c:689
msgid "[rejected]"
msgstr "[已拒ç»]"
-#: builtin/fetch.c:497
+#: builtin/fetch.c:610
+msgid "can't fetch in current branch"
+msgstr "当å‰åˆ†æ”¯ä¸‹ä¸èƒ½æ‰§è¡ŒèŽ·å–æ“作"
+
+#: builtin/fetch.c:619
msgid "[tag update]"
msgstr "[标签更新]"
-# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
-msgid " (unable to update local ref)"
-msgstr " (ä¸èƒ½æ›´æ–°æœ¬åœ°å¼•ç”¨ï¼‰"
+#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
+#: builtin/fetch.c:684
+msgid "unable to update local ref"
+msgstr "ä¸èƒ½æ›´æ–°æœ¬åœ°å¼•ç”¨"
-#: builtin/fetch.c:517
+#: builtin/fetch.c:639
msgid "[new tag]"
msgstr "[新标签]"
-#: builtin/fetch.c:520
+#: builtin/fetch.c:642
msgid "[new branch]"
msgstr "[新分支]"
-#: builtin/fetch.c:523
+#: builtin/fetch.c:645
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:569
-msgid "unable to update local ref"
-msgstr "ä¸èƒ½æ›´æ–°æœ¬åœ°å¼•ç”¨"
-
-#: builtin/fetch.c:569
+#: builtin/fetch.c:684
msgid "forced update"
msgstr "强制更新"
-#: builtin/fetch.c:576
-msgid "(non-fast-forward)"
-msgstr "(éžå¿«è¿›å¼ï¼‰"
+#: builtin/fetch.c:689
+msgid "non-fast-forward"
+msgstr "éžå¿«è¿›"
-#: builtin/fetch.c:619
+#: builtin/fetch.c:733
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未å‘é€æ‰€æœ‰å¿…须的对象\n"
-#: builtin/fetch.c:637
+#: builtin/fetch.c:753
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "æ‹’ç» %s 因为浅克隆ä¸å…许被更新"
-#: builtin/fetch.c:724 builtin/fetch.c:816
+#: builtin/fetch.c:839 builtin/fetch.c:934
#, c-format
msgid "From %.*s\n"
msgstr "æ¥è‡ª %.*s\n"
-#: builtin/fetch.c:735
+#: builtin/fetch.c:850
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -6500,87 +6871,87 @@ msgstr ""
" 'git remote prune %s' æ¥åˆ é™¤æ—§çš„ã€æœ‰å†²çªçš„分支"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: builtin/fetch.c:787
+#: builtin/fetch.c:904
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s å°†æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼‰"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: builtin/fetch.c:788
+#: builtin/fetch.c:905
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s å·²æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼‰"
-#: builtin/fetch.c:820
+#: builtin/fetch.c:937
msgid "[deleted]"
msgstr "[已删除]"
-#: builtin/fetch.c:821 builtin/remote.c:1025
+#: builtin/fetch.c:938 builtin/remote.c:1020
msgid "(none)"
msgstr "(无)"
-#: builtin/fetch.c:841
+#: builtin/fetch.c:960
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "æ‹’ç»èŽ·å–到éžçº¯ä»“库的当å‰åˆ†æ”¯ %s"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:979
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
-#: builtin/fetch.c:863
+#: builtin/fetch.c:982
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1039
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "ä¸çŸ¥é“如何从 %s 获å–"
-#: builtin/fetch.c:1080
+#: builtin/fetch.c:1199
#, c-format
msgid "Fetching %s\n"
msgstr "æ­£åœ¨èŽ·å– %s\n"
-#: builtin/fetch.c:1082 builtin/remote.c:96
+#: builtin/fetch.c:1201 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "ä¸èƒ½èŽ·å– %s"
-#: builtin/fetch.c:1100
+#: builtin/fetch.c:1219
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr "未指定远程仓库。请通过一个 URL 或远程仓库å指定,用以获å–æ–°æ交。"
-#: builtin/fetch.c:1123
+#: builtin/fetch.c:1242
msgid "You need to specify a tag name."
msgstr "您需è¦æŒ‡å®šä¸€ä¸ªæ ‡ç­¾å称。"
-#: builtin/fetch.c:1165
+#: builtin/fetch.c:1284
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth å’Œ --unshallow ä¸èƒ½åŒæ—¶ä½¿ç”¨"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1286
msgid "--unshallow on a complete repository does not make sense"
msgstr "对于一个完整的仓库,å‚æ•° --unshallow 没有æ„义"
-#: builtin/fetch.c:1187
+#: builtin/fetch.c:1306
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all ä¸èƒ½å¸¦ä¸€ä¸ªä»“库å‚æ•°"
-#: builtin/fetch.c:1189
+#: builtin/fetch.c:1308
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用规格没有任何æ„义"
-#: builtin/fetch.c:1200
+#: builtin/fetch.c:1319
#, c-format
msgid "No such remote or remote group: %s"
msgstr "没有这样的远程或远程组:%s"
-#: builtin/fetch.c:1208
+#: builtin/fetch.c:1327
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "获å–组并指定引用规格没有æ„义"
@@ -6665,63 +7036,63 @@ msgstr "åªæ‰“å°æ²¡æœ‰åˆå¹¶çš„引用"
msgid "print only refs which contain the commit"
msgstr "åªæ‰“å°åŒ…å«è¯¥æ交的引用"
-#: builtin/fsck.c:156 builtin/prune.c:140
-msgid "Checking connectivity"
-msgstr "检查连接中"
-
-#: builtin/fsck.c:486
+#: builtin/fsck.c:519
msgid "Checking object directories"
msgstr "检查对象目录中"
-#: builtin/fsck.c:552
+#: builtin/fsck.c:588
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<选项>] [<对象>...]"
-#: builtin/fsck.c:558
+#: builtin/fsck.c:594
msgid "show unreachable objects"
msgstr "显示ä¸å¯è¾¾çš„对象"
-#: builtin/fsck.c:559
+#: builtin/fsck.c:595
msgid "show dangling objects"
msgstr "显示摇摆的对象"
-#: builtin/fsck.c:560
+#: builtin/fsck.c:596
msgid "report tags"
msgstr "报告标签"
-#: builtin/fsck.c:561
+#: builtin/fsck.c:597
msgid "report root nodes"
msgstr "报告根节点"
-#: builtin/fsck.c:562
+#: builtin/fsck.c:598
msgid "make index objects head nodes"
msgstr "将索引亦作为检查的头节点"
-#: builtin/fsck.c:563
+#: builtin/fsck.c:599
msgid "make reflogs head nodes (default)"
msgstr "将引用日志作为检查的头节点(默认)"
-#: builtin/fsck.c:564
+#: builtin/fsck.c:600
msgid "also consider packs and alternate objects"
msgstr "也考虑包和备用对象"
-#: builtin/fsck.c:565
+#: builtin/fsck.c:601
msgid "check only connectivity"
msgstr "仅检查连通性"
-#: builtin/fsck.c:566
+#: builtin/fsck.c:602
msgid "enable more strict checking"
msgstr "å¯ç”¨æ›´ä¸¥æ ¼çš„检查"
-#: builtin/fsck.c:568
+#: builtin/fsck.c:604
msgid "write dangling objects in .git/lost-found"
msgstr "将摇摆对象写入 .git/lost-found 中"
-#: builtin/fsck.c:569 builtin/prune.c:107
+#: builtin/fsck.c:605 builtin/prune.c:107
msgid "show progress"
msgstr "显示进度"
-#: builtin/fsck.c:630
+#: builtin/fsck.c:606
+msgid "show verbose names for reachable objects"
+msgstr "显示å¯è¾¾å¯¹è±¡çš„详细å称"
+
+#: builtin/fsck.c:671
msgid "Checking objects"
msgstr "检查对象中"
@@ -7007,7 +7378,7 @@ msgstr "å…许调用 grep(1)(本次构建忽略)"
msgid "no pattern given."
msgstr "未æ供模å¼åŒ¹é…。"
-#: builtin/grep.c:845 builtin/index-pack.c:1477
+#: builtin/grep.c:845 builtin/index-pack.c:1479
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的线程数无效(%d)"
@@ -7151,334 +7522,330 @@ msgstr "没有 man 查看器处ç†æ­¤è¯·æ±‚"
msgid "no info viewer handled the request"
msgstr "没有 info 查看器处ç†æ­¤è¯·æ±‚"
-#: builtin/help.c:408
+#: builtin/help.c:401
msgid "Defining attributes per path"
msgstr "定义路径的属性"
-#: builtin/help.c:409
+#: builtin/help.c:402
msgid "Everyday Git With 20 Commands Or So"
msgstr "æ¯ä¸€å¤© Git 常用的约 20 æ¡å‘½ä»¤"
-#: builtin/help.c:410
+#: builtin/help.c:403
msgid "A Git glossary"
msgstr "Git è¯æ±‡è¡¨"
-#: builtin/help.c:411
+#: builtin/help.c:404
msgid "Specifies intentionally untracked files to ignore"
msgstr "忽略指定的未跟踪文件"
-#: builtin/help.c:412
+#: builtin/help.c:405
msgid "Defining submodule properties"
msgstr "定义å­æ¨¡ç»„属性"
-#: builtin/help.c:413
+#: builtin/help.c:406
msgid "Specifying revisions and ranges for Git"
msgstr "指定 Git 的版本和版本范围"
-#: builtin/help.c:414
+#: builtin/help.c:407
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
-#: builtin/help.c:415
+#: builtin/help.c:408
msgid "An overview of recommended workflows with Git"
msgstr "Git 推è的工作æµæ¦‚览"
-#: builtin/help.c:427
+#: builtin/help.c:420
msgid "The common Git guides are:\n"
msgstr "最常用的 Git å‘导有:\n"
-#: builtin/help.c:448 builtin/help.c:465
+#: builtin/help.c:441 builtin/help.c:458
#, c-format
msgid "usage: %s%s"
msgstr "用法:%s%s"
-#: builtin/help.c:481
+#: builtin/help.c:474
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s' 是 `%s' 的别å"
-#: builtin/index-pack.c:152
+#: builtin/index-pack.c:153
#, c-format
msgid "unable to open %s"
msgstr "ä¸èƒ½æ‰“å¼€ %s"
-#: builtin/index-pack.c:202
+#: builtin/index-pack.c:203
#, c-format
msgid "object type mismatch at %s"
msgstr "%s 的对象类型ä¸åŒ¹é…"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:223
#, c-format
msgid "did not receive expected object %s"
msgstr "未能获å–期望的对象 %s"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "对象 %s:期待类型 %s,å´æ˜¯ %s"
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:268
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "无法填充 %d 字节"
msgstr[1] "无法填充 %d 字节"
-#: builtin/index-pack.c:277
+#: builtin/index-pack.c:278
msgid "early EOF"
msgstr "过早的文件结æŸç¬¦ï¼ˆEOF)"
-#: builtin/index-pack.c:278
+#: builtin/index-pack.c:279
msgid "read error on input"
msgstr "输入上的读错误"
-#: builtin/index-pack.c:290
+#: builtin/index-pack.c:291
msgid "used more bytes than were available"
msgstr "用掉了超过å¯ç”¨çš„字节"
-#: builtin/index-pack.c:297
+#: builtin/index-pack.c:298
msgid "pack too large for current definition of off_t"
msgstr "åŒ…å¤ªå¤§è¶…è¿‡äº†å½“å‰ off_t 的定义"
-#: builtin/index-pack.c:313
+#: builtin/index-pack.c:314
#, c-format
msgid "unable to create '%s'"
msgstr "ä¸èƒ½åˆ›å»º '%s'"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "cannot open packfile '%s'"
msgstr "无法打开包文件 '%s'"
-#: builtin/index-pack.c:332
+#: builtin/index-pack.c:333
msgid "pack signature mismatch"
msgstr "包签åä¸åŒ¹é…"
-#: builtin/index-pack.c:334
+#: builtin/index-pack.c:335
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "ä¸æ”¯æŒåŒ…版本 %<PRIu32>"
-#: builtin/index-pack.c:352
+#: builtin/index-pack.c:353
#, c-format
-msgid "pack has bad object at offset %lu: %s"
-msgstr "包中有错误的对象ä½äºŽ %lu:%s"
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "包中有错误的对象ä½äºŽåç§»é‡ %<PRIuMAX>:%s"
-#: builtin/index-pack.c:473
+#: builtin/index-pack.c:475
#, c-format
msgid "inflate returned %d"
msgstr "解压缩返回 %d"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:524
msgid "offset value overflow for delta base object"
msgstr "å移值覆盖了 delta 基准对象"
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:532
msgid "delta base offset is out of bound"
msgstr "delta 基准å移越界"
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:540
#, c-format
msgid "unknown object type %d"
msgstr "未知对象类型 %d"
-#: builtin/index-pack.c:569
+#: builtin/index-pack.c:571
msgid "cannot pread pack file"
msgstr "无法读å–包文件"
-#: builtin/index-pack.c:571
+#: builtin/index-pack.c:573
#, c-format
-msgid "premature end of pack file, %lu byte missing"
-msgid_plural "premature end of pack file, %lu bytes missing"
-msgstr[0] "包文件过早结æŸï¼Œç¼ºå°‘ %lu 字节"
-msgstr[1] "包文件过早结æŸï¼Œç¼ºå°‘ %lu 字节"
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+msgstr[0] "包文件过早结æŸï¼Œç¼ºå°‘ %<PRIuMAX> 字节"
+msgstr[1] "包文件过早结æŸï¼Œç¼ºå°‘ %<PRIuMAX> 字节"
-#: builtin/index-pack.c:597
+#: builtin/index-pack.c:599
msgid "serious inflate inconsistency"
msgstr "解压缩严é‡çš„ä¸ä¸€è‡´"
-#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
-#: builtin/index-pack.c:806 builtin/index-pack.c:815
+#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
+#: builtin/index-pack.c:808 builtin/index-pack.c:817
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "å‘现 %s 出现 SHA1 冲çªï¼"
-#: builtin/index-pack.c:746 builtin/pack-objects.c:162
-#: builtin/pack-objects.c:254
+#: builtin/index-pack.c:748 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:256
#, c-format
msgid "unable to read %s"
msgstr "ä¸èƒ½è¯» %s"
-#: builtin/index-pack.c:812
+#: builtin/index-pack.c:814
#, c-format
msgid "cannot read existing object %s"
msgstr "ä¸èƒ½è¯»å–现存对象 %s"
-#: builtin/index-pack.c:826
+#: builtin/index-pack.c:828
#, c-format
msgid "invalid blob object %s"
msgstr "无效的数æ®å¯¹è±¡ %s"
-#: builtin/index-pack.c:840
+#: builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr "无效的 %s"
-#: builtin/index-pack.c:843
+#: builtin/index-pack.c:845
msgid "Error in object"
msgstr "对象中出错"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s 的所有å­å¯¹è±¡å¹¶éžéƒ½å¯è¾¾"
-#: builtin/index-pack.c:917 builtin/index-pack.c:948
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "无法应用 delta"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1120
msgid "Receiving objects"
msgstr "接收对象中"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1120
msgid "Indexing objects"
msgstr "索引对象中"
-#: builtin/index-pack.c:1150
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "包冲çªï¼ˆSHA1 ä¸åŒ¹é…)"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "ä¸èƒ½æžšä¸¾åŒ…文件状æ€"
-#: builtin/index-pack.c:1158
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "包的结尾有垃圾数æ®"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1171
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() 中é‡åˆ°ä¸å¯ç†å–»çš„问题"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1196
msgid "Resolving deltas"
msgstr "å¤„ç† delta 中"
-#: builtin/index-pack.c:1205
+#: builtin/index-pack.c:1207
#, c-format
msgid "unable to create thread: %s"
msgstr "ä¸èƒ½åˆ›å»ºçº¿ç¨‹ï¼š%s"
-#: builtin/index-pack.c:1247
+#: builtin/index-pack.c:1249
msgid "confusion beyond insanity"
msgstr "ä¸å¯ç†å–»"
-#: builtin/index-pack.c:1253
+#: builtin/index-pack.c:1255
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "å®Œæˆ %d 个本地对象"
msgstr[1] "å®Œæˆ %d 个本地对象"
-#: builtin/index-pack.c:1265
+#: builtin/index-pack.c:1267
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "对 %s 的尾部校验出现æ„外(ç£ç›˜æŸå?)"
-#: builtin/index-pack.c:1269
+#: builtin/index-pack.c:1271
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "包有 %d 个未解决的 delta"
msgstr[1] "包有 %d 个未解决的 delta"
-#: builtin/index-pack.c:1293
+#: builtin/index-pack.c:1295
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "ä¸èƒ½åŽ‹ç¼©é™„加对象(%d)"
-#: builtin/index-pack.c:1369
+#: builtin/index-pack.c:1371
#, c-format
msgid "local object %s is corrupt"
msgstr "本地对象 %s å·²æŸå"
-#: builtin/index-pack.c:1393
+#: builtin/index-pack.c:1395
msgid "error while closing pack file"
msgstr "关闭包文件时出错"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1408
#, c-format
msgid "cannot write keep file '%s'"
msgstr "无法写ä¿ç•™æ–‡ä»¶ '%s'"
-#: builtin/index-pack.c:1414
+#: builtin/index-pack.c:1416
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "无法关闭ä¿ç•™æ–‡ä»¶ '%s'"
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1429
msgid "cannot store pack file"
msgstr "无法存储包文件"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1440
msgid "cannot store index file"
msgstr "无法存储索引文件"
-#: builtin/index-pack.c:1471
+#: builtin/index-pack.c:1473
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "åçš„ pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
+#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
#, c-format
msgid "no threads support, ignoring %s"
msgstr "没有线程支æŒï¼Œå¿½ç•¥ %s"
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "无法打开现存包文件 '%s'"
-#: builtin/index-pack.c:1542
+#: builtin/index-pack.c:1544
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "无法为 %s 打开包索引文件"
-#: builtin/index-pack.c:1589
+#: builtin/index-pack.c:1591
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "éž delta:%d 个对象"
msgstr[1] "éž delta:%d 个对象"
-#: builtin/index-pack.c:1596
+#: builtin/index-pack.c:1598
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "链长 = %d: %lu 对象"
msgstr[1] "链长 = %d: %lu 对象"
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1611
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "包文件å '%s' 没有以 '.pack' 结尾"
-#: builtin/index-pack.c:1638
-msgid "Cannot come back to cwd"
-msgstr "无法返回当å‰å·¥ä½œç›®å½•"
-
-#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
-#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
+#: builtin/index-pack.c:1693 builtin/index-pack.c:1696
+#: builtin/index-pack.c:1712 builtin/index-pack.c:1716
#, c-format
msgid "bad %s"
msgstr "错误选项 %s"
-#: builtin/index-pack.c:1723
+#: builtin/index-pack.c:1730
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin ä¸èƒ½å’Œ --stdin åŒæ—¶ä½¿ç”¨"
-#: builtin/index-pack.c:1731
+#: builtin/index-pack.c:1738
msgid "--verify with no packfile name given"
msgstr "--verify 没有æ供包文件åå‚æ•°"
@@ -7542,28 +7909,27 @@ msgstr "ä¸èƒ½å¤„ç† %d 类型的文件"
msgid "unable to move %s to %s"
msgstr "ä¸èƒ½ç§»åŠ¨ %s 至 %s"
-#. TRANSLATORS: The first '%s' is either "Reinitialized
-#. existing" or "Initialized empty", the second " shared" or
-#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:403
+#: builtin/init-db.c:402
#, c-format
-msgid "%s%s Git repository in %s%s\n"
-msgstr "%s%s Git 仓库于 %s%s\n"
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "é‡æ–°åˆå§‹åŒ–已存在的共享 Git 仓库于 %s%s\n"
-#: builtin/init-db.c:404
-msgid "Reinitialized existing"
-msgstr "é‡æ–°åˆå§‹åŒ–现存的"
+#: builtin/init-db.c:403
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "é‡æ–°åˆå§‹åŒ–已存在的 Git 仓库于 %s%s\n"
-#: builtin/init-db.c:404
-msgid "Initialized empty"
-msgstr "åˆå§‹åŒ–空的"
+#: builtin/init-db.c:407
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "å·²åˆå§‹åŒ–空的共享 Git 仓库于 %s%s\n"
-# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
-#: builtin/init-db.c:405
-msgid " shared"
-msgstr "共享"
+#: builtin/init-db.c:408
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "å·²åˆå§‹åŒ–空的 Git 仓库于 %s%s\n"
-#: builtin/init-db.c:452
+#: builtin/init-db.c:455
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7571,32 +7937,32 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<模æ¿ç›®å½•>] [--shared[=<æƒé™>]] "
"[<目录>]"
-#: builtin/init-db.c:475
+#: builtin/init-db.c:478
msgid "permissions"
msgstr "æƒé™"
-#: builtin/init-db.c:476
+#: builtin/init-db.c:479
msgid "specify that the git repository is to be shared amongst several users"
msgstr "指定 git 仓库是多个用户之间共享的"
-#: builtin/init-db.c:510 builtin/init-db.c:515
+#: builtin/init-db.c:513 builtin/init-db.c:518
#, c-format
msgid "cannot mkdir %s"
msgstr "ä¸èƒ½åˆ›å»ºç›®å½• %s"
-#: builtin/init-db.c:519
+#: builtin/init-db.c:522
#, c-format
msgid "cannot chdir to %s"
msgstr "ä¸èƒ½åˆ‡æ¢ç›®å½•åˆ° %s"
-#: builtin/init-db.c:540
+#: builtin/init-db.c:543
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr "ä¸å…许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
-#: builtin/init-db.c:568
+#: builtin/init-db.c:571
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "ä¸èƒ½è®¿é—®å·¥ä½œåŒº '%s'"
@@ -7629,115 +7995,115 @@ msgstr "è¦æ·»åŠ çš„ç­¾å"
msgid "no input file given for in-place editing"
msgstr "没有给出è¦åŽŸä½ç¼–辑的文件"
-#: builtin/log.c:43
+#: builtin/log.c:44
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
-#: builtin/log.c:44
+#: builtin/log.c:45
msgid "git show [<options>] <object>..."
msgstr "git show [<选项>] <对象>..."
-#: builtin/log.c:83
+#: builtin/log.c:84
#, c-format
msgid "invalid --decorate option: %s"
msgstr "无效的 --decorate 选项:%s"
-#: builtin/log.c:137
+#: builtin/log.c:139
msgid "suppress diff output"
msgstr "ä¸æ˜¾ç¤ºå·®å¼‚输出"
-#: builtin/log.c:138
+#: builtin/log.c:140
msgid "show source"
msgstr "显示æº"
-#: builtin/log.c:139
+#: builtin/log.c:141
msgid "Use mail map file"
msgstr "使用邮件映射文件"
-#: builtin/log.c:140
+#: builtin/log.c:142
msgid "decorate options"
msgstr "修饰选项"
-#: builtin/log.c:143
+#: builtin/log.c:145
msgid "Process line range n,m in file, counting from 1"
msgstr "处ç†æ–‡ä»¶ä¸­ç¬¬ n 到 m 之间的行,从 1 开始"
-#: builtin/log.c:239
+#: builtin/log.c:241
#, c-format
msgid "Final output: %d %s\n"
msgstr "最终输出:%d %s\n"
-#: builtin/log.c:471
+#: builtin/log.c:486
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: æŸå的文件"
-#: builtin/log.c:485 builtin/log.c:578
+#: builtin/log.c:500 builtin/log.c:594
#, c-format
msgid "Could not read object %s"
msgstr "ä¸èƒ½è¯»å–对象 %s"
-#: builtin/log.c:602
+#: builtin/log.c:618
#, c-format
msgid "Unknown type: %d"
msgstr "未知类型:%d"
-#: builtin/log.c:722
+#: builtin/log.c:739
msgid "format.headers without value"
msgstr "format.headers 没有值"
-#: builtin/log.c:812
+#: builtin/log.c:839
msgid "name of output directory is too long"
msgstr "输出目录å太长"
-#: builtin/log.c:827
+#: builtin/log.c:854
#, c-format
msgid "Cannot open patch file %s"
msgstr "无法打开补ä¸æ–‡ä»¶ %s"
-#: builtin/log.c:841
+#: builtin/log.c:868
msgid "Need exactly one range."
msgstr "åªéœ€è¦ä¸€ä¸ªèŒƒå›´ã€‚"
-#: builtin/log.c:851
+#: builtin/log.c:878
msgid "Not a range."
msgstr "ä¸æ˜¯ä¸€ä¸ªèŒƒå›´ã€‚"
-#: builtin/log.c:957
+#: builtin/log.c:984
msgid "Cover letter needs email format"
msgstr "ä¿¡å°éœ€è¦é‚®ä»¶åœ°å€æ ¼å¼"
-#: builtin/log.c:1036
+#: builtin/log.c:1064
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ä¸æ­£å¸¸çš„ in-reply-to:%s"
-#: builtin/log.c:1064
+#: builtin/log.c:1092
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
-#: builtin/log.c:1109
+#: builtin/log.c:1137
msgid "Two output directories?"
msgstr "两个输出目录?"
-#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
#, c-format
msgid "Unknown commit %s"
msgstr "未知æ交 %s"
-#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
-#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
-#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
-#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
+#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
+#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
+#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "æ— æ³•è§£æž '%s' 为一个有效引用。"
-#: builtin/log.c:1231
+#: builtin/log.c:1259
msgid "Could not find exact merge base."
msgstr "ä¸èƒ½æ‰¾åˆ°å‡†ç¡®çš„åˆå¹¶åŸºçº¿ã€‚"
-#: builtin/log.c:1235
+#: builtin/log.c:1263
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -7747,307 +8113,307 @@ msgstr ""
"git branch --set-upstream-to æ¥è·Ÿè¸ªä¸€ä¸ªè¿œç¨‹åˆ†æ”¯ã€‚或者你å¯ä»¥é€šè¿‡\n"
"å‚æ•° --base=<base-commit-id> 手动指定一个基线æ交。"
-#: builtin/log.c:1255
+#: builtin/log.c:1283
msgid "Failed to find exact merge base"
msgstr "无法找到准确的åˆå¹¶åŸºçº¿"
-#: builtin/log.c:1266
+#: builtin/log.c:1294
msgid "base commit should be the ancestor of revision list"
msgstr "基线æ交应该是版本列表的祖先"
-#: builtin/log.c:1270
+#: builtin/log.c:1298
msgid "base commit shouldn't be in revision list"
msgstr "基线æ交ä¸åº”该出现在版本列表中"
-#: builtin/log.c:1319
+#: builtin/log.c:1347
msgid "cannot get patch id"
msgstr "æ— æ³•å¾—åˆ°è¡¥ä¸ id"
-#: builtin/log.c:1377
+#: builtin/log.c:1404
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m],å³ä½¿åªæœ‰ä¸€ä¸ªè¡¥ä¸"
-#: builtin/log.c:1380
+#: builtin/log.c:1407
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH],å³ä½¿æœ‰å¤šä¸ªè¡¥ä¸"
-#: builtin/log.c:1384
+#: builtin/log.c:1411
msgid "print patches to standard out"
msgstr "打å°è¡¥ä¸åˆ°æ ‡å‡†è¾“出"
-#: builtin/log.c:1386
+#: builtin/log.c:1413
msgid "generate a cover letter"
msgstr "生æˆä¸€å°é™„ä¿¡"
-#: builtin/log.c:1388
+#: builtin/log.c:1415
msgid "use simple number sequence for output file names"
msgstr "使用简å•çš„æ•°å­—åºåˆ—作为输出文件å"
-#: builtin/log.c:1389
+#: builtin/log.c:1416
msgid "sfx"
msgstr "åŽç¼€"
-#: builtin/log.c:1390
+#: builtin/log.c:1417
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <åŽç¼€> 代替 '.patch'"
-#: builtin/log.c:1392
+#: builtin/log.c:1419
msgid "start numbering patches at <n> instead of 1"
msgstr "è¡¥ä¸ä»¥ <n> 开始编å·ï¼Œè€Œä¸æ˜¯1"
-#: builtin/log.c:1394
+#: builtin/log.c:1421
msgid "mark the series as Nth re-roll"
msgstr "标记补ä¸ç³»åˆ—是第几次é‡åˆ¶"
-#: builtin/log.c:1396
+#: builtin/log.c:1423
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "使用 [<å‰ç¼€>] 代替 [PATCH]"
-#: builtin/log.c:1399
+#: builtin/log.c:1426
msgid "store resulting files in <dir>"
msgstr "把结果文件存储在 <目录>"
-#: builtin/log.c:1402
+#: builtin/log.c:1429
msgid "don't strip/add [PATCH]"
msgstr "ä¸åˆ é™¤/添加 [PATCH]"
-#: builtin/log.c:1405
+#: builtin/log.c:1432
msgid "don't output binary diffs"
msgstr "ä¸è¾“出二进制差异"
-#: builtin/log.c:1407
+#: builtin/log.c:1434
msgid "output all-zero hash in From header"
msgstr "在 From 头信æ¯ä¸­è¾“出全为零的哈希值"
-#: builtin/log.c:1409
+#: builtin/log.c:1436
msgid "don't include a patch matching a commit upstream"
msgstr "ä¸åŒ…å«å·²åœ¨ä¸Šæ¸¸æ交中的补ä¸"
-#: builtin/log.c:1411
+#: builtin/log.c:1438
msgid "show patch format instead of default (patch + stat)"
msgstr "显示纯补ä¸æ ¼å¼è€Œéžé»˜è®¤çš„(补ä¸+状æ€ï¼‰"
-#: builtin/log.c:1413
+#: builtin/log.c:1440
msgid "Messaging"
msgstr "邮件å‘é€"
-#: builtin/log.c:1414
+#: builtin/log.c:1441
msgid "header"
msgstr "header"
-#: builtin/log.c:1415
+#: builtin/log.c:1442
msgid "add email header"
msgstr "添加邮件头"
-#: builtin/log.c:1416 builtin/log.c:1418
+#: builtin/log.c:1443 builtin/log.c:1445
msgid "email"
msgstr "邮件地å€"
-#: builtin/log.c:1416
+#: builtin/log.c:1443
msgid "add To: header"
msgstr "添加收件人"
-#: builtin/log.c:1418
+#: builtin/log.c:1445
msgid "add Cc: header"
msgstr "添加抄é€"
-#: builtin/log.c:1420
+#: builtin/log.c:1447
msgid "ident"
msgstr "标识"
-#: builtin/log.c:1421
+#: builtin/log.c:1448
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "å°† From 地å€è®¾ç½®ä¸º <标识>(如若ä¸æ供,则用æ交者 ID åšä¸ºåœ°å€ï¼‰"
-#: builtin/log.c:1423
+#: builtin/log.c:1450
msgid "message-id"
msgstr "邮件标识"
-#: builtin/log.c:1424
+#: builtin/log.c:1451
msgid "make first mail a reply to <message-id>"
msgstr "使第一å°é‚®ä»¶ä½œä¸ºå¯¹ <邮件标识> 的回å¤"
-#: builtin/log.c:1425 builtin/log.c:1428
+#: builtin/log.c:1452 builtin/log.c:1455
msgid "boundary"
msgstr "边界"
-#: builtin/log.c:1426
+#: builtin/log.c:1453
msgid "attach the patch"
msgstr "附件方å¼æ·»åŠ è¡¥ä¸"
-#: builtin/log.c:1429
+#: builtin/log.c:1456
msgid "inline the patch"
msgstr "内è”显示补ä¸"
-#: builtin/log.c:1433
+#: builtin/log.c:1460
msgid "enable message threading, styles: shallow, deep"
msgstr "å¯ç”¨é‚®ä»¶çº¿ç´¢ï¼Œé£Žæ ¼ï¼šæµ…,深"
-#: builtin/log.c:1435
+#: builtin/log.c:1462
msgid "signature"
msgstr "ç­¾å"
-#: builtin/log.c:1436
+#: builtin/log.c:1463
msgid "add a signature"
msgstr "添加一个签å"
-#: builtin/log.c:1437
+#: builtin/log.c:1464
msgid "base-commit"
msgstr "基线æ交"
-#: builtin/log.c:1438
+#: builtin/log.c:1465
msgid "add prerequisite tree info to the patch series"
msgstr "为补ä¸åˆ—表添加å‰ç½®æ ‘ä¿¡æ¯"
-#: builtin/log.c:1440
+#: builtin/log.c:1467
msgid "add a signature from a file"
msgstr "从文件添加一个签å"
-#: builtin/log.c:1441
+#: builtin/log.c:1468
msgid "don't print the patch filenames"
msgstr "ä¸è¦æ‰“å°è¡¥ä¸æ–‡ä»¶å"
-#: builtin/log.c:1531
+#: builtin/log.c:1558
msgid "-n and -k are mutually exclusive."
msgstr "-n 和 -k 互斥。"
-#: builtin/log.c:1533
+#: builtin/log.c:1560
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix 和 -k 互斥。"
-#: builtin/log.c:1541
+#: builtin/log.c:1568
msgid "--name-only does not make sense"
msgstr "--name-only æ— æ„义"
-#: builtin/log.c:1543
+#: builtin/log.c:1570
msgid "--name-status does not make sense"
msgstr "--name-status æ— æ„义"
-#: builtin/log.c:1545
+#: builtin/log.c:1572
msgid "--check does not make sense"
msgstr "--check æ— æ„义"
-#: builtin/log.c:1573
+#: builtin/log.c:1602
msgid "standard output, or directory, which one?"
msgstr "标准输出或目录,哪一个?"
-#: builtin/log.c:1575
+#: builtin/log.c:1604
#, c-format
msgid "Could not create directory '%s'"
msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'"
-#: builtin/log.c:1672
+#: builtin/log.c:1698
#, c-format
msgid "unable to read signature file '%s'"
msgstr "无法读å–ç­¾å文件 '%s'"
-#: builtin/log.c:1743
+#: builtin/log.c:1769
msgid "Failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:1792
+#: builtin/log.c:1818
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<头> [<é™åˆ¶>]]]"
-#: builtin/log.c:1846
+#: builtin/log.c:1872
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "ä¸èƒ½æ‰¾åˆ°è·Ÿè¸ªçš„远程分支,请手工指定 <上游>。\n"
-#: builtin/ls-files.c:378
+#: builtin/ls-files.c:379
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<选项>] [<文件>...]"
-#: builtin/ls-files.c:427
+#: builtin/ls-files.c:428
msgid "identify the file status with tags"
msgstr "用标签标识文件的状æ€"
-#: builtin/ls-files.c:429
+#: builtin/ls-files.c:430
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "使用å°å†™å­—æ¯è¡¨ç¤º 'å‡è®¾æœªæ”¹å˜çš„' 文件"
-#: builtin/ls-files.c:431
+#: builtin/ls-files.c:432
msgid "show cached files in the output (default)"
msgstr "显示缓存的文件(默认)"
-#: builtin/ls-files.c:433
+#: builtin/ls-files.c:434
msgid "show deleted files in the output"
msgstr "显示已删除的文件"
-#: builtin/ls-files.c:435
+#: builtin/ls-files.c:436
msgid "show modified files in the output"
msgstr "显示已修改的文件"
-#: builtin/ls-files.c:437
+#: builtin/ls-files.c:438
msgid "show other files in the output"
msgstr "显示其它文件"
-#: builtin/ls-files.c:439
+#: builtin/ls-files.c:440
msgid "show ignored files in the output"
msgstr "显示忽略的文件"
-#: builtin/ls-files.c:442
+#: builtin/ls-files.c:443
msgid "show staged contents' object name in the output"
msgstr "显示暂存区内容的对象å称"
-#: builtin/ls-files.c:444
+#: builtin/ls-files.c:445
msgid "show files on the filesystem that need to be removed"
msgstr "显示文件系统需è¦åˆ é™¤çš„文件"
-#: builtin/ls-files.c:446
+#: builtin/ls-files.c:447
msgid "show 'other' directories' names only"
msgstr "åªæ˜¾ç¤ºâ€œå…¶ä»–â€ç›®å½•çš„å称"
-#: builtin/ls-files.c:448
+#: builtin/ls-files.c:449
msgid "show line endings of files"
msgstr "显示文件æ¢è¡Œç¬¦æ ¼å¼"
-#: builtin/ls-files.c:450
+#: builtin/ls-files.c:451
msgid "don't show empty directories"
msgstr "ä¸æ˜¾ç¤ºç©ºç›®å½•"
-#: builtin/ls-files.c:453
+#: builtin/ls-files.c:454
msgid "show unmerged files in the output"
msgstr "显示未åˆå¹¶çš„文件"
-#: builtin/ls-files.c:455
+#: builtin/ls-files.c:456
msgid "show resolve-undo information"
msgstr "显示 resolve-undo ä¿¡æ¯"
-#: builtin/ls-files.c:457
+#: builtin/ls-files.c:458
msgid "skip files matching pattern"
msgstr "匹é…排除文件的模å¼"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:461
msgid "exclude patterns are read from <file>"
msgstr "从 <文件> 中读å–排除模å¼"
-#: builtin/ls-files.c:463
+#: builtin/ls-files.c:464
msgid "read additional per-directory exclude patterns in <file>"
msgstr "从 <文件> 读å–é¢å¤–çš„æ¯ä¸ªç›®å½•çš„排除模å¼"
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:466
msgid "add the standard git exclusions"
msgstr "添加标准的 git 排除"
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:469
msgid "make the output relative to the project top directory"
msgstr "显示相对于顶级目录的文件å"
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:472
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <文件> 都ä¸åœ¨ç´¢å¼•åŒºï¼Œè§†ä¸ºé”™è¯¯"
-#: builtin/ls-files.c:472
+#: builtin/ls-files.c:473
msgid "tree-ish"
msgstr "树或æ交"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:474
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "å‡è£…自从 <树或æ交> 之åŽåˆ é™¤çš„路径ä»ç„¶å­˜åœ¨"
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:476
msgid "show debugging data"
msgstr "显示调试数æ®"
@@ -8133,187 +8499,173 @@ msgstr "使用文件的全路径"
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "列出整个树;ä¸ä»…仅当å‰ç›®å½•ï¼ˆéšå« --full-name)"
-#: builtin/merge.c:45
+#: builtin/merge.c:46
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<选项>] [<æ交>...]"
-#: builtin/merge.c:46
+#: builtin/merge.c:47
msgid "git merge [<options>] <msg> HEAD <commit>"
msgstr "git merge [<选项>] <说明> HEAD <æ交>"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:101
+#: builtin/merge.c:102
msgid "switch `m' requires a value"
msgstr "开关 `m' 需è¦ä¸€ä¸ªå€¼"
-#: builtin/merge.c:138
+#: builtin/merge.c:139
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "ä¸èƒ½æ‰¾åˆ°åˆå¹¶ç­–ç•¥ '%s'。\n"
-#: builtin/merge.c:139
+#: builtin/merge.c:140
#, c-format
msgid "Available strategies are:"
msgstr "å¯ç”¨çš„策略有:"
-#: builtin/merge.c:144
+#: builtin/merge.c:145
#, c-format
msgid "Available custom strategies are:"
msgstr "å¯ç”¨çš„自定义策略有:"
-#: builtin/merge.c:194 builtin/pull.c:126
+#: builtin/merge.c:195 builtin/pull.c:126
msgid "do not show a diffstat at the end of the merge"
msgstr "在åˆå¹¶çš„最åŽä¸æ˜¾ç¤ºå·®å¼‚统计"
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:129
msgid "show a diffstat at the end of the merge"
msgstr "在åˆå¹¶çš„最åŽæ˜¾ç¤ºå·®å¼‚统计"
-#: builtin/merge.c:198 builtin/pull.c:132
+#: builtin/merge.c:199 builtin/pull.c:132
msgid "(synonym to --stat)"
msgstr "(和 --stat åŒä¹‰ï¼‰"
-#: builtin/merge.c:200 builtin/pull.c:135
+#: builtin/merge.c:201 builtin/pull.c:135
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在åˆå¹¶æ交信æ¯ä¸­æ·»åŠ ï¼ˆæœ€å¤š <n> æ¡ï¼‰ç²¾ç®€æ交记录"
-#: builtin/merge.c:203 builtin/pull.c:138
+#: builtin/merge.c:204 builtin/pull.c:138
msgid "create a single commit instead of doing a merge"
msgstr "创建一个å•ç‹¬çš„æ交而ä¸æ˜¯åšä¸€æ¬¡åˆå¹¶"
-#: builtin/merge.c:205 builtin/pull.c:141
+#: builtin/merge.c:206 builtin/pull.c:141
msgid "perform a commit if the merge succeeds (default)"
msgstr "如果åˆå¹¶æˆåŠŸï¼Œæ‰§è¡Œä¸€æ¬¡æ交(默认)"
-#: builtin/merge.c:207 builtin/pull.c:144
+#: builtin/merge.c:208 builtin/pull.c:144
msgid "edit message before committing"
msgstr "在æ交å‰ç¼–辑æ交说明"
-#: builtin/merge.c:208
+#: builtin/merge.c:209
msgid "allow fast-forward (default)"
msgstr "å…许快进(默认)"
-#: builtin/merge.c:210 builtin/pull.c:150
+#: builtin/merge.c:211 builtin/pull.c:150
msgid "abort if fast-forward is not possible"
msgstr "如果ä¸èƒ½å¿«è¿›å°±æ”¾å¼ƒåˆå¹¶"
-#: builtin/merge.c:214
-msgid "Verify that the named commit has a valid GPG signature"
+#: builtin/merge.c:215 builtin/pull.c:153
+msgid "verify that the named commit has a valid GPG signature"
msgstr "验è¯æŒ‡å®šçš„æ交是å¦åŒ…å«ä¸€ä¸ªæœ‰æ•ˆçš„ GPG ç­¾å"
-#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
+#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157
#: builtin/revert.c:89
msgid "strategy"
msgstr "ç­–ç•¥"
-#: builtin/merge.c:216 builtin/pull.c:158
+#: builtin/merge.c:217 builtin/pull.c:158
msgid "merge strategy to use"
msgstr "è¦ä½¿ç”¨çš„åˆå¹¶ç­–ç•¥"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:218 builtin/pull.c:161
msgid "option=value"
msgstr "option=value"
-#: builtin/merge.c:218 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:162
msgid "option for selected merge strategy"
msgstr "所选的åˆå¹¶ç­–略的选项"
-#: builtin/merge.c:220
+#: builtin/merge.c:221
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "åˆå¹¶çš„æ交说明(针对éžå¿«è¿›å¼åˆå¹¶ï¼‰"
-#: builtin/merge.c:224
+#: builtin/merge.c:225
msgid "abort the current in-progress merge"
msgstr "放弃当å‰æ­£åœ¨è¿›è¡Œçš„åˆå¹¶"
-#: builtin/merge.c:226 builtin/pull.c:169
+#: builtin/merge.c:227 builtin/pull.c:169
msgid "allow merging unrelated histories"
msgstr "å…许åˆå¹¶ä¸ç›¸å…³çš„历å²"
-#: builtin/merge.c:254
+#: builtin/merge.c:255
msgid "could not run stash."
msgstr "ä¸èƒ½è¿›è¡Œè¿›åº¦ä¿å­˜ã€‚"
-#: builtin/merge.c:259
+#: builtin/merge.c:260
msgid "stash failed"
msgstr "进度ä¿å­˜å¤±è´¥"
-#: builtin/merge.c:264
+#: builtin/merge.c:265
#, c-format
msgid "not a valid object: %s"
msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆå¯¹è±¡ï¼š%s"
-#: builtin/merge.c:283 builtin/merge.c:300
+#: builtin/merge.c:284 builtin/merge.c:301
msgid "read-tree failed"
msgstr "读å–树失败"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: builtin/merge.c:330
+#: builtin/merge.c:331
msgid " (nothing to squash)"
msgstr " (无å¯åŽ‹ç¼©ï¼‰"
-#: builtin/merge.c:343
+#: builtin/merge.c:342
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "压缩æ交 -- 未更新 HEAD\n"
-#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
-#: builtin/merge.c:1000
-#, c-format
-msgid "Could not write to '%s'"
-msgstr "ä¸èƒ½å†™å…¥ '%s'"
-
-#: builtin/merge.c:375
-msgid "Writing SQUASH_MSG"
-msgstr "写入 SQUASH_MSG"
-
-#: builtin/merge.c:377
-msgid "Finishing SQUASH_MSG"
-msgstr "å®Œæˆ SQUASH_MSG"
-
-#: builtin/merge.c:400
+#: builtin/merge.c:392
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "æ— åˆå¹¶ä¿¡æ¯ -- 未更新 HEAD\n"
-#: builtin/merge.c:451
+#: builtin/merge.c:443
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' 没有指å‘一个æ交"
-#: builtin/merge.c:541
+#: builtin/merge.c:533
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "åçš„ branch.%s.mergeoptions 字符串:%s"
-#: builtin/merge.c:660
+#: builtin/merge.c:652
msgid "Not handling anything other than two heads merge."
msgstr "ä¸èƒ½å¤„ç†ä¸¤ä¸ªå¤´åˆå¹¶ä¹‹å¤–的任何æ“作。"
-#: builtin/merge.c:674
+#: builtin/merge.c:666
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "merge-recursive 的未知选项:-X%s"
-#: builtin/merge.c:687
+#: builtin/merge.c:681
#, c-format
msgid "unable to write %s"
msgstr "ä¸èƒ½å†™ %s"
-#: builtin/merge.c:776
+#: builtin/merge.c:733
#, c-format
msgid "Could not read from '%s'"
msgstr "ä¸èƒ½ä»Ž '%s' 读å–"
-#: builtin/merge.c:785
+#: builtin/merge.c:742
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "未æ交åˆå¹¶ï¼Œä½¿ç”¨ 'git commit' 完æˆæ­¤æ¬¡åˆå¹¶ã€‚\n"
-#: builtin/merge.c:791
+#: builtin/merge.c:748
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -8327,52 +8679,66 @@ msgstr ""
"\n"
"以 '%c' 开头的行将被忽略,而且空æ交说明将会终止æ交。\n"
-#: builtin/merge.c:815
+#: builtin/merge.c:772
msgid "Empty commit message."
msgstr "空æ交信æ¯ã€‚"
-#: builtin/merge.c:835
+#: builtin/merge.c:792
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"
-#: builtin/merge.c:890
+#: builtin/merge.c:847
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自动åˆå¹¶å¤±è´¥ï¼Œä¿®æ­£å†²çªç„¶åŽæ交修正的结果。\n"
-#: builtin/merge.c:906
+#: builtin/merge.c:863
#, c-format
msgid "'%s' is not a commit"
msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæ交"
-#: builtin/merge.c:947
+#: builtin/merge.c:904
msgid "No current branch."
msgstr "没有当å‰åˆ†æ”¯ã€‚"
-#: builtin/merge.c:949
+#: builtin/merge.c:906
msgid "No remote for the current branch."
msgstr "当å‰åˆ†æ”¯æ²¡æœ‰å¯¹åº”的远程仓库。"
-#: builtin/merge.c:951
+#: builtin/merge.c:908
msgid "No default upstream defined for the current branch."
msgstr "当å‰åˆ†æ”¯æ²¡æœ‰å®šä¹‰é»˜è®¤çš„上游分支。"
-#: builtin/merge.c:956
+#: builtin/merge.c:913
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "对于 %s 没有æ¥è‡ª %s 的远程跟踪分支"
-#: builtin/merge.c:1091
+#: builtin/merge.c:960
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "环境 '%2$s' 中存在åçš„å–值 '%1$s'"
+
+#: builtin/merge.c:1034
#, c-format
msgid "could not close '%s'"
msgstr "ä¸èƒ½å…³é—­ '%s'"
-#: builtin/merge.c:1219
+#: builtin/merge.c:1061
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "ä¸èƒ½åœ¨ %s 中åˆå¹¶ï¼š%s"
+
+#: builtin/merge.c:1095
+msgid "not something we can merge"
+msgstr "ä¸èƒ½åˆå¹¶"
+
+#: builtin/merge.c:1162
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有è¦ç»ˆæ­¢çš„åˆå¹¶ï¼ˆMERGE_HEAD 丢失)。"
-#: builtin/merge.c:1235
+#: builtin/merge.c:1178
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8380,7 +8746,7 @@ msgstr ""
"您尚未结æŸæ‚¨çš„åˆå¹¶ï¼ˆå­˜åœ¨ MERGE_HEAD)。\n"
"请在åˆå¹¶å‰å…ˆæ交您的修改。"
-#: builtin/merge.c:1242
+#: builtin/merge.c:1185
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8388,104 +8754,112 @@ msgstr ""
"您尚未结æŸæ‚¨çš„拣选(存在 CHERRY_PICK_HEAD)。\n"
"请在åˆå¹¶å‰å…ˆæ交您的修改。"
-#: builtin/merge.c:1245
+#: builtin/merge.c:1188
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结æŸæ‚¨çš„拣选(存在 CHERRY_PICK_HEAD)。"
-#: builtin/merge.c:1254
+#: builtin/merge.c:1197
msgid "You cannot combine --squash with --no-ff."
msgstr "您ä¸èƒ½å°† --squash 与 --no-ff åŒæ—¶ä½¿ç”¨ã€‚"
-#: builtin/merge.c:1262
+#: builtin/merge.c:1205
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定æ交并且 merge.defaultToUpstream 未设置。"
-#: builtin/merge.c:1279
+#: builtin/merge.c:1222
msgid "Squash commit into empty head not supported yet"
msgstr "å°šä¸æ”¯æŒåˆ°ç©ºåˆ†æ”¯çš„压缩æ交"
-#: builtin/merge.c:1281
+#: builtin/merge.c:1224
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的éžå¿«è¿›å¼æ交没有æ„义"
-#: builtin/merge.c:1286
+#: builtin/merge.c:1229
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - ä¸èƒ½è¢«åˆå¹¶"
-#: builtin/merge.c:1288
+#: builtin/merge.c:1231
msgid "Can merge only exactly one commit into empty head"
msgstr "åªèƒ½å°†ä¸€ä¸ªæ交åˆå¹¶åˆ°ç©ºåˆ†æ”¯ä¸Š"
-#: builtin/merge.c:1344
+#: builtin/merge.c:1287
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "æ交 %s 有一个éžå¯ä¿¡çš„声称æ¥è‡ª %s çš„ GPG ç­¾å。"
-#: builtin/merge.c:1347
+#: builtin/merge.c:1290
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "æ交 %s 有一个错误的声称æ¥è‡ª %s çš„ GPG ç­¾å。"
-#: builtin/merge.c:1350
+#: builtin/merge.c:1293
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "æ交 %s 没有一个 GPG ç­¾å。"
-#: builtin/merge.c:1353
+#: builtin/merge.c:1296
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "æ交 %s 有一个æ¥è‡ª %s 的好的 GPG ç­¾å。\n"
-#: builtin/merge.c:1415
+#: builtin/merge.c:1358
msgid "refusing to merge unrelated histories"
msgstr "æ‹’ç»åˆå¹¶æ— å…³çš„历å²"
-#: builtin/merge.c:1439
+#: builtin/merge.c:1367
+msgid "Already up-to-date."
+msgstr "å·²ç»æ˜¯æœ€æ–°çš„。"
+
+#: builtin/merge.c:1382
#, c-format
msgid "Updating %s..%s\n"
msgstr "æ›´æ–° %s..%s\n"
-#: builtin/merge.c:1476
+#: builtin/merge.c:1419
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "å°è¯•éžå¸¸å°çš„索引内åˆå¹¶...\n"
-#: builtin/merge.c:1483
+#: builtin/merge.c:1426
#, c-format
msgid "Nope.\n"
msgstr "无。\n"
-#: builtin/merge.c:1515
+#: builtin/merge.c:1451
+msgid "Already up-to-date. Yeeah!"
+msgstr "å·²ç»æ˜¯æœ€æ–°çš„。耶ï¼"
+
+#: builtin/merge.c:1457
msgid "Not possible to fast-forward, aborting."
msgstr "无法快进,终止。"
-#: builtin/merge.c:1538 builtin/merge.c:1617
+#: builtin/merge.c:1480 builtin/merge.c:1559
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状æ€...\n"
-#: builtin/merge.c:1542
+#: builtin/merge.c:1484
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "å°è¯•åˆå¹¶ç­–ç•¥ %s...\n"
-#: builtin/merge.c:1608
+#: builtin/merge.c:1550
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有åˆå¹¶ç­–略处ç†æ­¤åˆå¹¶ã€‚\n"
-#: builtin/merge.c:1610
+#: builtin/merge.c:1552
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s åˆå¹¶å¤±è´¥ã€‚\n"
-#: builtin/merge.c:1619
+#: builtin/merge.c:1561
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以准备手工解决。\n"
-#: builtin/merge.c:1631
+#: builtin/merge.c:1573
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动åˆå¹¶è¿›å±•é¡ºåˆ©ï¼ŒæŒ‰è¦æ±‚在æ交å‰åœæ­¢\n"
@@ -8612,68 +8986,68 @@ msgstr "强制移动/é‡å‘½ä»¤ï¼Œå³ä½¿ç›®æ ‡å­˜åœ¨"
msgid "skip move/rename errors"
msgstr "跳过移动/é‡å‘½å错误"
-#: builtin/mv.c:152
+#: builtin/mv.c:155
#, c-format
msgid "destination '%s' is not a directory"
msgstr "目标 '%s' ä¸æ˜¯ä¸€ä¸ªç›®å½•"
-#: builtin/mv.c:163
+#: builtin/mv.c:166
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "检查 '%s' 到 '%s' çš„é‡å‘½å\n"
-#: builtin/mv.c:167
+#: builtin/mv.c:170
msgid "bad source"
msgstr "åçš„æº"
-#: builtin/mv.c:170
+#: builtin/mv.c:173
msgid "can not move directory into itself"
msgstr "ä¸èƒ½å°†ç›®å½•ç§»åŠ¨åˆ°è‡ªèº«"
-#: builtin/mv.c:173
+#: builtin/mv.c:176
msgid "cannot move directory over file"
msgstr "ä¸èƒ½å°†ç›®å½•ç§»åŠ¨åˆ°æ–‡ä»¶"
-#: builtin/mv.c:182
+#: builtin/mv.c:185
msgid "source directory is empty"
msgstr "æºç›®å½•ä¸ºç©º"
-#: builtin/mv.c:207
+#: builtin/mv.c:210
msgid "not under version control"
msgstr "ä¸åœ¨ç‰ˆæœ¬æŽ§åˆ¶ä¹‹ä¸‹"
-#: builtin/mv.c:210
+#: builtin/mv.c:213
msgid "destination exists"
msgstr "目标已存在"
-#: builtin/mv.c:218
+#: builtin/mv.c:221
#, c-format
msgid "overwriting '%s'"
msgstr "覆盖 '%s'"
-#: builtin/mv.c:221
+#: builtin/mv.c:224
msgid "Cannot overwrite"
msgstr "ä¸èƒ½è¦†ç›–"
-#: builtin/mv.c:224
+#: builtin/mv.c:227
msgid "multiple sources for the same target"
msgstr "åŒä¸€ç›®æ ‡å…·æœ‰å¤šä¸ªæº"
-#: builtin/mv.c:226
+#: builtin/mv.c:229
msgid "destination directory does not exist"
msgstr "目标目录ä¸å­˜åœ¨"
-#: builtin/mv.c:233
+#: builtin/mv.c:236
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s,æº=%s,目标=%s"
-#: builtin/mv.c:254
+#: builtin/mv.c:257
#, c-format
msgid "Renaming %s to %s\n"
msgstr "é‡å‘½å %s 至 %s\n"
-#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
#, c-format
msgid "renaming '%s' failed"
msgstr "é‡å‘½å '%s' 失败"
@@ -8827,6 +9201,10 @@ msgstr "git notes prune [<选项>]"
msgid "git notes get-ref"
msgstr "git notes get-ref"
+#: builtin/notes.c:94
+msgid "Write/edit the notes for the following object:"
+msgstr "为下é¢çš„对象写/编辑说明:"
+
#: builtin/notes.c:147
#, c-format
msgid "unable to start 'show' for object '%s'"
@@ -8841,121 +9219,116 @@ msgstr "ä¸èƒ½è¯»å– 'show' 的输出"
msgid "failed to finish 'show' for object '%s'"
msgstr "无法为对象 '%s' å®Œæˆ 'show'"
-#: builtin/notes.c:174 builtin/tag.c:248
-#, c-format
-msgid "could not create file '%s'"
-msgstr "ä¸èƒ½åˆ›å»ºæ–‡ä»¶ '%s'"
-
-#: builtin/notes.c:193
+#: builtin/notes.c:194
msgid "Please supply the note contents using either -m or -F option"
msgstr "请通过 -m 或 -F 选项为注解æ供内容"
-#: builtin/notes.c:202
+#: builtin/notes.c:203
msgid "unable to write note object"
msgstr "ä¸èƒ½å†™æ³¨è§£å¯¹è±¡"
-#: builtin/notes.c:204
+#: builtin/notes.c:205
#, c-format
msgid "The note contents have been left in %s"
msgstr "注解内容被留在 %s 中"
-#: builtin/notes.c:232 builtin/tag.c:439
+#: builtin/notes.c:233 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr "ä¸èƒ½è¯»å– '%s'"
-#: builtin/notes.c:234 builtin/tag.c:442
+#: builtin/notes.c:235 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr "ä¸èƒ½æ‰“å¼€æˆ–è¯»å– '%s'"
-#: builtin/notes.c:256
+#: builtin/notes.c:257
#, c-format
msgid "Failed to read object '%s'."
msgstr "无法读å–对象 '%s'。"
-#: builtin/notes.c:260
+#: builtin/notes.c:261
#, c-format
msgid "Cannot read note data from non-blob object '%s'."
msgstr "ä¸èƒ½ä»Žéžæ•°æ®å¯¹è±¡ '%s' 中读å–注解数æ®"
-#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
-#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:946
+#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
+#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
+#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
msgid "too many parameters"
msgstr "å‚数太多"
-#: builtin/notes.c:375 builtin/notes.c:662
+#: builtin/notes.c:376 builtin/notes.c:663
#, c-format
msgid "No note found for object %s."
msgstr "未å‘现对象 %s 的注解。"
-#: builtin/notes.c:396 builtin/notes.c:559
+#: builtin/notes.c:397 builtin/notes.c:560
msgid "note contents as a string"
msgstr "注解内容作为一个字符串"
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:400 builtin/notes.c:563
msgid "note contents in a file"
msgstr "注解内容到一个文件中"
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "reuse and edit specified note object"
msgstr "é‡ç”¨å’Œç¼–辑指定的注解对象"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "reuse specified note object"
msgstr "é‡ç”¨æŒ‡å®šçš„注解对象"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "allow storing empty note"
msgstr "å…许ä¿å­˜ç©ºç™½æ³¨é‡Š"
-#: builtin/notes.c:409 builtin/notes.c:480
+#: builtin/notes.c:410 builtin/notes.c:481
msgid "replace existing notes"
msgstr "替æ¢å·²å­˜åœ¨çš„注解"
-#: builtin/notes.c:434
+#: builtin/notes.c:435
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "ä¸èƒ½æ·»åŠ æ³¨è§£ã€‚å‘现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
-#: builtin/notes.c:449 builtin/notes.c:528
+#: builtin/notes.c:450 builtin/notes.c:529
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "覆盖对象 %s 现存注解\n"
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
+#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
#, c-format
msgid "Removing note for object %s\n"
msgstr "删除对象 %s 的注解\n"
-#: builtin/notes.c:481
+#: builtin/notes.c:482
msgid "read objects from stdin"
msgstr "从标准输入读å–对象"
-#: builtin/notes.c:483
+#: builtin/notes.c:484
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "é‡æ–°åŠ è½½ <命令> çš„é…置(éšå« --stdin)"
-#: builtin/notes.c:501
+#: builtin/notes.c:502
msgid "too few parameters"
msgstr "å‚数太少"
-#: builtin/notes.c:522
+#: builtin/notes.c:523
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "ä¸èƒ½æ‹·è´æ³¨è§£ã€‚å‘现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
-#: builtin/notes.c:534
+#: builtin/notes.c:535
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr "æºå¯¹è±¡ %s 缺少注解。ä¸èƒ½æ‹·è´ã€‚"
-#: builtin/notes.c:586
+#: builtin/notes.c:587
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -8964,63 +9337,102 @@ msgstr ""
"å­å‘½ä»¤ 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
"请æ¢ç”¨ 'git notes add -f -m/-F/-c/-C'。\n"
-#: builtin/notes.c:768
+#: builtin/notes.c:753
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "未知的注解åˆå¹¶ç­–ç•¥ %s"
+
+#: builtin/notes.c:769
msgid "General options"
msgstr "通用选项"
-#: builtin/notes.c:770
+#: builtin/notes.c:771
msgid "Merge options"
msgstr "åˆå¹¶é€‰é¡¹"
-#: builtin/notes.c:772
+#: builtin/notes.c:773
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr "ä½¿ç”¨æŒ‡å®šçš„ç­–ç•¥è§£å†³æ³¨è§£å†²çª (manual/ours/theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:774
+#: builtin/notes.c:775
msgid "Committing unmerged notes"
msgstr "æ交未åˆå¹¶çš„注解"
-#: builtin/notes.c:776
+#: builtin/notes.c:777
msgid "finalize notes merge by committing unmerged notes"
msgstr "通过æ交未åˆå¹¶çš„注解æ¥å®Œæˆæ³¨è§£åˆå¹¶"
-#: builtin/notes.c:778
+#: builtin/notes.c:779
msgid "Aborting notes merge resolution"
msgstr "中止注解åˆå¹¶çš„方案"
-#: builtin/notes.c:780
+#: builtin/notes.c:781
msgid "abort notes merge"
msgstr "中止注解åˆå¹¶"
-#: builtin/notes.c:857
+#: builtin/notes.c:792
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "ä¸èƒ½æ··ç”¨ --commitã€--abort 或 -s/--strategy"
+
+#: builtin/notes.c:797
+msgid "Must specify a notes ref to merge"
+msgstr "必须指定一个注解引用æ¥åˆå¹¶"
+
+#: builtin/notes.c:821
+#, c-format
+msgid "Unknown -s/--strategy: %s"
+msgstr "未知的 -s/--strategy:%s"
+
+#: builtin/notes.c:858
#, c-format
msgid "A notes merge into %s is already in-progress at %s"
msgstr "一个到 %s 的注解åˆå¹¶å·²ç»åœ¨ %s 执行中"
-#: builtin/notes.c:884
+#: builtin/notes.c:861
+#, c-format
+msgid "Failed to store link to current notes ref (%s)"
+msgstr "无法存储链接到当å‰æ³¨è§£çš„引用(%s)"
+
+#: builtin/notes.c:863
+#, c-format
+msgid ""
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
+msgstr "自动åˆå¹¶è¯´æ˜Žå¤±è´¥ã€‚修改 %s 中的冲çªå¹¶ä¸”使用命令 'git notes merge --commit' æ交结果,或者使用命令 'git notes merge --abort' 终止åˆå¹¶ã€‚\n"
+
+#: builtin/notes.c:885
#, c-format
msgid "Object %s has no note\n"
msgstr "对象 %s 没有注解\n"
-#: builtin/notes.c:896
+#: builtin/notes.c:897
msgid "attempt to remove non-existent note is not an error"
msgstr "å°è¯•åˆ é™¤ä¸å­˜åœ¨çš„注解ä¸æ˜¯ä¸€ä¸ªé”™è¯¯"
-#: builtin/notes.c:899
+#: builtin/notes.c:900
msgid "read object names from the standard input"
msgstr "从标准输入读å–对象å称"
-#: builtin/notes.c:980
+#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
+msgid "do not remove, show only"
+msgstr "ä¸åˆ é™¤ï¼Œåªæ˜¾ç¤º"
+
+#: builtin/notes.c:939
+msgid "report pruned notes"
+msgstr "报告清除的注解"
+
+#: builtin/notes.c:981
msgid "notes-ref"
msgstr "注解引用"
-#: builtin/notes.c:981
+#: builtin/notes.c:982
msgid "use notes from <notes-ref>"
msgstr "从 <注解引用> 使用注解"
-#: builtin/notes.c:1016 builtin/remote.c:1628
+#: builtin/notes.c:1017 builtin/remote.c:1623
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知å­å‘½ä»¤ï¼š%s"
@@ -9035,174 +9447,178 @@ msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
-#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
+#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
#, c-format
msgid "deflate error (%d)"
msgstr "压缩错误 (%d)"
-#: builtin/pack-objects.c:763
+#: builtin/pack-objects.c:766
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "ç¦ç”¨ bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:779
msgid "Writing objects"
msgstr "写入对象中"
-#: builtin/pack-objects.c:1017
+#: builtin/pack-objects.c:1037
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "ç¦ç”¨ bitmap 写入,因为一些对象将ä¸ä¼šè¢«æ‰“包"
-#: builtin/pack-objects.c:2177
+#: builtin/pack-objects.c:2197
msgid "Compressing objects"
msgstr "压缩对象中"
-#: builtin/pack-objects.c:2563
+#: builtin/pack-objects.c:2611
#, c-format
msgid "unsupported index version %s"
msgstr "ä¸æ”¯æŒçš„索引版本 %s"
-#: builtin/pack-objects.c:2567
+#: builtin/pack-objects.c:2615
#, c-format
msgid "bad index version '%s'"
msgstr "å的索引版本 '%s'"
-#: builtin/pack-objects.c:2597
+#: builtin/pack-objects.c:2645
msgid "do not show progress meter"
msgstr "ä¸æ˜¾ç¤ºè¿›åº¦è¡¨"
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2647
msgid "show progress meter"
msgstr "显示进度表"
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2649
msgid "show progress meter during object writing phase"
msgstr "在对象写入阶段显示进度表"
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2652
msgid "similar to --all-progress when progress meter is shown"
msgstr "当进度表显示时类似于 --all-progress"
-#: builtin/pack-objects.c:2605
+#: builtin/pack-objects.c:2653
msgid "version[,offset]"
msgstr "版本[,å移]"
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2654
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx æ ¼å¼ç‰ˆæœ¬æ¥å†™åŒ…索引文件"
-#: builtin/pack-objects.c:2609
+#: builtin/pack-objects.c:2657
msgid "maximum size of each output pack file"
msgstr "æ¯ä¸ªè¾“出包的最大尺寸"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2659
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略从备用对象存储里借用对象"
-#: builtin/pack-objects.c:2613
+#: builtin/pack-objects.c:2661
msgid "ignore packed objects"
msgstr "忽略包对象"
-#: builtin/pack-objects.c:2615
+#: builtin/pack-objects.c:2663
msgid "limit pack window by objects"
msgstr "é™åˆ¶æ‰“包窗å£çš„对象数"
-#: builtin/pack-objects.c:2617
+#: builtin/pack-objects.c:2665
msgid "limit pack window by memory in addition to object limit"
msgstr "除对象数é‡é™åˆ¶å¤–设置打包窗å£çš„内存é™åˆ¶"
-#: builtin/pack-objects.c:2619
+#: builtin/pack-objects.c:2667
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包å…许的 delta 链的最大长度"
-#: builtin/pack-objects.c:2621
+#: builtin/pack-objects.c:2669
msgid "reuse existing deltas"
msgstr "é‡ç”¨å·²å­˜åœ¨çš„ deltas"
-#: builtin/pack-objects.c:2623
+#: builtin/pack-objects.c:2671
msgid "reuse existing objects"
msgstr "é‡ç”¨å·²å­˜åœ¨çš„对象"
-#: builtin/pack-objects.c:2625
+#: builtin/pack-objects.c:2673
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 对象"
-#: builtin/pack-objects.c:2627
+#: builtin/pack-objects.c:2675
msgid "use threads when searching for best delta matches"
msgstr "使用线程查询最佳 delta 匹é…"
-#: builtin/pack-objects.c:2629
+#: builtin/pack-objects.c:2677
msgid "do not create an empty pack output"
msgstr "ä¸åˆ›å»ºç©ºçš„包输出"
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2679
msgid "read revision arguments from standard input"
msgstr "从标准输入读å–版本å·å‚æ•°"
-#: builtin/pack-objects.c:2633
+#: builtin/pack-objects.c:2681
msgid "limit the objects to those that are not yet packed"
msgstr "é™åˆ¶é‚£äº›å°šæœªæ‰“包的对象"
-#: builtin/pack-objects.c:2636
+#: builtin/pack-objects.c:2684
msgid "include objects reachable from any reference"
msgstr "包括å¯ä»¥ä»Žä»»ä½•å¼•ç”¨è®¿é—®åˆ°çš„对象"
-#: builtin/pack-objects.c:2639
+#: builtin/pack-objects.c:2687
msgid "include objects referred by reflog entries"
msgstr "包括被引用日志引用到的对象"
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2690
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的对象"
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2693
msgid "output pack to stdout"
msgstr "输出包到标准输出"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2695
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包对象的标签对象"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2697
msgid "keep unreachable objects"
msgstr "ç»´æŒä¸å¯è¾¾çš„对象"
-#: builtin/pack-objects.c:2650 parse-options.h:142
+#: builtin/pack-objects.c:2699
+msgid "pack loose unreachable objects"
+msgstr "打包æ¾æ•£çš„ä¸å¯è¾¾å¯¹è±¡"
+
+#: builtin/pack-objects.c:2700 parse-options.h:142
msgid "time"
msgstr "时间"
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2701
msgid "unpack unreachable objects newer than <time>"
msgstr "将比给定 <时间> 新的无法访问的对象解包"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2704
msgid "create thin packs"
msgstr "创建精简包"
-#: builtin/pack-objects.c:2656
+#: builtin/pack-objects.c:2706
msgid "create packs suitable for shallow fetches"
msgstr "创建适åˆæµ…克隆仓库获å–的包"
-#: builtin/pack-objects.c:2658
+#: builtin/pack-objects.c:2708
msgid "ignore packs that have companion .keep file"
msgstr "忽略é…有 .keep 文件的包"
-#: builtin/pack-objects.c:2660
+#: builtin/pack-objects.c:2710
msgid "pack compression level"
msgstr "打包压缩级别"
-#: builtin/pack-objects.c:2662
+#: builtin/pack-objects.c:2712
msgid "do not hide commits by grafts"
msgstr "显示被å«æŽ¥éšè—çš„æ交"
-#: builtin/pack-objects.c:2664
+#: builtin/pack-objects.c:2714
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引(如果有的è¯ï¼‰ä»¥æ高对象计数时的速度"
-#: builtin/pack-objects.c:2666
+#: builtin/pack-objects.c:2716
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的åŒæ—¶åˆ›å»º bitmap 索引"
-#: builtin/pack-objects.c:2757
+#: builtin/pack-objects.c:2829
msgid "Counting objects"
msgstr "对象计数中"
@@ -9230,15 +9646,11 @@ msgstr "正在删除é‡å¤å¯¹è±¡"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
-#: builtin/prune.c:105 builtin/worktree.c:125
-msgid "do not remove, show only"
-msgstr "ä¸åˆ é™¤ï¼Œåªæ˜¾ç¤º"
-
-#: builtin/prune.c:106 builtin/worktree.c:126
+#: builtin/prune.c:106 builtin/worktree.c:128
msgid "report pruned objects"
msgstr "报告清除的对象"
-#: builtin/prune.c:109 builtin/worktree.c:128
+#: builtin/prune.c:109 builtin/worktree.c:130
msgid "expire objects older than <time>"
msgstr "使早于给定时间的对象过期"
@@ -9258,14 +9670,10 @@ msgstr "å’Œåˆå¹¶ç›¸å…³çš„选项"
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用å˜åŸºæ“作å–代åˆå¹¶æ“作以åˆå…¥ä¿®æ”¹"
-#: builtin/pull.c:147 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:101
msgid "allow fast-forward"
msgstr "å…许快进å¼"
-#: builtin/pull.c:153
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "验è¯æŒ‡å®šçš„æ交是å¦åŒ…å«ä¸€ä¸ªæœ‰æ•ˆçš„ GPG ç­¾å"
-
#: builtin/pull.c:156
msgid "automatically stash/stash pop before and after rebase"
msgstr "自动在å˜åŸºæ“作å‰åŽæ‰§è¡Œ stash/stash pop"
@@ -9283,15 +9691,15 @@ msgstr "并å‘拉å–çš„å­æ¨¡ç»„çš„æ•°é‡"
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ff çš„å–值无效:%s"
-#: builtin/pull.c:379
+#: builtin/pull.c:379 git-sh-setup.sh:226
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr "无法通过å˜åŸºæ–¹å¼æ‹‰å–:您有未暂存的å˜æ›´ã€‚"
-#: builtin/pull.c:385
+#: builtin/pull.c:385 git-sh-setup.sh:252
msgid "Additionally, your index contains uncommitted changes."
msgstr "而且您的索引中包å«æœªæ交的å˜æ›´ã€‚"
-#: builtin/pull.c:387
+#: builtin/pull.c:387 git-sh-setup.sh:245
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr "无法通过å˜åŸºæ–¹å¼æ‹‰å–:您的索引中包å«æœªæ交的å˜æ›´ã€‚"
@@ -9343,7 +9751,7 @@ msgstr "è¯¦è§ git-pull(1)。"
msgid "<remote>"
msgstr "<远程>"
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<分支>"
@@ -9366,15 +9774,19 @@ msgstr ""
"您的é…置中指定è¦åˆå¹¶è¿œç¨‹çš„引用 '%s',\n"
"但是没有获å–到这个引用。"
-#: builtin/pull.c:864
+#: builtin/pull.c:820
+msgid "ignoring --verify-signatures for rebase"
+msgstr "为å˜åŸºæ“作忽略 --verify-signatures"
+
+#: builtin/pull.c:867
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash 选项åªåœ¨ä½¿ç”¨ --rebase 时有效。"
-#: builtin/pull.c:872
+#: builtin/pull.c:875
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未诞生的分支,å˜æ›´æ·»åŠ è‡³ç´¢å¼•ã€‚"
-#: builtin/pull.c:900
+#: builtin/pull.c:903
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -9384,7 +9796,7 @@ msgstr ""
"fetch 更新了当å‰çš„分支。快进您的工作区\n"
"至æ交 %s。"
-#: builtin/pull.c:905
+#: builtin/pull.c:908
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -9401,11 +9813,11 @@ msgstr ""
"$ git reset --hard\n"
"æ¢å¤ä¹‹å‰çš„状æ€ã€‚"
-#: builtin/pull.c:920
+#: builtin/pull.c:923
msgid "Cannot merge multiple branches into empty head."
msgstr "无法将多个分支åˆå¹¶åˆ°ç©ºåˆ†æ”¯ã€‚"
-#: builtin/pull.c:924
+#: builtin/pull.c:927
msgid "Cannot rebase onto multiple branches."
msgstr "无法å˜åŸºåˆ°å¤šä¸ªåˆ†æ”¯ã€‚"
@@ -9558,12 +9970,12 @@ msgstr "推é€åˆ° %s\n"
msgid "failed to push some refs to '%s'"
msgstr "无法推é€ä¸€äº›å¼•ç”¨åˆ° '%s'"
-#: builtin/push.c:365
+#: builtin/push.c:366
#, c-format
msgid "bad repository '%s'"
msgstr "å的仓库 '%s'"
-#: builtin/push.c:366
+#: builtin/push.c:367
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -9584,103 +9996,115 @@ msgstr ""
"\n"
" git push <å称>\n"
-#: builtin/push.c:381
+#: builtin/push.c:385
msgid "--all and --tags are incompatible"
msgstr "--all å’Œ --tags ä¸å…¼å®¹"
-#: builtin/push.c:382
+#: builtin/push.c:386
msgid "--all can't be combined with refspecs"
msgstr "--all ä¸èƒ½å’Œå¼•ç”¨è§„æ ¼åŒæ—¶ä½¿ç”¨"
-#: builtin/push.c:387
+#: builtin/push.c:391
msgid "--mirror and --tags are incompatible"
msgstr "--mirror å’Œ --tags ä¸å…¼å®¹"
-#: builtin/push.c:388
+#: builtin/push.c:392
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror ä¸èƒ½å’Œå¼•ç”¨è§„æ ¼åŒæ—¶ä½¿ç”¨"
-#: builtin/push.c:393
+#: builtin/push.c:397
msgid "--all and --mirror are incompatible"
msgstr "--all å’Œ --mirror ä¸å…¼å®¹"
-#: builtin/push.c:505
+#: builtin/push.c:515
msgid "repository"
msgstr "仓库"
-#: builtin/push.c:506 builtin/send-pack.c:161
+#: builtin/push.c:516 builtin/send-pack.c:161
msgid "push all refs"
msgstr "推é€æ‰€æœ‰å¼•ç”¨"
-#: builtin/push.c:507 builtin/send-pack.c:163
+#: builtin/push.c:517 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "é•œåƒæ‰€æœ‰å¼•ç”¨"
-#: builtin/push.c:509
+#: builtin/push.c:519
msgid "delete refs"
msgstr "删除引用"
-#: builtin/push.c:510
+#: builtin/push.c:520
msgid "push tags (can't be used with --all or --mirror)"
msgstr "推é€æ ‡ç­¾ï¼ˆä¸èƒ½ä½¿ç”¨ --all or --mirror)"
-#: builtin/push.c:513 builtin/send-pack.c:164
+#: builtin/push.c:523 builtin/send-pack.c:164
msgid "force updates"
msgstr "强制更新"
-#: builtin/push.c:515 builtin/send-pack.c:175
+#: builtin/push.c:525 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "引用å>:<期望值"
-#: builtin/push.c:516 builtin/send-pack.c:176
+#: builtin/push.c:526 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "è¦æ±‚引用旧的å–值为设定值"
-#: builtin/push.c:519
+#: builtin/push.c:529
msgid "control recursive pushing of submodules"
msgstr "控制å­æ¨¡ç»„的递归推é€"
-#: builtin/push.c:521 builtin/send-pack.c:169
+#: builtin/push.c:531 builtin/send-pack.c:169
msgid "use thin pack"
msgstr "使用精简打包"
-#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
+#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "接收包程åº"
-#: builtin/push.c:524
+#: builtin/push.c:534
msgid "set upstream for git pull/status"
msgstr "设置 git pull/status 的上游"
-#: builtin/push.c:527
+#: builtin/push.c:537
msgid "prune locally removed refs"
msgstr "清除本地删除的引用"
-#: builtin/push.c:529
+#: builtin/push.c:539
msgid "bypass pre-push hook"
msgstr "绕过 pre-push é’©å­"
-#: builtin/push.c:530
+#: builtin/push.c:540
msgid "push missing but relevant tags"
msgstr "推é€ç¼ºå¤±ä½†æœ‰å…³çš„标签"
-#: builtin/push.c:533 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "用 GPG 为推é€ç­¾å"
-#: builtin/push.c:535 builtin/send-pack.c:170
+#: builtin/push.c:545 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "需è¦è¿œç«¯æ”¯æŒåŽŸå­äº‹åŠ¡"
-#: builtin/push.c:549
+#: builtin/push.c:546
+msgid "server-specific"
+msgstr "server-specific"
+
+#: builtin/push.c:546
+msgid "option to transmit"
+msgstr "传输选项"
+
+#: builtin/push.c:560
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete 与 --allã€--mirror åŠ --tags ä¸å…¼å®¹"
-#: builtin/push.c:551
+#: builtin/push.c:562
msgid "--delete doesn't make sense without any refs"
msgstr "--delete 未接任何引用没有æ„义"
+#: builtin/push.c:579
+msgid "push options must not have new line characters"
+msgstr "推é€é€‰é¡¹ä¸èƒ½æœ‰æ¢è¡Œç¬¦"
+
#: builtin/read-tree.c:37
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
@@ -9759,11 +10183,11 @@ msgstr "调试 unpack-trees"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:1719
+#: builtin/receive-pack.c:1843
msgid "quiet"
msgstr "é™é»˜æ¨¡å¼"
-#: builtin/receive-pack.c:1733
+#: builtin/receive-pack.c:1857
msgid "You must specify a directory."
msgstr "您必须指定一个目录。"
@@ -9912,12 +10336,12 @@ msgstr "指定一个 master 分支并使用 --mirror 选项没有æ„义"
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "指定è¦è·Ÿè¸ªçš„分支åªåœ¨ä¸ŽèŽ·å–é•œåƒåŒæ—¶ä½¿ç”¨æ‰æœ‰æ„义"
-#: builtin/remote.c:190 builtin/remote.c:633
+#: builtin/remote.c:190 builtin/remote.c:629
#, c-format
msgid "remote %s already exists."
msgstr "远程 %s å·²ç»å­˜åœ¨ã€‚"
-#: builtin/remote.c:194 builtin/remote.c:637
+#: builtin/remote.c:194 builtin/remote.c:633
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„远程å称"
@@ -9940,17 +10364,17 @@ msgstr "(匹é…)"
msgid "(delete)"
msgstr "(删除)"
-#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
#, c-format
msgid "No such remote: %s"
msgstr "没有这样的远程:%s"
-#: builtin/remote.c:643
+#: builtin/remote.c:639
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "ä¸èƒ½é‡å‘½åé…ç½®å°èŠ‚ '%s' 到 '%s'"
-#: builtin/remote.c:663
+#: builtin/remote.c:659
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -9961,17 +10385,17 @@ msgstr ""
"\t%s\n"
"\t如果必è¦è¯·æ‰‹åŠ¨æ›´æ–°é…置。"
-#: builtin/remote.c:699
+#: builtin/remote.c:695
#, c-format
msgid "deleting '%s' failed"
msgstr "删除 '%s' 失败"
-#: builtin/remote.c:733
+#: builtin/remote.c:729
#, c-format
msgid "creating '%s' failed"
msgstr "创建 '%s' 失败"
-#: builtin/remote.c:796
+#: builtin/remote.c:792
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -9981,133 +10405,144 @@ msgid_plural ""
msgstr[0] "注æ„:ref/remotes 层级之外的一个分支未被移除。è¦åˆ é™¤å®ƒï¼Œä½¿ç”¨ï¼š"
msgstr[1] "注æ„:ref/remotes 层级之外的一些分支未被移除。è¦åˆ é™¤å®ƒä»¬ï¼Œä½¿ç”¨ï¼š"
-#: builtin/remote.c:810
+#: builtin/remote.c:806
#, c-format
msgid "Could not remove config section '%s'"
msgstr "ä¸èƒ½ç§»é™¤é…ç½®å°èŠ‚ '%s'"
-#: builtin/remote.c:911
+#: builtin/remote.c:907
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 新的(下一次获å–将存储于 remotes/%s)"
-#: builtin/remote.c:914
+#: builtin/remote.c:910
msgid " tracked"
msgstr " 已跟踪"
-#: builtin/remote.c:916
+#: builtin/remote.c:912
msgid " stale (use 'git remote prune' to remove)"
msgstr " 过时(使用 'git remote prune' æ¥ç§»é™¤ï¼‰"
-#: builtin/remote.c:918
+#: builtin/remote.c:914
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:959
+#: builtin/remote.c:955
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "无效的 branch.%s.merge,ä¸èƒ½å˜åŸºåˆ°ä¸€ä¸ªä»¥ä¸Šçš„分支"
-#: builtin/remote.c:967
+#: builtin/remote.c:963
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "交互å¼å˜åŸºåˆ°è¿œç¨‹ %s"
-#: builtin/remote.c:971
+#: builtin/remote.c:964
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "å˜åŸºåˆ°è¿œç¨‹ %s"
+
+#: builtin/remote.c:967
#, c-format
msgid " merges with remote %s"
msgstr " 与远程 %s åˆå¹¶"
-#: builtin/remote.c:972
-msgid " and with remote"
-msgstr " 且有远程"
-
-#: builtin/remote.c:974
+#: builtin/remote.c:970
#, c-format
msgid "merges with remote %s"
msgstr "与远程 %s åˆå¹¶"
-#: builtin/remote.c:975
-msgid " and with remote"
-msgstr " 且有远程"
+#: builtin/remote.c:973
+#, c-format
+msgid "%-*s and with remote %s\n"
+msgstr "%-*s 以åŠå’Œè¿œç¨‹ %s\n"
-#: builtin/remote.c:1021
+#: builtin/remote.c:1016
msgid "create"
msgstr "创建"
-#: builtin/remote.c:1024
+#: builtin/remote.c:1019
msgid "delete"
msgstr "删除"
-#: builtin/remote.c:1028
+#: builtin/remote.c:1023
msgid "up to date"
msgstr "最新"
-#: builtin/remote.c:1031
+#: builtin/remote.c:1026
msgid "fast-forwardable"
msgstr "å¯å¿«è¿›"
-#: builtin/remote.c:1034
+#: builtin/remote.c:1029
msgid "local out of date"
msgstr "本地已过时"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1036
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s 强制推é€è‡³ %-*s (%s)"
-#: builtin/remote.c:1044
+#: builtin/remote.c:1039
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s 推é€è‡³ %-*s (%s)"
-#: builtin/remote.c:1048
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s 强制推é€è‡³ %s"
-#: builtin/remote.c:1051
+#: builtin/remote.c:1046
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s 推é€è‡³ %s"
-#: builtin/remote.c:1119
+#: builtin/remote.c:1114
msgid "do not query remotes"
msgstr "ä¸æŸ¥è¯¢è¿œç¨‹"
-#: builtin/remote.c:1146
+#: builtin/remote.c:1141
#, c-format
msgid "* remote %s"
msgstr "* 远程 %s"
-#: builtin/remote.c:1147
+#: builtin/remote.c:1142
#, c-format
msgid " Fetch URL: %s"
msgstr " 获å–地å€ï¼š%s"
-#: builtin/remote.c:1148 builtin/remote.c:1301
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
msgid "(no URL)"
msgstr "(æ—  URL)"
#. TRANSLATORS: the colon ':' should align with
#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1159 builtin/remote.c:1161
+#: builtin/remote.c:1154 builtin/remote.c:1156
#, c-format
msgid " Push URL: %s"
msgstr " 推é€åœ°å€ï¼š%s"
-#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
+#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 分支:%s"
-#: builtin/remote.c:1169
+# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
+#: builtin/remote.c:1158
+msgid "(not queried)"
+msgstr "(未查询)"
+
+#: builtin/remote.c:1160
+msgid "(unknown)"
+msgstr "(未知)"
+
+#: builtin/remote.c:1164
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 分支(远程 HEAD 模糊,å¯èƒ½æ˜¯ä¸‹åˆ—中的一个):\n"
-#: builtin/remote.c:1181
+#: builtin/remote.c:1176
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
@@ -10115,151 +10550,151 @@ msgstr[0] " 远程分支:%s"
msgstr[1] " 远程分支:%s"
# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
-#: builtin/remote.c:1184 builtin/remote.c:1211
+#: builtin/remote.c:1179 builtin/remote.c:1206
msgid " (status not queried)"
msgstr "(状æ€æœªæŸ¥è¯¢ï¼‰"
-#: builtin/remote.c:1193
+#: builtin/remote.c:1188
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 为 'git pull' é…置的本地分支:"
msgstr[1] " 为 'git pull' é…置的本地分支:"
-#: builtin/remote.c:1201
+#: builtin/remote.c:1196
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本地引用将在 'git push' 时被镜åƒ"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1203
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " 为 'git push' é…置的本地引用%s:"
msgstr[1] " 为 'git push' é…置的本地引用%s:"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1224
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "æ ¹æ®è¿œç¨‹è®¾ç½® refs/remotes/<å称>/HEAD"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1226
msgid "delete refs/remotes/<name>/HEAD"
msgstr "删除 refs/remotes/<å称>/HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1241
msgid "Cannot determine remote HEAD"
msgstr "无法确定远程 HEAD"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1243
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
-#: builtin/remote.c:1258
+#: builtin/remote.c:1253
#, c-format
msgid "Could not delete %s"
msgstr "无法删除 %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1261
#, c-format
msgid "Not a valid ref: %s"
msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆå¼•ç”¨ï¼š%s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1263
#, c-format
msgid "Could not setup %s"
msgstr "ä¸èƒ½è®¾ç½® %s"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: builtin/remote.c:1286
+#: builtin/remote.c:1281
#, c-format
msgid " %s will become dangling!"
msgstr " %s å°†æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: builtin/remote.c:1287
+#: builtin/remote.c:1282
#, c-format
msgid " %s has become dangling!"
msgstr " %s å·²æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1292
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1293
#, c-format
msgid "URL: %s"
msgstr "URL:%s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1309
#, c-format
msgid " * [would prune] %s"
msgstr " * [将删除] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1312
#, c-format
msgid " * [pruned] %s"
msgstr " * [已删除] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1357
msgid "prune remotes after fetching"
msgstr "抓å–åŽæ¸…除远程"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
#, c-format
msgid "No such remote '%s'"
msgstr "没有此远程 '%s'"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1436
msgid "add branch"
msgstr "添加分支"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1443
msgid "no remote specified"
msgstr "未指定远程"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1460
msgid "query push URLs rather than fetch URLs"
msgstr "æŸ¥è¯¢æŽ¨é€ URL 地å€ï¼Œè€ŒéžèŽ·å– URL 地å€"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1462
msgid "return all URLs"
msgstr "返回所有 URL 地å€"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1490
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "没有给远程仓库 '%s' 设定 URL"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1516
msgid "manipulate push URLs"
msgstr "æ“ä½œæŽ¨é€ URLS"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1518
msgid "add URL"
msgstr "添加 URL"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1520
msgid "delete URLs"
msgstr "删除 URLS"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1527
msgid "--add --delete doesn't make sense"
msgstr "--add --delete æ— æ„义"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1568
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "无效的旧 URL 匹é…模版:%s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1576
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL:%s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1578
msgid "Will not delete all non-push URLs"
msgstr "å°†ä¸ä¼šåˆ é™¤æ‰€æœ‰éžæŽ¨é€ URL 地å€"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1592
msgid "be verbose; must be placed before a subcommand"
msgstr "冗长输出;必须置于å­å‘½ä»¤ä¹‹å‰"
@@ -10267,78 +10702,86 @@ msgstr "冗长输出;必须置于å­å‘½ä»¤ä¹‹å‰"
msgid "git repack [<options>]"
msgstr "git repack [<选项>]"
-#: builtin/repack.c:159
+#: builtin/repack.c:160
msgid "pack everything in a single pack"
msgstr "所有内容打包到一个包文件中"
-#: builtin/repack.c:161
+#: builtin/repack.c:162
msgid "same as -a, and turn unreachable objects loose"
msgstr "å’Œ -a 相åŒï¼Œå¹¶å°†ä¸å¯è¾¾çš„对象设为æ¾æ•£å¯¹è±¡"
-#: builtin/repack.c:164
+#: builtin/repack.c:165
msgid "remove redundant packs, and run git-prune-packed"
msgstr "删除多余的包,è¿è¡Œ git-prune-packed"
-#: builtin/repack.c:166
+#: builtin/repack.c:167
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "å‘ git-pack-objects 传递å‚æ•° --no-reuse-delta"
-#: builtin/repack.c:168
+#: builtin/repack.c:169
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "å‘ git-pack-objects 传递å‚æ•° --no-reuse-object"
-#: builtin/repack.c:170
+#: builtin/repack.c:171
msgid "do not run git-update-server-info"
msgstr "ä¸è¿è¡Œ git-update-server-info"
-#: builtin/repack.c:173
+#: builtin/repack.c:174
msgid "pass --local to git-pack-objects"
msgstr "å‘ git-pack-objects 传递å‚æ•° --local"
-#: builtin/repack.c:175
+#: builtin/repack.c:176
msgid "write bitmap index"
msgstr "写 bitmap 索引"
-#: builtin/repack.c:176
+#: builtin/repack.c:177
msgid "approxidate"
msgstr "近似日期"
-#: builtin/repack.c:177
+#: builtin/repack.c:178
msgid "with -A, do not loosen objects older than this"
msgstr "使用 -A,ä¸è¦å°†æ—©äºŽç»™å®šæ—¶é—´çš„对象过期"
-#: builtin/repack.c:179
+#: builtin/repack.c:180
+msgid "with -a, repack unreachable objects"
+msgstr "使用 -a ,é‡æ–°å¯¹ä¸å¯è¾¾å¯¹è±¡æ‰“包"
+
+#: builtin/repack.c:182
msgid "size of the window used for delta compression"
msgstr "用于增é‡åŽ‹ç¼©çš„窗å£å€¼"
-#: builtin/repack.c:180 builtin/repack.c:184
+#: builtin/repack.c:183 builtin/repack.c:187
msgid "bytes"
msgstr "字节"
-#: builtin/repack.c:181
+#: builtin/repack.c:184
msgid "same as the above, but limit memory size instead of entries count"
msgstr "和上é¢çš„相似,但é™åˆ¶å†…存大å°è€Œéžæ¡ç›®æ•°"
-#: builtin/repack.c:183
+#: builtin/repack.c:186
msgid "limits the maximum delta depth"
msgstr "é™åˆ¶æœ€å¤§å¢žé‡æ·±åº¦"
-#: builtin/repack.c:185
+#: builtin/repack.c:188
msgid "maximum size of each packfile"
msgstr "æ¯ä¸ªåŒ…文件的最大尺寸"
-#: builtin/repack.c:187
+#: builtin/repack.c:190
msgid "repack objects in packs marked with .keep"
msgstr "对标记为 .keep 的包中的对象é‡æ–°æ‰“包"
-#: builtin/repack.c:197
+#: builtin/repack.c:200
msgid "cannot delete packs in a precious-objects repo"
msgstr "ä¸èƒ½åˆ é™¤çå“仓库中的打包文件"
-#: builtin/repack.c:381
+#: builtin/repack.c:204
+msgid "--keep-unreachable and -A are incompatible"
+msgstr "--keep-unreachable å’Œ -A ä¸å…¼å®¹"
+
+#: builtin/repack.c:391 builtin/worktree.c:115
#, c-format
-msgid "removing '%s' failed"
-msgstr "删除 '%s' 失败"
+msgid "failed to remove '%s'"
+msgstr "无法删除 '%s'"
#: builtin/replace.c:19
msgid "git replace [-f] <object> <replacement>"
@@ -10560,7 +11003,7 @@ msgstr "ä¸èƒ½é‡ç½®ç´¢å¼•æ–‡ä»¶è‡³ç‰ˆæœ¬ '%s'。"
msgid "Could not write new index file."
msgstr "ä¸èƒ½å†™å…¥æ–°çš„索引文件。"
-#: builtin/rev-list.c:350
+#: builtin/rev-list.c:362
msgid "rev-list does not support display of notes"
msgstr "rev-list ä¸æ”¯æŒæ˜¾ç¤ºæ³¨è§£"
@@ -10651,31 +11094,27 @@ msgstr "选项"
msgid "option for merge strategy"
msgstr "åˆå¹¶ç­–略的选项"
-#: builtin/revert.c:104
+#: builtin/revert.c:100
msgid "append commit name"
msgstr "追加æ交å称"
-#: builtin/revert.c:106
+#: builtin/revert.c:102
msgid "preserve initially empty commits"
msgstr "ä¿ç•™åˆå§‹åŒ–的空æ交"
-#: builtin/revert.c:107
+#: builtin/revert.c:103
msgid "allow commits with empty messages"
msgstr "å…许æ交说明为空"
-#: builtin/revert.c:108
+#: builtin/revert.c:104
msgid "keep redundant, empty commits"
msgstr "ä¿æŒå¤šä½™çš„ã€ç©ºçš„æ交"
-#: builtin/revert.c:112
-msgid "program error"
-msgstr "程åºé”™è¯¯"
-
-#: builtin/revert.c:197
+#: builtin/revert.c:192
msgid "revert failed"
msgstr "还原失败"
-#: builtin/revert.c:212
+#: builtin/revert.c:207
msgid "cherry-pick failed"
msgstr "拣选失败"
@@ -10960,12 +11399,12 @@ msgstr "跳过和移除所有的注释行"
msgid "prepend comment character and space to each line"
msgstr "为æ¯ä¸€è¡Œçš„行首添加注释符和空格"
-#: builtin/submodule--helper.c:24
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923
#, c-format
msgid "No such ref: %s"
msgstr "没有这样的引用:%s"
-#: builtin/submodule--helper.c:31
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "期望一个完整的引用å称,å´å¾—到 %s"
@@ -10975,8 +11414,8 @@ msgstr "期望一个完整的引用å称,å´å¾—到 %s"
msgid "cannot strip one component off url '%s'"
msgstr "无法从 url '%s' 剥离一个组件"
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
-#: builtin/submodule--helper.c:486
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
+#: builtin/submodule--helper.c:483
msgid "alternative anchor for relative paths"
msgstr "相对路径的替代锚记(anchor)"
@@ -10984,152 +11423,175 @@ msgstr "相对路径的替代锚记(anchor)"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "在 .gitmodules 中未找到å­æ¨¡ç»„ '%s' çš„ url"
-#: builtin/submodule--helper.c:366
+#: builtin/submodule--helper.c:364
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "无法为å­æ¨¡ç»„ '%s' 注册 url"
-#: builtin/submodule--helper.c:370
+#: builtin/submodule--helper.c:368
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "å­æ¨¡ç»„ '%s'(%s)未对路径 '%s' 注册\n"
#
-#: builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:378
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "警告:建议å­æ¨¡ç»„ '%s' 使用命令更新模å¼\n"
-#: builtin/submodule--helper.c:387
+#: builtin/submodule--helper.c:385
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "无法为å­æ¨¡ç»„ '%s' 注册更新模å¼"
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:404
msgid "Suppress output for initializing a submodule"
msgstr "åˆå§‹åŒ–å­æ¨¡ç»„时抑制输出"
-#: builtin/submodule--helper.c:411
+#: builtin/submodule--helper.c:409
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<路径>]"
-#: builtin/submodule--helper.c:432
+#: builtin/submodule--helper.c:430
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <路径>"
-#: builtin/submodule--helper.c:438
+#: builtin/submodule--helper.c:436
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "在 .gitmodules 中没有å‘现路径 '%s' çš„å­æ¨¡ç»„映射"
-#: builtin/submodule--helper.c:489
+#: builtin/submodule--helper.c:486
msgid "where the new submodule will be cloned to"
msgstr "æ–°çš„å­æ¨¡ç»„å°†è¦å…‹éš†çš„路径"
-#: builtin/submodule--helper.c:492
+#: builtin/submodule--helper.c:489
msgid "name of the new submodule"
msgstr "æ–°å­æ¨¡ç»„çš„å称"
-#: builtin/submodule--helper.c:495
+#: builtin/submodule--helper.c:492
msgid "url where to clone the submodule from"
msgstr "克隆å­æ¨¡ç»„çš„ url 地å€"
-#: builtin/submodule--helper.c:501
+#: builtin/submodule--helper.c:498
msgid "depth for shallow clones"
msgstr "浅克隆的深度"
-#: builtin/submodule--helper.c:507
+#: builtin/submodule--helper.c:504
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
-msgstr "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] [--name <åå­—>] [--depth <深度>] --url <url> --path <路径>"
+msgstr ""
+"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
+"[--name <åå­—>] [--depth <深度>] --url <url> --path <路径>"
-#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
+#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
#, c-format
msgid "could not create directory '%s'"
msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'"
-#: builtin/submodule--helper.c:534
+#: builtin/submodule--helper.c:531
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "无法克隆 '%s' 到å­æ¨¡ç»„路径 '%s'"
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:547
#, c-format
msgid "cannot open file '%s'"
msgstr "无法打开文件 '%s'"
-#: builtin/submodule--helper.c:555
+#: builtin/submodule--helper.c:552
#, c-format
msgid "could not close file %s"
msgstr "无法关闭文件 %s"
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:559
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "无法得到 '%s' çš„å­æ¨¡ç»„目录"
-#: builtin/submodule--helper.c:609
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "å­æ¨¡ç»„ '%s' 尚未åˆå§‹åŒ–"
-#: builtin/submodule--helper.c:613
+#: builtin/submodule--helper.c:615
msgid "Maybe you want to use 'update --init'?"
msgstr "也许您想è¦æ‰§è¡Œ 'update --init'?"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:641
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "略过未åˆå¹¶çš„å­æ¨¡ç»„ %s"
-#: builtin/submodule--helper.c:660
+#: builtin/submodule--helper.c:662
#, c-format
msgid "Skipping submodule '%s'"
msgstr "略过å­æ¨¡ç»„ '%s'"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:792
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "克隆 '%s' 失败。按计划é‡è¯•"
+
+#: builtin/submodule--helper.c:803
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "第二次å°è¯•å…‹éš† '%s' 失败,退出"
+
+#: builtin/submodule--helper.c:824
msgid "path into the working tree"
msgstr "到工作区的路径"
-#: builtin/submodule--helper.c:771
+#: builtin/submodule--helper.c:827
msgid "path into the working tree, across nested submodule boundaries"
msgstr "工作区中的路径,递归嵌套å­æ¨¡ç»„"
-#: builtin/submodule--helper.c:775
+#: builtin/submodule--helper.c:831
msgid "rebase, merge, checkout or none"
msgstr "rebaseã€mergeã€checkout 或 none"
-#: builtin/submodule--helper.c:779
+#: builtin/submodule--helper.c:835
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/submodule--helper.c:782
+#: builtin/submodule--helper.c:838
msgid "parallel jobs"
msgstr "并å‘任务"
-#: builtin/submodule--helper.c:783
+#: builtin/submodule--helper.c:840
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "åˆå§‹å…‹éš†æ˜¯å¦åº”该éµå®ˆæŽ¨è的浅克隆选项"
+
+#: builtin/submodule--helper.c:841
msgid "don't print cloning progress"
msgstr "ä¸è¦è¾“出克隆进度"
-#: builtin/submodule--helper.c:788
+#: builtin/submodule--helper.c:846
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:798
+#: builtin/submodule--helper.c:856
msgid "bad value for update parameter"
msgstr "update å‚æ•°å–值错误"
-#: builtin/submodule--helper.c:855
+#: builtin/submodule--helper.c:927
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr "å­æ¨¡ç»„(%s)的分支é…置为继承上级项目的分支,但是上级项目ä¸åœ¨ä»»ä½•åˆ†æ”¯ä¸Š"
+
+#: builtin/submodule--helper.c:977
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "submodule-helper å­å‘½ä»¤å¿…须由å¦å¤–çš„å­å‘½ä»¤è°ƒç”¨"
-#: builtin/submodule--helper.c:862
+#: builtin/submodule--helper.c:984
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ submodule--helper å­å‘½ä»¤"
@@ -11469,14 +11931,6 @@ msgstr "<å­˜å–模å¼>,<对象>,<路径>"
msgid "add the specified entry to the index"
msgstr "添加指定的æ¡ç›®åˆ°ç´¢å¼•åŒº"
-#: builtin/update-index.c:958
-msgid "(+/-)x"
-msgstr "(+/-)x"
-
-#: builtin/update-index.c:959
-msgid "override the executable bit of the listed files"
-msgstr "覆盖列表里文件的å¯æ‰§è¡Œä½"
-
#: builtin/update-index.c:963
msgid "mark files as \"not changing\""
msgstr "把文件标记为 \"没有å˜æ›´\""
@@ -11635,82 +12089,109 @@ msgid "git worktree add [<options>] <path> [<branch>]"
msgstr "git worktree add [<选项>] <路径> [<分支>]"
#: builtin/worktree.c:16
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<选项>]"
+
+#: builtin/worktree.c:17
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<选项>] <路径>"
+
+#: builtin/worktree.c:18
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<选项>]"
-#: builtin/worktree.c:17
-msgid "git worktree list [<options>]"
-msgstr "git worktree list [<选项>]"
+#: builtin/worktree.c:19
+msgid "git worktree unlock <path>"
+msgstr "git worktree unlock <路径>"
-#: builtin/worktree.c:40
+#: builtin/worktree.c:42
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "删除工作区/%s:ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„目录"
-#: builtin/worktree.c:46
+#: builtin/worktree.c:48
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "删除 worktrees/%s:gitdir 文件ä¸å­˜åœ¨"
-#: builtin/worktree.c:51
+#: builtin/worktree.c:53
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "删除 worktrees/%sï¼šæ— æ³•è¯»å– gitdir 文件 (%s)"
-#: builtin/worktree.c:62
+#: builtin/worktree.c:64
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "删除 worktrees/%s:无效的 gitdir 文件"
-#: builtin/worktree.c:78
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "删除 worktrees/%s:gitdir 文件的指å‘ä¸å­˜åœ¨"
-#: builtin/worktree.c:113
-#, c-format
-msgid "failed to remove '%s'"
-msgstr "无法删除 '%s'"
-
-#: builtin/worktree.c:202
+#: builtin/worktree.c:204
#, c-format
msgid "'%s' already exists"
msgstr "'%s' å·²ç»å­˜åœ¨"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:236
#, c-format
msgid "could not create directory of '%s'"
msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'"
-#: builtin/worktree.c:270
+#: builtin/worktree.c:272
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "准备 %s (标识符 %s)"
-#: builtin/worktree.c:322
+#: builtin/worktree.c:323
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "检出分支 <branch> å³ä½¿å·²ç»è¢«æ£€å‡ºåˆ°å…¶å®ƒå·¥ä½œåŒº"
-#: builtin/worktree.c:324
+#: builtin/worktree.c:325
msgid "create a new branch"
msgstr "创建一个新分支"
-#: builtin/worktree.c:326
+#: builtin/worktree.c:327
msgid "create or reset a branch"
msgstr "创建或é‡ç½®ä¸€ä¸ªåˆ†æ”¯"
-#: builtin/worktree.c:327
-msgid "detach HEAD at named commit"
-msgstr "HEAD 从指定的æ交分离"
-
-#: builtin/worktree.c:328
+#: builtin/worktree.c:329
msgid "populate the new working tree"
msgstr "生æˆæ–°çš„工作区"
-#: builtin/worktree.c:336
+#: builtin/worktree.c:337
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-bã€-B å’Œ --detach 是互斥的"
+#: builtin/worktree.c:470
+msgid "reason for locking"
+msgstr "é”定原因"
+
+#: builtin/worktree.c:482 builtin/worktree.c:515
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªå·¥ä½œåŒº"
+
+#: builtin/worktree.c:484 builtin/worktree.c:517
+msgid "The main working tree cannot be locked or unlocked"
+msgstr "主工作区无法被加é”或解é”"
+
+#: builtin/worktree.c:489
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "'%s' 已被é”定,原因:%s"
+
+#: builtin/worktree.c:491
+#, c-format
+msgid "'%s' is already locked"
+msgstr "'%s' 已被é”定"
+
+#: builtin/worktree.c:519
+#, c-format
+msgid "'%s' is not locked"
+msgstr "'%s' 未被é”定"
+
#: builtin/write-tree.c:13
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<å‰ç¼€>/]"
@@ -11727,6 +12208,26 @@ msgstr "å°† <å‰ç¼€> å­ç›®å½•å†…容写到一个树对象"
msgid "only useful for debugging"
msgstr "åªå¯¹è°ƒè¯•æœ‰ç”¨"
+#: upload-pack.c:20
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<选项>] <目录>"
+
+#: upload-pack.c:837
+msgid "quit after a single request/response exchange"
+msgstr "在一次å•ç‹¬çš„请求/å“应(request/response)交æ¢åŽé€€å‡º"
+
+#: upload-pack.c:839
+msgid "exit immediately after initial ref advertisement"
+msgstr "在åˆå§‹çš„引用广告åŽç«‹å³é€€å‡º"
+
+#: upload-pack.c:841
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "ä¸è¦å°è¯• <directory>/.git/ 如果 <directory> ä¸æ˜¯ä¸€ä¸ª Git 目录"
+
+#: upload-pack.c:843
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "ä¸æ´»åŠ¨ <n> 秒钟åŽç»ˆæ­¢ä¼ è¾“"
+
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "调试信æ¯è¾“出到标准错误"
@@ -11741,7 +12242,7 @@ msgstr ""
"查看 'git help <命令>' 或 'git help <概念>' 以获å–给定å­å‘½ä»¤æˆ–概念的\n"
"帮助。"
-#: http.c:322
+#: http.c:323
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "ä¸æ”¯æŒå…¬é’¥æ–‡ä»¶é”定,因为 cURL < 7.44.0"
@@ -11873,7 +12374,7 @@ msgstr "用 <n> ä½æ•°å­—显示 SHA-1 哈希值"
msgid "update the index with reused conflict resolution if possible"
msgstr "如果å¯èƒ½ï¼Œé‡ç”¨å†²çªè§£å†³æ›´æ–°ç´¢å¼•"
-#: git-bisect.sh:55
+#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "您需è¦æ‰§è¡Œ \"git bisect start\" æ¥å¼€å§‹"
@@ -11881,56 +12382,57 @@ msgstr "您需è¦æ‰§è¡Œ \"git bisect start\" æ¥å¼€å§‹"
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:61
+#: git-bisect.sh:60
msgid "Do you want me to do it for you [Y/n]? "
msgstr "您想让我为您这样åšä¹ˆ[Y/n]? "
-#: git-bisect.sh:122
+#: git-bisect.sh:121
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "未能识别的选项:'$arg'"
-#: git-bisect.sh:126
+#: git-bisect.sh:125
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "'$arg' 看起æ¥ä¸åƒæ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„版本"
-#: git-bisect.sh:155
+#: git-bisect.sh:154
msgid "Bad HEAD - I need a HEAD"
msgstr "åçš„ HEAD - 我需è¦ä¸€ä¸ª HEAD"
-#: git-bisect.sh:168
+#: git-bisect.sh:167
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
msgstr "检出 '$start_head' 失败。å°è¯• 'git bisect reset <有效分支>'。"
-#: git-bisect.sh:178
+#: git-bisect.sh:177
msgid "won't bisect on cg-seek'ed tree"
msgstr "ä¸ä¼šåœ¨åšäº† cg-seek 的树上åšäºŒåˆ†æŸ¥æ‰¾"
-#: git-bisect.sh:182
+#: git-bisect.sh:181
msgid "Bad HEAD - strange symbolic ref"
msgstr "åçš„ HEAD - 奇怪的符å·å¼•ç”¨"
-#: git-bisect.sh:234
+#: git-bisect.sh:233
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "åçš„ bisect_write å‚数:$state"
-#: git-bisect.sh:263
+#: git-bisect.sh:262
#, sh-format
msgid "Bad rev input: $arg"
-msgstr "输入å的版本:$arg"
+msgstr "å的输入版本:$arg"
-#: git-bisect.sh:278
-msgid "Please call 'bisect_state' with at least one argument."
-msgstr "请在调用 'bisect_state' 时跟至少一个å‚数。"
+#: git-bisect.sh:281
+#, sh-format
+msgid "Bad rev input: $bisected_head"
+msgstr "å的输入版本:$bisected_head"
#: git-bisect.sh:290
#, sh-format
msgid "Bad rev input: $rev"
-msgstr "输入å的版本:$rev"
+msgstr "å的输入版本:$rev"
#: git-bisect.sh:299
#, sh-format
@@ -12069,7 +12571,45 @@ msgstr ""
"å‚æ•° $arg 对命令 'git bisect terms' 无效。\n"
"支æŒçš„选项有:--term-good|--term-old å’Œ --term-bad|--term-new。"
-#: git-rebase.sh:57
+#: git-merge-octopus.sh:46
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr "错误:您对下列文件的本地修改将被åˆå¹¶æ“作覆盖"
+
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr "自动åˆå¹¶æœªç”Ÿæ•ˆã€‚"
+
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an Octopus."
+msgstr "ä¸åº”该执行章鱼å¼åˆå¹¶ã€‚"
+
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "无法找到和 $pretty_name 的基线æ交"
+
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up-to-date with $pretty_name"
+msgstr "å·²ç»å’Œ $pretty_name ä¿æŒä¸€è‡´"
+
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "快进至:$pretty_name"
+
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "å°è¯•å’Œ $pretty_name 的简å•åˆå¹¶"
+
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
+msgstr "简å•åˆå¹¶æœªç”Ÿæ•ˆï¼Œå°è¯•è‡ªåŠ¨åˆå¹¶ã€‚"
+
+#: git-rebase.sh:56
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
@@ -12080,16 +12620,21 @@ msgstr ""
"如果您想跳过此补ä¸ï¼Œåˆ™æ‰§è¡Œ \"git rebase --skip\"。\n"
"è¦æ¢å¤åŽŸåˆ†æ”¯å¹¶åœæ­¢å˜åŸºï¼Œæ‰§è¡Œ \"git rebase --abort\"。"
-#: git-rebase.sh:168
+#: git-rebase.sh:156 git-rebase.sh:395
+#, sh-format
+msgid "Could not move back to $head_name"
+msgstr "无法移回 $head_name"
+
+#: git-rebase.sh:167
msgid "Applied autostash."
msgstr "æˆåŠŸåº”用 autostash。"
-#: git-rebase.sh:171
+#: git-rebase.sh:170
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "无法ä¿å­˜ $stash_sha1"
-#: git-rebase.sh:172
+#: git-rebase.sh:171
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
@@ -12099,27 +12644,27 @@ msgstr ""
"您的修改安全地ä¿å­˜åœ¨ stash 中。\n"
"您å¯ä»¥åœ¨ä»»ä½•æ—¶å€™è¿è¡Œ \"git stash pop\" 或 \"git stash drop\"。\n"
-#: git-rebase.sh:211
+#: git-rebase.sh:210
msgid "The pre-rebase hook refused to rebase."
msgstr "é’©å­ pre-rebase æ‹’ç»å˜åŸºæ“作。"
-#: git-rebase.sh:216
+#: git-rebase.sh:215
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "似乎正处于在 git-am 的执行过程中。无法å˜åŸºã€‚"
-#: git-rebase.sh:357
+#: git-rebase.sh:356
msgid "No rebase in progress?"
msgstr "没有正在进行的å˜åŸºï¼Ÿ"
-#: git-rebase.sh:368
+#: git-rebase.sh:367
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo åªèƒ½ç”¨åœ¨äº¤äº’å¼å˜åŸºè¿‡ç¨‹ä¸­ã€‚"
-#: git-rebase.sh:375
+#: git-rebase.sh:374
msgid "Cannot read HEAD"
msgstr "ä¸èƒ½è¯»å– HEAD"
-#: git-rebase.sh:378
+#: git-rebase.sh:377
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -12127,12 +12672,7 @@ msgstr ""
"您必须编辑所有的åˆå¹¶å†²çªï¼Œç„¶åŽé€šè¿‡ git add\n"
"命令将它们标记为已解决"
-#: git-rebase.sh:396
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "无法移回 $head_name"
-
-#: git-rebase.sh:415
+#: git-rebase.sh:414
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -12151,97 +12691,97 @@ msgstr ""
"\t$cmd_clear_stale_rebase\n"
"然åŽå†é‡æ–°æ‰§è¡Œå˜åŸºæ“作。 为é¿å…丢失é‡è¦æ•°æ®ï¼Œæˆ‘å·²ç»åœæ­¢å½“å‰æ“作。"
-#: git-rebase.sh:466
+#: git-rebase.sh:465
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "无效的上游 $upstream_name"
-#: git-rebase.sh:490
+#: git-rebase.sh:489
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: 有一个以上的åˆå¹¶åŸºå‡†"
-#: git-rebase.sh:493 git-rebase.sh:497
+#: git-rebase.sh:492 git-rebase.sh:496
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: 没有åˆå¹¶åŸºå‡†"
-#: git-rebase.sh:502
+#: git-rebase.sh:501
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "没有指å‘一个有效的æ交:$onto_name"
-#: git-rebase.sh:525
+#: git-rebase.sh:524
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "严é‡é”™è¯¯ï¼šæ— æ­¤åˆ†æ”¯ï¼š$branch_name"
-#: git-rebase.sh:558
+#: git-rebase.sh:557
msgid "Cannot autostash"
msgstr "无法 autostash"
-#: git-rebase.sh:563
+#: git-rebase.sh:562
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "创建了 autostash: $stash_abbrev"
-#: git-rebase.sh:567
+#: git-rebase.sh:566
msgid "Please commit or stash them."
msgstr "请æ交或为它们ä¿å­˜è¿›åº¦ã€‚"
-#: git-rebase.sh:587
+#: git-rebase.sh:586
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "当å‰åˆ†æ”¯ $branch_name 是最新的。"
-#: git-rebase.sh:591
+#: git-rebase.sh:590
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "当å‰åˆ†æ”¯ $branch_name 是最新的,强制å˜åŸºã€‚"
-#: git-rebase.sh:602
+#: git-rebase.sh:601
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "å˜æ›´ä»Ž $mb 到 $onto:"
-#: git-rebase.sh:611
+#: git-rebase.sh:610
msgid "First, rewinding head to replay your work on top of it..."
msgstr "首先,回退分支以便在上é¢é‡æ”¾æ‚¨çš„工作..."
-#: git-rebase.sh:621
+#: git-rebase.sh:620
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "快进 $branch_name 至 $onto_name。"
-#: git-stash.sh:51
+#: git-stash.sh:50
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear ä¸æ”¯æŒå‚æ•°"
-#: git-stash.sh:74
+#: git-stash.sh:73
msgid "You do not have the initial commit yet"
msgstr "您尚未建立åˆå§‹æ交"
-#: git-stash.sh:89
+#: git-stash.sh:88
msgid "Cannot save the current index state"
msgstr "无法ä¿å­˜å½“å‰ç´¢å¼•çŠ¶æ€"
-#: git-stash.sh:124 git-stash.sh:137
+#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "无法ä¿å­˜å½“å‰å·¥ä½œåŒºçŠ¶æ€"
-#: git-stash.sh:141
+#: git-stash.sh:140
msgid "No changes selected"
msgstr "没有选择å˜æ›´"
-#: git-stash.sh:144
+#: git-stash.sh:143
msgid "Cannot remove temporary index (can't happen)"
msgstr "无法删除临时索引(ä¸åº”å‘生)"
-#: git-stash.sh:157
+#: git-stash.sh:156
msgid "Cannot record working tree state"
msgstr "ä¸èƒ½è®°å½•å·¥ä½œåŒºçŠ¶æ€"
-#: git-stash.sh:189
+#: git-stash.sh:188
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "无法用 $w_commit 更新 $ref_stash"
@@ -12256,7 +12796,7 @@ msgstr "无法用 $w_commit 更新 $ref_stash"
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:239
+#: git-stash.sh:238
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -12265,108 +12805,117 @@ msgstr ""
"错误:'stash save' 的未知选项:$option\n"
" è¦æ供一个æè¿°ä¿¡æ¯ï¼Œä½¿ç”¨ git stash save -- '$option'"
-#: git-stash.sh:260
+#: git-stash.sh:259
msgid "No local changes to save"
msgstr "没有è¦ä¿å­˜çš„本地修改"
-#: git-stash.sh:264
+#: git-stash.sh:263
msgid "Cannot initialize stash"
msgstr "无法åˆå§‹åŒ– stash"
-#: git-stash.sh:268
+#: git-stash.sh:267
msgid "Cannot save the current status"
msgstr "无法ä¿å­˜å½“å‰çŠ¶æ€"
-#: git-stash.sh:286
+#: git-stash.sh:268
+#, sh-format
+msgid "Saved working directory and index state $stash_msg"
+msgstr "ä¿å­˜å·¥ä½œç›®å½•å’Œç´¢å¼•çŠ¶æ€ $stash_msg"
+
+#: git-stash.sh:285
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区å˜æ›´"
-#: git-stash.sh:405
+#: git-stash.sh:404
#, sh-format
msgid "unknown option: $opt"
msgstr "未知选项: $opt"
-#: git-stash.sh:415
+#: git-stash.sh:414
msgid "No stash found."
msgstr "未å‘现 stash。"
-#: git-stash.sh:422
+#: git-stash.sh:421
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "指定了太多的版本:$REV"
-#: git-stash.sh:428
+#: git-stash.sh:427
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„引用"
-#: git-stash.sh:456
+#: git-stash.sh:455
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' ä¸æ˜¯ stash æ ·æ交"
-#: git-stash.sh:467
+#: git-stash.sh:466
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' ä¸æ˜¯ä¸€ä¸ª stash 引用"
-#: git-stash.sh:475
+#: git-stash.sh:474
msgid "unable to refresh index"
msgstr "无法刷新索引"
-#: git-stash.sh:479
+#: git-stash.sh:478
msgid "Cannot apply a stash in the middle of a merge"
msgstr "无法在åˆå¹¶è¿‡ç¨‹ä¸­æ¢å¤è¿›åº¦"
-#: git-stash.sh:487
+#: git-stash.sh:486
msgid "Conflicts in index. Try without --index."
msgstr "索引中有冲çªã€‚å°è¯•ä¸ä½¿ç”¨ --index。"
-#: git-stash.sh:489
+#: git-stash.sh:488
msgid "Could not save index tree"
msgstr "ä¸èƒ½ä¿å­˜ç´¢å¼•æ ‘"
-#: git-stash.sh:523
+#: git-stash.sh:522
msgid "Cannot unstage modified files"
msgstr "无法将修改的文件å–消暂存"
-#: git-stash.sh:538
+#: git-stash.sh:537
msgid "Index was not unstashed."
msgstr "索引的进度没有被æ¢å¤ã€‚"
-#: git-stash.sh:561
+#: git-stash.sh:551
+msgid "The stash is kept in case you need it again."
+msgstr "暂存被ä¿ç•™ä»¥å¤‡æ‚¨å†æ¬¡éœ€è¦ã€‚"
+
+#: git-stash.sh:560
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "丢弃了 ${REV} ($s)"
-#: git-stash.sh:562
+#: git-stash.sh:561
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}:ä¸èƒ½ä¸¢å¼ƒè¿›åº¦æ¡ç›®"
-#: git-stash.sh:570
+#: git-stash.sh:569
msgid "No branch name specified"
msgstr "未指定分支å"
-#: git-stash.sh:642
+#: git-stash.sh:641
msgid "(To restore them type \"git stash apply\")"
msgstr "(为æ¢å¤æ•°æ®è¾“å…¥ \"git stash apply\")"
-#: git-submodule.sh:219
+#: git-submodule.sh:183
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "åªèƒ½åœ¨å·¥ä½œåŒºçš„顶级目录中使用相对路径"
-#: git-submodule.sh:229
+#: git-submodule.sh:193
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "仓库 URL:'$repo' 必须是ç»å¯¹è·¯å¾„或以 ./|../ 起始"
-#: git-submodule.sh:246
+#: git-submodule.sh:210
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' å·²ç»å­˜åœ¨äºŽç´¢å¼•ä¸­"
-#: git-submodule.sh:250
+#: git-submodule.sh:214
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -12377,215 +12926,223 @@ msgstr ""
"$sm_path\n"
"如果您确实想添加它,使用 -f å‚数。"
-#: git-submodule.sh:268
+#: git-submodule.sh:232
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "添加ä½äºŽ '$sm_path' 的现存仓库到索引"
-#: git-submodule.sh:270
+#: git-submodule.sh:234
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' 已存在且ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ git 仓库"
-#: git-submodule.sh:278
+#: git-submodule.sh:242
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "本地å‘现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
-#: git-submodule.sh:280
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from"
-msgstr "如果您想é‡ç”¨æ­¤æœ¬åœ° git 目录而ä¸æ˜¯é‡æ–°å…‹éš†è‡ª"
-
-#: git-submodule.sh:282
-#, sh-format
-msgid ""
-"use the '--force' option. If the local git directory is not the correct repo"
-msgstr "使用 '--force' å‚数。如果本地 git 目录ä¸æ˜¯æ­£ç¡®çš„仓库"
-
-#: git-submodule.sh:283
+#: git-submodule.sh:244
#, sh-format
msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+" $realrepo\n"
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
"or you are unsure what this means choose another name with the '--name' "
"option."
-msgstr "或者您ä¸ç¡®å®šå…¶ä¸­å«ä¹‰ä½¿ç”¨ '--name' å‚数选择å¦å¤–一个å称。"
+msgstr ""
+"如果您想è¦é‡ç”¨è¿™ä¸ªæœ¬åœ° git 目录而éžé‡æ–°å…‹éš†è‡ª\n"
+" $realrepo\n"
+"使用 '--force' 选项。如果本地 git 目录ä¸æ˜¯æ­£ç¡®çš„仓库\n"
+"或者您ä¸ç¡®å®šè¿™é‡Œçš„å«ä¹‰ï¼Œä½¿ç”¨ '--name' 选项选择å¦å¤–çš„å称。"
-#: git-submodule.sh:285
+#: git-submodule.sh:250
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "激活本地 git 目录到å­æ¨¡ç»„ '$sm_name'。"
-#: git-submodule.sh:297
+#: git-submodule.sh:262
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "ä¸èƒ½æ£€å‡ºå­æ¨¡ç»„ '$sm_path'"
-#: git-submodule.sh:302
+#: git-submodule.sh:267
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "无法添加å­æ¨¡ç»„ '$sm_path'"
-#: git-submodule.sh:311
+#: git-submodule.sh:276
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "无法注册å­æ¨¡ç»„ '$sm_path'"
-#: git-submodule.sh:355
+#: git-submodule.sh:323
#, sh-format
msgid "Entering '$displaypath'"
msgstr "正在进入 '$displaypath'"
-#: git-submodule.sh:375
+#: git-submodule.sh:343
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr "åœæ­¢äºŽ '$displaypath';脚本返回éžé›¶å€¼ã€‚"
-#: git-submodule.sh:448
+#: git-submodule.sh:414
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "pathspec å’Œ --all ä¸å…¼å®¹"
-#: git-submodule.sh:453
+#: git-submodule.sh:419
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "如果您确实想è¦å¯¹æ‰€æœ‰å­æ¨¡ç»„执行å–消åˆå§‹åŒ–,请使用 '--all'"
-#: git-submodule.sh:470
-#, sh-format
-msgid "Submodule work tree '$displaypath' contains a .git directory"
-msgstr "å­æ¨¡ç»„工作区 '$displaypath' 包å«ä¸€ä¸ª .git 目录"
-
-#: git-submodule.sh:471
+#: git-submodule.sh:439
#, sh-format
msgid ""
+"Submodule work tree '$displaypath' contains a .git directory\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr "(使用 'rm -rf' 命令如果您真的想删除它åŠå…¶å…¨éƒ¨åŽ†å²ï¼‰"
+msgstr ""
+"å­æ¨¡ç»„工作区 '$displaypath' 包å«ä¸€ä¸ª .git 目录\n"
+"(如果您真的想删除它åŠå…¶å…¨éƒ¨åŽ†å²ï¼Œä½¿ç”¨ 'rm -rf' 命令)"
-#: git-submodule.sh:477
+#: git-submodule.sh:447
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
msgstr "å­æ¨¡ç»„工作区 '$displaypath' 包å«æœ¬åœ°ä¿®æ”¹ï¼›ä½¿ç”¨ '-f' 丢弃它们"
-#: git-submodule.sh:480
+#: git-submodule.sh:450
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "已清除目录 '$displaypath'"
-#: git-submodule.sh:481
+#: git-submodule.sh:451
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "无法移除å­æ¨¡ç»„工作区 '$displaypath'"
-#: git-submodule.sh:484
+#: git-submodule.sh:454
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "ä¸èƒ½åˆ›å»ºç©ºçš„å­æ¨¡ç»„目录 '$displaypath'"
-#: git-submodule.sh:493
+#: git-submodule.sh:463
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "å­æ¨¡ç»„ '$name' ($url) 未对路径 '$displaypath' 注册"
-#: git-submodule.sh:635
+#: git-submodule.sh:612
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "无法在å­æ¨¡ç»„路径 '$displaypath' 中找到当å‰ç‰ˆæœ¬"
-#: git-submodule.sh:644
+#: git-submodule.sh:622
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在å­æ¨¡ç»„路径 '$sm_path' 中获å–"
-#: git-submodule.sh:667
+#: git-submodule.sh:627
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr "无法在å­æ¨¡ç»„路径 '$sm_path' 中找到当å‰ç‰ˆæœ¬ ${remote_name}/${branch}"
+
+#: git-submodule.sh:645
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "无法在å­æ¨¡ç»„路径 '$displaypath' 中获å–"
-#: git-submodule.sh:680
+#: git-submodule.sh:651
+#, sh-format
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr "获å–了å­æ¨¡ç»„路径 '$displaypath'ï¼Œä½†æ˜¯å®ƒæ²¡æœ‰åŒ…å« $sha1。直接获å–该æ交失败。"
+
+#: git-submodule.sh:658
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "无法在å­æ¨¡ç»„路径 '$displaypath' 中检出 '$sha1'"
-#: git-submodule.sh:681
+#: git-submodule.sh:659
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "å­æ¨¡ç»„路径 '$displaypath':检出 '$sha1'"
-#: git-submodule.sh:685
+#: git-submodule.sh:663
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "无法在å­æ¨¡ç»„路径 '$displaypath' 中å˜åŸº '$sha1'"
-#: git-submodule.sh:686
+#: git-submodule.sh:664
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "å­æ¨¡ç»„路径 '$displaypath':å˜åŸºè‡³ '$sha1'"
-#: git-submodule.sh:691
+#: git-submodule.sh:669
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "无法åˆå¹¶ '$sha1' 到å­æ¨¡ç»„路径 '$displaypath' 中"
-#: git-submodule.sh:692
+#: git-submodule.sh:670
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "å­æ¨¡ç»„路径 '$displaypath':已åˆå¹¶å…¥ '$sha1'"
-#: git-submodule.sh:697
+#: git-submodule.sh:675
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "在å­æ¨¡ç»„ '$displaypath' 中执行 '$command $sha1' 失败"
-#: git-submodule.sh:698
+#: git-submodule.sh:676
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "å­æ¨¡ç»„ '$displaypath':'$command $sha1'"
-#: git-submodule.sh:729
+#: git-submodule.sh:707
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "无法递归进å­æ¨¡ç»„路径 '$displaypath'"
-#: git-submodule.sh:837
+#: git-submodule.sh:815
msgid "The --cached option cannot be used with the --files option"
msgstr "选项 --cached ä¸èƒ½å’Œé€‰é¡¹ --files åŒæ—¶ä½¿ç”¨"
-#: git-submodule.sh:889
+#: git-submodule.sh:867
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "æ„å¤–çš„æ¨¡å¼ $mod_dst"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: git-submodule.sh:909
+#: git-submodule.sh:887
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 警告:$display_name 未包å«æ交 $sha1_src"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: git-submodule.sh:912
+#: git-submodule.sh:890
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 警告:$display_name 未包å«æ交 $sha1_dst"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: git-submodule.sh:915
+#: git-submodule.sh:893
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " 警告:$display_name 未包å«æ交 $sha1_src å’Œ $sha1_dst"
-#: git-submodule.sh:940
+#: git-submodule.sh:918
msgid "blob"
msgstr "æ•°æ®å¯¹è±¡"
-#: git-submodule.sh:1059
+#: git-submodule.sh:1040
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "无法递归进å­æ¨¡ç»„路径 '$sm_path'"
-#: git-submodule.sh:1123
+#: git-submodule.sh:1107
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "为 '$displaypath' åŒæ­¥å­æ¨¡ç»„ url"
@@ -12594,3 +13151,437 @@ msgstr "为 '$displaypath' åŒæ­¥å­æ¨¡ç»„ url"
#, sh-format
msgid "See git-${cmd}(1) for details."
msgstr "è¯¦è§ git-${cmd}(1)。"
+
+#: git-rebase--interactive.sh:131
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr "å˜åŸºä¸­ï¼ˆ$new_count/$total)"
+
+#: git-rebase--interactive.sh:147
+msgid ""
+"\n"
+"Commands:\n"
+" p, pick = use commit\n"
+" r, reword = use commit, but edit the commit message\n"
+" e, edit = use commit, but stop for amending\n"
+" s, squash = use commit, but meld into previous commit\n"
+" f, fixup = like \"squash\", but discard this commit's log message\n"
+" x, exec = run command (the rest of the line) using shell\n"
+" d, drop = remove commit\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+"\n"
+"命令:\n"
+" p, pick = 使用æ交\n"
+" r, reword = 使用æ交,但修改æ交说明\n"
+" e, edit = 使用æ交,但åœæ­¢ä»¥ä¾¿è¿›è¡Œæ交修补\n"
+" s, squash = 使用æ交,但和å‰ä¸€ä¸ªç‰ˆæœ¬èžåˆ\n"
+" f, fixup = 类似于 \"squash\",但丢弃æ交说明日志\n"
+" x, exec = 使用 shell è¿è¡Œå‘½ä»¤ï¼ˆæ­¤è¡Œå‰©ä½™éƒ¨åˆ†ï¼‰\n"
+" d, drop = 删除æ交\n"
+"\n"
+"这些行å¯ä»¥è¢«é‡æ–°æŽ’åºï¼›å®ƒä»¬ä¼šè¢«ä»Žä¸Šè‡³ä¸‹åœ°æ‰§è¡Œã€‚\n"
+"\n"
+
+#: git-rebase--interactive.sh:162
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr "\nä¸è¦åˆ é™¤ä»»æ„一行。使用 'drop' 显å¼åœ°åˆ é™¤ä¸€ä¸ªæ交。\n"
+
+#: git-rebase--interactive.sh:166
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr "\n如果您在这里删除一行,对应的æ交将会丢失。\n"
+
+#: git-rebase--interactive.sh:202
+#, sh-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"您现在å¯ä»¥ä¿®è¡¥è¿™ä¸ªæ交,使用\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"当您对å˜æ›´æ„Ÿåˆ°æ»¡æ„,执行\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:227
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
+msgstr "$sha1:ä¸æ˜¯ä¸€ä¸ªå¯ä»¥è¢«æ‹£é€‰çš„æ交"
+
+#: git-rebase--interactive.sh:266
+#, sh-format
+msgid "Invalid commit name: $sha1"
+msgstr "无效的æ交å:$sha1"
+
+#: git-rebase--interactive.sh:308
+msgid "Cannot write current commit's replacement sha1"
+msgstr "ä¸èƒ½å†™å…¥å½“å‰æ交的替代 sha1"
+
+#: git-rebase--interactive.sh:360
+#, sh-format
+msgid "Fast-forward to $sha1"
+msgstr "快进到 $sha1"
+
+#: git-rebase--interactive.sh:362
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
+msgstr "ä¸èƒ½å¿«è¿›åˆ° $sha1"
+
+#: git-rebase--interactive.sh:371
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
+msgstr "ä¸èƒ½ç§»åŠ¨ HEAD 到 $first_parent"
+
+#: git-rebase--interactive.sh:376
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
+msgstr "æ‹’ç»åŽ‹ç¼©ä¸€ä¸ªåˆå¹¶ï¼š$sha1"
+
+#: git-rebase--interactive.sh:390
+#, sh-format
+msgid "Error redoing merge $sha1"
+msgstr "无法é‡åšåˆå¹¶ $sha1"
+
+#: git-rebase--interactive.sh:398
+#, sh-format
+msgid "Could not pick $sha1"
+msgstr "ä¸èƒ½æ‹£é€‰ $sha1"
+
+#: git-rebase--interactive.sh:407
+#, sh-format
+msgid "This is the commit message #${n}:"
+msgstr "这是æ交说明 #${n}:"
+
+#: git-rebase--interactive.sh:412
+#, sh-format
+msgid "The commit message #${n} will be skipped:"
+msgstr "æ交说明 #${n} 将被跳过:"
+
+#: git-rebase--interactive.sh:423
+#, sh-format
+msgid "This is a combination of $count commit."
+msgid_plural "This is a combination of $count commits."
+msgstr[0] "这是一个 $count 个æ交的组åˆã€‚"
+msgstr[1] "这是一个 $count 个æ交的组åˆã€‚"
+
+#: git-rebase--interactive.sh:431
+#, sh-format
+msgid "Cannot write $fixup_msg"
+msgstr "ä¸èƒ½å†™å…¥ $fixup_msg"
+
+#: git-rebase--interactive.sh:434
+msgid "This is a combination of 2 commits."
+msgstr "这是一个 2 个æ交的组åˆã€‚"
+
+#: git-rebase--interactive.sh:435
+msgid "This is the 1st commit message:"
+msgstr "这是第一个æ交说明:"
+
+#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
+#: git-rebase--interactive.sh:521
+#, sh-format
+msgid "Could not apply $sha1... $rest"
+msgstr "ä¸èƒ½åº”用 $sha1... $rest"
+
+#: git-rebase--interactive.sh:549
+#, sh-format
+msgid ""
+"Could not amend commit after successfully picking $sha1... $rest\n"
+"This is most likely due to an empty commit message, or the pre-commit hook\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue "
+"before\n"
+"you are able to reword the commit."
+msgstr ""
+"ä¸èƒ½åœ¨æˆåŠŸæ‹£é€‰ $sha1... $rest 之åŽä¿®è¡¥æ交\n"
+"这通常是因为空的æ交说明,或者 pre-commit é’©å­æ‰§è¡Œå¤±è´¥ã€‚如果是 pre-commit\n"
+"é’©å­æ‰§è¡Œå¤±è´¥ï¼Œä½ å¯èƒ½éœ€è¦åœ¨é‡å†™æ交说明å‰è§£å†³è¿™ä¸ªé—®é¢˜ã€‚"
+
+#: git-rebase--interactive.sh:564
+#, sh-format
+msgid "Stopped at $sha1_abbrev... $rest"
+msgstr "åœæ­¢åœ¨ $sha1_abbrev... $rest"
+
+#: git-rebase--interactive.sh:579
+#, sh-format
+msgid "Cannot '$squash_style' without a previous commit"
+msgstr "没有父æ交的情况下ä¸èƒ½ '$squash_style'"
+
+#: git-rebase--interactive.sh:621
+#, sh-format
+msgid "Executing: $rest"
+msgstr "执行:$rest"
+
+#: git-rebase--interactive.sh:629
+#, sh-format
+msgid "Execution failed: $rest"
+msgstr "执行失败:$rest"
+
+#: git-rebase--interactive.sh:631
+msgid "and made changes to the index and/or the working tree"
+msgstr "并且修改索引和/或工作区"
+
+# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
+#: git-rebase--interactive.sh:633
+msgid ""
+"You can fix the problem, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"您å¯ä»¥è§£å†³è¿™ä¸ªé—®é¢˜ï¼Œç„¶åŽè¿è¡Œ\n"
+"\n"
+"\tgit rebase --continue"
+
+#. TRANSLATORS: after these lines is a command to be issued by the user
+#: git-rebase--interactive.sh:646
+#, sh-format
+msgid ""
+"Execution succeeded: $rest\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"执行æˆåŠŸï¼š$rest\n"
+"但是在索引和/或工作区中存在å˜æ›´ã€‚æ交或暂存修改,然åŽè¿è¡Œ\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:657
+#, sh-format
+msgid "Unknown command: $command $sha1 $rest"
+msgstr "未知命令:$command $sha1 $rest"
+
+#: git-rebase--interactive.sh:658
+msgid "Please fix this using 'git rebase --edit-todo'."
+msgstr "è¦ä¿®æ”¹è¯·ä½¿ç”¨å‘½ä»¤ 'git rebase --edit-todo'。"
+
+#: git-rebase--interactive.sh:693
+#, sh-format
+msgid "Successfully rebased and updated $head_name."
+msgstr "æˆåŠŸå˜åŸºå¹¶æ›´æ–° $head_name。"
+
+#: git-rebase--interactive.sh:740
+msgid "Could not skip unnecessary pick commands"
+msgstr "ä¸èƒ½è·³è¿‡ä¸å¿…è¦çš„拣选命令"
+
+#: git-rebase--interactive.sh:898
+#, sh-format
+msgid ""
+"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+" - $line"
+msgstr ""
+"警告:缺失 SHA-1 或者在下é¢ä¸€è¡Œä¸­ä¸æ˜¯ä¸€ä¸ªæ交:\n"
+" - $line"
+
+#: git-rebase--interactive.sh:931
+#, sh-format
+msgid ""
+"Warning: the command isn't recognized in the following line:\n"
+" - $line"
+msgstr ""
+"警告:下é¢ä¸€è¡Œä¸­çš„命令未能被识别:\n"
+" - $line"
+
+#: git-rebase--interactive.sh:970
+msgid "could not detach HEAD"
+msgstr "ä¸èƒ½æ£€å‡ºä¸ºåˆ†ç¦»å¤´æŒ‡é’ˆ"
+
+#: git-rebase--interactive.sh:1008
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):"
+msgstr "警告:一些æ交å¯èƒ½è¢«æ„外丢弃。丢弃的æ交(从新到旧):"
+
+#: git-rebase--interactive.sh:1016
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error."
+msgstr ""
+"为é¿å…è¿™æ¡ä¿¡æ¯ï¼Œä½¿ç”¨ \"drop\" 指令显å¼åœ°åˆ é™¤ä¸€ä¸ªæ交。\n"
+"\n"
+"使用 'git config rebase.missingCommitsCheck' æ¥ä¿®æ”¹è­¦å‘Šçº§åˆ«ã€‚\n"
+"å¯é€‰å€¼æœ‰ï¼šignoreã€warnã€error。"
+
+#: git-rebase--interactive.sh:1027
+#, sh-format
+msgid ""
+"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
+"Ignoring."
+msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。"
+
+#: git-rebase--interactive.sh:1044
+msgid "You can fix this with 'git rebase --edit-todo'."
+msgstr "您å¯ä»¥ä½¿ç”¨ 'git rebase --edit-todo' 命令修改。"
+
+#: git-rebase--interactive.sh:1045
+msgid "Or you can abort the rebase with 'git rebase --abort'."
+msgstr "或者您å¯ä»¥ä½¿ç”¨ 'git rebase --abort' 命令终止å˜åŸºæ“作。"
+
+#: git-rebase--interactive.sh:1069
+msgid "Could not remove CHERRY_PICK_HEAD"
+msgstr "ä¸èƒ½åˆ é™¤ CHERRY_PICK_HEAD"
+
+#: git-rebase--interactive.sh:1074
+#, sh-format
+msgid ""
+"You have staged changes in your working tree.\n"
+"If these changes are meant to be\n"
+"squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In both case, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
+msgstr ""
+"您已暂存了工作区的修改。如果这些修改è¦åŽ‹ç¼©åˆ°å‰ä¸€ä¸ªæ交,执行:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"如果这些å˜æ›´è¦å½¢æˆä¸€ä¸ªæ–°æ交,执行:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"无论哪ç§æƒ…况,当您完æˆæ交,继续执行:\n"
+"\n"
+" git rebase --continue\n"
+
+#: git-rebase--interactive.sh:1091
+msgid "Error trying to find the author identity to amend commit"
+msgstr "在修补æ交中查找作者信æ¯æ—¶é‡åˆ°é”™è¯¯"
+
+#: git-rebase--interactive.sh:1096
+msgid ""
+"You have uncommitted changes in your working tree. Please commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr "您的工作区中有未æ交的å˜æ›´ã€‚请先æ交然åŽå†æ¬¡è¿è¡Œ 'git rebase --continue'。"
+
+#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
+msgid "Could not commit staged changes."
+msgstr "ä¸èƒ½æ交暂存的修改。"
+
+#: git-rebase--interactive.sh:1129
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"您正在修改è¿è¡Œä¸­çš„交互å¼å˜åŸºçš„ todo 文件。若è¦åœ¨ç¼–辑结æŸåŽç»§ç»­å˜åŸºï¼Œ\n"
+"请执行:\n"
+" git rebase --continue\n"
+"\n"
+
+#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
+msgid "Could not execute editor"
+msgstr "无法è¿è¡Œç¼–辑器"
+
+#: git-rebase--interactive.sh:1145
+msgid "You need to set your committer info first"
+msgstr "您需è¦å…ˆè®¾ç½®æ‚¨çš„æ交者信æ¯"
+
+#: git-rebase--interactive.sh:1153
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr "ä¸èƒ½æ£€å‡º $switch_to"
+
+#: git-rebase--interactive.sh:1158
+msgid "No HEAD?"
+msgstr "没有 HEAD?"
+
+#: git-rebase--interactive.sh:1159
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr "ä¸èƒ½åˆ›å»ºä¸´æ—¶ $state_dir"
+
+#: git-rebase--interactive.sh:1161
+msgid "Could not mark as interactive"
+msgstr "ä¸èƒ½æ ‡è®°ä¸ºäº¤äº’å¼"
+
+#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
+msgid "Could not init rewritten commits"
+msgstr "ä¸èƒ½å¯¹é‡å†™æ交进行åˆå§‹åŒ–"
+
+#: git-rebase--interactive.sh:1276
+#, sh-format
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] "å˜åŸº $shortrevisions 到 $shortonto($todocount 个æ交)"
+msgstr[1] "å˜åŸº $shortrevisions 到 $shortonto($todocount 个æ交)"
+
+#: git-rebase--interactive.sh:1281
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr "\n然而,如果您删除全部内容,å˜åŸºæ“作将会终止。\n\n"
+
+#: git-rebase--interactive.sh:1288
+msgid "Note that empty commits are commented out"
+msgstr "注æ„空æ交已被注释掉"
+
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "用法:$dashless $USAGE"
+
+#: git-sh-setup.sh:190
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr "ä¸èƒ½åˆ‡æ¢ç›®å½•åˆ° $cdup,工作区的顶级目录"
+
+#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr "严é‡é”™è¯¯ï¼š$program_name ä¸èƒ½åœ¨æ²¡æœ‰å·¥ä½œåŒºçš„情况下使用"
+
+#: git-sh-setup.sh:220
+msgid "Cannot rebase: You have unstaged changes."
+msgstr "ä¸èƒ½å˜åŸºï¼šæ‚¨æœ‰æœªæš‚存的å˜æ›´ã€‚"
+
+#: git-sh-setup.sh:223
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr "ä¸èƒ½é‡å†™åˆ†æ”¯ï¼šæ‚¨æœ‰æœªæš‚存的å˜æ›´ã€‚"
+
+#: git-sh-setup.sh:229
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr "ä¸èƒ½ $action:您有未暂存的å˜æ›´ã€‚"
+
+#: git-sh-setup.sh:242
+msgid "Cannot rebase: Your index contains uncommitted changes."
+msgstr "ä¸èƒ½å˜åŸºï¼šæ‚¨çš„索引中包å«æœªæ交的å˜æ›´ã€‚"
+
+#: git-sh-setup.sh:248
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr "ä¸èƒ½ $action:您的索引中包å«æœªæ交的å˜æ›´ã€‚"
+
+#: git-sh-setup.sh:372
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr "您需è¦åœ¨å·¥ä½œåŒºçš„顶级目录中è¿è¡Œè¿™ä¸ªå‘½ä»¤ã€‚"
+
+#: git-sh-setup.sh:377
+msgid "Unable to determine absolute path of git directory"
+msgstr "ä¸èƒ½ç¡®å®š git 目录的ç»å¯¹è·¯å¾„"
diff --git a/pretty.c b/pretty.c
index dede7de..0c31495 100644
--- a/pretty.c
+++ b/pretty.c
@@ -92,6 +92,7 @@ static void setup_commit_formats(void)
{ "medium", CMIT_FMT_MEDIUM, 0, 8 },
{ "short", CMIT_FMT_SHORT, 0, 0 },
{ "email", CMIT_FMT_EMAIL, 0, 0 },
+ { "mboxrd", CMIT_FMT_MBOXRD, 0, 0 },
{ "fuller", CMIT_FMT_FULLER, 0, 8 },
{ "full", CMIT_FMT_FULL, 0, 8 },
{ "oneline", CMIT_FMT_ONELINE, 1, 0 }
@@ -444,7 +445,7 @@ void pp_user_info(struct pretty_print_context *pp,
if (pp->mailmap)
map_user(pp->mailmap, &mailbuf, &maillen, &namebuf, &namelen);
- if (pp->fmt == CMIT_FMT_EMAIL) {
+ if (cmit_fmt_is_mail(pp->fmt)) {
if (pp->from_ident && ident_cmp(pp->from_ident, &ident)) {
struct strbuf buf = STRBUF_INIT;
@@ -494,6 +495,7 @@ void pp_user_info(struct pretty_print_context *pp,
show_ident_date(&ident, &pp->date_mode));
break;
case CMIT_FMT_EMAIL:
+ case CMIT_FMT_MBOXRD:
strbuf_addf(sb, "Date: %s\n",
show_ident_date(&ident, DATE_MODE(RFC2822)));
break;
@@ -535,22 +537,20 @@ static void add_merge_info(const struct pretty_print_context *pp,
{
struct commit_list *parent = commit->parents;
- if ((pp->fmt == CMIT_FMT_ONELINE) || (pp->fmt == CMIT_FMT_EMAIL) ||
+ if ((pp->fmt == CMIT_FMT_ONELINE) || (cmit_fmt_is_mail(pp->fmt)) ||
!parent || !parent->next)
return;
strbuf_addstr(sb, "Merge:");
while (parent) {
- struct commit *p = parent->item;
- const char *hex = NULL;
+ struct object_id *oidp = &parent->item->object.oid;
+ strbuf_addch(sb, ' ');
if (pp->abbrev)
- hex = find_unique_abbrev(p->object.oid.hash, pp->abbrev);
- if (!hex)
- hex = oid_to_hex(&p->object.oid);
+ strbuf_add_unique_abbrev(sb, oidp->hash, pp->abbrev);
+ else
+ strbuf_addstr(sb, oid_to_hex(oidp));
parent = parent->next;
-
- strbuf_addf(sb, " %s", hex);
}
strbuf_addch(sb, '\n');
}
@@ -1063,13 +1063,15 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
const struct commit *commit = c->commit;
const char *msg = c->message;
struct commit_list *p;
- int h1, h2;
+ int ch;
/* these are independent of the commit */
switch (placeholder[0]) {
case 'C':
if (starts_with(placeholder + 1, "(auto)")) {
c->auto_color = want_color(c->pretty_ctx->color);
+ if (c->auto_color && sb->len)
+ strbuf_addstr(sb, GIT_COLOR_RESET);
return 7; /* consumed 7 bytes, "C(auto)" */
} else {
int ret = parse_color(sb, placeholder, c);
@@ -1087,14 +1089,11 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
return 1;
case 'x':
/* %x00 == NUL, %x0a == LF, etc. */
- if (0 <= (h1 = hexval_table[0xff & placeholder[1]]) &&
- h1 <= 16 &&
- 0 <= (h2 = hexval_table[0xff & placeholder[2]]) &&
- h2 <= 16) {
- strbuf_addch(sb, (h1<<4)|h2);
- return 3;
- } else
+ ch = hex2chr(placeholder + 1);
+ if (ch < 0)
return 0;
+ strbuf_addch(sb, ch);
+ return 3;
case 'w':
if (placeholder[1] == '(') {
unsigned long width = 0, indent1 = 0, indent2 = 0;
@@ -1620,7 +1619,7 @@ void pp_title_line(struct pretty_print_context *pp,
if (pp->after_subject) {
strbuf_addstr(sb, pp->after_subject);
}
- if (pp->fmt == CMIT_FMT_EMAIL) {
+ if (cmit_fmt_is_mail(pp->fmt)) {
strbuf_addch(sb, '\n');
}
@@ -1703,6 +1702,16 @@ static void pp_handle_indent(struct pretty_print_context *pp,
strbuf_add(sb, line, linelen);
}
+static int is_mboxrd_from(const char *line, int len)
+{
+ /*
+ * a line matching /^From $/ here would only have len == 4
+ * at this point because is_empty_line would've trimmed all
+ * trailing space
+ */
+ return len > 4 && starts_with(line + strspn(line, ">"), "From ");
+}
+
void pp_remainder(struct pretty_print_context *pp,
const char **msg_p,
struct strbuf *sb,
@@ -1731,8 +1740,13 @@ void pp_remainder(struct pretty_print_context *pp,
else if (pp->expand_tabs_in_log)
strbuf_add_tabexpand(sb, pp->expand_tabs_in_log,
line, linelen);
- else
+ else {
+ if (pp->fmt == CMIT_FMT_MBOXRD &&
+ is_mboxrd_from(line, linelen))
+ strbuf_addch(sb, '>');
+
strbuf_add(sb, line, linelen);
+ }
strbuf_addch(sb, '\n');
}
}
@@ -1756,14 +1770,14 @@ void pretty_print_commit(struct pretty_print_context *pp,
encoding = get_log_output_encoding();
msg = reencoded = logmsg_reencode(commit, NULL, encoding);
- if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
+ if (pp->fmt == CMIT_FMT_ONELINE || cmit_fmt_is_mail(pp->fmt))
indent = 0;
/*
* We need to check and emit Content-type: to mark it
* as 8-bit if we haven't done so.
*/
- if (pp->fmt == CMIT_FMT_EMAIL && need_8bit_cte == 0) {
+ if (cmit_fmt_is_mail(pp->fmt) && need_8bit_cte == 0) {
int i, ch, in_body;
for (in_body = i = 0; (ch = msg[i]); i++) {
@@ -1791,7 +1805,7 @@ void pretty_print_commit(struct pretty_print_context *pp,
msg = skip_blank_lines(msg);
/* These formats treat the title line specially. */
- if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
+ if (pp->fmt == CMIT_FMT_ONELINE || cmit_fmt_is_mail(pp->fmt))
pp_title_line(pp, &msg, sb, encoding, need_8bit_cte);
beginning_of_body = sb->len;
@@ -1808,7 +1822,7 @@ void pretty_print_commit(struct pretty_print_context *pp,
* format. Make sure we did not strip the blank line
* between the header and the body.
*/
- if (pp->fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body)
+ if (cmit_fmt_is_mail(pp->fmt) && sb->len <= beginning_of_body)
strbuf_addch(sb, '\n');
unuse_commit_buffer(commit, reencoded);
diff --git a/read-cache.c b/read-cache.c
index 491e52d..248432a 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -627,7 +627,7 @@ void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
hashcpy(ce->sha1, sha1);
}
-int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags, int force_mode)
+int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
{
int size, namelen, was_same;
mode_t st_mode = st->st_mode;
@@ -656,11 +656,10 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
else
ce->ce_flags |= CE_INTENT_TO_ADD;
- if (S_ISREG(st_mode) && force_mode)
- ce->ce_mode = create_ce_mode(force_mode);
- else if (trust_executable_bit && has_symlinks)
+
+ if (trust_executable_bit && has_symlinks) {
ce->ce_mode = create_ce_mode(st_mode);
- else {
+ } else {
/* If there is an existing entry, pick the mode bits and type
* from it, otherwise assume unexecutable regular file.
*/
@@ -719,13 +718,12 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
return 0;
}
-int add_file_to_index(struct index_state *istate, const char *path,
- int flags, int force_mode)
+int add_file_to_index(struct index_state *istate, const char *path, int flags)
{
struct stat st;
if (lstat(path, &st))
die_errno("unable to stat '%s'", path);
- return add_to_index(istate, path, &st, flags, force_mode);
+ return add_to_index(istate, path, &st, flags);
}
struct cache_entry *make_cache_entry(unsigned int mode,
@@ -756,6 +754,35 @@ struct cache_entry *make_cache_entry(unsigned int mode,
return ret;
}
+/*
+ * Chmod an index entry with either +x or -x.
+ *
+ * Returns -1 if the chmod for the particular cache entry failed (if it's
+ * not a regular file), -2 if an invalid flip argument is passed in, 0
+ * otherwise.
+ */
+int chmod_index_entry(struct index_state *istate, struct cache_entry *ce,
+ char flip)
+{
+ if (!S_ISREG(ce->ce_mode))
+ return -1;
+ switch (flip) {
+ case '+':
+ ce->ce_mode |= 0111;
+ break;
+ case '-':
+ ce->ce_mode &= ~0111;
+ break;
+ default:
+ return -2;
+ }
+ cache_tree_invalidate_path(istate, ce->name);
+ ce->ce_flags |= CE_UPDATE_IN_BASE;
+ istate->cache_changed |= CE_ENTRY_CHANGED;
+
+ return 0;
+}
+
int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
{
int len = ce_namelen(a);
diff --git a/ref-filter.c b/ref-filter.c
index bc551a7..9a8f55e 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -235,7 +235,7 @@ int parse_ref_filter_atom(const char *atom, const char *ep)
{
const char *sp;
const char *arg;
- int i, at;
+ int i, at, atom_len;
sp = atom;
if (*sp == '*' && sp < ep)
@@ -250,19 +250,19 @@ int parse_ref_filter_atom(const char *atom, const char *ep)
return i;
}
+ /*
+ * If the atom name has a colon, strip it and everything after
+ * it off - it specifies the format for this entry, and
+ * shouldn't be used for checking against the valid_atom
+ * table.
+ */
+ arg = memchr(sp, ':', ep - sp);
+ atom_len = (arg ? arg : ep) - sp;
+
/* Is the atom a valid one? */
for (i = 0; i < ARRAY_SIZE(valid_atom); i++) {
int len = strlen(valid_atom[i].name);
-
- /*
- * If the atom name has a colon, strip it and everything after
- * it off - it specifies the format for this entry, and
- * shouldn't be used for checking against the valid_atom
- * table.
- */
- arg = memchr(sp, ':', ep - sp);
- if (len == (arg ? arg : ep) - sp &&
- !memcmp(valid_atom[i].name, sp, len))
+ if (len == atom_len && !memcmp(valid_atom[i].name, sp, len))
break;
}
@@ -1576,24 +1576,6 @@ void ref_array_sort(struct ref_sorting *sorting, struct ref_array *array)
qsort(array->items, array->nr, sizeof(struct ref_array_item *), compare_refs);
}
-static int hex1(char ch)
-{
- if ('0' <= ch && ch <= '9')
- return ch - '0';
- else if ('a' <= ch && ch <= 'f')
- return ch - 'a' + 10;
- else if ('A' <= ch && ch <= 'F')
- return ch - 'A' + 10;
- return -1;
-}
-static int hex2(const char *cp)
-{
- if (cp[0] && cp[1])
- return (hex1(cp[0]) << 4) | hex1(cp[1]);
- else
- return -1;
-}
-
static void append_literal(const char *cp, const char *ep, struct ref_formatting_state *state)
{
struct strbuf *s = &state->stack->output;
@@ -1603,7 +1585,7 @@ static void append_literal(const char *cp, const char *ep, struct ref_formatting
if (cp[1] == '%')
cp++;
else {
- int ch = hex2(cp + 1);
+ int ch = hex2chr(cp + 1);
if (0 <= ch) {
strbuf_addch(s, ch);
cp += 3;
diff --git a/refs.c b/refs.c
index 87dc82f..62055ab 100644
--- a/refs.c
+++ b/refs.c
@@ -120,25 +120,33 @@ int check_refname_format(const char *refname, int flags)
int refname_is_safe(const char *refname)
{
- if (starts_with(refname, "refs/")) {
+ const char *rest;
+
+ if (skip_prefix(refname, "refs/", &rest)) {
char *buf;
int result;
+ size_t restlen = strlen(rest);
+
+ /* rest must not be empty, or start or end with "/" */
+ if (!restlen || *rest == '/' || rest[restlen - 1] == '/')
+ return 0;
- buf = xmallocz(strlen(refname));
/*
* Does the refname try to escape refs/?
* For example: refs/foo/../bar is safe but refs/foo/../../bar
* is not.
*/
- result = !normalize_path_copy(buf, refname + strlen("refs/"));
+ buf = xmallocz(restlen);
+ result = !normalize_path_copy(buf, rest) && !strcmp(buf, rest);
free(buf);
return result;
}
- while (*refname) {
+
+ do {
if (!isupper(*refname) && *refname != '_')
return 0;
refname++;
- }
+ } while (*refname);
return 1;
}
@@ -496,7 +504,7 @@ static int write_pseudoref(const char *pseudoref, const unsigned char *sha1,
filename = git_path("%s", pseudoref);
fd = hold_lock_file_for_update(&lock, filename, LOCK_DIE_ON_ERROR);
if (fd < 0) {
- strbuf_addf(err, "Could not open '%s' for writing: %s",
+ strbuf_addf(err, "could not open '%s' for writing: %s",
filename, strerror(errno));
return -1;
}
@@ -507,14 +515,14 @@ static int write_pseudoref(const char *pseudoref, const unsigned char *sha1,
if (read_ref(pseudoref, actual_old_sha1))
die("could not read ref '%s'", pseudoref);
if (hashcmp(actual_old_sha1, old_sha1)) {
- strbuf_addf(err, "Unexpected sha1 when writing %s", pseudoref);
+ strbuf_addf(err, "unexpected sha1 when writing '%s'", pseudoref);
rollback_lock_file(&lock);
goto done;
}
}
if (write_in_full(fd, buf.buf, buf.len) != buf.len) {
- strbuf_addf(err, "Could not write to '%s'", filename);
+ strbuf_addf(err, "could not write to '%s'", filename);
rollback_lock_file(&lock);
goto done;
}
@@ -758,13 +766,32 @@ void ref_transaction_free(struct ref_transaction *transaction)
free(transaction);
}
-static struct ref_update *add_update(struct ref_transaction *transaction,
- const char *refname)
+struct ref_update *ref_transaction_add_update(
+ struct ref_transaction *transaction,
+ const char *refname, unsigned int flags,
+ const unsigned char *new_sha1,
+ const unsigned char *old_sha1,
+ const char *msg)
{
struct ref_update *update;
+
+ if (transaction->state != REF_TRANSACTION_OPEN)
+ die("BUG: update called for transaction that is not open");
+
+ if ((flags & REF_ISPRUNING) && !(flags & REF_NODEREF))
+ die("BUG: REF_ISPRUNING set without REF_NODEREF");
+
FLEX_ALLOC_STR(update, refname, refname);
ALLOC_GROW(transaction->updates, transaction->nr + 1, transaction->alloc);
transaction->updates[transaction->nr++] = update;
+
+ update->flags = flags;
+
+ if (flags & REF_HAVE_NEW)
+ hashcpy(update->new_sha1, new_sha1);
+ if (flags & REF_HAVE_OLD)
+ hashcpy(update->old_sha1, old_sha1);
+ update->msg = xstrdup_or_null(msg);
return update;
}
@@ -775,32 +802,20 @@ int ref_transaction_update(struct ref_transaction *transaction,
unsigned int flags, const char *msg,
struct strbuf *err)
{
- struct ref_update *update;
-
assert(err);
- if (transaction->state != REF_TRANSACTION_OPEN)
- die("BUG: update called for transaction that is not open");
-
- if (new_sha1 && !is_null_sha1(new_sha1) &&
- check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
- strbuf_addf(err, "refusing to update ref with bad name %s",
+ if ((new_sha1 && !is_null_sha1(new_sha1)) ?
+ check_refname_format(refname, REFNAME_ALLOW_ONELEVEL) :
+ !refname_is_safe(refname)) {
+ strbuf_addf(err, "refusing to update ref with bad name '%s'",
refname);
return -1;
}
- update = add_update(transaction, refname);
- if (new_sha1) {
- hashcpy(update->new_sha1, new_sha1);
- flags |= REF_HAVE_NEW;
- }
- if (old_sha1) {
- hashcpy(update->old_sha1, old_sha1);
- flags |= REF_HAVE_OLD;
- }
- update->flags = flags;
- if (msg)
- update->msg = xstrdup(msg);
+ flags |= (new_sha1 ? REF_HAVE_NEW : 0) | (old_sha1 ? REF_HAVE_OLD : 0);
+
+ ref_transaction_add_update(transaction, refname, flags,
+ new_sha1, old_sha1, msg);
return 0;
}
@@ -906,7 +921,7 @@ char *shorten_unambiguous_ref(const char *refname, int strict)
/* -2 for strlen("%.*s") - strlen("%s"); +1 for NUL */
total_len += strlen(ref_rev_parse_rules[nr_rules]) - 2 + 1;
- scanf_fmts = xmalloc(st_add(st_mult(nr_rules, sizeof(char *)), total_len));
+ scanf_fmts = xmalloc(st_add(st_mult(sizeof(char *), nr_rules), total_len));
offset = 0;
for (i = 0; i < nr_rules; i++) {
@@ -1104,6 +1119,26 @@ int head_ref(each_ref_fn fn, void *cb_data)
return head_ref_submodule(NULL, fn, cb_data);
}
+/*
+ * Call fn for each reference in the specified submodule for which the
+ * refname begins with prefix. If trim is non-zero, then trim that
+ * many characters off the beginning of each refname before passing
+ * the refname to fn. flags can be DO_FOR_EACH_INCLUDE_BROKEN to
+ * include broken references in the iteration. If fn ever returns a
+ * non-zero value, stop the iteration and return that value;
+ * otherwise, return 0.
+ */
+static int do_for_each_ref(const char *submodule, const char *prefix,
+ each_ref_fn fn, int trim, int flags, void *cb_data)
+{
+ struct ref_iterator *iter;
+
+ iter = files_ref_iterator_begin(submodule, prefix, flags);
+ iter = prefix_ref_iterator_begin(iter, prefix, trim);
+
+ return do_for_each_ref_iterator(iter, fn, cb_data);
+}
+
int for_each_ref(each_ref_fn fn, void *cb_data)
{
return do_for_each_ref(NULL, "", fn, 0, 0, cb_data);
diff --git a/refs.h b/refs.h
index 56089d5..1b02043 100644
--- a/refs.h
+++ b/refs.h
@@ -52,19 +52,19 @@
#define RESOLVE_REF_NO_RECURSE 0x02
#define RESOLVE_REF_ALLOW_BAD_NAME 0x04
-extern const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
- unsigned char *sha1, int *flags);
+const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
+ unsigned char *sha1, int *flags);
-extern char *resolve_refdup(const char *refname, int resolve_flags,
- unsigned char *sha1, int *flags);
+char *resolve_refdup(const char *refname, int resolve_flags,
+ unsigned char *sha1, int *flags);
-extern int read_ref_full(const char *refname, int resolve_flags,
- unsigned char *sha1, int *flags);
-extern int read_ref(const char *refname, unsigned char *sha1);
+int read_ref_full(const char *refname, int resolve_flags,
+ unsigned char *sha1, int *flags);
+int read_ref(const char *refname, unsigned char *sha1);
-extern int ref_exists(const char *refname);
+int ref_exists(const char *refname);
-extern int is_branch(const char *refname);
+int is_branch(const char *refname);
/*
* If refname is a non-symbolic reference that refers to a tag object,
@@ -74,24 +74,25 @@ extern int is_branch(const char *refname);
* Symbolic references are considered unpeelable, even if they
* ultimately resolve to a peelable tag.
*/
-extern int peel_ref(const char *refname, unsigned char *sha1);
+int peel_ref(const char *refname, unsigned char *sha1);
/**
* Resolve refname in the nested "gitlink" repository that is located
* at path. If the resolution is successful, return 0 and set sha1 to
* the name of the object; otherwise, return a non-zero value.
*/
-extern int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *sha1);
+int resolve_gitlink_ref(const char *path, const char *refname,
+ unsigned char *sha1);
/*
* Return true iff abbrev_name is a possible abbreviation for
* full_name according to the rules defined by ref_rev_parse_rules in
* refs.c.
*/
-extern int refname_match(const char *abbrev_name, const char *full_name);
+int refname_match(const char *abbrev_name, const char *full_name);
-extern int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref);
-extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);
+int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref);
+int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);
/*
* A ref_transaction represents a collection of ref updates
@@ -140,7 +141,9 @@ extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);
struct ref_transaction;
/*
- * Bit values set in the flags argument passed to each_ref_fn():
+ * Bit values set in the flags argument passed to each_ref_fn() and
+ * stored in ref_iterator::flags. Other bits are for internal use
+ * only:
*/
/* Reference is a symbolic reference. */
@@ -182,38 +185,45 @@ typedef int each_ref_fn(const char *refname,
* modifies the reference also returns a nonzero value to immediately
* stop the iteration.
*/
-extern int head_ref(each_ref_fn fn, void *cb_data);
-extern int for_each_ref(each_ref_fn fn, void *cb_data);
-extern int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data);
-extern int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, unsigned int broken);
-extern int for_each_tag_ref(each_ref_fn fn, void *cb_data);
-extern int for_each_branch_ref(each_ref_fn fn, void *cb_data);
-extern int for_each_remote_ref(each_ref_fn fn, void *cb_data);
-extern int for_each_replace_ref(each_ref_fn fn, void *cb_data);
-extern int for_each_glob_ref(each_ref_fn fn, const char *pattern, void *cb_data);
-extern int for_each_glob_ref_in(each_ref_fn fn, const char *pattern, const char *prefix, void *cb_data);
-
-extern int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
-extern int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
-extern int for_each_ref_in_submodule(const char *submodule, const char *prefix,
+int head_ref(each_ref_fn fn, void *cb_data);
+int for_each_ref(each_ref_fn fn, void *cb_data);
+int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data);
+int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data,
+ unsigned int broken);
+int for_each_tag_ref(each_ref_fn fn, void *cb_data);
+int for_each_branch_ref(each_ref_fn fn, void *cb_data);
+int for_each_remote_ref(each_ref_fn fn, void *cb_data);
+int for_each_replace_ref(each_ref_fn fn, void *cb_data);
+int for_each_glob_ref(each_ref_fn fn, const char *pattern, void *cb_data);
+int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
+ const char *prefix, void *cb_data);
+
+int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
+int for_each_ref_submodule(const char *submodule,
+ each_ref_fn fn, void *cb_data);
+int for_each_ref_in_submodule(const char *submodule, const char *prefix,
each_ref_fn fn, void *cb_data);
-extern int for_each_tag_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
-extern int for_each_branch_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
-extern int for_each_remote_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
+int for_each_tag_ref_submodule(const char *submodule,
+ each_ref_fn fn, void *cb_data);
+int for_each_branch_ref_submodule(const char *submodule,
+ each_ref_fn fn, void *cb_data);
+int for_each_remote_ref_submodule(const char *submodule,
+ each_ref_fn fn, void *cb_data);
-extern int head_ref_namespaced(each_ref_fn fn, void *cb_data);
-extern int for_each_namespaced_ref(each_ref_fn fn, void *cb_data);
+int head_ref_namespaced(each_ref_fn fn, void *cb_data);
+int for_each_namespaced_ref(each_ref_fn fn, void *cb_data);
/* can be used to learn about broken ref and symref */
-extern int for_each_rawref(each_ref_fn fn, void *cb_data);
+int for_each_rawref(each_ref_fn fn, void *cb_data);
static inline const char *has_glob_specials(const char *pattern)
{
return strpbrk(pattern, "?*[");
}
-extern void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname);
-extern void warn_dangling_symrefs(FILE *fp, const char *msg_fmt, const struct string_list *refnames);
+void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname);
+void warn_dangling_symrefs(FILE *fp, const char *msg_fmt,
+ const struct string_list *refnames);
/*
* Flags for controlling behaviour of pack_refs()
@@ -245,13 +255,13 @@ int pack_refs(unsigned int flags);
int safe_create_reflog(const char *refname, int force_create, struct strbuf *err);
/** Reads log for the value of ref during at_time. **/
-extern int read_ref_at(const char *refname, unsigned int flags,
- unsigned long at_time, int cnt,
- unsigned char *sha1, char **msg,
- unsigned long *cutoff_time, int *cutoff_tz, int *cutoff_cnt);
+int read_ref_at(const char *refname, unsigned int flags,
+ unsigned long at_time, int cnt,
+ unsigned char *sha1, char **msg,
+ unsigned long *cutoff_time, int *cutoff_tz, int *cutoff_cnt);
/** Check if a particular reflog exists */
-extern int reflog_exists(const char *refname);
+int reflog_exists(const char *refname);
/*
* Delete the specified reference. If old_sha1 is non-NULL, then
@@ -260,21 +270,26 @@ extern int reflog_exists(const char *refname);
* exists, regardless of its old value. It is an error for old_sha1 to
* be NULL_SHA1. flags is passed through to ref_transaction_delete().
*/
-extern int delete_ref(const char *refname, const unsigned char *old_sha1,
- unsigned int flags);
+int delete_ref(const char *refname, const unsigned char *old_sha1,
+ unsigned int flags);
/*
* Delete the specified references. If there are any problems, emit
* errors but attempt to keep going (i.e., the deletes are not done in
- * an all-or-nothing transaction).
+ * an all-or-nothing transaction). flags is passed through to
+ * ref_transaction_delete().
*/
-extern int delete_refs(struct string_list *refnames);
+int delete_refs(struct string_list *refnames, unsigned int flags);
/** Delete a reflog */
-extern int delete_reflog(const char *refname);
+int delete_reflog(const char *refname);
/* iterate over reflog entries */
-typedef int each_reflog_ent_fn(unsigned char *osha1, unsigned char *nsha1, const char *, unsigned long, int, const char *, void *);
+typedef int each_reflog_ent_fn(
+ unsigned char *old_sha1, unsigned char *new_sha1,
+ const char *committer, unsigned long timestamp,
+ int tz, const char *msg, void *cb_data);
+
int for_each_reflog_ent(const char *refname, each_reflog_ent_fn fn, void *cb_data);
int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn, void *cb_data);
@@ -282,7 +297,7 @@ int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn, void
* Calls the specified function for each reflog file until it returns nonzero,
* and returns the value
*/
-extern int for_each_reflog(each_ref_fn, void *);
+int for_each_reflog(each_ref_fn fn, void *cb_data);
#define REFNAME_ALLOW_ONELEVEL 1
#define REFNAME_REFSPEC_PATTERN 2
@@ -295,16 +310,16 @@ extern int for_each_reflog(each_ref_fn, void *);
* allow a single "*" wildcard character in the refspec. No leading or
* repeated slashes are accepted.
*/
-extern int check_refname_format(const char *refname, int flags);
+int check_refname_format(const char *refname, int flags);
-extern const char *prettify_refname(const char *refname);
+const char *prettify_refname(const char *refname);
-extern char *shorten_unambiguous_ref(const char *refname, int strict);
+char *shorten_unambiguous_ref(const char *refname, int strict);
/** rename ref, return 0 on success **/
-extern int rename_ref(const char *oldref, const char *newref, const char *logmsg);
+int rename_ref(const char *oldref, const char *newref, const char *logmsg);
-extern int create_symref(const char *refname, const char *target, const char *logmsg);
+int create_symref(const char *refname, const char *target, const char *logmsg);
/*
* Update HEAD of the specified gitdir.
@@ -313,7 +328,7 @@ extern int create_symref(const char *refname, const char *target, const char *lo
* $GIT_DIR points to.
* Return 0 if successful, non-zero otherwise.
* */
-extern int set_worktree_head_symref(const char *gitdir, const char *target);
+int set_worktree_head_symref(const char *gitdir, const char *target);
enum action_on_err {
UPDATE_REFS_MSG_ON_ERR,
@@ -463,7 +478,7 @@ int update_ref(const char *msg, const char *refname,
const unsigned char *new_sha1, const unsigned char *old_sha1,
unsigned int flags, enum action_on_err onerr);
-extern int parse_hide_refs_config(const char *var, const char *value, const char *);
+int parse_hide_refs_config(const char *var, const char *value, const char *);
/*
* Check whether a ref is hidden. If no namespace is set, both the first and
@@ -473,7 +488,7 @@ extern int parse_hide_refs_config(const char *var, const char *value, const char
* the ref is outside that namespace, the first parameter is NULL. The second
* parameter always points to the full ref name.
*/
-extern int ref_is_hidden(const char *, const char *);
+int ref_is_hidden(const char *, const char *);
enum ref_type {
REF_TYPE_PER_WORKTREE,
@@ -522,11 +537,11 @@ typedef void reflog_expiry_cleanup_fn(void *cb_data);
* enum expire_reflog_flags. The three function pointers are described
* above. On success, return zero.
*/
-extern int reflog_expire(const char *refname, const unsigned char *sha1,
- unsigned int flags,
- reflog_expiry_prepare_fn prepare_fn,
- reflog_expiry_should_prune_fn should_prune_fn,
- reflog_expiry_cleanup_fn cleanup_fn,
- void *policy_cb_data);
+int reflog_expire(const char *refname, const unsigned char *sha1,
+ unsigned int flags,
+ reflog_expiry_prepare_fn prepare_fn,
+ reflog_expiry_should_prune_fn should_prune_fn,
+ reflog_expiry_cleanup_fn cleanup_fn,
+ void *policy_cb_data);
#endif /* REFS_H */
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 1f38076..2455564 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1,13 +1,14 @@
#include "../cache.h"
#include "../refs.h"
#include "refs-internal.h"
+#include "../iterator.h"
+#include "../dir-iterator.h"
#include "../lockfile.h"
#include "../object.h"
#include "../dir.h"
struct ref_lock {
char *ref_name;
- char *orig_ref_name;
struct lock_file *lk;
struct object_id old_oid;
};
@@ -514,68 +515,36 @@ static void sort_ref_dir(struct ref_dir *dir)
}
/*
- * Return true iff the reference described by entry can be resolved to
- * an object in the database. Emit a warning if the referred-to
- * object does not exist.
+ * Return true if refname, which has the specified oid and flags, can
+ * be resolved to an object in the database. If the referred-to object
+ * does not exist, emit a warning and return false.
*/
-static int ref_resolves_to_object(struct ref_entry *entry)
+static int ref_resolves_to_object(const char *refname,
+ const struct object_id *oid,
+ unsigned int flags)
{
- if (entry->flag & REF_ISBROKEN)
+ if (flags & REF_ISBROKEN)
return 0;
- if (!has_sha1_file(entry->u.value.oid.hash)) {
- error("%s does not point to a valid object!", entry->name);
+ if (!has_sha1_file(oid->hash)) {
+ error("%s does not point to a valid object!", refname);
return 0;
}
return 1;
}
/*
- * current_ref is a performance hack: when iterating over references
- * using the for_each_ref*() functions, current_ref is set to the
- * current reference's entry before calling the callback function. If
- * the callback function calls peel_ref(), then peel_ref() first
- * checks whether the reference to be peeled is the current reference
- * (it usually is) and if so, returns that reference's peeled version
- * if it is available. This avoids a refname lookup in a common case.
- */
-static struct ref_entry *current_ref;
-
-typedef int each_ref_entry_fn(struct ref_entry *entry, void *cb_data);
-
-struct ref_entry_cb {
- const char *base;
- int trim;
- int flags;
- each_ref_fn *fn;
- void *cb_data;
-};
-
-/*
- * Handle one reference in a do_for_each_ref*()-style iteration,
- * calling an each_ref_fn for each entry.
+ * Return true if the reference described by entry can be resolved to
+ * an object in the database; otherwise, emit a warning and return
+ * false.
*/
-static int do_one_ref(struct ref_entry *entry, void *cb_data)
+static int entry_resolves_to_object(struct ref_entry *entry)
{
- struct ref_entry_cb *data = cb_data;
- struct ref_entry *old_current_ref;
- int retval;
-
- if (!starts_with(entry->name, data->base))
- return 0;
-
- if (!(data->flags & DO_FOR_EACH_INCLUDE_BROKEN) &&
- !ref_resolves_to_object(entry))
- return 0;
-
- /* Store the old value, in case this is a recursive call: */
- old_current_ref = current_ref;
- current_ref = entry;
- retval = data->fn(entry->name + data->trim, &entry->u.value.oid,
- entry->flag, data->cb_data);
- current_ref = old_current_ref;
- return retval;
+ return ref_resolves_to_object(entry->name,
+ &entry->u.value.oid, entry->flag);
}
+typedef int each_ref_entry_fn(struct ref_entry *entry, void *cb_data);
+
/*
* Call fn for each reference in dir that has index in the range
* offset <= index < dir->nr. Recurse into subdirectories that are in
@@ -605,78 +574,6 @@ static int do_for_each_entry_in_dir(struct ref_dir *dir, int offset,
}
/*
- * Call fn for each reference in the union of dir1 and dir2, in order
- * by refname. Recurse into subdirectories. If a value entry appears
- * in both dir1 and dir2, then only process the version that is in
- * dir2. The input dirs must already be sorted, but subdirs will be
- * sorted as needed. fn is called for all references, including
- * broken ones.
- */
-static int do_for_each_entry_in_dirs(struct ref_dir *dir1,
- struct ref_dir *dir2,
- each_ref_entry_fn fn, void *cb_data)
-{
- int retval;
- int i1 = 0, i2 = 0;
-
- assert(dir1->sorted == dir1->nr);
- assert(dir2->sorted == dir2->nr);
- while (1) {
- struct ref_entry *e1, *e2;
- int cmp;
- if (i1 == dir1->nr) {
- return do_for_each_entry_in_dir(dir2, i2, fn, cb_data);
- }
- if (i2 == dir2->nr) {
- return do_for_each_entry_in_dir(dir1, i1, fn, cb_data);
- }
- e1 = dir1->entries[i1];
- e2 = dir2->entries[i2];
- cmp = strcmp(e1->name, e2->name);
- if (cmp == 0) {
- if ((e1->flag & REF_DIR) && (e2->flag & REF_DIR)) {
- /* Both are directories; descend them in parallel. */
- struct ref_dir *subdir1 = get_ref_dir(e1);
- struct ref_dir *subdir2 = get_ref_dir(e2);
- sort_ref_dir(subdir1);
- sort_ref_dir(subdir2);
- retval = do_for_each_entry_in_dirs(
- subdir1, subdir2, fn, cb_data);
- i1++;
- i2++;
- } else if (!(e1->flag & REF_DIR) && !(e2->flag & REF_DIR)) {
- /* Both are references; ignore the one from dir1. */
- retval = fn(e2, cb_data);
- i1++;
- i2++;
- } else {
- die("conflict between reference and directory: %s",
- e1->name);
- }
- } else {
- struct ref_entry *e;
- if (cmp < 0) {
- e = e1;
- i1++;
- } else {
- e = e2;
- i2++;
- }
- if (e->flag & REF_DIR) {
- struct ref_dir *subdir = get_ref_dir(e);
- sort_ref_dir(subdir);
- retval = do_for_each_entry_in_dir(
- subdir, 0, fn, cb_data);
- } else {
- retval = fn(e, cb_data);
- }
- }
- if (retval)
- return retval;
- }
-}
-
-/*
* Load all of the refs from the dir into our in-memory cache. The hard work
* of loading loose refs is done by get_ref_dir(), so we just need to recurse
* through all of the sub-directories. We do not even need to care about
@@ -692,6 +589,153 @@ static void prime_ref_dir(struct ref_dir *dir)
}
}
+/*
+ * A level in the reference hierarchy that is currently being iterated
+ * through.
+ */
+struct cache_ref_iterator_level {
+ /*
+ * The ref_dir being iterated over at this level. The ref_dir
+ * is sorted before being stored here.
+ */
+ struct ref_dir *dir;
+
+ /*
+ * The index of the current entry within dir (which might
+ * itself be a directory). If index == -1, then the iteration
+ * hasn't yet begun. If index == dir->nr, then the iteration
+ * through this level is over.
+ */
+ int index;
+};
+
+/*
+ * Represent an iteration through a ref_dir in the memory cache. The
+ * iteration recurses through subdirectories.
+ */
+struct cache_ref_iterator {
+ struct ref_iterator base;
+
+ /*
+ * The number of levels currently on the stack. This is always
+ * at least 1, because when it becomes zero the iteration is
+ * ended and this struct is freed.
+ */
+ size_t levels_nr;
+
+ /* The number of levels that have been allocated on the stack */
+ size_t levels_alloc;
+
+ /*
+ * A stack of levels. levels[0] is the uppermost level that is
+ * being iterated over in this iteration. (This is not
+ * necessary the top level in the references hierarchy. If we
+ * are iterating through a subtree, then levels[0] will hold
+ * the ref_dir for that subtree, and subsequent levels will go
+ * on from there.)
+ */
+ struct cache_ref_iterator_level *levels;
+};
+
+static int cache_ref_iterator_advance(struct ref_iterator *ref_iterator)
+{
+ struct cache_ref_iterator *iter =
+ (struct cache_ref_iterator *)ref_iterator;
+
+ while (1) {
+ struct cache_ref_iterator_level *level =
+ &iter->levels[iter->levels_nr - 1];
+ struct ref_dir *dir = level->dir;
+ struct ref_entry *entry;
+
+ if (level->index == -1)
+ sort_ref_dir(dir);
+
+ if (++level->index == level->dir->nr) {
+ /* This level is exhausted; pop up a level */
+ if (--iter->levels_nr == 0)
+ return ref_iterator_abort(ref_iterator);
+
+ continue;
+ }
+
+ entry = dir->entries[level->index];
+
+ if (entry->flag & REF_DIR) {
+ /* push down a level */
+ ALLOC_GROW(iter->levels, iter->levels_nr + 1,
+ iter->levels_alloc);
+
+ level = &iter->levels[iter->levels_nr++];
+ level->dir = get_ref_dir(entry);
+ level->index = -1;
+ } else {
+ iter->base.refname = entry->name;
+ iter->base.oid = &entry->u.value.oid;
+ iter->base.flags = entry->flag;
+ return ITER_OK;
+ }
+ }
+}
+
+static enum peel_status peel_entry(struct ref_entry *entry, int repeel);
+
+static int cache_ref_iterator_peel(struct ref_iterator *ref_iterator,
+ struct object_id *peeled)
+{
+ struct cache_ref_iterator *iter =
+ (struct cache_ref_iterator *)ref_iterator;
+ struct cache_ref_iterator_level *level;
+ struct ref_entry *entry;
+
+ level = &iter->levels[iter->levels_nr - 1];
+
+ if (level->index == -1)
+ die("BUG: peel called before advance for cache iterator");
+
+ entry = level->dir->entries[level->index];
+
+ if (peel_entry(entry, 0))
+ return -1;
+ hashcpy(peeled->hash, entry->u.value.peeled.hash);
+ return 0;
+}
+
+static int cache_ref_iterator_abort(struct ref_iterator *ref_iterator)
+{
+ struct cache_ref_iterator *iter =
+ (struct cache_ref_iterator *)ref_iterator;
+
+ free(iter->levels);
+ base_ref_iterator_free(ref_iterator);
+ return ITER_DONE;
+}
+
+static struct ref_iterator_vtable cache_ref_iterator_vtable = {
+ cache_ref_iterator_advance,
+ cache_ref_iterator_peel,
+ cache_ref_iterator_abort
+};
+
+static struct ref_iterator *cache_ref_iterator_begin(struct ref_dir *dir)
+{
+ struct cache_ref_iterator *iter;
+ struct ref_iterator *ref_iterator;
+ struct cache_ref_iterator_level *level;
+
+ iter = xcalloc(1, sizeof(*iter));
+ ref_iterator = &iter->base;
+ base_ref_iterator_init(ref_iterator, &cache_ref_iterator_vtable);
+ ALLOC_GROW(iter->levels, 10, iter->levels_alloc);
+
+ iter->levels_nr = 1;
+ level = &iter->levels[0];
+ level->index = -1;
+ level->dir = dir;
+
+ return ref_iterator;
+}
+
struct nonmatching_ref_data {
const struct string_list *skip;
const char *conflicting_refname;
@@ -955,15 +999,26 @@ static struct ref_cache *lookup_ref_cache(const char *submodule)
/*
* Return a pointer to a ref_cache for the specified submodule. For
- * the main repository, use submodule==NULL. The returned structure
- * will be allocated and initialized but not necessarily populated; it
- * should not be freed.
+ * the main repository, use submodule==NULL; such a call cannot fail.
+ * For a submodule, the submodule must exist and be a nonbare
+ * repository, otherwise return NULL.
+ *
+ * The returned structure will be allocated and initialized but not
+ * necessarily populated; it should not be freed.
*/
static struct ref_cache *get_ref_cache(const char *submodule)
{
struct ref_cache *refs = lookup_ref_cache(submodule);
- if (!refs)
- refs = create_ref_cache(submodule);
+
+ if (!refs) {
+ struct strbuf submodule_sb = STRBUF_INIT;
+
+ strbuf_addstr(&submodule_sb, submodule);
+ if (is_nonbare_repository_dir(&submodule_sb))
+ refs = create_ref_cache(submodule);
+ strbuf_release(&submodule_sb);
+ }
+
return refs;
}
@@ -1342,13 +1397,10 @@ int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *sh
return -1;
strbuf_add(&submodule, path, len);
- refs = lookup_ref_cache(submodule.buf);
+ refs = get_ref_cache(submodule.buf);
if (!refs) {
- if (!is_nonbare_repository_dir(&submodule)) {
- strbuf_release(&submodule);
- return -1;
- }
- refs = create_ref_cache(submodule.buf);
+ strbuf_release(&submodule);
+ return -1;
}
strbuf_release(&submodule);
@@ -1388,38 +1440,8 @@ static int resolve_missing_loose_ref(const char *refname,
return -1;
}
-/*
- * Read a raw ref from the filesystem or packed refs file.
- *
- * If the ref is a sha1, fill in sha1 and return 0.
- *
- * If the ref is symbolic, fill in *symref with the referrent
- * (e.g. "refs/heads/master") and return 0. The caller is responsible
- * for validating the referrent. Set REF_ISSYMREF in flags.
- *
- * If the ref doesn't exist, set errno to ENOENT and return -1.
- *
- * If the ref exists but is neither a symbolic ref nor a sha1, it is
- * broken. Set REF_ISBROKEN in flags, set errno to EINVAL, and return
- * -1.
- *
- * If there is another error reading the ref, set errno appropriately and
- * return -1.
- *
- * Backend-specific flags might be set in flags as well, regardless of
- * outcome.
- *
- * sb_path is workspace: the caller should allocate and free it.
- *
- * It is OK for refname to point into symref. In this case:
- * - if the function succeeds with REF_ISSYMREF, symref will be
- * overwritten and the memory pointed to by refname might be changed
- * or even freed.
- * - in all other cases, symref will be untouched, and therefore
- * refname will still be valid and unchanged.
- */
int read_raw_ref(const char *refname, unsigned char *sha1,
- struct strbuf *symref, unsigned int *flags)
+ struct strbuf *referent, unsigned int *type)
{
struct strbuf sb_contents = STRBUF_INIT;
struct strbuf sb_path = STRBUF_INIT;
@@ -1429,7 +1451,9 @@ int read_raw_ref(const char *refname, unsigned char *sha1,
int fd;
int ret = -1;
int save_errno;
+ int remaining_retries = 3;
+ *type = 0;
strbuf_reset(&sb_path);
strbuf_git_path(&sb_path, "%s", refname);
path = sb_path.buf;
@@ -1443,12 +1467,18 @@ stat_ref:
* <-> symlink) between the lstat() and reading, then
* we don't want to report that as an error but rather
* try again starting with the lstat().
+ *
+ * We'll keep a count of the retries, though, just to avoid
+ * any confusing situation sending us into an infinite loop.
*/
+ if (remaining_retries-- <= 0)
+ goto out;
+
if (lstat(path, &st) < 0) {
if (errno != ENOENT)
goto out;
- if (resolve_missing_loose_ref(refname, sha1, flags)) {
+ if (resolve_missing_loose_ref(refname, sha1, type)) {
errno = ENOENT;
goto out;
}
@@ -1468,16 +1498,30 @@ stat_ref:
}
if (starts_with(sb_contents.buf, "refs/") &&
!check_refname_format(sb_contents.buf, 0)) {
- strbuf_swap(&sb_contents, symref);
- *flags |= REF_ISSYMREF;
+ strbuf_swap(&sb_contents, referent);
+ *type |= REF_ISSYMREF;
ret = 0;
goto out;
}
+ /*
+ * It doesn't look like a refname; fall through to just
+ * treating it like a non-symlink, and reading whatever it
+ * points to.
+ */
}
/* Is it a directory? */
if (S_ISDIR(st.st_mode)) {
- errno = EISDIR;
+ /*
+ * Even though there is a directory where the loose
+ * ref is supposed to be, there could still be a
+ * packed ref:
+ */
+ if (resolve_missing_loose_ref(refname, sha1, type)) {
+ errno = EISDIR;
+ goto out;
+ }
+ ret = 0;
goto out;
}
@@ -1487,7 +1531,7 @@ stat_ref:
*/
fd = open(path, O_RDONLY);
if (fd < 0) {
- if (errno == ENOENT)
+ if (errno == ENOENT && !S_ISLNK(st.st_mode))
/* inconsistent with lstat; retry */
goto stat_ref;
else
@@ -1508,9 +1552,9 @@ stat_ref:
while (isspace(*buf))
buf++;
- strbuf_reset(symref);
- strbuf_addstr(symref, buf);
- *flags |= REF_ISSYMREF;
+ strbuf_reset(referent);
+ strbuf_addstr(referent, buf);
+ *type |= REF_ISSYMREF;
ret = 0;
goto out;
}
@@ -1521,7 +1565,7 @@ stat_ref:
*/
if (get_sha1_hex(buf, sha1) ||
(buf[40] != '\0' && !isspace(buf[40]))) {
- *flags |= REF_ISBROKEN;
+ *type |= REF_ISBROKEN;
errno = EINVAL;
goto out;
}
@@ -1536,6 +1580,241 @@ out:
return ret;
}
+static void unlock_ref(struct ref_lock *lock)
+{
+ /* Do not free lock->lk -- atexit() still looks at them */
+ if (lock->lk)
+ rollback_lock_file(lock->lk);
+ free(lock->ref_name);
+ free(lock);
+}
+
+/*
+ * Lock refname, without following symrefs, and set *lock_p to point
+ * at a newly-allocated lock object. Fill in lock->old_oid, referent,
+ * and type similarly to read_raw_ref().
+ *
+ * The caller must verify that refname is a "safe" reference name (in
+ * the sense of refname_is_safe()) before calling this function.
+ *
+ * If the reference doesn't already exist, verify that refname doesn't
+ * have a D/F conflict with any existing references. extras and skip
+ * are passed to verify_refname_available_dir() for this check.
+ *
+ * If mustexist is not set and the reference is not found or is
+ * broken, lock the reference anyway but clear sha1.
+ *
+ * Return 0 on success. On failure, write an error message to err and
+ * return TRANSACTION_NAME_CONFLICT or TRANSACTION_GENERIC_ERROR.
+ *
+ * Implementation note: This function is basically
+ *
+ * lock reference
+ * read_raw_ref()
+ *
+ * but it includes a lot more code to
+ * - Deal with possible races with other processes
+ * - Avoid calling verify_refname_available_dir() when it can be
+ * avoided, namely if we were successfully able to read the ref
+ * - Generate informative error messages in the case of failure
+ */
+static int lock_raw_ref(const char *refname, int mustexist,
+ const struct string_list *extras,
+ const struct string_list *skip,
+ struct ref_lock **lock_p,
+ struct strbuf *referent,
+ unsigned int *type,
+ struct strbuf *err)
+{
+ struct ref_lock *lock;
+ struct strbuf ref_file = STRBUF_INIT;
+ int attempts_remaining = 3;
+ int ret = TRANSACTION_GENERIC_ERROR;
+
+ assert(err);
+ *type = 0;
+
+ /* First lock the file so it can't change out from under us. */
+
+ *lock_p = lock = xcalloc(1, sizeof(*lock));
+
+ lock->ref_name = xstrdup(refname);
+ strbuf_git_path(&ref_file, "%s", refname);
+
+retry:
+ switch (safe_create_leading_directories(ref_file.buf)) {
+ case SCLD_OK:
+ break; /* success */
+ case SCLD_EXISTS:
+ /*
+ * Suppose refname is "refs/foo/bar". We just failed
+ * to create the containing directory, "refs/foo",
+ * because there was a non-directory in the way. This
+ * indicates a D/F conflict, probably because of
+ * another reference such as "refs/foo". There is no
+ * reason to expect this error to be transitory.
+ */
+ if (verify_refname_available(refname, extras, skip, err)) {
+ if (mustexist) {
+ /*
+ * To the user the relevant error is
+ * that the "mustexist" reference is
+ * missing:
+ */
+ strbuf_reset(err);
+ strbuf_addf(err, "unable to resolve reference '%s'",
+ refname);
+ } else {
+ /*
+ * The error message set by
+ * verify_refname_available_dir() is OK.
+ */
+ ret = TRANSACTION_NAME_CONFLICT;
+ }
+ } else {
+ /*
+ * The file that is in the way isn't a loose
+ * reference. Report it as a low-level
+ * failure.
+ */
+ strbuf_addf(err, "unable to create lock file %s.lock; "
+ "non-directory in the way",
+ ref_file.buf);
+ }
+ goto error_return;
+ case SCLD_VANISHED:
+ /* Maybe another process was tidying up. Try again. */
+ if (--attempts_remaining > 0)
+ goto retry;
+ /* fall through */
+ default:
+ strbuf_addf(err, "unable to create directory for %s",
+ ref_file.buf);
+ goto error_return;
+ }
+
+ if (!lock->lk)
+ lock->lk = xcalloc(1, sizeof(struct lock_file));
+
+ if (hold_lock_file_for_update(lock->lk, ref_file.buf, LOCK_NO_DEREF) < 0) {
+ if (errno == ENOENT && --attempts_remaining > 0) {
+ /*
+ * Maybe somebody just deleted one of the
+ * directories leading to ref_file. Try
+ * again:
+ */
+ goto retry;
+ } else {
+ unable_to_lock_message(ref_file.buf, errno, err);
+ goto error_return;
+ }
+ }
+
+ /*
+ * Now we hold the lock and can read the reference without
+ * fear that its value will change.
+ */
+
+ if (read_raw_ref(refname, lock->old_oid.hash, referent, type)) {
+ if (errno == ENOENT) {
+ if (mustexist) {
+ /* Garden variety missing reference. */
+ strbuf_addf(err, "unable to resolve reference '%s'",
+ refname);
+ goto error_return;
+ } else {
+ /*
+ * Reference is missing, but that's OK. We
+ * know that there is not a conflict with
+ * another loose reference because
+ * (supposing that we are trying to lock
+ * reference "refs/foo/bar"):
+ *
+ * - We were successfully able to create
+ * the lockfile refs/foo/bar.lock, so we
+ * know there cannot be a loose reference
+ * named "refs/foo".
+ *
+ * - We got ENOENT and not EISDIR, so we
+ * know that there cannot be a loose
+ * reference named "refs/foo/bar/baz".
+ */
+ }
+ } else if (errno == EISDIR) {
+ /*
+ * There is a directory in the way. It might have
+ * contained references that have been deleted. If
+ * we don't require that the reference already
+ * exists, try to remove the directory so that it
+ * doesn't cause trouble when we want to rename the
+ * lockfile into place later.
+ */
+ if (mustexist) {
+ /* Garden variety missing reference. */
+ strbuf_addf(err, "unable to resolve reference '%s'",
+ refname);
+ goto error_return;
+ } else if (remove_dir_recursively(&ref_file,
+ REMOVE_DIR_EMPTY_ONLY)) {
+ if (verify_refname_available_dir(
+ refname, extras, skip,
+ get_loose_refs(&ref_cache),
+ err)) {
+ /*
+ * The error message set by
+ * verify_refname_available() is OK.
+ */
+ ret = TRANSACTION_NAME_CONFLICT;
+ goto error_return;
+ } else {
+ /*
+ * We can't delete the directory,
+ * but we also don't know of any
+ * references that it should
+ * contain.
+ */
+ strbuf_addf(err, "there is a non-empty directory '%s' "
+ "blocking reference '%s'",
+ ref_file.buf, refname);
+ goto error_return;
+ }
+ }
+ } else if (errno == EINVAL && (*type & REF_ISBROKEN)) {
+ strbuf_addf(err, "unable to resolve reference '%s': "
+ "reference broken", refname);
+ goto error_return;
+ } else {
+ strbuf_addf(err, "unable to resolve reference '%s': %s",
+ refname, strerror(errno));
+ goto error_return;
+ }
+
+ /*
+ * If the ref did not exist and we are creating it,
+ * make sure there is no existing packed ref whose
+ * name begins with our refname, nor a packed ref
+ * whose name is a proper prefix of our refname.
+ */
+ if (verify_refname_available_dir(
+ refname, extras, skip,
+ get_packed_refs(&ref_cache),
+ err)) {
+ goto error_return;
+ }
+ }
+
+ ret = 0;
+ goto out;
+
+error_return:
+ unlock_ref(lock);
+ *lock_p = NULL;
+
+out:
+ strbuf_release(&ref_file);
+ return ret;
+}
+
/*
* Peel the entry (if possible) and return its new peel_status. If
* repeel is true, re-peel the entry even if there is an old peeled
@@ -1576,11 +1855,12 @@ int peel_ref(const char *refname, unsigned char *sha1)
int flag;
unsigned char base[20];
- if (current_ref && (current_ref->name == refname
- || !strcmp(current_ref->name, refname))) {
- if (peel_entry(current_ref, 0))
+ if (current_ref_iter && current_ref_iter->refname == refname) {
+ struct object_id peeled;
+
+ if (ref_iterator_peel(current_ref_iter, &peeled))
return -1;
- hashcpy(sha1, current_ref->u.value.peeled.hash);
+ hashcpy(sha1, peeled.hash);
return 0;
}
@@ -1608,100 +1888,137 @@ int peel_ref(const char *refname, unsigned char *sha1)
return peel_object(base, sha1);
}
-/*
- * Call fn for each reference in the specified ref_cache, omitting
- * references not in the containing_dir of base. fn is called for all
- * references, including broken ones. If fn ever returns a non-zero
- * value, stop the iteration and return that value; otherwise, return
- * 0.
- */
-static int do_for_each_entry(struct ref_cache *refs, const char *base,
- each_ref_entry_fn fn, void *cb_data)
-{
+struct files_ref_iterator {
+ struct ref_iterator base;
+
struct packed_ref_cache *packed_ref_cache;
- struct ref_dir *loose_dir;
- struct ref_dir *packed_dir;
- int retval = 0;
+ struct ref_iterator *iter0;
+ unsigned int flags;
+};
- /*
- * We must make sure that all loose refs are read before accessing the
- * packed-refs file; this avoids a race condition in which loose refs
- * are migrated to the packed-refs file by a simultaneous process, but
- * our in-memory view is from before the migration. get_packed_ref_cache()
- * takes care of making sure our view is up to date with what is on
- * disk.
- */
- loose_dir = get_loose_refs(refs);
- if (base && *base) {
- loose_dir = find_containing_dir(loose_dir, base, 0);
- }
- if (loose_dir)
- prime_ref_dir(loose_dir);
+static int files_ref_iterator_advance(struct ref_iterator *ref_iterator)
+{
+ struct files_ref_iterator *iter =
+ (struct files_ref_iterator *)ref_iterator;
+ int ok;
- packed_ref_cache = get_packed_ref_cache(refs);
- acquire_packed_ref_cache(packed_ref_cache);
- packed_dir = get_packed_ref_dir(packed_ref_cache);
- if (base && *base) {
- packed_dir = find_containing_dir(packed_dir, base, 0);
- }
-
- if (packed_dir && loose_dir) {
- sort_ref_dir(packed_dir);
- sort_ref_dir(loose_dir);
- retval = do_for_each_entry_in_dirs(
- packed_dir, loose_dir, fn, cb_data);
- } else if (packed_dir) {
- sort_ref_dir(packed_dir);
- retval = do_for_each_entry_in_dir(
- packed_dir, 0, fn, cb_data);
- } else if (loose_dir) {
- sort_ref_dir(loose_dir);
- retval = do_for_each_entry_in_dir(
- loose_dir, 0, fn, cb_data);
+ while ((ok = ref_iterator_advance(iter->iter0)) == ITER_OK) {
+ if (!(iter->flags & DO_FOR_EACH_INCLUDE_BROKEN) &&
+ !ref_resolves_to_object(iter->iter0->refname,
+ iter->iter0->oid,
+ iter->iter0->flags))
+ continue;
+
+ iter->base.refname = iter->iter0->refname;
+ iter->base.oid = iter->iter0->oid;
+ iter->base.flags = iter->iter0->flags;
+ return ITER_OK;
}
- release_packed_ref_cache(packed_ref_cache);
- return retval;
+ iter->iter0 = NULL;
+ if (ref_iterator_abort(ref_iterator) != ITER_DONE)
+ ok = ITER_ERROR;
+
+ return ok;
}
-/*
- * Call fn for each reference in the specified ref_cache for which the
- * refname begins with base. If trim is non-zero, then trim that many
- * characters off the beginning of each refname before passing the
- * refname to fn. flags can be DO_FOR_EACH_INCLUDE_BROKEN to include
- * broken references in the iteration. If fn ever returns a non-zero
- * value, stop the iteration and return that value; otherwise, return
- * 0.
- */
-int do_for_each_ref(const char *submodule, const char *base,
- each_ref_fn fn, int trim, int flags, void *cb_data)
+static int files_ref_iterator_peel(struct ref_iterator *ref_iterator,
+ struct object_id *peeled)
{
- struct ref_entry_cb data;
- struct ref_cache *refs;
+ struct files_ref_iterator *iter =
+ (struct files_ref_iterator *)ref_iterator;
+
+ return ref_iterator_peel(iter->iter0, peeled);
+}
+
+static int files_ref_iterator_abort(struct ref_iterator *ref_iterator)
+{
+ struct files_ref_iterator *iter =
+ (struct files_ref_iterator *)ref_iterator;
+ int ok = ITER_DONE;
+
+ if (iter->iter0)
+ ok = ref_iterator_abort(iter->iter0);
+
+ release_packed_ref_cache(iter->packed_ref_cache);
+ base_ref_iterator_free(ref_iterator);
+ return ok;
+}
- refs = get_ref_cache(submodule);
- data.base = base;
- data.trim = trim;
- data.flags = flags;
- data.fn = fn;
- data.cb_data = cb_data;
+static struct ref_iterator_vtable files_ref_iterator_vtable = {
+ files_ref_iterator_advance,
+ files_ref_iterator_peel,
+ files_ref_iterator_abort
+};
+
+struct ref_iterator *files_ref_iterator_begin(
+ const char *submodule,
+ const char *prefix, unsigned int flags)
+{
+ struct ref_cache *refs = get_ref_cache(submodule);
+ struct ref_dir *loose_dir, *packed_dir;
+ struct ref_iterator *loose_iter, *packed_iter;
+ struct files_ref_iterator *iter;
+ struct ref_iterator *ref_iterator;
+
+ if (!refs)
+ return empty_ref_iterator_begin();
if (ref_paranoia < 0)
ref_paranoia = git_env_bool("GIT_REF_PARANOIA", 0);
if (ref_paranoia)
- data.flags |= DO_FOR_EACH_INCLUDE_BROKEN;
+ flags |= DO_FOR_EACH_INCLUDE_BROKEN;
- return do_for_each_entry(refs, base, do_one_ref, &data);
-}
+ iter = xcalloc(1, sizeof(*iter));
+ ref_iterator = &iter->base;
+ base_ref_iterator_init(ref_iterator, &files_ref_iterator_vtable);
-static void unlock_ref(struct ref_lock *lock)
-{
- /* Do not free lock->lk -- atexit() still looks at them */
- if (lock->lk)
- rollback_lock_file(lock->lk);
- free(lock->ref_name);
- free(lock->orig_ref_name);
- free(lock);
+ /*
+ * We must make sure that all loose refs are read before
+ * accessing the packed-refs file; this avoids a race
+ * condition if loose refs are migrated to the packed-refs
+ * file by a simultaneous process, but our in-memory view is
+ * from before the migration. We ensure this as follows:
+ * First, we call prime_ref_dir(), which pre-reads the loose
+ * references for the subtree into the cache. (If they've
+ * already been read, that's OK; we only need to guarantee
+ * that they're read before the packed refs, not *how much*
+ * before.) After that, we call get_packed_ref_cache(), which
+ * internally checks whether the packed-ref cache is up to
+ * date with what is on disk, and re-reads it if not.
+ */
+
+ loose_dir = get_loose_refs(refs);
+
+ if (prefix && *prefix)
+ loose_dir = find_containing_dir(loose_dir, prefix, 0);
+
+ if (loose_dir) {
+ prime_ref_dir(loose_dir);
+ loose_iter = cache_ref_iterator_begin(loose_dir);
+ } else {
+ /* There's nothing to iterate over. */
+ loose_iter = empty_ref_iterator_begin();
+ }
+
+ iter->packed_ref_cache = get_packed_ref_cache(refs);
+ acquire_packed_ref_cache(iter->packed_ref_cache);
+ packed_dir = get_packed_ref_dir(iter->packed_ref_cache);
+
+ if (prefix && *prefix)
+ packed_dir = find_containing_dir(packed_dir, prefix, 0);
+
+ if (packed_dir) {
+ packed_iter = cache_ref_iterator_begin(packed_dir);
+ } else {
+ /* There's nothing to iterate over. */
+ packed_iter = empty_ref_iterator_begin();
+ }
+
+ iter->iter0 = overlay_ref_iterator_begin(loose_iter, packed_iter);
+ iter->flags = flags;
+
+ return ref_iterator;
}
/*
@@ -1721,18 +2038,18 @@ static int verify_lock(struct ref_lock *lock,
lock->old_oid.hash, NULL)) {
if (old_sha1) {
int save_errno = errno;
- strbuf_addf(err, "can't verify ref %s", lock->ref_name);
+ strbuf_addf(err, "can't verify ref '%s'", lock->ref_name);
errno = save_errno;
return -1;
} else {
- hashclr(lock->old_oid.hash);
+ oidclr(&lock->old_oid);
return 0;
}
}
if (old_sha1 && hashcmp(lock->old_oid.hash, old_sha1)) {
- strbuf_addf(err, "ref %s is at %s but expected %s",
+ strbuf_addf(err, "ref '%s' is at %s but expected %s",
lock->ref_name,
- sha1_to_hex(lock->old_oid.hash),
+ oid_to_hex(&lock->old_oid),
sha1_to_hex(old_sha1));
errno = EBUSY;
return -1;
@@ -1758,19 +2075,17 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
const unsigned char *old_sha1,
const struct string_list *extras,
const struct string_list *skip,
- unsigned int flags, int *type_p,
+ unsigned int flags, int *type,
struct strbuf *err)
{
struct strbuf ref_file = STRBUF_INIT;
- struct strbuf orig_ref_file = STRBUF_INIT;
- const char *orig_refname = refname;
struct ref_lock *lock;
int last_errno = 0;
- int type;
- int lflags = 0;
+ int lflags = LOCK_NO_DEREF;
int mustexist = (old_sha1 && !is_null_sha1(old_sha1));
- int resolve_flags = 0;
+ int resolve_flags = RESOLVE_REF_NO_RECURSE;
int attempts_remaining = 3;
+ int resolved;
assert(err);
@@ -1780,48 +2095,39 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
resolve_flags |= RESOLVE_REF_READING;
if (flags & REF_DELETING)
resolve_flags |= RESOLVE_REF_ALLOW_BAD_NAME;
- if (flags & REF_NODEREF) {
- resolve_flags |= RESOLVE_REF_NO_RECURSE;
- lflags |= LOCK_NO_DEREF;
- }
- refname = resolve_ref_unsafe(refname, resolve_flags,
- lock->old_oid.hash, &type);
- if (!refname && errno == EISDIR) {
+ strbuf_git_path(&ref_file, "%s", refname);
+ resolved = !!resolve_ref_unsafe(refname, resolve_flags,
+ lock->old_oid.hash, type);
+ if (!resolved && errno == EISDIR) {
/*
* we are trying to lock foo but we used to
* have foo/bar which now does not exist;
* it is normal for the empty directory 'foo'
* to remain.
*/
- strbuf_git_path(&orig_ref_file, "%s", orig_refname);
- if (remove_empty_directories(&orig_ref_file)) {
+ if (remove_empty_directories(&ref_file)) {
last_errno = errno;
- if (!verify_refname_available_dir(orig_refname, extras, skip,
+ if (!verify_refname_available_dir(refname, extras, skip,
get_loose_refs(&ref_cache), err))
strbuf_addf(err, "there are still refs under '%s'",
- orig_refname);
+ refname);
goto error_return;
}
- refname = resolve_ref_unsafe(orig_refname, resolve_flags,
- lock->old_oid.hash, &type);
+ resolved = !!resolve_ref_unsafe(refname, resolve_flags,
+ lock->old_oid.hash, type);
}
- if (type_p)
- *type_p = type;
- if (!refname) {
+ if (!resolved) {
last_errno = errno;
if (last_errno != ENOTDIR ||
- !verify_refname_available_dir(orig_refname, extras, skip,
+ !verify_refname_available_dir(refname, extras, skip,
get_loose_refs(&ref_cache), err))
- strbuf_addf(err, "unable to resolve reference %s: %s",
- orig_refname, strerror(last_errno));
+ strbuf_addf(err, "unable to resolve reference '%s': %s",
+ refname, strerror(last_errno));
goto error_return;
}
- if (flags & REF_NODEREF)
- refname = orig_refname;
-
/*
* If the ref did not exist and we are creating it, make sure
* there is no existing packed ref whose name begins with our
@@ -1838,8 +2144,6 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
lock->lk = xcalloc(1, sizeof(struct lock_file));
lock->ref_name = xstrdup(refname);
- lock->orig_ref_name = xstrdup(orig_refname);
- strbuf_git_path(&ref_file, "%s", refname);
retry:
switch (safe_create_leading_directories_const(ref_file.buf)) {
@@ -1851,7 +2155,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
/* fall through */
default:
last_errno = errno;
- strbuf_addf(err, "unable to create directory for %s",
+ strbuf_addf(err, "unable to create directory for '%s'",
ref_file.buf);
goto error_return;
}
@@ -1882,7 +2186,6 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
out:
strbuf_release(&ref_file);
- strbuf_release(&orig_ref_file);
errno = last_errno;
return lock;
}
@@ -2036,7 +2339,7 @@ static int pack_if_possible_fn(struct ref_entry *entry, void *cb_data)
return 0;
/* Do not pack symbolic or broken refs: */
- if ((entry->flag & REF_ISSYMREF) || !ref_resolves_to_object(entry))
+ if ((entry->flag & REF_ISSYMREF) || !entry_resolves_to_object(entry))
return 0;
/* Add a packed ref cache entry equivalent to the loose entry. */
@@ -2110,7 +2413,7 @@ static void prune_ref(struct ref_to_prune *r)
transaction = ref_transaction_begin(&err);
if (!transaction ||
ref_transaction_delete(transaction, r->name, r->sha1,
- REF_ISPRUNING, NULL, &err) ||
+ REF_ISPRUNING | REF_NODEREF, NULL, &err) ||
ref_transaction_commit(transaction, &err)) {
ref_transaction_free(transaction);
error("%s", err.buf);
@@ -2222,7 +2525,7 @@ static int delete_ref_loose(struct ref_lock *lock, int flag, struct strbuf *err)
return 0;
}
-int delete_refs(struct string_list *refnames)
+int delete_refs(struct string_list *refnames, unsigned int flags)
{
struct strbuf err = STRBUF_INIT;
int i, result = 0;
@@ -2251,7 +2554,7 @@ int delete_refs(struct string_list *refnames)
for (i = 0; i < refnames->nr; i++) {
const char *refname = refnames->items[i].string;
- if (delete_ref(refname, NULL, 0))
+ if (delete_ref(refname, NULL, flags))
result |= error(_("could not remove reference %s"), refname);
}
@@ -2322,8 +2625,8 @@ out:
}
int verify_refname_available(const char *newname,
- struct string_list *extras,
- struct string_list *skip,
+ const struct string_list *extras,
+ const struct string_list *skip,
struct strbuf *err)
{
struct ref_dir *packed_refs = get_packed_refs(&ref_cache);
@@ -2342,7 +2645,7 @@ static int write_ref_to_lockfile(struct ref_lock *lock,
const unsigned char *sha1, struct strbuf *err);
static int commit_ref_update(struct ref_lock *lock,
const unsigned char *sha1, const char *logmsg,
- int flags, struct strbuf *err);
+ struct strbuf *err);
int rename_ref(const char *oldrefname, const char *newrefname, const char *logmsg)
{
@@ -2351,20 +2654,18 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
struct ref_lock *lock;
struct stat loginfo;
int log = !lstat(git_path("logs/%s", oldrefname), &loginfo);
- const char *symref = NULL;
struct strbuf err = STRBUF_INIT;
if (log && S_ISLNK(loginfo.st_mode))
return error("reflog for %s is a symlink", oldrefname);
- symref = resolve_ref_unsafe(oldrefname, RESOLVE_REF_READING,
- orig_sha1, &flag);
+ if (!resolve_ref_unsafe(oldrefname, RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
+ orig_sha1, &flag))
+ return error("refname %s not found", oldrefname);
+
if (flag & REF_ISSYMREF)
return error("refname %s is a symbolic ref, renaming it is not supported",
oldrefname);
- if (!symref)
- return error("refname %s not found", oldrefname);
-
if (!rename_ref_available(oldrefname, newrefname))
return 1;
@@ -2377,8 +2678,16 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
goto rollback;
}
- if (!read_ref_full(newrefname, RESOLVE_REF_READING, sha1, NULL) &&
- delete_ref(newrefname, sha1, REF_NODEREF)) {
+ /*
+ * Since we are doing a shallow lookup, sha1 is not the
+ * correct value to pass to delete_ref as old_sha1. But that
+ * doesn't matter, because an old_sha1 check wouldn't add to
+ * the safety anyway; we want to delete the reference whatever
+ * its current value.
+ */
+ if (!read_ref_full(newrefname, RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
+ sha1, NULL) &&
+ delete_ref(newrefname, NULL, REF_NODEREF)) {
if (errno==EISDIR) {
struct strbuf path = STRBUF_INIT;
int result;
@@ -2402,7 +2711,8 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
logmoved = log;
- lock = lock_ref_sha1_basic(newrefname, NULL, NULL, NULL, 0, NULL, &err);
+ lock = lock_ref_sha1_basic(newrefname, NULL, NULL, NULL, REF_NODEREF,
+ NULL, &err);
if (!lock) {
error("unable to rename '%s' to '%s': %s", oldrefname, newrefname, err.buf);
strbuf_release(&err);
@@ -2411,7 +2721,7 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
hashcpy(lock->old_oid.hash, orig_sha1);
if (write_ref_to_lockfile(lock, orig_sha1, &err) ||
- commit_ref_update(lock, orig_sha1, logmsg, 0, &err)) {
+ commit_ref_update(lock, orig_sha1, logmsg, &err)) {
error("unable to write current sha1 into %s: %s", newrefname, err.buf);
strbuf_release(&err);
goto rollback;
@@ -2420,7 +2730,8 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
return 0;
rollback:
- lock = lock_ref_sha1_basic(oldrefname, NULL, NULL, NULL, 0, NULL, &err);
+ lock = lock_ref_sha1_basic(oldrefname, NULL, NULL, NULL, REF_NODEREF,
+ NULL, &err);
if (!lock) {
error("unable to lock %s for rollback: %s", oldrefname, err.buf);
strbuf_release(&err);
@@ -2430,7 +2741,7 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
flag = log_all_ref_updates;
log_all_ref_updates = 0;
if (write_ref_to_lockfile(lock, orig_sha1, &err) ||
- commit_ref_update(lock, orig_sha1, NULL, 0, &err)) {
+ commit_ref_update(lock, orig_sha1, NULL, &err)) {
error("unable to write current sha1 into %s: %s", oldrefname, err.buf);
strbuf_release(&err);
}
@@ -2457,6 +2768,30 @@ static int close_ref(struct ref_lock *lock)
static int commit_ref(struct ref_lock *lock)
{
+ char *path = get_locked_file_path(lock->lk);
+ struct stat st;
+
+ if (!lstat(path, &st) && S_ISDIR(st.st_mode)) {
+ /*
+ * There is a directory at the path we want to rename
+ * the lockfile to. Hopefully it is empty; try to
+ * delete it.
+ */
+ size_t len = strlen(path);
+ struct strbuf sb_path = STRBUF_INIT;
+
+ strbuf_attach(&sb_path, path, len, len);
+
+ /*
+ * If this fails, commit_lock_file() will also fail
+ * and will report the problem.
+ */
+ remove_empty_directories(&sb_path);
+ strbuf_release(&sb_path);
+ } else {
+ free(path);
+ }
+
if (commit_lock_file(lock->lk))
return -1;
return 0;
@@ -2475,7 +2810,7 @@ static int log_ref_setup(const char *refname, struct strbuf *logfile, struct str
strbuf_git_path(logfile, "logs/%s", refname);
if (force_create || should_autocreate_reflog(refname)) {
if (safe_create_leading_directories(logfile->buf) < 0) {
- strbuf_addf(err, "unable to create directory for %s: "
+ strbuf_addf(err, "unable to create directory for '%s': "
"%s", logfile->buf, strerror(errno));
return -1;
}
@@ -2489,7 +2824,7 @@ static int log_ref_setup(const char *refname, struct strbuf *logfile, struct str
if (errno == EISDIR) {
if (remove_empty_directories(logfile)) {
- strbuf_addf(err, "There are still logs under "
+ strbuf_addf(err, "there are still logs under "
"'%s'", logfile->buf);
return -1;
}
@@ -2497,7 +2832,7 @@ static int log_ref_setup(const char *refname, struct strbuf *logfile, struct str
}
if (logfd < 0) {
- strbuf_addf(err, "unable to append to %s: %s",
+ strbuf_addf(err, "unable to append to '%s': %s",
logfile->buf, strerror(errno));
return -1;
}
@@ -2566,13 +2901,13 @@ static int log_ref_write_1(const char *refname, const unsigned char *old_sha1,
result = log_ref_write_fd(logfd, old_sha1, new_sha1,
git_committer_info(0), msg);
if (result) {
- strbuf_addf(err, "unable to append to %s: %s", logfile->buf,
+ strbuf_addf(err, "unable to append to '%s': %s", logfile->buf,
strerror(errno));
close(logfd);
return -1;
}
if (close(logfd)) {
- strbuf_addf(err, "unable to append to %s: %s", logfile->buf,
+ strbuf_addf(err, "unable to append to '%s': %s", logfile->buf,
strerror(errno));
return -1;
}
@@ -2613,14 +2948,14 @@ static int write_ref_to_lockfile(struct ref_lock *lock,
o = parse_object(sha1);
if (!o) {
strbuf_addf(err,
- "Trying to write ref %s with nonexistent object %s",
+ "trying to write ref '%s' with nonexistent object %s",
lock->ref_name, sha1_to_hex(sha1));
unlock_ref(lock);
return -1;
}
if (o->type != OBJ_COMMIT && is_branch(lock->ref_name)) {
strbuf_addf(err,
- "Trying to write non-commit object %s to branch %s",
+ "trying to write non-commit object %s to branch '%s'",
sha1_to_hex(sha1), lock->ref_name);
unlock_ref(lock);
return -1;
@@ -2630,7 +2965,7 @@ static int write_ref_to_lockfile(struct ref_lock *lock,
write_in_full(fd, &term, 1) != 1 ||
close_ref(lock) < 0) {
strbuf_addf(err,
- "Couldn't write %s", get_lock_file_path(lock->lk));
+ "couldn't write '%s'", get_lock_file_path(lock->lk));
unlock_ref(lock);
return -1;
}
@@ -2644,20 +2979,19 @@ static int write_ref_to_lockfile(struct ref_lock *lock,
*/
static int commit_ref_update(struct ref_lock *lock,
const unsigned char *sha1, const char *logmsg,
- int flags, struct strbuf *err)
+ struct strbuf *err)
{
clear_loose_ref_cache(&ref_cache);
- if (log_ref_write(lock->ref_name, lock->old_oid.hash, sha1, logmsg, flags, err) < 0 ||
- (strcmp(lock->ref_name, lock->orig_ref_name) &&
- log_ref_write(lock->orig_ref_name, lock->old_oid.hash, sha1, logmsg, flags, err) < 0)) {
+ if (log_ref_write(lock->ref_name, lock->old_oid.hash, sha1, logmsg, 0, err)) {
char *old_msg = strbuf_detach(err, NULL);
- strbuf_addf(err, "Cannot update the ref '%s': %s",
+ strbuf_addf(err, "cannot update the ref '%s': %s",
lock->ref_name, old_msg);
free(old_msg);
unlock_ref(lock);
return -1;
}
- if (strcmp(lock->orig_ref_name, "HEAD") != 0) {
+
+ if (strcmp(lock->ref_name, "HEAD") != 0) {
/*
* Special hack: If a branch is updated directly and HEAD
* points to it (may happen on the remote side of a push
@@ -2673,6 +3007,7 @@ static int commit_ref_update(struct ref_lock *lock,
unsigned char head_sha1[20];
int head_flag;
const char *head_ref;
+
head_ref = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,
head_sha1, &head_flag);
if (head_ref && (head_flag & REF_ISSYMREF) &&
@@ -2685,8 +3020,9 @@ static int commit_ref_update(struct ref_lock *lock,
}
}
}
+
if (commit_ref(lock)) {
- error("Couldn't set %s", lock->ref_name);
+ strbuf_addf(err, "couldn't set '%s'", lock->ref_name);
unlock_ref(lock);
return -1;
}
@@ -2790,7 +3126,6 @@ int set_worktree_head_symref(const char *gitdir, const char *target)
lock = xcalloc(1, sizeof(struct ref_lock));
lock->lk = &head_lock;
lock->ref_name = xstrdup(head_rel);
- lock->orig_ref_name = xstrdup(head_rel);
ret = create_symref_locked(lock, head_rel, target, NULL);
@@ -2969,60 +3304,88 @@ int for_each_reflog_ent(const char *refname, each_reflog_ent_fn fn, void *cb_dat
strbuf_release(&sb);
return ret;
}
-/*
- * Call fn for each reflog in the namespace indicated by name. name
- * must be empty or end with '/'. Name will be used as a scratch
- * space, but its contents will be restored before return.
- */
-static int do_for_each_reflog(struct strbuf *name, each_ref_fn fn, void *cb_data)
-{
- DIR *d = opendir(git_path("logs/%s", name->buf));
- int retval = 0;
- struct dirent *de;
- int oldlen = name->len;
- if (!d)
- return name->len ? errno : 0;
+struct files_reflog_iterator {
+ struct ref_iterator base;
- while ((de = readdir(d)) != NULL) {
- struct stat st;
+ struct dir_iterator *dir_iterator;
+ struct object_id oid;
+};
- if (de->d_name[0] == '.')
+static int files_reflog_iterator_advance(struct ref_iterator *ref_iterator)
+{
+ struct files_reflog_iterator *iter =
+ (struct files_reflog_iterator *)ref_iterator;
+ struct dir_iterator *diter = iter->dir_iterator;
+ int ok;
+
+ while ((ok = dir_iterator_advance(diter)) == ITER_OK) {
+ int flags;
+
+ if (!S_ISREG(diter->st.st_mode))
continue;
- if (ends_with(de->d_name, ".lock"))
+ if (diter->basename[0] == '.')
+ continue;
+ if (ends_with(diter->basename, ".lock"))
continue;
- strbuf_addstr(name, de->d_name);
- if (stat(git_path("logs/%s", name->buf), &st) < 0) {
- ; /* silently ignore */
- } else {
- if (S_ISDIR(st.st_mode)) {
- strbuf_addch(name, '/');
- retval = do_for_each_reflog(name, fn, cb_data);
- } else {
- struct object_id oid;
- if (read_ref_full(name->buf, 0, oid.hash, NULL))
- retval = error("bad ref for %s", name->buf);
- else
- retval = fn(name->buf, &oid, 0, cb_data);
- }
- if (retval)
- break;
+ if (read_ref_full(diter->relative_path, 0,
+ iter->oid.hash, &flags)) {
+ error("bad ref for %s", diter->path.buf);
+ continue;
}
- strbuf_setlen(name, oldlen);
+
+ iter->base.refname = diter->relative_path;
+ iter->base.oid = &iter->oid;
+ iter->base.flags = flags;
+ return ITER_OK;
}
- closedir(d);
- return retval;
+
+ iter->dir_iterator = NULL;
+ if (ref_iterator_abort(ref_iterator) == ITER_ERROR)
+ ok = ITER_ERROR;
+ return ok;
+}
+
+static int files_reflog_iterator_peel(struct ref_iterator *ref_iterator,
+ struct object_id *peeled)
+{
+ die("BUG: ref_iterator_peel() called for reflog_iterator");
+}
+
+static int files_reflog_iterator_abort(struct ref_iterator *ref_iterator)
+{
+ struct files_reflog_iterator *iter =
+ (struct files_reflog_iterator *)ref_iterator;
+ int ok = ITER_DONE;
+
+ if (iter->dir_iterator)
+ ok = dir_iterator_abort(iter->dir_iterator);
+
+ base_ref_iterator_free(ref_iterator);
+ return ok;
+}
+
+static struct ref_iterator_vtable files_reflog_iterator_vtable = {
+ files_reflog_iterator_advance,
+ files_reflog_iterator_peel,
+ files_reflog_iterator_abort
+};
+
+struct ref_iterator *files_reflog_iterator_begin(void)
+{
+ struct files_reflog_iterator *iter = xcalloc(1, sizeof(*iter));
+ struct ref_iterator *ref_iterator = &iter->base;
+
+ base_ref_iterator_init(ref_iterator, &files_reflog_iterator_vtable);
+ iter->dir_iterator = dir_iterator_begin(git_path("logs"));
+ return ref_iterator;
}
int for_each_reflog(each_ref_fn fn, void *cb_data)
{
- int retval;
- struct strbuf name;
- strbuf_init(&name, PATH_MAX);
- retval = do_for_each_reflog(&name, fn, cb_data);
- strbuf_release(&name);
- return retval;
+ return do_for_each_ref_iterator(files_reflog_iterator_begin(),
+ fn, cb_data);
}
static int ref_update_reject_duplicates(struct string_list *refnames,
@@ -3035,36 +3398,352 @@ static int ref_update_reject_duplicates(struct string_list *refnames,
for (i = 1; i < n; i++)
if (!strcmp(refnames->items[i - 1].string, refnames->items[i].string)) {
strbuf_addf(err,
- "Multiple updates for ref '%s' not allowed.",
+ "multiple updates for ref '%s' not allowed.",
refnames->items[i].string);
return 1;
}
return 0;
}
+/*
+ * If update is a direct update of head_ref (the reference pointed to
+ * by HEAD), then add an extra REF_LOG_ONLY update for HEAD.
+ */
+static int split_head_update(struct ref_update *update,
+ struct ref_transaction *transaction,
+ const char *head_ref,
+ struct string_list *affected_refnames,
+ struct strbuf *err)
+{
+ struct string_list_item *item;
+ struct ref_update *new_update;
+
+ if ((update->flags & REF_LOG_ONLY) ||
+ (update->flags & REF_ISPRUNING) ||
+ (update->flags & REF_UPDATE_VIA_HEAD))
+ return 0;
+
+ if (strcmp(update->refname, head_ref))
+ return 0;
+
+ /*
+ * First make sure that HEAD is not already in the
+ * transaction. This insertion is O(N) in the transaction
+ * size, but it happens at most once per transaction.
+ */
+ item = string_list_insert(affected_refnames, "HEAD");
+ if (item->util) {
+ /* An entry already existed */
+ strbuf_addf(err,
+ "multiple updates for 'HEAD' (including one "
+ "via its referent '%s') are not allowed",
+ update->refname);
+ return TRANSACTION_NAME_CONFLICT;
+ }
+
+ new_update = ref_transaction_add_update(
+ transaction, "HEAD",
+ update->flags | REF_LOG_ONLY | REF_NODEREF,
+ update->new_sha1, update->old_sha1,
+ update->msg);
+
+ item->util = new_update;
+
+ return 0;
+}
+
+/*
+ * update is for a symref that points at referent and doesn't have
+ * REF_NODEREF set. Split it into two updates:
+ * - The original update, but with REF_LOG_ONLY and REF_NODEREF set
+ * - A new, separate update for the referent reference
+ * Note that the new update will itself be subject to splitting when
+ * the iteration gets to it.
+ */
+static int split_symref_update(struct ref_update *update,
+ const char *referent,
+ struct ref_transaction *transaction,
+ struct string_list *affected_refnames,
+ struct strbuf *err)
+{
+ struct string_list_item *item;
+ struct ref_update *new_update;
+ unsigned int new_flags;
+
+ /*
+ * First make sure that referent is not already in the
+ * transaction. This insertion is O(N) in the transaction
+ * size, but it happens at most once per symref in a
+ * transaction.
+ */
+ item = string_list_insert(affected_refnames, referent);
+ if (item->util) {
+ /* An entry already existed */
+ strbuf_addf(err,
+ "multiple updates for '%s' (including one "
+ "via symref '%s') are not allowed",
+ referent, update->refname);
+ return TRANSACTION_NAME_CONFLICT;
+ }
+
+ new_flags = update->flags;
+ if (!strcmp(update->refname, "HEAD")) {
+ /*
+ * Record that the new update came via HEAD, so that
+ * when we process it, split_head_update() doesn't try
+ * to add another reflog update for HEAD. Note that
+ * this bit will be propagated if the new_update
+ * itself needs to be split.
+ */
+ new_flags |= REF_UPDATE_VIA_HEAD;
+ }
+
+ new_update = ref_transaction_add_update(
+ transaction, referent, new_flags,
+ update->new_sha1, update->old_sha1,
+ update->msg);
+
+ new_update->parent_update = update;
+
+ /*
+ * Change the symbolic ref update to log only. Also, it
+ * doesn't need to check its old SHA-1 value, as that will be
+ * done when new_update is processed.
+ */
+ update->flags |= REF_LOG_ONLY | REF_NODEREF;
+ update->flags &= ~REF_HAVE_OLD;
+
+ item->util = new_update;
+
+ return 0;
+}
+
+/*
+ * Return the refname under which update was originally requested.
+ */
+static const char *original_update_refname(struct ref_update *update)
+{
+ while (update->parent_update)
+ update = update->parent_update;
+
+ return update->refname;
+}
+
+/*
+ * Check whether the REF_HAVE_OLD and old_oid values stored in update
+ * are consistent with oid, which is the reference's current value. If
+ * everything is OK, return 0; otherwise, write an error message to
+ * err and return -1.
+ */
+static int check_old_oid(struct ref_update *update, struct object_id *oid,
+ struct strbuf *err)
+{
+ if (!(update->flags & REF_HAVE_OLD) ||
+ !hashcmp(oid->hash, update->old_sha1))
+ return 0;
+
+ if (is_null_sha1(update->old_sha1))
+ strbuf_addf(err, "cannot lock ref '%s': "
+ "reference already exists",
+ original_update_refname(update));
+ else if (is_null_oid(oid))
+ strbuf_addf(err, "cannot lock ref '%s': "
+ "reference is missing but expected %s",
+ original_update_refname(update),
+ sha1_to_hex(update->old_sha1));
+ else
+ strbuf_addf(err, "cannot lock ref '%s': "
+ "is at %s but expected %s",
+ original_update_refname(update),
+ oid_to_hex(oid),
+ sha1_to_hex(update->old_sha1));
+
+ return -1;
+}
+
+/*
+ * Prepare for carrying out update:
+ * - Lock the reference referred to by update.
+ * - Read the reference under lock.
+ * - Check that its old SHA-1 value (if specified) is correct, and in
+ * any case record it in update->lock->old_oid for later use when
+ * writing the reflog.
+ * - If it is a symref update without REF_NODEREF, split it up into a
+ * REF_LOG_ONLY update of the symref and add a separate update for
+ * the referent to transaction.
+ * - If it is an update of head_ref, add a corresponding REF_LOG_ONLY
+ * update of HEAD.
+ */
+static int lock_ref_for_update(struct ref_update *update,
+ struct ref_transaction *transaction,
+ const char *head_ref,
+ struct string_list *affected_refnames,
+ struct strbuf *err)
+{
+ struct strbuf referent = STRBUF_INIT;
+ int mustexist = (update->flags & REF_HAVE_OLD) &&
+ !is_null_sha1(update->old_sha1);
+ int ret;
+ struct ref_lock *lock;
+
+ if ((update->flags & REF_HAVE_NEW) && is_null_sha1(update->new_sha1))
+ update->flags |= REF_DELETING;
+
+ if (head_ref) {
+ ret = split_head_update(update, transaction, head_ref,
+ affected_refnames, err);
+ if (ret)
+ return ret;
+ }
+
+ ret = lock_raw_ref(update->refname, mustexist,
+ affected_refnames, NULL,
+ &update->lock, &referent,
+ &update->type, err);
+
+ if (ret) {
+ char *reason;
+
+ reason = strbuf_detach(err, NULL);
+ strbuf_addf(err, "cannot lock ref '%s': %s",
+ original_update_refname(update), reason);
+ free(reason);
+ return ret;
+ }
+
+ lock = update->lock;
+
+ if (update->type & REF_ISSYMREF) {
+ if (update->flags & REF_NODEREF) {
+ /*
+ * We won't be reading the referent as part of
+ * the transaction, so we have to read it here
+ * to record and possibly check old_sha1:
+ */
+ if (read_ref_full(referent.buf, 0,
+ lock->old_oid.hash, NULL)) {
+ if (update->flags & REF_HAVE_OLD) {
+ strbuf_addf(err, "cannot lock ref '%s': "
+ "error reading reference",
+ original_update_refname(update));
+ return -1;
+ }
+ } else if (check_old_oid(update, &lock->old_oid, err)) {
+ return TRANSACTION_GENERIC_ERROR;
+ }
+ } else {
+ /*
+ * Create a new update for the reference this
+ * symref is pointing at. Also, we will record
+ * and verify old_sha1 for this update as part
+ * of processing the split-off update, so we
+ * don't have to do it here.
+ */
+ ret = split_symref_update(update, referent.buf, transaction,
+ affected_refnames, err);
+ if (ret)
+ return ret;
+ }
+ } else {
+ struct ref_update *parent_update;
+
+ if (check_old_oid(update, &lock->old_oid, err))
+ return TRANSACTION_GENERIC_ERROR;
+
+ /*
+ * If this update is happening indirectly because of a
+ * symref update, record the old SHA-1 in the parent
+ * update:
+ */
+ for (parent_update = update->parent_update;
+ parent_update;
+ parent_update = parent_update->parent_update) {
+ oidcpy(&parent_update->lock->old_oid, &lock->old_oid);
+ }
+ }
+
+ if ((update->flags & REF_HAVE_NEW) &&
+ !(update->flags & REF_DELETING) &&
+ !(update->flags & REF_LOG_ONLY)) {
+ if (!(update->type & REF_ISSYMREF) &&
+ !hashcmp(lock->old_oid.hash, update->new_sha1)) {
+ /*
+ * The reference already has the desired
+ * value, so we don't need to write it.
+ */
+ } else if (write_ref_to_lockfile(lock, update->new_sha1,
+ err)) {
+ char *write_err = strbuf_detach(err, NULL);
+
+ /*
+ * The lock was freed upon failure of
+ * write_ref_to_lockfile():
+ */
+ update->lock = NULL;
+ strbuf_addf(err,
+ "cannot update ref '%s': %s",
+ update->refname, write_err);
+ free(write_err);
+ return TRANSACTION_GENERIC_ERROR;
+ } else {
+ update->flags |= REF_NEEDS_COMMIT;
+ }
+ }
+ if (!(update->flags & REF_NEEDS_COMMIT)) {
+ /*
+ * We didn't call write_ref_to_lockfile(), so
+ * the lockfile is still open. Close it to
+ * free up the file descriptor:
+ */
+ if (close_ref(lock)) {
+ strbuf_addf(err, "couldn't close '%s.lock'",
+ update->refname);
+ return TRANSACTION_GENERIC_ERROR;
+ }
+ }
+ return 0;
+}
+
int ref_transaction_commit(struct ref_transaction *transaction,
struct strbuf *err)
{
int ret = 0, i;
- int n = transaction->nr;
- struct ref_update **updates = transaction->updates;
struct string_list refs_to_delete = STRING_LIST_INIT_NODUP;
struct string_list_item *ref_to_delete;
struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
+ char *head_ref = NULL;
+ int head_type;
+ struct object_id head_oid;
assert(err);
if (transaction->state != REF_TRANSACTION_OPEN)
die("BUG: commit called for transaction that is not open");
- if (!n) {
+ if (!transaction->nr) {
transaction->state = REF_TRANSACTION_CLOSED;
return 0;
}
- /* Fail if a refname appears more than once in the transaction: */
- for (i = 0; i < n; i++)
- string_list_append(&affected_refnames, updates[i]->refname);
+ /*
+ * Fail if a refname appears more than once in the
+ * transaction. (If we end up splitting up any updates using
+ * split_symref_update() or split_head_update(), those
+ * functions will check that the new updates don't have the
+ * same refname as any existing ones.)
+ */
+ for (i = 0; i < transaction->nr; i++) {
+ struct ref_update *update = transaction->updates[i];
+ struct string_list_item *item =
+ string_list_append(&affected_refnames, update->refname);
+
+ /*
+ * We store a pointer to update in item->util, but at
+ * the moment we never use the value of this field
+ * except to check whether it is non-NULL.
+ */
+ item->util = update;
+ }
string_list_sort(&affected_refnames);
if (ref_update_reject_duplicates(&affected_refnames, err)) {
ret = TRANSACTION_GENERIC_ERROR;
@@ -3072,105 +3751,84 @@ int ref_transaction_commit(struct ref_transaction *transaction,
}
/*
+ * Special hack: If a branch is updated directly and HEAD
+ * points to it (may happen on the remote side of a push
+ * for example) then logically the HEAD reflog should be
+ * updated too.
+ *
+ * A generic solution would require reverse symref lookups,
+ * but finding all symrefs pointing to a given branch would be
+ * rather costly for this rare event (the direct update of a
+ * branch) to be worth it. So let's cheat and check with HEAD
+ * only, which should cover 99% of all usage scenarios (even
+ * 100% of the default ones).
+ *
+ * So if HEAD is a symbolic reference, then record the name of
+ * the reference that it points to. If we see an update of
+ * head_ref within the transaction, then split_head_update()
+ * arranges for the reflog of HEAD to be updated, too.
+ */
+ head_ref = resolve_refdup("HEAD", RESOLVE_REF_NO_RECURSE,
+ head_oid.hash, &head_type);
+
+ if (head_ref && !(head_type & REF_ISSYMREF)) {
+ free(head_ref);
+ head_ref = NULL;
+ }
+
+ /*
* Acquire all locks, verify old values if provided, check
* that new values are valid, and write new values to the
* lockfiles, ready to be activated. Only keep one lockfile
* open at a time to avoid running out of file descriptors.
*/
- for (i = 0; i < n; i++) {
- struct ref_update *update = updates[i];
+ for (i = 0; i < transaction->nr; i++) {
+ struct ref_update *update = transaction->updates[i];
- if ((update->flags & REF_HAVE_NEW) &&
- is_null_sha1(update->new_sha1))
- update->flags |= REF_DELETING;
- update->lock = lock_ref_sha1_basic(
- update->refname,
- ((update->flags & REF_HAVE_OLD) ?
- update->old_sha1 : NULL),
- &affected_refnames, NULL,
- update->flags,
- &update->type,
- err);
- if (!update->lock) {
- char *reason;
-
- ret = (errno == ENOTDIR)
- ? TRANSACTION_NAME_CONFLICT
- : TRANSACTION_GENERIC_ERROR;
- reason = strbuf_detach(err, NULL);
- strbuf_addf(err, "cannot lock ref '%s': %s",
- update->refname, reason);
- free(reason);
+ ret = lock_ref_for_update(update, transaction, head_ref,
+ &affected_refnames, err);
+ if (ret)
goto cleanup;
- }
- if ((update->flags & REF_HAVE_NEW) &&
- !(update->flags & REF_DELETING)) {
- int overwriting_symref = ((update->type & REF_ISSYMREF) &&
- (update->flags & REF_NODEREF));
-
- if (!overwriting_symref &&
- !hashcmp(update->lock->old_oid.hash, update->new_sha1)) {
- /*
- * The reference already has the desired
- * value, so we don't need to write it.
- */
- } else if (write_ref_to_lockfile(update->lock,
- update->new_sha1,
- err)) {
- char *write_err = strbuf_detach(err, NULL);
+ }
- /*
- * The lock was freed upon failure of
- * write_ref_to_lockfile():
- */
+ /* Perform updates first so live commits remain referenced */
+ for (i = 0; i < transaction->nr; i++) {
+ struct ref_update *update = transaction->updates[i];
+ struct ref_lock *lock = update->lock;
+
+ if (update->flags & REF_NEEDS_COMMIT ||
+ update->flags & REF_LOG_ONLY) {
+ if (log_ref_write(lock->ref_name, lock->old_oid.hash,
+ update->new_sha1,
+ update->msg, update->flags, err)) {
+ char *old_msg = strbuf_detach(err, NULL);
+
+ strbuf_addf(err, "cannot update the ref '%s': %s",
+ lock->ref_name, old_msg);
+ free(old_msg);
+ unlock_ref(lock);
update->lock = NULL;
- strbuf_addf(err,
- "cannot update the ref '%s': %s",
- update->refname, write_err);
- free(write_err);
ret = TRANSACTION_GENERIC_ERROR;
goto cleanup;
- } else {
- update->flags |= REF_NEEDS_COMMIT;
- }
- }
- if (!(update->flags & REF_NEEDS_COMMIT)) {
- /*
- * We didn't have to write anything to the lockfile.
- * Close it to free up the file descriptor:
- */
- if (close_ref(update->lock)) {
- strbuf_addf(err, "Couldn't close %s.lock",
- update->refname);
- goto cleanup;
}
}
- }
-
- /* Perform updates first so live commits remain referenced */
- for (i = 0; i < n; i++) {
- struct ref_update *update = updates[i];
-
if (update->flags & REF_NEEDS_COMMIT) {
- if (commit_ref_update(update->lock,
- update->new_sha1, update->msg,
- update->flags, err)) {
- /* freed by commit_ref_update(): */
+ clear_loose_ref_cache(&ref_cache);
+ if (commit_ref(lock)) {
+ strbuf_addf(err, "couldn't set '%s'", lock->ref_name);
+ unlock_ref(lock);
update->lock = NULL;
ret = TRANSACTION_GENERIC_ERROR;
goto cleanup;
- } else {
- /* freed by commit_ref_update(): */
- update->lock = NULL;
}
}
}
-
/* Perform deletes now that updates are safely completed */
- for (i = 0; i < n; i++) {
- struct ref_update *update = updates[i];
+ for (i = 0; i < transaction->nr; i++) {
+ struct ref_update *update = transaction->updates[i];
- if (update->flags & REF_DELETING) {
+ if (update->flags & REF_DELETING &&
+ !(update->flags & REF_LOG_ONLY)) {
if (delete_ref_loose(update->lock, update->type, err)) {
ret = TRANSACTION_GENERIC_ERROR;
goto cleanup;
@@ -3193,11 +3851,13 @@ int ref_transaction_commit(struct ref_transaction *transaction,
cleanup:
transaction->state = REF_TRANSACTION_CLOSED;
- for (i = 0; i < n; i++)
- if (updates[i]->lock)
- unlock_ref(updates[i]->lock);
+ for (i = 0; i < transaction->nr; i++)
+ if (transaction->updates[i]->lock)
+ unlock_ref(transaction->updates[i]->lock);
string_list_clear(&refs_to_delete, 0);
+ free(head_ref);
string_list_clear(&affected_refnames, 0);
+
return ret;
}
@@ -3213,8 +3873,6 @@ int initial_ref_transaction_commit(struct ref_transaction *transaction,
struct strbuf *err)
{
int ret = 0, i;
- int n = transaction->nr;
- struct ref_update **updates = transaction->updates;
struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
assert(err);
@@ -3223,8 +3881,9 @@ int initial_ref_transaction_commit(struct ref_transaction *transaction,
die("BUG: commit called for transaction that is not open");
/* Fail if a refname appears more than once in the transaction: */
- for (i = 0; i < n; i++)
- string_list_append(&affected_refnames, updates[i]->refname);
+ for (i = 0; i < transaction->nr; i++)
+ string_list_append(&affected_refnames,
+ transaction->updates[i]->refname);
string_list_sort(&affected_refnames);
if (ref_update_reject_duplicates(&affected_refnames, err)) {
ret = TRANSACTION_GENERIC_ERROR;
@@ -3246,8 +3905,8 @@ int initial_ref_transaction_commit(struct ref_transaction *transaction,
if (for_each_rawref(ref_present, &affected_refnames))
die("BUG: initial ref transaction called with existing refs");
- for (i = 0; i < n; i++) {
- struct ref_update *update = updates[i];
+ for (i = 0; i < transaction->nr; i++) {
+ struct ref_update *update = transaction->updates[i];
if ((update->flags & REF_HAVE_OLD) &&
!is_null_sha1(update->old_sha1))
@@ -3267,8 +3926,8 @@ int initial_ref_transaction_commit(struct ref_transaction *transaction,
goto cleanup;
}
- for (i = 0; i < n; i++) {
- struct ref_update *update = updates[i];
+ for (i = 0; i < transaction->nr; i++) {
+ struct ref_update *update = transaction->updates[i];
if ((update->flags & REF_HAVE_NEW) &&
!is_null_sha1(update->new_sha1))
diff --git a/refs/iterator.c b/refs/iterator.c
new file mode 100644
index 0000000..bce1f19
--- /dev/null
+++ b/refs/iterator.c
@@ -0,0 +1,384 @@
+/*
+ * Generic reference iterator infrastructure. See refs-internal.h for
+ * documentation about the design and use of reference iterators.
+ */
+
+#include "cache.h"
+#include "refs.h"
+#include "refs/refs-internal.h"
+#include "iterator.h"
+
+int ref_iterator_advance(struct ref_iterator *ref_iterator)
+{
+ return ref_iterator->vtable->advance(ref_iterator);
+}
+
+int ref_iterator_peel(struct ref_iterator *ref_iterator,
+ struct object_id *peeled)
+{
+ return ref_iterator->vtable->peel(ref_iterator, peeled);
+}
+
+int ref_iterator_abort(struct ref_iterator *ref_iterator)
+{
+ return ref_iterator->vtable->abort(ref_iterator);
+}
+
+void base_ref_iterator_init(struct ref_iterator *iter,
+ struct ref_iterator_vtable *vtable)
+{
+ iter->vtable = vtable;
+ iter->refname = NULL;
+ iter->oid = NULL;
+ iter->flags = 0;
+}
+
+void base_ref_iterator_free(struct ref_iterator *iter)
+{
+ /* Help make use-after-free bugs fail quickly: */
+ iter->vtable = NULL;
+ free(iter);
+}
+
+struct empty_ref_iterator {
+ struct ref_iterator base;
+};
+
+static int empty_ref_iterator_advance(struct ref_iterator *ref_iterator)
+{
+ return ref_iterator_abort(ref_iterator);
+}
+
+static int empty_ref_iterator_peel(struct ref_iterator *ref_iterator,
+ struct object_id *peeled)
+{
+ die("BUG: peel called for empty iterator");
+}
+
+static int empty_ref_iterator_abort(struct ref_iterator *ref_iterator)
+{
+ base_ref_iterator_free(ref_iterator);
+ return ITER_DONE;
+}
+
+static struct ref_iterator_vtable empty_ref_iterator_vtable = {
+ empty_ref_iterator_advance,
+ empty_ref_iterator_peel,
+ empty_ref_iterator_abort
+};
+
+struct ref_iterator *empty_ref_iterator_begin(void)
+{
+ struct empty_ref_iterator *iter = xcalloc(1, sizeof(*iter));
+ struct ref_iterator *ref_iterator = &iter->base;
+
+ base_ref_iterator_init(ref_iterator, &empty_ref_iterator_vtable);
+ return ref_iterator;
+}
+
+int is_empty_ref_iterator(struct ref_iterator *ref_iterator)
+{
+ return ref_iterator->vtable == &empty_ref_iterator_vtable;
+}
+
+struct merge_ref_iterator {
+ struct ref_iterator base;
+
+ struct ref_iterator *iter0, *iter1;
+
+ ref_iterator_select_fn *select;
+ void *cb_data;
+
+ /*
+ * A pointer to iter0 or iter1 (whichever is supplying the
+ * current value), or NULL if advance has not yet been called.
+ */
+ struct ref_iterator **current;
+};
+
+static int merge_ref_iterator_advance(struct ref_iterator *ref_iterator)
+{
+ struct merge_ref_iterator *iter =
+ (struct merge_ref_iterator *)ref_iterator;
+ int ok;
+
+ if (!iter->current) {
+ /* Initialize: advance both iterators to their first entries */
+ if ((ok = ref_iterator_advance(iter->iter0)) != ITER_OK) {
+ iter->iter0 = NULL;
+ if (ok == ITER_ERROR)
+ goto error;
+ }
+ if ((ok = ref_iterator_advance(iter->iter1)) != ITER_OK) {
+ iter->iter1 = NULL;
+ if (ok == ITER_ERROR)
+ goto error;
+ }
+ } else {
+ /*
+ * Advance the current iterator past the just-used
+ * entry:
+ */
+ if ((ok = ref_iterator_advance(*iter->current)) != ITER_OK) {
+ *iter->current = NULL;
+ if (ok == ITER_ERROR)
+ goto error;
+ }
+ }
+
+ /* Loop until we find an entry that we can yield. */
+ while (1) {
+ struct ref_iterator **secondary;
+ enum iterator_selection selection =
+ iter->select(iter->iter0, iter->iter1, iter->cb_data);
+
+ if (selection == ITER_SELECT_DONE) {
+ return ref_iterator_abort(ref_iterator);
+ } else if (selection == ITER_SELECT_ERROR) {
+ ref_iterator_abort(ref_iterator);
+ return ITER_ERROR;
+ }
+
+ if ((selection & ITER_CURRENT_SELECTION_MASK) == 0) {
+ iter->current = &iter->iter0;
+ secondary = &iter->iter1;
+ } else {
+ iter->current = &iter->iter1;
+ secondary = &iter->iter0;
+ }
+
+ if (selection & ITER_SKIP_SECONDARY) {
+ if ((ok = ref_iterator_advance(*secondary)) != ITER_OK) {
+ *secondary = NULL;
+ if (ok == ITER_ERROR)
+ goto error;
+ }
+ }
+
+ if (selection & ITER_YIELD_CURRENT) {
+ iter->base.refname = (*iter->current)->refname;
+ iter->base.oid = (*iter->current)->oid;
+ iter->base.flags = (*iter->current)->flags;
+ return ITER_OK;
+ }
+ }
+
+error:
+ ref_iterator_abort(ref_iterator);
+ return ITER_ERROR;
+}
+
+static int merge_ref_iterator_peel(struct ref_iterator *ref_iterator,
+ struct object_id *peeled)
+{
+ struct merge_ref_iterator *iter =
+ (struct merge_ref_iterator *)ref_iterator;
+
+ if (!iter->current) {
+ die("BUG: peel called before advance for merge iterator");
+ }
+ return ref_iterator_peel(*iter->current, peeled);
+}
+
+static int merge_ref_iterator_abort(struct ref_iterator *ref_iterator)
+{
+ struct merge_ref_iterator *iter =
+ (struct merge_ref_iterator *)ref_iterator;
+ int ok = ITER_DONE;
+
+ if (iter->iter0) {
+ if (ref_iterator_abort(iter->iter0) != ITER_DONE)
+ ok = ITER_ERROR;
+ }
+ if (iter->iter1) {
+ if (ref_iterator_abort(iter->iter1) != ITER_DONE)
+ ok = ITER_ERROR;
+ }
+ base_ref_iterator_free(ref_iterator);
+ return ok;
+}
+
+static struct ref_iterator_vtable merge_ref_iterator_vtable = {
+ merge_ref_iterator_advance,
+ merge_ref_iterator_peel,
+ merge_ref_iterator_abort
+};
+
+struct ref_iterator *merge_ref_iterator_begin(
+ struct ref_iterator *iter0, struct ref_iterator *iter1,
+ ref_iterator_select_fn *select, void *cb_data)
+{
+ struct merge_ref_iterator *iter = xcalloc(1, sizeof(*iter));
+ struct ref_iterator *ref_iterator = &iter->base;
+
+ /*
+ * We can't do the same kind of is_empty_ref_iterator()-style
+ * optimization here as overlay_ref_iterator_begin() does,
+ * because we don't know the semantics of the select function.
+ * It might, for example, implement "intersect" by passing
+ * references through only if they exist in both iterators.
+ */
+
+ base_ref_iterator_init(ref_iterator, &merge_ref_iterator_vtable);
+ iter->iter0 = iter0;
+ iter->iter1 = iter1;
+ iter->select = select;
+ iter->cb_data = cb_data;
+ iter->current = NULL;
+ return ref_iterator;
+}
+
+/*
+ * A ref_iterator_select_fn that overlays the items from front on top
+ * of those from back (like loose refs over packed refs). See
+ * overlay_ref_iterator_begin().
+ */
+static enum iterator_selection overlay_iterator_select(
+ struct ref_iterator *front, struct ref_iterator *back,
+ void *cb_data)
+{
+ int cmp;
+
+ if (!back)
+ return front ? ITER_SELECT_0 : ITER_SELECT_DONE;
+ else if (!front)
+ return ITER_SELECT_1;
+
+ cmp = strcmp(front->refname, back->refname);
+
+ if (cmp < 0)
+ return ITER_SELECT_0;
+ else if (cmp > 0)
+ return ITER_SELECT_1;
+ else
+ return ITER_SELECT_0_SKIP_1;
+}
+
+struct ref_iterator *overlay_ref_iterator_begin(
+ struct ref_iterator *front, struct ref_iterator *back)
+{
+ /*
+ * Optimization: if one of the iterators is empty, return the
+ * other one rather than incurring the overhead of wrapping
+ * them.
+ */
+ if (is_empty_ref_iterator(front)) {
+ ref_iterator_abort(front);
+ return back;
+ } else if (is_empty_ref_iterator(back)) {
+ ref_iterator_abort(back);
+ return front;
+ }
+
+ return merge_ref_iterator_begin(front, back,
+ overlay_iterator_select, NULL);
+}
+
+struct prefix_ref_iterator {
+ struct ref_iterator base;
+
+ struct ref_iterator *iter0;
+ char *prefix;
+ int trim;
+};
+
+static int prefix_ref_iterator_advance(struct ref_iterator *ref_iterator)
+{
+ struct prefix_ref_iterator *iter =
+ (struct prefix_ref_iterator *)ref_iterator;
+ int ok;
+
+ while ((ok = ref_iterator_advance(iter->iter0)) == ITER_OK) {
+ if (!starts_with(iter->iter0->refname, iter->prefix))
+ continue;
+
+ iter->base.refname = iter->iter0->refname + iter->trim;
+ iter->base.oid = iter->iter0->oid;
+ iter->base.flags = iter->iter0->flags;
+ return ITER_OK;
+ }
+
+ iter->iter0 = NULL;
+ if (ref_iterator_abort(ref_iterator) != ITER_DONE)
+ return ITER_ERROR;
+ return ok;
+}
+
+static int prefix_ref_iterator_peel(struct ref_iterator *ref_iterator,
+ struct object_id *peeled)
+{
+ struct prefix_ref_iterator *iter =
+ (struct prefix_ref_iterator *)ref_iterator;
+
+ return ref_iterator_peel(iter->iter0, peeled);
+}
+
+static int prefix_ref_iterator_abort(struct ref_iterator *ref_iterator)
+{
+ struct prefix_ref_iterator *iter =
+ (struct prefix_ref_iterator *)ref_iterator;
+ int ok = ITER_DONE;
+
+ if (iter->iter0)
+ ok = ref_iterator_abort(iter->iter0);
+ free(iter->prefix);
+ base_ref_iterator_free(ref_iterator);
+ return ok;
+}
+
+static struct ref_iterator_vtable prefix_ref_iterator_vtable = {
+ prefix_ref_iterator_advance,
+ prefix_ref_iterator_peel,
+ prefix_ref_iterator_abort
+};
+
+struct ref_iterator *prefix_ref_iterator_begin(struct ref_iterator *iter0,
+ const char *prefix,
+ int trim)
+{
+ struct prefix_ref_iterator *iter;
+ struct ref_iterator *ref_iterator;
+
+ if (!*prefix && !trim)
+ return iter0; /* optimization: no need to wrap iterator */
+
+ iter = xcalloc(1, sizeof(*iter));
+ ref_iterator = &iter->base;
+
+ base_ref_iterator_init(ref_iterator, &prefix_ref_iterator_vtable);
+
+ iter->iter0 = iter0;
+ iter->prefix = xstrdup(prefix);
+ iter->trim = trim;
+
+ return ref_iterator;
+}
+
+struct ref_iterator *current_ref_iter = NULL;
+
+int do_for_each_ref_iterator(struct ref_iterator *iter,
+ each_ref_fn fn, void *cb_data)
+{
+ int retval = 0, ok;
+ struct ref_iterator *old_ref_iter = current_ref_iter;
+
+ current_ref_iter = iter;
+ while ((ok = ref_iterator_advance(iter)) == ITER_OK) {
+ retval = fn(iter->refname, iter->oid, iter->flags, cb_data);
+ if (retval) {
+ /*
+ * If ref_iterator_abort() returns ITER_ERROR,
+ * we ignore that error in deference to the
+ * callback function's return value.
+ */
+ ref_iterator_abort(iter);
+ goto out;
+ }
+ }
+
+out:
+ current_ref_iter = old_ref_iter;
+ if (ok == ITER_ERROR)
+ return -1;
+ return retval;
+}
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 3a4f634..efe5847 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -15,7 +15,7 @@
/*
* Used as a flag in ref_update::flags when a loose ref is being
- * pruned.
+ * pruned. This flag must only be used when REF_NODEREF is set.
*/
#define REF_ISPRUNING 0x04
@@ -43,6 +43,19 @@
*/
/*
+ * Used as a flag in ref_update::flags when we want to log a ref
+ * update but not actually perform it. This is used when a symbolic
+ * ref update is split up.
+ */
+#define REF_LOG_ONLY 0x80
+
+/*
+ * Internal flag, meaning that the containing ref_update was via an
+ * update to HEAD.
+ */
+#define REF_UPDATE_VIA_HEAD 0x100
+
+/*
* Return true iff refname is minimally safe. "Safe" here means that
* deleting a loose reference by this name will not do any damage, for
* example by causing a file that is not a reference to be deleted.
@@ -109,8 +122,8 @@ enum peel_status peel_object(const unsigned char *name, unsigned char *sha1);
* extras and skip must be sorted.
*/
int verify_refname_available(const char *newname,
- struct string_list *extras,
- struct string_list *skip,
+ const struct string_list *extras,
+ const struct string_list *skip,
struct strbuf *err);
/*
@@ -130,27 +143,59 @@ int should_autocreate_reflog(const char *refname);
* not exist before update.
*/
struct ref_update {
+
/*
* If (flags & REF_HAVE_NEW), set the reference to this value:
*/
unsigned char new_sha1[20];
+
/*
* If (flags & REF_HAVE_OLD), check that the reference
* previously had this value:
*/
unsigned char old_sha1[20];
+
/*
* One or more of REF_HAVE_NEW, REF_HAVE_OLD, REF_NODEREF,
- * REF_DELETING, and REF_ISPRUNING:
+ * REF_DELETING, REF_ISPRUNING, REF_LOG_ONLY, and
+ * REF_UPDATE_VIA_HEAD:
*/
unsigned int flags;
+
struct ref_lock *lock;
- int type;
+ unsigned int type;
char *msg;
+
+ /*
+ * If this ref_update was split off of a symref update via
+ * split_symref_update(), then this member points at that
+ * update. This is used for two purposes:
+ * 1. When reporting errors, we report the refname under which
+ * the update was originally requested.
+ * 2. When we read the old value of this reference, we
+ * propagate it back to its parent update for recording in
+ * the latter's reflog.
+ */
+ struct ref_update *parent_update;
+
const char refname[FLEX_ARRAY];
};
/*
+ * Add a ref_update with the specified properties to transaction, and
+ * return a pointer to the new object. This function does not verify
+ * that refname is well-formed. new_sha1 and old_sha1 are only
+ * dereferenced if the REF_HAVE_NEW and REF_HAVE_OLD bits,
+ * respectively, are set in flags.
+ */
+struct ref_update *ref_transaction_add_update(
+ struct ref_transaction *transaction,
+ const char *refname, unsigned int flags,
+ const unsigned char *new_sha1,
+ const unsigned char *old_sha1,
+ const char *msg);
+
+/*
* Transaction states.
* OPEN: The transaction is in a valid state and can accept new updates.
* An OPEN transaction can be committed.
@@ -204,12 +249,270 @@ int rename_ref_available(const char *oldname, const char *newname);
#define DO_FOR_EACH_INCLUDE_BROKEN 0x01
/*
- * The common backend for the for_each_*ref* functions
+ * Reference iterators
+ *
+ * A reference iterator encapsulates the state of an in-progress
+ * iteration over references. Create an instance of `struct
+ * ref_iterator` via one of the functions in this module.
+ *
+ * A freshly-created ref_iterator doesn't yet point at a reference. To
+ * advance the iterator, call ref_iterator_advance(). If successful,
+ * this sets the iterator's refname, oid, and flags fields to describe
+ * the next reference and returns ITER_OK. The data pointed at by
+ * refname and oid belong to the iterator; if you want to retain them
+ * after calling ref_iterator_advance() again or calling
+ * ref_iterator_abort(), you must make a copy. When the iteration has
+ * been exhausted, ref_iterator_advance() releases any resources
+ * assocated with the iteration, frees the ref_iterator object, and
+ * returns ITER_DONE. If you want to abort the iteration early, call
+ * ref_iterator_abort(), which also frees the ref_iterator object and
+ * any associated resources. If there was an internal error advancing
+ * to the next entry, ref_iterator_advance() aborts the iteration,
+ * frees the ref_iterator, and returns ITER_ERROR.
+ *
+ * The reference currently being looked at can be peeled by calling
+ * ref_iterator_peel(). This function is often faster than peel_ref(),
+ * so it should be preferred when iterating over references.
+ *
+ * Putting it all together, a typical iteration looks like this:
+ *
+ * int ok;
+ * struct ref_iterator *iter = ...;
+ *
+ * while ((ok = ref_iterator_advance(iter)) == ITER_OK) {
+ * if (want_to_stop_iteration()) {
+ * ok = ref_iterator_abort(iter);
+ * break;
+ * }
+ *
+ * // Access information about the current reference:
+ * if (!(iter->flags & REF_ISSYMREF))
+ * printf("%s is %s\n", iter->refname, oid_to_hex(&iter->oid));
+ *
+ * // If you need to peel the reference:
+ * ref_iterator_peel(iter, &oid);
+ * }
+ *
+ * if (ok != ITER_DONE)
+ * handle_error();
+ */
+struct ref_iterator {
+ struct ref_iterator_vtable *vtable;
+ const char *refname;
+ const struct object_id *oid;
+ unsigned int flags;
+};
+
+/*
+ * Advance the iterator to the first or next item and return ITER_OK.
+ * If the iteration is exhausted, free the resources associated with
+ * the ref_iterator and return ITER_DONE. On errors, free the iterator
+ * resources and return ITER_ERROR. It is a bug to use ref_iterator or
+ * call this function again after it has returned ITER_DONE or
+ * ITER_ERROR.
+ */
+int ref_iterator_advance(struct ref_iterator *ref_iterator);
+
+/*
+ * If possible, peel the reference currently being viewed by the
+ * iterator. Return 0 on success.
+ */
+int ref_iterator_peel(struct ref_iterator *ref_iterator,
+ struct object_id *peeled);
+
+/*
+ * End the iteration before it has been exhausted, freeing the
+ * reference iterator and any associated resources and returning
+ * ITER_DONE. If the abort itself failed, return ITER_ERROR.
+ */
+int ref_iterator_abort(struct ref_iterator *ref_iterator);
+
+/*
+ * An iterator over nothing (its first ref_iterator_advance() call
+ * returns ITER_DONE).
+ */
+struct ref_iterator *empty_ref_iterator_begin(void);
+
+/*
+ * Return true iff ref_iterator is an empty_ref_iterator.
+ */
+int is_empty_ref_iterator(struct ref_iterator *ref_iterator);
+
+/*
+ * A callback function used to instruct merge_ref_iterator how to
+ * interleave the entries from iter0 and iter1. The function should
+ * return one of the constants defined in enum iterator_selection. It
+ * must not advance either of the iterators itself.
+ *
+ * The function must be prepared to handle the case that iter0 and/or
+ * iter1 is NULL, which indicates that the corresponding sub-iterator
+ * has been exhausted. Its return value must be consistent with the
+ * current states of the iterators; e.g., it must not return
+ * ITER_SKIP_1 if iter1 has already been exhausted.
*/
-int do_for_each_ref(const char *submodule, const char *base,
- each_ref_fn fn, int trim, int flags, void *cb_data);
+typedef enum iterator_selection ref_iterator_select_fn(
+ struct ref_iterator *iter0, struct ref_iterator *iter1,
+ void *cb_data);
+/*
+ * Iterate over the entries from iter0 and iter1, with the values
+ * interleaved as directed by the select function. The iterator takes
+ * ownership of iter0 and iter1 and frees them when the iteration is
+ * over.
+ */
+struct ref_iterator *merge_ref_iterator_begin(
+ struct ref_iterator *iter0, struct ref_iterator *iter1,
+ ref_iterator_select_fn *select, void *cb_data);
+
+/*
+ * An iterator consisting of the union of the entries from front and
+ * back. If there are entries common to the two sub-iterators, use the
+ * one from front. Each iterator must iterate over its entries in
+ * strcmp() order by refname for this to work.
+ *
+ * The new iterator takes ownership of its arguments and frees them
+ * when the iteration is over. As a convenience to callers, if front
+ * or back is an empty_ref_iterator, then abort that one immediately
+ * and return the other iterator directly, without wrapping it.
+ */
+struct ref_iterator *overlay_ref_iterator_begin(
+ struct ref_iterator *front, struct ref_iterator *back);
+
+/*
+ * Wrap iter0, only letting through the references whose names start
+ * with prefix. If trim is set, set iter->refname to the name of the
+ * reference with that many characters trimmed off the front;
+ * otherwise set it to the full refname. The new iterator takes over
+ * ownership of iter0 and frees it when iteration is over. It makes
+ * its own copy of prefix.
+ *
+ * As an convenience to callers, if prefix is the empty string and
+ * trim is zero, this function returns iter0 directly, without
+ * wrapping it.
+ */
+struct ref_iterator *prefix_ref_iterator_begin(struct ref_iterator *iter0,
+ const char *prefix,
+ int trim);
+
+/*
+ * Iterate over the packed and loose references in the specified
+ * submodule that are within find_containing_dir(prefix). If prefix is
+ * NULL or the empty string, iterate over all references in the
+ * submodule.
+ */
+struct ref_iterator *files_ref_iterator_begin(const char *submodule,
+ const char *prefix,
+ unsigned int flags);
+
+/*
+ * Iterate over the references in the main ref_store that have a
+ * reflog. The paths within a directory are iterated over in arbitrary
+ * order.
+ */
+struct ref_iterator *files_reflog_iterator_begin(void);
+
+/* Internal implementation of reference iteration: */
+
+/*
+ * Base class constructor for ref_iterators. Initialize the
+ * ref_iterator part of iter, setting its vtable pointer as specified.
+ * This is meant to be called only by the initializers of derived
+ * classes.
+ */
+void base_ref_iterator_init(struct ref_iterator *iter,
+ struct ref_iterator_vtable *vtable);
+
+/*
+ * Base class destructor for ref_iterators. Destroy the ref_iterator
+ * part of iter and shallow-free the object. This is meant to be
+ * called only by the destructors of derived classes.
+ */
+void base_ref_iterator_free(struct ref_iterator *iter);
+
+/* Virtual function declarations for ref_iterators: */
+
+typedef int ref_iterator_advance_fn(struct ref_iterator *ref_iterator);
+
+typedef int ref_iterator_peel_fn(struct ref_iterator *ref_iterator,
+ struct object_id *peeled);
+
+/*
+ * Implementations of this function should free any resources specific
+ * to the derived class, then call base_ref_iterator_free() to clean
+ * up and free the ref_iterator object.
+ */
+typedef int ref_iterator_abort_fn(struct ref_iterator *ref_iterator);
+
+struct ref_iterator_vtable {
+ ref_iterator_advance_fn *advance;
+ ref_iterator_peel_fn *peel;
+ ref_iterator_abort_fn *abort;
+};
+
+/*
+ * current_ref_iter is a performance hack: when iterating over
+ * references using the for_each_ref*() functions, current_ref_iter is
+ * set to the reference iterator before calling the callback function.
+ * If the callback function calls peel_ref(), then peel_ref() first
+ * checks whether the reference to be peeled is the one referred to by
+ * the iterator (it usually is) and if so, asks the iterator for the
+ * peeled version of the reference if it is available. This avoids a
+ * refname lookup in a common case. current_ref_iter is set to NULL
+ * when the iteration is over.
+ */
+extern struct ref_iterator *current_ref_iter;
+
+/*
+ * The common backend for the for_each_*ref* functions. Call fn for
+ * each reference in iter. If the iterator itself ever returns
+ * ITER_ERROR, return -1. If fn ever returns a non-zero value, stop
+ * the iteration and return that value. Otherwise, return 0. In any
+ * case, free the iterator when done. This function is basically an
+ * adapter between the callback style of reference iteration and the
+ * iterator style.
+ */
+int do_for_each_ref_iterator(struct ref_iterator *iter,
+ each_ref_fn fn, void *cb_data);
+
+/*
+ * Read the specified reference from the filesystem or packed refs
+ * file, non-recursively. Set type to describe the reference, and:
+ *
+ * - If refname is the name of a normal reference, fill in sha1
+ * (leaving referent unchanged).
+ *
+ * - If refname is the name of a symbolic reference, write the full
+ * name of the reference to which it refers (e.g.
+ * "refs/heads/master") to referent and set the REF_ISSYMREF bit in
+ * type (leaving sha1 unchanged). The caller is responsible for
+ * validating that referent is a valid reference name.
+ *
+ * WARNING: refname might be used as part of a filename, so it is
+ * important from a security standpoint that it be safe in the sense
+ * of refname_is_safe(). Moreover, for symrefs this function sets
+ * referent to whatever the repository says, which might not be a
+ * properly-formatted or even safe reference name. NEITHER INPUT NOR
+ * OUTPUT REFERENCE NAMES ARE VALIDATED WITHIN THIS FUNCTION.
+ *
+ * Return 0 on success. If the ref doesn't exist, set errno to ENOENT
+ * and return -1. If the ref exists but is neither a symbolic ref nor
+ * a sha1, it is broken; set REF_ISBROKEN in type, set errno to
+ * EINVAL, and return -1. If there is another error reading the ref,
+ * set errno appropriately and return -1.
+ *
+ * Backend-specific flags might be set in type as well, regardless of
+ * outcome.
+ *
+ * It is OK for refname to point into referent. If so:
+ *
+ * - if the function succeeds with REF_ISSYMREF, referent will be
+ * overwritten and the memory formerly pointed to by it might be
+ * changed or even freed.
+ *
+ * - in all other cases, referent will be untouched, and therefore
+ * refname will still be valid and unchanged.
+ */
int read_raw_ref(const char *refname, unsigned char *sha1,
- struct strbuf *symref, unsigned int *flags);
+ struct strbuf *referent, unsigned int *type);
#endif /* REFS_REFS_INTERNAL_H */
diff --git a/remote.c b/remote.c
index d29850a..ad6c542 100644
--- a/remote.c
+++ b/remote.c
@@ -2073,7 +2073,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
_("Your branch is based on '%s', but the upstream is gone.\n"),
base);
if (advice_status_hints)
- strbuf_addf(sb,
+ strbuf_addstr(sb,
_(" (use \"git branch --unset-upstream\" to fixup)\n"));
} else if (!ours && !theirs) {
strbuf_addf(sb,
@@ -2086,7 +2086,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
ours),
base, ours);
if (advice_status_hints)
- strbuf_addf(sb,
+ strbuf_addstr(sb,
_(" (use \"git push\" to publish your local commits)\n"));
} else if (!ours) {
strbuf_addf(sb,
@@ -2097,7 +2097,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
theirs),
base, theirs);
if (advice_status_hints)
- strbuf_addf(sb,
+ strbuf_addstr(sb,
_(" (use \"git pull\" to update your local branch)\n"));
} else {
strbuf_addf(sb,
@@ -2110,7 +2110,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
ours + theirs),
base, ours, theirs);
if (advice_status_hints)
- strbuf_addf(sb,
+ strbuf_addstr(sb,
_(" (use \"git pull\" to merge the remote branch into yours)\n"));
}
free(base);
diff --git a/revision.c b/revision.c
index fe0f3a4..8a29cb0 100644
--- a/revision.c
+++ b/revision.c
@@ -846,7 +846,7 @@ static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
*/
if (left_first != !!(flags & SYMMETRIC_LEFT))
continue;
- commit->util = add_commit_patch_id(commit, &ids);
+ add_commit_patch_id(commit, &ids);
}
/* either cherry_mark or cherry_pick are true */
@@ -873,21 +873,9 @@ static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
id = has_commit_patch_id(commit, &ids);
if (!id)
continue;
- id->seen = 1;
- commit->object.flags |= cherry_flag;
- }
- /* Now check the original side for seen ones */
- for (p = list; p; p = p->next) {
- struct commit *commit = p->item;
- struct patch_id *ent;
-
- ent = commit->util;
- if (!ent)
- continue;
- if (ent->seen)
- commit->object.flags |= cherry_flag;
- commit->util = NULL;
+ commit->object.flags |= cherry_flag;
+ id->commit->object.flags |= cherry_flag;
}
free_patch_ids(&ids);
@@ -1425,7 +1413,7 @@ static void prepare_show_merge(struct rev_info *revs)
ce_same_name(ce, active_cache[i+1]))
i++;
}
- free_pathspec(&revs->prune_data);
+ clear_pathspec(&revs->prune_data);
parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
revs->limited = 1;
@@ -1871,6 +1859,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->notes_opt.use_default_notes = 1;
} else if (!strcmp(arg, "--show-signature")) {
revs->show_signature = 1;
+ } else if (!strcmp(arg, "--no-show-signature")) {
+ revs->show_signature = 0;
} else if (!strcmp(arg, "--show-linear-break") ||
starts_with(arg, "--show-linear-break=")) {
if (starts_with(arg, "--show-linear-break="))
diff --git a/run-command.c b/run-command.c
index af0c8a1..5a4dbb6 100644
--- a/run-command.c
+++ b/run-command.c
@@ -824,10 +824,7 @@ const char *find_hook(const char *name)
static struct strbuf path = STRBUF_INIT;
strbuf_reset(&path);
- if (git_hooks_path)
- strbuf_addf(&path, "%s/%s", git_hooks_path, name);
- else
- strbuf_git_path(&path, "hooks/%s", name);
+ strbuf_git_path(&path, "hooks/%s", name);
if (access(path.buf, X_OK) < 0)
return NULL;
return path.buf;
@@ -864,19 +861,161 @@ int run_hook_le(const char *const *env, const char *name, ...)
return ret;
}
-int capture_command(struct child_process *cmd, struct strbuf *buf, size_t hint)
+struct io_pump {
+ /* initialized by caller */
+ int fd;
+ int type; /* POLLOUT or POLLIN */
+ union {
+ struct {
+ const char *buf;
+ size_t len;
+ } out;
+ struct {
+ struct strbuf *buf;
+ size_t hint;
+ } in;
+ } u;
+
+ /* returned by pump_io */
+ int error; /* 0 for success, otherwise errno */
+
+ /* internal use */
+ struct pollfd *pfd;
+};
+
+static int pump_io_round(struct io_pump *slots, int nr, struct pollfd *pfd)
{
- cmd->out = -1;
+ int pollsize = 0;
+ int i;
+
+ for (i = 0; i < nr; i++) {
+ struct io_pump *io = &slots[i];
+ if (io->fd < 0)
+ continue;
+ pfd[pollsize].fd = io->fd;
+ pfd[pollsize].events = io->type;
+ io->pfd = &pfd[pollsize++];
+ }
+
+ if (!pollsize)
+ return 0;
+
+ if (poll(pfd, pollsize, -1) < 0) {
+ if (errno == EINTR)
+ return 1;
+ die_errno("poll failed");
+ }
+
+ for (i = 0; i < nr; i++) {
+ struct io_pump *io = &slots[i];
+
+ if (io->fd < 0)
+ continue;
+
+ if (!(io->pfd->revents & (POLLOUT|POLLIN|POLLHUP|POLLERR|POLLNVAL)))
+ continue;
+
+ if (io->type == POLLOUT) {
+ ssize_t len = xwrite(io->fd,
+ io->u.out.buf, io->u.out.len);
+ if (len < 0) {
+ io->error = errno;
+ close(io->fd);
+ io->fd = -1;
+ } else {
+ io->u.out.buf += len;
+ io->u.out.len -= len;
+ if (!io->u.out.len) {
+ close(io->fd);
+ io->fd = -1;
+ }
+ }
+ }
+
+ if (io->type == POLLIN) {
+ ssize_t len = strbuf_read_once(io->u.in.buf,
+ io->fd, io->u.in.hint);
+ if (len < 0)
+ io->error = errno;
+ if (len <= 0) {
+ close(io->fd);
+ io->fd = -1;
+ }
+ }
+ }
+
+ return 1;
+}
+
+static int pump_io(struct io_pump *slots, int nr)
+{
+ struct pollfd *pfd;
+ int i;
+
+ for (i = 0; i < nr; i++)
+ slots[i].error = 0;
+
+ ALLOC_ARRAY(pfd, nr);
+ while (pump_io_round(slots, nr, pfd))
+ ; /* nothing */
+ free(pfd);
+
+ /* There may be multiple errno values, so just pick the first. */
+ for (i = 0; i < nr; i++) {
+ if (slots[i].error) {
+ errno = slots[i].error;
+ return -1;
+ }
+ }
+ return 0;
+}
+
+
+int pipe_command(struct child_process *cmd,
+ const char *in, size_t in_len,
+ struct strbuf *out, size_t out_hint,
+ struct strbuf *err, size_t err_hint)
+{
+ struct io_pump io[3];
+ int nr = 0;
+
+ if (in)
+ cmd->in = -1;
+ if (out)
+ cmd->out = -1;
+ if (err)
+ cmd->err = -1;
+
if (start_command(cmd) < 0)
return -1;
- if (strbuf_read(buf, cmd->out, hint) < 0) {
- close(cmd->out);
+ if (in) {
+ io[nr].fd = cmd->in;
+ io[nr].type = POLLOUT;
+ io[nr].u.out.buf = in;
+ io[nr].u.out.len = in_len;
+ nr++;
+ }
+ if (out) {
+ io[nr].fd = cmd->out;
+ io[nr].type = POLLIN;
+ io[nr].u.in.buf = out;
+ io[nr].u.in.hint = out_hint;
+ nr++;
+ }
+ if (err) {
+ io[nr].fd = cmd->err;
+ io[nr].type = POLLIN;
+ io[nr].u.in.buf = err;
+ io[nr].u.in.hint = err_hint;
+ nr++;
+ }
+
+ if (pump_io(io, nr) < 0) {
finish_command(cmd); /* throw away exit code */
return -1;
}
- close(cmd->out);
return finish_command(cmd);
}
diff --git a/run-command.h b/run-command.h
index 11f76b0..5066649 100644
--- a/run-command.h
+++ b/run-command.h
@@ -79,17 +79,34 @@ int run_command_v_opt(const char **argv, int opt);
int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const char *const *env);
/**
- * Execute the given command, capturing its stdout in the given strbuf.
+ * Execute the given command, sending "in" to its stdin, and capturing its
+ * stdout and stderr in the "out" and "err" strbufs. Any of the three may
+ * be NULL to skip processing.
+ *
* Returns -1 if starting the command fails or reading fails, and otherwise
- * returns the exit code of the command. The output collected in the
- * buffer is kept even if the command returns a non-zero exit. The hint field
- * gives a starting size for the strbuf allocation.
+ * returns the exit code of the command. Any output collected in the
+ * buffers is kept even if the command returns a non-zero exit. The hint fields
+ * gives starting sizes for the strbuf allocations.
*
* The fields of "cmd" should be set up as they would for a normal run_command
- * invocation. But note that there is no need to set cmd->out; the function
- * sets it up for the caller.
+ * invocation. But note that there is no need to set the in, out, or err
+ * fields; pipe_command handles that automatically.
+ */
+int pipe_command(struct child_process *cmd,
+ const char *in, size_t in_len,
+ struct strbuf *out, size_t out_hint,
+ struct strbuf *err, size_t err_hint);
+
+/**
+ * Convenience wrapper around pipe_command for the common case
+ * of capturing only stdout.
*/
-int capture_command(struct child_process *cmd, struct strbuf *buf, size_t hint);
+static inline int capture_command(struct child_process *cmd,
+ struct strbuf *out,
+ size_t hint)
+{
+ return pipe_command(cmd, NULL, 0, out, hint, NULL, 0);
+}
/*
* The purpose of the following functions is to feed a pipe by running
diff --git a/send-pack.c b/send-pack.c
index 1f85c56..6195b43 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -181,8 +181,7 @@ static int receive_status(int in, struct ref *refs)
hint->status = REF_STATUS_REMOTE_REJECT;
ret = -1;
}
- if (msg)
- hint->remote_status = xstrdup(msg);
+ hint->remote_status = xstrdup_or_null(msg);
/* start our next search from the next ref */
hint = hint->next;
}
@@ -260,6 +259,7 @@ static int generate_push_cert(struct strbuf *req_buf,
const char *push_cert_nonce)
{
const struct ref *ref;
+ struct string_list_item *item;
char *signing_key = xstrdup(get_signing_key());
const char *cp, *np;
struct strbuf cert = STRBUF_INIT;
@@ -276,6 +276,9 @@ static int generate_push_cert(struct strbuf *req_buf,
}
if (push_cert_nonce[0])
strbuf_addf(&cert, "nonce %s\n", push_cert_nonce);
+ if (args->push_options)
+ for_each_string_list_item(item, args->push_options)
+ strbuf_addf(&cert, "push-option %s\n", item->string);
strbuf_addstr(&cert, "\n");
for (ref = remote_refs; ref; ref = ref->next) {
@@ -370,6 +373,8 @@ int send_pack(struct send_pack_args *args,
int agent_supported = 0;
int use_atomic = 0;
int atomic_supported = 0;
+ int use_push_options = 0;
+ int push_options_supported = 0;
unsigned cmds_sent = 0;
int ret;
struct async demux;
@@ -392,6 +397,8 @@ int send_pack(struct send_pack_args *args,
args->use_thin_pack = 0;
if (server_supports("atomic"))
atomic_supported = 1;
+ if (server_supports("push-options"))
+ push_options_supported = 1;
if (args->push_cert != SEND_PACK_PUSH_CERT_NEVER) {
int len;
@@ -418,6 +425,11 @@ int send_pack(struct send_pack_args *args,
use_atomic = atomic_supported && args->atomic;
+ if (args->push_options && !push_options_supported)
+ die(_("the receiving end does not support push options"));
+
+ use_push_options = push_options_supported && args->push_options;
+
if (status_report)
strbuf_addstr(&cap_buf, " report-status");
if (use_sideband)
@@ -426,6 +438,8 @@ int send_pack(struct send_pack_args *args,
strbuf_addstr(&cap_buf, " quiet");
if (use_atomic)
strbuf_addstr(&cap_buf, " atomic");
+ if (use_push_options)
+ strbuf_addstr(&cap_buf, " push-options");
if (agent_supported)
strbuf_addf(&cap_buf, " agent=%s", git_user_agent_sanitized());
@@ -512,6 +526,18 @@ int send_pack(struct send_pack_args *args,
strbuf_release(&req_buf);
strbuf_release(&cap_buf);
+ if (use_push_options) {
+ struct string_list_item *item;
+ struct strbuf sb = STRBUF_INIT;
+
+ for_each_string_list_item(item, args->push_options)
+ packet_buf_write(&sb, "%s", item->string);
+
+ write_or_die(out, sb.buf, sb.len);
+ packet_flush(out);
+ strbuf_release(&sb);
+ }
+
if (use_sideband && cmds_sent) {
memset(&demux, 0, sizeof(demux));
demux.proc = sideband_demux;
diff --git a/send-pack.h b/send-pack.h
index 57f222a..67fc40f 100644
--- a/send-pack.h
+++ b/send-pack.h
@@ -1,6 +1,8 @@
#ifndef SEND_PACK_H
#define SEND_PACK_H
+#include "string-list.h"
+
/* Possible values for push_cert field in send_pack_args. */
#define SEND_PACK_PUSH_CERT_NEVER 0
#define SEND_PACK_PUSH_CERT_IF_ASKED 1
@@ -21,6 +23,7 @@ struct send_pack_args {
push_cert:2,
stateless_rpc:1,
atomic:1;
+ const struct string_list *push_options;
};
struct option;
diff --git a/sequencer.c b/sequencer.c
index 80a17bb..3804fa9 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -190,7 +190,7 @@ static void write_message(struct strbuf *msgbuf, const char *filename)
die_errno(_("Could not write to %s"), filename);
strbuf_release(msgbuf);
if (commit_lock_file(&msg_file) < 0)
- die(_("Error wrapping up %s"), filename);
+ die(_("Error wrapping up %s."), filename);
}
static struct tree *empty_tree(void)
@@ -225,7 +225,7 @@ static int fast_forward_to(const unsigned char *to, const unsigned char *from,
if (checkout_fast_forward(from, to, 1))
exit(128); /* the callee should have complained already */
- strbuf_addf(&sb, "%s: fast-forward", action_name(opts));
+ strbuf_addf(&sb, _("%s: fast-forward"), action_name(opts));
transaction = ref_transaction_begin(&err);
if (!transaction ||
@@ -293,6 +293,9 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
clean = merge_trees(&o,
head_tree,
next_tree, base_tree, &result);
+ strbuf_release(&o.obuf);
+ if (clean < 0)
+ return clean;
if (active_cache_changed &&
write_locked_index(&the_index, &index_lock, COMMIT_LOCK))
@@ -559,6 +562,8 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
if (!opts->strategy || !strcmp(opts->strategy, "recursive") || opts->action == REPLAY_REVERT) {
res = do_recursive_merge(base, next, base_label, next_label,
head, &msgbuf, opts);
+ if (res < 0)
+ return res;
write_message(&msgbuf, git_path_merge_msg());
} else {
struct commit_list *common = NULL;
@@ -695,9 +700,14 @@ static struct commit *parse_insn_line(char *bol, char *eol, struct replay_opts *
* opts; we don't support arbitrary instructions
*/
if (action != opts->action) {
- const char *action_str;
- action_str = action == REPLAY_REVERT ? "revert" : "cherry-pick";
- error(_("Cannot %s during a %s"), action_str, action_name(opts));
+ if (action == REPLAY_REVERT)
+ error((opts->action == REPLAY_REVERT)
+ ? _("Cannot revert during another revert.")
+ : _("Cannot revert during a cherry-pick."));
+ else
+ error((opts->action == REPLAY_REVERT)
+ ? _("Cannot cherry-pick during a revert.")
+ : _("Cannot cherry-pick during another cherry-pick."));
return NULL;
}
diff --git a/setup.c b/setup.c
index c86bf5c..fe572b8 100644
--- a/setup.c
+++ b/setup.c
@@ -157,8 +157,8 @@ static void NORETURN die_verify_filename(const char *prefix,
int diagnose_misspelt_rev)
{
if (!diagnose_misspelt_rev)
- die("%s: no such path in the working tree.\n"
- "Use 'git <command> -- <path>...' to specify paths that do not exist locally.",
+ die(_("%s: no such path in the working tree.\n"
+ "Use 'git <command> -- <path>...' to specify paths that do not exist locally."),
arg);
/*
* Saying "'(icase)foo' does not exist in the index" when the
@@ -170,9 +170,9 @@ static void NORETURN die_verify_filename(const char *prefix,
maybe_die_on_misspelt_object_name(arg, prefix);
/* ... or fall back the most general message. */
- die("ambiguous argument '%s': unknown revision or path not in the working tree.\n"
- "Use '--' to separate paths from revisions, like this:\n"
- "'git <command> [<revision>...] -- [<file>...]'", arg);
+ die(_("ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+ "Use '--' to separate paths from revisions, like this:\n"
+ "'git <command> [<revision>...] -- [<file>...]'"), arg);
}
@@ -220,9 +220,9 @@ void verify_non_filename(const char *prefix, const char *arg)
return; /* flag */
if (!check_filename(prefix, arg))
return;
- die("ambiguous argument '%s': both revision and filename\n"
- "Use '--' to separate paths from revisions, like this:\n"
- "'git <command> [<revision>...] -- [<file>...]'", arg);
+ die(_("ambiguous argument '%s': both revision and filename\n"
+ "Use '--' to separate paths from revisions, like this:\n"
+ "'git <command> [<revision>...] -- [<file>...]'"), arg);
}
int get_common_dir(struct strbuf *sb, const char *gitdir)
@@ -759,9 +759,9 @@ static const char *setup_bare_git_dir(struct strbuf *cwd, int offset,
static const char *setup_nongit(const char *cwd, int *nongit_ok)
{
if (!nongit_ok)
- die("Not a git repository (or any of the parent directories): %s", DEFAULT_GIT_DIR_ENVIRONMENT);
+ die(_("Not a git repository (or any of the parent directories): %s"), DEFAULT_GIT_DIR_ENVIRONMENT);
if (chdir(cwd))
- die_errno("Cannot come back to cwd");
+ die_errno(_("Cannot come back to cwd"));
*nongit_ok = 1;
return NULL;
}
@@ -842,7 +842,7 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)
*nongit_ok = 0;
if (strbuf_getcwd(&cwd))
- die_errno("Unable to read current working directory");
+ die_errno(_("Unable to read current working directory"));
offset = cwd.len;
/*
@@ -912,19 +912,19 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)
if (parent_device != current_device) {
if (nongit_ok) {
if (chdir(cwd.buf))
- die_errno("Cannot come back to cwd");
+ die_errno(_("Cannot come back to cwd"));
*nongit_ok = 1;
return NULL;
}
strbuf_setlen(&cwd, offset);
- die("Not a git repository (or any parent up to mount point %s)\n"
- "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).",
+ die(_("Not a git repository (or any parent up to mount point %s)\n"
+ "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."),
cwd.buf);
}
}
if (chdir("..")) {
strbuf_setlen(&cwd, offset);
- die_errno("Cannot change to '%s/..'", cwd.buf);
+ die_errno(_("Cannot change to '%s/..'"), cwd.buf);
}
offset = offset_parent;
}
@@ -986,9 +986,9 @@ int git_config_perm(const char *var, const char *value)
/* A filemode value was given: 0xxx */
if ((i & 0600) != 0600)
- die("Problem with core.sharedRepository filemode value "
+ die(_("Problem with core.sharedRepository filemode value "
"(0%.3o).\nThe owner of files must always have "
- "read and write permissions.", i);
+ "read and write permissions."), i);
/*
* Mask filemode value. Others can not get write permission.
diff --git a/sha1_file.c b/sha1_file.c
index cb571ac..727a976 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -23,6 +23,7 @@
#include "bulk-checkin.h"
#include "streaming.h"
#include "dir.h"
+#include "mru.h"
#ifndef O_NOATIME
#if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
@@ -59,14 +60,6 @@ static struct cached_object empty_tree = {
0
};
-/*
- * A pointer to the last packed_git in which an object was found.
- * When an object is sought, we look in this packfile first, because
- * objects that are looked up at similar times are often in the same
- * packfile as one another.
- */
-static struct packed_git *last_found_pack;
-
static struct cached_object *find_cached_object(const unsigned char *sha1)
{
int i;
@@ -522,6 +515,9 @@ static size_t peak_pack_mapped;
static size_t pack_mapped;
struct packed_git *packed_git;
+static struct mru packed_git_mru_storage;
+struct mru *packed_git_mru = &packed_git_mru_storage;
+
void pack_report(void)
{
fprintf(stderr,
@@ -795,7 +791,7 @@ void close_all_packs(void)
for (p = packed_git; p; p = p->next)
if (p->do_not_close)
- die("BUG! Want to close pack marked 'do-not-close'");
+ die("BUG: want to close pack marked 'do-not-close'");
else
close_pack(p);
}
@@ -891,36 +887,6 @@ void close_pack_index(struct packed_git *p)
}
}
-/*
- * This is used by git-repack in case a newly created pack happens to
- * contain the same set of objects as an existing one. In that case
- * the resulting file might be different even if its name would be the
- * same. It is best to close any reference to the old pack before it is
- * replaced on disk. Of course no index pointers or windows for given pack
- * must subsist at this point. If ever objects from this pack are requested
- * again, the new version of the pack will be reinitialized through
- * reprepare_packed_git().
- */
-void free_pack_by_name(const char *pack_name)
-{
- struct packed_git *p, **pp = &packed_git;
-
- while (*pp) {
- p = *pp;
- if (strcmp(pack_name, p->pack_name) == 0) {
- clear_delta_base_cache();
- close_pack(p);
- free(p->bad_object_sha1);
- *pp = p->next;
- if (last_found_pack == p)
- last_found_pack = NULL;
- free(p);
- return;
- }
- pp = &p->next;
- }
-}
-
static unsigned int get_max_fd_limit(void)
{
#ifdef RLIMIT_NOFILE
@@ -1385,6 +1351,15 @@ static void rearrange_packed_git(void)
free(ary);
}
+static void prepare_packed_git_mru(void)
+{
+ struct packed_git *p;
+
+ mru_clear(packed_git_mru);
+ for (p = packed_git; p; p = p->next)
+ mru_append(packed_git_mru, p);
+}
+
static int prepare_packed_git_run_once = 0;
void prepare_packed_git(void)
{
@@ -1400,6 +1375,7 @@ void prepare_packed_git(void)
alt->name[-1] = '/';
}
rearrange_packed_git();
+ prepare_packed_git_mru();
prepare_packed_git_run_once = 1;
}
@@ -1596,7 +1572,9 @@ unsigned long unpack_object_header_buffer(const unsigned char *buf,
return used;
}
-int unpack_sha1_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz)
+static int unpack_sha1_short_header(git_zstream *stream,
+ unsigned char *map, unsigned long mapsize,
+ void *buffer, unsigned long bufsiz)
{
/* Get the data stream */
memset(stream, 0, sizeof(*stream));
@@ -1609,13 +1587,31 @@ int unpack_sha1_header(git_zstream *stream, unsigned char *map, unsigned long ma
return git_inflate(stream, 0);
}
+int unpack_sha1_header(git_zstream *stream,
+ unsigned char *map, unsigned long mapsize,
+ void *buffer, unsigned long bufsiz)
+{
+ int status = unpack_sha1_short_header(stream, map, mapsize,
+ buffer, bufsiz);
+
+ if (status < Z_OK)
+ return status;
+
+ /* Make sure we have the terminating NUL */
+ if (!memchr(buffer, '\0', stream->next_out - (unsigned char *)buffer))
+ return -1;
+ return 0;
+}
+
static int unpack_sha1_header_to_strbuf(git_zstream *stream, unsigned char *map,
unsigned long mapsize, void *buffer,
unsigned long bufsiz, struct strbuf *header)
{
int status;
- status = unpack_sha1_header(stream, map, mapsize, buffer, bufsiz);
+ status = unpack_sha1_short_header(stream, map, mapsize, buffer, bufsiz);
+ if (status < Z_OK)
+ return -1;
/*
* Check if entire header is unpacked in the first iteration.
@@ -1706,6 +1702,8 @@ static int parse_sha1_header_extended(const char *hdr, struct object_info *oi,
*/
for (;;) {
char c = *hdr++;
+ if (!c)
+ return -1;
if (c == ' ')
break;
type_len++;
@@ -1716,7 +1714,7 @@ static int parse_sha1_header_extended(const char *hdr, struct object_info *oi,
strbuf_add(oi->typename, type_buf, type_len);
/*
* Set type to 0 if its an unknown object and
- * we're obtaining the type using '--allow-unkown-type'
+ * we're obtaining the type using '--allow-unknown-type'
* option.
*/
if ((flags & LOOKUP_UNKNOWN_OBJECT) && (type < 0))
@@ -2330,7 +2328,7 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
case OBJ_OFS_DELTA:
case OBJ_REF_DELTA:
if (data)
- die("BUG in unpack_entry: left loop at a valid delta");
+ die("BUG: unpack_entry: left loop at a valid delta");
break;
case OBJ_COMMIT:
case OBJ_TREE:
@@ -2604,21 +2602,15 @@ static int fill_pack_entry(const unsigned char *sha1,
*/
static int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
{
- struct packed_git *p;
+ struct mru_entry *p;
prepare_packed_git();
if (!packed_git)
return 0;
- if (last_found_pack && fill_pack_entry(sha1, e, last_found_pack))
- return 1;
-
- for (p = packed_git; p; p = p->next) {
- if (p == last_found_pack)
- continue; /* we already checked this one */
-
- if (fill_pack_entry(sha1, e, p)) {
- last_found_pack = p;
+ for (p = packed_git_mru->head; p; p = p->next) {
+ if (fill_pack_entry(sha1, e, p->item)) {
+ mru_mark(packed_git_mru, p);
return 1;
}
}
@@ -3239,6 +3231,11 @@ int has_object_file(const struct object_id *oid)
return has_sha1_file(oid->hash);
}
+int has_object_file_with_flags(const struct object_id *oid, int flags)
+{
+ return has_sha1_file_with_flags(oid->hash, flags);
+}
+
static void check_tree(const void *buf, size_t size)
{
struct tree_desc desc;
diff --git a/shallow.c b/shallow.c
index 4d554ca..54e2db7 100644
--- a/shallow.c
+++ b/shallow.c
@@ -389,7 +389,7 @@ static void paint_down(struct paint_info *info, const unsigned char *sha1,
unsigned int i, nr;
struct commit_list *head = NULL;
int bitmap_nr = (info->nr_bits + 31) / 32;
- size_t bitmap_size = st_mult(bitmap_nr, sizeof(uint32_t));
+ size_t bitmap_size = st_mult(sizeof(uint32_t), bitmap_nr);
uint32_t *tmp = xmalloc(bitmap_size); /* to be freed before return */
uint32_t *bitmap = paint_alloc(info);
struct commit *c = lookup_commit_reference_gently(sha1, 1);
diff --git a/shortlog.h b/shortlog.h
index de4f86f..5a326c6 100644
--- a/shortlog.h
+++ b/shortlog.h
@@ -17,6 +17,7 @@ struct shortlog {
char *common_repo_prefix;
int email;
struct string_list mailmap;
+ FILE *file;
};
void shortlog_init(struct shortlog *log);
diff --git a/split-index.c b/split-index.c
index 3c75d4b..35da553 100644
--- a/split-index.c
+++ b/split-index.c
@@ -83,8 +83,7 @@ void move_cache_to_base_index(struct index_state *istate)
si->base->timestamp = istate->timestamp;
ALLOC_GROW(si->base->cache, istate->cache_nr, si->base->cache_alloc);
si->base->cache_nr = istate->cache_nr;
- memcpy(si->base->cache, istate->cache,
- sizeof(*istate->cache) * istate->cache_nr);
+ COPY_ARRAY(si->base->cache, istate->cache, istate->cache_nr);
mark_base_index_entries(si->base);
for (i = 0; i < si->base->cache_nr; i++)
si->base->cache[i]->ce_flags &= ~CE_UPDATE_IN_BASE;
@@ -141,8 +140,7 @@ void merge_base_index(struct index_state *istate)
istate->cache = NULL;
istate->cache_alloc = 0;
ALLOC_GROW(istate->cache, istate->cache_nr, istate->cache_alloc);
- memcpy(istate->cache, si->base->cache,
- sizeof(*istate->cache) * istate->cache_nr);
+ COPY_ARRAY(istate->cache, si->base->cache, istate->cache_nr);
si->nr_deletions = 0;
si->nr_replacements = 0;
diff --git a/strbuf.c b/strbuf.c
index f3bd571..b839be4 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -187,7 +187,7 @@ void strbuf_insert(struct strbuf *sb, size_t pos, const void *data, size_t len)
void strbuf_remove(struct strbuf *sb, size_t pos, size_t len)
{
- strbuf_splice(sb, pos, len, NULL, 0);
+ strbuf_splice(sb, pos, len, "", 0);
}
void strbuf_add(struct strbuf *sb, const void *data, size_t len)
diff --git a/streaming.c b/streaming.c
index 811fcc2..90feec9 100644
--- a/streaming.c
+++ b/streaming.c
@@ -337,17 +337,17 @@ static open_method_decl(loose)
st->u.loose.mapped = map_sha1_file(sha1, &st->u.loose.mapsize);
if (!st->u.loose.mapped)
return -1;
- if (unpack_sha1_header(&st->z,
- st->u.loose.mapped,
- st->u.loose.mapsize,
- st->u.loose.hdr,
- sizeof(st->u.loose.hdr)) < 0) {
+ if ((unpack_sha1_header(&st->z,
+ st->u.loose.mapped,
+ st->u.loose.mapsize,
+ st->u.loose.hdr,
+ sizeof(st->u.loose.hdr)) < 0) ||
+ (parse_sha1_header(st->u.loose.hdr, &st->size) < 0)) {
git_inflate_end(&st->z);
munmap(st->u.loose.mapped, st->u.loose.mapsize);
return -1;
}
- parse_sha1_header(st->u.loose.hdr, &st->size);
st->u.loose.hdr_used = strlen(st->u.loose.hdr) + 1;
st->u.loose.hdr_avail = st->z.total_out;
st->z_state = z_used;
diff --git a/submodule-config.c b/submodule-config.c
index 93dd364..098085b 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -59,6 +59,7 @@ static void free_one_config(struct submodule_entry *entry)
{
free((void *) entry->config->path);
free((void *) entry->config->name);
+ free((void *) entry->config->branch);
free((void *) entry->config->update_strategy.command);
free(entry->config);
}
@@ -199,6 +200,8 @@ static struct submodule *lookup_or_create_by_name(struct submodule_cache *cache,
submodule->update_strategy.command = NULL;
submodule->fetch_recurse = RECURSE_SUBMODULES_NONE;
submodule->ignore = NULL;
+ submodule->branch = NULL;
+ submodule->recommend_shallow = -1;
hashcpy(submodule->gitmodules_sha1, gitmodules_sha1);
@@ -353,6 +356,21 @@ static int parse_config(const char *var, const char *value, void *data)
else if (parse_submodule_update_strategy(value,
&submodule->update_strategy) < 0)
die(_("invalid value for %s"), var);
+ } else if (!strcmp(item.buf, "shallow")) {
+ if (!me->overwrite && submodule->recommend_shallow != -1)
+ warn_multiple_config(me->commit_sha1, submodule->name,
+ "shallow");
+ else
+ submodule->recommend_shallow =
+ git_config_bool(var, value);
+ } else if (!strcmp(item.buf, "branch")) {
+ if (!me->overwrite && submodule->branch)
+ warn_multiple_config(me->commit_sha1, submodule->name,
+ "branch");
+ else {
+ free((void *)submodule->branch);
+ submodule->branch = xstrdup(value);
+ }
}
strbuf_release(&name);
@@ -368,7 +386,7 @@ static int gitmodule_sha1_from_commit(const unsigned char *commit_sha1,
int ret = 0;
if (is_null_sha1(commit_sha1)) {
- hashcpy(gitmodules_sha1, null_sha1);
+ hashclr(gitmodules_sha1);
return 1;
}
@@ -433,7 +451,7 @@ static const struct submodule *config_from(struct submodule_cache *cache,
parameter.commit_sha1 = commit_sha1;
parameter.gitmodules_sha1 = sha1;
parameter.overwrite = 0;
- git_config_from_mem(parse_config, "submodule-blob", rev.buf,
+ git_config_from_mem(parse_config, CONFIG_ORIGIN_SUBMODULE_BLOB, rev.buf,
config, config_size, &parameter);
strbuf_release(&rev);
free(config);
diff --git a/submodule-config.h b/submodule-config.h
index e4857f5..d05c542 100644
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -15,9 +15,11 @@ struct submodule {
const char *url;
int fetch_recurse;
const char *ignore;
+ const char *branch;
struct submodule_update_strategy update_strategy;
/* the sha1 blob id of the responsible .gitmodules file */
unsigned char gitmodules_sha1[20];
+ int recommend_shallow;
};
int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
diff --git a/submodule.c b/submodule.c
index 4532b11..9d8d91c 100644
--- a/submodule.c
+++ b/submodule.c
@@ -17,7 +17,7 @@
static int config_fetch_recurse_submodules = RECURSE_SUBMODULES_ON_DEMAND;
static int parallel_jobs = 1;
-static struct string_list changed_submodule_paths;
+static struct string_list changed_submodule_paths = STRING_LIST_INIT_NODUP;
static int initialized_fetch_ref_tips;
static struct sha1_array ref_tips_before_fetch;
static struct sha1_array ref_tips_after_fetch;
@@ -370,11 +370,10 @@ void show_submodule_summary(FILE *f, const char *path,
return;
}
- strbuf_addf(&sb, "%s%sSubmodule %s %s..", line_prefix, meta, path,
- find_unique_abbrev(one, DEFAULT_ABBREV));
- if (!fast_backward && !fast_forward)
- strbuf_addch(&sb, '.');
- strbuf_addf(&sb, "%s", find_unique_abbrev(two, DEFAULT_ABBREV));
+ strbuf_addf(&sb, "%s%sSubmodule %s ", line_prefix, meta, path);
+ strbuf_add_unique_abbrev(&sb, one, DEFAULT_ABBREV);
+ strbuf_addstr(&sb, (fast_backward || fast_forward) ? ".." : "...");
+ strbuf_add_unique_abbrev(&sb, two, DEFAULT_ABBREV);
if (message)
strbuf_addf(&sb, " %s%s\n", message, reset);
else
@@ -445,7 +444,7 @@ static void collect_submodules_from_diff(struct diff_queue_struct *q,
struct diff_filepair *p = q->queue[i];
if (!S_ISGITLINK(p->two->mode))
continue;
- if (submodule_needs_pushing(p->two->path, p->two->sha1))
+ if (submodule_needs_pushing(p->two->path, p->two->oid.hash))
string_list_insert(needs_pushing, p->two->path);
}
}
@@ -577,7 +576,7 @@ static void submodule_collect_changed_cb(struct diff_queue_struct *q,
* being moved around. */
struct string_list_item *path;
path = unsorted_string_list_lookup(&changed_submodule_paths, p->two->path);
- if (!path && !is_submodule_commit_present(p->two->path, p->two->sha1))
+ if (!path && !is_submodule_commit_present(p->two->path, p->two->oid.hash))
string_list_append(&changed_submodule_paths, xstrdup(p->two->path));
} else {
/* Submodule is new or was moved here */
@@ -1160,4 +1159,5 @@ void prepare_submodule_repo_env(struct argv_array *out)
if (strcmp(*var, CONFIG_DATA_ENVIRONMENT))
argv_array_push(out, *var);
}
+ argv_array_push(out, "GIT_DIR=.git");
}
diff --git a/t/README b/t/README
index 76a0daa..4982d1c 100644
--- a/t/README
+++ b/t/README
@@ -153,6 +153,12 @@ appropriately before running "make".
As the names depend on the tests' file names, it is safe to
run the tests with this option in parallel.
+--verbose-log::
+ Write verbose output to the same logfile as `--tee`, but do
+ _not_ write it to stdout. Unlike `--tee --verbose`, this option
+ is safe to use when stdout is being consumed by a TAP parser
+ like `prove`. Implies `--tee` and `--verbose`.
+
--with-dashes::
By default tests are run without dashed forms of
commands (like git-commit) in the PATH (it only uses
@@ -265,7 +271,7 @@ right, so this:
$ sh ./t9200-git-cvsexport-commit.sh --run='1-4 !3'
will run tests 1, 2, and 4. Items that comes later have higher
-precendence. It means that this:
+precedence. It means that this:
$ sh ./t9200-git-cvsexport-commit.sh --run='!3 1-4'
diff --git a/t/helper/test-config.c b/t/helper/test-config.c
index d143cd7..3c6d08c 100644
--- a/t/helper/test-config.c
+++ b/t/helper/test-config.c
@@ -25,6 +25,9 @@
* ascending order of priority from a config_set
* constructed from files entered as arguments.
*
+ * iterate -> iterate over all values using git_config(), and print some
+ * data for each
+ *
* Examples:
*
* To print the value with highest priority for key "foo.bAr Baz.rock":
@@ -32,6 +35,36 @@
*
*/
+static const char *scope_name(enum config_scope scope)
+{
+ switch (scope) {
+ case CONFIG_SCOPE_SYSTEM:
+ return "system";
+ case CONFIG_SCOPE_GLOBAL:
+ return "global";
+ case CONFIG_SCOPE_REPO:
+ return "repo";
+ case CONFIG_SCOPE_CMDLINE:
+ return "cmdline";
+ default:
+ return "unknown";
+ }
+}
+static int iterate_cb(const char *var, const char *value, void *data)
+{
+ static int nr;
+
+ if (nr++)
+ putchar('\n');
+
+ printf("key=%s\n", var);
+ printf("value=%s\n", value ? value : "(null)");
+ printf("origin=%s\n", current_config_origin_type());
+ printf("name=%s\n", current_config_name());
+ printf("scope=%s\n", scope_name(current_config_scope()));
+
+ return 0;
+}
int cmd_main(int argc, const char **argv)
{
@@ -134,6 +167,9 @@ int cmd_main(int argc, const char **argv)
printf("Value not found for \"%s\"\n", argv[2]);
goto exit1;
}
+ } else if (!strcmp(argv[1], "iterate")) {
+ git_config(iterate_cb, NULL);
+ goto exit0;
}
die("%s: Please check the syntax and the function name", argv[0]);
diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c
index d51d292..a01430c 100644
--- a/t/helper/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@ -12,7 +12,7 @@ static int dry_run = 0, quiet = 0;
static char *string = NULL;
static char *file = NULL;
static int ambiguous;
-static struct string_list list;
+static struct string_list list = STRING_LIST_INIT_NODUP;
static struct {
int called;
diff --git a/t/helper/test-submodule-config.c b/t/helper/test-submodule-config.c
index 2a50217..2f144d5 100644
--- a/t/helper/test-submodule-config.c
+++ b/t/helper/test-submodule-config.c
@@ -49,7 +49,7 @@ int cmd_main(int argc, const char **argv)
path_or_name = arg[1];
if (commit[0] == '\0')
- hashcpy(commit_sha1, null_sha1);
+ hashclr(commit_sha1);
else if (get_sha1(commit, commit_sha1) < 0)
die_usage(argc, argv, "Commit not found.");
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index fb88232..688313e 100644
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -65,81 +65,22 @@ svn_cmd () {
svn "$orig_svncmd" --config-dir "$svnconf" "$@"
}
-prepare_httpd () {
- for d in \
- "$SVN_HTTPD_PATH" \
- /usr/sbin/apache2 \
- /usr/sbin/httpd \
- ; do
- if test -f "$d"
- then
- SVN_HTTPD_PATH="$d"
- break
- fi
- done
- if test -z "$SVN_HTTPD_PATH"
- then
- echo >&2 '*** error: Apache not found'
- return 1
- fi
- for d in \
- "$SVN_HTTPD_MODULE_PATH" \
- /usr/lib/apache2/modules \
- /usr/libexec/apache2 \
- ; do
- if test -d "$d"
- then
- SVN_HTTPD_MODULE_PATH="$d"
- break
- fi
- done
- if test -z "$SVN_HTTPD_MODULE_PATH"
- then
- echo >&2 '*** error: Apache module dir not found'
- return 1
- fi
- if test ! -f "$SVN_HTTPD_MODULE_PATH/mod_dav_svn.so"
- then
- echo >&2 '*** error: Apache module "mod_dav_svn" not found'
- return 1
- fi
-
- repo_base_path="${1-svn}"
- mkdir "$GIT_DIR"/logs
-
- cat > "$GIT_DIR/httpd.conf" <<EOF
-ServerName "git svn test"
-ServerRoot "$GIT_DIR"
-DocumentRoot "$GIT_DIR"
-PidFile "$GIT_DIR/httpd.pid"
-LockFile logs/accept.lock
-Listen 127.0.0.1:$SVN_HTTPD_PORT
-LoadModule dav_module $SVN_HTTPD_MODULE_PATH/mod_dav.so
-LoadModule dav_svn_module $SVN_HTTPD_MODULE_PATH/mod_dav_svn.so
-<Location /$repo_base_path>
- DAV svn
- SVNPath "$rawsvnrepo"
-</Location>
-EOF
-}
-
-start_httpd () {
- if test -z "$SVN_HTTPD_PORT"
- then
- echo >&2 'SVN_HTTPD_PORT is not defined!'
- return
- fi
-
- prepare_httpd "$1" || return 1
-
- "$SVN_HTTPD_PATH" -f "$GIT_DIR"/httpd.conf -k start
- svnrepo="http://127.0.0.1:$SVN_HTTPD_PORT/$repo_base_path"
-}
-
-stop_httpd () {
- test -z "$SVN_HTTPD_PORT" && return
- test ! -f "$GIT_DIR/httpd.conf" && return
- "$SVN_HTTPD_PATH" -f "$GIT_DIR"/httpd.conf -k stop
+maybe_start_httpd () {
+ loc=${1-svn}
+
+ test_tristate GIT_SVN_TEST_HTTPD
+ case $GIT_SVN_TEST_HTTPD in
+ true)
+ . "$TEST_DIRECTORY"/lib-httpd.sh
+ LIB_HTTPD_SVN="$loc"
+ start_httpd
+ ;;
+ *)
+ stop_httpd () {
+ : noop
+ }
+ ;;
+ esac
}
convert_to_rev_db () {
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index f9f3e5f..435a374 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -24,7 +24,7 @@
# LIB_HTTPD_MODULE_PATH web server modules path
# LIB_HTTPD_PORT listening port
# LIB_HTTPD_DAV enable DAV
-# LIB_HTTPD_SVN enable SVN
+# LIB_HTTPD_SVN enable SVN at given location (e.g. "svn")
# LIB_HTTPD_SSL enable SSL
#
# Copyright (c) 2008 Clemens Buchacher <drizzd@aon.at>
@@ -162,8 +162,10 @@ prepare_httpd() {
if test -n "$LIB_HTTPD_SVN"
then
HTTPD_PARA="$HTTPD_PARA -DSVN"
- rawsvnrepo="$HTTPD_ROOT_PATH/svnrepo"
- svnrepo="http://127.0.0.1:$LIB_HTTPD_PORT/svn"
+ LIB_HTTPD_SVNPATH="$rawsvnrepo"
+ svnrepo="http://127.0.0.1:$LIB_HTTPD_PORT/"
+ svnrepo="$svnrepo$LIB_HTTPD_SVN"
+ export LIB_HTTPD_SVN LIB_HTTPD_SVNPATH
fi
fi
}
@@ -180,6 +182,7 @@ start_httpd() {
if test $? -ne 0
then
trap 'die' EXIT
+ cat "$HTTPD_ROOT_PATH"/error.log >&4 2>/dev/null
test_skip_or_die $GIT_TEST_HTTPD "web server setup failed"
fi
}
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 018a83a..c3e6313 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -208,8 +208,8 @@ RewriteRule ^/half-auth-complete/ - [E=AUTHREQUIRED:yes]
<IfDefine SVN>
LoadModule dav_svn_module modules/mod_dav_svn.so
- <Location /svn>
+ <Location /${LIB_HTTPD_SVN}>
DAV svn
- SVNPath svnrepo
+ SVNPath "${LIB_HTTPD_SVNPATH}"
</Location>
</IfDefine>
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index 9a96e15..25a77ee 100644
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -29,6 +29,7 @@ set_fake_editor () {
*/COMMIT_EDITMSG)
test -z "$EXPECT_HEADER_COUNT" ||
test "$EXPECT_HEADER_COUNT" = "$(sed -n '1s/^# This is a combination of \(.*\) commits\./\1/p' < "$1")" ||
+ test "# # GETTEXT POISON #" = "$(sed -n '1p' < "$1")" ||
exit
test -z "$FAKE_COMMIT_MESSAGE" || echo "$FAKE_COMMIT_MESSAGE" > "$1"
test -z "$FAKE_COMMIT_AMEND" || echo "$FAKE_COMMIT_AMEND" >> "$1"
diff --git a/t/perf/README b/t/perf/README
index 8848c14..49ea434 100644
--- a/t/perf/README
+++ b/t/perf/README
@@ -115,8 +115,16 @@ After that you will want to use some of the following:
At least one of the first two is required!
-You can use test_expect_success as usual. For actual performance
-tests, use
+You can use test_expect_success as usual. In both test_expect_success
+and in test_perf, running "git" points to the version that is being
+perf-tested. The $MODERN_GIT variable points to the git wrapper for the
+currently checked-out version (i.e., the one that matches the t/perf
+scripts you are running). This is useful if your setup uses commands
+that only work with newer versions of git than what you might want to
+test (but obviously your new commands must still create a state that can
+be used by the older version of git you are testing).
+
+For actual performance tests, use
test_perf 'descriptive string' '
command1 &&
diff --git a/t/perf/p3400-rebase.sh b/t/perf/p3400-rebase.sh
new file mode 100755
index 0000000..b3e7d52
--- /dev/null
+++ b/t/perf/p3400-rebase.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+test_description='Tests rebase performance'
+. ./perf-lib.sh
+
+test_perf_default_repo
+
+test_expect_success 'setup' '
+ git checkout -f -b base &&
+ git checkout -b to-rebase &&
+ git checkout -b upstream &&
+ for i in $(seq 100)
+ do
+ # simulate huge diffs
+ echo change$i >unrelated-file$i &&
+ seq 1000 >>unrelated-file$i &&
+ git add unrelated-file$i &&
+ test_tick &&
+ git commit -m commit$i unrelated-file$i &&
+ echo change$i >unrelated-file$i &&
+ seq 1000 | tac >>unrelated-file$i &&
+ git add unrelated-file$i &&
+ test_tick &&
+ git commit -m commit$i-reverse unrelated-file$i ||
+ break
+ done &&
+ git checkout to-rebase &&
+ test_commit our-patch interesting-file
+'
+
+test_perf 'rebase on top of a lot of unrelated changes' '
+ git rebase --onto upstream HEAD^ &&
+ git rebase --onto base HEAD^
+'
+
+test_done
diff --git a/t/perf/p4211-line-log.sh b/t/perf/p4211-line-log.sh
index 3d074b0..b7ff68d 100755
--- a/t/perf/p4211-line-log.sh
+++ b/t/perf/p4211-line-log.sh
@@ -23,11 +23,11 @@ test_perf 'git log --follow (baseline for -M)' '
git log --oneline --follow -- "$file" >/dev/null
'
-test_perf 'git log -L' '
- git log -L 1:"$file" >/dev/null
+test_perf 'git log -L (renames off)' '
+ git log --no-renames -L 1:"$file" >/dev/null
'
-test_perf 'git log -M -L' '
+test_perf 'git log -L (renames on)' '
git log -M -L 1:"$file" >/dev/null
'
diff --git a/t/perf/p5303-many-packs.sh b/t/perf/p5303-many-packs.sh
new file mode 100755
index 0000000..3779851
--- /dev/null
+++ b/t/perf/p5303-many-packs.sh
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+test_description='performance with large numbers of packs'
+. ./perf-lib.sh
+
+test_perf_large_repo
+
+# A real many-pack situation would probably come from having a lot of pushes
+# over time. We don't know how big each push would be, but we can fake it by
+# just walking the first-parent chain and having every 5 commits be their own
+# "push". This isn't _entirely_ accurate, as real pushes would have some
+# duplicate objects due to thin-pack fixing, but it's a reasonable
+# approximation.
+#
+# And then all of the rest of the objects can go in a single packfile that
+# represents the state before any of those pushes (actually, we'll generate
+# that first because in such a setup it would be the oldest pack, and we sort
+# the packs by reverse mtime inside git).
+repack_into_n () {
+ rm -rf staging &&
+ mkdir staging &&
+
+ git rev-list --first-parent HEAD |
+ sed -n '1~5p' |
+ head -n "$1" |
+ perl -e 'print reverse <>' \
+ >pushes
+
+ # create base packfile
+ head -n 1 pushes |
+ git pack-objects --delta-base-offset --revs staging/pack
+
+ # and then incrementals between each pair of commits
+ last= &&
+ while read rev
+ do
+ if test -n "$last"; then
+ {
+ echo "$rev" &&
+ echo "^$last"
+ } |
+ git pack-objects --delta-base-offset --revs \
+ staging/pack || return 1
+ fi
+ last=$rev
+ done <pushes &&
+
+ # and install the whole thing
+ rm -f .git/objects/pack/* &&
+ mv staging/* .git/objects/pack/
+}
+
+# Pretend we just have a single branch and no reflogs, and that everything is
+# in objects/pack; that makes our fake pack-building via repack_into_n()
+# much simpler.
+test_expect_success 'simplify reachability' '
+ tip=$(git rev-parse --verify HEAD) &&
+ git for-each-ref --format="option no-deref%0adelete %(refname)" |
+ git update-ref --stdin &&
+ rm -rf .git/logs &&
+ git update-ref refs/heads/master $tip &&
+ git symbolic-ref HEAD refs/heads/master &&
+ git repack -ad
+'
+
+for nr_packs in 1 50 1000
+do
+ test_expect_success "create $nr_packs-pack scenario" '
+ repack_into_n $nr_packs
+ '
+
+ test_perf "rev-list ($nr_packs)" '
+ git rev-list --objects --all >/dev/null
+ '
+
+ # This simulates the interesting part of the repack, which is the
+ # actual pack generation, without smudging the on-disk setup
+ # between trials.
+ test_perf "repack ($nr_packs)" '
+ git pack-objects --keep-true-parents \
+ --honor-pack-keep --non-empty --all \
+ --reflog --indexed-objects --delta-base-offset \
+ --stdout </dev/null >/dev/null
+ '
+done
+
+test_done
diff --git a/t/perf/p5550-fetch-tags.sh b/t/perf/p5550-fetch-tags.sh
new file mode 100755
index 0000000..a5dc39f
--- /dev/null
+++ b/t/perf/p5550-fetch-tags.sh
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+test_description='performance of tag-following with many tags
+
+This tests a fairly pathological case, so rather than rely on a real-world
+case, we will construct our own repository. The situation is roughly as
+follows.
+
+The parent repository has a large number of tags which are disconnected from
+the rest of history. That makes them candidates for tag-following, but we never
+actually grab them (and thus they will impact each subsequent fetch).
+
+The child repository is a clone of parent, without the tags, and is at least
+one commit behind the parent (meaning that we will fetch one object and then
+examine the tags to see if they need followed). Furthermore, it has a large
+number of packs.
+
+The exact values of "large" here are somewhat arbitrary; I picked values that
+start to show a noticeable performance problem on my machine, but without
+taking too long to set up and run the tests.
+'
+. ./perf-lib.sh
+
+# make a long nonsense history on branch $1, consisting of $2 commits, each
+# with a unique file pointing to the blob at $2.
+create_history () {
+ perl -le '
+ my ($branch, $n, $blob) = @ARGV;
+ for (1..$n) {
+ print "commit refs/heads/$branch";
+ print "committer nobody <nobody@example.com> now";
+ print "data 4";
+ print "foo";
+ print "M 100644 $blob $_";
+ }
+ ' "$@" |
+ git fast-import --date-format=now
+}
+
+# make a series of tags, one per commit in the revision range given by $@
+create_tags () {
+ git rev-list "$@" |
+ perl -lne 'print "create refs/tags/$. $_"' |
+ git update-ref --stdin
+}
+
+# create $1 nonsense packs, each with a single blob
+create_packs () {
+ perl -le '
+ my ($n) = @ARGV;
+ for (1..$n) {
+ print "blob";
+ print "data <<EOF";
+ print "$_";
+ print "EOF";
+ }
+ ' "$@" |
+ git fast-import &&
+
+ git cat-file --batch-all-objects --batch-check='%(objectname)' |
+ while read sha1
+ do
+ echo $sha1 | git pack-objects .git/objects/pack/pack
+ done
+}
+
+test_expect_success 'create parent and child' '
+ git init parent &&
+ git -C parent commit --allow-empty -m base &&
+ git clone parent child &&
+ git -C parent commit --allow-empty -m trigger-fetch
+'
+
+test_expect_success 'populate parent tags' '
+ (
+ cd parent &&
+ blob=$(echo content | git hash-object -w --stdin) &&
+ create_history cruft 3000 $blob &&
+ create_tags cruft &&
+ git branch -D cruft
+ )
+'
+
+test_expect_success 'create child packs' '
+ (
+ cd child &&
+ git config gc.auto 0 &&
+ git config gc.autopacklimit 0 &&
+ create_packs 500
+ )
+'
+
+test_perf 'fetch' '
+ # make sure there is something to fetch on each iteration
+ git -C child update-ref -d refs/remotes/origin/master &&
+ git -C child fetch
+'
+
+test_done
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index 773f955..46f08ee 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -52,6 +52,9 @@ TEST_NO_MALLOC_CHECK=t
# need to export them for test_perf subshells
export TEST_DIRECTORY TRASH_DIRECTORY GIT_BUILD_DIR GIT_TEST_CMP
+MODERN_GIT=$GIT_BUILD_DIR/bin-wrappers/git
+export MODERN_GIT
+
perf_results_dir=$TEST_OUTPUT_DIRECTORY/test-results
mkdir -p "$perf_results_dir"
rm -f "$perf_results_dir"/$(basename "$0" .sh).subtests
@@ -81,7 +84,7 @@ test_perf_create_repo_from () {
repo="$1"
source="$2"
source_git="$(git -C "$source" rev-parse --git-dir)"
- objects_dir="$(git -C "$source" rev-parse --git-path objects)"
+ objects_dir="$("$MODERN_GIT" -C "$source" rev-parse --git-path objects)"
mkdir -p "$repo/.git"
(
cd "$source" &&
diff --git a/t/perf/run b/t/perf/run
index cfd7012..e8adeda 100755
--- a/t/perf/run
+++ b/t/perf/run
@@ -30,7 +30,13 @@ unpack_git_rev () {
}
build_git_rev () {
rev=$1
- cp ../../config.mak build/$rev/config.mak
+ for config in config.mak config.mak.autogen config.status
+ do
+ if test -e "../../$config"
+ then
+ cp "../../$config" "build/$rev/"
+ fi
+ done
(cd build/$rev && make $GIT_PERF_MAKE_OPTS) ||
die "failed to build revision '$mydir'"
}
diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
index b425f3a..d27f438 100755
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -34,7 +34,7 @@ expect_from_stdin () {
test_stderr () {
expected="$1"
expect_in stderr "$1" &&
- test_cmp "$HOME/expected-stderr" "$HOME/stderr"
+ test_i18ncmp "$HOME/expected-stderr" "$HOME/stderr"
}
broken_c_unquote () {
@@ -47,7 +47,7 @@ broken_c_unquote_verbose () {
stderr_contains () {
regexp="$1"
- if grep "$regexp" "$HOME/stderr"
+ if test_i18ngrep "$regexp" "$HOME/stderr"
then
return 0
else
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
index 2860d2d..90db54c 100755
--- a/t/t0027-auto-crlf.sh
+++ b/t/t0027-auto-crlf.sh
@@ -119,8 +119,7 @@ commit_chk_wrnNNO () {
fname=${pfx}_$f.txt &&
cp $f $fname &&
printf Z >>"$fname" &&
- git -c core.autocrlf=$crlf add $fname 2>/dev/null &&
- git -c core.autocrlf=$crlf commit -m "commit_$fname" $fname >"${pfx}_$f.err" 2>&1
+ git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err"
done
test_expect_success "commit NNO files crlf=$crlf attr=$attr LF" '
@@ -417,7 +416,8 @@ commit_chk_wrnNNO "text" "" false "$WILC" "$WICL" "$WAMIX" "$WILC
commit_chk_wrnNNO "text" "" true LF_CRLF "" LF_CRLF LF_CRLF ""
commit_chk_wrnNNO "text" "" input "" CRLF_LF CRLF_LF "" CRLF_LF
-test_expect_success 'create files cleanup' '
+test_expect_success 'commit NNO and cleanup' '
+ git commit -m "commit files on top of NNO" &&
rm -f *.txt &&
git -c core.autocrlf=false reset --hard
'
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index db5f60d..74d2cd7 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -208,32 +208,15 @@ test_expect_success 'unambiguously abbreviated option' '
'
test_expect_success 'unambiguously abbreviated option with "="' '
- test-parse-options --int=2 >output 2>output.err &&
- test_must_be_empty output.err &&
- test_cmp expect output
+ test-parse-options --expect="integer: 2" --int=2
'
test_expect_success 'ambiguously abbreviated option' '
test_expect_code 129 test-parse-options --strin 123
'
-cat >expect <<\EOF
-boolean: 0
-integer: 0
-magnitude: 0
-timestamp: 0
-string: 123
-abbrev: 7
-verbose: -1
-quiet: 0
-dry run: no
-file: (not set)
-EOF
-
test_expect_success 'non ambiguous option (after two options it abbreviates)' '
- test-parse-options --st 123 >output 2>output.err &&
- test_must_be_empty output.err &&
- test_cmp expect output
+ test-parse-options --expect="string: 123" --st 123
'
cat >typo.err <<\EOF
@@ -256,24 +239,8 @@ test_expect_success 'detect possible typos' '
test_cmp typo.err output.err
'
-cat >expect <<\EOF
-boolean: 0
-integer: 0
-magnitude: 0
-timestamp: 0
-string: (not set)
-abbrev: 7
-verbose: -1
-quiet: 0
-dry run: no
-file: (not set)
-arg 00: --quux
-EOF
-
test_expect_success 'keep some options as arguments' '
- test-parse-options --quux >output 2>output.err &&
- test_must_be_empty output.err &&
- test_cmp expect output
+ test-parse-options --expect="arg 00: --quux" --quux
'
cat >expect <<\EOF
@@ -350,54 +317,20 @@ test_expect_success 'OPT_NEGBIT() and OPT_SET_INT() work' '
test_cmp expect output
'
-cat >expect <<\EOF
-boolean: 6
-integer: 0
-magnitude: 0
-timestamp: 0
-string: (not set)
-abbrev: 7
-verbose: -1
-quiet: 0
-dry run: no
-file: (not set)
-EOF
-
test_expect_success 'OPT_BIT() works' '
- test-parse-options -bb --or4 >output 2>output.err &&
- test_must_be_empty output.err &&
- test_cmp expect output
+ test-parse-options --expect="boolean: 6" -bb --or4
'
test_expect_success 'OPT_NEGBIT() works' '
- test-parse-options -bb --no-neg-or4 >output 2>output.err &&
- test_must_be_empty output.err &&
- test_cmp expect output
+ test-parse-options --expect="boolean: 6" -bb --no-neg-or4
'
test_expect_success 'OPT_COUNTUP() with PARSE_OPT_NODASH works' '
- test-parse-options + + + + + + >output 2>output.err &&
- test_must_be_empty output.err &&
- test_cmp expect output
+ test-parse-options --expect="boolean: 6" + + + + + +
'
-cat >expect <<\EOF
-boolean: 0
-integer: 12345
-magnitude: 0
-timestamp: 0
-string: (not set)
-abbrev: 7
-verbose: -1
-quiet: 0
-dry run: no
-file: (not set)
-EOF
-
test_expect_success 'OPT_NUMBER_CALLBACK() works' '
- test-parse-options -12345 >output 2>output.err &&
- test_must_be_empty output.err &&
- test_cmp expect output
+ test-parse-options --expect="integer: 12345" -12345
'
cat >expect <<\EOF
@@ -435,118 +368,28 @@ test_expect_success '--no-list resets list' '
test_cmp expect output
'
-cat >expect <<\EOF
-boolean: 0
-integer: 0
-magnitude: 0
-timestamp: 0
-string: (not set)
-abbrev: 7
-verbose: -1
-quiet: 3
-dry run: no
-file: (not set)
-EOF
-
test_expect_success 'multiple quiet levels' '
- test-parse-options -q -q -q >output 2>output.err &&
- test_must_be_empty output.err &&
- test_cmp expect output
+ test-parse-options --expect="quiet: 3" -q -q -q
'
-cat >expect <<\EOF
-boolean: 0
-integer: 0
-magnitude: 0
-timestamp: 0
-string: (not set)
-abbrev: 7
-verbose: 3
-quiet: 0
-dry run: no
-file: (not set)
-EOF
-
test_expect_success 'multiple verbose levels' '
- test-parse-options -v -v -v >output 2>output.err &&
- test_must_be_empty output.err &&
- test_cmp expect output
+ test-parse-options --expect="verbose: 3" -v -v -v
'
-cat >expect <<\EOF
-boolean: 0
-integer: 0
-magnitude: 0
-timestamp: 0
-string: (not set)
-abbrev: 7
-verbose: -1
-quiet: 0
-dry run: no
-file: (not set)
-EOF
-
test_expect_success '--no-quiet sets --quiet to 0' '
- test-parse-options --no-quiet >output 2>output.err &&
- test_must_be_empty output.err &&
- test_cmp expect output
+ test-parse-options --expect="quiet: 0" --no-quiet
'
-cat >expect <<\EOF
-boolean: 0
-integer: 0
-magnitude: 0
-timestamp: 0
-string: (not set)
-abbrev: 7
-verbose: -1
-quiet: 0
-dry run: no
-file: (not set)
-EOF
-
test_expect_success '--no-quiet resets multiple -q to 0' '
- test-parse-options -q -q -q --no-quiet >output 2>output.err &&
- test_must_be_empty output.err &&
- test_cmp expect output
+ test-parse-options --expect="quiet: 0" -q -q -q --no-quiet
'
-cat >expect <<\EOF
-boolean: 0
-integer: 0
-magnitude: 0
-timestamp: 0
-string: (not set)
-abbrev: 7
-verbose: 0
-quiet: 0
-dry run: no
-file: (not set)
-EOF
-
test_expect_success '--no-verbose sets verbose to 0' '
- test-parse-options --no-verbose >output 2>output.err &&
- test_must_be_empty output.err &&
- test_cmp expect output
+ test-parse-options --expect="verbose: 0" --no-verbose
'
-cat >expect <<\EOF
-boolean: 0
-integer: 0
-magnitude: 0
-timestamp: 0
-string: (not set)
-abbrev: 7
-verbose: 0
-quiet: 0
-dry run: no
-file: (not set)
-EOF
-
test_expect_success '--no-verbose resets multiple verbose to 0' '
- test-parse-options -v -v -v --no-verbose >output 2>output.err &&
- test_must_be_empty output.err &&
- test_cmp expect output
+ test-parse-options --expect="verbose: 0" -v -v -v --no-verbose
'
test_done
diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index 4f38078..b19f332 100755
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -231,7 +231,7 @@ $tag_content
| git cat-file --batch)"
'
-test_expect_success "--batch-check for an emtpy line" '
+test_expect_success "--batch-check for an empty line" '
test " missing" = "$(echo | git cat-file --batch-check)"
'
diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh
index 81e85e0..c167f60 100755
--- a/t/t1011-read-tree-sparse-checkout.sh
+++ b/t/t1011-read-tree-sparse-checkout.sh
@@ -247,7 +247,7 @@ error: The following untracked working tree files would be overwritten by checko
Please move or remove them before you switch branches.
Aborting
EOF
- test_cmp expected actual
+ test_i18ncmp expected actual
'
test_expect_success 'checkout without --ignore-skip-worktree-bits' '
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index d934a24..923bfc5 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -886,7 +886,7 @@ test_expect_success !MINGW 'get --path copes with unset $HOME' '
git config --get --path path.normal >>result &&
git config --get --path path.trailingtilde >>result
) &&
- grep "[Ff]ailed to expand.*~/" msg &&
+ test_i18ngrep "[Ff]ailed to expand.*~/" msg &&
test_cmp expect result
'
@@ -1126,7 +1126,7 @@ test_expect_success 'barf on syntax error' '
key garbage
EOF
test_must_fail git config --get section.key >actual 2>error &&
- grep " line 3 " error
+ test_i18ngrep " line 3 " error
'
test_expect_success 'barf on incomplete section header' '
@@ -1136,7 +1136,7 @@ test_expect_success 'barf on incomplete section header' '
key = value
EOF
test_must_fail git config --get section.key >actual 2>error &&
- grep " line 2 " error
+ test_i18ngrep " line 2 " error
'
test_expect_success 'barf on incomplete string' '
@@ -1146,7 +1146,7 @@ test_expect_success 'barf on incomplete string' '
key = "value string
EOF
test_must_fail git config --get section.key >actual 2>error &&
- grep " line 3 " error
+ test_i18ngrep " line 3 " error
'
test_expect_success 'urlmatch' '
diff --git a/t/t1307-config-blob.sh b/t/t1307-config-blob.sh
index 3c6791e..eed31ff 100755
--- a/t/t1307-config-blob.sh
+++ b/t/t1307-config-blob.sh
@@ -61,10 +61,7 @@ test_expect_success 'parse errors in blobs are properly attributed' '
git commit -m broken &&
test_must_fail git config --blob=HEAD:config some.value 2>err &&
-
- # just grep for our token as the exact error message is likely to
- # change or be internationalized
- grep "HEAD:config" err
+ test_i18ngrep "HEAD:config" err
'
test_expect_success 'can parse blob ending with CR' '
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 005d66d..7655c94 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -197,14 +197,14 @@ test_expect_success 'proper error on error in default config files' '
echo "[" >>.git/config &&
echo "fatal: bad config line 34 in file .git/config" >expect &&
test_expect_code 128 test-config get_value foo.bar 2>actual &&
- test_cmp expect actual
+ test_i18ncmp expect actual
'
test_expect_success 'proper error on error in custom config files' '
echo "[" >>syntax-error &&
echo "fatal: bad config line 1 in file syntax-error" >expect &&
test_expect_code 128 test-config configset_get_value foo.bar syntax-error 2>actual &&
- test_cmp expect actual
+ test_i18ncmp expect actual
'
test_expect_success 'check line errors for malformed values' '
@@ -229,4 +229,39 @@ test_expect_success 'error on modifying repo config without repo' '
)
'
+cmdline_config="'foo.bar=from-cmdline'"
+test_expect_success 'iteration shows correct origins' '
+ echo "[foo]bar = from-repo" >.git/config &&
+ echo "[foo]bar = from-home" >.gitconfig &&
+ if test_have_prereq MINGW
+ then
+ # Use Windows path (i.e. *not* $HOME)
+ HOME_GITCONFIG=$(pwd)/.gitconfig
+ else
+ # Do not get fooled by symbolic links, i.e. $HOME != $(pwd)
+ HOME_GITCONFIG=$HOME/.gitconfig
+ fi &&
+ cat >expect <<-EOF &&
+ key=foo.bar
+ value=from-home
+ origin=file
+ name=$HOME_GITCONFIG
+ scope=global
+
+ key=foo.bar
+ value=from-repo
+ origin=file
+ name=.git/config
+ scope=repo
+
+ key=foo.bar
+ value=from-cmdline
+ origin=command line
+ name=
+ scope=cmdline
+ EOF
+ GIT_CONFIG_PARAMETERS=$cmdline_config test-config iterate >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t1350-config-hooks-path.sh b/t/t1350-config-hooks-path.sh
index 5e3fb3a..f1f9aee 100755
--- a/t/t1350-config-hooks-path.sh
+++ b/t/t1350-config-hooks-path.sh
@@ -34,4 +34,10 @@ test_expect_success 'Check that various forms of specifying core.hooksPath work'
test_cmp expect actual
'
+test_expect_success 'git rev-parse --git-path hooks' '
+ git config core.hooksPath .git/custom-hooks &&
+ git rev-parse --git-path hooks/abc >actual &&
+ test .git/custom-hooks/abc = "$(cat actual)"
+'
+
test_done
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index af1b20d..d4fb977 100755
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -23,7 +23,7 @@ test_expect_success setup '
m=refs/heads/master
n_dir=refs/heads/gu
n=$n_dir/fixes
-outside=foo
+outside=refs/foo
test_expect_success \
"create $m" \
@@ -361,7 +361,7 @@ test_expect_success 'stdin test setup' '
test_expect_success '-z fails without --stdin' '
test_must_fail git update-ref -z $m $m $m 2>err &&
- grep "usage: git update-ref" err
+ test_i18ngrep "usage: git update-ref" err
'
test_expect_success 'stdin works with no input' '
@@ -479,7 +479,7 @@ test_expect_success 'stdin fails with duplicate refs' '
create $a $m
EOF
test_must_fail git update-ref --stdin <stdin 2>err &&
- grep "fatal: Multiple updates for ref '"'"'$a'"'"' not allowed." err
+ grep "fatal: multiple updates for ref '"'"'$a'"'"' not allowed." err
'
test_expect_success 'stdin create ref works' '
@@ -880,7 +880,7 @@ test_expect_success 'stdin -z fails option with unknown name' '
test_expect_success 'stdin -z fails with duplicate refs' '
printf $F "create $a" "$m" "create $b" "$m" "create $a" "$m" >stdin &&
test_must_fail git update-ref -z --stdin <stdin 2>err &&
- grep "fatal: Multiple updates for ref '"'"'$a'"'"' not allowed." err
+ grep "fatal: multiple updates for ref '"'"'$a'"'"' not allowed." err
'
test_expect_success 'stdin -z create ref works' '
@@ -1102,6 +1102,41 @@ test_expect_success 'stdin -z delete refs works with packed and loose refs' '
test_must_fail git rev-parse --verify -q $c
'
+test_expect_success 'fails with duplicate HEAD update' '
+ git branch target1 $A &&
+ git checkout target1 &&
+ cat >stdin <<-EOF &&
+ update refs/heads/target1 $C
+ option no-deref
+ update HEAD $B
+ EOF
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: multiple updates for '\''HEAD'\'' (including one via its referent .refs/heads/target1.) are not allowed" err &&
+ echo "refs/heads/target1" >expect &&
+ git symbolic-ref HEAD >actual &&
+ test_cmp expect actual &&
+ echo "$A" >expect &&
+ git rev-parse refs/heads/target1 >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'fails with duplicate ref update via symref' '
+ git branch target2 $A &&
+ git symbolic-ref refs/heads/symref2 refs/heads/target2 &&
+ cat >stdin <<-EOF &&
+ update refs/heads/target2 $C
+ update refs/heads/symref2 $B
+ EOF
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: multiple updates for '\''refs/heads/target2'\'' (including one via symref .refs/heads/symref2.) are not allowed" err &&
+ echo "refs/heads/target2" >expect &&
+ git symbolic-ref refs/heads/symref2 >actual &&
+ test_cmp expect actual &&
+ echo "$A" >expect &&
+ git rev-parse refs/heads/target2 >actual &&
+ test_cmp expect actual
+'
+
run_with_limited_open_files () {
(ulimit -n 32 && "$@")
}
diff --git a/t/t1401-symbolic-ref.sh b/t/t1401-symbolic-ref.sh
index ca3fa40..eec3e90 100755
--- a/t/t1401-symbolic-ref.sh
+++ b/t/t1401-symbolic-ref.sh
@@ -33,18 +33,25 @@ test_expect_success 'symbolic-ref refuses bare sha1' '
'
reset_to_sane
-test_expect_success 'symbolic-ref deletes HEAD' '
- git symbolic-ref -d HEAD &&
+test_expect_success 'HEAD cannot be removed' '
+ test_must_fail git symbolic-ref -d HEAD
+'
+
+reset_to_sane
+
+test_expect_success 'symbolic-ref can be deleted' '
+ git symbolic-ref NOTHEAD refs/heads/foo &&
+ git symbolic-ref -d NOTHEAD &&
test_path_is_file .git/refs/heads/foo &&
- test_path_is_missing .git/HEAD
+ test_path_is_missing .git/NOTHEAD
'
reset_to_sane
-test_expect_success 'symbolic-ref deletes dangling HEAD' '
- git symbolic-ref HEAD refs/heads/missing &&
- git symbolic-ref -d HEAD &&
+test_expect_success 'symbolic-ref can delete dangling symref' '
+ git symbolic-ref NOTHEAD refs/heads/missing &&
+ git symbolic-ref -d NOTHEAD &&
test_path_is_missing .git/refs/heads/missing &&
- test_path_is_missing .git/HEAD
+ test_path_is_missing .git/NOTHEAD
'
reset_to_sane
diff --git a/t/t1404-update-ref-df-conflicts.sh b/t/t1404-update-ref-df-conflicts.sh
deleted file mode 100755
index 66bafb5..0000000
--- a/t/t1404-update-ref-df-conflicts.sh
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-
-test_description='Test git update-ref with D/F conflicts'
-. ./test-lib.sh
-
-test_update_rejected () {
- prefix="$1" &&
- before="$2" &&
- pack="$3" &&
- create="$4" &&
- error="$5" &&
- printf "create $prefix/%s $C\n" $before |
- git update-ref --stdin &&
- git for-each-ref $prefix >unchanged &&
- if $pack
- then
- git pack-refs --all
- fi &&
- printf "create $prefix/%s $C\n" $create >input &&
- test_must_fail git update-ref --stdin <input 2>output.err &&
- grep -F "$error" output.err &&
- git for-each-ref $prefix >actual &&
- test_cmp unchanged actual
-}
-
-Q="'"
-
-test_expect_success 'setup' '
-
- git commit --allow-empty -m Initial &&
- C=$(git rev-parse HEAD)
-
-'
-
-test_expect_success 'existing loose ref is a simple prefix of new' '
-
- prefix=refs/1l &&
- test_update_rejected $prefix "a c e" false "b c/x d" \
- "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
-
-'
-
-test_expect_success 'existing packed ref is a simple prefix of new' '
-
- prefix=refs/1p &&
- test_update_rejected $prefix "a c e" true "b c/x d" \
- "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
-
-'
-
-test_expect_success 'existing loose ref is a deeper prefix of new' '
-
- prefix=refs/2l &&
- test_update_rejected $prefix "a c e" false "b c/x/y d" \
- "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
-
-'
-
-test_expect_success 'existing packed ref is a deeper prefix of new' '
-
- prefix=refs/2p &&
- test_update_rejected $prefix "a c e" true "b c/x/y d" \
- "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
-
-'
-
-test_expect_success 'new ref is a simple prefix of existing loose' '
-
- prefix=refs/3l &&
- test_update_rejected $prefix "a c/x e" false "b c d" \
- "$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
-
-'
-
-test_expect_success 'new ref is a simple prefix of existing packed' '
-
- prefix=refs/3p &&
- test_update_rejected $prefix "a c/x e" true "b c d" \
- "$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
-
-'
-
-test_expect_success 'new ref is a deeper prefix of existing loose' '
-
- prefix=refs/4l &&
- test_update_rejected $prefix "a c/x/y e" false "b c d" \
- "$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
-
-'
-
-test_expect_success 'new ref is a deeper prefix of existing packed' '
-
- prefix=refs/4p &&
- test_update_rejected $prefix "a c/x/y e" true "b c d" \
- "$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
-
-'
-
-test_expect_success 'one new ref is a simple prefix of another' '
-
- prefix=refs/5 &&
- test_update_rejected $prefix "a e" false "b c c/x d" \
- "cannot process $Q$prefix/c$Q and $Q$prefix/c/x$Q at the same time"
-
-'
-
-test_done
diff --git a/t/t1404-update-ref-errors.sh b/t/t1404-update-ref-errors.sh
new file mode 100755
index 0000000..c34ece4
--- /dev/null
+++ b/t/t1404-update-ref-errors.sh
@@ -0,0 +1,407 @@
+#!/bin/sh
+
+test_description='Test git update-ref error handling'
+. ./test-lib.sh
+
+# Create some references, perhaps run pack-refs --all, then try to
+# create some more references. Ensure that the second creation fails
+# with the correct error message.
+# Usage: test_update_rejected <before> <pack> <create> <error>
+# <before> is a ws-separated list of refs to create before the test
+# <pack> (true or false) tells whether to pack the refs before the test
+# <create> is a list of variables to attempt creating
+# <error> is a string to look for in the stderr of update-ref.
+# All references are created in the namespace specified by the current
+# value of $prefix.
+test_update_rejected () {
+ before="$1" &&
+ pack="$2" &&
+ create="$3" &&
+ error="$4" &&
+ printf "create $prefix/%s $C\n" $before |
+ git update-ref --stdin &&
+ git for-each-ref $prefix >unchanged &&
+ if $pack
+ then
+ git pack-refs --all
+ fi &&
+ printf "create $prefix/%s $C\n" $create >input &&
+ test_must_fail git update-ref --stdin <input 2>output.err &&
+ grep -F "$error" output.err &&
+ git for-each-ref $prefix >actual &&
+ test_cmp unchanged actual
+}
+
+Q="'"
+
+test_expect_success 'setup' '
+
+ git commit --allow-empty -m Initial &&
+ C=$(git rev-parse HEAD) &&
+ git commit --allow-empty -m Second &&
+ D=$(git rev-parse HEAD) &&
+ git commit --allow-empty -m Third &&
+ E=$(git rev-parse HEAD)
+'
+
+test_expect_success 'existing loose ref is a simple prefix of new' '
+
+ prefix=refs/1l &&
+ test_update_rejected "a c e" false "b c/x d" \
+ "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
+
+'
+
+test_expect_success 'existing packed ref is a simple prefix of new' '
+
+ prefix=refs/1p &&
+ test_update_rejected "a c e" true "b c/x d" \
+ "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
+
+'
+
+test_expect_success 'existing loose ref is a deeper prefix of new' '
+
+ prefix=refs/2l &&
+ test_update_rejected "a c e" false "b c/x/y d" \
+ "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
+
+'
+
+test_expect_success 'existing packed ref is a deeper prefix of new' '
+
+ prefix=refs/2p &&
+ test_update_rejected "a c e" true "b c/x/y d" \
+ "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
+
+'
+
+test_expect_success 'new ref is a simple prefix of existing loose' '
+
+ prefix=refs/3l &&
+ test_update_rejected "a c/x e" false "b c d" \
+ "$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
+
+'
+
+test_expect_success 'new ref is a simple prefix of existing packed' '
+
+ prefix=refs/3p &&
+ test_update_rejected "a c/x e" true "b c d" \
+ "$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
+
+'
+
+test_expect_success 'new ref is a deeper prefix of existing loose' '
+
+ prefix=refs/4l &&
+ test_update_rejected "a c/x/y e" false "b c d" \
+ "$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
+
+'
+
+test_expect_success 'new ref is a deeper prefix of existing packed' '
+
+ prefix=refs/4p &&
+ test_update_rejected "a c/x/y e" true "b c d" \
+ "$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
+
+'
+
+test_expect_success 'one new ref is a simple prefix of another' '
+
+ prefix=refs/5 &&
+ test_update_rejected "a e" false "b c c/x d" \
+ "cannot process $Q$prefix/c$Q and $Q$prefix/c/x$Q at the same time"
+
+'
+
+test_expect_success 'empty directory should not fool rev-parse' '
+ prefix=refs/e-rev-parse &&
+ git update-ref $prefix/foo $C &&
+ git pack-refs --all &&
+ mkdir -p .git/$prefix/foo/bar/baz &&
+ echo "$C" >expected &&
+ git rev-parse $prefix/foo >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'empty directory should not fool for-each-ref' '
+ prefix=refs/e-for-each-ref &&
+ git update-ref $prefix/foo $C &&
+ git for-each-ref $prefix >expected &&
+ git pack-refs --all &&
+ mkdir -p .git/$prefix/foo/bar/baz &&
+ git for-each-ref $prefix >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'empty directory should not fool create' '
+ prefix=refs/e-create &&
+ mkdir -p .git/$prefix/foo/bar/baz &&
+ printf "create %s $C\n" $prefix/foo |
+ git update-ref --stdin
+'
+
+test_expect_success 'empty directory should not fool verify' '
+ prefix=refs/e-verify &&
+ git update-ref $prefix/foo $C &&
+ git pack-refs --all &&
+ mkdir -p .git/$prefix/foo/bar/baz &&
+ printf "verify %s $C\n" $prefix/foo |
+ git update-ref --stdin
+'
+
+test_expect_success 'empty directory should not fool 1-arg update' '
+ prefix=refs/e-update-1 &&
+ git update-ref $prefix/foo $C &&
+ git pack-refs --all &&
+ mkdir -p .git/$prefix/foo/bar/baz &&
+ printf "update %s $D\n" $prefix/foo |
+ git update-ref --stdin
+'
+
+test_expect_success 'empty directory should not fool 2-arg update' '
+ prefix=refs/e-update-2 &&
+ git update-ref $prefix/foo $C &&
+ git pack-refs --all &&
+ mkdir -p .git/$prefix/foo/bar/baz &&
+ printf "update %s $D $C\n" $prefix/foo |
+ git update-ref --stdin
+'
+
+test_expect_success 'empty directory should not fool 0-arg delete' '
+ prefix=refs/e-delete-0 &&
+ git update-ref $prefix/foo $C &&
+ git pack-refs --all &&
+ mkdir -p .git/$prefix/foo/bar/baz &&
+ printf "delete %s\n" $prefix/foo |
+ git update-ref --stdin
+'
+
+test_expect_success 'empty directory should not fool 1-arg delete' '
+ prefix=refs/e-delete-1 &&
+ git update-ref $prefix/foo $C &&
+ git pack-refs --all &&
+ mkdir -p .git/$prefix/foo/bar/baz &&
+ printf "delete %s $C\n" $prefix/foo |
+ git update-ref --stdin
+'
+
+# Test various errors when reading the old values of references...
+
+test_expect_success 'missing old value blocks update' '
+ prefix=refs/missing-update &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q
+ EOF
+ printf "%s\n" "update $prefix/foo $E $D" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err
+'
+
+test_expect_success 'incorrect old value blocks update' '
+ prefix=refs/incorrect-update &&
+ git update-ref $prefix/foo $C &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/foo$Q: is at $C but expected $D
+ EOF
+ printf "%s\n" "update $prefix/foo $E $D" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err
+'
+
+test_expect_success 'existing old value blocks create' '
+ prefix=refs/existing-create &&
+ git update-ref $prefix/foo $C &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/foo$Q: reference already exists
+ EOF
+ printf "%s\n" "create $prefix/foo $E" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err
+'
+
+test_expect_success 'incorrect old value blocks delete' '
+ prefix=refs/incorrect-delete &&
+ git update-ref $prefix/foo $C &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/foo$Q: is at $C but expected $D
+ EOF
+ printf "%s\n" "delete $prefix/foo $D" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err
+'
+
+test_expect_success 'missing old value blocks indirect update' '
+ prefix=refs/missing-indirect-update &&
+ git symbolic-ref $prefix/symref $prefix/foo &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q
+ EOF
+ printf "%s\n" "update $prefix/symref $E $D" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err
+'
+
+test_expect_success 'incorrect old value blocks indirect update' '
+ prefix=refs/incorrect-indirect-update &&
+ git symbolic-ref $prefix/symref $prefix/foo &&
+ git update-ref $prefix/foo $C &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
+ EOF
+ printf "%s\n" "update $prefix/symref $E $D" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err
+'
+
+test_expect_success 'existing old value blocks indirect create' '
+ prefix=refs/existing-indirect-create &&
+ git symbolic-ref $prefix/symref $prefix/foo &&
+ git update-ref $prefix/foo $C &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/symref$Q: reference already exists
+ EOF
+ printf "%s\n" "create $prefix/symref $E" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err
+'
+
+test_expect_success 'incorrect old value blocks indirect delete' '
+ prefix=refs/incorrect-indirect-delete &&
+ git symbolic-ref $prefix/symref $prefix/foo &&
+ git update-ref $prefix/foo $C &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
+ EOF
+ printf "%s\n" "delete $prefix/symref $D" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err
+'
+
+test_expect_success 'missing old value blocks indirect no-deref update' '
+ prefix=refs/missing-noderef-update &&
+ git symbolic-ref $prefix/symref $prefix/foo &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/symref$Q: reference is missing but expected $D
+ EOF
+ printf "%s\n" "option no-deref" "update $prefix/symref $E $D" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err
+'
+
+test_expect_success 'incorrect old value blocks indirect no-deref update' '
+ prefix=refs/incorrect-noderef-update &&
+ git symbolic-ref $prefix/symref $prefix/foo &&
+ git update-ref $prefix/foo $C &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
+ EOF
+ printf "%s\n" "option no-deref" "update $prefix/symref $E $D" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err
+'
+
+test_expect_success 'existing old value blocks indirect no-deref create' '
+ prefix=refs/existing-noderef-create &&
+ git symbolic-ref $prefix/symref $prefix/foo &&
+ git update-ref $prefix/foo $C &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/symref$Q: reference already exists
+ EOF
+ printf "%s\n" "option no-deref" "create $prefix/symref $E" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err
+'
+
+test_expect_success 'incorrect old value blocks indirect no-deref delete' '
+ prefix=refs/incorrect-noderef-delete &&
+ git symbolic-ref $prefix/symref $prefix/foo &&
+ git update-ref $prefix/foo $C &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
+ EOF
+ printf "%s\n" "option no-deref" "delete $prefix/symref $D" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err
+'
+
+test_expect_success 'non-empty directory blocks create' '
+ prefix=refs/ne-create &&
+ mkdir -p .git/$prefix/foo/bar &&
+ : >.git/$prefix/foo/bar/baz.lock &&
+ test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/foo$Q: there is a non-empty directory $Q.git/$prefix/foo$Q blocking reference $Q$prefix/foo$Q
+ EOF
+ printf "%s\n" "update $prefix/foo $C" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q
+ EOF
+ printf "%s\n" "update $prefix/foo $D $C" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err
+'
+
+test_expect_success 'broken reference blocks create' '
+ prefix=refs/broken-create &&
+ mkdir -p .git/$prefix &&
+ echo "gobbledigook" >.git/$prefix/foo &&
+ test_when_finished "rm -f .git/$prefix/foo" &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken
+ EOF
+ printf "%s\n" "update $prefix/foo $C" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken
+ EOF
+ printf "%s\n" "update $prefix/foo $D $C" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err
+'
+
+test_expect_success 'non-empty directory blocks indirect create' '
+ prefix=refs/ne-indirect-create &&
+ git symbolic-ref $prefix/symref $prefix/foo &&
+ mkdir -p .git/$prefix/foo/bar &&
+ : >.git/$prefix/foo/bar/baz.lock &&
+ test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/symref$Q: there is a non-empty directory $Q.git/$prefix/foo$Q blocking reference $Q$prefix/foo$Q
+ EOF
+ printf "%s\n" "update $prefix/symref $C" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q
+ EOF
+ printf "%s\n" "update $prefix/symref $D $C" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err
+'
+
+test_expect_success 'broken reference blocks indirect create' '
+ prefix=refs/broken-indirect-create &&
+ git symbolic-ref $prefix/symref $prefix/foo &&
+ echo "gobbledigook" >.git/$prefix/foo &&
+ test_when_finished "rm -f .git/$prefix/foo" &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken
+ EOF
+ printf "%s\n" "update $prefix/symref $C" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err &&
+ cat >expected <<-EOF &&
+ fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken
+ EOF
+ printf "%s\n" "update $prefix/symref $D $C" |
+ test_must_fail git update-ref --stdin 2>output.err &&
+ test_cmp expected output.err
+'
+
+test_done
diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh
index 25ddab4..8937e25 100755
--- a/t/t1430-bad-ref-name.sh
+++ b/t/t1430-bad-ref-name.sh
@@ -285,7 +285,7 @@ test_expect_success 'update-ref -d cannot delete non-ref in .git dir' '
echo precious >expect &&
test_must_fail git update-ref -d my-private-file >output 2>error &&
test_must_be_empty output &&
- test_i18ngrep -e "cannot lock .*: unable to resolve reference" error &&
+ test_i18ngrep -e "refusing to update ref with bad name" error &&
test_cmp expect .git/my-private-file
'
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index 7ee8ea0..8f52da2 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -523,4 +523,26 @@ test_expect_success 'fsck --connectivity-only' '
)
'
+remove_loose_object () {
+ sha1="$(git rev-parse "$1")" &&
+ remainder=${sha1#??} &&
+ firsttwo=${sha1%$remainder} &&
+ rm .git/objects/$firsttwo/$remainder
+}
+
+test_expect_success 'fsck --name-objects' '
+ rm -rf name-objects &&
+ git init name-objects &&
+ (
+ cd name-objects &&
+ test_commit julius caesar.t &&
+ test_commit augustus &&
+ test_commit caesar &&
+ remove_loose_object $(git rev-parse julius:caesar.t) &&
+ test_must_fail git fsck --name-objects >out &&
+ tree=$(git rev-parse --verify julius:) &&
+ grep "$tree (\(refs/heads/master\|HEAD\)@{[0-9]*}:" out
+ )
+'
+
test_done
diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh
index ab27d0d..492edff 100755
--- a/t/t1503-rev-parse-verify.sh
+++ b/t/t1503-rev-parse-verify.sh
@@ -139,4 +139,9 @@ test_expect_success 'master@{n} for various n' '
test_must_fail git rev-parse --verify master@{$Np1}
'
+test_expect_success SYMLINKS 'ref resolution not confused by broken symlinks' '
+ ln -s does-not-exist .git/refs/heads/broken &&
+ test_must_fail git rev-parse --verify broken
+'
+
test_done
diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
index 86c2ff2..79a0251 100755
--- a/t/t1506-rev-parse-diagnosis.sh
+++ b/t/t1506-rev-parse-diagnosis.sh
@@ -106,7 +106,7 @@ test_expect_success 'incorrect revision id' '
test_must_fail git rev-parse foobar:file.txt 2>error &&
grep "Invalid object name '"'"'foobar'"'"'." error &&
test_must_fail git rev-parse foobar 2> error &&
- grep "unknown revision or path not in the working tree." error
+ test_i18ngrep "unknown revision or path not in the working tree." error
'
test_expect_success 'incorrect file in sha1:path' '
diff --git a/t/t2010-checkout-ambiguous.sh b/t/t2010-checkout-ambiguous.sh
index 87bdf9c..2e47fe0 100755
--- a/t/t2010-checkout-ambiguous.sh
+++ b/t/t2010-checkout-ambiguous.sh
@@ -41,6 +41,15 @@ test_expect_success 'check ambiguity' '
test_must_fail git checkout world all
'
+test_expect_success 'check ambiguity in subdir' '
+ mkdir sub &&
+ # not ambiguous because sub/world does not exist
+ git -C sub checkout world ../all &&
+ echo hello >sub/world &&
+ # ambiguous because sub/world does exist
+ test_must_fail git -C sub checkout world ../all
+'
+
test_expect_success 'disambiguate checking out from a tree-ish' '
echo bye > world &&
git checkout world -- world &&
@@ -49,7 +58,7 @@ test_expect_success 'disambiguate checking out from a tree-ish' '
test_expect_success 'accurate error message with more than one ref' '
test_must_fail git checkout HEAD master -- 2>actual &&
- grep 2 actual &&
+ test_i18ngrep 2 actual &&
test_i18ngrep "one reference expected, 2 given" actual
'
diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh
index 2741262..2131fb2 100755
--- a/t/t2018-checkout-branch.sh
+++ b/t/t2018-checkout-branch.sh
@@ -124,7 +124,7 @@ test_expect_success 'checkout -b to @{-1} fails with the right branch name' '
git checkout branch2 &&
echo >expect "fatal: A branch named '\''branch1'\'' already exists." &&
test_must_fail git checkout -b @{-1} 2>actual &&
- test_cmp expect actual
+ test_i18ncmp expect actual
'
test_expect_success 'checkout -B to an existing branch resets branch to HEAD' '
diff --git a/t/t2024-checkout-dwim.sh b/t/t2024-checkout-dwim.sh
index 468a000..3e5ac81 100755
--- a/t/t2024-checkout-dwim.sh
+++ b/t/t2024-checkout-dwim.sh
@@ -174,6 +174,18 @@ test_expect_success 'checkout of branch with a file having the same name fails'
test_branch master
'
+test_expect_success 'checkout of branch with a file in subdir having the same name fails' '
+ git checkout -B master &&
+ test_might_fail git branch -D spam &&
+
+ >spam &&
+ mkdir sub &&
+ mv spam sub/spam &&
+ test_must_fail git -C sub checkout spam &&
+ test_must_fail git rev-parse --verify refs/heads/spam &&
+ test_branch master
+'
+
test_expect_success 'checkout <branch> -- succeeds, even if a file with the same name exists' '
git checkout -B master &&
test_might_fail git branch -D spam &&
diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh
index 3a22fc5..b618d6b 100755
--- a/t/t2025-worktree-add.sh
+++ b/t/t2025-worktree-add.sh
@@ -20,6 +20,22 @@ test_expect_success '"add" an existing empty worktree' '
git worktree add --detach existing_empty master
'
+test_expect_success '"add" using shorthand - fails when no previous branch' '
+ test_must_fail git worktree add existing_short -
+'
+
+test_expect_success '"add" using - shorthand' '
+ git checkout -b newbranch &&
+ echo hello >myworld &&
+ git add myworld &&
+ git commit -m myworld &&
+ git checkout master &&
+ git worktree add short-hand - &&
+ echo refs/heads/newbranch >expect &&
+ git -C short-hand rev-parse --symbolic-full-name HEAD >actual &&
+ test_cmp expect actual
+'
+
test_expect_success '"add" refuses to checkout locked branch' '
test_must_fail git worktree add zere master &&
! test -d zere &&
@@ -122,6 +138,14 @@ test_expect_success 'checkout from a bare repo without "add"' '
)
'
+test_expect_success '"add" default branch of a bare repo' '
+ (
+ git clone --bare . bare2 &&
+ cd bare2 &&
+ git worktree add ../there3 master
+ )
+'
+
test_expect_success 'checkout with grafts' '
test_when_finished rm .git/info/grafts &&
test_commit abc &&
diff --git a/t/t2028-worktree-move.sh b/t/t2028-worktree-move.sh
new file mode 100755
index 0000000..8298aaf
--- /dev/null
+++ b/t/t2028-worktree-move.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+test_description='test git worktree move, remove, lock and unlock'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ test_commit init &&
+ git worktree add source &&
+ git worktree list --porcelain | grep "^worktree" >actual &&
+ cat <<-EOF >expected &&
+ worktree $(pwd)
+ worktree $(pwd)/source
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'lock main worktree' '
+ test_must_fail git worktree lock .
+'
+
+test_expect_success 'lock linked worktree' '
+ git worktree lock --reason hahaha source &&
+ echo hahaha >expected &&
+ test_cmp expected .git/worktrees/source/locked
+'
+
+test_expect_success 'lock linked worktree from another worktree' '
+ rm .git/worktrees/source/locked &&
+ git worktree add elsewhere &&
+ git -C elsewhere worktree lock --reason hahaha ../source &&
+ echo hahaha >expected &&
+ test_cmp expected .git/worktrees/source/locked
+'
+
+test_expect_success 'lock worktree twice' '
+ test_must_fail git worktree lock source &&
+ echo hahaha >expected &&
+ test_cmp expected .git/worktrees/source/locked
+'
+
+test_expect_success 'lock worktree twice (from the locked worktree)' '
+ test_must_fail git -C source worktree lock . &&
+ echo hahaha >expected &&
+ test_cmp expected .git/worktrees/source/locked
+'
+
+test_expect_success 'unlock main worktree' '
+ test_must_fail git worktree unlock .
+'
+
+test_expect_success 'unlock linked worktree' '
+ git worktree unlock source &&
+ test_path_is_missing .git/worktrees/source/locked
+'
+
+test_expect_success 'unlock worktree twice' '
+ test_must_fail git worktree unlock source &&
+ test_path_is_missing .git/worktrees/source/locked
+'
+
+test_done
diff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh
index dfe02f4..32ac6e0 100755
--- a/t/t2107-update-index-basic.sh
+++ b/t/t2107-update-index-basic.sh
@@ -80,4 +80,17 @@ test_expect_success '.lock files cleaned up' '
)
'
+test_expect_success '--chmod=+x and chmod=-x in the same argument list' '
+ >A &&
+ >B &&
+ git add A B &&
+ git update-index --chmod=+x A --chmod=-x B &&
+ cat >expect <<-\EOF &&
+ 100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 A
+ 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 B
+ EOF
+ git ls-files --stage A B >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t3101-ls-tree-dirname.sh b/t/t3101-ls-tree-dirname.sh
index 425d858..327ded4 100755
--- a/t/t3101-ls-tree-dirname.sh
+++ b/t/t3101-ls-tree-dirname.sh
@@ -16,7 +16,7 @@ This test runs git ls-tree with the following in a tree.
path3/1.txt - a file in a directory
path3/2.txt - a file in a directory
-Test the handling of mulitple directories which have matching file
+Test the handling of multiple directories which have matching file
entries. Also test odd filename and missing entries handling.
'
. ./test-lib.sh
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index f3e3b6c..8a833f3 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -79,6 +79,15 @@ test_expect_success 'git branch -m dumps usage' '
test_i18ngrep "branch name required" err
'
+test_expect_success 'git branch -m m broken_symref should work' '
+ test_when_finished "git branch -D broken_symref" &&
+ git branch -l m &&
+ git symbolic-ref refs/heads/broken_symref refs/heads/i_am_broken &&
+ git branch -m m broken_symref &&
+ git reflog exists refs/heads/broken_symref &&
+ test_must_fail git reflog exists refs/heads/i_am_broken
+'
+
test_expect_success 'git branch -m m m/m should work' '
git branch -l m &&
git branch -m m m/m &&
@@ -550,7 +559,7 @@ If you wanted to make '"'master'"' track '"'origin/master'"', do this:
git branch -d origin/master
git branch --set-upstream-to origin/master
EOF
- test_cmp expected actual
+ test_i18ncmp expected actual
'
test_expect_success '--set-upstream with two args only shows the deprecation message' '
@@ -559,7 +568,7 @@ test_expect_success '--set-upstream with two args only shows the deprecation mes
cat >expected <<EOF &&
The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
EOF
- test_cmp expected actual
+ test_i18ncmp expected actual
'
test_expect_success '--set-upstream with one arg only shows the deprecation message if the branch existed' '
@@ -568,7 +577,7 @@ test_expect_success '--set-upstream with one arg only shows the deprecation mess
cat >expected <<EOF &&
The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
EOF
- test_cmp expected actual
+ test_i18ncmp expected actual
'
test_expect_success '--set-upstream-to notices an error to set branch as own upstream' '
diff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh
index 912a663..7f3ec47 100755
--- a/t/t3201-branch-contains.sh
+++ b/t/t3201-branch-contains.sh
@@ -156,7 +156,7 @@ test_expect_success 'branch --merged with --verbose' '
* topic 2c939f4 [ahead 1] foo
zzz c77a0a9 second on master
EOF
- test_cmp expect actual
+ test_i18ncmp expect actual
'
test_done
diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh
index d557212..6967436 100755
--- a/t/t3310-notes-merge-manual-resolve.sh
+++ b/t/t3310-notes-merge-manual-resolve.sh
@@ -178,7 +178,7 @@ test_expect_success 'merge z into m (== y) with default ("manual") resolver => C
git config core.notesRef refs/notes/m &&
test_must_fail git notes merge z >output &&
# Output should point to where to resolve conflicts
- grep -q "\\.git/NOTES_MERGE_WORKTREE" output &&
+ test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
test_cmp expect_conflicts output_conflicts &&
@@ -381,7 +381,7 @@ test_expect_success 'redo merge of z into m (== y) with default ("manual") resol
git config core.notesRef refs/notes/m &&
test_must_fail git notes merge z >output &&
# Output should point to where to resolve conflicts
- grep -q "\\.git/NOTES_MERGE_WORKTREE" output &&
+ test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
test_cmp expect_conflicts output_conflicts &&
@@ -415,7 +415,7 @@ git rev-parse refs/notes/z > pre_merge_z
test_expect_success 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge' '
test_must_fail git notes merge z >output &&
# Output should point to where to resolve conflicts
- grep -q "\\.git/NOTES_MERGE_WORKTREE" output &&
+ test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
test_cmp expect_conflicts output_conflicts &&
@@ -496,7 +496,7 @@ test_expect_success 'redo merge of z into m (== y) with default ("manual") resol
git update-ref refs/notes/m refs/notes/y &&
test_must_fail git notes merge z >output &&
# Output should point to where to resolve conflicts
- grep -q "\\.git/NOTES_MERGE_WORKTREE" output &&
+ test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
test_cmp expect_conflicts output_conflicts &&
diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh
index 1f71d58..6e05115 100755
--- a/t/t3320-notes-merge-worktrees.sh
+++ b/t/t3320-notes-merge-worktrees.sh
@@ -52,7 +52,7 @@ test_expect_success 'merge z into y while mid-merge in another workdir fails' '
cd worktree &&
git config core.notesRef refs/notes/y &&
test_must_fail git notes merge z 2>err &&
- grep "A notes merge into refs/notes/y is already in-progress at" err
+ test_i18ngrep "A notes merge into refs/notes/y is already in-progress at" err
) &&
test_path_is_missing .git/worktrees/worktree/NOTES_MERGE_REF
'
@@ -62,7 +62,7 @@ test_expect_success 'merge z into x while mid-merge on y succeeds' '
cd worktree2 &&
git config core.notesRef refs/notes/x &&
test_must_fail git notes merge z 2>&1 >out &&
- grep "Automatic notes merge failed" out &&
+ test_i18ngrep "Automatic notes merge failed" out &&
grep -v "A notes merge into refs/notes/x is already in-progress in" out
) &&
echo "ref: refs/notes/x" >expect &&
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 47b5682..f5fd15e 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -136,8 +136,8 @@ test_expect_success 'setup: recover' '
test_expect_success 'Show verbose error when HEAD could not be detached' '
>B &&
test_must_fail git rebase topic 2>output.err >output.out &&
- grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
- grep B output.err
+ test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" output.err &&
+ test_i18ngrep B output.err
'
rm -f B
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index c7ea8ba..e38e296 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -219,9 +219,9 @@ test_expect_success 'abort with error when new base cannot be checked out' '
git commit -m "remove file in base" &&
set_fake_editor &&
test_must_fail git rebase -i master > output 2>&1 &&
- grep "The following untracked working tree files would be overwritten by checkout:" \
+ test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" \
output &&
- grep "file1" output &&
+ test_i18ngrep "file1" output &&
test_path_is_missing .git/rebase-merge &&
git reset --hard HEAD^
'
@@ -540,7 +540,7 @@ test_expect_success 'clean error after failed "exec"' '
echo "edited again" > file7 &&
git add file7 &&
test_must_fail git rebase --continue 2>error &&
- grep "You have staged changes in your working tree." error
+ test_i18ngrep "You have staged changes in your working tree." error
'
test_expect_success 'rebase a detached HEAD' '
@@ -1060,7 +1060,7 @@ test_expect_success 'todo count' '
EOF
test_set_editor "$(pwd)/dump-raw.sh" &&
git rebase -i HEAD~4 >actual &&
- grep "^# Rebase ..* onto ..* ([0-9]" actual
+ test_i18ngrep "^# Rebase ..* onto ..* ([0-9]" actual
'
test_expect_success 'rebase -i commits that overwrite untracked files (pick)' '
@@ -1160,7 +1160,7 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = ignore' '
FAKE_LINES="1 2 3 4" \
git rebase -i --root 2>actual &&
test D = $(git cat-file commit HEAD | sed -ne \$p) &&
- test_cmp expect actual
+ test_i18ncmp expect actual
'
cat >expect <<EOF
@@ -1181,7 +1181,7 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = warn' '
set_fake_editor &&
FAKE_LINES="1 2 3 4" \
git rebase -i --root 2>actual &&
- test_cmp expect actual &&
+ test_i18ncmp expect actual &&
test D = $(git cat-file commit HEAD | sed -ne \$p)
'
@@ -1195,7 +1195,7 @@ To avoid this message, use "drop" to explicitly remove a commit.
Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
The possible behaviours are: ignore, warn, error.
-You can fix this with 'git rebase --edit-todo'.
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
Or you can abort the rebase with 'git rebase --abort'.
EOF
@@ -1205,7 +1205,7 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = error' '
set_fake_editor &&
test_must_fail env FAKE_LINES="1 2 4" \
git rebase -i --root 2>actual &&
- test_cmp expect actual &&
+ test_i18ncmp expect actual &&
cp .git/rebase-merge/git-rebase-todo.backup \
.git/rebase-merge/git-rebase-todo &&
FAKE_LINES="1 2 drop 3 4 drop 5" \
@@ -1219,7 +1219,7 @@ cat >expect <<EOF
Warning: the command isn't recognized in the following line:
- badcmd $(git rev-list --oneline -1 master~1)
-You can fix this with 'git rebase --edit-todo'.
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
Or you can abort the rebase with 'git rebase --abort'.
EOF
@@ -1228,7 +1228,7 @@ test_expect_success 'static check of bad command' '
set_fake_editor &&
test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \
git rebase -i --root 2>actual &&
- test_cmp expect actual &&
+ test_i18ncmp expect actual &&
FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo &&
git rebase --continue &&
test E = $(git cat-file commit HEAD | sed -ne \$p) &&
@@ -1254,7 +1254,7 @@ cat >expect <<EOF
Warning: the SHA-1 is missing or isn't a commit in the following line:
- edit XXXXXXX False commit
-You can fix this with 'git rebase --edit-todo'.
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
Or you can abort the rebase with 'git rebase --abort'.
EOF
@@ -1263,7 +1263,7 @@ test_expect_success 'static check of bad SHA-1' '
set_fake_editor &&
test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \
git rebase -i --root 2>actual &&
- test_cmp expect actual &&
+ test_i18ncmp expect actual &&
FAKE_LINES="1 2 4 5 6" git rebase --edit-todo &&
git rebase --continue &&
test E = $(git cat-file commit HEAD | sed -ne \$p)
@@ -1281,4 +1281,12 @@ test_expect_success 'editor saves as CR/LF' '
)
'
+SQ="'"
+test_expect_success 'rebase -i --gpg-sign=<key-id>' '
+ set_fake_editor &&
+ FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \
+ >out 2>err &&
+ test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err
+'
+
test_done
diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh
index 8f53e54..48346f1 100755
--- a/t/t3415-rebase-autosquash.sh
+++ b/t/t3415-rebase-autosquash.sh
@@ -271,4 +271,37 @@ test_expect_success 'autosquash with custom inst format' '
test 2 = $(git cat-file commit HEAD^ | grep squash | wc -l)
'
+set_backup_editor () {
+ write_script backup-editor.sh <<-\EOF
+ cp "$1" .git/backup-"$(basename "$1")"
+ EOF
+ test_set_editor "$PWD/backup-editor.sh"
+}
+
+test_expect_failure 'autosquash with multiple empty patches' '
+ test_tick &&
+ git commit --allow-empty -m "empty" &&
+ test_tick &&
+ git commit --allow-empty -m "empty2" &&
+ test_tick &&
+ >fixup &&
+ git add fixup &&
+ git commit --fixup HEAD^^ &&
+ (
+ set_backup_editor &&
+ GIT_USE_REBASE_HELPER=false \
+ git rebase -i --force-rebase --autosquash HEAD~4 &&
+ grep empty2 .git/backup-git-rebase-todo
+ )
+'
+
+test_expect_success 'extra spaces after fixup!' '
+ base=$(git rev-parse HEAD) &&
+ test_commit to-fixup &&
+ git commit --allow-empty -m "fixup! to-fixup" &&
+ git rebase -i --autosquash --keep-empty HEAD~2 &&
+ parent=$(git rev-parse HEAD^) &&
+ test $base = $parent
+'
+
test_done
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
index 532ff5c..ab8a63e 100755
--- a/t/t3420-rebase-autostash.sh
+++ b/t/t3420-rebase-autostash.sh
@@ -179,7 +179,7 @@ testrebase " --interactive" .git/rebase-merge
test_expect_success 'abort rebase -i with --autostash' '
test_when_finished "git reset --hard" &&
- echo uncommited-content >file0 &&
+ echo uncommitted-content >file0 &&
(
write_script abort-editor.sh <<-\EOF &&
echo >"$1"
@@ -188,7 +188,7 @@ test_expect_success 'abort rebase -i with --autostash' '
test_must_fail git rebase -i --autostash HEAD^ &&
rm -f abort-editor.sh
) &&
- echo uncommited-content >expected &&
+ echo uncommitted-content >expected &&
test_cmp expected file0
'
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 4865304..53c0cb6 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -7,6 +7,20 @@ test_description='Test of git add, including the -- option.'
. ./test-lib.sh
+# Test the file mode "$1" of the file "$2" in the index.
+test_mode_in_index () {
+ case "$(git ls-files -s "$2")" in
+ "$1 "*" $2")
+ echo pass
+ ;;
+ *)
+ echo fail
+ git ls-files -s "$2"
+ return 1
+ ;;
+ esac
+}
+
test_expect_success \
'Test of git add' \
'touch foo && git add foo'
@@ -25,18 +39,12 @@ test_expect_success \
echo foo >xfoo1 &&
chmod 755 xfoo1 &&
git add xfoo1 &&
- case "$(git ls-files --stage xfoo1)" in
- 100644" "*xfoo1) echo pass;;
- *) echo fail; git ls-files --stage xfoo1; (exit 1);;
- esac'
+ test_mode_in_index 100644 xfoo1'
test_expect_success 'git add: filemode=0 should not get confused by symlink' '
rm -f xfoo1 &&
test_ln_s_add foo xfoo1 &&
- case "$(git ls-files --stage xfoo1)" in
- 120000" "*xfoo1) echo pass;;
- *) echo fail; git ls-files --stage xfoo1; (exit 1);;
- esac
+ test_mode_in_index 120000 xfoo1
'
test_expect_success \
@@ -45,28 +53,19 @@ test_expect_success \
echo foo >xfoo2 &&
chmod 755 xfoo2 &&
git update-index --add xfoo2 &&
- case "$(git ls-files --stage xfoo2)" in
- 100644" "*xfoo2) echo pass;;
- *) echo fail; git ls-files --stage xfoo2; (exit 1);;
- esac'
+ test_mode_in_index 100644 xfoo2'
test_expect_success 'git add: filemode=0 should not get confused by symlink' '
rm -f xfoo2 &&
test_ln_s_add foo xfoo2 &&
- case "$(git ls-files --stage xfoo2)" in
- 120000" "*xfoo2) echo pass;;
- *) echo fail; git ls-files --stage xfoo2; (exit 1);;
- esac
+ test_mode_in_index 120000 xfoo2
'
test_expect_success \
'git update-index --add: Test that executable bit is not used...' \
'git config core.filemode 0 &&
test_ln_s_add xfoo2 xfoo3 && # runs git update-index --add
- case "$(git ls-files --stage xfoo3)" in
- 120000" "*xfoo3) echo pass;;
- *) echo fail; git ls-files --stage xfoo3; (exit 1);;
- esac'
+ test_mode_in_index 120000 xfoo3'
test_expect_success '.gitignore test setup' '
echo "*.ig" >.gitignore &&
@@ -332,34 +331,71 @@ test_expect_success 'git add --dry-run --ignore-missing of non-existing file out
test_i18ncmp expect.err actual.err
'
-test_expect_success 'git add --chmod=+x stages a non-executable file with +x' '
+test_expect_success 'git add --chmod=[+-]x stages correctly' '
+ rm -f foo1 &&
echo foo >foo1 &&
git add --chmod=+x foo1 &&
- case "$(git ls-files --stage foo1)" in
- 100755" "*foo1) echo pass;;
- *) echo fail; git ls-files --stage foo1; (exit 1);;
- esac
-'
-
-test_expect_success 'git add --chmod=-x stages an executable file with -x' '
- echo foo >xfoo1 &&
- chmod 755 xfoo1 &&
- git add --chmod=-x xfoo1 &&
- case "$(git ls-files --stage xfoo1)" in
- 100644" "*xfoo1) echo pass;;
- *) echo fail; git ls-files --stage xfoo1; (exit 1);;
- esac
+ test_mode_in_index 100755 foo1 &&
+ git add --chmod=-x foo1 &&
+ test_mode_in_index 100644 foo1
'
test_expect_success POSIXPERM,SYMLINKS 'git add --chmod=+x with symlinks' '
git config core.filemode 1 &&
git config core.symlinks 1 &&
+ rm -f foo2 &&
echo foo >foo2 &&
git add --chmod=+x foo2 &&
- case "$(git ls-files --stage foo2)" in
- 100755" "*foo2) echo pass;;
- *) echo fail; git ls-files --stage foo2; (exit 1);;
- esac
+ test_mode_in_index 100755 foo2
+'
+
+test_expect_success 'git add --chmod=[+-]x changes index with already added file' '
+ rm -f foo3 xfoo3 &&
+ echo foo >foo3 &&
+ git add foo3 &&
+ git add --chmod=+x foo3 &&
+ test_mode_in_index 100755 foo3 &&
+ echo foo >xfoo3 &&
+ chmod 755 xfoo3 &&
+ git add xfoo3 &&
+ git add --chmod=-x xfoo3 &&
+ test_mode_in_index 100644 xfoo3
+'
+
+test_expect_success POSIXPERM 'git add --chmod=[+-]x does not change the working tree' '
+ echo foo >foo4 &&
+ git add foo4 &&
+ git add --chmod=+x foo4 &&
+ ! test -x foo4
+'
+
+test_expect_success 'no file status change if no pathspec is given' '
+ >foo5 &&
+ >foo6 &&
+ git add foo5 foo6 &&
+ git add --chmod=+x &&
+ test_mode_in_index 100644 foo5 &&
+ test_mode_in_index 100644 foo6
+'
+
+test_expect_success 'no file status change if no pathspec is given in subdir' '
+ mkdir -p sub &&
+ (
+ cd sub &&
+ >sub-foo1 &&
+ >sub-foo2 &&
+ git add . &&
+ git add --chmod=+x &&
+ test_mode_in_index 100644 sub-foo1 &&
+ test_mode_in_index 100644 sub-foo2
+ )
+'
+
+test_expect_success 'all statuses changed in folder if . is given' '
+ git add --chmod=+x . &&
+ test $(git ls-files --stage | grep ^100644 | wc -l) -eq 0 &&
+ git add --chmod=-x . &&
+ test $(git ls-files --stage | grep ^100755 | wc -l) -eq 0
'
test_done
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 805dc90..8d90a6e 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -229,6 +229,46 @@ check_patch () {
grep -e "^Subject:" "$1"
}
+test_expect_success 'format.from=false' '
+
+ git -c format.from=false format-patch --stdout master..side |
+ sed -e "/^\$/q" >patch &&
+ check_patch patch &&
+ ! grep "^From: C O Mitter <committer@example.com>\$" patch
+'
+
+test_expect_success 'format.from=true' '
+
+ git -c format.from=true format-patch --stdout master..side |
+ sed -e "/^\$/q" >patch &&
+ check_patch patch &&
+ grep "^From: C O Mitter <committer@example.com>\$" patch
+'
+
+test_expect_success 'format.from with address' '
+
+ git -c format.from="F R Om <from@example.com>" format-patch --stdout master..side |
+ sed -e "/^\$/q" >patch &&
+ check_patch patch &&
+ grep "^From: F R Om <from@example.com>\$" patch
+'
+
+test_expect_success '--no-from overrides format.from' '
+
+ git -c format.from="F R Om <from@example.com>" format-patch --no-from --stdout master..side |
+ sed -e "/^\$/q" >patch &&
+ check_patch patch &&
+ ! grep "^From: F R Om <from@example.com>\$" patch
+'
+
+test_expect_success '--from overrides format.from' '
+
+ git -c format.from="F R Om <from@example.com>" format-patch --from --stdout master..side |
+ sed -e "/^\$/q" >patch &&
+ check_patch patch &&
+ ! grep "^From: F R Om <from@example.com>\$" patch
+'
+
test_expect_success '--no-to overrides config.to' '
git config --replace-all format.to \
@@ -714,9 +754,22 @@ test_expect_success 'format-patch --ignore-if-in-upstream HEAD' '
git format-patch --ignore-if-in-upstream HEAD
'
+git_version="$(git --version | sed "s/.* //")"
+
+signature() {
+ printf "%s\n%s\n\n" "-- " "${1:-$git_version}"
+}
+
+test_expect_success 'format-patch default signature' '
+ git format-patch --stdout -1 | tail -n 3 >output &&
+ signature >expect &&
+ test_cmp expect output
+'
+
test_expect_success 'format-patch --signature' '
- git format-patch --stdout --signature="my sig" -1 >output &&
- grep "my sig" output
+ git format-patch --stdout --signature="my sig" -1 | tail -n 3 >output &&
+ signature "my sig" >expect &&
+ test_cmp expect output
'
test_expect_success 'format-patch with format.signature config' '
@@ -1462,12 +1515,12 @@ test_expect_success 'format-patch -o overrides format.outputDirectory' '
test_expect_success 'format-patch --base' '
git checkout side &&
- git format-patch --stdout --base=HEAD~3 -1 >patch &&
- grep "^base-commit:" patch >actual &&
- grep "^prerequisite-patch-id:" patch >>actual &&
- echo "base-commit: $(git rev-parse HEAD~3)" >expected &&
+ git format-patch --stdout --base=HEAD~3 -1 | tail -n 7 >actual &&
+ echo >expected &&
+ echo "base-commit: $(git rev-parse HEAD~3)" >>expected &&
echo "prerequisite-patch-id: $(git show --patch HEAD~2 | git patch-id --stable | awk "{print \$1}")" >>expected &&
echo "prerequisite-patch-id: $(git show --patch HEAD~1 | git patch-id --stable | awk "{print \$1}")" >>expected &&
+ signature >> expected &&
test_cmp expected actual
'
@@ -1565,4 +1618,53 @@ test_expect_success 'format-patch --base overrides format.useAutoBase' '
test_cmp expected actual
'
+test_expect_success 'format-patch --base with --attach' '
+ git format-patch --attach=mimemime --stdout --base=HEAD~ -1 >patch &&
+ sed -n -e "/^base-commit:/s/.*/1/p" -e "/^---*mimemime--$/s/.*/2/p" \
+ patch >actual &&
+ test_write_lines 1 2 >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'format-patch --pretty=mboxrd' '
+ sp=" " &&
+ cat >msg <<-INPUT_END &&
+ mboxrd should escape the body
+
+ From could trip up a loose mbox parser
+ >From extra escape for reversibility
+ >>From extra escape for reversibility 2
+ from lower case not escaped
+ Fromm bad speling not escaped
+ From with leading space not escaped
+
+ F
+ From
+ From$sp
+ From $sp
+ From $sp
+ INPUT_END
+
+ cat >expect <<-INPUT_END &&
+ >From could trip up a loose mbox parser
+ >>From extra escape for reversibility
+ >>>From extra escape for reversibility 2
+ from lower case not escaped
+ Fromm bad speling not escaped
+ From with leading space not escaped
+
+ F
+ From
+ From
+ From
+ From
+ INPUT_END
+
+ C=$(git commit-tree HEAD^^{tree} -p HEAD <msg) &&
+ git format-patch --pretty=mboxrd --stdout -1 $C~1..$C >patch &&
+ git grep -h --no-index -A11 \
+ "^>From could trip up a loose mbox parser" patch >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 67373dc..1795ffc 100755
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -30,6 +30,7 @@ diffpatterns="
bibtex
cpp
csharp
+ css
fortran
fountain
html
diff --git a/t/t4018/css-brace-in-col-1 b/t/t4018/css-brace-in-col-1
new file mode 100644
index 0000000..7831577
--- /dev/null
+++ b/t/t4018/css-brace-in-col-1
@@ -0,0 +1,5 @@
+RIGHT label.control-label
+{
+ margin-top: 10px!important;
+ border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/css-colon-eol b/t/t4018/css-colon-eol
new file mode 100644
index 0000000..5a30553
--- /dev/null
+++ b/t/t4018/css-colon-eol
@@ -0,0 +1,4 @@
+RIGHT h1 {
+color:
+ChangeMe;
+}
diff --git a/t/t4018/css-colon-selector b/t/t4018/css-colon-selector
new file mode 100644
index 0000000..c6d71fb
--- /dev/null
+++ b/t/t4018/css-colon-selector
@@ -0,0 +1,5 @@
+RIGHT a:hover {
+ margin-top:
+ 10px!important;
+ border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/css-common b/t/t4018/css-common
new file mode 100644
index 0000000..84ed754
--- /dev/null
+++ b/t/t4018/css-common
@@ -0,0 +1,4 @@
+RIGHT label.control-label {
+ margin-top: 10px!important;
+ border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/css-long-selector-list b/t/t4018/css-long-selector-list
new file mode 100644
index 0000000..7ccd25d
--- /dev/null
+++ b/t/t4018/css-long-selector-list
@@ -0,0 +1,6 @@
+p.header,
+label.control-label,
+div ul#RIGHT {
+ margin-top: 10px!important;
+ border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/css-prop-sans-indent b/t/t4018/css-prop-sans-indent
new file mode 100644
index 0000000..a9e3c86
--- /dev/null
+++ b/t/t4018/css-prop-sans-indent
@@ -0,0 +1,5 @@
+RIGHT, label.control-label {
+margin-top: 10px!important;
+padding: 0;
+border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/css-short-selector-list b/t/t4018/css-short-selector-list
new file mode 100644
index 0000000..6a0bdee
--- /dev/null
+++ b/t/t4018/css-short-selector-list
@@ -0,0 +1,4 @@
+label.control, div ul#RIGHT {
+ margin-top: 10px!important;
+ border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/css-trailing-space b/t/t4018/css-trailing-space
new file mode 100644
index 0000000..32b5606
--- /dev/null
+++ b/t/t4018/css-trailing-space
@@ -0,0 +1,5 @@
+RIGHT label.control-label {
+ margin:10px;
+ padding:10px;
+ border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4026-color.sh b/t/t4026-color.sh
index 2b32c4f..ec78c5e 100755
--- a/t/t4026-color.sh
+++ b/t/t4026-color.sh
@@ -50,14 +50,19 @@ test_expect_success 'attr negation' '
color "nobold nodim noul noblink noreverse" "[22;24;25;27m"
'
+test_expect_success '"no-" variant of negation' '
+ color "no-bold no-blink" "[22;25m"
+'
+
test_expect_success 'long color specification' '
color "254 255 bold dim ul blink reverse" "[1;2;4;5;7;38;5;254;48;5;255m"
'
test_expect_success 'absurdly long color specification' '
color \
- "#ffffff #ffffff bold nobold dim nodim ul noul blink noblink reverse noreverse" \
- "[1;2;4;5;7;22;24;25;27;38;2;255;255;255;48;2;255;255;255m"
+ "#ffffff #ffffff bold nobold dim nodim italic noitalic
+ ul noul blink noblink reverse noreverse strike nostrike" \
+ "[1;2;3;4;5;7;9;22;23;24;25;27;29;38;2;255;255;255;48;2;255;255;255m"
'
test_expect_success '0-7 are aliases for basic ANSI color names' '
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index f2f55fc..912df91 100755
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -302,6 +302,7 @@ test_language_driver ada
test_language_driver bibtex
test_language_driver cpp
test_language_driver csharp
+test_language_driver css
test_language_driver fortran
test_language_driver html
test_language_driver java
diff --git a/t/t4034/css/expect b/t/t4034/css/expect
new file mode 100644
index 0000000..ed10393
--- /dev/null
+++ b/t/t4034/css/expect
@@ -0,0 +1,16 @@
+<BOLD>diff --git a/pre b/post<RESET>
+<BOLD>index b8ae0bb..fe500b7 100644<RESET>
+<BOLD>--- a/pre<RESET>
+<BOLD>+++ b/post<RESET>
+<CYAN>@@ -1,10 +1,10 @@<RESET>
+.<RED>class-form<RESET><GREEN>other-form<RESET> label.control-label {
+ margin-top: <RED>10<RESET><GREEN>15<RESET>px!important;
+ border : 10px <RED>dashed<RESET><GREEN>dotted<RESET> #C6C6C6;
+}<RESET>
+<RED>#CCCCCC<RESET><GREEN>#CCCCCB<RESET>
+10em<RESET>
+<RED>padding-bottom<RESET><GREEN>margin-left<RESET>
+150<RED>px<RESET><GREEN>em<RESET>
+10px
+<RED>!important<RESET>
+<RED>div<RESET><GREEN>li<RESET>.class#id
diff --git a/t/t4034/css/post b/t/t4034/css/post
new file mode 100644
index 0000000..fe500b7
--- /dev/null
+++ b/t/t4034/css/post
@@ -0,0 +1,10 @@
+.other-form label.control-label {
+ margin-top: 15px!important;
+ border : 10px dotted #C6C6C6;
+}
+#CCCCCB
+10em
+margin-left
+150em
+10px
+li.class#id
diff --git a/t/t4034/css/pre b/t/t4034/css/pre
new file mode 100644
index 0000000..b8ae0bb
--- /dev/null
+++ b/t/t4034/css/pre
@@ -0,0 +1,10 @@
+.class-form label.control-label {
+ margin-top: 10px!important;
+ border : 10px dashed #C6C6C6;
+}
+#CCCCCC
+10em
+padding-bottom
+150px
+10px!important
+div.class#id
diff --git a/t/t4051-diff-function-context.sh b/t/t4051-diff-function-context.sh
index b79b877..6154acb 100755
--- a/t/t4051-diff-function-context.sh
+++ b/t/t4051-diff-function-context.sh
@@ -67,6 +67,15 @@ test_expect_success 'setup' '
commit_and_tag long_common_tail file.c &&
git checkout initial &&
+ cat "$dir/hello.c" "$dir/dummy.c" >file.c &&
+ commit_and_tag hello_dummy file.c &&
+
+ # overlap function context of 1st change and -u context of 2nd change
+ grep -v "delete me from hello" <"$dir/hello.c" >file.c &&
+ sed 2p <"$dir/dummy.c" >>file.c &&
+ commit_and_tag changed_hello_dummy file.c &&
+
+ git checkout initial &&
grep -v "delete me from hello" <file.c >file.c.new &&
mv file.c.new file.c &&
cat "$dir/appended1.c" >>file.c &&
@@ -179,4 +188,20 @@ test_expect_success ' context does not include other functions' '
test $(grep -c "^[ +-].*Begin" changed_hello_appended.diff) -le 2
'
+check_diff changed_hello_dummy 'changed two consecutive functions'
+
+test_expect_success ' context includes begin' '
+ grep "^ .*Begin of hello" changed_hello_dummy.diff &&
+ grep "^ .*Begin of dummy" changed_hello_dummy.diff
+'
+
+test_expect_success ' context includes end' '
+ grep "^ .*End of hello" changed_hello_dummy.diff &&
+ grep "^ .*End of dummy" changed_hello_dummy.diff
+'
+
+test_expect_success ' overlapping hunks are merged' '
+ test $(grep -c "^@@" changed_hello_dummy.diff) -eq 1
+'
+
test_done
diff --git a/t/t4062-diff-pickaxe.sh b/t/t4062-diff-pickaxe.sh
new file mode 100755
index 0000000..f0bf50b
--- /dev/null
+++ b/t/t4062-diff-pickaxe.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# Copyright (c) 2016 Johannes Schindelin
+#
+
+test_description='Pickaxe options'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+ test_commit initial &&
+ printf "%04096d" 0 >4096-zeroes.txt &&
+ git add 4096-zeroes.txt &&
+ test_tick &&
+ git commit -m "A 4k file"
+'
+test_expect_success '-G matches' '
+ git diff --name-only -G "^0{4096}$" HEAD^ >out &&
+ test 4096-zeroes.txt = "$(cat out)"
+'
+
+test_done
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index b41bd17..9ce9424 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -957,4 +957,24 @@ test_expect_success 'am -s unexpected trailer block' '
test_cmp expect actual
'
+test_expect_success 'am --patch-format=mboxrd handles mboxrd' '
+ rm -fr .git/rebase-apply &&
+ git checkout -f first &&
+ echo mboxrd >>file &&
+ git add file &&
+ cat >msg <<-\INPUT_END &&
+ mboxrd should escape the body
+
+ From could trip up a loose mbox parser
+ >From extra escape for reversibility
+ INPUT_END
+ git commit -F msg &&
+ git format-patch --pretty=mboxrd --stdout -1 >mboxrd1 &&
+ grep "^>From could trip up a loose mbox parser" mboxrd1 &&
+ git checkout -f first &&
+ git am --patch-format=mboxrd mboxrd1 &&
+ git cat-file commit HEAD | tail -n4 >out &&
+ test_cmp msg out
+'
+
test_done
diff --git a/t/t4153-am-resume-override-opts.sh b/t/t4153-am-resume-override-opts.sh
index 7c013d8..8ea22d1 100755
--- a/t/t4153-am-resume-override-opts.sh
+++ b/t/t4153-am-resume-override-opts.sh
@@ -53,7 +53,7 @@ test_expect_success '--no-quiet overrides --quiet' '
# Applying side1 will be quiet.
test_must_fail git am --quiet side[123].eml >out &&
test_path_is_dir .git/rebase-apply &&
- ! test_i18ngrep "^Applying: " out &&
+ test_i18ngrep ! "^Applying: " out &&
echo side1 >file &&
git add file &&
diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index a977365..ae08b57 100755
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -184,4 +184,10 @@ test_expect_success 'shortlog with revision pseudo options' '
git shortlog --exclude=refs/heads/m* --all
'
+test_expect_success 'shortlog with --output=<file>' '
+ git shortlog --output=shortlog -1 master >output &&
+ test ! -s output &&
+ test_line_count = 3 shortlog
+'
+
test_done
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 0b53e56..e2db47c 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -874,12 +874,15 @@ test_expect_success 'dotdot is a parent directory' '
test_cmp expect actual
'
-test_expect_success GPG 'log --graph --show-signature' '
+test_expect_success GPG 'setup signed branch' '
test_when_finished "git reset --hard && git checkout master" &&
git checkout -b signed master &&
echo foo >foo &&
git add foo &&
- git commit -S -m signed_commit &&
+ git commit -S -m signed_commit
+'
+
+test_expect_success GPG 'log --graph --show-signature' '
git log --graph --show-signature -n1 signed >actual &&
grep "^| gpg: Signature made" actual &&
grep "^| gpg: Good signature" actual
@@ -904,6 +907,31 @@ test_expect_success GPG 'log --graph --show-signature for merged tag' '
grep "^| | gpg: Good signature" actual
'
+test_expect_success GPG '--no-show-signature overrides --show-signature' '
+ git log -1 --show-signature --no-show-signature signed >actual &&
+ ! grep "^gpg:" actual
+'
+
+test_expect_success GPG 'log.showsignature=true behaves like --show-signature' '
+ test_config log.showsignature true &&
+ git log -1 signed >actual &&
+ grep "gpg: Signature made" actual &&
+ grep "gpg: Good signature" actual
+'
+
+test_expect_success GPG '--no-show-signature overrides log.showsignature=true' '
+ test_config log.showsignature true &&
+ git log -1 --no-show-signature signed >actual &&
+ ! grep "^gpg:" actual
+'
+
+test_expect_success GPG '--show-signature overrides log.showsignature=false' '
+ test_config log.showsignature false &&
+ git log -1 --show-signature signed >actual &&
+ grep "gpg: Signature made" actual &&
+ grep "gpg: Good signature" actual
+'
+
test_expect_success 'log --graph --no-walk is forbidden' '
test_must_fail git log --graph --no-walk
'
diff --git a/t/t4207-log-decoration-colors.sh b/t/t4207-log-decoration-colors.sh
index f8008b6..b972296 100755
--- a/t/t4207-log-decoration-colors.sh
+++ b/t/t4207-log-decoration-colors.sh
@@ -44,7 +44,7 @@ test_expect_success setup '
'
cat >expected <<EOF
-${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}${c_commit} ->\
+${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD ->\
${c_reset}${c_branch}master${c_reset}${c_commit},\
${c_reset}${c_tag}tag: v1.0${c_reset}${c_commit},\
${c_reset}${c_tag}tag: B${c_reset}${c_commit})${c_reset} B
diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh
index d8f23f4..001343e 100755
--- a/t/t4208-log-magic-pathspec.sh
+++ b/t/t4208-log-magic-pathspec.sh
@@ -18,7 +18,7 @@ test_expect_success '"git log :/" should not be ambiguous' '
test_expect_success '"git log :/a" should be ambiguous (applied both rev and worktree)' '
: >a &&
test_must_fail git log :/a 2>error &&
- grep ambiguous error
+ test_i18ngrep ambiguous error
'
test_expect_success '"git log :/a -- " should not be ambiguous' '
@@ -31,7 +31,7 @@ test_expect_success '"git log -- :/a" should not be ambiguous' '
test_expect_success '"git log :" should be ambiguous' '
test_must_fail git log : 2>error &&
- grep ambiguous error
+ test_i18ngrep ambiguous error
'
test_expect_success 'git log -- :' '
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 4451127..9d87777 100755
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -99,4 +99,11 @@ test_expect_success '-L with --first-parent and a merge' '
git log --first-parent -L 1,1:b.c
'
+test_expect_success '-L with --output' '
+ git checkout parallel-change &&
+ git log --output=log -L :main:b.c >output &&
+ test ! -s output &&
+ test_line_count = 70 log
+'
+
test_done
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 4b68bba..80b2387 100755
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -319,4 +319,78 @@ test_expect_success 'catch non-matching pathspec' '
test_must_fail git archive -v HEAD -- "*.abc" >/dev/null
'
+# Pull the size and date of each entry in a tarfile using the system tar.
+#
+# We'll pull out only the year from the date; that avoids any question of
+# timezones impacting the result (as long as we keep our test times away from a
+# year boundary; our reference times are all in August).
+#
+# The output of tar_info is expected to be "<size> <year>", both in decimal. It
+# ignores the return value of tar. We have to do this, because some of our test
+# input is only partial (the real data is 64GB in some cases).
+tar_info () {
+ "$TAR" tvf "$1" |
+ awk '{
+ split($4, date, "-")
+ print $3 " " date[1]
+ }'
+}
+
+# See if our system tar can handle a tar file with huge sizes and dates far in
+# the future, and that we can actually parse its output.
+#
+# The reference file was generated by GNU tar, and the magic time and size are
+# both octal 01000000000001, which overflows normal ustar fields.
+test_lazy_prereq TAR_HUGE '
+ echo "68719476737 4147" >expect &&
+ tar_info "$TEST_DIRECTORY"/t5000/huge-and-future.tar >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success LONG_IS_64BIT 'set up repository with huge blob' '
+ obj_d=19 &&
+ obj_f=f9c8273ec45a8938e6999cb59b3ff66739902a &&
+ obj=${obj_d}${obj_f} &&
+ mkdir -p .git/objects/$obj_d &&
+ cp "$TEST_DIRECTORY"/t5000/$obj .git/objects/$obj_d/$obj_f &&
+ rm -f .git/index &&
+ git update-index --add --cacheinfo 100644,$obj,huge &&
+ git commit -m huge
+'
+
+# We expect git to die with SIGPIPE here (otherwise we
+# would generate the whole 64GB).
+test_expect_success LONG_IS_64BIT 'generate tar with huge size' '
+ {
+ git archive HEAD
+ echo $? >exit-code
+ } | test_copy_bytes 4096 >huge.tar &&
+ echo 141 >expect &&
+ test_cmp expect exit-code
+'
+
+test_expect_success TAR_HUGE,LONG_IS_64BIT 'system tar can read our huge size' '
+ echo 68719476737 >expect &&
+ tar_info huge.tar | cut -d" " -f1 >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success LONG_IS_64BIT 'set up repository with far-future commit' '
+ rm -f .git/index &&
+ echo content >file &&
+ git add file &&
+ GIT_COMMITTER_DATE="@68719476737 +0000" \
+ git commit -m "tempori parendum"
+'
+
+test_expect_success LONG_IS_64BIT 'generate tar with future mtime' '
+ git archive HEAD >future.tar
+'
+
+test_expect_success TAR_HUGE,LONG_IS_64BIT 'system tar can read our future mtime' '
+ echo 4147 >expect &&
+ tar_info future.tar | cut -d" " -f2 >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t5000/19f9c8273ec45a8938e6999cb59b3ff66739902a b/t/t5000/19f9c8273ec45a8938e6999cb59b3ff66739902a
new file mode 100644
index 0000000..5cbe9ec
--- /dev/null
+++ b/t/t5000/19f9c8273ec45a8938e6999cb59b3ff66739902a
Binary files differ
diff --git a/t/t5000/huge-and-future.tar b/t/t5000/huge-and-future.tar
new file mode 100644
index 0000000..63155e1
--- /dev/null
+++ b/t/t5000/huge-and-future.tar
Binary files differ
diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh
index 85b3df5..45d228e 100755
--- a/t/t5100-mailinfo.sh
+++ b/t/t5100-mailinfo.sh
@@ -7,8 +7,10 @@ test_description='git mailinfo and git mailsplit test'
. ./test-lib.sh
+DATA="$TEST_DIRECTORY/t5100"
+
test_expect_success 'split sample box' \
- 'git mailsplit -o. "$TEST_DIRECTORY"/t5100/sample.mbox >last &&
+ 'git mailsplit -o. "$DATA/sample.mbox" >last &&
last=$(cat last) &&
echo total is $last &&
test $(cat last) = 17'
@@ -16,28 +18,28 @@ test_expect_success 'split sample box' \
check_mailinfo () {
mail=$1 opt=$2
mo="$mail$opt"
- git mailinfo -u $opt msg$mo patch$mo <$mail >info$mo &&
- test_cmp "$TEST_DIRECTORY"/t5100/msg$mo msg$mo &&
- test_cmp "$TEST_DIRECTORY"/t5100/patch$mo patch$mo &&
- test_cmp "$TEST_DIRECTORY"/t5100/info$mo info$mo
+ git mailinfo -u $opt "msg$mo" "patch$mo" <"$mail" >"info$mo" &&
+ test_cmp "$DATA/msg$mo" "msg$mo" &&
+ test_cmp "$DATA/patch$mo" "patch$mo" &&
+ test_cmp "$DATA/info$mo" "info$mo"
}
for mail in 00*
do
test_expect_success "mailinfo $mail" '
- check_mailinfo $mail "" &&
- if test -f "$TEST_DIRECTORY"/t5100/msg$mail--scissors
+ check_mailinfo "$mail" "" &&
+ if test -f "$DATA/msg$mail--scissors"
then
- check_mailinfo $mail --scissors
+ check_mailinfo "$mail" --scissors
fi &&
- if test -f "$TEST_DIRECTORY"/t5100/msg$mail--no-inbody-headers
+ if test -f "$DATA/msg$mail--no-inbody-headers"
then
- check_mailinfo $mail --no-inbody-headers
+ check_mailinfo "$mail" --no-inbody-headers
fi &&
- if test -f "$TEST_DIRECTORY"/t5100/msg$mail--message-id
+ if test -f "$DATA/msg$mail--message-id"
then
- check_mailinfo $mail --message-id
+ check_mailinfo "$mail" --message-id
fi
'
done
@@ -45,7 +47,7 @@ done
test_expect_success 'split box with rfc2047 samples' \
'mkdir rfc2047 &&
- git mailsplit -orfc2047 "$TEST_DIRECTORY"/t5100/rfc2047-samples.mbox \
+ git mailsplit -orfc2047 "$DATA/rfc2047-samples.mbox" \
>rfc2047/last &&
last=$(cat rfc2047/last) &&
echo total is $last &&
@@ -54,20 +56,20 @@ test_expect_success 'split box with rfc2047 samples' \
for mail in rfc2047/00*
do
test_expect_success "mailinfo $mail" '
- git mailinfo -u $mail-msg $mail-patch <$mail >$mail-info &&
+ git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
echo msg &&
- test_cmp "$TEST_DIRECTORY"/t5100/empty $mail-msg &&
+ test_cmp "$DATA/empty" "$mail-msg" &&
echo patch &&
- test_cmp "$TEST_DIRECTORY"/t5100/empty $mail-patch &&
+ test_cmp "$DATA/empty" "$mail-patch" &&
echo info &&
- test_cmp "$TEST_DIRECTORY"/t5100/rfc2047-info-$(basename $mail) $mail-info
+ test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
'
done
test_expect_success 'respect NULs' '
- git mailsplit -d3 -o. "$TEST_DIRECTORY"/t5100/nul-plain &&
- test_cmp "$TEST_DIRECTORY"/t5100/nul-plain 001 &&
+ git mailsplit -d3 -o. "$DATA/nul-plain" &&
+ test_cmp "$DATA/nul-plain" 001 &&
(cat 001 | git mailinfo msg patch) &&
test_line_count = 4 patch
@@ -75,40 +77,85 @@ test_expect_success 'respect NULs' '
test_expect_success 'Preserve NULs out of MIME encoded message' '
- git mailsplit -d5 -o. "$TEST_DIRECTORY"/t5100/nul-b64.in &&
- test_cmp "$TEST_DIRECTORY"/t5100/nul-b64.in 00001 &&
+ git mailsplit -d5 -o. "$DATA/nul-b64.in" &&
+ test_cmp "$DATA/nul-b64.in" 00001 &&
git mailinfo msg patch <00001 &&
- test_cmp "$TEST_DIRECTORY"/t5100/nul-b64.expect patch
+ test_cmp "$DATA/nul-b64.expect" patch
'
test_expect_success 'mailinfo on from header without name works' '
mkdir info-from &&
- git mailsplit -oinfo-from "$TEST_DIRECTORY"/t5100/info-from.in &&
- test_cmp "$TEST_DIRECTORY"/t5100/info-from.in info-from/0001 &&
+ git mailsplit -oinfo-from "$DATA/info-from.in" &&
+ test_cmp "$DATA/info-from.in" info-from/0001 &&
git mailinfo info-from/msg info-from/patch \
<info-from/0001 >info-from/out &&
- test_cmp "$TEST_DIRECTORY"/t5100/info-from.expect info-from/out
+ test_cmp "$DATA/info-from.expect" info-from/out
'
test_expect_success 'mailinfo finds headers after embedded From line' '
mkdir embed-from &&
- git mailsplit -oembed-from "$TEST_DIRECTORY"/t5100/embed-from.in &&
- test_cmp "$TEST_DIRECTORY"/t5100/embed-from.in embed-from/0001 &&
+ git mailsplit -oembed-from "$DATA/embed-from.in" &&
+ test_cmp "$DATA/embed-from.in" embed-from/0001 &&
git mailinfo embed-from/msg embed-from/patch \
<embed-from/0001 >embed-from/out &&
- test_cmp "$TEST_DIRECTORY"/t5100/embed-from.expect embed-from/out
+ test_cmp "$DATA/embed-from.expect" embed-from/out
'
test_expect_success 'mailinfo on message with quoted >From' '
mkdir quoted-from &&
- git mailsplit -oquoted-from "$TEST_DIRECTORY"/t5100/quoted-from.in &&
- test_cmp "$TEST_DIRECTORY"/t5100/quoted-from.in quoted-from/0001 &&
+ git mailsplit -oquoted-from "$DATA/quoted-from.in" &&
+ test_cmp "$DATA/quoted-from.in" quoted-from/0001 &&
git mailinfo quoted-from/msg quoted-from/patch \
<quoted-from/0001 >quoted-from/out &&
- test_cmp "$TEST_DIRECTORY"/t5100/quoted-from.expect quoted-from/msg
+ test_cmp "$DATA/quoted-from.expect" quoted-from/msg
+'
+
+test_expect_success 'mailinfo unescapes with --mboxrd' '
+ mkdir mboxrd &&
+ git mailsplit -omboxrd --mboxrd \
+ "$DATA/sample.mboxrd" >last &&
+ test x"$(cat last)" = x2 &&
+ for i in 0001 0002
+ do
+ git mailinfo mboxrd/msg mboxrd/patch \
+ <mboxrd/$i >mboxrd/out &&
+ test_cmp "$DATA/${i}mboxrd" mboxrd/msg
+ done &&
+ sp=" " &&
+ echo "From " >expect &&
+ echo "From " >>expect &&
+ echo >> expect &&
+ cat >sp <<-INPUT_END &&
+ From mboxrd Mon Sep 17 00:00:00 2001
+ From: trailing spacer <sp@example.com>
+ Subject: [PATCH] a commit with trailing space
+
+ From$sp
+ >From$sp
+
+ INPUT_END
+
+ git mailsplit -f2 -omboxrd --mboxrd <sp >last &&
+ test x"$(cat last)" = x1 &&
+ git mailinfo mboxrd/msg mboxrd/patch <mboxrd/0003 &&
+ test_cmp expect mboxrd/msg
+'
+
+test_expect_success 'mailinfo handles rfc2822 quoted-string' '
+ mkdir quoted-string &&
+ git mailinfo /dev/null /dev/null <"$DATA/quoted-string.in" \
+ >quoted-string/info &&
+ test_cmp "$DATA/quoted-string.expect" quoted-string/info
+'
+
+test_expect_success 'mailinfo handles rfc2822 comment' '
+ mkdir comment &&
+ git mailinfo /dev/null /dev/null <"$DATA/comment.in" \
+ >comment/info &&
+ test_cmp "$DATA/comment.expect" comment/info
'
test_done
diff --git a/t/t5100/0001mboxrd b/t/t5100/0001mboxrd
new file mode 100644
index 0000000..494ec55
--- /dev/null
+++ b/t/t5100/0001mboxrd
@@ -0,0 +1,4 @@
+From the beginning, mbox should have been mboxrd
+>From escaped
+From not mangled but this line should have been escaped
+
diff --git a/t/t5100/0002mboxrd b/t/t5100/0002mboxrd
new file mode 100644
index 0000000..71343d4
--- /dev/null
+++ b/t/t5100/0002mboxrd
@@ -0,0 +1,5 @@
+ >From unchanged
+ From also unchanged
+no trailing space, no escaping necessary and '>' was intended:
+>From
+
diff --git a/t/t5100/comment.expect b/t/t5100/comment.expect
new file mode 100644
index 0000000..7228177
--- /dev/null
+++ b/t/t5100/comment.expect
@@ -0,0 +1,5 @@
+Author: A U Thor (this is (really) a comment (honestly))
+Email: somebody@example.com
+Subject: testing comments
+Date: Sun, 25 May 2008 00:38:18 -0700
+
diff --git a/t/t5100/comment.in b/t/t5100/comment.in
new file mode 100644
index 0000000..c53a192
--- /dev/null
+++ b/t/t5100/comment.in
@@ -0,0 +1,9 @@
+From 1234567890123456789012345678901234567890 Mon Sep 17 00:00:00 2001
+From: "A U Thor" <somebody@example.com> (this is \(really\) a comment (honestly))
+Date: Sun, 25 May 2008 00:38:18 -0700
+Subject: [PATCH] testing comments
+
+
+
+---
+patch
diff --git a/t/t5100/quoted-string.expect b/t/t5100/quoted-string.expect
new file mode 100644
index 0000000..cab1bce
--- /dev/null
+++ b/t/t5100/quoted-string.expect
@@ -0,0 +1,5 @@
+Author: Author "The Author" Name
+Email: somebody@example.com
+Subject: testing quoted-pair
+Date: Sun, 25 May 2008 00:38:18 -0700
+
diff --git a/t/t5100/quoted-string.in b/t/t5100/quoted-string.in
new file mode 100644
index 0000000..e2e627a
--- /dev/null
+++ b/t/t5100/quoted-string.in
@@ -0,0 +1,9 @@
+From 1234567890123456789012345678901234567890 Mon Sep 17 00:00:00 2001
+From: "Author \"The Author\" Name" <somebody@example.com>
+Date: Sun, 25 May 2008 00:38:18 -0700
+Subject: [PATCH] testing quoted-pair
+
+
+
+---
+patch
diff --git a/t/t5100/sample.mboxrd b/t/t5100/sample.mboxrd
new file mode 100644
index 0000000..79ad5ae
--- /dev/null
+++ b/t/t5100/sample.mboxrd
@@ -0,0 +1,19 @@
+From mboxrd Mon Sep 17 00:00:00 2001
+From: mboxrd writer <mboxrd@example.com>
+Date: Fri, 9 Jun 2006 00:44:16 -0700
+Subject: [PATCH] a commit with escaped From lines
+
+>From the beginning, mbox should have been mboxrd
+>>From escaped
+From not mangled but this line should have been escaped
+
+From mboxrd Mon Sep 17 00:00:00 2001
+From: mboxrd writer <mboxrd@example.com>
+Date: Fri, 9 Jun 2006 00:44:16 -0700
+Subject: [PATCH 2/2] another with fake From lines
+
+ >From unchanged
+ From also unchanged
+no trailing space, no escaping necessary and '>' was intended:
+>From
+
diff --git a/t/t5305-include-tag.sh b/t/t5305-include-tag.sh
index f314ad5..a5eca21 100755
--- a/t/t5305-include-tag.sh
+++ b/t/t5305-include-tag.sh
@@ -25,58 +25,94 @@ test_expect_success setup '
} >obj-list
'
-rm -rf clone.git
test_expect_success 'pack without --include-tag' '
- packname_1=$(git pack-objects \
+ packname=$(git pack-objects \
--window=0 \
- test-1 <obj-list)
+ test-no-include <obj-list)
'
test_expect_success 'unpack objects' '
- (
- GIT_DIR=clone.git &&
- export GIT_DIR &&
- git init &&
- git unpack-objects -n <test-1-${packname_1}.pack &&
- git unpack-objects <test-1-${packname_1}.pack
- )
+ rm -rf clone.git &&
+ git init clone.git &&
+ git -C clone.git unpack-objects <test-no-include-${packname}.pack
'
test_expect_success 'check unpacked result (have commit, no tag)' '
git rev-list --objects $commit >list.expect &&
- (
- test_must_fail env GIT_DIR=clone.git git cat-file -e $tag &&
- git rev-list --objects $commit
- ) >list.actual &&
+ test_must_fail git -C clone.git cat-file -e $tag &&
+ git -C clone.git rev-list --objects $commit >list.actual &&
test_cmp list.expect list.actual
'
-rm -rf clone.git
test_expect_success 'pack with --include-tag' '
- packname_1=$(git pack-objects \
+ packname=$(git pack-objects \
--window=0 \
--include-tag \
- test-2 <obj-list)
+ test-include <obj-list)
'
test_expect_success 'unpack objects' '
- (
- GIT_DIR=clone.git &&
- export GIT_DIR &&
- git init &&
- git unpack-objects -n <test-2-${packname_1}.pack &&
- git unpack-objects <test-2-${packname_1}.pack
- )
+ rm -rf clone.git &&
+ git init clone.git &&
+ git -C clone.git unpack-objects <test-include-${packname}.pack
'
test_expect_success 'check unpacked result (have commit, have tag)' '
git rev-list --objects mytag >list.expect &&
- (
- GIT_DIR=clone.git &&
- export GIT_DIR &&
- git rev-list --objects $tag
- ) >list.actual &&
+ git -C clone.git rev-list --objects $tag >list.actual &&
test_cmp list.expect list.actual
'
+# A tag of a tag, where the "inner" tag is not otherwise
+# reachable, and a full peel points to a commit reachable from HEAD.
+test_expect_success 'create hidden inner tag' '
+ test_commit commit &&
+ git tag -m inner inner HEAD &&
+ git tag -m outer outer inner &&
+ git tag -d inner
+'
+
+test_expect_success 'pack explicit outer tag' '
+ packname=$(
+ {
+ echo HEAD &&
+ echo outer
+ } |
+ git pack-objects --revs test-hidden-explicit
+ )
+'
+
+test_expect_success 'unpack objects' '
+ rm -rf clone.git &&
+ git init clone.git &&
+ git -C clone.git unpack-objects <test-hidden-explicit-${packname}.pack
+'
+
+test_expect_success 'check unpacked result (have all objects)' '
+ git -C clone.git rev-list --objects $(git rev-parse outer HEAD)
+'
+
+test_expect_success 'pack implied outer tag' '
+ packname=$(
+ echo HEAD |
+ git pack-objects --revs --include-tag test-hidden-implied
+ )
+'
+
+test_expect_success 'unpack objects' '
+ rm -rf clone.git &&
+ git init clone.git &&
+ git -C clone.git unpack-objects <test-hidden-implied-${packname}.pack
+'
+
+test_expect_success 'check unpacked result (have all objects)' '
+ git -C clone.git rev-list --objects $(git rev-parse outer HEAD)
+'
+
+test_expect_success 'single-branch clone can transfer tag' '
+ rm -rf clone.git &&
+ git clone --no-local --single-branch -b master . clone.git &&
+ git -C clone.git fsck
+'
+
test_done
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index dd2e6ce..8198d8e 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -1182,7 +1182,7 @@ test_expect_success 'extra args: setup' '
test_extra_arg () {
test_expect_success "extra args: $*" "
test_must_fail git remote $* bogus_extra_arg 2>actual &&
- grep '^usage:' actual
+ test_i18ngrep '^usage:' actual
"
}
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 454d896..668c54b 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -644,7 +644,7 @@ test_expect_success 'fetch --prune prints the remotes url' '
git fetch --prune origin 2>&1 | head -n1 >../actual
) &&
echo "From ${D}/." >expect &&
- test_cmp expect actual
+ test_i18ncmp expect actual
'
test_expect_success 'branchname D/F conflict resolved by --prune' '
@@ -688,4 +688,34 @@ test_expect_success 'fetching with auto-gc does not lock up' '
)
'
+test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '
+ git clone . full-output &&
+ test_commit looooooooooooong-tag &&
+ (
+ cd full-output &&
+ git -c fetch.output=full fetch origin 2>&1 | \
+ grep -e "->" | cut -c 22- >../actual
+ ) &&
+ cat >expect <<-\EOF &&
+ master -> origin/master
+ looooooooooooong-tag -> looooooooooooong-tag
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '
+ git clone . compact &&
+ test_commit extraaa &&
+ (
+ cd compact &&
+ git -c fetch.output=compact fetch origin 2>&1 | \
+ grep -e "->" | cut -c 22- >../actual
+ ) &&
+ cat >expect <<-\EOF &&
+ master -> origin/*
+ extraaa -> *
+ EOF
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 739c089..5518445 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -211,7 +211,7 @@ test_expect_success 'fail if the index has unresolved entries' '
test -n "$(git ls-files -u)" &&
cp file expected &&
test_must_fail git pull . second 2>err &&
- test_i18ngrep "Pull is not possible because you have unmerged files" err &&
+ test_i18ngrep "Pulling is not possible because you have unmerged files." err &&
test_cmp expected file &&
git add file &&
test -z "$(git ls-files -u)" &&
@@ -255,6 +255,38 @@ test_expect_success '--rebase' '
test new = "$(git show HEAD:file2)"
'
+test_expect_success '--rebase with conflicts shows advice' '
+ test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
+ git checkout -b seq &&
+ test_seq 5 >seq.txt &&
+ git add seq.txt &&
+ test_tick &&
+ git commit -m "Add seq.txt" &&
+ echo 6 >>seq.txt &&
+ test_tick &&
+ git commit -m "Append to seq.txt" seq.txt &&
+ git checkout -b with-conflicts HEAD^ &&
+ echo conflicting >>seq.txt &&
+ test_tick &&
+ git commit -m "Create conflict" seq.txt &&
+ test_must_fail git pull --rebase . seq 2>err >out &&
+ test_i18ngrep "When you have resolved this problem" out
+'
+
+test_expect_success 'failed --rebase shows advice' '
+ test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
+ git checkout -b diverging &&
+ test_commit attributes .gitattributes "* text=auto" attrs &&
+ sha1="$(printf "1\\r\\n" | git hash-object -w --stdin)" &&
+ git update-index --cacheinfo 0644 $sha1 file &&
+ git commit -m v1-with-cr &&
+ # force checkout because `git reset --hard` will not leave clean `file`
+ git checkout -f -b fails-to-rebase HEAD^ &&
+ test_commit v2-without-cr file "2" file2-lf &&
+ test_must_fail git pull --rebase . diverging 2>err >out &&
+ test_i18ngrep "When you have resolved this problem" out
+'
+
test_expect_success '--rebase fails with multiple branches' '
git reset --hard before-rebase &&
test_must_fail git pull --rebase . copy master 2>err &&
@@ -341,6 +373,22 @@ test_expect_success 'branch.to-rebase.rebase should override pull.rebase' '
test new = "$(git show HEAD:file2)"
'
+test_expect_success "pull --rebase warns on --verify-signatures" '
+ git reset --hard before-rebase &&
+ git pull --rebase --verify-signatures . copy 2>err &&
+ test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
+ test new = "$(git show HEAD:file2)" &&
+ test_i18ngrep "ignoring --verify-signatures for rebase" err
+'
+
+test_expect_success "pull --rebase does not warn on --no-verify-signatures" '
+ git reset --hard before-rebase &&
+ git pull --rebase --no-verify-signatures . copy 2>err &&
+ test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
+ test new = "$(git show HEAD:file2)" &&
+ test_i18ngrep ! "verify-signatures" err
+'
+
# add a feature branch, keep-merge, that is merged into master, so the
# test can try preserving the merge commit (or not) with various
# --rebase flags/pull.rebase settings.
diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh
index 3683df1..d6981ba 100755
--- a/t/t5523-push-upstream.sh
+++ b/t/t5523-push-upstream.sh
@@ -75,7 +75,7 @@ test_expect_success TTY 'progress messages go to tty' '
ensure_fresh_upstream &&
test_terminal git push -u upstream master >out 2>err &&
- grep "Writing objects" err
+ test_i18ngrep "Writing objects" err
'
test_expect_success 'progress messages do not go to non-tty' '
@@ -83,7 +83,7 @@ test_expect_success 'progress messages do not go to non-tty' '
# skip progress messages, since stderr is non-tty
git push -u upstream master >out 2>err &&
- ! grep "Writing objects" err
+ test_i18ngrep ! "Writing objects" err
'
test_expect_success 'progress messages go to non-tty (forced)' '
@@ -91,22 +91,22 @@ test_expect_success 'progress messages go to non-tty (forced)' '
# force progress messages to stderr, even though it is non-tty
git push -u --progress upstream master >out 2>err &&
- grep "Writing objects" err
+ test_i18ngrep "Writing objects" err
'
test_expect_success TTY 'push -q suppresses progress' '
ensure_fresh_upstream &&
test_terminal git push -u -q upstream master >out 2>err &&
- ! grep "Writing objects" err
+ test_i18ngrep ! "Writing objects" err
'
test_expect_success TTY 'push --no-progress suppresses progress' '
ensure_fresh_upstream &&
test_terminal git push -u --no-progress upstream master >out 2>err &&
- ! grep "Unpacking objects" err &&
- ! grep "Writing objects" err
+ test_i18ngrep ! "Unpacking objects" err &&
+ test_i18ngrep ! "Writing objects" err
'
test_expect_success TTY 'quiet push' '
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index 954d0e4..f3b0a8d 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -485,4 +485,39 @@ test_expect_success 'fetching submodules respects parallel settings' '
)
'
+test_expect_success 'fetching submodule into a broken repository' '
+ # Prepare src and src/sub nested in it
+ git init src &&
+ (
+ cd src &&
+ git init sub &&
+ git -C sub commit --allow-empty -m "initial in sub" &&
+ git submodule add -- ./sub sub &&
+ git commit -m "initial in top"
+ ) &&
+
+ # Clone the old-fashoned way
+ git clone src dst &&
+ git -C dst clone ../src/sub sub &&
+
+ # Make sure that old-fashoned layout is still supported
+ git -C dst status &&
+
+ # "diff" would find no change
+ git -C dst diff --exit-code &&
+
+ # Recursive-fetch works fine
+ git -C dst fetch --recurse-submodules &&
+
+ # Break the receiving submodule
+ rm -f dst/sub/.git/HEAD &&
+
+ # NOTE: without the fix the following tests will recurse forever!
+ # They should terminate with an error.
+
+ test_must_fail git -C dst status &&
+ test_must_fail git -C dst diff &&
+ test_must_fail git -C dst fetch --recurse-submodules
+'
+
test_done
diff --git a/t/t5536-fetch-conflicts.sh b/t/t5536-fetch-conflicts.sh
index 6c5d3a4..2e42cf3 100755
--- a/t/t5536-fetch-conflicts.sh
+++ b/t/t5536-fetch-conflicts.sh
@@ -22,8 +22,8 @@ verify_stderr () {
cat >expected &&
# We're not interested in the error
# "fatal: The remote end hung up unexpectedly":
- grep -E '^(fatal|warning):' <error | grep -v 'hung up' >actual | sort &&
- test_cmp expected actual
+ test_i18ngrep -E '^(fatal|warning):' <error | grep -v 'hung up' >actual | sort &&
+ test_i18ncmp expected actual
}
test_expect_success 'setup' '
diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
index 9593fc1..d38bf32 100755
--- a/t/t5541-http-push-smart.sh
+++ b/t/t5541-http-push-smart.sh
@@ -74,7 +74,7 @@ test_expect_success 'push to remote repository (standard)' '
test_tick &&
git commit -m path2 &&
HEAD=$(git rev-parse --verify HEAD) &&
- GIT_CURL_VERBOSE=1 git push -v -v 2>err &&
+ GIT_TRACE_CURL=true git push -v -v 2>err &&
! grep "Expect: 100-continue" err &&
grep "POST git-receive-pack ([0-9]* bytes)" err &&
(cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
@@ -119,7 +119,7 @@ test_expect_success 'rejected update prints status' '
git commit -m dev2 &&
test_must_fail git push origin dev2 2>act &&
sed -e "/^remote: /s/ *$//" <act >cmp &&
- test_cmp exp cmp
+ test_i18ncmp exp cmp
'
rm -f "$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update"
@@ -219,7 +219,7 @@ test_expect_success TTY 'push shows progress when stderr is a tty' '
cd "$ROOT_PATH"/test_repo_clone &&
test_commit noisy &&
test_terminal git push >output 2>&1 &&
- grep "^Writing objects" output
+ test_i18ngrep "^Writing objects" output
'
test_expect_success TTY 'push --quiet silences status and progress' '
@@ -233,16 +233,16 @@ test_expect_success TTY 'push --no-progress silences progress but not status' '
cd "$ROOT_PATH"/test_repo_clone &&
test_commit no-progress &&
test_terminal git push --no-progress >output 2>&1 &&
- grep "^To http" output &&
- ! grep "^Writing objects"
+ test_i18ngrep "^To http" output &&
+ test_i18ngrep ! "^Writing objects"
'
test_expect_success 'push --progress shows progress to non-tty' '
cd "$ROOT_PATH"/test_repo_clone &&
test_commit progress &&
git push --progress >output 2>&1 &&
- grep "^To http" output &&
- grep "^Writing objects" output
+ test_i18ngrep "^To http" output &&
+ test_i18ngrep "^Writing objects" output
'
test_expect_success 'http push gives sane defaults to reflog' '
diff --git a/t/t5544-pack-objects-hook.sh b/t/t5544-pack-objects-hook.sh
new file mode 100755
index 0000000..4357af1
--- /dev/null
+++ b/t/t5544-pack-objects-hook.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+test_description='test custom script in place of pack-objects'
+. ./test-lib.sh
+
+test_expect_success 'create some history to fetch' '
+ test_commit one &&
+ test_commit two
+'
+
+test_expect_success 'create debugging hook script' '
+ write_script .git/hook <<-\EOF
+ echo >&2 "hook running"
+ echo "$*" >hook.args
+ cat >hook.stdin
+ "$@" <hook.stdin >hook.stdout
+ cat hook.stdout
+ EOF
+'
+
+clear_hook_results () {
+ rm -rf .git/hook.* dst.git
+}
+
+test_expect_success 'hook runs via global config' '
+ clear_hook_results &&
+ test_config_global uploadpack.packObjectsHook ./hook &&
+ git clone --no-local . dst.git 2>stderr &&
+ grep "hook running" stderr
+'
+
+test_expect_success 'hook outputs are sane' '
+ # check that we recorded a usable pack
+ git index-pack --stdin <.git/hook.stdout &&
+
+ # check that we recorded args and stdin. We do not check
+ # the full argument list or the exact pack contents, as it would make
+ # the test brittle. So just sanity check that we could replay
+ # the packing procedure.
+ grep "^git" .git/hook.args &&
+ $(cat .git/hook.args) <.git/hook.stdin >replay
+'
+
+test_expect_success 'hook runs from -c config' '
+ clear_hook_results &&
+ git clone --no-local \
+ -u "git -c uploadpack.packObjectsHook=./hook upload-pack" \
+ . dst.git 2>stderr &&
+ grep "hook running" stderr
+'
+
+test_expect_success 'hook does not run from repo config' '
+ clear_hook_results &&
+ test_config uploadpack.packObjectsHook "./hook" &&
+ git clone --no-local . dst.git 2>stderr &&
+ ! grep "hook running" stderr &&
+ test_path_is_missing .git/hook.args &&
+ test_path_is_missing .git/hook.stdin &&
+ test_path_is_missing .git/hook.stdout
+'
+
+test_done
diff --git a/t/t5545-push-options.sh b/t/t5545-push-options.sh
new file mode 100755
index 0000000..ea813b9
--- /dev/null
+++ b/t/t5545-push-options.sh
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+test_description='pushing to a repository using push options'
+
+. ./test-lib.sh
+
+mk_repo_pair () {
+ rm -rf workbench upstream &&
+ test_create_repo upstream &&
+ test_create_repo workbench &&
+ (
+ cd upstream &&
+ git config receive.denyCurrentBranch warn &&
+ mkdir -p .git/hooks &&
+ cat >.git/hooks/pre-receive <<-'EOF' &&
+ #!/bin/sh
+ if test -n "$GIT_PUSH_OPTION_COUNT"; then
+ i=0
+ >hooks/pre-receive.push_options
+ while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"; do
+ eval "value=\$GIT_PUSH_OPTION_$i"
+ echo $value >>hooks/pre-receive.push_options
+ i=$((i + 1))
+ done
+ fi
+ EOF
+ chmod u+x .git/hooks/pre-receive
+
+ cat >.git/hooks/post-receive <<-'EOF' &&
+ #!/bin/sh
+ if test -n "$GIT_PUSH_OPTION_COUNT"; then
+ i=0
+ >hooks/post-receive.push_options
+ while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"; do
+ eval "value=\$GIT_PUSH_OPTION_$i"
+ echo $value >>hooks/post-receive.push_options
+ i=$((i + 1))
+ done
+ fi
+ EOF
+ chmod u+x .git/hooks/post-receive
+ ) &&
+ (
+ cd workbench &&
+ git remote add up ../upstream
+ )
+}
+
+# Compare the ref ($1) in upstream with a ref value from workbench ($2)
+# i.e. test_refs second HEAD@{2}
+test_refs () {
+ test $# = 2 &&
+ git -C upstream rev-parse --verify "$1" >expect &&
+ git -C workbench rev-parse --verify "$2" >actual &&
+ test_cmp expect actual
+}
+
+test_expect_success 'one push option works for a single branch' '
+ mk_repo_pair &&
+ git -C upstream config receive.advertisePushOptions true &&
+ (
+ cd workbench &&
+ test_commit one &&
+ git push --mirror up &&
+ test_commit two &&
+ git push --push-option=asdf up master
+ ) &&
+ test_refs master master &&
+ echo "asdf" >expect &&
+ test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+ test_cmp expect upstream/.git/hooks/post-receive.push_options
+'
+
+test_expect_success 'push option denied by remote' '
+ mk_repo_pair &&
+ git -C upstream config receive.advertisePushOptions false &&
+ (
+ cd workbench &&
+ test_commit one &&
+ git push --mirror up &&
+ test_commit two &&
+ test_must_fail git push --push-option=asdf up master
+ ) &&
+ test_refs master HEAD@{1}
+'
+
+test_expect_success 'two push options work' '
+ mk_repo_pair &&
+ git -C upstream config receive.advertisePushOptions true &&
+ (
+ cd workbench &&
+ test_commit one &&
+ git push --mirror up &&
+ test_commit two &&
+ git push --push-option=asdf --push-option="more structured text" up master
+ ) &&
+ test_refs master master &&
+ printf "asdf\nmore structured text\n" >expect &&
+ test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+ test_cmp expect upstream/.git/hooks/post-receive.push_options
+'
+
+test_done
diff --git a/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh
index 3484b6f..7641417 100755
--- a/t/t5550-http-fetch-dumb.sh
+++ b/t/t5550-http-fetch-dumb.sh
@@ -263,15 +263,15 @@ check_language () {
>expect
;;
?*)
- echo "Accept-Language: $1" >expect
+ echo "=> Send header: Accept-Language: $1" >expect
;;
esac &&
- GIT_CURL_VERBOSE=1 \
+ GIT_TRACE_CURL=true \
LANGUAGE=$2 \
git ls-remote "$HTTPD_URL/dumb/repo.git" >output 2>&1 &&
tr -d '\015' <output |
sort -u |
- sed -ne '/^Accept-Language:/ p' >actual &&
+ sed -ne '/^=> Send header: Accept-Language:/ p' >actual &&
test_cmp expect actual
}
@@ -295,8 +295,16 @@ ja;q=0.95, zh;q=0.94, sv;q=0.93, pt;q=0.92, nb;q=0.91, *;q=0.90" \
'
test_expect_success 'git client does not send an empty Accept-Language' '
- GIT_CURL_VERBOSE=1 LANGUAGE= git ls-remote "$HTTPD_URL/dumb/repo.git" 2>stderr &&
- ! grep "^Accept-Language:" stderr
+ GIT_TRACE_CURL=true LANGUAGE= git ls-remote "$HTTPD_URL/dumb/repo.git" 2>stderr &&
+ ! grep "^=> Send header: Accept-Language:" stderr
+'
+
+test_expect_success 'remote-http complains cleanly about malformed urls' '
+ # do not actually issue "list" or other commands, as we do not
+ # want to rely on what curl would actually do with such a broken
+ # URL. This is just about making sure we do not segfault during
+ # initialization.
+ test_must_fail git remote-http http::/example.com/repo.git
'
stop_httpd
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
index 2f375eb..1ec5b27 100755
--- a/t/t5551-http-fetch-smart.sh
+++ b/t/t5551-http-fetch-smart.sh
@@ -43,12 +43,21 @@ cat >exp <<EOF
< Content-Type: application/x-git-upload-pack-result
EOF
test_expect_success 'clone http repository' '
- GIT_CURL_VERBOSE=1 git clone --quiet $HTTPD_URL/smart/repo.git clone 2>err &&
+ GIT_TRACE_CURL=true git clone --quiet $HTTPD_URL/smart/repo.git clone 2>err &&
test_cmp file clone/file &&
tr '\''\015'\'' Q <err |
sed -e "
s/Q\$//
/^[*] /d
+ /^== Info:/d
+ /^=> Send header, /d
+ /^=> Send header:$/d
+ /^<= Recv header, /d
+ /^<= Recv header:$/d
+ s/=> Send header: //
+ s/= Recv header://
+ /^<= Recv data/d
+ /^=> Send data/d
/^$/d
/^< $/d
@@ -261,9 +270,9 @@ test_expect_success CMDLINE_LIMIT \
'
test_expect_success 'large fetch-pack requests can be split across POSTs' '
- GIT_CURL_VERBOSE=1 git -c http.postbuffer=65536 \
+ GIT_TRACE_CURL=true git -c http.postbuffer=65536 \
clone --bare "$HTTPD_URL/smart/repo.git" split.git 2>err &&
- grep "^> POST" err >posts &&
+ grep "^=> Send header: POST" err >posts &&
test_line_count = 2 posts
'
diff --git a/t/t5614-clone-submodules.sh b/t/t5614-clone-submodules.sh
index da2a67f..a87d329 100755
--- a/t/t5614-clone-submodules.sh
+++ b/t/t5614-clone-submodules.sh
@@ -67,4 +67,56 @@ test_expect_success 'non shallow clone with shallow submodule' '
test_line_count = 1 lines
'
+test_expect_success 'clone follows shallow recommendation' '
+ test_when_finished "rm -rf super_clone" &&
+ git config -f .gitmodules submodule.sub.shallow true &&
+ git add .gitmodules &&
+ git commit -m "recommed shallow for sub" &&
+ git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&
+ (
+ cd super_clone &&
+ git log --oneline >lines &&
+ test_line_count = 4 lines
+ ) &&
+ (
+ cd super_clone/sub &&
+ git log --oneline >lines &&
+ test_line_count = 1 lines
+ )
+'
+
+test_expect_success 'get unshallow recommended shallow submodule' '
+ test_when_finished "rm -rf super_clone" &&
+ git clone --no-local "file://$pwd/." super_clone &&
+ (
+ cd super_clone &&
+ git submodule update --init --no-recommend-shallow &&
+ git log --oneline >lines &&
+ test_line_count = 4 lines
+ ) &&
+ (
+ cd super_clone/sub &&
+ git log --oneline >lines &&
+ test_line_count = 3 lines
+ )
+'
+
+test_expect_success 'clone follows non shallow recommendation' '
+ test_when_finished "rm -rf super_clone" &&
+ git config -f .gitmodules submodule.sub.shallow false &&
+ git add .gitmodules &&
+ git commit -m "recommed non shallow for sub" &&
+ git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&
+ (
+ cd super_clone &&
+ git log --oneline >lines &&
+ test_line_count = 5 lines
+ ) &&
+ (
+ cd super_clone/sub &&
+ git log --oneline >lines &&
+ test_line_count = 3 lines
+ )
+'
+
test_done
diff --git a/t/t6007-rev-list-cherry-pick-file.sh b/t/t6007-rev-list-cherry-pick-file.sh
index 28d4f6b..1408b60 100755
--- a/t/t6007-rev-list-cherry-pick-file.sh
+++ b/t/t6007-rev-list-cherry-pick-file.sh
@@ -207,4 +207,25 @@ test_expect_success '--count --left-right' '
test_cmp expect actual
'
+# Corrupt the object store deliberately to make sure
+# the object is not even checked for its existence.
+remove_loose_object () {
+ sha1="$(git rev-parse "$1")" &&
+ remainder=${sha1#??} &&
+ firsttwo=${sha1%$remainder} &&
+ rm .git/objects/$firsttwo/$remainder
+}
+
+test_expect_success '--cherry-pick avoids looking at full diffs' '
+ git checkout -b shy-diff &&
+ test_commit dont-look-at-me &&
+ echo Hello >dont-look-at-me.t &&
+ test_tick &&
+ git commit -m tip dont-look-at-me.t &&
+ git checkout -b mainline HEAD^ &&
+ test_commit to-cherry-pick &&
+ remove_loose_object shy-diff^:dont-look-at-me.t &&
+ git rev-list --cherry-pick ...shy-diff
+'
+
test_done
diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh
index e0c5f44..31db7b5 100755
--- a/t/t6010-merge-base.sh
+++ b/t/t6010-merge-base.sh
@@ -260,6 +260,12 @@ test_expect_success 'using reflog to find the fork point' '
test_cmp expect3 actual
'
+test_expect_success '--fork-point works with empty reflog' '
+ git -c core.logallrefupdates=false branch no-reflog base &&
+ git merge-base --fork-point no-reflog derived &&
+ test_cmp expect3 actual
+'
+
test_expect_success 'merge-base --octopus --all for complex tree' '
# Best common ancestor for JE, JAA and JDD is JC
# JE
diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh
index d00f7db..381f35e 100755
--- a/t/t6018-rev-list-glob.sh
+++ b/t/t6018-rev-list-glob.sh
@@ -257,7 +257,7 @@ test_expect_success 'rev-list accumulates multiple --exclude' '
# "git rev-list<ENTER>" is likely to be a bug in the calling script and may
-# deserve an error message, but do cases where set of refs programatically
+# deserve an error message, but do cases where set of refs programmatically
# given using globbing and/or --stdin need to fail with the same error, or
# are we better off reporting a success with no output? The following few
# tests document the current behaviour to remind us that we might want to
diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh
index dd8f88d..8f9b48a 100755
--- a/t/t6026-merge-attr.sh
+++ b/t/t6026-merge-attr.sh
@@ -183,14 +183,24 @@ test_expect_success 'up-to-date merge without common ancestor' '
test_expect_success 'custom merge does not lock index' '
git reset --hard anchor &&
- write_script sleep-one-second.sh <<-\EOF &&
- sleep 1 &
+ write_script sleep-an-hour.sh <<-\EOF &&
+ sleep 3600 &
+ echo $! >sleep.pid
EOF
test_write_lines >.gitattributes \
- "* merge=ours" "text merge=sleep-one-second" &&
+ "* merge=ours" "text merge=sleep-an-hour" &&
test_config merge.ours.driver true &&
- test_config merge.sleep-one-second.driver ./sleep-one-second.sh &&
+ test_config merge.sleep-an-hour.driver ./sleep-an-hour.sh &&
+
+ # We are testing that the custom merge driver does not block
+ # index.lock on Windows due to an inherited file handle.
+ # To ensure that the backgrounded process ran sufficiently
+ # long (and has been started in the first place), we do not
+ # ignore the result of the kill command.
+ # By packaging the command in test_when_finished, we get both
+ # the correctness check and the clean-up.
+ test_when_finished "kill \$(cat sleep.pid)" &&
git merge master
'
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index e74662b..5e5370f 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -362,7 +362,7 @@ test_expect_success 'bisect starting with a detached HEAD' '
test_expect_success 'bisect errors out if bad and good are mistaken' '
git bisect reset &&
test_must_fail git bisect start $HASH2 $HASH4 2> rev_list_error &&
- grep "mistook good and bad" rev_list_error &&
+ test_i18ngrep "mistook good and bad" rev_list_error &&
git bisect reset
'
@@ -404,7 +404,7 @@ test_expect_success 'side branch creation' '
test_expect_success 'good merge base when good and bad are siblings' '
git bisect start "$HASH7" "$SIDE_HASH7" > my_bisect_log.txt &&
- grep "merge base must be tested" my_bisect_log.txt &&
+ test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
grep $HASH4 my_bisect_log.txt &&
git bisect good > my_bisect_log.txt &&
test_must_fail grep "merge base must be tested" my_bisect_log.txt &&
@@ -413,7 +413,7 @@ test_expect_success 'good merge base when good and bad are siblings' '
'
test_expect_success 'skipped merge base when good and bad are siblings' '
git bisect start "$SIDE_HASH7" "$HASH7" > my_bisect_log.txt &&
- grep "merge base must be tested" my_bisect_log.txt &&
+ test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
grep $HASH4 my_bisect_log.txt &&
git bisect skip > my_bisect_log.txt 2>&1 &&
grep "warning" my_bisect_log.txt &&
@@ -423,11 +423,11 @@ test_expect_success 'skipped merge base when good and bad are siblings' '
test_expect_success 'bad merge base when good and bad are siblings' '
git bisect start "$HASH7" HEAD > my_bisect_log.txt &&
- grep "merge base must be tested" my_bisect_log.txt &&
+ test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
grep $HASH4 my_bisect_log.txt &&
test_must_fail git bisect bad > my_bisect_log.txt 2>&1 &&
- grep "merge base $HASH4 is bad" my_bisect_log.txt &&
- grep "fixed between $HASH4 and \[$SIDE_HASH7\]" my_bisect_log.txt &&
+ test_i18ngrep "merge base $HASH4 is bad" my_bisect_log.txt &&
+ test_i18ngrep "fixed between $HASH4 and \[$SIDE_HASH7\]" my_bisect_log.txt &&
git bisect reset
'
@@ -460,9 +460,9 @@ test_expect_success 'many merge bases creation' '
test_expect_success 'good merge bases when good and bad are siblings' '
git bisect start "$B_HASH" "$A_HASH" > my_bisect_log.txt &&
- grep "merge base must be tested" my_bisect_log.txt &&
+ test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
git bisect good > my_bisect_log2.txt &&
- grep "merge base must be tested" my_bisect_log2.txt &&
+ test_i18ngrep "merge base must be tested" my_bisect_log2.txt &&
{
{
grep "$SIDE_HASH5" my_bisect_log.txt &&
@@ -477,14 +477,14 @@ test_expect_success 'good merge bases when good and bad are siblings' '
test_expect_success 'optimized merge base checks' '
git bisect start "$HASH7" "$SIDE_HASH7" > my_bisect_log.txt &&
- grep "merge base must be tested" my_bisect_log.txt &&
+ test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
grep "$HASH4" my_bisect_log.txt &&
git bisect good > my_bisect_log2.txt &&
test -f ".git/BISECT_ANCESTORS_OK" &&
test "$HASH6" = $(git rev-parse --verify HEAD) &&
git bisect bad > my_bisect_log3.txt &&
git bisect good "$A_HASH" > my_bisect_log4.txt &&
- grep "merge base must be tested" my_bisect_log4.txt &&
+ test_i18ngrep "merge base must be tested" my_bisect_log4.txt &&
test_must_fail test -f ".git/BISECT_ANCESTORS_OK"
'
@@ -562,7 +562,7 @@ test_expect_success 'skipping away from skipped commit' '
test_expect_success 'erroring out when using bad path parameters' '
test_must_fail git bisect start $PARA_HASH7 $HASH1 -- foobar 2> error.txt &&
- grep "bad path parameters" error.txt
+ test_i18ngrep "bad path parameters" error.txt
'
test_expect_success 'test bisection on bare repo - --no-checkout specified' '
@@ -721,7 +721,7 @@ git bisect good 3de952f2416b6084f557ec417709eac740c6818c
# first bad commit: [32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
EOF
-test_expect_success 'bisect log: successfull result' '
+test_expect_success 'bisect log: successful result' '
git bisect reset &&
git bisect start $HASH4 $HASH2 &&
git bisect good &&
@@ -803,7 +803,7 @@ test_expect_success 'bisect terms needs 0 or 1 argument' '
test_must_fail git bisect terms 1 2 &&
test_must_fail git bisect terms 2>actual &&
echo "no terms defined" >expected &&
- test_cmp expected actual
+ test_i18ncmp expected actual
'
test_expect_success 'bisect terms shows good/bad after start' '
@@ -875,7 +875,7 @@ test_expect_success 'bisect start --term-* does store terms' '
Your current terms are two for the old state
and one for the new state.
EOF
- test_cmp expected actual &&
+ test_i18ncmp expected actual &&
git bisect terms --term-bad >actual &&
echo one >expected &&
test_cmp expected actual &&
diff --git a/t/t6301-for-each-ref-errors.sh b/t/t6301-for-each-ref-errors.sh
index cdb67a0..c734ce2 100755
--- a/t/t6301-for-each-ref-errors.sh
+++ b/t/t6301-for-each-ref-errors.sh
@@ -20,8 +20,8 @@ test_expect_success 'Broken refs are reported correctly' '
test_when_finished "rm -f .git/$r" &&
echo "warning: ignoring broken ref $r" >broken-err &&
git for-each-ref >out 2>err &&
- test_cmp full-list out &&
- test_cmp broken-err err
+ test_i18ncmp full-list out &&
+ test_i18ncmp broken-err err
'
test_expect_success 'NULL_SHA1 refs are reported correctly' '
@@ -31,10 +31,10 @@ test_expect_success 'NULL_SHA1 refs are reported correctly' '
echo "warning: ignoring broken ref $r" >zeros-err &&
git for-each-ref >out 2>err &&
test_cmp full-list out &&
- test_cmp zeros-err err &&
+ test_i18ncmp zeros-err err &&
git for-each-ref --format="%(objectname) %(refname)" >brief-out 2>brief-err &&
test_cmp brief-list brief-out &&
- test_cmp zeros-err brief-err
+ test_i18ncmp zeros-err brief-err
'
test_expect_success 'Missing objects are reported correctly' '
@@ -43,7 +43,7 @@ test_expect_success 'Missing objects are reported correctly' '
test_when_finished "rm -f .git/$r" &&
echo "fatal: missing object $MISSING for $r" >missing-err &&
test_must_fail git for-each-ref 2>err &&
- test_cmp missing-err err &&
+ test_i18ncmp missing-err err &&
(
cat brief-list &&
echo "$MISSING $r"
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 4a2570e..e365d1f 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -292,8 +292,8 @@ test_expect_success 'setup submodule' '
echo content >file &&
git add file &&
git commit -m "added sub and file" &&
- mkdir -p deep/directory/hierachy &&
- git submodule add ./. deep/directory/hierachy/sub &&
+ mkdir -p deep/directory/hierarchy &&
+ git submodule add ./. deep/directory/hierarchy/sub &&
git commit -m "added another submodule" &&
git branch submodule
'
@@ -485,8 +485,8 @@ test_expect_success 'moving a submodule in nested directories' '
# git status would fail if the update of linking git dir to
# work dir of the submodule failed.
git status &&
- git config -f ../.gitmodules submodule.deep/directory/hierachy/sub.path >../actual &&
- echo "directory/hierachy/sub" >../expect
+ git config -f ../.gitmodules submodule.deep/directory/hierarchy/sub.path >../actual &&
+ echo "directory/hierarchy/sub" >../expect
) &&
test_cmp actual expect
'
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index f9b7d79..8b0f71a 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1202,10 +1202,17 @@ test_expect_success GPG,RFC1991 \
# try to sign with bad user.signingkey
git config user.signingkey BobTheMouse
test_expect_success GPG \
- 'git tag -s fails if gpg is misconfigured' \
+ 'git tag -s fails if gpg is misconfigured (bad key)' \
'test_must_fail git tag -s -m tail tag-gpg-failure'
git config --unset user.signingkey
+# try to produce invalid signature
+test_expect_success GPG \
+ 'git tag -s fails if gpg is misconfigured (bad signature format)' \
+ 'test_config gpg.program echo &&
+ test_must_fail git tag -s -m tail tag-gpg-failure'
+
+
# try to verify without gpg:
rm -rf gpghome
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index e4fc5c8..c8dc665 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -49,6 +49,19 @@ test_expect_success TTY 'LESS and LV envvars are set for pagination' '
grep ^LV= pager-env.out
'
+test_expect_success !MINGW,TTY 'LESS and LV envvars set by git-sh-setup' '
+ (
+ sane_unset LESS LV &&
+ PAGER="env >pager-env.out; wc" &&
+ export PAGER &&
+ PATH="$(git --exec-path):$PATH" &&
+ export PATH &&
+ test_terminal sh -c ". git-sh-setup && git_pager"
+ ) &&
+ grep ^LESS= pager-env.out &&
+ grep ^LV= pager-env.out
+'
+
test_expect_success TTY 'some commands do not use a pager' '
rm -f paginated.out &&
test_terminal git rev-list HEAD &&
diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh
index 4e1e290..0667bd9 100755
--- a/t/t7063-status-untracked-cache.sh
+++ b/t/t7063-status-untracked-cache.sh
@@ -658,7 +658,7 @@ test_expect_success 'test ident field is working' '
cp -R done dthree dtwo four three ../other_worktree &&
GIT_WORK_TREE=../other_worktree git status 2>../err &&
echo "warning: Untracked cache is disabled on this system or location." >../expect &&
- test_cmp ../expect ../err
+ test_i18ncmp ../expect ../err
'
test_done
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 98bcfe2..86f23be 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -66,14 +66,14 @@ test_expect_success 'reset --hard message' '
hex=$(git log -1 --format="%h") &&
git reset --hard > .actual &&
echo HEAD is now at $hex $(commit_msg) > .expected &&
- test_cmp .expected .actual
+ test_i18ncmp .expected .actual
'
test_expect_success 'reset --hard message (ISO8859-1 logoutputencoding)' '
hex=$(git log -1 --format="%h") &&
git -c "i18n.logOutputEncoding=$test_encoding" reset --hard > .actual &&
echo HEAD is now at $hex $(commit_msg $test_encoding) > .expected &&
- test_cmp .expected .actual
+ test_i18ncmp .expected .actual
'
>.diff_expect
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 8859236..d4b217b 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -257,7 +257,7 @@ test_expect_success 'checkout to detach HEAD' '
git checkout -f renamer && git clean -f &&
git checkout renamer^ 2>messages &&
test_i18ngrep "HEAD is now at 7329388" messages &&
- test_line_count -gt 1 messages &&
+ (test_line_count -gt 1 messages || test -n "$GETTEXT_POISON") &&
H=$(git rev-parse --verify HEAD) &&
M=$(git show-ref -s --verify refs/heads/master) &&
test "z$H" = "z$M" &&
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 3570f7b..b77cce8 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -942,7 +942,7 @@ test_expect_success 'submodule deinit from subdirectory' '
cd sub &&
git submodule deinit ../init >../output
) &&
- grep "\\.\\./init" output &&
+ test_i18ngrep "\\.\\./init" output &&
test -z "$(git config --get-regexp "submodule\.example\.")" &&
test -n "$(git config --get-regexp "submodule\.example2\.")" &&
test -f example2/.git &&
diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index 5503ec0..0726799 100755
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@ -157,7 +157,7 @@ test_expect_success '"git submodule sync" should update submodule URLs - subdire
cd sub &&
git submodule sync >../../output
) &&
- grep "\\.\\./submodule" output &&
+ test_i18ngrep "\\.\\./submodule" output &&
test -d "$(
cd super-clone/submodule &&
git config remote.origin.url
@@ -188,7 +188,7 @@ test_expect_success '"git submodule sync --recursive" should update all submodul
cd sub &&
git submodule sync --recursive >../../output
) &&
- grep "\\.\\./submodule/sub-submodule" output &&
+ test_i18ngrep "\\.\\./submodule/sub-submodule" output &&
test -d "$(
cd super-clone/submodule &&
git config remote.origin.url
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 5f27879..64f322c 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -136,8 +136,8 @@ test_expect_success 'submodule update --init --recursive from subdirectory' '
cd tmp &&
git submodule update --init --recursive ../super >../../actual 2>../../actual2
) &&
- test_cmp expect actual &&
- test_cmp expect2 actual2
+ test_i18ncmp expect actual &&
+ test_i18ncmp expect2 actual2
'
apos="'";
@@ -209,9 +209,42 @@ test_expect_success 'submodule update --remote should fetch upstream changes' '
)
'
+test_expect_success 'submodule update --remote should fetch upstream changes with .' '
+ (
+ cd super &&
+ git config -f .gitmodules submodule."submodule".branch "." &&
+ git add .gitmodules &&
+ git commit -m "submodules: update from the respective superproject branch"
+ ) &&
+ (
+ cd submodule &&
+ echo line4a >> file &&
+ git add file &&
+ test_tick &&
+ git commit -m "upstream line4a" &&
+ git checkout -b test-branch &&
+ test_commit on-test-branch
+ ) &&
+ (
+ cd super &&
+ git submodule update --remote --force submodule &&
+ git -C submodule log -1 --oneline >actual
+ git -C ../submodule log -1 --oneline master >expect
+ test_cmp expect actual &&
+ git checkout -b test-branch &&
+ git submodule update --remote --force submodule &&
+ git -C submodule log -1 --oneline >actual
+ git -C ../submodule log -1 --oneline test-branch >expect
+ test_cmp expect actual &&
+ git checkout master &&
+ git branch -d test-branch &&
+ git reset --hard HEAD^
+ )
+'
+
test_expect_success 'local config should override .gitmodules branch' '
(cd submodule &&
- git checkout -b test-branch &&
+ git checkout test-branch &&
echo line5 >> file &&
git add file &&
test_tick &&
@@ -370,7 +403,7 @@ test_expect_success 'submodule update - command in .git/config catches failure'
(cd super &&
test_must_fail git submodule update submodule 2>../actual
) &&
- test_cmp actual expect
+ test_i18ncmp actual expect
'
cat << EOF >expect
@@ -388,7 +421,7 @@ test_expect_success 'submodule update - command in .git/config catches failure -
mkdir tmp && cd tmp &&
test_must_fail git submodule update ../submodule 2>../../actual
) &&
- test_cmp actual expect
+ test_i18ncmp actual expect
'
cat << EOF >expect
@@ -408,7 +441,7 @@ test_expect_success 'recursive submodule update - command in .git/config catches
mkdir -p tmp && cd tmp &&
test_must_fail git submodule update --recursive ../super 2>../../actual
) &&
- test_cmp actual expect
+ test_i18ncmp actual expect
'
test_expect_success 'submodule init does not copy command into .git/config' '
@@ -841,16 +874,35 @@ test_expect_success SYMLINKS 'submodule update can handle symbolic links in pwd'
'
test_expect_success 'submodule update clone shallow submodule' '
+ test_when_finished "rm -rf super3" &&
+ first=$(git -C cloned submodule status submodule |cut -c2-41) &&
+ second=$(git -C submodule rev-parse HEAD) &&
+ commit_count=$(git -C submodule rev-list --count $first^..$second) &&
git clone cloned super3 &&
pwd=$(pwd) &&
- (cd super3 &&
- sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
- mv -f .gitmodules.tmp .gitmodules &&
- git submodule update --init --depth=3
- (cd submodule &&
- test 1 = $(git log --oneline | wc -l)
- )
-)
+ (
+ cd super3 &&
+ sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
+ mv -f .gitmodules.tmp .gitmodules &&
+ git submodule update --init --depth=$commit_count &&
+ test 1 = $(git -C submodule log --oneline | wc -l)
+ )
+'
+
+test_expect_success 'submodule update clone shallow submodule outside of depth' '
+ test_when_finished "rm -rf super3" &&
+ git clone cloned super3 &&
+ pwd=$(pwd) &&
+ (
+ cd super3 &&
+ sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
+ mv -f .gitmodules.tmp .gitmodules &&
+ test_must_fail git submodule update --init --depth=1 2>actual &&
+ test_i18ngrep "Direct fetching of that commit failed." actual &&
+ git -C ../submodule config uploadpack.allowReachableSHA1InWant true &&
+ git submodule update --init --depth=1 >actual &&
+ test 1 = $(git -C submodule log --oneline | wc -l)
+ )
'
test_expect_success 'submodule update --recursive drops module name before recursing' '
diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh
index 400e2b1..47562ce 100755
--- a/t/t7411-submodule-config.sh
+++ b/t/t7411-submodule-config.sh
@@ -89,7 +89,7 @@ test_expect_success 'error message contains blob reference' '
HEAD b \
HEAD submodule \
2>actual_err &&
- grep "submodule-blob $sha1:.gitmodules" actual_err >/dev/null
+ test_i18ngrep "submodule-blob $sha1:.gitmodules" actual_err >/dev/null
)
'
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index a42aef8..fb00e6d 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -1377,7 +1377,7 @@ EOF
git config --add -f .gitmodules submodule.subname.ignore all &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status > output &&
- test_cmp expect output &&
+ test_i18ncmp expect output &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1387,7 +1387,7 @@ test_expect_success '.git/config ignore=all suppresses unstaged submodule summar
git config --add submodule.subname.ignore all &&
git config --add submodule.subname.path sm &&
git status > output &&
- test_cmp expect output &&
+ test_i18ncmp expect output &&
git config --remove-section submodule.subname &&
git config -f .gitmodules --remove-section submodule.subname
'
diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index 4177a86..6e839f5 100755
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -210,4 +210,11 @@ test_expect_success GPG 'show lack of signature with custom format' '
test_cmp expect actual
'
+test_expect_success GPG 'log.showsignature behaves like --show-signature' '
+ test_config log.showsignature true &&
+ git show initial >actual &&
+ grep "gpg: Signature made" actual &&
+ grep "gpg: Good signature" actual
+'
+
test_done
diff --git a/t/t7517-per-repo-email.sh b/t/t7517-per-repo-email.sh
index 337e6e3..2a22fa7 100755
--- a/t/t7517-per-repo-email.sh
+++ b/t/t7517-per-repo-email.sh
@@ -36,4 +36,51 @@ test_expect_success 'succeeds cloning if global email is not set' '
git clone . clone
'
+test_expect_success 'set up rebase scenarios' '
+ # temporarily enable an actual ident for this setup
+ test_config user.email foo@example.com &&
+ test_commit new &&
+ git branch side-without-commit HEAD^ &&
+ git checkout -b side-with-commit HEAD^ &&
+ test_commit side
+'
+
+test_expect_success 'fast-forward rebase does not care about ident' '
+ git checkout -B tmp side-without-commit &&
+ git rebase master
+'
+
+test_expect_success 'non-fast-forward rebase refuses to write commits' '
+ test_when_finished "git rebase --abort || true" &&
+ git checkout -B tmp side-with-commit &&
+ test_must_fail git rebase master
+'
+
+test_expect_success 'fast-forward rebase does not care about ident (interactive)' '
+ git checkout -B tmp side-without-commit &&
+ git rebase -i master
+'
+
+test_expect_success 'non-fast-forward rebase refuses to write commits (interactive)' '
+ test_when_finished "git rebase --abort || true" &&
+ git checkout -B tmp side-with-commit &&
+ test_must_fail git rebase -i master
+'
+
+test_expect_success 'noop interactive rebase does not care about ident' '
+ git checkout -B tmp side-with-commit &&
+ git rebase -i HEAD^
+'
+
+test_expect_success 'fast-forward rebase does not care about ident (preserve)' '
+ git checkout -B tmp side-without-commit &&
+ git rebase -p master
+'
+
+test_expect_success 'non-fast-forward rebase refuses to write commits (preserve)' '
+ test_when_finished "git rebase --abort || true" &&
+ git checkout -B tmp side-with-commit &&
+ test_must_fail git rebase -p master
+'
+
test_done
diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh
index 1c59349..9444d6a 100755
--- a/t/t7607-merge-overwrite.sh
+++ b/t/t7607-merge-overwrite.sh
@@ -125,7 +125,7 @@ test_expect_success 'will not overwrite untracked file in leading path' '
cp important sub &&
cp important sub2 &&
test_must_fail git merge sub 2>out &&
- test_cmp out expect &&
+ test_i18ncmp out expect &&
test_path_is_missing .git/MERGE_HEAD &&
test_cmp important sub &&
test_cmp important sub2 &&
diff --git a/t/t7701-repack-unpack-unreachable.sh b/t/t7701-repack-unpack-unreachable.sh
index b66e383..987573c 100755
--- a/t/t7701-repack-unpack-unreachable.sh
+++ b/t/t7701-repack-unpack-unreachable.sh
@@ -122,4 +122,32 @@ test_expect_success 'keep packed objects found only in index' '
git cat-file blob :file
'
+test_expect_success 'repack -k keeps unreachable packed objects' '
+ # create packed-but-unreachable object
+ sha1=$(echo unreachable-packed | git hash-object -w --stdin) &&
+ pack=$(echo $sha1 | git pack-objects .git/objects/pack/pack) &&
+ git prune-packed &&
+
+ # -k should keep it
+ git repack -adk &&
+ git cat-file -p $sha1 &&
+
+ # and double check that without -k it would have been removed
+ git repack -ad &&
+ test_must_fail git cat-file -p $sha1
+'
+
+test_expect_success 'repack -k packs unreachable loose objects' '
+ # create loose unreachable object
+ sha1=$(echo would-be-deleted-loose | git hash-object -w --stdin) &&
+ objpath=.git/objects/$(echo $sha1 | sed "s,..,&/,") &&
+ test_path_is_file $objpath &&
+
+ # and confirm that the loose object goes away, but we can
+ # still access it (ergo, it is packed)
+ git repack -adk &&
+ test_path_is_missing $objpath &&
+ git cat-file -p $sha1
+'
+
test_done
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index cf3f9ec..de2405c 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -581,7 +581,7 @@ test_expect_success 'log grep (9)' '
'
test_expect_success 'log grep (9)' '
- git log -g --grep-reflog="commit: third" --author="non-existant" --pretty=tformat:%s >actual &&
+ git log -g --grep-reflog="commit: third" --author="non-existent" --pretty=tformat:%s >actual &&
: >expect &&
test_cmp expect actual
'
diff --git a/t/t8002-blame.sh b/t/t8002-blame.sh
index ff09ace..ab79de9 100755
--- a/t/t8002-blame.sh
+++ b/t/t8002-blame.sh
@@ -6,6 +6,11 @@ test_description='git blame'
PROG='git blame -c'
. "$TEST_DIRECTORY"/annotate-tests.sh
+test_expect_success 'blame untracked file in empty repo' '
+ >untracked &&
+ test_must_fail git blame untracked
+'
+
PROG='git blame -c -e'
test_expect_success 'blame --show-email' '
check_count \
diff --git a/t/t9000/test.pl b/t/t9000/test.pl
index 2d05d3e..dfeaa9c 100755
--- a/t/t9000/test.pl
+++ b/t/t9000/test.pl
@@ -32,15 +32,15 @@ my @success_list = (q[Jane],
q["Jane\" Doe" <jdoe@example.com>],
q[Doe, jane <jdoe@example.com>],
q["Jane Doe <jdoe@example.com>],
- q['Jane 'Doe' <jdoe@example.com>]);
+ q['Jane 'Doe' <jdoe@example.com>],
+ q[Jane@:;\.,()<>Doe <jdoe@example.com>],
+ q[Jane <jdoe@example.com> Doe],
+ q[<jdoe@example.com> Jane Doe]);
my @known_failure_list = (q[Jane\ Doe <jdoe@example.com>],
q["Doe, Ja"ne <jdoe@example.com>],
q["Doe, Katarina" Jane <jdoe@example.com>],
- q[Jane@:;\.,()<>Doe <jdoe@example.com>],
q[Jane jdoe@example.com],
- q[<jdoe@example.com> Jane Doe],
- q[Jane <jdoe@example.com> Doe],
q["Jane "Kat"a" ri"na" ",Doe" <jdoe@example.com>],
q[Jane Doe],
q[Jane "Doe <jdoe@example.com>"],
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index b3355d2..3dc4a34 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -140,6 +140,35 @@ test_expect_success $PREREQ 'Verify commandline' '
test_cmp expected commandline1
'
+test_expect_success $PREREQ 'setup expect for cc trailer' "
+cat >expected-cc <<\EOF
+!recipient@example.com!
+!author@example.com!
+!one@example.com!
+!two@example.com!
+!three@example.com!
+!four@example.com!
+!five@example.com!
+EOF
+"
+
+test_expect_success $PREREQ 'cc trailer with various syntax' '
+ test_commit cc-trailer &&
+ test_when_finished "git reset --hard HEAD^" &&
+ git commit --amend -F - <<-EOF &&
+ Test Cc: trailers.
+
+ Cc: one@example.com
+ Cc: <two@example.com> # this is part of the name
+ Cc: <three@example.com>, <four@example.com> # not.five@example.com
+ Cc: "Some # Body" <five@example.com> [part.of.name.too]
+ EOF
+ clean_fake_sendmail &&
+ git send-email -1 --to=recipient@example.com \
+ --smtp-server="$(pwd)/fake.sendmail" &&
+ test_cmp expected-cc commandline1
+'
+
test_expect_success $PREREQ 'setup expect' "
cat >expected-show-all-headers <<\EOF
0001-Second.patch
diff --git a/t/t9003-help-autocorrect.sh b/t/t9003-help-autocorrect.sh
index dfe95c9..b1c7919 100755
--- a/t/t9003-help-autocorrect.sh
+++ b/t/t9003-help-autocorrect.sh
@@ -31,10 +31,10 @@ test_expect_success 'autocorrect showing candidates' '
git config help.autocorrect 0 &&
test_must_fail git lfg 2>actual &&
- sed -e "1,/^Did you mean this/d" actual | grep lgf &&
+ grep "^ lgf" actual &&
test_must_fail git distimdist 2>actual &&
- sed -e "1,/^Did you mean this/d" actual | grep distimdistim
+ grep "^ distimdistim" actual
'
test_expect_success 'autocorrect running commands' '
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 28082b1..92a3aa8 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -8,8 +8,6 @@ GIT_SVN_LC_ALL=${LC_ALL:-$LANG}
. ./lib-git-svn.sh
-say 'define NO_SVN_TESTS to skip git svn tests'
-
case "$GIT_SVN_LC_ALL" in
*.UTF-8)
test_set_prereq UTF8
@@ -19,6 +17,27 @@ case "$GIT_SVN_LC_ALL" in
;;
esac
+deepdir=nothing-above
+ceiling=$PWD
+
+test_expect_success 'git svn --version works anywhere' '
+ mkdir -p "$deepdir" && (
+ GIT_CEILING_DIRECTORIES="$ceiling" &&
+ export GIT_CEILING_DIRECTORIES &&
+ cd "$deepdir" &&
+ git svn --version
+ )
+'
+
+test_expect_success 'git svn help works anywhere' '
+ mkdir -p "$deepdir" && (
+ GIT_CEILING_DIRECTORIES="$ceiling" &&
+ export GIT_CEILING_DIRECTORIES &&
+ cd "$deepdir" &&
+ git svn help
+ )
+'
+
test_expect_success \
'initialize git svn' '
mkdir import &&
diff --git a/t/t9115-git-svn-dcommit-funky-renames.sh b/t/t9115-git-svn-dcommit-funky-renames.sh
index a87d3d3..64bb495 100755
--- a/t/t9115-git-svn-dcommit-funky-renames.sh
+++ b/t/t9115-git-svn-dcommit-funky-renames.sh
@@ -8,9 +8,10 @@ test_description='git svn dcommit can commit renames of files with ugly names'
. ./lib-git-svn.sh
test_expect_success 'load repository with strange names' '
- svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9115/funky-names.dump &&
- start_httpd gtk+
- '
+ svnadmin load -q "$rawsvnrepo" <"$TEST_DIRECTORY"/t9115/funky-names.dump
+'
+
+maybe_start_httpd gtk+
test_expect_success 'init and fetch repository' '
git svn init "$svnrepo" &&
diff --git a/t/t9118-git-svn-funky-branch-names.sh b/t/t9118-git-svn-funky-branch-names.sh
index ecb1fed..41a0266 100755
--- a/t/t9118-git-svn-funky-branch-names.sh
+++ b/t/t9118-git-svn-funky-branch-names.sh
@@ -32,7 +32,7 @@ test_expect_success 'setup svnrepo' '
"$svnrepo/pr ject/branches/trailing_dotlock.lock" &&
svn_cmd cp -m "reflog" "$svnrepo/pr ject/trunk" \
"$svnrepo/pr ject/branches/not-a@{0}reflog@" &&
- start_httpd
+ maybe_start_httpd
'
# SVN 1.7 will truncate "not-a%40{0]" to just "not-a".
diff --git a/t/t9120-git-svn-clone-with-percent-escapes.sh b/t/t9120-git-svn-clone-with-percent-escapes.sh
index 59465b1..b28a174 100755
--- a/t/t9120-git-svn-clone-with-percent-escapes.sh
+++ b/t/t9120-git-svn-clone-with-percent-escapes.sh
@@ -15,7 +15,7 @@ test_expect_success 'setup svnrepo' '
svn_cmd cp -m "tag" "$svnrepo/pr ject/trunk" \
"$svnrepo/pr ject/tags/v1" &&
rm -rf project &&
- start_httpd
+ maybe_start_httpd
'
test_expect_success 'test clone with percent escapes' '
diff --git a/t/t9142-git-svn-shallow-clone.sh b/t/t9142-git-svn-shallow-clone.sh
index e21ee5f..9ee23be 100755
--- a/t/t9142-git-svn-shallow-clone.sh
+++ b/t/t9142-git-svn-shallow-clone.sh
@@ -18,7 +18,7 @@ test_expect_success 'setup test repository' '
svn_cmd add foo &&
svn_cmd commit -m "add foo"
) &&
- start_httpd
+ maybe_start_httpd
'
test_expect_success 'clone trunk with "-r HEAD"' '
diff --git a/t/t9158-git-svn-mergeinfo.sh b/t/t9158-git-svn-mergeinfo.sh
index 13f78f2..a875b45 100755
--- a/t/t9158-git-svn-mergeinfo.sh
+++ b/t/t9158-git-svn-mergeinfo.sh
@@ -7,8 +7,6 @@ test_description='git svn mergeinfo propagation'
. ./lib-git-svn.sh
-say 'define NO_SVN_TESTS to skip git svn tests'
-
test_expect_success 'initialize source svn repo' '
svn_cmd mkdir -m x "$svnrepo"/trunk &&
svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
diff --git a/t/t9160-git-svn-preserve-empty-dirs.sh b/t/t9160-git-svn-preserve-empty-dirs.sh
index b4a4434..0ede3cf 100755
--- a/t/t9160-git-svn-preserve-empty-dirs.sh
+++ b/t/t9160-git-svn-preserve-empty-dirs.sh
@@ -11,7 +11,6 @@ local Git repository with placeholder files.'
. ./lib-git-svn.sh
-say 'define NO_SVN_TESTS to skip git svn tests'
GIT_REPO=git-svn-repo
test_expect_success 'initialize source svn repo containing empty dirs' '
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 4bca35c..2e0ba3e 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -7,23 +7,6 @@ test_description='test git fast-import utility'
. ./test-lib.sh
. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
-# Print $1 bytes from stdin to stdout.
-#
-# This could be written as "head -c $1", but IRIX "head" does not
-# support the -c option.
-head_c () {
- perl -e '
- my $len = $ARGV[1];
- while ($len > 0) {
- my $s;
- my $nread = sysread(STDIN, $s, $len);
- die "cannot read: $!" unless defined($nread);
- print $s;
- $len -= $nread;
- }
- ' - "$1"
-}
-
verify_packs () {
for p in .git/objects/pack/*.pack
do
@@ -52,6 +35,7 @@ echo "$@"'
###
test_expect_success 'empty stream succeeds' '
+ git config fastimport.unpackLimit 0 &&
git fast-import </dev/null
'
@@ -2480,7 +2464,7 @@ test_expect_success PIPE 'R: copy using cat-file' '
read blob_id type size <&3 &&
echo "$blob_id $type $size" >response &&
- head_c $size >blob <&3 &&
+ test_copy_bytes $size >blob <&3 &&
read newline <&3 &&
cat <<-EOF &&
@@ -2523,7 +2507,7 @@ test_expect_success PIPE 'R: print blob mid-commit' '
EOF
read blob_id type size <&3 &&
- head_c $size >actual <&3 &&
+ test_copy_bytes $size >actual <&3 &&
read newline <&3 &&
echo
@@ -2558,7 +2542,7 @@ test_expect_success PIPE 'R: print staged blob within commit' '
echo "cat-blob $to_get" &&
read blob_id type size <&3 &&
- head_c $size >actual <&3 &&
+ test_copy_bytes $size >actual <&3 &&
read newline <&3 &&
echo deleteall
@@ -2690,6 +2674,7 @@ test_expect_success 'R: blob bigger than threshold' '
echo >>input &&
test_create_repo R &&
+ git --git-dir=R/.git config fastimport.unpackLimit 0 &&
git --git-dir=R/.git fast-import --big-file-threshold=1 <input
'
diff --git a/t/t9302-fast-import-unpack-limit.sh b/t/t9302-fast-import-unpack-limit.sh
new file mode 100755
index 0000000..a04de14
--- /dev/null
+++ b/t/t9302-fast-import-unpack-limit.sh
@@ -0,0 +1,105 @@
+#!/bin/sh
+test_description='test git fast-import unpack limit'
+. ./test-lib.sh
+
+test_expect_success 'create loose objects on import' '
+ test_tick &&
+ cat >input <<-INPUT_END &&
+ commit refs/heads/master
+ committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+ data <<COMMIT
+ initial
+ COMMIT
+
+ done
+ INPUT_END
+
+ git -c fastimport.unpackLimit=2 fast-import --done <input &&
+ git fsck --no-progress &&
+ test $(find .git/objects/?? -type f | wc -l) -eq 2 &&
+ test $(find .git/objects/pack -type f | wc -l) -eq 0
+'
+
+test_expect_success 'bigger packs are preserved' '
+ test_tick &&
+ cat >input <<-INPUT_END &&
+ commit refs/heads/master
+ committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+ data <<COMMIT
+ incremental should create a pack
+ COMMIT
+ from refs/heads/master^0
+
+ commit refs/heads/branch
+ committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+ data <<COMMIT
+ branch
+ COMMIT
+
+ done
+ INPUT_END
+
+ git -c fastimport.unpackLimit=2 fast-import --done <input &&
+ git fsck --no-progress &&
+ test $(find .git/objects/?? -type f | wc -l) -eq 2 &&
+ test $(find .git/objects/pack -type f | wc -l) -eq 2
+'
+
+test_expect_success 'lookups after checkpoint works' '
+ hello_id=$(echo hello | git hash-object --stdin -t blob) &&
+ id="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE" &&
+ before=$(git rev-parse refs/heads/master^0) &&
+ (
+ cat <<-INPUT_END &&
+ blob
+ mark :1
+ data 6
+ hello
+
+ commit refs/heads/master
+ mark :2
+ committer $id
+ data <<COMMIT
+ checkpoint after this
+ COMMIT
+ from refs/heads/master^0
+ M 100644 :1 hello
+
+ # pre-checkpoint
+ cat-blob :1
+ cat-blob $hello_id
+ checkpoint
+ # post-checkpoint
+ cat-blob :1
+ cat-blob $hello_id
+ INPUT_END
+
+ n=0 &&
+ from=$before &&
+ while test x"$from" = x"$before"
+ do
+ if test $n -gt 30
+ then
+ echo >&2 "checkpoint did not update branch"
+ exit 1
+ else
+ n=$(($n + 1))
+ fi &&
+ sleep 1 &&
+ from=$(git rev-parse refs/heads/master^0)
+ done &&
+ cat <<-INPUT_END &&
+ commit refs/heads/master
+ committer $id
+ data <<COMMIT
+ make sure from "unpacked sha1 reference" works, too
+ COMMIT
+ from $from
+ INPUT_END
+ echo done
+ ) | git -c fastimport.unpackLimit=100 fast-import --done &&
+ test $(find .git/objects/?? -type f | wc -l) -eq 6 &&
+ test $(find .git/objects/pack -type f | wc -l) -eq 2
+'
+
+test_done
diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
index f324b9f..84787ee 100755
--- a/t/t9401-git-cvsserver-crlf.sh
+++ b/t/t9401-git-cvsserver-crlf.sh
@@ -154,7 +154,7 @@ test_expect_success 'adding files' '
echo "more text" > src.c &&
GIT_CONFIG="$git_config" cvs -Q add src.c >cvs.log 2>&1 &&
marked_as . src.c "" &&
- echo "psuedo-binary" > temp.bin
+ echo "pseudo-binary" > temp.bin
) &&
GIT_CONFIG="$git_config" cvs -Q add subdir/temp.bin >cvs.log 2>&1 &&
marked_as subdir temp.bin "-kb" &&
diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh
index 0aafd03..6a86d69 100755
--- a/t/t9801-git-p4-branch.sh
+++ b/t/t9801-git-p4-branch.sh
@@ -300,7 +300,7 @@ test_expect_success 'git p4 clone complex branches' '
test_path_is_file file2 &&
test_path_is_file file3 &&
! grep update file2 &&
- test_path_is_missing .git/git-p4-tmp
+ test_must_fail git show-ref --verify refs/git-p4-tmp
)
'
@@ -352,7 +352,7 @@ test_expect_success 'git p4 sync changes to two branches in the same changelist'
test_path_is_file file2 &&
test_path_is_file file3 &&
! grep update file2 &&
- test_path_is_missing .git/git-p4-tmp
+ test_must_fail git show-ref --verify refs/git-p4-tmp
)
'
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
index 0db4469..97c9b32 100755
--- a/t/t9903-bash-prompt.sh
+++ b/t/t9903-bash-prompt.sh
@@ -177,7 +177,7 @@ test_expect_success 'prompt - interactive rebase' '
git checkout b1 &&
test_when_finished "git checkout master" &&
git rebase -i HEAD^ &&
- test_when_finished "git rebase --abort"
+ test_when_finished "git rebase --abort" &&
__git_ps1 >"$actual" &&
test_cmp expected "$actual"
'
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index ca40a12..4f7eadb 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -976,3 +976,17 @@ test_match_signal () {
fi
return 1
}
+
+# Read up to "$1" bytes (or to EOF) from stdin and write them to stdout.
+test_copy_bytes () {
+ perl -e '
+ my $len = $ARGV[1];
+ while ($len > 0) {
+ my $s;
+ my $nread = sysread(STDIN, $s, $len);
+ die "cannot read: $!" unless defined($nread);
+ print $s;
+ $len -= $nread;
+ }
+ ' - "$1"
+}
diff --git a/t/test-lib.sh b/t/test-lib.sh
index d731d66..b021329 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -54,12 +54,22 @@ case "$GIT_TEST_TEE_STARTED, $* " in
done,*)
# do not redirect again
;;
-*' --tee '*|*' --va'*)
+*' --tee '*|*' --va'*|*' --verbose-log '*)
mkdir -p "$TEST_OUTPUT_DIRECTORY/test-results"
BASE="$TEST_OUTPUT_DIRECTORY/test-results/$(basename "$0" .sh)"
+
+ # Make this filename available to the sub-process in case it is using
+ # --verbose-log.
+ GIT_TEST_TEE_OUTPUT_FILE=$BASE.out
+ export GIT_TEST_TEE_OUTPUT_FILE
+
+ # Truncate before calling "tee -a" to get rid of the results
+ # from any previous runs.
+ >"$GIT_TEST_TEE_OUTPUT_FILE"
+
(GIT_TEST_TEE_STARTED=done ${SHELL_PATH} "$0" "$@" 2>&1;
- echo $? > $BASE.exit) | tee $BASE.out
- test "$(cat $BASE.exit)" = 0
+ echo $? >"$BASE.exit") | tee -a "$GIT_TEST_TEE_OUTPUT_FILE"
+ test "$(cat "$BASE.exit")" = 0
exit
;;
esac
@@ -89,6 +99,7 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e '
UNZIP
PERF_
CURL_VERBOSE
+ TRACE_CURL
));
my @vars = grep(/^GIT_/ && !/^GIT_($ok)/o, @env);
print join("\n", @vars);
@@ -245,6 +256,9 @@ do
trace=t
verbose=t
shift ;;
+ --verbose-log)
+ verbose_log=t
+ shift ;;
*)
echo "error: unknown test option '$1'" >&2; exit 1 ;;
esac
@@ -307,6 +321,16 @@ say () {
say_color info "$*"
}
+if test -n "$HARNESS_ACTIVE"
+then
+ if test "$verbose" = t || test -n "$verbose_only"
+ then
+ printf 'Bail out! %s\n' \
+ 'verbose mode forbidden under TAP harness; try --verbose-log'
+ exit 1
+ fi
+fi
+
test "${test_description}" != "" ||
error "Test script did not set test_description."
@@ -318,7 +342,10 @@ fi
exec 5>&1
exec 6<&0
-if test "$verbose" = "t"
+if test "$verbose_log" = "t"
+then
+ exec 3>>"$GIT_TEST_TEE_OUTPUT_FILE" 4>&3
+elif test "$verbose" = "t"
then
exec 4>&2 3>&1
else
@@ -687,9 +714,9 @@ test_done () {
test_results_dir="$TEST_OUTPUT_DIRECTORY/test-results"
mkdir -p "$test_results_dir"
base=${0##*/}
- test_results_path="$test_results_dir/${base%.sh}-$$.counts"
+ test_results_path="$test_results_dir/${base%.sh}.counts"
- cat >>"$test_results_path" <<-EOF
+ cat >"$test_results_path" <<-EOF
total $test_count
success $test_success
fixed $test_fixed
@@ -782,7 +809,14 @@ then
return;
base=$(basename "$1")
- symlink_target=$GIT_BUILD_DIR/$base
+ case "$base" in
+ test-*)
+ symlink_target="$GIT_BUILD_DIR/t/helper/$base"
+ ;;
+ *)
+ symlink_target="$GIT_BUILD_DIR/$base"
+ ;;
+ esac
# do not override scripts
if test -x "$symlink_target" &&
test ! -d "$symlink_target" &&
diff --git a/t/valgrind/valgrind.sh b/t/valgrind/valgrind.sh
index 4215303..669ebaf 100755
--- a/t/valgrind/valgrind.sh
+++ b/t/valgrind/valgrind.sh
@@ -1,11 +1,19 @@
#!/bin/sh
base=$(basename "$0")
+case "$base" in
+test-*)
+ program="$GIT_VALGRIND/../../t/helper/$base"
+ ;;
+*)
+ program="$GIT_VALGRIND/../../$base"
+ ;;
+esac
TOOL_OPTIONS='--leak-check=no'
test -z "$GIT_VALGRIND_ENABLED" &&
-exec "$GIT_VALGRIND"/../../"$base" "$@"
+exec "$program" "$@"
case "$GIT_VALGRIND_MODE" in
memcheck-fast)
@@ -29,4 +37,4 @@ exec valgrind -q --error-exitcode=126 \
--log-fd=4 \
--input-fd=4 \
$GIT_VALGRIND_OPTIONS \
- "$GIT_VALGRIND"/../../"$base" "$@"
+ "$program" "$@"
diff --git a/templates/hooks--pre-receive.sample b/templates/hooks--pre-receive.sample
new file mode 100755
index 0000000..a1fd29e
--- /dev/null
+++ b/templates/hooks--pre-receive.sample
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to make use of push options.
+# The example simply echoes all push options that start with 'echoback='
+# and rejects all pushes when the "reject" push option is used.
+#
+# To enable this hook, rename this file to "pre-receive".
+
+if test -n "$GIT_PUSH_OPTION_COUNT"
+then
+ i=0
+ while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
+ do
+ eval "value=\$GIT_PUSH_OPTION_$i"
+ case "$value" in
+ echoback=*)
+ echo "echo from the pre-receive-hook: ${value#*=}" >&2
+ ;;
+ reject)
+ exit 1
+ esac
+ i=$((i + 1))
+ done
+fi
diff --git a/trace.c b/trace.c
index 4aeea60..7508aea 100644
--- a/trace.c
+++ b/trace.c
@@ -25,15 +25,25 @@
#include "cache.h"
#include "quote.h"
+/*
+ * "Normalize" a key argument by converting NULL to our trace_default,
+ * and otherwise passing through the value. All caller-facing functions
+ * should normalize their inputs in this way, though most get it
+ * for free by calling get_trace_fd() (directly or indirectly).
+ */
+static void normalize_trace_key(struct trace_key **key)
+{
+ static struct trace_key trace_default = { "GIT_TRACE" };
+ if (!*key)
+ *key = &trace_default;
+}
+
/* Get a trace file descriptor from "key" env variable. */
static int get_trace_fd(struct trace_key *key)
{
- static struct trace_key trace_default = { "GIT_TRACE" };
const char *trace;
- /* use default "GIT_TRACE" if NULL */
- if (!key)
- key = &trace_default;
+ normalize_trace_key(&key);
/* don't open twice */
if (key->initialized)
@@ -51,22 +61,19 @@ static int get_trace_fd(struct trace_key *key)
else if (is_absolute_path(trace)) {
int fd = open(trace, O_WRONLY | O_APPEND | O_CREAT, 0666);
if (fd == -1) {
- fprintf(stderr,
- "Could not open '%s' for tracing: %s\n"
- "Defaulting to tracing on stderr...\n",
+ warning("could not open '%s' for tracing: %s",
trace, strerror(errno));
- key->fd = STDERR_FILENO;
+ trace_disable(key);
} else {
key->fd = fd;
key->need_close = 1;
}
} else {
- fprintf(stderr, "What does '%s' for %s mean?\n"
- "If you want to trace into a file, then please set "
- "%s to an absolute pathname (starting with /).\n"
- "Defaulting to tracing on stderr...\n",
- trace, key->key, key->key);
- key->fd = STDERR_FILENO;
+ warning("unknown trace value for '%s': %s\n"
+ " If you want to trace into a file, then please set %s\n"
+ " to an absolute pathname (starting with /)",
+ key->key, trace, key->key);
+ trace_disable(key);
}
key->initialized = 1;
@@ -75,6 +82,8 @@ static int get_trace_fd(struct trace_key *key)
void trace_disable(struct trace_key *key)
{
+ normalize_trace_key(&key);
+
if (key->need_close)
close(key->fd);
key->fd = 0;
@@ -82,9 +91,6 @@ void trace_disable(struct trace_key *key)
key->need_close = 0;
}
-static const char err_msg[] = "Could not trace into fd given by "
- "GIT_TRACE environment variable";
-
static int prepare_trace_line(const char *file, int line,
struct trace_key *key, struct strbuf *buf)
{
@@ -120,18 +126,27 @@ static int prepare_trace_line(const char *file, int line,
return 1;
}
+static void trace_write(struct trace_key *key, const void *buf, unsigned len)
+{
+ if (write_in_full(get_trace_fd(key), buf, len) < 0) {
+ normalize_trace_key(&key);
+ warning("unable to write trace for %s: %s",
+ key->key, strerror(errno));
+ trace_disable(key);
+ }
+}
+
void trace_verbatim(struct trace_key *key, const void *buf, unsigned len)
{
if (!trace_want(key))
return;
- write_or_whine_pipe(get_trace_fd(key), buf, len, err_msg);
+ trace_write(key, buf, len);
}
static void print_trace_line(struct trace_key *key, struct strbuf *buf)
{
strbuf_complete_line(buf);
-
- write_or_whine_pipe(get_trace_fd(key), buf->buf, buf->len, err_msg);
+ trace_write(key, buf->buf, buf->len);
strbuf_release(buf);
}
diff --git a/trailer.c b/trailer.c
index 8e48a5c..aecaf92 100644
--- a/trailer.c
+++ b/trailer.c
@@ -428,12 +428,9 @@ static int set_if_missing(struct conf_info *item, const char *value)
static void duplicate_conf(struct conf_info *dst, struct conf_info *src)
{
*dst = *src;
- if (src->name)
- dst->name = xstrdup(src->name);
- if (src->key)
- dst->key = xstrdup(src->key);
- if (src->command)
- dst->command = xstrdup(src->command);
+ dst->name = xstrdup_or_null(src->name);
+ dst->key = xstrdup_or_null(src->key);
+ dst->command = xstrdup_or_null(src->command);
}
static struct trailer_item *get_conf_item(const char *name)
@@ -562,7 +559,7 @@ static int git_trailer_config(const char *conf_key, const char *value, void *cb)
warning(_("unknown value '%s' for key '%s'"), value, conf_key);
break;
default:
- die("internal bug in trailer.c");
+ die("BUG: trailer.c: unhandled type %d", type);
}
return 0;
}
diff --git a/transport-helper.c b/transport-helper.c
index bd666b2..db2f930 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -1038,7 +1038,7 @@ static struct ref *get_refs_list(struct transport *transport, int for_push)
(*tail)->status |= REF_STATUS_UPTODATE;
if (read_ref((*tail)->name,
(*tail)->old_oid.hash) < 0)
- die(N_("Could not read ref %s"),
+ die(_("Could not read ref %s"),
(*tail)->name);
}
}
@@ -1103,7 +1103,7 @@ static void transfer_debug(const char *fmt, ...)
}
/* Stream state: More data may be coming in this direction. */
-#define SSTATE_TRANSFERING 0
+#define SSTATE_TRANSFERRING 0
/*
* Stream state: No more data coming in this direction, flushing rest of
* data.
@@ -1112,7 +1112,7 @@ static void transfer_debug(const char *fmt, ...)
/* Stream state: Transfer in this direction finished. */
#define SSTATE_FINISHED 2
-#define STATE_NEEDS_READING(state) ((state) <= SSTATE_TRANSFERING)
+#define STATE_NEEDS_READING(state) ((state) <= SSTATE_TRANSFERRING)
#define STATE_NEEDS_WRITING(state) ((state) <= SSTATE_FLUSHING)
#define STATE_NEEDS_CLOSING(state) ((state) == SSTATE_FLUSHING)
@@ -1369,7 +1369,7 @@ int bidirectional_transfer_loop(int input, int output)
state.ptg.dest = 1;
state.ptg.src_is_sock = (input == output);
state.ptg.dest_is_sock = 0;
- state.ptg.state = SSTATE_TRANSFERING;
+ state.ptg.state = SSTATE_TRANSFERRING;
state.ptg.bufuse = 0;
state.ptg.src_name = "remote input";
state.ptg.dest_name = "stdout";
@@ -1378,7 +1378,7 @@ int bidirectional_transfer_loop(int input, int output)
state.gtp.dest = output;
state.gtp.src_is_sock = 0;
state.gtp.dest_is_sock = (input == output);
- state.gtp.state = SSTATE_TRANSFERING;
+ state.gtp.state = SSTATE_TRANSFERRING;
state.gtp.bufuse = 0;
state.gtp.src_name = "stdin";
state.gtp.dest_name = "remote output";
diff --git a/transport.c b/transport.c
index 41eb82c..94d6dc3 100644
--- a/transport.c
+++ b/transport.c
@@ -59,7 +59,7 @@ static void set_upstreams(struct transport *transport, struct ref *refs,
localname + 11, transport->remote->name,
remotename);
else
- printf("Would set upstream of '%s' to '%s' of '%s'\n",
+ printf(_("Would set upstream of '%s' to '%s' of '%s'\n"),
localname + 11, remotename + 11,
transport->remote->name);
}
@@ -148,7 +148,7 @@ static int set_git_option(struct git_transport_options *opts,
char *end;
opts->depth = strtol(value, &end, 0);
if (*end)
- die("transport: invalid depth option '%s'", value);
+ die(_("transport: invalid depth option '%s'"), value);
}
return 0;
}
@@ -510,6 +510,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN);
args.porcelain = !!(flags & TRANSPORT_PUSH_PORCELAIN);
args.atomic = !!(flags & TRANSPORT_PUSH_ATOMIC);
+ args.push_options = transport->push_options;
args.url = transport->url;
if (flags & TRANSPORT_PUSH_CERT_ALWAYS)
@@ -563,7 +564,7 @@ void transport_take_over(struct transport *transport,
struct git_transport_data *data;
if (!transport->smart_options)
- die("Bug detected: Taking over transport requires non-NULL "
+ die("BUG: taking over transport requires non-NULL "
"smart_options field.");
data = xcalloc(1, sizeof(*data));
@@ -767,19 +768,19 @@ static void die_with_unpushed_submodules(struct string_list *needs_pushing)
{
int i;
- fprintf(stderr, "The following submodule paths contain changes that can\n"
- "not be found on any remote:\n");
+ fprintf(stderr, _("The following submodule paths contain changes that can\n"
+ "not be found on any remote:\n"));
for (i = 0; i < needs_pushing->nr; i++)
- printf(" %s\n", needs_pushing->items[i].string);
- fprintf(stderr, "\nPlease try\n\n"
- " git push --recurse-submodules=on-demand\n\n"
- "or cd to the path and use\n\n"
- " git push\n\n"
- "to push them to a remote.\n\n");
+ fprintf(stderr, " %s\n", needs_pushing->items[i].string);
+ fprintf(stderr, _("\nPlease try\n\n"
+ " git push --recurse-submodules=on-demand\n\n"
+ "or cd to the path and use\n\n"
+ " git push\n\n"
+ "to push them to a remote.\n\n"));
string_list_clear(needs_pushing, 0);
- die("Aborting.");
+ die(_("Aborting."));
}
static int run_pre_push_hook(struct transport *transport,
diff --git a/transport.h b/transport.h
index c681408..6fe3485 100644
--- a/transport.h
+++ b/transport.h
@@ -48,6 +48,12 @@ struct transport {
*/
unsigned cloning : 1;
+ /*
+ * These strings will be passed to the {pre, post}-receive hook,
+ * on the remote side, if both sides support the push options capability.
+ */
+ const struct string_list *push_options;
+
/**
* Returns 0 if successful, positive if the option is not
* recognized or is inapplicable, and negative if the option
@@ -134,6 +140,7 @@ struct transport {
#define TRANSPORT_PUSH_CERT_ALWAYS 2048
#define TRANSPORT_PUSH_CERT_IF_ASKED 4096
#define TRANSPORT_PUSH_ATOMIC 8192
+#define TRANSPORT_PUSH_OPTIONS 16384
#define TRANSPORT_SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
#define TRANSPORT_SUMMARY(x) (int)(TRANSPORT_SUMMARY_WIDTH + strlen(x) - gettext_width(x)), (x)
diff --git a/tree-diff.c b/tree-diff.c
index ebf40f4..e164e53 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -617,7 +617,7 @@ static void try_to_follow_renames(const unsigned char *old, const unsigned char
diff_setup_done(&diff_opts);
ll_diff_tree_sha1(old, new, base, &diff_opts);
diffcore_std(&diff_opts);
- free_pathspec(&diff_opts.pathspec);
+ clear_pathspec(&diff_opts.pathspec);
/* Go through the new set of filepairing, and see if we find a more interesting one */
opt->found_follow = 0;
@@ -640,7 +640,7 @@ static void try_to_follow_renames(const unsigned char *old, const unsigned char
/* Update the path we use from now on.. */
path[0] = p->one->path;
path[1] = NULL;
- free_pathspec(&opt->pathspec);
+ clear_pathspec(&opt->pathspec);
parse_pathspec(&opt->pathspec,
PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
PATHSPEC_LITERAL_PATH, "", path);
diff --git a/unpack-trees.c b/unpack-trees.c
index 11c37fb..2a963f9 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -123,9 +123,9 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] =
_("Cannot update sparse checkout: the following entries are not up-to-date:\n%s");
msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] =
- _("The following Working tree files would be overwritten by sparse checkout update:\n%s");
+ _("The following working tree files would be overwritten by sparse checkout update:\n%s");
msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
- _("The following Working tree files would be removed by sparse checkout update:\n%s");
+ _("The following working tree files would be removed by sparse checkout update:\n%s");
opts->show_all_errors = 1;
/* rejected paths may not have a static buffer */
@@ -218,8 +218,8 @@ static void unlink_entry(const struct cache_entry *ce)
schedule_dir_for_removal(ce->name, ce_namelen(ce));
}
-static struct checkout state;
-static int check_updates(struct unpack_trees_options *o)
+static int check_updates(struct unpack_trees_options *o,
+ const struct checkout *state)
{
unsigned cnt = 0, total = 0;
struct progress *progress = NULL;
@@ -264,7 +264,7 @@ static int check_updates(struct unpack_trees_options *o)
display_progress(progress, ++cnt);
ce->ce_flags &= ~CE_UPDATE;
if (o->update && !o->dry_run) {
- errs |= checkout_entry(ce, &state, NULL);
+ errs |= checkout_entry(ce, state, NULL);
}
}
}
@@ -1094,6 +1094,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
int i, ret;
static struct cache_entry *dfc;
struct exclude_list el;
+ struct checkout state;
if (len > MAX_UNPACK_TREES)
die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
@@ -1239,7 +1240,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
}
o->src_index = NULL;
- ret = check_updates(o) ? (-2) : 0;
+ ret = check_updates(o, &state) ? (-2) : 0;
if (o->dst_index) {
if (!ret) {
if (!o->result.cache_tree)
diff --git a/upload-pack.c b/upload-pack.c
index 26746f6..ca7f941 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -14,8 +14,12 @@
#include "sigchain.h"
#include "version.h"
#include "string-list.h"
+#include "parse-options.h"
-static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=<n>] <dir>";
+static const char * const upload_pack_usage[] = {
+ N_("git upload-pack [<options>] <dir>"),
+ NULL
+};
/* Remember to update object flag allocation in object.h */
#define THEY_HAVE (1u << 11)
@@ -52,6 +56,7 @@ static int keepalive = 5;
static int use_sideband;
static int advertise_refs;
static int stateless_rpc;
+static const char *pack_objects_hook;
static void reset_timeout(void)
{
@@ -94,6 +99,14 @@ static void create_pack_file(void)
int i;
FILE *pipe_fd;
+ if (!pack_objects_hook)
+ pack_objects.git_cmd = 1;
+ else {
+ argv_array_push(&pack_objects.args, pack_objects_hook);
+ argv_array_push(&pack_objects.args, "git");
+ pack_objects.use_shell = 1;
+ }
+
if (shallow_nr) {
argv_array_push(&pack_objects.args, "--shallow-file");
argv_array_push(&pack_objects.args, "");
@@ -116,7 +129,6 @@ static void create_pack_file(void)
pack_objects.in = -1;
pack_objects.out = -1;
pack_objects.err = -1;
- pack_objects.git_cmd = 1;
if (start_command(&pack_objects))
die("git upload-pack: unable to fork git-pack-objects");
@@ -809,6 +821,9 @@ static int upload_pack_config(const char *var, const char *value, void *unused)
keepalive = git_config_int(var, value);
if (!keepalive)
keepalive = -1;
+ } else if (current_config_scope() != CONFIG_SCOPE_REPO) {
+ if (!strcmp("uploadpack.packobjectshook", var))
+ return git_config_string(&pack_objects_hook, var, value);
}
return parse_hide_refs_config(var, value, "uploadpack");
}
@@ -816,46 +831,33 @@ static int upload_pack_config(const char *var, const char *value, void *unused)
int cmd_main(int argc, const char **argv)
{
const char *dir;
- int i;
int strict = 0;
+ struct option options[] = {
+ OPT_BOOL(0, "stateless-rpc", &stateless_rpc,
+ N_("quit after a single request/response exchange")),
+ OPT_BOOL(0, "advertise-refs", &advertise_refs,
+ N_("exit immediately after initial ref advertisement")),
+ OPT_BOOL(0, "strict", &strict,
+ N_("do not try <directory>/.git/ if <directory> is no Git directory")),
+ OPT_INTEGER(0, "timeout", &timeout,
+ N_("interrupt transfer after <n> seconds of inactivity")),
+ OPT_END()
+ };
packet_trace_identity("upload-pack");
check_replace_refs = 0;
- for (i = 1; i < argc; i++) {
- const char *arg = argv[i];
+ argc = parse_options(argc, argv, NULL, options, upload_pack_usage, 0);
- if (arg[0] != '-')
- break;
- if (!strcmp(arg, "--advertise-refs")) {
- advertise_refs = 1;
- continue;
- }
- if (!strcmp(arg, "--stateless-rpc")) {
- stateless_rpc = 1;
- continue;
- }
- if (!strcmp(arg, "--strict")) {
- strict = 1;
- continue;
- }
- if (starts_with(arg, "--timeout=")) {
- timeout = atoi(arg+10);
- daemon_mode = 1;
- continue;
- }
- if (!strcmp(arg, "--")) {
- i++;
- break;
- }
- }
+ if (argc != 1)
+ usage_with_options(upload_pack_usage, options);
- if (i != argc-1)
- usage(upload_pack_usage);
+ if (timeout)
+ daemon_mode = 1;
setup_path();
- dir = argv[i];
+ dir = argv[0];
if (!enter_repo(dir, strict))
die("'%s' does not appear to be a git repository", dir);
diff --git a/url.c b/url.c
index 2d89ad1..eaf4f07 100644
--- a/url.c
+++ b/url.c
@@ -29,25 +29,6 @@ int is_url(const char *url)
return (url[0] == ':' && url[1] == '/' && url[2] == '/');
}
-static int url_decode_char(const char *q)
-{
- int i;
- unsigned char val = 0;
- for (i = 0; i < 2; i++) {
- unsigned char c = *q++;
- val <<= 4;
- if (c >= '0' && c <= '9')
- val += c - '0';
- else if (c >= 'a' && c <= 'f')
- val += c - 'a' + 10;
- else if (c >= 'A' && c <= 'F')
- val += c - 'A' + 10;
- else
- return -1;
- }
- return val;
-}
-
static char *url_decode_internal(const char **query, int len,
const char *stop_at, struct strbuf *out,
int decode_plus)
@@ -66,7 +47,7 @@ static char *url_decode_internal(const char **query, int len,
}
if (c == '%') {
- int val = url_decode_char(q + 1);
+ int val = hex2chr(q + 1);
if (0 <= val) {
strbuf_addch(out, val);
q += 3;
diff --git a/usage.c b/usage.c
index 1dad03f..0efa3fa 100644
--- a/usage.c
+++ b/usage.c
@@ -148,6 +148,7 @@ void NORETURN die_errno(const char *fmt, ...)
va_end(params);
}
+#undef error_errno
int error_errno(const char *fmt, ...)
{
char buf[1024];
diff --git a/userdiff.c b/userdiff.c
index 6bf2505..2125d6d 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -148,6 +148,18 @@ PATTERNS("csharp",
"[a-zA-Z_][a-zA-Z0-9_]*"
"|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?"
"|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"),
+IPATTERN("css",
+ "![:;][[:space:]]*$\n"
+ "^[_a-z0-9].*$",
+ /* -- */
+ /*
+ * This regex comes from W3C CSS specs. Should theoretically also
+ * allow ISO 10646 characters U+00A0 and higher,
+ * but they are not handled in this regex.
+ */
+ "-?[_a-zA-Z][-_a-zA-Z0-9]*" /* identifiers */
+ "|-?[0-9]+|\\#[0-9a-fA-F]+" /* numbers */
+),
{ "default", NULL, -1, { NULL, 0 } },
};
#undef PATTERNS
diff --git a/vcs-svn/fast_export.c b/vcs-svn/fast_export.c
index bd0f2c2..97cba39 100644
--- a/vcs-svn/fast_export.c
+++ b/vcs-svn/fast_export.c
@@ -73,7 +73,7 @@ void fast_export_begin_note(uint32_t revision, const char *author,
static int firstnote = 1;
size_t loglen = strlen(log);
printf("commit %s\n", note_ref);
- printf("committer %s <%s@%s> %ld +0000\n", author, author, "local", timestamp);
+ printf("committer %s <%s@%s> %lu +0000\n", author, author, "local", timestamp);
printf("data %"PRIuMAX"\n", (uintmax_t)loglen);
fwrite(log, loglen, 1, stdout);
if (firstnote) {
@@ -107,7 +107,7 @@ void fast_export_begin_commit(uint32_t revision, const char *author,
}
printf("commit %s\n", local_ref);
printf("mark :%"PRIu32"\n", revision);
- printf("committer %s <%s@%s> %ld +0000\n",
+ printf("committer %s <%s@%s> %lu +0000\n",
*author ? author : "nobody",
*author ? author : "nobody",
*uuid ? uuid : "local", timestamp);
diff --git a/walker.c b/walker.c
index d95b007..2c86e40 100644
--- a/walker.c
+++ b/walker.c
@@ -9,10 +9,14 @@
static unsigned char current_commit_sha1[20];
-void walker_say(struct walker *walker, const char *fmt, const char *hex)
+void walker_say(struct walker *walker, const char *fmt, ...)
{
- if (walker->get_verbosely)
- fprintf(stderr, fmt, hex);
+ if (walker->get_verbosely) {
+ va_list ap;
+ va_start(ap, fmt);
+ vfprintf(stderr, fmt, ap);
+ va_end(ap);
+ }
}
static void report_missing(const struct object *obj)
diff --git a/walker.h b/walker.h
index 95e5765..a869013 100644
--- a/walker.h
+++ b/walker.h
@@ -19,7 +19,8 @@ struct walker {
};
/* Report what we got under get_verbosely */
-void walker_say(struct walker *walker, const char *, const char *);
+__attribute__((format (printf, 2, 3)))
+void walker_say(struct walker *walker, const char *fmt, ...);
/* Load pull targets from stdin */
int walker_targets_stdin(char ***target, const char ***write_ref);
diff --git a/worktree.c b/worktree.c
index 6b4f5f3..f7869f8 100644
--- a/worktree.c
+++ b/worktree.c
@@ -13,6 +13,7 @@ void free_worktrees(struct worktree **worktrees)
free(worktrees[i]->path);
free(worktrees[i]->id);
free(worktrees[i]->head_ref);
+ free(worktrees[i]->lock_reason);
free(worktrees[i]);
}
free (worktrees);
@@ -98,6 +99,8 @@ static struct worktree *get_main_worktree(void)
worktree->is_detached = is_detached;
worktree->is_current = 0;
add_head_info(&head_ref, worktree);
+ worktree->lock_reason = NULL;
+ worktree->lock_reason_valid = 0;
done:
strbuf_release(&path);
@@ -143,6 +146,8 @@ static struct worktree *get_linked_worktree(const char *id)
worktree->is_detached = is_detached;
worktree->is_current = 0;
add_head_info(&head_ref, worktree);
+ worktree->lock_reason = NULL;
+ worktree->lock_reason_valid = 0;
done:
strbuf_release(&path);
@@ -153,21 +158,19 @@ done:
static void mark_current_worktree(struct worktree **worktrees)
{
- struct strbuf git_dir = STRBUF_INIT;
- struct strbuf path = STRBUF_INIT;
+ char *git_dir = xstrdup(absolute_path(get_git_dir()));
int i;
- strbuf_addstr(&git_dir, absolute_path(get_git_dir()));
for (i = 0; worktrees[i]; i++) {
struct worktree *wt = worktrees[i];
- strbuf_addstr(&path, absolute_path(get_worktree_git_dir(wt)));
- wt->is_current = !fspathcmp(git_dir.buf, path.buf);
- strbuf_reset(&path);
- if (wt->is_current)
+ const char *wt_git_dir = get_worktree_git_dir(wt);
+
+ if (!fspathcmp(git_dir, absolute_path(wt_git_dir))) {
+ wt->is_current = 1;
break;
+ }
}
- strbuf_release(&git_dir);
- strbuf_release(&path);
+ free(git_dir);
}
struct worktree **get_worktrees(void)
@@ -189,7 +192,7 @@ struct worktree **get_worktrees(void)
if (dir) {
while ((d = readdir(dir)) != NULL) {
struct worktree *linked = NULL;
- if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
+ if (is_dot_or_dotdot(d->d_name))
continue;
if ((linked = get_linked_worktree(d->d_name))) {
@@ -216,6 +219,78 @@ const char *get_worktree_git_dir(const struct worktree *wt)
return git_common_path("worktrees/%s", wt->id);
}
+static struct worktree *find_worktree_by_suffix(struct worktree **list,
+ const char *suffix)
+{
+ struct worktree *found = NULL;
+ int nr_found = 0, suffixlen;
+
+ suffixlen = strlen(suffix);
+ if (!suffixlen)
+ return NULL;
+
+ for (; *list && nr_found < 2; list++) {
+ const char *path = (*list)->path;
+ int pathlen = strlen(path);
+ int start = pathlen - suffixlen;
+
+ /* suffix must start at directory boundary */
+ if ((!start || (start > 0 && is_dir_sep(path[start - 1]))) &&
+ !fspathcmp(suffix, path + start)) {
+ found = *list;
+ nr_found++;
+ }
+ }
+ return nr_found == 1 ? found : NULL;
+}
+
+struct worktree *find_worktree(struct worktree **list,
+ const char *prefix,
+ const char *arg)
+{
+ struct worktree *wt;
+ char *path;
+
+ if ((wt = find_worktree_by_suffix(list, arg)))
+ return wt;
+
+ arg = prefix_filename(prefix, strlen(prefix), arg);
+ path = xstrdup(real_path(arg));
+ for (; *list; list++)
+ if (!fspathcmp(path, real_path((*list)->path)))
+ break;
+ free(path);
+ return *list;
+}
+
+int is_main_worktree(const struct worktree *wt)
+{
+ return !wt->id;
+}
+
+const char *is_worktree_locked(struct worktree *wt)
+{
+ assert(!is_main_worktree(wt));
+
+ if (!wt->lock_reason_valid) {
+ struct strbuf path = STRBUF_INIT;
+
+ strbuf_addstr(&path, worktree_git_path(wt, "locked"));
+ if (file_exists(path.buf)) {
+ struct strbuf lock_reason = STRBUF_INIT;
+ if (strbuf_read_file(&lock_reason, path.buf, 0) < 0)
+ die_errno(_("failed to read '%s'"), path.buf);
+ strbuf_trim(&lock_reason);
+ wt->lock_reason = strbuf_detach(&lock_reason, NULL);
+ } else
+ wt->lock_reason = NULL;
+ wt->lock_reason_valid = 1;
+ strbuf_release(&path);
+ }
+
+ return wt->lock_reason;
+}
+
int is_worktree_being_rebased(const struct worktree *wt,
const char *target)
{
@@ -270,6 +345,8 @@ const struct worktree *find_shared_symref(const char *symref,
for (i = 0; worktrees[i]; i++) {
struct worktree *wt = worktrees[i];
+ if (wt->is_bare)
+ continue;
if (wt->is_detached && !strcmp(symref, "HEAD")) {
if (is_worktree_being_rebased(wt, target)) {
diff --git a/worktree.h b/worktree.h
index 1394909..90e1311 100644
--- a/worktree.h
+++ b/worktree.h
@@ -5,10 +5,12 @@ struct worktree {
char *path;
char *id;
char *head_ref;
+ char *lock_reason; /* internal use */
unsigned char head_sha1[20];
int is_detached;
int is_bare;
int is_current;
+ int lock_reason_valid;
};
/* Functions for acting on the information about worktrees. */
@@ -30,6 +32,25 @@ extern struct worktree **get_worktrees(void);
extern const char *get_worktree_git_dir(const struct worktree *wt);
/*
+ * Search a worktree that can be unambiguously identified by
+ * "arg". "prefix" must not be NULL.
+ */
+extern struct worktree *find_worktree(struct worktree **list,
+ const char *prefix,
+ const char *arg);
+
+/*
+ * Return true if the given worktree is the main one.
+ */
+extern int is_main_worktree(const struct worktree *wt);
+
+/*
+ * Return the reason string if the given worktree is locked or NULL
+ * otherwise.
+ */
+extern const char *is_worktree_locked(struct worktree *wt);
+
+/*
* Free up the memory for worktree(s)
*/
extern void free_worktrees(struct worktree **);
diff --git a/wrapper.c b/wrapper.c
index 26db215..e7f1979 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -651,56 +651,28 @@ int xsnprintf(char *dst, size_t max, const char *fmt, ...)
return len;
}
-static int write_file_v(const char *path, int fatal,
- const char *fmt, va_list params)
+void write_file_buf(const char *path, const char *buf, size_t len)
{
- struct strbuf sb = STRBUF_INIT;
- int fd = open(path, O_RDWR | O_CREAT | O_TRUNC, 0666);
- if (fd < 0) {
- if (fatal)
- die_errno(_("could not open %s for writing"), path);
- return -1;
- }
- strbuf_vaddf(&sb, fmt, params);
- strbuf_complete_line(&sb);
- if (write_in_full(fd, sb.buf, sb.len) != sb.len) {
- int err = errno;
- close(fd);
- strbuf_release(&sb);
- errno = err;
- if (fatal)
- die_errno(_("could not write to %s"), path);
- return -1;
- }
- strbuf_release(&sb);
- if (close(fd)) {
- if (fatal)
- die_errno(_("could not close %s"), path);
- return -1;
- }
- return 0;
+ int fd = xopen(path, O_WRONLY | O_CREAT | O_TRUNC, 0666);
+ if (write_in_full(fd, buf, len) != len)
+ die_errno(_("could not write to %s"), path);
+ if (close(fd))
+ die_errno(_("could not close %s"), path);
}
-int write_file(const char *path, const char *fmt, ...)
+void write_file(const char *path, const char *fmt, ...)
{
- int status;
va_list params;
+ struct strbuf sb = STRBUF_INIT;
va_start(params, fmt);
- status = write_file_v(path, 1, fmt, params);
+ strbuf_vaddf(&sb, fmt, params);
va_end(params);
- return status;
-}
-int write_file_gently(const char *path, const char *fmt, ...)
-{
- int status;
- va_list params;
+ strbuf_complete_line(&sb);
- va_start(params, fmt);
- status = write_file_v(path, 0, fmt, params);
- va_end(params);
- return status;
+ write_file_buf(path, sb.buf, sb.len);
+ strbuf_release(&sb);
}
void sleep_millisec(int millisec)
diff --git a/write_or_die.c b/write_or_die.c
index 9816879..0734432 100644
--- a/write_or_die.c
+++ b/write_or_die.c
@@ -82,15 +82,3 @@ void write_or_die(int fd, const void *buf, size_t count)
die_errno("write error");
}
}
-
-int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg)
-{
- if (write_in_full(fd, buf, count) < 0) {
- check_pipe(errno);
- fprintf(stderr, "%s: write error (%s)\n",
- msg, strerror(errno));
- return 0;
- }
-
- return 1;
-}
diff --git a/wt-status.c b/wt-status.c
index b96be25..7004a2d 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -263,7 +263,7 @@ static const char *wt_status_unmerged_status_string(int stagemask)
case 7:
return _("both modified:");
default:
- die(_("bug: unhandled unmerged status %x"), stagemask);
+ die("BUG: unhandled unmerged status %x", stagemask);
}
}
@@ -367,11 +367,11 @@ static void wt_status_print_change_data(struct wt_status *s,
if (d->new_submodule_commits || d->dirty_submodule) {
strbuf_addstr(&extra, " (");
if (d->new_submodule_commits)
- strbuf_addf(&extra, _("new commits, "));
+ strbuf_addstr(&extra, _("new commits, "));
if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
- strbuf_addf(&extra, _("modified content, "));
+ strbuf_addstr(&extra, _("modified content, "));
if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
- strbuf_addf(&extra, _("untracked content, "));
+ strbuf_addstr(&extra, _("untracked content, "));
strbuf_setlen(&extra, extra.len - 2);
strbuf_addch(&extra, ')');
}
@@ -388,7 +388,7 @@ static void wt_status_print_change_data(struct wt_status *s,
status_printf(s, color(WT_STATUS_HEADER, s), "\t");
what = wt_status_diff_status_string(status);
if (!what)
- die(_("bug: unhandled diff status %c"), status);
+ die("BUG: unhandled diff status %c", status);
len = label_width - utf8_strwidth(what);
assert(len >= 0);
if (status == DIFF_STATUS_COPIED || status == DIFF_STATUS_RENAMED)
@@ -432,7 +432,8 @@ static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
d->worktree_status = p->status;
d->dirty_submodule = p->two->dirty_submodule;
if (S_ISGITLINK(p->two->mode))
- d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1);
+ d->new_submodule_commits = !!oidcmp(&p->one->oid,
+ &p->two->oid);
}
}
@@ -1052,7 +1053,6 @@ static void abbrev_sha1_in_line(struct strbuf *line)
split = strbuf_split_max(line, ' ', 3);
if (split[0] && split[1]) {
unsigned char sha1[20];
- const char *abbrev;
/*
* strbuf_split_max left a space. Trim it and re-add
@@ -1060,9 +1060,10 @@ static void abbrev_sha1_in_line(struct strbuf *line)
*/
strbuf_trim(split[1]);
if (!get_sha1(split[1]->buf, sha1)) {
- abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
strbuf_reset(split[1]);
- strbuf_addf(split[1], "%s ", abbrev);
+ strbuf_add_unique_abbrev(split[1], sha1,
+ DEFAULT_ABBREV);
+ strbuf_addch(split[1], ' ');
strbuf_reset(line);
for (i = 0; split[i]; i++)
strbuf_addbuf(line, split[i]);
@@ -1285,10 +1286,8 @@ static char *get_branch(const struct worktree *wt, const char *path)
else if (starts_with(sb.buf, "refs/"))
;
else if (!get_sha1_hex(sb.buf, sha1)) {
- const char *abbrev;
- abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
strbuf_reset(&sb);
- strbuf_addstr(&sb, abbrev);
+ strbuf_add_unique_abbrev(&sb, sha1, DEFAULT_ABBREV);
} else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
goto got_nothing;
else /* bisect */
@@ -1325,8 +1324,7 @@ static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
if (!strcmp(cb->buf.buf, "HEAD")) {
/* HEAD is relative. Resolve it to the right reflog entry. */
strbuf_reset(&cb->buf);
- strbuf_addstr(&cb->buf,
- find_unique_abbrev(nsha1, DEFAULT_ABBREV));
+ strbuf_add_unique_abbrev(&cb->buf, nsha1, DEFAULT_ABBREV);
}
return 1;
}
diff --git a/xdiff-interface.c b/xdiff-interface.c
index f34ea76..50702a2 100644
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -214,11 +214,10 @@ struct ff_regs {
static long ff_regexp(const char *line, long len,
char *buffer, long buffer_size, void *priv)
{
- char *line_buffer;
struct ff_regs *regs = priv;
regmatch_t pmatch[2];
int i;
- int result = -1;
+ int result;
/* Exclude terminating newline (and cr) from matching */
if (len > 0 && line[len-1] == '\n') {
@@ -228,18 +227,16 @@ static long ff_regexp(const char *line, long len,
len--;
}
- line_buffer = xstrndup(line, len); /* make NUL terminated */
-
for (i = 0; i < regs->nr; i++) {
struct ff_reg *reg = regs->array + i;
- if (!regexec(&reg->re, line_buffer, 2, pmatch, 0)) {
+ if (!regexec_buf(&reg->re, line, len, 2, pmatch, 0)) {
if (reg->negate)
- goto fail;
+ return -1;
break;
}
}
if (regs->nr <= i)
- goto fail;
+ return -1;
i = pmatch[1].rm_so >= 0 ? 1 : 0;
line += pmatch[i].rm_so;
result = pmatch[i].rm_eo - pmatch[i].rm_so;
@@ -248,8 +245,6 @@ static long ff_regexp(const char *line, long len,
while (result > 0 && (isspace(line[result - 1])))
result--;
memcpy(buffer, line, result);
- fail:
- free(line_buffer);
return result;
}
diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index 49aa16f..7389ce4 100644
--- a/xdiff/xemit.c
+++ b/xdiff/xemit.c
@@ -22,15 +22,6 @@
#include "xinclude.h"
-
-
-
-static long xdl_get_rec(xdfile_t *xdf, long ri, char const **rec);
-static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *ecb);
-
-
-
-
static long xdl_get_rec(xdfile_t *xdf, long ri, char const **rec) {
*rec = xdf->recs[ri]->ptr;
@@ -248,7 +239,7 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
if (xche->next) {
long l = XDL_MIN(xche->next->i1,
xe->xdf1.nrec - 1);
- if (l <= e1 ||
+ if (l - xecfg->ctxlen <= e1 ||
get_func_line(xe, xecfg, NULL, l, e1) < 0) {
xche = xche->next;
goto post_context_calculation;