On Sun, Nov 9, 2014 at 10:39 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
--- a/test-dump-untracked-cache.c
+++ b/test-dump-untracked-cache.c
@@ -44,6 +44,7 @@ int main(int ac, char **av)
{
struct untracked_cache *uc;
struct strbuf base = STRBUF_INIT;
+
On Sun, Nov 9, 2014 at 10:32 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Sat, Nov 8, 2014 at 4:39 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com
wrote:
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
diff --git a/compat/mingw.c b/compat/mingw.c
index c5c37e5..b817678 100644
ls-tree uses read_tree_recursive() which already does path filtering
using pathspec. No need to filter one more time based on prefix
only. ls-tree ../somewhere does not work because of
this. write_name_quotedpfx() can now be retired because nobody else
uses it.
Signed-off-by: Nguyễn Thái Ngọc Duy
This allows the callback to use 'base' as a temporary buffer to
quickly assemble full path without extra allocation. The callback has
to restore it afterwards of course.
Helped-by: Eric Sunshine sunsh...@sunshineco.com
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
Rebased on latest
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/ls-tree.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index 1ab0381..d226344 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -174,7 +174,8 @@ int
Here is a series to fix a few small bugs in git interpret-trailers.
Patch 1/5 and patch 2/5 are independent from the last 3 patches,
and can be applied to master.
Patches 3/5, 4/5 and 5/5 depend on this series by Junio:
jc/conflict-hint (2014-10-28) 4 commits
(merged to 'next'
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t7513-interpret-trailers.sh | 32 +++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
index fed053a..bd0ab46 100755
---
Trailers passed to the parse_trailer() function often have
a trailing newline. When erroring out, we should display
the invalid trailer properly, that means without any
trailing newline.
Helped-by: Junio C Hamano gits...@pobox.com
Helped-by: Jeff King p...@peff.net
Signed-off-by: Christian Couder
Make sure we look for trailers before any conflict line
by reusing the ignore_non_trailer() function.
Helped-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t7513-interpret-trailers.sh | 2 ++
trailer.c | 32
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
builtin/commit.c | 46 --
commit.c | 46 ++
commit.h | 3 +++
3 files changed, 49 insertions(+), 46 deletions(-)
diff --git
Otherwise trailers that are commented out might be
processed. We would also error out if the comment line
char is also a separator.
This means that comments inside a trailer block will
disappear, but that was already the case anyway.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
On Sat, Nov 08, 2014 at 08:19:21AM -0800, Martin von Zweigbergk wrote:
What should:
git checkout HEAD -- some-new-path
do in that case? With the current code, it actually barfs, complaining
that nothing matched some-new-path (because it is not part of HEAD, and
therefore we don't
On Sat, Nov 08, 2014 at 03:27:53PM +0100, Thomas Quinot wrote:
It may be impractical to install a wrapper script for GIT_SSH
when additional parameters need to be passed. Provide an alternative
way of specifying a shell command to be run, including command line
arguments, by means of the
From: Junio C Hamano gits...@pobox.com
Subject: Re: [PATCH 4/5] trailer: reuse ignore_non_trailer() to ignore conflict
lines
Date: Fri, 07 Nov 2014 12:27:03 -0800
Christian Couder chrisc...@tuxfamily.org writes:
* Copyright (c) 2013, 2014 Christian Couder chrisc...@tuxfamily.org
@@
Hi, a few weeks ago I send out attached message and patch to
gitster-at-pobox.com tried to follow the guidelines.
Have not get any feedback until now, neither acceptance nor decline … just
no feedback.
I am not sure if the message was received or this is some kind of intended
procedure.
From my
On 2014-11-09 09.36, Duy Nguyen wrote:
On Sun, Nov 9, 2014 at 10:32 AM, Eric Sunshine sunsh...@sunshineco.com
wrote:
On Sat, Nov 8, 2014 at 4:39 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com
wrote:
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
diff --git a/compat/mingw.c
Changes v3 - v4:
- Incorporate more feedback from Junio:
- Patch #1: s/git config --unset/test_unconfig/
- Add patches #3 - #6 to refactor add()/append_edit()/create_note()
for supporting the direction suggested by Junio
- Revamp the last patch to more fully modernize t3301
Have fun!
This fixes a small buglet when trying to explicitly add the empty blob
as a note object using the -c or -C option to git notes add/append.
Instead of failing with a nonsensical error message indicating that the
empty blob does not exist, we should rather behave as if an empty notes
message was
create_note() has a non-trivial interface, and comprises three loosely
related parts:
1. launching the editor with the note contents, if needed
2. appending to an existing note, if append_only was given
3. adding or removing the resulting note, based on whether it's non-empty
Split it along
On Fri, Nov 7, 2014 at 7:04 PM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
[...]
Assuming that it is a good idea to allow empty notes, I think
there are two issues involved here:
* Traditionally, feeding an empty note is taken as a request to
remove
If the user has gone through the trouble of explicitly adding an empty
note, then git log should not silently skip it (as if it didn't exist).
Signed-off-by: Johan Herland jo...@herland.net
---
notes.c | 3 +--
t/t3301-notes.sh | 12
2 files changed, 13 insertions(+), 2
Add test cases documenting the current behavior when trying to
add/append/edit empty notes. This is in preparation for adding
--allow-empty; to allow empty notes to be stored.
Improved-by: Eric Sunshine sunsh...@sunshineco.com
Improved-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Johan
Make this test script appear somewhat less old-fashioned:
- Use test helper functions:
- write_script
- test_commit
- test_write_lines
- test_config
- test_unconfig
- test_path_is_missing
- Remove whitespace between redirection operators and their targets.
- Move
Move the 'path' variable from create_note() and into the
note_data struct. Unify cleanup of note_data objects with
a free_note_data() function.
This might not make too much sense on its own, but it makes the
future refactoring of create_note() considerably cleaner.
Signed-off-by: Johan Herland
In preparation for some needed refactoring, rename struct msg_arg to
struct note_data, and rename its instances from msg to d (also
removing some unnecessary parentheses). The 'msg_arg' name was
inherited from tag.c, but is not really a good name for the contents
of a note.
Also rename
Signed-off-by: Johan Herland jo...@herland.net
---
builtin/notes.c | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/builtin/notes.c b/builtin/notes.c
index 1017472..f1480cf 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -399,7 +399,7 @@ static int
Although the git notes man page advertises that we support binary-safe
notes addition (using the -C option), we currently do not support adding
the empty note (i.e. using the empty blob to annotate an object). Instead,
an empty note is always treated as an intent to remove the note
altogether.
* Jeff King, 2014-11-09 :
Thanks, I like this much better. The name GIT_SSH_CMD is not too bad.
Personally, of the two (GIT_SSH and GIT_SSH_CMD) I would expect the
_CMD form to be the one that does not use the shell.
Right, except of course we're stuck with the compatibility issue in any
On 2014-08-27 00.40, Bernhard Reiter wrote:
Use libcurl's high-level API functions to implement git-imap-send
instead of the previous low-level OpenSSL-based functions.
This doesn't seem to fully work under Debian 7:
/home/tb/projects/git/git.pu/imap-send.c:1546: undefined reference to
* jt/timer-settime (2014-08-29) 6 commits
- use timer_settime() for new platforms
- autoconf: check for timer_settime()
- autoconf: check for struct itimerspec
- autoconf: check for struct sigevent
- autoconf: check for struct timespec
- autoconf: check for timer_t
Reviewed,
It may be impractical to install a wrapper script for GIT_SSH
when additional parameters need to be passed. Provide an alternative
way of specifying a shell command to be run, including command line
arguments, by means of the GIT_SSH_CMD environment variable, which
behaves like GIT_SSH but is
During 'rebase -i', a wrong edit command might inadvertently drop
commits. This change shows the total number of commits in the comments below
the commit list. After a rebase edit, this number can be quickly compared to
the line number of the last commit in the rebase TODO list.
Signed-off-by:
Am 29.10.2014 um 18:21 schrieb Jeff King:
On Tue, Oct 28, 2014 at 09:52:34PM +0100, René Scharfe wrote:
diff --git a/trailer.c b/trailer.c
index 8514566..7ff036c 100644
--- a/trailer.c
+++ b/trailer.c
@@ -237,7 +237,7 @@ static const char *apply_command(const char *command,
const char
Am 20.10.2014 um 11:19 schrieb Jeff King:
On Sun, Oct 19, 2014 at 01:14:20PM +0200, René Scharfe wrote:
--- a/wt-status.c
+++ b/wt-status.c
@@ -726,14 +726,14 @@ static void wt_status_print_changed(struct wt_status
*s)
static void wt_status_print_submodule_summary(struct wt_status *s,
Hi Junio,
Please pull the following git l10n updates.
The following changes since commit 4ace7ff4557350b7e0b57d024a2ea311b332e01d:
Git 2.2.0-rc0 (2014-10-31 11:57:23 -0700)
are available in the git repository at:
git://github.com/git-l10n/git-po master
for you to fetch changes up to
Am 2014-11-09 um 14:00 schrieb Torsten Bögershausen:
On 2014-08-27 00.40, Bernhard Reiter wrote:
Use libcurl's high-level API functions to implement git-imap-send
instead of the previous low-level OpenSSL-based functions.
This doesn't seem to fully work under Debian 7:
- Original Message -
You generally want to use git fetch or git pull in that case. git clone
creates an entirely new copy of the original repository.
Just to complement the answer: git clone is more or less a shorthand for git
init followed by git fetch (to get the remote objects) and
Signed-off-by: Nicolas Dermine nicolas.derm...@gmail.com
---
Documentation/config.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 382e12c..0fda2b5 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
Am 09.11.2014 um 12:39 schrieb Tom Freudenberg:
Hi, a few weeks ago I send out attached message and patch to
gitster-at-pobox.com tried to follow the guidelines.
Have not get any feedback until now, neither acceptance nor decline … just
no feedback.
I am not sure if the message was received or
Am 07.11.2014 um 20:20 schrieb Junio C Hamano:
Johannes Schindelin johannes.schinde...@gmx.de writes:
They are not affected by the update anyway.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
builtin/receive-pack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Christian Couder chrisc...@tuxfamily.org writes:
Yeah, it won't be as efficient as using only one strbuf and only byte
oriented functions, and it looks much less manly too :-) But over time in
Git we have developed a number of less efficient but quite clean
abstractions like strbuf,
Jeff King p...@peff.net writes:
On Fri, Nov 07, 2014 at 11:35:59PM -0800, Junio C Hamano wrote:
I think that has direct linkage; what you have in mind I think is
http://thread.gmane.org/gmane.comp.version-control.git/234903/focus=234935
Thanks for that link.
It was one of the items in the
Jakub Narębski jna...@gmail.com writes:
W dniu 2014-11-08 11:52, Jeff King pisze:
On Fri, Nov 07, 2014 at 04:31:08PM +0100, Christian Halstrick wrote:
In a repo where no remote.name.fetch config parameter is set what
should a git fetch do? My experiments let me think it's
HEAD:FETCH_HEAD.
Thomas Quinot tho...@quinot.org writes:
Could also be GIT_SSH_SHELLCMD, to denote that this is a *shell*
command...
Whatever. I loathe the CMD abbreviation, though. Why spell out
SHELL but not COMMAND? I.e. GIT_SSH_[SHELL_]COMMAND
Parsing complications aside, you cannot even know in git
On 09/11/14 14:55, Bernhard Reiter wrote:
Am 2014-11-09 um 14:00 schrieb Torsten Bögershausen:
On 2014-08-27 00.40, Bernhard Reiter wrote:
Use libcurl's high-level API functions to implement git-imap-send
instead of the previous low-level OpenSSL-based functions.
This doesn't seem to fully
Works for me, thanks =)
I'm curious now, is there an automated build of git running on a mac
anywhere? There's a mac mini running jenkins in my office and it's
possible I could convince someone to let me set up a git build that'll
e-mail me if there's a test failure.
On Sat, Nov 8, 2014 at 5:59
Jeff King p...@peff.net writes:
I think all of the callers of replace_object_sha1 do this same check
now. Can we just move the check into that function instead of adding
another instance of it?
Good thinking. Thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the body
Jens Lehmann jens.lehm...@web.de writes:
A patch should go to: gits...@pobox.com /and/ cc: git@vger.kernel.org
(and optinally any people relevant to the area you are touching).
No. A patch should go To: git@vger.kernel.org and Cc: those who are
involved in the area, and after those involved
Ramsay Jones ram...@ramsay1.demon.co.uk writes:
In order to suppress a sparse warning about using sizeof on a
function, we use the same solution used in commit 9371322a6
(sparse: suppress some using sizeof on a function warnings,
06-10-2013) which solved exactly this problem for the other
* Junio C Hamano, 2014-11-09 :
Whatever. I loathe the CMD abbreviation, though. Why spell out
SHELL but not COMMAND? I.e. GIT_SSH_[SHELL_]COMMAND
No strong opinion :-) GIT_SSH_COMMAND looks just fine to me.
(GIT_SSH_SHELL_COMMAND starts to feel a bit long...)
Thomas.
--
To unsubscribe
Michael Blume blume.m...@gmail.com writes:
Works for me, thanks =)
I'm curious now, is there an automated build of git running on a mac
anywhere? There's a mac mini running jenkins in my office and it's
possible I could convince someone to let me set up a git build that'll
e-mail me if
Thomas Quinot tho...@quinot.org writes:
* Junio C Hamano, 2014-11-09 :
Whatever. I loathe the CMD abbreviation, though. Why spell out
SHELL but not COMMAND? I.e. GIT_SSH_[SHELL_]COMMAND
No strong opinion :-) GIT_SSH_COMMAND looks just fine to me.
(GIT_SSH_SHELL_COMMAND starts to feel a
Junio C Hamano gits...@pobox.com writes:
Christian Couder chrisc...@tuxfamily.org writes:
Yeah, it won't be as efficient as using only one strbuf and only byte
oriented functions, and it looks much less manly too :-) But over time in
Git we have developed a number of less efficient but quite
Jeff King p...@peff.net writes:
On Sat, Nov 08, 2014 at 03:30:40AM -0500, Jeff King wrote:
So just to be clear, the behavior we want is that:
echo foo some-new-path
git add some-new-path
git checkout HEAD -- .
will delete some-new-path (whereas the current code turns it into an
Torsten Bögershausen tbo...@web.de writes:
strcpy() maybe?
It was originally strcpy, then I wanted to get fancy and show Win3.1,
Win95... but it got complicated (couldn't just do it based on the last
bit of 'v'). Will revert.
Why not use strlcpy() ?
(This feels little like an overkill,
Hi,
#: builtin/commit.c:594
#, c-format
msgid commit '%s' has malformed author line
-msgstr
+msgstr Commit '%s' hat missgebildete Autor-Zeile
I would use fehlerhafte as missgebildete is an old word (1) and I
would not use it. So maybe
+msgstr Commit '%s' hat eine fehlerhafte
On 09.11.14 18:34, Michael Blume wrote:
Works for me, thanks =)
I'm curious now, is there an automated build of git running on a mac
anywhere? There's a mac mini running jenkins in my office and it's
possible I could convince someone to let me set up a git build that'll
e-mail me if there's
Actually I have a build break in pu on my mac right now. Seems to
build fine in ubuntu, but:
progress.c:66:15: error: use of undeclared identifier 'CLOCK_MONOTONIC'
timer_create(CLOCK_MONOTONIC, sev, progress_timer);
^
./git-compat-util.h:233:54: note: expanded from
On 2014-11-08 10.39, Nguyễn Thái Ngọc Duy wrote:
If the user enables untracked cache, then
- move worktree to an unsupported filesystem
How do we detect this move ?
Shouldn't we be able to detect an unsupported file system
(by probing if stat(root_dir_of_repo) ==
On 2014-11-09 22.36, Michael Blume wrote:
Actually I have a build break in pu on my mac right now. Seems to
build fine in ubuntu, but:
progress.c:66:15: error: use of undeclared identifier 'CLOCK_MONOTONIC'
timer_create(CLOCK_MONOTONIC, sev, progress_timer);
That is not an unkown
v3 did not actually work for views.
Fix it (add global) and also set viewchanged in delview
Max Kirillov (2):
gitk: write only changed configuration variables
gitk: synchronize config write
gitk | 120 +++
1 file changed, 107
When gitk contains some changed parameter, and there is existing
instance of gitk where the parameter is still old, it is reverted to
that old value when the instance exits.
Instead, store a parameter in config only it is has been modified in the
exiting instance. Otherwise, preserve the value
If several gitk instances are closed simultaneously, safestuff procedure
can run at the same time, resulting in a conflict which may cause losing
of some of the instance's changes, failing the saving operation or even
corrupting the configuration file. This can happen, for example, at user
session
Junio C Hamano gits...@pobox.com writes:
Junio C Hamano gits...@pobox.com writes:
Christian Couder chrisc...@tuxfamily.org writes:
Yeah, it won't be as efficient as using only one strbuf and only byte
oriented functions, and it looks much less manly too :-) But over time in
Git we have
It may be impractical to install a wrapper script for GIT_SSH
when additional parameters need to be passed. Provide an alternative
way of specifying a shell command to be run, including command line
arguments, by means of the GIT_SSH_COMMAND environment variable,
which behaves like GIT_SSH but is
On Mon, Nov 10, 2014 at 4:39 AM, Torsten Bögershausen tbo...@web.de wrote:
On 2014-11-08 10.39, Nguyễn Thái Ngọc Duy wrote:
If the user enables untracked cache, then
- move worktree to an unsupported filesystem
How do we detect this move ?
Shouldn't we be able to detect an unsupported file
A pair of recently added tests used branches a and a/b, but earlier
tests created files A and A/B. On case insensitive filesystems (such
as HFS+), that causes git to complain about the name being ambiguous
between branch and file. Resolve by renaming the branches to aa and
aa/bb.
Signed-off-by:
Ok, with that I have a different test failure on the pu branch --
please tell me if I'm spamming the list or if there's some other
protocol I should be using to report issues on pu.
$ ./t4213-log-remerge-diff.sh -v
Initialized empty Git repository in
/Users/michael.blume/workspace/git/t/trash
On Sat, Nov 8, 2014 at 5:59 PM, Jeff King p...@peff.net wrote:
Two tests recently added to t1410 create branches a and
a/b to test d/f conflicts on reflogs. Earlier, unrelated
tests in that script create the path A/B in the working
tree. There's no conflict on a case-sensitive filesystem,
A postaláda korlátozza, kérjük, kattintson ide prekrocila
http://updattwhus.jigsy.com
Ellen?rizze a elektronikus levél köszönet
Rendszergazda E-mail System.
Köszönjük az együttm?ködést!
Levél a Web Team @ 2014
_
Az üzenet és
On Sun, Nov 09, 2014 at 06:56:45PM -0800, Junio C Hamano wrote:
We could fix this by using a -- to disambiguate, but we
are probably better off using names that are less confusing
to make it more clear that they are unrelated to the working
tree files. This patch turns a/b into one/two.
On Sun, Nov 09, 2014 at 08:48:06PM -0500, Brian Gernhardt wrote:
A pair of recently added tests used branches a and a/b, but earlier
tests created files A and A/B. On case insensitive filesystems (such
as HFS+), that causes git to complain about the name being ambiguous
between branch and
On Sun, Nov 09, 2014 at 09:48:29AM -0800, Junio C Hamano wrote:
Michael Blume blume.m...@gmail.com writes:
Works for me, thanks =)
I'm curious now, is there an automated build of git running on a mac
anywhere? There's a mac mini running jenkins in my office and it's
possible I could
On Sun, Nov 9, 2014 at 10:23 PM, Jeff King p...@peff.net wrote:
On Sun, Nov 09, 2014 at 08:48:06PM -0500, Brian Gernhardt wrote:
A pair of recently added tests used branches a and a/b, but earlier
tests created files A and A/B. On case insensitive filesystems (such
as HFS+), that causes git
Imap-send recently learned to conditionally compile against
and use curl for imap support. To use this feature, you must
both:
1. Compile with USE_CURL_FOR_IMAP_SEND
2. Specify --curl on the command line to enable it
It is OK (and even desirable) for the code checking --curl
to be compiled
On Sun, Nov 9, 2014 at 10:30 PM, Jeff King p...@peff.net wrote:
I know you make test before pushing out the results of any integration
you do. And I recall that for a while (and maybe still?) you even did so
on VMs of a few common platforms. OS X is notoriously irritating to run
in a VM, but
On Sun, Nov 09, 2014 at 06:46:01PM -0800, Michael Blume wrote:
Ok, with that I have a different test failure on the pu branch --
please tell me if I'm spamming the list or if there's some other
protocol I should be using to report issues on pu.
No, reporting problems to the list is exactly
On Sun, Nov 09, 2014 at 10:47:52PM -0800, Junio C Hamano wrote:
On Sun, Nov 9, 2014 at 10:30 PM, Jeff King p...@peff.net wrote:
I know you make test before pushing out the results of any integration
you do. And I recall that for a while (and maybe still?) you even did so
on VMs of a few
On Sun, Nov 09, 2014 at 11:42:32PM +0100, Thomas Quinot wrote:
It may be impractical to install a wrapper script for GIT_SSH
when additional parameters need to be passed. Provide an alternative
way of specifying a shell command to be run, including command line
arguments, by means of the
On Sun, Nov 09, 2014 at 02:49:58PM +0100, René Scharfe wrote:
-- 8 --
Subject: [PATCH] trailer: use CHILD_PROCESS_INIT in apply_command()
Initialize the struct child_process variable cp at declaration time.
This is shorter, saves a function call and prevents using the variable
before
On Mon, Nov 10, 2014 at 01:39:47AM -0500, Jeff King wrote:
On top of br/imap-send-via-libcurl. I needed this to compile 'pu' with
NO_CURL (which I don't usually do, but was testing on a minimal box). I
expect it can just be squashed in to the next re-roll.
Oops, just started reading through
Am 07.11.2014 um 20:54 schrieb Junio C Hamano:
Junio C Hamano gits...@pobox.com writes:
In other words, you give paths from the command line to tell the
command that you want to record the contents of them in the working
tree as a whole to be recorded in the resulting commit.
... and
82 matches
Mail list logo
