Re: [PATCH 1/2] t3312-notes-empty: Test that 'git notes' removes empty notes by default

On Tue, Nov 4, 2014 at 8:32 PM, Johan Herland wrote: > 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. > > Signed-off-by: Johan Herland > --- > t/t3312-notes-empty.

Re: [PATCH v5] lockfile.c: store absolute path

On Sun, Nov 02, 2014 at 07:24:37AM +0100, Michael Haggerty wrote: > Locked paths can be saved in a linked list so that if something wrong > happens, *.lock are removed. For relative paths, this works fine if we > keep cwd the same, which is true 99% of time except: > > - update-index and read-tree

[PATCH 1/2] t3312-notes-empty: Test that 'git notes' removes empty notes by default

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. Signed-off-by: Johan Herland --- t/t3312-notes-empty.sh | 58 ++ 1 file

[PATCH 2/2] notes: Add --allow-empty, to allow storing empty notes

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

Odd git am behavior rewriting subject, adding "ASoC: " prefix

I have a patch file created by git format-patch. Applying it via git am changes the subject prefix. Anyone know why? $ git --version git version 2.1.2 $ git am -i 0002-staging-ft1000-Logging-message-neatening.patch Commit Body is: -- staging: ft1000: Logging message neate

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

Jeff King writes: > The bundle code is not bound by this historical legacy, and could do it > in a different (and more efficient and flexible) way. But it is probably > saner to just keep them identical. It makes the code simpler, and having > bundle as the only transport which has the extra flex

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

On Tue, Nov 04, 2014 at 01:56:15PM -0800, Junio C Hamano wrote: > >> 2. Including two lines, like: > >> > >> $sha1 HEAD\0symref=refs/heads/master > >> $sha1 HEAD > >> > >> which JGit does the right thing with (and git.git seems to, as > >> well). > > > > Sounds sensible

Re: [PATCH] gitignore.txt: fix spelling of "backslash"

Ben North writes: > Signed-off-by: Ben North > --- > Documentation/gitignore.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt > index 8734c15..09e82c3 100644 > --- a/Documentation/gitignore.txt > +++ b/Documen

Re: [PATCH v2 2/7] send-pack.c: add an --atomic-push command line argument

Fixed. Thanks On Tue, Nov 4, 2014 at 2:17 PM, Stefan Beller wrote: > On Mon, Nov 3, 2014 at 11:12 AM, Ronnie Sahlberg wrote: >> This adds support to send-pack to to negotiate and use atomic pushes > > /s/to to/to/ > >> iff the server supports it. Atomic pushes are activated by a new command >>

[PATCH] gitignore.txt: fix spelling of "backslash"

Signed-off-by: Ben North --- Documentation/gitignore.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index 8734c15..09e82c3 100644 --- a/Documentation/gitignore.txt +++ b/Documentation/gitignore.txt @@ -77,7 +77,7 @

Re: [PATCH v2 2/7] send-pack.c: add an --atomic-push command line argument

On Mon, Nov 3, 2014 at 11:12 AM, Ronnie Sahlberg wrote: > This adds support to send-pack to to negotiate and use atomic pushes /s/to to/to/ > iff the server supports it. Atomic pushes are activated by a new command > line flag --atomic-push. > > In order to do this we also need to change the sem

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

Junio C Hamano writes: > Jeff King writes: > >> I peeked at libgit2 and I think it does not support bundles at all yet, >> so that is safe. Grepping for "bundle" in dulwich turns up no hits, >> either. >> >> Looks like JGit does support them. I did a very brief test, and it seems >> to silently

Re: [PATCH v2] line-log: fix crash when --first-parent is used

On Tue, Nov 4, 2014 at 1:24 PM, Junio C Hamano wrote: > Thanks, both. The patch looks good (modulo the indentation of > nparents assignment, which I'll locally fix up). > > Will queue. Awesome, thanks! (I can't believe I missed that tab. Well, at least one of my two lines was correct :-) ) rega

Re: [PATCH v2] line-log: fix crash when --first-parent is used

Tzvetan Mikov writes: > line-log tries to access all parents of a commit, but only the first > parent has been loaded if "--first-parent" is specified, resulting > in a crash. > > Limit the number of parents to one if "--first-parent" is specified. > > Reported-by: Eric N. Vander Weele > Signed-

Re: [PATCH] Fix some misspellings

Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH] submodule: Fix documentation of update subcommand

Jens Lehmann writes: > So I believe that gitmodules.txt should describe all ćonfig > options that can be provided by upstream (and e.g. mention that > the 'url' and 'update' values are copied into .git/config on > init), while all settings that can be overridden locally should > be documented in

Re: [PATCH v2] diff-highlight: exit when a pipe is broken

Jeff King writes: > On Tue, Nov 04, 2014 at 03:01:12PM -0500, John Szakmeister wrote: > >> While using diff-highlight with other tools, I have discovered that Python >> ignores SIGPIPE by default. Unfortunately, this also means that tools >> attempting to launch a pager under Python--and don't r

[PATCH v2] line-log: fix crash when --first-parent is used

line-log tries to access all parents of a commit, but only the first parent has been loaded if "--first-parent" is specified, resulting in a crash. Limit the number of parents to one if "--first-parent" is specified. Reported-by: Eric N. Vander Weele Signed-off-by: Tzvetan Mikov --- PATCH v2:

Re: [PATCH] submodule: Fix documentation of update subcommand

Am 04.11.2014 um 00:08 schrieb Junio C Hamano: Michal Sojka writes: Or something perhaps? Or the detailed description of submodule.$name.update should be dropped from here and refer the reader to config.txt instead? I guess you mean gitmodules.txt. Actually, I do mean the configuration. .

Re: [PATCH v2] diff-highlight: exit when a pipe is broken

On Tue, Nov 04, 2014 at 03:01:12PM -0500, John Szakmeister wrote: > While using diff-highlight with other tools, I have discovered that Python > ignores SIGPIPE by default. Unfortunately, this also means that tools > attempting to launch a pager under Python--and don't realize this is > happening

[PATCH v2] diff-highlight: exit when a pipe is broken

While using diff-highlight with other tools, I have discovered that Python ignores SIGPIPE by default. Unfortunately, this also means that tools attempting to launch a pager under Python--and don't realize this is happening--means that the subprocess inherits this setting. In this case, it means

Re: [PATCH] diff-highlight: exit when a pipe is broken

On Sat, Nov 1, 2014 at 12:04 AM, Jeff King wrote: > On Fri, Oct 31, 2014 at 07:04:04AM -0400, John Szakmeister wrote: > >> While using diff-highlight with other tools, I have discovered that Python >> ignores SIGPIPE by default. Unfortunately, this also means that tools >> attempting to launch a

Re: [PATCH 0/2] fetch, reflogs, and bare repositories

Jeff King writes: > I ran into a rather confusing case of fetching into a bare repository > with reflogs turned on: > ... > This turns out to be caused by two subtle bugs: one that makes "git > fetch" use reflogs inconsistently, and the other that causes some ref > updates to fail when reflogs ar

Re: squash commits deep down in history

On Thu, Oct 23, 2014 at 8:34 AM, Henning Moll wrote: > Hi, > > i need to squash several commits into a single one in a automated way. I know > that there is interactive rebase, which can also be automated using > GIT_SEQUENCE_EDITOR. Unfortunately my history is very large and i need to > squash

Re: git reflog --date

On Tue, Oct 21, 2014 at 1:24 PM, Junio C Hamano wrote: > John Tapsell writes: > >> Hi all, >> >> Could we add a default to "--date" so that: >> >> git reflog --date >> >> just works? (Currently you need to do: git reflog --date=iso) It >> should probably obey the default in log.date? > > Hm

Re: Bug in log for path in case of identical commit

On Fri, Oct 31, 2014 at 4:40 AM, Alexandre Garnier wrote: > When merging 2 branches with the same modifications on the both sides, > depending the merge side, one branch disappear from the file history. > > To be more clear, there is a script in attachment to reproduce, but > here is the result :

[PATCH 2/2] ignore stale directories when checking reflog existence

When we update a ref, we have two rules for whether or not we actually update the reflog: 1. If the reflog already exists, we will always append to it. 2. If log_all_ref_updates is set, we will create a new reflog file if necessary. We do the existence check by trying to open the r

[PATCH 1/2] fetch: load all default config at startup

When we start the git-fetch program, we call git_config to load all config, but our callback only processes the fetch.prune option; we do not chain to git_default_config at all. This means that we may not load some core configuration which will have an effect. For instance, we do not load core.log

[PATCH 0/2] fetch, reflogs, and bare repositories

I ran into a rather confusing case of fetching into a bare repository with reflogs turned on: # make a repo with a two-component branch name git init -q && git commit -q --allow-empty -m one && git branch foo/bar && # now fetch it all into a bare repo with reflogs git

Kedves: Webmail Előfizető

-- A postaláda mérete elérte határértéket kérjük kattintson ide http://updattwesd.jigsy.com és erősítsd meg az e-mail Köszönöm rendszergazda Powered by elektronikus levél rendszer. Köszönjük az együttműködést! Levél a Web team @ 2014 -- To unsubscribe from this list: send the line "unsubscrib

Re: [PATCH] line-log: fix crash when --first-parent is used

Tzvetan Mikov schrieb am 03.11.2014 um 23:09: > On Mon, Nov 3, 2014 at 12:58 PM, Junio C Hamano wrote: > >>> line-log tries to access all parents of a commit, but only the first >>> parent has been loaded if "--first-parent" is specified, resulting >>> in a crash. >>> >>> Limit the number of pare