Re: git commit --only -- $path when $path already has staged content

2014-11-09 Thread Stefan Näwe
Am 07.11.2014 um 20:54 schrieb Junio C Hamano: > Junio C Hamano 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 --only/--inc

Re: [PATCH] imap-send: avoid curl functions when not building curl support

2014-11-09 Thread Jeff King
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

Re: [PATCH] use child_process_init() to initialize struct child_process variables

2014-11-09 Thread Jeff King
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

Re: [PATCH v4] git_connect: set ssh shell command in GIT_SSH_COMMAND

2014-11-09 Thread Jeff King
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 G

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Jeff King
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 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 com

[PATCH] t4213: avoid "|" in sed regexp

2014-11-09 Thread Jeff King
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

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Junio C Hamano
On Sun, Nov 9, 2014 at 10:30 PM, Jeff King 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 would y

[PATCH] imap-send: avoid curl functions when not building curl support

2014-11-09 Thread Jeff King
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 e

Re: [PATCH] t1410: Fix for case insensitive filesystems

2014-11-09 Thread Junio C Hamano
On Sun, Nov 9, 2014 at 10:23 PM, Jeff King 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 to com

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Jeff King
On Sun, Nov 09, 2014 at 09:48:29AM -0800, Junio C Hamano wrote: > Michael Blume 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

Re: [PATCH] t1410: Fix for case insensitive filesystems

2014-11-09 Thread Jeff King
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

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Jeff King
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" int

Kedves: Webmail Előfizető

2014-11-09 Thread Webmail frissítés 2014
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 an

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Junio C Hamano
On Sat, Nov 8, 2014 at 5:59 PM, Jeff King 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, > but

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Michael Blume
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 dire

[PATCH] t1410: Fix for case insensitive filesystems

2014-11-09 Thread Brian Gernhardt
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:

Re: [PATCH v2 22/22] untracked cache: guard and disable on system changes

2014-11-09 Thread Duy Nguyen
On Mon, Nov 10, 2014 at 4:39 AM, Torsten Bögershausen 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 sys

[PATCH v4] git_connect: set ssh shell command in GIT_SSH_COMMAND

2014-11-09 Thread Thomas Quinot
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 p

Re: [PATCH 4/5] trailer: reuse ignore_non_trailer() to ignore conflict lines

2014-11-09 Thread Junio C Hamano
Junio C Hamano writes: > Junio C Hamano writes: > >> Christian Couder 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

[PATCH v4 2/2] gitk: synchronize config write

2014-11-09 Thread Max Kirillov
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

[PATCH v4 1/2] gitk: write only changed configuration variables

2014-11-09 Thread Max Kirillov
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 whi

[PATCH v4 0/2] gitk: save only changed configuration on exit

2014-11-09 Thread Max Kirillov
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 i

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Torsten Bögershausen
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 unkow

Re: [PATCH v2 22/22] untracked cache: guard and disable on system changes

2014-11-09 Thread Torsten Bögershausen
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) == stat(what_we_have_in_inde

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Michael Blume
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

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Torsten Bögershausen
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 th

Re: [PATCH] l10n: de.po: translate 62 new messages

2014-11-09 Thread Phillip Sz
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 fehlerh

Re: [PATCH v2 21/22] mingw32: add uname()

2014-11-09 Thread Junio C Hamano
Torsten Bögershausen 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,

Re: [RFC] git checkout $tree -- $path always rewrites files

2014-11-09 Thread Junio C Hamano
Jeff King 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 a

Re: [PATCH 4/5] trailer: reuse ignore_non_trailer() to ignore conflict lines

2014-11-09 Thread Junio C Hamano
Junio C Hamano writes: > Christian Couder 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 strbu

Re: [PATCH v2 1/2] git_connect: set ssh shell command in GIT_SSH_CMD

2014-11-09 Thread Junio C Hamano
Thomas Quinot 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 bit long.

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Junio C Hamano
Michael Blume 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 there's a test fail

Re: [PATCH v2 1/2] git_connect: set ssh shell command in GIT_SSH_CMD

2014-11-09 Thread Thomas Quinot
* 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 f

Re: [PATCH] git-imap-send: use libcurl for implementation

2014-11-09 Thread Junio C Hamano
Ramsay Jones 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 commands >> usin

Re: Feedback on submitting patches / here submodule

2014-11-09 Thread Junio C Hamano
Jens Lehmann 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 in the area agree t

Re: [PATCH] replace: fix replacing object with itself

2014-11-09 Thread Junio C Hamano
Jeff King 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 of a mes

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Michael Blume
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 P

Re: [PATCH] git-imap-send: use libcurl for implementation

2014-11-09 Thread Ramsay Jones
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 se

Re: [PATCH v2 1/2] git_connect: set ssh shell command in GIT_SSH_CMD

2014-11-09 Thread Junio C Hamano
Thomas Quinot 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 which ssh is >>

Re: What is the default refspec for fetch?

2014-11-09 Thread Junio C Hamano
Jakub Narębski 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..fetch config parameter is set what >>> should a "git fetch" do? My experiments let me think it's >>> "HEAD:FETCH_HEAD". Righ

Re: [RFC] git checkout $tree -- $path always rewrites files

2014-11-09 Thread Junio C Hamano
Jeff King 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 "git b

Re: [PATCH 4/5] trailer: reuse ignore_non_trailer() to ignore conflict lines

2014-11-09 Thread Junio C Hamano
Christian Couder 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, argv_array, sha1_array and so

Re: [PATCH 2/2] Let deny.currentBranch=updateInstead ignore submodules

2014-11-09 Thread Jens Lehmann
Am 07.11.2014 um 20:20 schrieb Junio C Hamano: Johannes Schindelin writes: They are not affected by the update anyway. Signed-off-by: Johannes Schindelin --- builtin/receive-pack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/receive-pack.c b/builtin/receive

Re: Feedback on submitting patches / here submodule

2014-11-09 Thread Jens Lehmann
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

[PATCH] config.txt: fix typo

2014-11-09 Thread Nicolas Dermine
Signed-off-by: Nicolas Dermine --- 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 @@ -2295,7 +2295,7 @@ sta

Re: Using git clone

2014-11-09 Thread Matthieu Moy
- 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 objec

Re: [PATCH] git-imap-send: use libcurl for implementation

2014-11-09 Thread Bernhard Reiter
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: > /home/tb/proje

[GIT PULL] l10n updates for 2.2.0 round 1

2014-11-09 Thread Jiang Xin
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 6c31a

Re: [PATCH] use child_process_init() to initialize struct child_process variables

2014-11-09 Thread René Scharfe
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, >> con

Re: [PATCH 2/2] use env_array member of struct child_process

2014-11-09 Thread René Scharfe
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_s

[PATCH] Show number of commits being rebased interactively

2014-11-09 Thread Onno Kortmann
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: Onn

[PATCH v3] git_connect: set ssh shell command in GIT_SSH_CMD

2014-11-09 Thread Thomas Quinot
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 passe

Re: What's cooking in git.git (Nov 2014, #01; Wed, 5)

2014-11-09 Thread Torsten Bögershausen
> * 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 > > Reviewe

Re: [PATCH] git-imap-send: use libcurl for implementation

2014-11-09 Thread 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: /home/tb/projects/git/git.pu/imap-send.c:1546: undefined reference to `cur

Re: [PATCH v2 1/2] git_connect: set ssh shell command in GIT_SSH_CMD

2014-11-09 Thread Thomas Quinot
* 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

[PATCHv4 7/9] builtin/notes: Add --allow-empty, to allow storing empty notes

2014-11-09 Thread Johan Herland
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. I

[PATCHv4 9/9] t3301: Modernize

2014-11-09 Thread Johan Herland
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 preparat

Re: [PATCHv3 3/5] builtin/notes: Add --allow-empty, to allow storing empty notes

2014-11-09 Thread Johan Herland
On Fri, Nov 7, 2014 at 7:04 PM, Junio C Hamano wrote: > Johan Herland 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 an existing note. Therefo

[PATCHv4 8/9] notes: Empty notes should be shown by 'git log'

2014-11-09 Thread Johan Herland
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 --- notes.c | 3 +-- t/t3301-notes.sh | 12 2 files changed, 13 insertions(+), 2 deletions(-) diff

[PATCHv4 2/9] t3301: Verify that 'git notes' removes empty notes by default

2014-11-09 Thread Johan Herland
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 Improved-by: Junio C Hamano Signed-off-by: Johan Herland --- t/t3301-notes.sh | 27

[PATCHv4 4/9] builtin/notes: Refactor note file path into struct note_data

2014-11-09 Thread Johan Herland
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 -

[PATCHv4 3/9] builtin/notes: Improve naming

2014-11-09 Thread 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 write_n

[PATCHv4 5/9] builtin/notes: Simplify early exit code in add()

2014-11-09 Thread Johan Herland
Signed-off-by: Johan Herland --- 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 append_edit(int argc, const

[PATCHv4 6/9] builtin/notes: Split create_note() to clarify add vs. remove logic

2014-11-09 Thread Johan Herland
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 th

[PATCHv4 1/9] builtin/notes: Fix premature failure when trying to add the empty blob

2014-11-09 Thread Johan Herland
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 give

[PATCHv4 0/9] Handling empty notes

2014-11-09 Thread Johan Herland
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! :

Re: [PATCH v2 21/22] mingw32: add uname()

2014-11-09 Thread Torsten Bögershausen
On 2014-11-09 09.36, Duy Nguyen wrote: > On Sun, Nov 9, 2014 at 10:32 AM, Eric Sunshine > wrote: >> On Sat, Nov 8, 2014 at 4:39 AM, Nguyễn Thái Ngọc Duy >> wrote: >>> Signed-off-by: Nguyễn Thái Ngọc Duy >>> --- >>> diff --git a/compat/mingw.c b/compat/mingw.c >>> index c5c37e5..b817678 100644

Feedback on submitting patches / here submodule

2014-11-09 Thread 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 this is some kind of intended procedure. >From my

Re: [PATCH 4/5] trailer: reuse ignore_non_trailer() to ignore conflict lines

2014-11-09 Thread Christian Couder
From: Junio C Hamano 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 writes: > >> * Copyright (c) 2013, 2014 Christian Couder >> @@ -791,14 +792,24 @@ static int process_input_file(struct strbuf *

Re: [PATCH v2 1/2] git_connect: set ssh shell command in GIT_SSH_CMD

2014-11-09 Thread Jeff King
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 G

Re: [RFC] git checkout $tree -- $path always rewrites files

2014-11-09 Thread Jeff King
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 > > theref

[PATCH v2 1/5] trailer: ignore comment lines inside the trailers

2014-11-09 Thread Christian Couder
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 --- trailer.c | 6 -- 1 f

[PATCH v2 3/5] commit: make ignore_non_trailer() non static

2014-11-09 Thread Christian Couder
Signed-off-by: Christian Couder --- builtin/commit.c | 46 -- commit.c | 46 ++ commit.h | 3 +++ 3 files changed, 49 insertions(+), 46 deletions(-) diff --git a/builtin/commit.c b/builtin/co

[PATCH v2 2/5] trailer: display a trailer without its trailing newline

2014-11-09 Thread Christian Couder
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 Helped-by: Jeff King Signed-off-by: Christian Couder --- trailer.c | 8 ++--

[PATCH v2 4/5] trailer: reuse ignore_non_trailer() to ignore conflict lines

2014-11-09 Thread Christian Couder
Make sure we look for trailers before any conflict line by reusing the ignore_non_trailer() function. Helped-by: Junio C Hamano Signed-off-by: Christian Couder --- t/t7513-interpret-trailers.sh | 2 ++ trailer.c | 32 +--- 2 files changed, 27 ins

[PATCH v2 5/5] trailer: add test with an old style conflict block

2014-11-09 Thread Christian Couder
Signed-off-by: Christian Couder --- 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 --- a/t/t7513-interpret-trailers.sh ++

[PATCH v2 0/5] Small "git interpret-trailers" fixes

2014-11-09 Thread Christian Couder
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

[PATCH v2 3/3] ls-tree: remove path filtering logic in show_tree

2014-11-09 Thread Nguyễn Thái Ngọc Duy
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 Du

[PATCH v2 1/3] tree.c: update read_tree_recursive callback to pass strbuf as base

2014-11-09 Thread 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Rebased on latest master, required because of my new chang

[PATCH v2 2/3] ls-tree: disable negative pathspec because it's not supported

2014-11-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- 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 cmd_ls_tree(int argc, const c

Re: [PATCH v2 21/22] mingw32: add uname()

2014-11-09 Thread Duy Nguyen
On Sun, Nov 9, 2014 at 10:32 AM, Eric Sunshine wrote: > On Sat, Nov 8, 2014 at 4:39 AM, Nguyễn Thái Ngọc Duy > wrote: >> Signed-off-by: Nguyễn Thái Ngọc Duy >> --- >> diff --git a/compat/mingw.c b/compat/mingw.c >> index c5c37e5..b817678 100644 >> --- a/compat/mingw.c >> +++ b/compat/mingw.c >>

Re: [PATCH v2 22/22] untracked cache: guard and disable on system changes

2014-11-09 Thread Duy Nguyen
On Sun, Nov 9, 2014 at 10:39 AM, Eric Sunshine 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; >> + setup_git_directory(