Thanks a lot Peff. This cleared a lot of things. Would it be okay if I
cite some parts of this conversation on my personal blog?
On Fri, Jun 17, 2016 at 8:31 PM, Jeff King wrote:
> On Fri, Jun 17, 2016 at 08:05:47PM +0530, Saksham Saxena wrote:
>
>> > ..even if I have an existing "url.git://.inst
On 06/17/2016 05:20 AM, Junio C Hamano wrote:
> [...]
> * mh/ref-iterators (2016-06-03) 13 commits
> (merged to 'next' on 2016-06-06 at c8e79dc)
> + for_each_reflog(): reimplement using iterators
> + dir_iterator: new API for iterating over a directory tree
> + for_each_reflog(): don't abort f
If there is not a nonbare repository where a submodule is supposedly
located, then don't instantiate a ref_cache for it.
The analogous check can be removed from resolve_gitlink_ref().
Signed-off-by: Michael Haggerty
---
refs/files-backend.c | 33 ++---
1 file changed
Allow references with reflogs to be iterated over using a ref_iterator.
The latter is implemented as a files_reflog_iterator, which in turn uses
dir_iterator to read the "logs" directory.
Note that reflog iteration doesn't correctly handle per-worktree
reflogs (either before or after this patch).
Use the reference iterator interface to implement do_for_each_ref().
Delete a bunch of code supporting the old for_each_ref() implementation.
And now that do_for_each_ref() is generic code (it is no longer tied to
the files backend), move it to refs.c.
The implementation is via a new function, do_
Extract new function ref_resolves_to_object() from
entry_resolves_to_object(). It can be used even if there is no ref_entry
at hand.
Signed-off-by: Michael Haggerty
---
refs/files-backend.c | 33 +++--
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/re
The iterator interface is modeled on that for references, though no
vtable is necessary because there is (so far?) only one type of
dir_iterator.
There are obviously a lot of features that could easily be added to this
class:
* Skip/include directory paths in the iteration
* Shallow/deep iteratio
If there is a file under "$GIT_DIR/logs" with no corresponding
reference, the old code was emitting an error message, aborting the
reflog iteration, and returning -1. But
* None of the callers was checking the exit value
* The callers all want to find all legitimate reflogs (sometimes for the
p
This will be useful for passing REF_NODEREF through.
Signed-off-by: Michael Haggerty
---
builtin/fetch.c | 2 +-
builtin/remote.c | 4 ++--
refs.h | 5 +++--
refs/files-backend.c | 4 ++--
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/builtin/fetch.c b/bui
In the modern world of reference backends, it is not OK to delete a
symref by unlink()ing the file directly. This must be done via the refs
API.
We do so by adding the symref to the list of references to delete along
with the non-symbolic references, then calling delete_refs() with the
new flags o
In the context of the for_each_ref() functions, call the prefix that
references must start with "prefix". (In some places it was called
"base".) This is clearer, and also prevents confusion with another
planned use of the word "base".
Signed-off-by: Michael Haggerty
---
refs/files-backend.c | 24
Signed-off-by: Michael Haggerty
---
refs/files-backend.c | 9 -
refs/refs-internal.h | 10 +-
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/refs/files-backend.c b/refs/files-backend.c
index bbf96ad..8fa897b 100644
--- a/refs/files-backend.c
+++ b/refs/files-back
Currently, the API for iterating over references is via a family of
for_each_ref()-type functions that invoke a callback function for each
selected reference. All of these eventually call do_for_each_ref(),
which knows how to do one thing: iterate in parallel through two
ref_caches, one for loose a
Free up the old name for a more general purpose.
Signed-off-by: Michael Haggerty
---
refs/files-backend.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/refs/files-backend.c b/refs/files-backend.c
index b563a7e..c24a78e 100644
--- a/refs/files-backend.c
+++ b/refs/file
There's continuing work in this area, so clean up unneeded "extern"
keywords rather than schlepping them around. Also split up some overlong
lines and add parameter names in a couple of places.
Signed-off-by: Michael Haggerty
---
refs.h | 132 +++--
This is the reroll of branch mh/ref-iterators promised and discussed
earlier [1]. There are no showstoppers here, but it would be
preferable to merge this version rather than v2.
This version squashes in Ramsay's patch [2], addresses Eric's
comments, and incorporates the whitespace fix that you ma
Leo Gaspard wrote:
> First, sorry for not having this message threaded: I'm not subscribed to
> the list and haven't found a way to get a Message-Id from gmane.
Appending "/raw" to the gmane URL will get you the raw message
with full headers:
article.gmane.org/gmane.comp.version-control.git/$N
First, sorry for not having this message threaded: I'm not subscribed to
the list and haven't found a way to get a Message-Id from gmane.
I just wanted to ask, as an end-user highly relying on commit
signatures, a few questions as to the migration away from SHA-1.
SHA-1 already suffers from a fre
On 18/06/16 00:40, Jeff King wrote:
> On Fri, Jun 17, 2016 at 10:06:14PM +0100, Ramsay Jones wrote:
>
>> If you need to re-roll your 'jk/big-and-old-archive-tar' branch, could
>> you please squash this into the relevant patch (commit 8035a1e3,
>> "archive-tar: write extended headers for far-futu
On 18/06/16 00:33, Jeff King wrote:
> On Fri, Jun 17, 2016 at 10:01:24PM +0100, Ramsay Jones wrote:
>
>> If you need to re-roll your 'jk/gpg-interface-cleanup' branch, could
>> you please squash this into the relevant patch (commit 74287e34,
>> "run-command: add pipe_command helper", 16-06-2016)
On Sat, Jun 18, 2016 at 6:17 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> v6 fixes comments from Ramsay and Eric. Interdiff below.
>
> Another thing I noticed with this is that the non-ascii test breaks
> when run under dash (but passes under bash). You need to have is_IS
> loc
On Sat, Jun 18, 2016 at 4:54 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> -F means "no regex", not "case sensitive" so it should not override -i
>
> That logic is flawed, isn't it?
>
> "-F" means "no regex", so it should not touch opt.regflags at all.
>
>> Signed-off-by: Nguyễn
On Fri, Jun 17, 2016 at 10:06:14PM +0100, Ramsay Jones wrote:
> If you need to re-roll your 'jk/big-and-old-archive-tar' branch, could
> you please squash this into the relevant patch (commit 8035a1e3,
> "archive-tar: write extended headers for far-future mtime", 16-06-2016).
>
> Thanks!
>
> ATB
We use git_mkstemp to create a temporary file, and try to
clean it up in all exit paths from the function. But that
misses any cases where we die by signal, or by calling die()
in a sub-function. In addition, we missed one of the exit
paths.
Let's convert to using a tempfile object, which handles
Similar to the prior commit for verify_signed_buffer, the
motivation here is both to make the code simpler, and to
avoid any possible deadlocks with gpg.
In this case we have the same "write to stdin, then read
from stdout" that the verify case had. This is unlikely to
be a problem in practice, si
This is shorter and should make the function easier to
follow. But more importantly, it removes the possibility of
any deadlocks based on reading or writing to gpg.
It's not clear if such a deadlock is possible in practice.
We do write the whole payload before reading anything, so we
could deadlo
We already have capture_command(), which captures the stdout
of a command in a way that avoids deadlocks. But sometimes
we need to do more I/O, like capturing stderr as well, or
sending data to stdin. It's easy to write code that
deadlocks racily in these situations depending on how fast
the comman
From: Michael J Gruber
When we create a signature, it may happen that gpg returns with
"success" but not with an actual detached signature on stdout.
Check for the correct signature creation status to catch these cases
better. Really, --status-fd parsing is the only way to check gpg status
relia
If our caller gave us a non-NULL gpg_status parameter, we
write the gpg status into their strbuf. If they didn't, then
we write it to a temporary local strbuf (since we still need
to look at it). The variable "pbuf" adds an extra layer of
indirection so that the rest of the function can just acces
Our argv allocations are relatively straightforward, but
this avoids us having to manually keep the count up to date
(or create new to-be-replaced slots in the declaration) when
we add new arguments.
Signed-off-by: Jeff King
---
gpg-interface.c | 19 +--
1 file changed, 9 inserti
On Thu, Jun 16, 2016 at 05:32:48AM -0400, Jeff King wrote:
> [1/7]: gpg-interface: use child_process.args
> [2/7]: verify_signed_buffer: drop pbuf variable
> [3/7]: verify_signed_buffer: use tempfile object
> [4/7]: run-command: add pipe_command helper
> [5/7]: verify_signed_buffer: use
On Fri, Jun 17, 2016 at 10:01:24PM +0100, Ramsay Jones wrote:
> If you need to re-roll your 'jk/gpg-interface-cleanup' branch, could
> you please squash this into the relevant patch (commit 74287e34,
> "run-command: add pipe_command helper", 16-06-2016).
Thanks, yes.
> BTW, also on that branch,
On Fri, Jun 17, 2016 at 7:28 PM, Jeff King wrote:
> On Fri, Jun 17, 2016 at 04:03:18PM -0400, Eric Sunshine wrote:
>> > diff --git a/run-command.h b/run-command.h
>> > @@ -79,17 +79,34 @@ int run_command_v_opt(const char **argv, int opt);
>> > /**
>> > - * Execute the given command, capturing its
On Fri, Jun 17, 2016 at 04:03:18PM -0400, Eric Sunshine wrote:
> > diff --git a/run-command.h b/run-command.h
> > @@ -79,17 +79,34 @@ int run_command_v_opt(const char **argv, int opt);
> > /**
> > - * Execute the given command, capturing its stdout in the given strbuf.
> > + * Execute the given c
Nguyễn Thái Ngọc Duy writes:
> v6 fixes comments from Ramsay and Eric. Interdiff below.
Another thing I noticed with this is that the non-ascii test breaks
when run under dash (but passes under bash). You need to have is_IS
locale on the system to see the breakage, it seems (which is why I
did
It's natural to expect %f to be an actual file on disk; help avoid that
mistake.
Signed-off-by: Joey Hess
---
This patch series was meant to contain 5 patches; here's the missing
one. This patch will apply cleanly on top of v2.9.0.
Documentation/gitattributes.txt | 5 +
1 file changed, 5 i
Am 15.06.2016 um 19:54 schrieb Junio C Hamano:
>
> dexteritas writes:
>>
>> After the ASCII-check, test the windows compatibility of file names.
>> Can be disabled by: git config hooks.allownonwindowschars true ---
>
> Missing sign off.
Will be there next time.
>>
>> templates/hooks--pre-commit.s
Junio C Hamano writes:
> Vasco Almeida writes:
>
>> Interdiff included below.
>>
>> Vasco Almeida (38):
>> i18n: builtin/remote.c: fix mark for translation
>> i18n: advice: mark string about detached head for translation
>> i18n: advice: internationalize message for conflicts
>> i18n: tr
Am 15.06.2016 um 13:15 schrieb Thomas Braun:
> Am 15.06.2016 um 10:02 schrieb dexteritas:
>> After the ASCII-check, test the windows compatibility of file names.
>> Can be disabled by:
>> git config hooks.allownonwindowschars true
>> ---
>> templates/hooks--pre-commit.sample | 22 +
Lars Schneider writes:
>> On 17 Jun 2016, at 05:20, Junio C Hamano wrote:
>>
>> ...
>>
>> * mh/split-under-lock (2016-05-13) 33 commits
>> (merged to 'next' on 2016-06-03 at 2e71330)
>> + lock_ref_sha1_basic(): only handle REF_NODEREF mode
>> + ...
>> + t1404: demonstrate a bug resolving refe
> On 17 Jun 2016, at 05:20, Junio C Hamano wrote:
>
> ...
>
> * mh/split-under-lock (2016-05-13) 33 commits
> (merged to 'next' on 2016-06-03 at 2e71330)
> + lock_ref_sha1_basic(): only handle REF_NODEREF mode
> + commit_ref_update(): remove the flags parameter
> + lock_ref_for_update(): don't
When one issues git branch --edit-description branch_name, a edit with
that message commented out is opened. Mark that message for translation
in to order to be localized.
Signed-off-by: Vasco Almeida
---
builtin/branch.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/
Join message displayed during repository initialization in one entire
sentence. That would improve translations since it's easier translate
an entire sentence than translating each piece.
Update Icelandic translation to reflect the changes. The Icelandic
translation of these messages is used wit
According to the gettext manual [1], references to shell variables inside
eval_gettext call must be escaped so that eval_gettext receives the
translatable string before the variable values are substituted into it.
[1]
http://www.gnu.org/software/gettext/manual/html_node/Preparing-Shell-Scripts.ht
These messages are relevant for the programmer only, not for the end
user. Thus, they can be unmarked for translation, saving translator
some work.
Signed-off-by: Vasco Almeida
---
git-bisect.sh | 2 +-
wt-status.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-b
Join strings marked for translation since that would facilitate and
improve translations result.
Signed-off-by: Vasco Almeida
---
git-submodule.sh | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 5b9674a..f72b237 10
Nguyễn Thái Ngọc Duy writes:
> -F means "no regex", not "case sensitive" so it should not override -i
That logic is flawed, isn't it?
"-F" means "no regex", so it should not touch opt.regflags at all.
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> builtin/grep.c | 2 +-
> 1 file changed, 1 i
> > - if (really && cache_errno == EINVAL) {
> > + if (really || cache_errno == EINVAL) {
> > /* If we are doing --really-refresh that
> > * means the index is not valid anymore.
> >
Vasco Almeida writes:
> Interdiff included below.
>
> Vasco Almeida (38):
> i18n: builtin/remote.c: fix mark for translation
> i18n: advice: mark string about detached head for translation
> i18n: advice: internationalize message for conflicts
> i18n: transport: mark strings for translati
Joey Hess writes:
> Reroll of this patch set with changes:
... where is this 4-patch series designed to apply? The first one
already fails...
Applying: add smudgeToFile and cleanFromFile filter configs
.git/rebase-apply/patch:28: trailing whitespace.
Similar to filter..clean but the sp
Signed-off-by: Ramsay Jones
---
Hi Jeff,
If you need to re-roll your 'jk/big-and-old-archive-tar' branch, could
you please squash this into the relevant patch (commit 8035a1e3,
"archive-tar: write extended headers for far-future mtime", 16-06-2016).
Thanks!
ATB,
Ramsay Jones
archive-tar.c |
Doing a quick benchmark of this new interface and git-annex's use of it, git
checkout of a 1 gigabyte file with git-annex providing the smudge filter took:
19 seconds using the smudge interface
11 seconds using smudgeToFile
0.1 seconds with smudgeToFile and annex.thin set
(whi
Signed-off-by: Ramsay Jones
---
Hi Jeff,
If you need to re-roll your 'jk/gpg-interface-cleanup' branch, could
you please squash this into the relevant patch (commit 74287e34,
"run-command: add pipe_command helper", 16-06-2016).
BTW, also on that branch, commit 6fec0a89 ("verify_signed_buffer:
This makes git checkout, git reset, etc use smudgeToFile.
Includes test cases.
(There's a call to convert_to_working_tree in merge-recursive.c
that could also be made to use smudgeToFile as well.)
Signed-off-by: Joey Hess
---
entry.c | 37 +
t/
This adds new smudgeToFile and cleanFromFile filter commands,
which are similar to smudge and clean but allow direct access to files on
disk.
This interface can be much more efficient when operating on large files,
because the whole file content does not need to be streamed through the
filter. It
Let the user know when they have a smudgeToFile/cleanFromFile config
that cannot be used because the corresponding smudge/clean config
is missing.
The warning is only displayed a maximum of once per git invocation,
and only when doing an operation that would use the filter.
Signed-off-by: Joey He
Includes test cases.
Signed-off-by: Joey Hess
---
sha1_file.c | 42 --
t/t0021-conversion.sh | 36
2 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/sha1_file.c b/sha1_file.c
index d5e1121..8df86
Reroll of this patch set with changes:
* Renamed the new filter drivers for consistency with other configs.
* Improved documentation with feedback from Junio and others.
* Eliminated %p and instead append the filename to the commands
(separated by a space).
* Fixed an FD leak and a space leak.
*
Marks fallback text for translation that may be displayed in git remote
show output.
Signed-off-by: Vasco Almeida
---
builtin/remote.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/remote.c b/builtin/remote.c
index ae74da6..9f934cb 100644
--- a/builtin/remote.
Introduced in 473166b ("config: add 'origin_type' to config_source
struct", 2016-02-19), Git can inform the user about the origin of a
config error, but the implementation does not allow translators to
translate the keywords 'file', 'blob, 'standard input', and
'submodule-blob'. Moreover, for the s
Mark placeholder "" in git-rebase.sh for translation. The string
containing the named placeholder is passed to shell function
error_on_missing_default_upstream in git-parse-remote.sh which uses it
to display a command hint for the user.
Signed-off-by: Vasco Almeida
---
git-rebase.sh | 2 +-
1 fi
Mark messages in git-merge-octopus.sh for translation.
Signed-off-by: Vasco Almeida
---
git-merge-octopus.sh | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index dc2fd1b..89e967a 100755
--- a/git-merge-octopus.s
The function test_i18ngrep fakes success when run under GETTEXT_POISON.
Hence, running in the following manner will always fail under gettext
poison:
! test_i18ngrep expected actual
Use correct syntax: test_i18ngrep ! expected actual
For other instance of this issue see 41ca19b ("tests:
Positional arguments, such as $0, $1, etc, need to be stored on shell
variables for use in translatable strings, according to gettext manual
[1].
Add git-sh-setup.sh to LOCALIZED_SH variable in Makefile to enable
extraction of string marked for translation by xgettext.
Source git-sh-i18n in git-s
Mark comment messages of squash/fixup file ($squash_msg) for
translation.
Helper functions this_nth_commit_message and skip_nth_commit_message
replace the previous method of making the comment messages (such as
"This is the 2nd commit message:") aided by nth_string helper function.
This step was t
Use pipe to send gettext output to git stripspace instead of the
original method of using shell here-document, because command
substitution '$(...)' would not take place inside the here-documents.
The exception is the case of the last here-document redirecting to cat,
in which commands substitution
Use functions test_i18ncmp and test_i18ngrep to successfully pass tests
running under GETTEXT_POISON.
The output strings compared to in these test were marked for translation
in ed47fdf ("i18n: unpack-trees: mark strings for translation",
2016-04-09) and later improved in 2e3926b ("i18n: unpack-tr
The test functions test_i18ncmp and test_i18ngrep pretend success if run
under GETTEXT_POISON. By using those functions to test output which is
correctly marked as translatable, enables one to detect if the strings
newly marked for translation are from plumbing output. If they are
indeed from plumb
Mark strings of messages for the user as translatable.
Update tests t3310-notes-merge-manual-resolve.sh and
t3320-notes-merge-worktrees.sh to reflect new translatable messages.
Tests that grep for .git/NOTES_MERGE_WORKTREE reflect the translatable
string "Automatic notes merge failed. Fix conflic
Before this patch, translations couldn't place the branch name
where it was better fit in the message "and with remote ".
Allow translations that, instead of forcing the branch name to display
right of the message.
Signed-off-by: Vasco Almeida
---
builtin/remote.c | 7 +++
1 file changed, 3
Since the git bisect output tested here is subject to translation, the
helper function test_i18ncmp should be used over test_cmp.
Signed-off-by: Vasco Almeida
---
t/t6030-bisect-porcelain.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t6030-bisect-porcelain.sh b/t/t
Mark options description of git prune for translation.
Signed-off-by: Vasco Almeida
---
builtin/notes.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/notes.c b/builtin/notes.c
index d11e6eb..0572051 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -934,8 +9
Add a period to error message so it matches others instances in
sequencer.c. Now translator would have to translate such message only
once.
Signed-off-by: Vasco Almeida
---
sequencer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
index 57b3671..e9
Mark messages shown to the user for translation.
Signed-off-by: Vasco Almeida
---
builtin/merge.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index b555a1b..961def5 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1014,7
Update tests that compare the strings newly marked for translation to
succeed when running under GETTEXT_POISON.
Signed-off-by: Vasco Almeida
---
setup.c| 16
t/t1506-rev-parse-diagnosis.sh | 2 +-
t/t4208-log-magic-pathspec.sh | 4 ++--
3 files change
Mark strings in git-rebase--interactive.sh for translation. There is no
need to source git-sh-i18n since git-rebase.sh already does so.
Add git-rebase--interactive.sh to LOCALIZED_SH in Makefile in order to
enable extracting strings marked for translation by xgettext.
Signed-off-by: Vasco Almeida
Standardise messages in order to save translators some work.
Nuances fixed in this commit:
"failed to read %s"
"read of %s failed"
"detach the HEAD at named commit"
"detach HEAD at named commit"
"removing '%s' failed"
"failed to remove '%s'"
"index file corrupt"
"corrupt index file"
"failed to
Change command option description to lowercase, matching pull
counterpart option. Translators would have to translate such message
only once.
Signed-off-by: Vasco Almeida
---
builtin/merge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c
ind
The message was not being extracted by xgettext, although it was marked
for translation, seemingly because it contained a command substitution.
Moreover, eval_gettext should be used instead of gettext for strings
with substitution.
See step 4. of section 15.5.2.1 Preparing Shell Scripts for
Intern
The test t9003-help-autocorrect.sh fails when run under GETTEXT_POISON,
because it's expecting to filter out the original output. Accommodate
gettext poison case by also filtering out the default simulated output.
Signed-off-by: Vasco Almeida
---
t/t9003-help-autocorrect.sh | 4 ++--
1 file chan
The N_() no-op call currently marks the string to be extracted by
xgettext but doesn't trigger the retrieval of the translation at run
time, whereas _() does both. Meaning that, in spite of having
translations available, they were never retrieved to make use of them.
Signed-off-by: Vasco Almeida
In the last message, involving Q_(), try to mark the message in such way
that is suited for RTL (Right to Left) languages.
Update test t6030-bisect-porcelain.sh to reflect the changes.
Signed-off-by: Vasco Almeida
---
bisect.c| 56 +---
Replace the first form with the second one:
! grep expected actual
test_i18ngrep ! expected actual
The latter syntax is supported by test_i18ngrep defined in
t/test-lib.sh.
Although the test already passes whether GETTEXT_POSION is enabled, use
the i18n grep variant for the sake
The string message marked for translation should use eval_gettext
variant instead of the gettext one, since we want to dollar-substitute
$head_name in the result.
Signed-off-by: Vasco Almeida
---
git-rebase.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-rebase.sh b/gi
Mark string with advice seen by the user when in detached head.
Update test t7201-co.sh to pass under GETTEXT_POISON build. Pretend
success if the number of lines of "git checkout renamer^" output is not
greater than 1 and test are running under GETTEXT_POISON.
Signed-off-by: Vasco Almeida
---
Mark entire sentences of error message rather than assembling one using
placeholders (e.g. "Cannot %s during a %s").
That would facilitate translation work because it is easier to translate
a entire sentence than translating pieces. We would have better
translations at the expense of source code v
Marks several messages for translation and updates tests to pass under
GETTEXT_POISON. Some tests were updated to fit previous i18n marks, others
were updated to fit marks made by these patches. Patches that only touch
test file refer to marks done in commits previous to these ones.
"[PATCH v5 34/
Mark informative string ": fast-forward" for translation.
Signed-off-by: Vasco Almeida
---
sequencer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
index 88a7c78..57b3671 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -225,7 +225,7 @@ static int fa
Mark one printf string and one error string for translation.
Signed-off-by: Vasco Almeida
---
transport.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/transport.c b/transport.c
index 095e61f..59b911e 100644
--- a/transport.c
+++ b/transport.c
@@ -59,
Mark message for translation telling the user she has conflicts to
resolve. Expose each particular use case, in order to enable translating
entire sentences which would facilitate translating into other
languages.
Change "Pull" to lowercase to match other instances. Update test
t5520-pull.sh, that
Source git-sh-setup in order to use die shell function from
git-sh-setup.sh library instead of using the one defined in
git-merge-octopus.sh. Remove the former die function.
Signed-off-by: Vasco Almeida
---
git-merge-octopus.sh | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --g
The second string inside _() was not being extracted for translation by
xgettext, meaning that, although the string was passed to gettext, there
was no translation available.
Mark each individual string instead of marking the result of ternary if.
Signed-off-by: Vasco Almeida
---
builtin/remote
On Thu, Jun 16, 2016 at 5:37 AM, Jeff King wrote:
> We already have capture_command(), which captures the stdout
> of a command in a way that avoids deadlocks. But sometimes
> we need to do more I/O, like capturing stderr as well, or
> sending data to stdin. It's easy to write code that
> deadlock
Michael J Gruber writes:
> Signed-off-by: Michael J Gruber
> ---
> This is the version describing the current state, not assuming any new
> verify command for blobs.
>
> Documentation/technical/signature-format.txt | 51
>
> 1 file changed, 51 insertions(+)
>
> dif
Joey Hess writes:
> Here's a revised version of the documentation that I think takes the other
> suggestions onboard. I emphasise that clean and smudge operate as filters,
> to contrast better with cleanFromFile and smudgeToFile not operating as
> regular stdio filters.
> ...
> This could be exte
Joey Hess writes:
> Or we could pick one of the two methods of appending the file
> (I prefer not including a space before it as more flexible), and
> anything using this interface would need to design its command line
> parsing with this interface in mind, and would probably choose to use
> --to
Junio C Hamano wrote:
> Would an interface that always appends the pathname at the end of
> the command line string work?
One problem with this is that "appends" is subtly unclear in this case.
With the example of smugeToFile = cmd --to-file
it seems that a space should be added by git before the
Junio C Hamano pobox.com> writes:
> * va/i18n-even-more (2016-06-07) 38 commits
> - i18n: branch: mark comment when editing branch description for translation
> - i18n: unmark die messages for translation
> - i18n: submodule: escape shell variables inside eval_gettext
> - i18n: submodule: join
A Terça, 7 de Junho de 2016 12:55:37 Vasco Almeida escreveu:
> Join message displayed during repository initialization in one entire
> sentence. That would improve translations since it's easier translate an
> entire sentence than translating each piece.
>
> Signed-off-by: Vasco Almeida
> ---
>
Michael J Gruber writes:
> - We don't support verifying push certificates, although they fit in with
> git verify-tag. Patch has been submitted, and this series documents the
> result already (git verify-tag --blob).
>
> - We don' support verifying signed merge tags other than by using log/sh
1 - 100 of 140 matches
Mail list logo
