When a file that ends with an incomplete line is expressed as a
complete rewrite with the -B option, git diff incorrectly appends the
incomplete line indicator \ No newline at end of file after such a
line, rather than writing it on a line of its own (the output codepath
for normal output without
Translate 76 new messages came from git.pot update
in 3b6137f (l10n: Update git.pot (76 new, 4 removed
messages)).
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com
Signed-off-by: Thomas Rast tr...@student.ethz.ch
---
po/de.po | 216
Hello!
Running this commands locally (german locale) lead to some wrong dates
for the patches upstream.
git format-patch -o patches origin
git send-email --compose --no-chain-reply-to --to s...@address.com
--suppress-cc=author patches/0001-l10n-Turkish-update.patch
The local
Date: Sat, 4
On 08/05/2012 06:56 AM, Junio C Hamano wrote:
The alternates mechanism [...]
The UI for this mechanism however has some room for improvement, and
we may want to start improving it for the next release after the
upcoming Git 1.7.12 (or even Git 2.0 if the change is a large one
that may be
Here is output from linux:
[janusz@mikrus JavaCommon]$ git config --add core.quotepath false
[janusz@mikrus JavaCommon]$ git diff --unified=3 -- 1ą.txt
warning: LF will be replaced by CRLF in 1B1.txt.
The file will have its original line endings in your working directory.
diff --git a/1B1.txt
The outputs in handle_change_delete() contain a lot of placeholders.
This could end up in confusion to translators since two parts of them
are translated separately. Add a hint for translators that they can
easily understand it without study the code.
Signed-off-by: Ralf Thielow
The function merge_recursive prints the count of common
ancestors as found %u common ancestor(s):. At least for
better translation, we should use a singular and a plural
form of this message.
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com
---
merge-recursive.c | 5 -
1 file changed, 4
On Mon, Jul 30, 2012 at 5:39 PM, Bo98 boellisander...@aol.com wrote:
Shawn Pearce wrote
Maybe you forgot to enable ExecCGI?
Whoops, completely forgot about that, but, assuming I did it right, it still
doesn't seem to work.
Here's what I did:
Directory /usr/libexec/git-core/
Ralf Thielow ralf.thie...@gmail.com writes:
The function merge_recursive prints the count of common
ancestors as found %u common ancestor(s):. At least for
better translation, we should use a singular and a plural
form of this message.
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com
---
As discussed in the previous iteration, testing for prompt-availabilty
has been reworked (patch #2).
This is done with the aid of patch #1, which extracts the opening of
/dev/tty from git_terminal_prompt() into a terminal_open(). Its return
value indicates if a terminal is available for
Factor out the opening and closing of /dev/tty from
git_terminal_prompt(), so that callers may first test if a controlling
terminal is available before proceeding with prompting proper.
When HAVE_DEV_TTY is not defined, terminal_open() falls back to checking
tty-ness of stdin and stderr, as
If suggestions are available (based on Levenshtein distance) and if the
terminal isatty(), present a prompt to the user to select one of the
computed suggestions.
In the case where there is a single suggestion, present the prompt
[Y/n], such that (ie. the default), y and Y as input leads git
to
It would be nicer for translators to have two messages.
In the end it's just a separation for singular and plural as it's
done in diff.c (e.g. Q_( %d file changed, %d files changed, files)).
On Sun, Aug 5, 2012 at 8:44 PM, Junio C Hamano gits...@pobox.com wrote:
Ralf Thielow
Michael Haggerty mhag...@alum.mit.edu writes:
I have some other crazy ideas for making the concept even more powerful:
Sorry, but the a bit more sanity topic is not interested in making
the concept powerful at all.
This is about making it usable with ease without the user having to
worry about
Ralf Thielow ralf.thie...@gmail.com writes:
It would be nicer for translators to have two messages.
In the end it's just a separation for singular and plural as it's
done in diff.c (e.g. Q_( %d file changed, %d files changed, files)).
OK, so there was no hidden message behind At least for
Ralf Thielow ralf.thie...@gmail.com writes:
The outputs in handle_change_delete() contain a lot of placeholders.
This could end up in confusion to translators since two parts of them
are translated separately. Add a hint for translators that they can
easily understand it without study the
Christoph Miebach christoph.mieb...@web.de writes:
Running this commands locally (german locale) lead to some wrong dates
for the patches upstream.
git format-patch -o patches origin
What does git show -s --pretty=fuller HEAD give you at this point?
This is to check what kind of timestamps
Fist again apologies for those who were not credited in the first
version of this series.
The first version of the series was here: $gmane/202752.
Changes since the last version:
This series now applies to the latest master.
[PATCH/RFC v2 01/16] Modify cache_header to prepare for other index
Modify the cache_header such that other index file formats
can be added and reusing the common part of each index format.
The signature and version have to be present in every
version of the index file format, to check if it can be read
by a specific version of git, while other entries (eg.
Modify the write_index function to add the possibility to add
other index formats, that are written in a different way. Also
mark all functions, which shall only be used with v2-v4 as v2
functions.
Signed-off-by: Thomas Gummerer t.gumme...@gmail.com
---
read-cache.c | 43
The new git racy code uses the mtime of cache-entries to smudge
a racy clean entry, and loads the work, of checking the file-system
if the entry has really changed, off to the reader. This interferes
with this test, because the entry is racily smudged and thus has
mtime 0. We wait 1 second to
Make git read the index file version 5 without complaining.
This version of the reader doesn't read neither the cache-tree
nor the resolve undo data, but doesn't choke on an index that
includes such data.
Helped-by: Thomas Rast tr...@student.ethz.ch
Signed-off-by: Thomas Gummerer
Make git read the resolve-undo data from the index.
Since the resolve-undo data is joined with the conflicts in
the ondisk format of the index file version 5, conflicts and
resolved data is read at the same time, and the resolve-undo
data is then converted to the in-memory format.
Helped-by:
Write the index version 5 file format to disk. This version doesn't
write the cache-tree data and resolve-undo data to the file.
The main work is done when filtering out the directories from the
current in-memory format, where in the same turn also the conflicts
and the file data is calculated.
Write the cache-tree data for the index version 5 file format. The
in-memory cache-tree data is converted to the ondisk format, by adding
it to the directory entries, that were compiled from the cache-entries
in the step before.
Signed-off-by: Thomas Gummerer t.gumme...@gmail.com
---
Write the resolve undo data to the ondisk format, by joining the data
in the resolve-undo string-list with the already existing conflicts
that were compiled before, when searching the directories and add
them to the corresponding directory entries.
Helped-by: Thomas Rast tr...@student.ethz.ch
Add a force-rewrite option to update-index, which allows the user
to rewrite the index, even if there are no changes. This can be used
to do performance tests of both the reader and the writer.
Signed-off-by: Thomas Gummerer t.gumme...@gmail.com
---
builtin/update-index.c |5 -
1 file
From: Thomas Rast tr...@student.ethz.ch
Add a performance test for index version [23]/4/5 by using
git update-index --force-rewrite, thus testing both the reader
and the writer speed of all index formats.
Signed-off-by: Thomas Rast tr...@student.ethz.ch
Signed-off-by: Thomas Gummerer
Modify the read_index_from function, splitting it up into
one function that stays the same for every index format,
doing the basic operations such as verifying the header,
and a function which is specific for each index version,
which does the real reading of the index.
Signed-off-by: Thomas
On Solaris getpass() returns at most 8 characters which cripples the
credential reading for accounts using longer passwords. The alternate
function getpassphrase() was introduced in SunOS 5.6 and will return
up to 256 characters.
Ensure that git_terminal_prompt uses the more able function when
Tay Ray Chuan rcta...@gmail.com writes:
If suggestions are available (based on Levenshtein distance) and if the
terminal isatty(), present a prompt to the user to select one of the
computed suggestions.
In the case where there is a single suggestion, present the prompt
[Y/n], such that
Thomas Gummerer t.gumme...@gmail.com writes:
diff --git a/read-cache.c b/read-cache.c
index 2f8159f..5d61d92 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1433,7 +1446,7 @@ int read_index_from(struct index_state *istate, const
char *path)
errno = EINVAL;
mmap_size =
2012/8/6 Junio C Hamano gits...@pobox.com:
Ralf Thielow ralf.thie...@gmail.com writes:
It would be nicer for translators to have two messages.
In the end it's just a separation for singular and plural as it's
done in diff.c (e.g. Q_( %d file changed, %d files changed, files)).
OK, so there
Thomas Gummerer t.gumme...@gmail.com writes:
t2104 currently checks for the exact index version 2 or 3,
depending if there is a skip-worktree flag or not. Other
index versions do not use extended flags and thus cannot
be tested for version changes.
Make this test update the index to version
On Sat, Aug 4, 2012 at 6:55 PM, Junio C Hamano gits...@pobox.com wrote:
I just saw this:
$ git push ko
ko: Counting objects: 332, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (110/110), done.
Writing objects: 100% (130/130), 32.27 KiB, done.
Thomas Gummerer t.gumme...@gmail.com writes:
The new git racy code uses the mtime of cache-entries to smudge
a racy clean entry, and loads the work, of checking the file-system
-ECANTPARSE.
if the entry has really changed, off to the reader. This interferes
with this test, because the entry
Thomas Gummerer t.gumme...@gmail.com writes:
+ stat_crc = crc32(stat_crc, (Bytef*)stat, 4);
+ stat = htonl(ce-ce_ino);
+ stat_crc = crc32(stat_crc, (Bytef*)stat, 4);
+ stat = htonl(ce-ce_size);
+ stat_crc = crc32(stat_crc, (Bytef*)stat, 4);
+ stat = htonl(ce-ce_dev);
On Mon, Aug 6, 2012 at 7:17 AM, Ben Walton bwal...@artsci.utoronto.ca wrote:
I've also briefly dabbled with getting Solaris to simply use the
HAVE_DEV_TTY code path but the terminal echo stuff hasn't worked
nicely for me just yet. (It reads the password with nothing echoed
but then displays
Thomas Gummerer t.gumme...@gmail.com writes:
Add a force-rewrite option to update-index, which allows the user
to rewrite the index, even if there are no changes. This can be used
to do performance tests of both the reader and the writer.
Signed-off-by: Thomas Gummerer t.gumme...@gmail.com
Ben Walton bwal...@artsci.utoronto.ca writes:
diff --git a/compat/terminal.h b/compat/terminal.h
index 97db7cd..8d7b3f9 100644
--- a/compat/terminal.h
+++ b/compat/terminal.h
@@ -3,4 +3,13 @@
char *git_terminal_prompt(const char *prompt, int echo);
+/* getpass() returns at most 8
Excerpts from Junio C Hamano's message of Sun Aug 05 21:59:48 -0400 2012:
Wouldn't
#if solaris
#define getpass getpassphrase
#endif
without anything else be more than sufficient?
Yes, it would, but I was hoping to make it more explicit that the
function getpass may be
On Sun, Aug 5, 2012 at 6:37 PM, Brandon Casey draf...@gmail.com wrote:
On Sat, Aug 4, 2012 at 6:55 PM, Junio C Hamano gits...@pobox.com wrote:
I just saw this:
$ git push ko
ko: Counting objects: 332, done.
Delta compression using up to 4 threads.
Compressing objects: 100%
42 matches
Mail list logo
