This is being discussed in the "Re: "git tag --contains " is too
chatty, if is invalid" thread.
$gmane/289312
On Sun, Mar 20, 2016 at 12:16 PM, Chirayu Desai wrote:
> * To show only error text on an error instead of the full usage
> * Currently used only by commands with options "--with" or "--c
I went for 3, and have sent a patch for that here - [PATCH/GSoC]
parse-options: Add a new nousage opt
However, it currently has one bug
Running 'git tag --contains qq' twice will first show an error, then
print qq, meaning that the first command creates the tag qq.
Running 'git tag -l --contains qq
* To show only error text on an error instead of the full usage
* Currently used only by commands with options "--with" or "--contains",
such as 'tag', 'branch', 'for-each-ref'.
It now prints only
$ git tag --contains qq
error: malformed object name qq
instead of the full usage text after th
On Wed, Mar 16, 2016 at 12:32 PM, Junio C Hamano wrote:
>
> may give us a better structure if we are going to give users a knob
> to disable this tab expansion, i.e. move the addition of 4 spaces to
> the caller, name the body of such a function strbuf_expand_add(),
> and then make the caller do s
On 03/01/2016 01:52 AM, David Turner wrote:
> Refactor resolve_ref_1 in terms of a new function read_raw_ref, which
> is responsible for reading ref data from the ref storage.
>
> Later, we will make read_raw_ref a pluggable backend function, and make
> resolve_ref_unsafe common.
>
> Testing done
---
mergetools/examdiff | 37 +
1 file changed, 37 insertions(+)
create mode 100644 mergetools/examdiff
diff --git a/mergetools/examdiff b/mergetools/examdiff
new file mode 100644
index 000..474fffe
--- /dev/null
+++ b/mergetools/examdiff
@@ -0,0 +1,37 @@
Linus Torvalds writes:
> The code in the recursive merge that allows this to happen is this:
> ...
> And I do think that's right, and I think it's clever, and it goes back to
> 2006:
>
> 934d9a24078e merge-recur: if there is no common ancestor, fake empty one
>
> but I think there should be an
Common logic of mkpath() and mkpathdup() are collected into a
new do_mkpath(). Then, based on do_mkpath(), strbuf_mkpath() is
implemented.
Signed-off-by: Hui Yiqun
---
cache.h | 2 ++
path.c | 21 +
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/cache.h b/c
This commit adds basic RFC3161 functionality, which is linked to the main git
binary. It is used for interaction with git objects by parsing data from and
writing data to it. Moreover, it is responsible for passing data to the external
helper tool `git-timestamp-util`, which does the actual work of
This commit adds documentation for newly introduced helper commands,
configuration variables and the certificate storage file `.git_tsa_store`. The
documentation pages for `git tag` and git `verify-tag` are altered to describe
the new command line options for time-stamping.
Signed-off-by: Anton Wü
On Sat, Mar 19, 2016 at 07:23:10PM +0100, Laurent Arnoud wrote:
> The tag.gpgsign config option allows to sign all
> commits automatically.
We have commit.gpgsign, so this makes some sense. Would you want to sign
_all_ tags created with "git tag", including lightweight tags, or only
those that wo
On Thu, Mar 17, 2016 at 8:04 PM, Johannes Schindelin
wrote:
> Hi Duy,
>
> On Thu, 17 Mar 2016, Duy Nguyen wrote:
>
>> Good news for you is there's "sparse checkout v2" in the work, that
>> would not rely on exclude engine and should be both faster and more
>> elegant. That should reduce "sparse ch
On Sat, Mar 19, 2016 at 12:22 AM, David Turner wrote:
> On Fri, 2016-03-18 at 14:44 +0700, Duy Nguyen wrote:
>> > So yeah, this is the challenge: to make Git work at real-world
>> > scale
>> > (didn't we hear a lot about this at the latest Git Merge?)
>>
>> I'm all for making Junio cry by using Gi
Stefan Beller writes:
> here is an additional ideas for the "Leftover Bits" on git-blame.blogspot.com
> (Is there another way of contributing these, such as sending a patch
> against some
> repository? Or any other way which may bother you less?)
A message "Subject: [RFC] ..." that asks "Wouldn'
Adam Dinwoodie wrote:
> According to the documentation, full URLs can be specified in the `-T`
> argument to `git svn init`. However, the canonicalization of such
> arguments squashes together consecutive "/"s, which unsurprisingly
> breaks http://, svn://, etc URLs. Add a failing test case to p
On Sat, Mar 19, 2016 at 03:13:48PM -0700, Josh Triplett wrote:
> I'm building some tools to track commit objects, and I'm thinking of
> using submodule-style references to commit objects in tree objects (mode
> 16) to do so. I'm trying to figure out some of the properties of
> that.
>
> Can
On Fri, Mar 18, 2016 at 04:53:34PM +0530, Pranit Bauva wrote:
> > And we would need to verify that all of the existing callers are OK with
> > this. Did you check that that (not rhetorical; I suspect they are all
> > OK, but somebody needs to check)?
>
> I did a grep on parse-options.h and saw th
On Fri, Mar 18, 2016 at 5:19 PM, Pranit Bauva wrote:
> Add commit.verbose configuration variable as a convenience for those
> who always prefer --verbose.
>
> Signed-off-by: Pranit Bauva
> ---
> diff --git a/builtin/commit.c b/builtin/commit.c
> @@ -1654,6 +1661,14 @@ int cmd_commit(int argc, con
This commit adds the git-http-timestamp helper tool. It does all the
communication to a Time Stamping Authority via libcurl and passes the received
data to the caller via stdout.
Libcurl by default depends on GnuTLS, the new RFC3161 time-stamping
functionality depends on libcrypto (OpenSSL) as Gnu
On Wed, Mar 16, 2016 at 7:06 AM, Levente wrote:
> It seems that this link is broken:
>
> https://github.com/git-for-windows/git/releases/download/v2.7.3.windows.1/Git-2.7.3-64-bit.exe
>
> Regards,
> Levente
I think Git for Windows is discussed mostly in the GitHub issues.
Anywhere, cc'ing Johanne
Hi Duy,
On Thu, 17 Mar 2016, Duy Nguyen wrote:
> Good news for you is there's "sparse checkout v2" in the work, that
> would not rely on exclude engine and should be both faster and more
> elegant. That should reduce "sparse checkout v1" usage to really small
> cases.
I dabbled myself with speed
On Wed, Mar 16, 2016 at 2:44 PM, Jeff King wrote:
> On Wed, Mar 16, 2016 at 05:37:03PM -0400, Eric Sunshine wrote:
>
>> A much easier solution would be to update OPT_VERBOSE() to understand
>> that negative values are "unspecified", and then --verbose would
>> (pseudocode):
>>
>> if (value < 0
Junio C Hamano venit, vidit, dixit 16.03.2016 17:30:
> Michael J Gruber writes:
>
>> echo '*.po diff=po' >>.gitattributes
>> echo '*.pot diff=po' >>.gitattributes
>> git config diff.po.textconv "msgcat --indent --no-location"
>>
>> With or without the indent, that gives a pretty clean diff. [It's
On 2016/03/17 14:16 +0900, Torsten Bögershausen wrote:
> On 2016-03-16 18.37, Kazutoshi Satoda wrote:
>> "funcky" looks a typo.
>>
Don't use funky file names, that can not be created under
HFS or NTFS.
>>
>> The file can be created on my Cygnus environment, which is under FONTS.
On Fri, Mar 18, 2016 at 12:40 AM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> For now I would just go with 3 directories:
>>
>> non-git/ (or util, helpers, or anything that could be ripped out and be
>> useful
>> e.g. strbufs, argv-array run-command, lockfile
>> git/ (maybe called lib
On 16.3.2016 19:48, Jeff King wrote:
> On Wed, Mar 16, 2016 at 07:05:49PM +0100, Petr Stodulka wrote:
>
>> according to commit 9831e92 (merge) there is maybe by mistake kept
>> declaration
>> of function path_name() in revision.h, whose definition was removed
>> and isn't used in git anymore.
>
In parse_binary() there is:
forward = parse_binary_hunk(&buffer, &size, &status, &used);
if (!forward && !status)
/* there has to be one hunk (forward hunk) */
return error(_("unrecognized binary patch at line %d"),
linenr-1);
so parse_binary() can
This commit adds a helper tool called `git-timestamp-util`, which does the
actual RFC3161 time-stamping work. It depends on libssl and libcrypto.
In particular, it is used for creating time-stamp signatures and for verifying
them.
To create a time-stamp signature, a Time Stamping Query (TSQ) is c
On Thu, 2016-03-17 at 15:43 +0100, Johannes Schindelin wrote:
> Hi Duy,
>
> On Thu, 17 Mar 2016, Duy Nguyen wrote:
>
> > On Thu, Mar 17, 2016 at 1:27 AM, Johannes Schindelin
> > wrote:
> > > I am much more concerned about concurrent accesses and the
> > > communication
> > > between the Git proc
Separate the call to add 4-space indent, and a new helper to add a
line after de-tabifying.
The new helper function strbuf_add_tabexpand() could later be moved
to strbuf.[ch] if other callers need to.
Signed-off-by: Junio C Hamano
---
pretty.c | 24 +++-
1 file changed, 15 i
Hi,
according to commit 9831e92 (merge) there is maybe by mistake kept declaration
of function path_name() in revision.h, whose definition was removed
and isn't used in git anymore.
Regards,
Petr
==
From ae72c8f9085b3b7bd84f94f9
On Wed, Mar 16, 2016 at 11:36:49PM +0600, Alexander Kuleshov wrote:
> > I also wonder if this should be sharing the strip_extension() helper
> > added in your 63ca1c0.
>
> Yes, I want to move strip_extension() (from 63ca1c0) to the git-compat-util.h
> and adapt/reuse it in the help.c. What do you
On Fri, Mar 18, 2016 at 11:17 AM, Mehul Jain wrote:
> On Fri, Mar 18, 2016 at 10:09 AM, Eric Sunshine
> wrote:
>> Actually, this is going to pass --autostash or --no-autostash to
>> git-rebase unconditionally won't it? This seems kind of undesirable
>> due to the unnecessarily tight coupling it
On Fri, Mar 18, 2016 at 11:17 AM, Mehul Jain wrote:
> On Fri, Mar 18, 2016 at 9:54 AM, Eric Sunshine
> wrote:
>>> +test_expect_success 'pull --rebase: --autostash overrides
>>> rebase.autostash' '
>>
>> Why do titles of some of the new test titles have a ":" after "rebase"
>> while other don't?
Hi Duy,
I tried your exact example and it worked correctly. But then I tried adding
some more files/dirs at the top level and I still see an issue:
cat .gitignore
/*
!a/b/c
find * -type f
1
2
3
a/1
a/b/1
a/b/c/1
d/1
git ls-files -o --exclude-standard
.gitignore
2
3
a/b/c/1
d/1
Trace output be
Elena Petrashen writes:
> Signed-off-by: Elena Petrashen
> ---
>
> Hi everyone,
>
> As my first Outreachy submission micropoject I've chosen to try to approach
> "Allow '-' as a short-hand for '@{-1} in more places."
> (http://git.github.io/SoC-2016-Microprojects/ (Cf. $gmane/230828))
> My goa
Duy Nguyen venit, vidit, dixit 16.03.2016 14:40:
> On Wed, Mar 16, 2016 at 8:33 PM, Michael J Gruber
> wrote:
>> In hindsight, what happened must have been like this:
>>
>> "ahead " was marked properly for l10n and translated in the past.
>>
>> 7a76c28 (status: disable translation when --porcelain
Hi Stefan,
On Tue, Mar 15, 2016 at 4:30 AM, Stefan Beller wrote:
> On Sat, Mar 12, 2016 at 2:46 AM, Paul Tan wrote:
>> These functions can be used for loading and saving common rebase options
>> into a state directory.
>>
>> Signed-off-by: Paul Tan
>> ---
>> rebase-common.c | 69
>> ++
This commit adds testcases for the new time-stamping functionality. To trigger
these testcases, the environment variables $GIT_TEST_TSA_URL and
$GIT_TEST_TSA_CAPATH have to be set. They do not default to any value to avoid
spamming a pre-defined Time Stamping Authority (TSA).
As testing the RFC3161
On Sat, Mar 19, 2016 at 2:17 PM, Jose Ivan B. Vilarouca Filho
wrote:
> From: "Jose Ivan B. Vilarouca Filho"
You can drop this line since it is the same as the From: line in the
email envelope.
> Fixing segmentation fault when merging FETCH_HEAD
Alternate:
merge: don't dereference NULL poi
In parse_binary() there is:
forward = parse_binary_hunk(&buffer, &size, &status, &used);
if (!forward && !status)
/* there has to be one hunk (forward hunk) */
return error(_("unrecognized binary patch at line %d"),
linenr-1);
so parse_binary() can
Junio C Hamano writes:
>> +EDITOR="echo >invoked_editor" git rebase --exec "echo a line
>> >>exec_output" HEAD~2 2>actual &&
>
> Hmph. If you add "-i" to the command line, do you see the
> 'invoked_editor' file created?
>
> I ask this because I thought we override GIT_EDITOR, which
The topic in question introduces "sticky" path list for this purpose:
given a path 'abc/def', if 'abc' already matches a pattern X, it's added
to X's sticky path list. When we need to check if 'abc/def' matches
pattern X and see that 'abc' is already in the list, we conclude right
away that 'abc/de
Michael J Gruber writes:
> So, in short, I do believe there is a good reason for the "out of sync"
> git.pot. That doesn't make the negative side effect that I describe any
> less true, and I'm looking for ways to ammeliorate that. Something as
> easy as "make check" or "make test-lint".
Yes, I
This commit introduces command line options for git tag to allow adding trusted
time-stamps from a Time Stamping Authority according to RFC3161.
The SHA-1 has used for a time-stamp signature is generated from the header data
and the tag message, if present. After obtaining the time-stamp signature
On Wed, Mar 16, 2016 at 7:27 AM, Marc Branchaud wrote:
>
> Could this also help with diff output, where the leading + or - mars the
> indentation in a similar way?
I don't think that's a good idea at least by default, since then it
will break things like running diff in emacs capture mode.
So ev
Signed-off-by: Elena Petrashen
---
Hi everyone,
As my first Outreachy submission micropoject I???ve chosen to try to approach
???Allow ???-??? as a short-hand for ???@{-1}??? in more places.???
(http://git.github.io/SoC-2016-Microprojects/ (Cf. $gmane/230828))
My goal was to teach git branch
On Thu, Mar 17, 2016 at 10:08 PM, Jeff King wrote:
>
> Hmm. Isn't "expand tabs" orthogonal to the rest of the pretty format?
> That is, couldn't one want "--pretty=fuller, but with tabs expanded"?
Yeah, you are right, one easily could. And in fact I end up doing
"fuller" myself occasionally, beca
Jeff King writes:
> E.g., start with:
>
> - only CMIT_FMT_MEDIUM expands tabs (and does so by default)
>
> - passing --no-expand-tabs suppresses this behavior
>
> - passing --expand-tabs is an error for now; if people care later,
> they can add support for other formats (naively this is
Hi Levente,
On Wed, 16 Mar 2016, Levente wrote:
> It seems that this link is broken:
>
> https://github.com/git-for-windows/git/releases/download/v2.7.3.windows.1/Git-2.7.3-64-bit.exe
Works for me. Maybe you want to be a bit more precise *how* it is broken
for you?
Ciao,
Johannes
--
To unsubsc
On Wed, Mar 16, 2016 at 05:09:23PM -0700, Durham Goode wrote:
> Using git 2.8.0-rc2, given a repo with the following files:
>
> - one/hideme
> - one/donthide
> - two/foo
>
> A sparse config of:
>
> cat > .git/info/sparse-checkout < /*
> !one/hideme
> EOF
>
> Results in a repository that only ha
On Wed, Mar 16, 2016 at 08:27:29PM +0600, Alexander Kuleshov wrote:
> We stripping extension in the list_commands_in_dir() to get
> commands without '.exe' suffix. Let's do it only if STRIP_EXTENSION
> is defined to not spend time for unnecessary strip_suffix() call in
> this case.
>
> Signed-off
Thanks for these 5 patches, two of which need to be discarded ;-).
I think you can pick either one of 1/2, pick the one that says
"non-NULL" (as opposed to "something") in the log message for 2/2.
Durham, does it fix your issues if you apply the 1/2 and 2/2 (but
not 3/2) on top of 2.8-rc?
Duy, ho
This commit moves the macros PGP_SIGNATURE and PGP_MESSAGE to gpg-interface.h to
make them publicly reachable, which is necessary for RFC3161 time-stamping.
When verifying an RFC3161 time-stamp signature, a SHA-1 hash has to be generated
over the git object excluding a possible PGP signature, whic
2016-03-16 18:07 GMT+08:00 Hui Yiqun :
> move .git-credential-cache/socket to xdg_runtime_dir("credential-cache.sock")
>
> Signed-off-by: Hui Yiqun
> ---
> credential-cache.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/credential-cache.c b/credential-cache.c
> index f
Using git 2.8.0-rc2, given a repo with the following files:
- one/hideme
- one/donthide
- two/foo
A sparse config of:
cat > .git/info/sparse-checkout
Am 17.03.2016 um 11:38 schrieb Alexander Kuleshov:
> This patch introduces the for_each_hashmap_entry() macro for more
I'd rather call it 'hashmap_for_each', following the pattern
'operandtype_operation' used throughout git. E.g. we already have
'hashmap_get', not 'get_hashmap_entry'.
I realize
On Thu, 2016-03-17 at 20:06 +0700, Duy Nguyen wrote:
> On Thu, Mar 17, 2016 at 7:56 AM, David Turner <
> dtur...@twopensource.com> wrote:
> > > So if we detect an updated file that's not in the index, we are
> > > prepared to invalidate that path, correct? We may invalidate more
> > > than
> > > ne
Am 16.03.2016 um 22:07 schrieb Stefan Beller:
---
Hi Jens,
I cannot find the edit button in the wiki[1] any more.
Oops. After you mentioned recently that every GitHub user had write
permissions to the Wiki I restricted it to be writable for known
collaborators and also added you to this
t0301 now tests git-credential-cache support for XDG user-specific
runtime file $XDG_RUNTIME_DIR/git/credential.sock. Specifically:
* if $XDG_RUNTIME_DIR exists, use socket at
`$XDG_RUNTIME_DIR/git/credential-cache.sock`.
* otherwise, `/tmp/git-$uid/credential-cache.sock` is taken.
Signed-off-
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.
Signed-off-by: Christian Couder
---
builtin/apply.c | 4 +++-
1 file changed,
It seems that people are still finding regressions in the topic for
this item in the 2.8-rc3:
* Another try to improve the ignore mechanism that lets you say
"this is excluded" and then later say "oh, no, this part (that is
a subset of the previous part) is not excluded". This has still
2016-03-17 1:15 GMT+08:00 Jeff King :
> On Wed, Mar 16, 2016 at 06:07:45PM +0800, Hui Yiqun wrote:
>
>> diff --git a/t/t0301-credential-cache.sh b/t/t0301-credential-cache.sh
>> index 82c8411..0718bb0 100755
>> --- a/t/t0301-credential-cache.sh
>> +++ b/t/t0301-credential-cache.sh
>> @@ -12,7 +12,3
On Wed, Mar 16, 2016 at 8:20 AM, Igor Korot wrote:
> Hi,
> Is it possible to tell Git to have a PR with a specific number?
Git does not have PRs.
Are you referring to a GitHub Pull request? If so you should ask
GitHub support. GitHub is a commercial entity that is separate from
the Git open sou
On Fri, Mar 18, 2016 at 9:32 PM, Richard Furness -X (rfurness - ENSOFT
LIMITED at Cisco) wrote:
> Hi Duy,
>
> I tried your exact example and it worked correctly. But then I tried adding
> some more files/dirs at the top level and I still see an issue:
Thank you. Phew.. I bet you hit the same bug
I'm building some tools to track commit objects, and I'm thinking of
using submodule-style references to commit objects in tree objects (mode
16) to do so. I'm trying to figure out some of the properties of
that.
Can a commit object referenced that way live in the same repository,
rather than
On 19.03.2016 09:49, Pranit Bauva wrote:
> On Sat, Mar 19, 2016 at 9:44 PM, Christian Couder
> wrote:
>> Hi,
>>
>> On Sat, Mar 19, 2016 at 1:48 PM, Matthieu Moy
>> wrote:
Subject: Re: GSoC Project | Improvise git bisect
>>>
>>>
>>> "Improve" I guess.
>
2016-03-17 1:06 GMT+08:00 Jeff King :
> On Wed, Mar 16, 2016 at 06:07:43PM +0800, Hui Yiqun wrote:
>
>> + if (runtime_dir && *runtime_dir)
>> + git_runtime_dir = mkpathdup("%s/git/", runtime_dir);
>> + else
>> + git_runtime_dir = mkpathdup("/tmp/git-%d", uid);
>
> He
Hi Duy,
On Wed, 16 Mar 2016, Duy Nguyen wrote:
> I think it's safe to drop this patch now. It's mostly to prove that it
> could work on Windows. But I don't think it's tested a lot (even I
> only occasionally test it under wine).
I agree that it is more important to get the basics right (such as
On Thu, Mar 17, 2016 at 01:32:41AM -0400, Eric Sunshine wrote:
> On Wed, Mar 16, 2016 at 9:43 PM, Jeff King wrote:
> > Arguably cmd_commit() should be using OPT_BOOL instead of OPT__VERBOSE,
> > as there is no such thing as "verbose > 1" here. But I don't think there
> > is any real user-facing c
In the later steps of preparing a patch series I do not want to edit the
patches any more, but just make sure the test suite passes after each
patch. Currently I would run
EDITOR=true git rebase -i -x "make test"
In an ideal world the command would be simpler and just be
git rebase -x "mak
Dear git MD,
New LCD/LED TV defender blocker for year 2016.
huge profits reserve for first distributor there, a lots request from end-users
New and hottest model refer to http://www.lcdaccessory.com
inquire email to Eric from eMetal Technology
i...@emetal.tw
Three tests before the test updated here is a test that is called
'pull in shallow repo with missing merge base' and does this:
test_must_fail git pull --depth 4 .. A
While attempting to create a merge after fetching necessary objects,
the current implementation happens to create a throw-away
Am 16.03.2016 um 17:39 schrieb Alexander Kuleshov:
> There is common pattern to traverse a hashmap in git source code:
>
> hashmap_iter_init(map, &iter);
> while ((entry = hashmap_iter_next(&iter)))
> // do something with entry
>
The hashmap_iter_first() function al
This commit introduces command line options for git verify-tag to allow
verification of RFC3161 time-stamped tags.
To keep consistent with the current behavior of verifying gpg signatures, the
return value of `git verify-tag` still indicates only the success of gpg
signature verification by defaul
Hi Paul,
On Wed, 16 Mar 2016, Paul Tan wrote:
> On Wed, Mar 16, 2016 at 4:04 PM, Johannes Schindelin
> wrote:
> > In addition I want to point out that sequencer's replay_opts seem to be at
> > least related, but the patch shares none of its code with the sequencer.
> > Let's avoid that.
> >
> >
This commit adds POST upload capabilities to the internal libcurl wrapper, which
are necessary for uploading RFC3161 Time Stamping Queries to a Time Stamping
Authority.
Therefore, the internal struct http_get_options is renamed to
http_request_options and extended by 2 strbuf fields named `postfie
On Thu, Mar 17, 2016 at 4:11 AM, Duy Nguyen wrote:
> Good? Bad? Ugly?
For now I would just go with 3 directories:
non-git/ (or util, helpers, or anything that could be ripped out and be useful
e.g. strbufs, argv-array run-command, lockfile
git/ (maybe called lib? All stuff that is pure Git a
Duy Nguyen writes:
> v2.7.3 differs in the way "!" is handled. It does extend reversion
> outside dir1/dir2/show, back to dir1/dir2. While 2.8+1+2 recognizes
> and follows the "/*" and "!dir1/dir2/" pair.
>
> The way I interpreted the rules above, though, may be because I'm just
> trying to defen
Stefan Beller writes:
> For now I would just go with 3 directories:
>
> non-git/ (or util, helpers, or anything that could be ripped out and be useful
> e.g. strbufs, argv-array run-command, lockfile
> git/ (maybe called lib? All stuff that is pure Git and is used for libgit
>
> builtin/ (as
This commit contains just a tiny whitespace fix in the git-tag documentation.
Signed-off-by: Anton Würfel
Signed-off-by: Phillip Raffeck
---
Documentation/git-tag.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index
---
Hi Jens,
I cannot find the edit button in the wiki[1] any more.
Please apply this patch documenting another idea.
Thanks,
Stefan
[1] https://github.com/jlehmann/git-submod-enhancements/wiki
Home.textile | 11 +++
1 file changed, 11 insertions(+)
diff --git a/Home
On 03/16, Johannes Schindelin wrote:
> Hi Paul,
>
> On Wed, 16 Mar 2016, Paul Tan wrote:
>
> > On Wed, Mar 16, 2016 at 3:58 PM, Johannes Schindelin
> > wrote:
> > >
> > > On Sat, 12 Mar 2016, Paul Tan wrote:
> > >
> > >> diff --git a/t/perf/p3404-rebase-interactive.sh
> > >> b/t/perf/p3404-reba
On Thu, Mar 17, 2016 at 4:17 AM, Mehul Jain wrote:
> I tried out this approach and here's the result.
>
> + if(!opt_rebase && opt_autostash != -1)
> + die(_("--[no-]autostash option is only valid with
> --rebase."));
> +
> if (opt_rebase) {
> int autost
On Thu, Mar 17, 2016 at 2:53 AM, Jeff King wrote:
> I don't think that would produce the wrong behavior, but it seems like a
> very complicated solution to a problem that can easily be solved by just
> following the usual conventions (that verbose starts at 0, options make
> it go up or down, and
On Fri, Mar 18, 2016 at 4:31 PM, Richard Furness -X (rfurness - ENSOFT
LIMITED at Cisco) wrote:
> Hi,
>
> I've been testing out git 2.8.0 rc3 due to having a particular interest in
> this enhancement from the changelog:
> " Another try to improve the ignore mechanism that lets you say "this
>
On Tue, Mar 15, 2016 at 2:43 AM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> On Sat, Mar 12, 2016 at 5:46 PM, Paul Tan wrote:
>>> So, we have around a 1.4x-1.8x speedup for Linux users, and a 1.7x-13x
>>> speedup
>>> for Windows users. The annoying long delay before the interactive editor i
Hello,
On 10/03/16 16:51, Gregor Jasny wrote:
today I discovered that it's a bad idea to "git subtree pull" from an
annotated tag. This issue got discussed in those two threads:
http://comments.gmane.org/gmane.comp.version-control.git/247503
http://comments.gmane.org/gmane.comp.version-control.
On Wed, Mar 16, 2016 at 06:28:59PM -0700, Stefan Beller wrote:
> To reproduce:
>
> $ git config sendemail.aliasesfile ~/.mailrc
> $ git config sendemail.aliasfiletype mailrc
> $ echo "alias zzz_wrong_entry jon@do.e "
> # notice the white space at the end of the alias
>
> $ git send-email 0001-re
Durham Goode writes:
> Using git 2.8.0-rc2, given a repo with the following files:
>
> - one/hideme
> - one/donthide
> - two/foo
>
> A sparse config of:
>
> cat > .git/info/sparse-checkout < /*
> !one/hideme
> EOF
>
> Results in a repository that only has `one/donthide` in it. I would
> expect `
On Wed, Mar 16, 2016 at 9:27 PM, Marc Branchaud wrote:
> On 16-03-15 09:02 PM, Stefan Beller wrote:
>> On Tue, Mar 15, 2016 at 6:00 PM, Stefan Beller wrote:
>>>
>>> Instead of converting to whitespaces in Git, we could make use of the
>>> set_tabs capability for ttys and setup the terminal for ha
WE THE MONEY GRAM REMITTING OFFICE WE ARE TO LET YOU KNOW THAT WE HAVE SENT
YOUR FULL COMPENSATION PAYMENT OF $3.5m YOU WILL BE RECEIVING $10,000.00 PER
DAY NOW WE HAVE SEND THE FIRST PAYMENT TO YOU HERE IS THE CONTACT INFORMATION
DR.PETER GODWIN
EMAIL (w3uni...@hotmail.com)
TEL:+22968831082
THE
On Thu, Mar 17, 2016 at 12:40:59AM +0800, 惠轶群 wrote:
> > Is it better to have the fallback in /tmp, and not in
> > ~/.git-credential-cache/, and why?
> >
> > Is it because the wish is to always use /tmp/git-$uid/ as a fallback
> > for $XDG_RUNTIME_DIR (as opposed to ~/.git-credential-cache/, which
Johannes Schindelin writes:
> And that is very, very much the purpose of the interactive rebase.
>
>> $ git for-each-rev -x "$command" old..new
>>
>> where you can write "sh -c 'git checkout $1 && make test' -" as
>> your $command.
>
> You meant
>
> git rev-list old...new |
> whi
On Fri, Mar 18, 2016 at 9:54 AM, Eric Sunshine wrote:
> Since this is now a patch series rather than a single patch, another
> way to help reviewers is to use a cover letter (see git-format-patch
> --cover-letter) where you'd explain the changes, and, importantly,
> include an interdiff between th
Duy Nguyen writes:
> On Fri, Mar 18, 2016 at 6:49 AM, Junio C Hamano wrote:
>> Thanks for these 5 patches, two of which need to be discarded ;-).
>> I think you can pick either one of 1/2, pick the one that says
>> "non-NULL" (as opposed to "something") in the log message for 2/2.
>
> Sorry, I d
On Fri, Mar 18, 2016 at 1:02 PM, Mike Hommey wrote:
> On Fri, Mar 18, 2016 at 09:10:37AM -0700, Junio C Hamano wrote:
>> * We forbid declaration-after-statement in our codebase.
>
> By the way, why not enforce it with -Werror=declaration-after-statement?
> If people patching git get an error when
Johannes Schindelin writes:
> Hi Linus,
>
> On Fri, 18 Mar 2016, Linus Torvalds wrote:
>
>> I thought git didn't merge two branches that have no common base by
>> default, but it seems it will happily do so.
>
> What happened to "The coolest merge EVER!"?
>
> http://thread.gmane.org/gmane.c
On Fri, Mar 18, 2016 at 12:24 AM, Eric Sunshine wrote:
> On Thu, Mar 17, 2016 at 12:49 PM, Mehul Jain wrote:
>> @@ -801,6 +804,7 @@ static int run_rebase(const unsigned char *curr_head,
>> argv_array_pushv(&args, opt_strategy_opts.argv);
>> if (opt_gpg_sign)
>> arg
Linus Torvalds writes:
> On Thu, Mar 17, 2016 at 4:16 PM, Junio C Hamano wrote:
>> It is reasonable for tweak the default output mode for "git log" to
>> untabify the commit log message, it sometimes may be necessary to
>> see the output without tab expansion.
>
> Thanks, these all look good to
1 - 100 of 299 matches
Mail list logo