diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh
index 3e752ce..a2acff3 100755
--- a/t/t6000-rev-list-misc.sh
+++ b/t/t6000-rev-list-misc.sh
@@ -100,4 +100,11 @@ test_expect_success '--bisect and --first-parent can not
be combined' '
test_must_fail git rev-list --bisect -
Hello,
We currently have opennings to fund early startups at the preferential interest
rate of two percent per year.
Regards,
Lionel Griffin
On Thu, Oct 20, 2016 at 02:21:25AM -0400, Jeff King wrote:
> diff --git a/diff.c b/diff.c
> index 8f0f309..ef11001 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -3049,6 +3049,19 @@ static int similarity_index(struct diff_filepair *p)
> return p->score * 100 / MAX_SCORE;
> }
>
> +static const
When we default to ".git" without having done any kind of
repository setup, the results quite often do what the user
expects. But this has also historically been the cause of
some poorly behaved corner cases. These cases can be hard to
find, because they happen at the conjunction of two
relatively
unsubscribe alsa-devel
When generating diffs outside a repository (e.g., with "diff
--no-index"), we may write abbreviated sha1s as part of
"--raw" output or the "index" lines of "--patch" output.
Since we have no object database, we never find any
collisions, and these sha1s get whatever static abbreviation
length is co
Since we're modifying this function anyway, it's a good time
to update it to the more modern "struct oid". We can also
drop some of the magic numbers in favor of GIT_SHA1_HEXSZ,
along with some descriptive comments.
Signed-off-by: Jeff King
---
combine-diff.c | 4 ++--
diff.c | 20 +
Some code paths want to format multiple abbreviated sha1s in
the same output line. Because we use a single static buffer
for our return value, they have to either break their output
into several calls or allocate their own arrays and use
find_unique_abbrev_r().
Intead, let's mimic sha1_to_hex() an
The word "align" describes how the function actually differs
from find_unique_abbrev, and will make it less confusing
when we add more diff-specific abbrevation functions that do
not do this alignment.
Since this is a globally available function, let's also move
its descriptive comment to the head
These test helper programs access the index, but do not ever
setup_git_directory(), meaning we just blindly looked in
".git/index". This happened to work for the purposes of our
tests (which do not run from subdirectories, nor in
non-repos), but it's a bad habit.
Signed-off-by: Jeff King
---
t/h
The low-level attribute and gitignore code will try to look
in $GIT_DIR/info for any repo-level configuration files,
even if we have not actually determined that we are in a
repository (e.g., running "git grep --no-index"). In such a
case they end up looking for ".git/info/attributes", etc.
This i
This is a follow-on to the series in:
http://public-inbox.org/git/20160913032242.coyuhyhn6ukle...@sigill.intra.peff.net/
That series avoided looking at ".git/config" when we haven't discovered
whether we are in a git repo. This takes that further and avoids ever
looking at ".git" as a fallback
On Wed, Oct 19, 2016 at 7:13 PM, Jeff King wrote:
> I suspect both of those would complain about legitimate workflows.
>
> I dunno. I do not ever use "git commit " myself. I almost
> invariably use one of "git add -p" (to review changes as I add them) or
> "git add -u" (when I know everything is
On Wed, Oct 19, 2016 at 04:36:36PM -0700, Jacob Keller wrote:
> > # undo selectively
> > git reset -p HEAD^
> > git commit --amend
>
> AHA! I knew about git reset -p but I didn't know about git reset -p
> allowed passing a treeish. Does this reset modify my local files at
> all? I think it
K Richard Pixley wrote:
> On 10/19/16 13:41 , Eric Wong wrote:
> >K Richard Pixley wrote:
> >>error: git-svn died of signal 11
> >>
> >>This seems awfully early and blatant for a core dump. What can I do to
> >>get this running?
> >Can you show us a backtrace? Thanks.
> There is none. I ran it
> NOTE: If you read the excellent Git Rev News [1], then you
> already know all about git-log-compact :)
The git-log-compact script provides a compact alternative to the
`git log --oneline` output that includes dates, times and author
and/or committer initials in a space efficient output format.
On Wed, Oct 19, 2016 at 3:42 PM, Jeff King wrote:
> On Wed, Oct 19, 2016 at 03:26:18PM -0700, Jacob Keller wrote:
>
>> I recently (and in the past) had an issue where I was using git add
>> --interactive and accidentally did something like the following:
>>
>> # hack lots of randmo changes, then b
On 10/19, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > Brandon Williams writes:
> >
> >> Update the documentaion for the the special value `.` to indicate that
> >> it signifies that the tracking branch in the submodule should be the
> >> same as the current branch in the superproject.
>
Junio C Hamano writes:
> Brandon Williams writes:
>
>> Update the documentaion for the the special value `.` to indicate that
>> it signifies that the tracking branch in the submodule should be the
>> same as the current branch in the superproject.
>
> Thanks. Will typofix while extending with
On Wed, Oct 19, 2016 at 03:26:18PM -0700, Jacob Keller wrote:
> I recently (and in the past) had an issue where I was using git add
> --interactive and accidentally did something like the following:
>
> # hack lots of randmo changes, then begin trying to commit then separately
> git add -i
> # se
Dennis Kaarsemaker writes:
> + touch expect &&
> + printf "\0" > expect &&
What's the point of that "touch", especially if you are going to
overwrite it immediately after?
> + git rev-list --header --max-count=1 HEAD | tail -n1 >actual &&
As "tail" is a tool for text files, it is l
Jacob Keller writes:
> Hi,
>
> On Wed, Oct 19, 2016 at 2:04 PM, Dennis Kaarsemaker
> wrote:
>> Commit 660e113 (graph: add support for --line-prefix on all graph-aware
>> output) changed the way commits were shown. Unfortunately this dropped
>> the NUL between commits in --header mode. Restore th
On Wed, Oct 19, 2016 at 03:30:44PM -0700, Junio C Hamano wrote:
> > Ouch. Thanks for a reminder. How about doing this for now?
>
> And the hack I used to quickly test it looks like this:
>
> $ cd t
> $ GIT_I_AM_INSANE=Yes sh ./t3700-add.sh
>
> We may want a more general
>
> GIT_
On Wed, Oct 19, 2016 at 03:27:35PM -0700, Junio C Hamano wrote:
> Ouch. Thanks for a reminder. How about doing this for now?
> [...]
> test_expect_success 'git add --chmod=[+-]x changes index with already added
> file' '
> + rm -f foo3 xfoo3 &&
> echo foo >foo3 &&
Yeah, this makes s
Junio C Hamano writes:
> Ouch. Thanks for a reminder. How about doing this for now?
And the hack I used to quickly test it looks like this:
$ cd t
$ GIT_I_AM_INSANE=Yes sh ./t3700-add.sh
We may want a more general
GIT_OVERRIDE_PREREQ='!SANITY,!POSIXPERM,MINGW' make test
or som
Jeff King writes:
> I can't reproduce any problems with raciness there, but there is a known
> problem with running the script as root (which I guess you might be
> doing from your "make prefix=/usr" call). There's some discussion in
> http://public-inbox.org/git/20161010035756.38408-1-jerem...@a
Hi,
I recently (and in the past) had an issue where I was using git add
--interactive and accidentally did something like the following:
# hack lots of randmo changes, then begin trying to commit then separately
git add -i
# set only the changes I want
# accidentally add to the commit
$git commi
On 10/19/16 13:41 , Eric Wong wrote:
K Richard Pixley wrote:
error: git-svn died of signal 11
This seems awfully early and blatant for a core dump. What can I do to
get this running?
Can you show us a backtrace? Thanks.
There is none. I ran it in gdb and bt produced no results. Nor did t
Hi,
On Wed, Oct 19, 2016 at 2:04 PM, Dennis Kaarsemaker
wrote:
> Commit 660e113 (graph: add support for --line-prefix on all graph-aware
> output) changed the way commits were shown. Unfortunately this dropped
> the NUL between commits in --header mode. Restore the NUL and add a test
> for this f
Hi,
On Wed, Oct 19, 2016 at 1:24 PM, Dennis Kaarsemaker
wrote:
> On Wed, 2016-08-31 at 16:27 -0700, Jacob Keller wrote:
>> From: Jacob Keller
>>
>> Add an extension to git-diff and git-log (and any other graph-aware
>> displayable output) such that "--line-prefix=" will print the
>> additional l
Brandon Williams writes:
> Update the documentaion for the the special value `.` to indicate that
> it signifies that the tracking branch in the submodule should be the
> same as the current branch in the superproject.
Thanks. Will typofix while extending with info supplied by Stefan
like so:
Junio C Hamano writes:
> This is a continuation of
>
> http://public-inbox.org/git/xmqqmvi2sj8f@gitster.mtv.corp.google.com
I scanned all two-parent merges in git.git leading to 'next' and
'pu' and reproduced them with or without the new --fp-base-only
option. I also did the same experi
On Wed, Oct 19, 2016 at 02:23:41PM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > Subject: Re: [PATCH 1/2] ref-filter: split ref_kind_from_filter
>
> I think you meant ref_kind_from_refname() ;-)
>
> Looks like a good idea.
Heh, I actually meant filter_ref_kind(), which is the origina
Jeff King writes:
> Subject: Re: [PATCH 1/2] ref-filter: split ref_kind_from_filter
I think you meant ref_kind_from_refname() ;-)
Looks like a good idea.
> This function does two things: if we know we are filtering
> only a certain kind of ref, then we can immediately know
> that we have that
On Wed, Oct 19, 2016 at 08:28:56PM +, brian m. carlson wrote:
> On Wed, Oct 19, 2016 at 03:46:48AM -0400, Jeff King wrote:
> > FWIW, I gave it a fairly thorough read-over (something I'd been meaning
> > to do for quite a while, but kept never quite getting around to). I
> > think overall it is
On Wed, Oct 19, 2016 at 08:47:50PM +0700, Duy Nguyen wrote:
> On Wed, Oct 19, 2016 at 08:27:43PM +0700, Duy Nguyen wrote:
> > If you set the environment variable GIT_ALLOC_LIMIT ... git
> > attempts to allocate more than that ... then it's caught and we get
> > a glimpse of how much memory git ma
On Wed, Oct 19, 2016 at 01:15:56PM +0200, Jan Keromnes wrote:
> - Problem: Is there a way to `make profile-install` but ignore
> occasional test failures, as these are not critical to get a useful
> hardware profile? (Note: In a previous thread, Dennis Kaarsemaker
> mentioned this is fixing a symp
Commit 660e113 (graph: add support for --line-prefix on all graph-aware
output) changed the way commits were shown. Unfortunately this dropped
the NUL between commits in --header mode. Restore the NUL and add a test
for this feature.
Signed-off-by: Dennis Kaarsemaker
---
builtin/rev-list.c
On Wed, Oct 19, 2016 at 10:32:12AM -0700, Junio C Hamano wrote:
> > Maybe we should start optimizing the tests...
>
> Yup, two things that come to mind are to identify long ones and see
> if each of them can be split into two halves that can be run in
> parallel, and to go through the tests with
On Wed, Oct 19, 2016 at 1:42 PM, Brandon Williams wrote:
> Update the documentaion for the the special value `.` to indicate that
> it signifies that the tracking branch in the submodule should be the
> same as the current branch in the superproject.
For reference of other reviewers:
See 4d7bc52b
Update the documentaion for the the special value `.` to indicate that
it signifies that the tracking branch in the submodule should be the
same as the current branch in the superproject.
Signed-off-by: Brandon Williams
---
Documentation/git-submodule.txt | 4 +++-
Documentation/gitmodules.txt
K Richard Pixley wrote:
> error: git-svn died of signal 11
>
> This seems awfully early and blatant for a core dump. What can I do to
> get this running?
Can you show us a backtrace? Thanks.
> Initially discovered on git-2.7.4, (ubuntu-16.04), but also reproduced
> on freshly built top of tre
The ref-filter code generally expects to see fully qualified
refs, so that things like "%(refname)" and "%(refname:short)"
work as expected. We can do so easily from git-tag, which
always works with refnames in the refs/tags namespace. As a
bonus, we can drop the "kind" parameter from
pretty_print_
On Wed, Oct 19, 2016 at 01:07:34PM -0400, Santiago Torres wrote:
> > I guess that may complicate things for the caller you add in this
> > series, which may not have a fully-qualified refname (which is obviously
> > how filter_ref_kind() figures it out). I'd argue that is a bug, though,
> > as thi
This function does two things: if we know we are filtering
only a certain kind of ref, then we can immediately know
that we have that kind. If not, then we compute the kind
from the fully-qualified refname. The latter half is useful
for other callers; let's split it out.
Signed-off-by: Jeff King
On Wed, Oct 19, 2016 at 03:46:48AM -0400, Jeff King wrote:
> FWIW, I gave it a fairly thorough read-over (something I'd been meaning
> to do for quite a while, but kept never quite getting around to). I
> think overall it is OK for next. I did find one or two nits, but I think
> they are things we
On Wed, 2016-08-31 at 16:27 -0700, Jacob Keller wrote:
> From: Jacob Keller
>
> Add an extension to git-diff and git-log (and any other graph-aware
> displayable output) such that "--line-prefix=" will print the
> additional line-prefix on every line of output.
This patch breaks git rev-list --h
On Wed, Oct 19, 2016 at 2:45 PM, Stefan Beller wrote:
> On Wed, Oct 19, 2016 at 12:19 PM, Robert Dailey
> wrote:
>> On Wed, Oct 19, 2016 at 11:23 AM, Stefan Beller wrote:
>>> You could try this patch series:
>>> https://github.com/jlehmann/git-submod-enhancements/tree/git-checkout-recurse-submod
On Wed, Oct 19, 2016 at 12:19 PM, Robert Dailey
wrote:
> On Wed, Oct 19, 2016 at 11:23 AM, Stefan Beller wrote:
>> You could try this patch series:
>> https://github.com/jlehmann/git-submod-enhancements/tree/git-checkout-recurse-submodules
>> (rebased to a newer version; no functional changes:)
>
Jonathan Tan writes:
> Would this work then:
> - at least one trailer line generated by Git ("(cherry picked by" or
> "Signed-off-by: ") or configured in the "trailer" section in
> git config AND at least 25% logical trailer lines
> OR
> - 100% logical trailer lines
Sure.
At that point, I
On Wed, Oct 19, 2016 at 11:23 AM, Stefan Beller wrote:
> You could try this patch series:
> https://github.com/jlehmann/git-submod-enhancements/tree/git-checkout-recurse-submodules
> (rebased to a newer version; no functional changes:)
> https://github.com/stefanbeller/git/tree/submodule-co
> (I'l
Vasco Almeida writes:
> @@ -669,12 +669,18 @@ sub status_cmd {
> sub say_n_paths {
> my $did = shift @_;
> my $cnt = scalar @_;
> - print "$did ";
> - if (1 < $cnt) {
> - print "$cnt paths\n";
> - }
> - else {
> - print "one path\n";
> + if
Vasco Almeida writes:
> } else {
> - print "No untracked files.\n";
> + print __("No untracked files.\n");
> }
Not a big deal, but this makes me wonder if we want to do this
instead
print __("No untracked files.") . "\n";
so that translators
On 10/18/2016 09:36 AM, Junio C Hamano wrote:
Jonathan Tan writes:
* rs/c-auto-resets-attributes:
pretty: avoid adding reset for %C(auto) if output is empty
And neither of the two colon containing line remotely resembles how
a typical RFC-822 header is formatted. So that may serve
Junio C Hamano writes:
> In a workflow where topic branches are first merged to the 'next'
> integration branch to be tested before getting merged down to the
> 'master' integration branch to be consumed by the end users, merging
> the 'master' branch back to the 'next' happens after topics gradu
Johannes Schindelin writes:
> What I can also say for certain is that the version from yesterday (commit
> 4ef44ce) was the first one in a week that built successfully and hence
> reached the test phase, and it was the first version of `pu` ever to time
> out after running for 3h.
I am sympathet
On Wed, Oct 19, 2016 at 05:16:42AM -0400, Jeff King wrote:
> On Wed, Oct 19, 2016 at 04:55:43AM -0400, Jeff King wrote:
>
> > > diff --git a/ref-filter.h b/ref-filter.h
> > > index 14d435e..3d23090 100644
> > > --- a/ref-filter.h
> > > +++ b/ref-filter.h
> > > @@ -107,4 +107,7 @@ struct ref_sortin
Hi Junio,
On Tue, 18 Oct 2016, Junio C Hamano wrote:
> 28a4d94044 ("object name: introduce ':/' notation",
> 2007-02-24) started using its own bit from object->flags to mark
> commits used while parsing the ":/token" extended SHA-1 syntax to
> name a commit temporarily, and this was kept even whe
On Wed, Oct 19, 2016 at 6:27 AM, Robert Dailey wrote:
> On Tue, Oct 18, 2016 at 4:17 PM, Stefan Beller wrote:
>> On Tue, Oct 18, 2016 at 12:35 PM, Robert Dailey
>> wrote:
>>> Hello git experts,
>>>
>>> I have in the past attempted to integrate submodules into my primary
>>> repository using the
On Wed, Oct 19, 2016 at 08:27:43PM +0700, Duy Nguyen wrote:
> If you set the environment variable GIT_ALLOC_LIMIT ... git
> attempts to allocate more than that ... then it's caught and we get
> a glimpse of how much memory git may need. Unfortunately we can't
> get a stack trace or anything like t
Hi Junio,
I know you are a fan of testing things thoroughly in the test suite, but I
have to say that it is getting out of hand, in particular due to our
over-use of shell script idioms (which really only run fast on Linux, not
a good idea for a portable software).
My builds of `pu` now time out,
On Fri, Oct 07, 2016 at 05:07:15PM -0400, santi...@nyu.edu wrote:
> From: Lukas Puehringer
>
> Functions that print git object information may require that the
> gpg-interface functions be silent. Add GPG_VERIFY_QUIET flag and prevent
> print_signature_buffer from being called if flag is set.
T
On Fri, Oct 07, 2016 at 05:07:16PM -0400, santi...@nyu.edu wrote:
> From: Lukas Puehringer
>
> ref-filter functions are useful for printing git object information
> using a format specifier. However, some other modules may not want to use
> this functionality on a ref-array but only print a sing
On Wed, Oct 19, 2016 at 04:55:43AM -0400, Jeff King wrote:
> > diff --git a/ref-filter.h b/ref-filter.h
> > index 14d435e..3d23090 100644
> > --- a/ref-filter.h
> > +++ b/ref-filter.h
> > @@ -107,4 +107,7 @@ struct ref_sorting *ref_default_sorting(void);
> > /* Function to parse --merged and --n
On Fri, Oct 07, 2016 at 05:07:19PM -0400, santi...@nyu.edu wrote:
> Adding --format to git tag -v mutes the default output of the GPG
> verification and instead prints the formatted tag object.
The same comments apply to "mutes" here, as to the previous patch (which
is to say I think we may want
On Fri, Oct 07, 2016 at 05:07:20PM -0400, santi...@nyu.edu wrote:
> Verify-tag now provides --format specifiers to inspect and ensure the
> contents of the tag are proper. We add two tests to ensure this
> functionality works as expected: the return value should indicate if
> verification passed,
On Tue, Oct 18, 2016 at 08:53:44AM -0700, Junio C Hamano wrote:
> >> * st/verify-tag (2016-10-10) 7 commits
> [...]
> > Hi, I saw this on the previous "what's cooking." Is there anything I
> > need to do on my side to make sure this is ready for next?
>
> Posting this exact message to the list wo
When a file is deleted from Git and replaced with a directory+file(s),
git-stash has two unexpected behaviors. This is tested against
versions 2.8.1 and 2.10.1:
1) Old file is removed from index and newly-added directory+file(s)
are added to index.
In this scenario, 'git stash' fails with the me
Hello,
TL;DR - Probably a regression of a previously reported bug. [0]
I'm trying to `profile-install` Git from source on Ubuntu 16.04, to
have the latest stable Git optimized for my machine.
However, this often fails, because the profile build runs all Git
tests (to get an idea of how Git behav
On Tue, Oct 18, 2016 at 4:17 PM, Stefan Beller wrote:
> On Tue, Oct 18, 2016 at 12:35 PM, Robert Dailey
> wrote:
>> Hello git experts,
>>
>> I have in the past attempted to integrate submodules into my primary
>> repository using the same directory name. However, this has always
>> caused headach
On Tue, Oct 18, 2016 at 10:17 PM, Raffael Reichelt
wrote:
> Hello!
>
> I have a serious problem with git, After my provider had updated to a X86_64
> architecture git crashes with various memory-related errors. This is
> happening remote when pushing to the repository from my local machine as we
On Tue, Oct 18, 2016 at 01:31:27PM -0700, Junio C Hamano wrote:
> >> * ls/filter-process (2016-10-17) 14 commits
> [...]
> > what do you think about v11? Do you feel the series is becoming mature
> > enough for `next`?
>
> I've already had that feeling a few rounds ago, but I haven't had a
> chan
> Am 19.10.2016 um 15:27 schrieb Duy Nguyen :
>
> On Tue, Oct 18, 2016 at 10:17 PM, Raffael Reichelt
> wrote:
>> Hello!
>>
>> I have a serious problem with git, After my provider had updated to a X86_64
>> architecture git crashes with various memory-related errors. This is
>> happening remot
On Wed, Oct 19, 2016 at 1:05 AM, Luke Shumaker wrote:
>> I am not sure if it is even a bug. As you can easily lose that
>> tilde that appears in front of subdirectory of /srv/git/ or replace
>> it with something else (e.g. "u/"), this smells like "Don't do it if
>> it hurts" thing to me.
>
> I bu
Hi everyone,
I'm happy announce that the 20th edition of Git Rev News is now published:
https://git.github.io/rev_news/2016/10/19/edition-20/
Thanks a lot to all the contributors and helpers, especially Jakub,
Dennis, Dscho, Lars and Peff!
Enjoy,
Christian and Thomas.
On Fri, Oct 07, 2016 at 05:07:18PM -0400, santi...@nyu.edu wrote:
> @@ -46,12 +50,17 @@ int cmd_verify_tag(int argc, const char **argv, const
> char *prefix)
> if (verbose)
> flags |= GPG_VERIFY_VERBOSE;
>
> + if (fmt_pretty) {
> + verify_ref_format(fmt_prett
76 matches
Mail list logo
