Re: [PATCH] Fix http-backend reading till EOF, ignoring CONTENT_LENGTH, violating rfc3875 -- WAS: Problem with git-http-backend.exe as iis cgi

On Wed, Mar 30, 2016 at 09:08:56AM +, Florian Manschwetus wrote: > After additional analysis it turned out, that in the case you > mentioned, at least IIS, sets CONTENT_LENGTH to -1 resulting in the > current behavior of git-http-backend being sufficient in this > situation. > Therefore I

What's cooking in git.git (Apr 2016, #01; Fri, 1)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. There are quite a few topics that

Re: [PATCH v2 6/7] correct blame for files commited with CRLF

tbo...@web.de writes: > Whenever a CLRF conversion is needed (or any filter us set), load the > index temporally, before calling convert_to_git() I am not sure if this is needed. We should just do read_cache() unconditionally at the beginning of fake_working_tree_commit(), without even

Re: [PATCH v2 5/7] CRLF: unify the "auto" handling

tbo...@web.de writes: > From: Torsten Bögershausen > > Make .gitattributes "* text=auto eol=crlf" to do the same as > setting core.autocrlf=true and "* text=auto eol=crlf" the same > as core.autocrlf=input "Earlier we didn't do so and instead did X, which was not great because it

Re: [PATCH v2 4/7] t0027: TC for combined attributes

tbo...@web.de writes: > +for crlf in true false input; Style: lose the ';' at the end (there may be other instances of the same). -- 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

Re: [PATCH v2 3/7] Allow core.autocrlf=input and core.eol=crlf

tbo...@web.de writes: > From: Torsten Bögershausen > > Commit 942e77 "Add "core.eol" config variable" adds a condition to > the config parser: core.autocrlf=input is not allowed together with > core.eol=crlf. > > This may lead to unnecessary problems, when config files are

Re: [PATCH 2/2] ident: make the useConfigOnly error messages more informative

Marios Titas writes: > Yeah, maybe informative is not the right word. What I meant is that it > directs the user to do the "git config user.name" thing, which is > likely the most appropriate course of action in this situation. In any > event, I think printing the env_hint

Re: [PATCH 1/2] ident: check for useConfigOnly before auto-detection of name/email

Marios Titas writes: > On Thu, Mar 31, 2016 at 10:40:03AM -0400, Jeff King wrote: >>On Wed, Mar 30, 2016 at 10:29:42PM +0300, Marios Titas wrote: >> >>> If user.useConfigOnly is set, it does not make sense to try to >>> auto-detect the name and/or the email. So it's better to do

Re: [PATCH 1/2] submodule--helper, module_clone: always operate on absolute paths

Junio C Hamano writes: > From: Junio C Hamano > Date: Fri, 1 Apr 2016 12:23:16 -0700 > Subject: [PATCH] submodule--helper: do not borrow absolute_path() result for > too long > > absolute_path() is designed to allow its callers to take a brief > peek of

Re: [PATCH 1/2] imap-send.c: implements the GIT_CURL_DEBUG environment variable

On Fri, Apr 1, 2016 at 6:44 AM, Elia Pinto wrote: > Implements the GIT_CURL_DEBUG environment variable to allow a greater > degree of detail of GIT_CURL_VERBOSE, in particular the complete > transport header and all the data payload exchanged. > It might be useful if a

Re: [PATCH 1/2] submodule--helper, module_clone: always operate on absolute paths

On Fri, Apr 1, 2016 at 3:30 PM, Junio C Hamano wrote: > Subject: [PATCH] submodule--helper: do not borrow absolute_path() result for > too long > > absolute_path() is designed to allow its callers to take a brief > peek of the result (typically, to be fed to functions like >

Re: [PATCH v3 00/16] port branch.c to use ref-filter's printing options

On Fri, Apr 1, 2016 at 8:45 PM, Ramsay Jones wrote: > > > On 01/04/16 14:44, Dennis Kaarsemaker wrote: >> On Fri, Apr 01, 2016 at 03:31:17PM +0200, Dennis Kaarsemaker wrote: >>> On wo, 2016-03-30 at 15:09 +0530, Karthik Nayak wrote: This is part of

Re: [PATCH v3] builtin/apply: handle parse_binary() failure

On Fri, Apr 1, 2016 at 1:16 PM, Junio C Hamano wrote: > Christian Couder writes: >> >> It looks like this patch is not in pu. Maybe it has fallen through the >> cracks? > > Yup, it indeed was ignored (giving priority to work towards 2.8 > during

Re: [PATCH 1/2] submodule--helper, module_clone: always operate on absolute paths

Junio C Hamano writes: > By the way, this line is the last use of sm_gitdir_rel before it > gets freed. I wonder > > sm_gitdir = absolute_path(sb.buf); > > would be sufficient. We can lose the variable, and free() on it at > the end of this function, and an extra

Re: [PATCH 1/2] submodule--helper, module_clone: always operate on absolute paths

Stefan Beller writes: > + char *sm_gitdir_rel, *p, *path = NULL; > + const char *sm_gitdir; > struct strbuf rel_path = STRBUF_INIT; > struct strbuf sb = STRBUF_INIT; > > @@ -198,7 +199,14 @@ static int module_clone(int argc, const char **argv, > const

Re: weird diff output?

Stefan Beller writes: > Thanks for going through examples! > (I would, too. But fixing a submodule regression is more important > now; I only develop new features when there are no known regressions > caused by me) This is a tangent but perhaps as an experiment perhaps we

Re: [PATCH v3 13/16] ref-filter: allow porcelain to translate messages in the output

cc'ing Matthieu since this patch was initially written by him. On Thu, Mar 31, 2016 at 3:28 AM, Junio C Hamano wrote: > Karthik Nayak writes: > >> +static struct ref_msg { >> + const char *gone; >> + const char *ahead; >> + const char

Re: [PATCH v3 05/16] ref-filter: move get_head_description() from branch.c

On Thu, Mar 31, 2016 at 3:46 AM, Junio C Hamano wrote: > Karthik Nayak writes: > >> -static char *get_head_description(void) >> -{ >> - struct strbuf desc = STRBUF_INIT; >> - struct wt_status_state state; >> - memset(, 0, sizeof(state)); >> -

Re: [PATCH v3 09/16] ref-filter: make "%(symref)" atom work with the ':short' modifier

On Thu, Mar 31, 2016 at 3:47 AM, Junio C Hamano wrote: > Karthik Nayak writes: > >> The "%(symref)" atom doesn't work when used with the ':short' modifier >> because we strictly match only 'symref' for setting the 'need_symref' >> indicator. Fix this by

Re: [PATCH 0/2] mergetools: add support for ExamDiff

Jacob Nisnevich writes: > OK I add the quotes and modified the comment. I also changed $folder to > $sub_directory. I think that makes a little bit more sense and sounds a lot > better. > > Jacob Nisnevich (2): > mergetools: create mergetool_find_win32_cmd() helper

Re: [PATCH 00/21] replacement for dt/refs-backend-lmdb v7 patch 04/33

On Thu, 2016-03-31 at 18:37 -0700, Stefan Beller wrote: > On Wed, Mar 30, 2016 at 1:05 PM, David Turner < > dtur...@twopensource.com> wrote: > > On Wed, 2016-03-30 at 08:37 +0200, Michael Haggerty wrote: > > > On 03/29/2016 10:12 PM, David Turner wrote: > > > > On Sun, 2016-03-27 at 07:22 +0200,

Re: [PATCHv4 3/4] bundle: don't leak an fd in case of early return

On Fri, Apr 01, 2016 at 10:29:51AM -0700, Junio C Hamano wrote: > > This does still suffer from the double-close I mentioned earlier. I'm > > not sure if we want to address that or not. > > Something like this on top? > > bundle.c | 7 +-- > 1 file changed, 5 insertions(+), 2 deletions(-)

Re: [PATCHv4 1/4] notes: don't leak memory in git_config_get_notes_strategy

On Fri, Apr 1, 2016 at 1:14 PM, Jeff King wrote: > On Fri, Apr 01, 2016 at 10:03:25AM -0700, Junio C Hamano wrote: >> From: Stefan Beller >> Date: Thu, 31 Mar 2016 11:04:03 -0700 >> Subject: [PATCH] notes: don't leak memory in git_config_get_notes_strategy >>

Re: [PATCHv4 3/4] bundle: don't leak an fd in case of early return

Jeff King writes: > You didn't see my response to the other patch yet. :) > >> >/* write pack */ >> >if (write_pack_data(bundle_fd, )) >> > - return -1; >> > + goto err; > > This does still suffer from the double-close I mentioned earlier. I'm > not sure

Re: GIT_CONFIG - what's the point?

> Let me explain my scenario. I have an nfs mounted home directory. It > is used across multiple machines. I use different colored xterms for > each machine. But that means that the one set of colors in my one > .gitconfig file don't work against all my screen backgrounds. I'm > trying to find a

Re: [PATCH] builtin/apply: free patch when parse_chunk() fails

Christian Couder writes: > When parse_chunk() fails it can return -1, for example > when find_header() doesn't find a patch header. > > In this case it's better in apply_patch() to free the > "struct patch" that we just allocated instead of > leaking it. > >

Re: [PATCH v3] builtin/apply: handle parse_binary() failure

Christian Couder writes: > On Fri, Mar 18, 2016 at 1:30 PM, Christian Couder > wrote: >> In parse_binary() there is: >> >> forward = parse_binary_hunk(, , , ); >> if (!forward && !status) >> /* there has to

Re: [PATCHv4 3/4] bundle: don't leak an fd in case of early return

On Fri, Apr 01, 2016 at 10:05:49AM -0700, Junio C Hamano wrote: > Stefan Beller writes: > > > In successful operation `write_pack_data` will close the `bundle_fd`, > > but when we exit early, we need to take care of the file descriptor > > as well as the lock file ourselves.

Re: [PATCHv4 1/4] notes: don't leak memory in git_config_get_notes_strategy

On Fri, Apr 01, 2016 at 10:03:25AM -0700, Junio C Hamano wrote: > -- >8 -- > From: Stefan Beller > Date: Thu, 31 Mar 2016 11:04:03 -0700 > Subject: [PATCH] notes: don't leak memory in git_config_get_notes_strategy > > This function asks for the value of a configuration and >

Re: [PATCHv4 3/4] bundle: don't leak an fd in case of early return

Stefan Beller writes: > In successful operation `write_pack_data` will close the `bundle_fd`, > but when we exit early, we need to take care of the file descriptor > as well as the lock file ourselves. The lock file may be deleted at the > end of running the program, but we

Re: [PATCHv4 1/4] notes: don't leak memory in git_config_get_notes_strategy

Junio C Hamano writes: > Eric Sunshine writes: > >> Meh. Rather than reverting the git_config_get_value(), it would have >> been just as easy and safer (less chance of a future change >> re-introducing a leak) if you had just inserted the necessary

Re: [PATCH] doc: clarify that notes can be attached to any type of stored object

Junio C Hamano writes: > Sebastian Schuberth writes: > >> Signed-off-by: Sebastian Schuberth >> --- >> Documentation/git-notes.txt | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) >> > I do not think this is correct

Re: [PATCH v2 3/4] format-patch: introduce --base=auto option

Ye Xiaolong writes: > For the info starts with "base-commit: ...", robot would know it > is reliable base commit, it would just checkout it and apply the prerequisite > patches and patchset for the work. > > For the info starts with "parent-commit: ; parent-patch-id: ", >

Re: [PATCHv4 1/4] notes: don't leak memory in git_config_get_notes_strategy

Eric Sunshine writes: > Meh. Rather than reverting the git_config_get_value(), it would have > been just as easy and safer (less chance of a future change > re-introducing a leak) if you had just inserted the necessary check > here: > > if (!value) > return

[PATCH v2 6/7] correct blame for files commited with CRLF

From: Torsten Bögershausen git blame reports lines as not "Not Committed Yet" when they have CRLF in the index, CRLF in the worktree and e.g. core.autocrlf is true. Since commit c48053 "new safer autocrlf handling", files that have CRLF in the index are not normalized at commit

[PATCH v2 4/7] t0027: TC for combined attributes

From: Torsten Bögershausen Add more test cases for the not normalized files ("NNO"). The "text" attribute is most important, use it as the first parameter. "ident", if set, is the second paramater followed by the eol attribute. The eol attribute overrides core.autocrlf, which

Re: [PATCH v3 3/4] format-patch: introduce --base=auto option

Ye Xiaolong writes: > On Thu, Mar 31, 2016 at 10:43:48AM -0700, Junio C Hamano wrote: >>Xiaolong Ye writes: >> >>> Introduce --base=auto to record the base commit info automatically, the >>> base_commit >>> will be the merge base of tip commit of

[PATCH v2 7/7] convert.c: more safer crlf handling with text attribute

From: Torsten Bögershausen A follow-up after a discussion how to fix the flaky execution of t0025, gmane/$284352. This patch extends the work done in commit c480539: "Make it work also for un-normalized repositories". Make sure that CRLF can be converted round trip, or don't

[PATCH v2 5/7] CRLF: unify the "auto" handling

From: Torsten Bögershausen Make .gitattributes "* text=auto eol=crlf" to do the same as setting core.autocrlf=true and "* text=auto eol=crlf" the same as core.autocrlf=input Signed-off-by: Torsten Bögershausen --- Documentation/config.txt| 10 -

[PATCH v2 2/7] convert.c: stream and early out

From: Torsten Bögershausen When statistics are done for the autocrlf handling, the search in the content can be stopped, if e.g - a search for binary is done, and a NUL character is found - a search for CRLF is done, and the first CRLF is found. Similar when statistics for binary

[PATCH v2 1/7] Make it possible to get sha1 for a path from the index

From: Torsten Bögershausen Factor out the retrieval of the sha1 for a given path in read_blob_data_from_index() into the function get_sha1_from_index(). This will be used in the next commit, when convert.c can do the analyze for "text=auto" without slurping the whole blob into

[PATCH v2 3/7] Allow core.autocrlf=input and core.eol=crlf

From: Torsten Bögershausen Commit 942e77 "Add "core.eol" config variable" adds a condition to the config parser: core.autocrlf=input is not allowed together with core.eol=crlf. This may lead to unnecessary problems, when config files are parsed: A global config file sets

Re: [PATCH v3 2/4] format-patch: add '--base' option to record base tree info

Ye Xiaolong writes: > On Thu, Mar 31, 2016 at 10:38:04AM -0700, Junio C Hamano wrote: > >>The contents of this look OK, but does it format correctly via >>AsciiDoc? I suspect that only the first paragraph up to "of this >>shape:" would appear correctly and all the rest

Re: [PATCH 1/2] imap-send.c: implements the GIT_CURL_DEBUG environment variable

Elia Pinto writes: > Implements the GIT_CURL_DEBUG environment variable to allow a greater > degree of detail of GIT_CURL_VERBOSE, in particular the complete > transport header and all the data payload exchanged. > It might be useful if a particular situation could

Re: [PATCH] doc: clarify that notes can be attached to any type of stored object

Sebastian Schuberth writes: > Signed-off-by: Sebastian Schuberth > --- > Documentation/git-notes.txt | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt > index

Re: [PATCH v3 00/16] port branch.c to use ref-filter's printing options

On 01/04/16 14:44, Dennis Kaarsemaker wrote: > On Fri, Apr 01, 2016 at 03:31:17PM +0200, Dennis Kaarsemaker wrote: >> On wo, 2016-03-30 at 15:09 +0530, Karthik Nayak wrote: >>> >>> This is part of unification of the commands 'git tag -l, git branch -l >>> and git for-each-ref'. This ports over

Re: [PATCH 2/2] http.c: implements the GIT_CURL_DEBUG environment variable

On 01/04/16 11:44, Elia Pinto wrote: > Implements the GIT_CURL_DEBUG environment variable to allow a greater > degree of detail of GIT_CURL_VERBOSE, in particular the complete > transport header and all the data payload exchanged. > It might be useful if a particular situation could require a

Re: [PATCH 1/2] imap-send.c: implements the GIT_CURL_DEBUG environment variable

On 01/04/16 11:44, Elia Pinto wrote: > Implements the GIT_CURL_DEBUG environment variable to allow a greater > degree of detail of GIT_CURL_VERBOSE, in particular the complete > transport header and all the data payload exchanged. > It might be useful if a particular situation could require a

Re: GIT_CONFIG - what's the point?

On Fri, Apr 01, 2016 at 10:31:12AM -0400, Matthew Persico wrote: > Let me explain my scenario. I have an nfs mounted home directory. It > is used across multiple machines. I use different colored xterms for > each machine. But that means that the one set of colors in my one > .gitconfig file

Re: [PATCHv3 0/2] Fix relative path issues in recursive submodules.

On 01/04/16 01:17, Stefan Beller wrote: > Thanks Junio for review! > > v3: > * This is a resend of the last two patches of the series, i.e. it replaces >44859d6626d4 and efdef1e2e in sb/submodule-helper-clone-regression-fix > > * use absolute_path for sm_gitdir Hi Stefan, In response

Re: GIT_CONFIG - what's the point?

Let me explain my scenario. I have an nfs mounted home directory. It is used across multiple machines. I use different colored xterms for each machine. But that means that the one set of colors in my one .gitconfig file don't work against all my screen backgrounds. I'm trying to find a way to tune

Re: Signed-off-by vs Reviewed-by

Hi, On Thu, Mar 31, 2016 at 09:28:44AM -0700, Junio C Hamano wrote: > The internal "parse the existing trailer block and manipulate it by > adding, conditionally adding, replacing and deleting it" logic was > done as an experimental "interpret-trailers" program, but polishing

Re: [PATCH v3 3/4] format-patch: introduce --base=auto option

On Thu, Mar 31, 2016 at 10:43:48AM -0700, Junio C Hamano wrote: >Xiaolong Ye writes: > >> Introduce --base=auto to record the base commit info automatically, the >> base_commit >> will be the merge base of tip commit of the upstream branch and >> revision-range >>

Re: [PATCH v3 00/16] port branch.c to use ref-filter's printing options

On Fri, Apr 01, 2016 at 03:31:17PM +0200, Dennis Kaarsemaker wrote: > On wo, 2016-03-30 at 15:09 +0530, Karthik Nayak wrote: > > > > This is part of unification of the commands 'git tag -l, git branch -l > > and git for-each-ref'. This ports over branch.c to use ref-filter's > > printing options.

Re: [PATCH v3 2/4] format-patch: add '--base' option to record base tree info

On Thu, Mar 31, 2016 at 10:38:04AM -0700, Junio C Hamano wrote: >Xiaolong Ye writes: > >> Maintainers or third party testers may want to know the exact base tree >> the patch series applies to. Teach git format-patch a '--base' option to >> record the base tree info and

Re: [PATCH v3 00/16] port branch.c to use ref-filter's printing options

On wo, 2016-03-30 at 15:09 +0530, Karthik Nayak wrote: > > This is part of unification of the commands 'git tag -l, git branch -l > and git for-each-ref'. This ports over branch.c to use ref-filter's > printing options. > > Initially posted here: $(gmane/279226). It was decided that this series

Re: GIT_CONFIG - what's the point?

On Thu, Mar 31, 2016 at 08:54:26PM -0400, Matthew Persico wrote: > So, what's the point of GIT_CONFIG if only git-config uses it? Or did > I miss a step? There isn't a point to it. It's historical cruft that has been left in to avoid breaking older scripts. The same thing is generally better

Re: What is an efficient way to get all blobs / trees that have notes attached?

On Fri, Apr 1, 2016 at 12:51 PM, Sebastian Schuberth wrote: > Hi, > > I'm curious whether there's a more efficient way to get a list of blobs / > trees (and their names) that have notes attached than doing this: > > 1) Get all notes refs I'm interested in (git-for-each-ref).

Re: Trouble with cat-file on tags

On Fri, Apr 01, 2016 at 12:00:44PM +0200, Sebastian Schuberth wrote: > This means > > $ git cat-file tag refs/tags/v0.1.2 > > displays the *contents* of the tag, not the tag itself. Right. `cat-file` is about looking at object content. > Which leads me to > the next question: For a given name

Re: What is an efficient way to get all blobs / trees that have notes attached?

On Fri, Apr 1, 2016 at 2:16 PM, Johan Herland wrote: > for notes_ref in $(git for-each-ref refs/notes | cut -c 49-) > do > echo "--- $notes_ref ---" > for annotated_obj in $(git notes --ref=$notes_ref list | cut -c 41-) > do > type=$(git cat-file -t

Re: git alias quoting help

On Fri, Apr 1, 2016 at 7:05 AM, Christian Couder wrote: > On Wed, Mar 30, 2016 at 6:13 AM, shawn wilson wrote: >> I've also tried to make this a plain bash script (w/o the function or >> if statements and am failing at the same place). The issue

Masking or hiding directories and files during a git submodule checkout

Hi All, My constraints are as follows: * I use submodules to reference other people's code. * I don't like to have to send commits to those authors of those submodules, they might not be accepted. * I don't want to maintain my own fork of the submodule. * Some submodules may contain lots of

Re: [PATCH 1/2] imap-send.c: implements the GIT_CURL_DEBUG environment variable

On 01.04.16 12:44, Elia Pinto wrote: > Implements the GIT_CURL_DEBUG environment variable to allow a greater > degree of detail of GIT_CURL_VERBOSE, in particular the complete > transport header and all the data payload exchanged. > It might be useful if a particular situation could require a more

Re: RPM spec file broken by README.md

On Fri, Apr 1, 2016 at 1:23 PM, Christian Couder wrote: > Hi! > > On Fri, Apr 1, 2016 at 7:35 AM, Ron Isaacson wrote: >> Hi everyone, >> >> I've noticed that "make rpm" is failing for 2.8.0 because README was >> replaced with README.md. This

Re: RPM spec file broken by README.md

Hi! On Fri, Apr 1, 2016 at 7:35 AM, Ron Isaacson wrote: > Hi everyone, > > I've noticed that "make rpm" is failing for 2.8.0 because README was > replaced with README.md. This line in git.spec is the culprit: > > %doc README COPYING Documentation/*.txt > > Would it be

Re: GIT_CONFIG - what's the point?

On Fri, Apr 1, 2016 at 2:54 AM, Matthew Persico wrote: > Greetings. > > Given the GIT_CONFIG environment variable can change 'git config' > behaves, it stands to reason that if GIT_CONFIG is defined, then ALL > git commands obey the value of GIT_CONFIG and use that file

Re: git alias quoting help

On Wed, Mar 30, 2016 at 6:13 AM, shawn wilson wrote: > I've also tried to make this a plain bash script (w/o the function or > if statements and am failing at the same place). The issue seems to be > with the quoting in the filter-branch | ls-files bit. Also, the end > goal

What is an efficient way to get all blobs / trees that have notes attached?

Hi, I'm curious whether there's a more efficient way to get a list of blobs / trees (and their names) that have notes attached than doing this: 1) Get all notes refs I'm interested in (git-for-each-ref). 2) For each notes ref, get the list of notes (git-notes list) and store them in a hash

[PATCH 1/2] imap-send.c: implements the GIT_CURL_DEBUG environment variable

Implements the GIT_CURL_DEBUG environment variable to allow a greater degree of detail of GIT_CURL_VERBOSE, in particular the complete transport header and all the data payload exchanged. It might be useful if a particular situation could require a more thorough debugging analysis. Signed-off-by:

Re: [PATCH v4] git-send-pack: fix --all option when used with directory

On 31/03/16 23:28, Junio C Hamano wrote: Thanks, will queue. Thanks a lot! -- Regards, Stanislav -- 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

[PATCH 2/2] http.c: implements the GIT_CURL_DEBUG environment variable

Implements the GIT_CURL_DEBUG environment variable to allow a greater degree of detail of GIT_CURL_VERBOSE, in particular the complete transport header and all the data payload exchanged. It might be useful if a particular situation could require a more thorough debugging analysis. Signed-off-by:

Re: [PATCH] git-send-pack: Fix --all option when used with directory

Thanks a lot, Jeff, your explanation really helped! -- Regards, Stanislav On 24/03/16 20:02, Jeff King wrote: On Thu, Mar 24, 2016 at 07:47:12PM +0200, Stanislav Kolotinskiy wrote: Thanks for noticing; the above explanation however does not make it very clear why the symptom exhibits itself

Re: git alias quoting help

I think I finally figured out how I want to do this: git remote add temp ..// git fetch temp git merge -s ours --no-commit temp/master git read-tree --prefix= -u temp/master: git commit -m "foo" However, when I do this, I've got all of the commits from the original (temp) repo. How do I prune

Re: [PATCH 5/5] t/t5520: test --[no-]autostash with pull.rebase=true

Hi Eric, On Thu, Mar 31, 2016 at 2:01 AM, Eric Sunshine wrote: > One other possibility would be to make this all table-driven by > collecting all of the above state information into a table and then > feeding that into a function (either as its argument list or via >

[PATCH] doc: clarify that notes can be attached to any type of stored object

Signed-off-by: Sebastian Schuberth --- Documentation/git-notes.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt index 8de3499..5375d98 100644 --- a/Documentation/git-notes.txt +++

Re: Trouble with cat-file on tags

On 4/1/2016 11:32, Sebastian Schuberth wrote: However, I still get information about the commit oject iintsead of the tag object. Is this expected? Solved this one, too: Yes it is. I was misreading the docs: "If is specified, the raw (though uncompressed) contents of the will be

Re: Trouble with cat-file on tags

On 4/1/2016 11:26, Sebastian Schuberth wrote: ---8<--- $ git tag test-tag $ git tag -l test-tag v0.0.3 v0.0.4 v0.1.0 v0.1.1 v0.1.2 $ git cat-file tag refs/tags/test-tag fatal: git cat-file refs/tags/test-tag: bad file ---8<--- Alright, I just found out why that is: Lighweight tags are not

Trouble with cat-file on tags

Hi, I was trying to use cat-file to get the hash of a tag object (not the hash of the commit object the tag points to), and I'm running into some issues. At the example of a cloned gerry [1] repository: ---8<--- $ git tag test-tag $ git tag -l test-tag v0.0.3 v0.0.4 v0.1.0 v0.1.1 v0.1.2 $

Re: [PATCHv2 3/4] bundle: don't leak an fd in case of early return

From: "Stefan Beller" On Thu, Mar 31, 2016 at 12:00 PM, Philip Oakley wrote: From: "Stefan Beller" In successful operation `write_pack_data` will close the `bundle_fd`, but when we exit early, we need to take care of the file

[PATCH] git.spec: use README.md, not README

The file was renamed in 4ad21f5 (README: use markdown syntax, 2016-02-25), but that commit forgot to update git.spec.in. Reported-by: Ron Isaacson Signed-off-by: Matthieu Moy --- git.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

Re: [PATCH] Feature: custom guitool commands can now have custom keyboard shortcuts

Hi David, Actually Im a TCL primer. This is the first time Im dealing with. That is why I kept it simple ( ie both accel-key and accel-label need to be defined in config ). I think, git-cola is using Qt style representation accel-key in the config file. Is git-cola is an official tool from git

Re: git alias quoting help

FWIW, I (finally) found two projects that like they'll do what I want: git-splits and git_filter The later was lacking in documentation and after the build I couldn't figure it out at a glance and I think git-splits will DWIW. On Thu, Mar 31, 2016 at 10:27 AM, shawn wilson