Johannes Sixt j.s...@viscovery.net writes:
The numbers defined in {FILE,PRODUCT}VERSION statements are intended for
machine consumption and are always 4 positions (if the source contains
fewer, they are padded with zeros). They can be used by installers to
decide whether a file that already
Vicent Martí tan...@gmail.com writes:
Do these consume CPU every time somebody asks for a tarball? That
might be considered wrong depending on the view.
No, our infrastructure caches frequently requested tarballs so they
don't have to be regenerated on the fly.
Thanks. That is certainly
These quantities can be larger than an int. Use ulong to express
them like the underlying pack-objects does, and also parse them with
the human-friendly unit suffixes.
Signed-off-by: Junio C Hamano gits...@pobox.com
---
builtin/repack.c | 12 ++--
1 file changed, 6 insertions(+), 6
-by: Junio C Hamano gits...@pobox.com
---
builtin/pack-objects.c | 25 -
parse-options.c| 17 +
parse-options.h| 5 +
3 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index
documentation to no longer state it's a script, 2013-10-19) and
later can be merged down to maint-1.8.4 track and upwards.
Junio C Hamano (2):
parse-options: refactor human-friendly-integer parser out of pack-objects
repack: accept larger window-memory and max-pack-size
builtin/pack-objects.c | 25
Junio C Hamano gits...@pobox.com writes:
Johannes Sixt j.s...@viscovery.net writes:
...
..., I suggest that we just punt (as per
my patch). That should work out nicely because we can fairly safely assume
that there are no installers around that look at these particular version
numbers.
OK
Paul Mackerras pau...@samba.org writes:
On Tue, Jan 21, 2014 at 10:33:02AM -0500, Marc Branchaud wrote:
On 13-12-18 11:04 AM, Marc Branchaud wrote:
Users often find that next and prev do the opposite of what they
expect. For example, next moves to the next match down the list, but
that
Ken Moffat zarniwh...@ntlworld.com writes:
I note that all of these *are* still available at googlecode for
the moment : https://code.google.com/p/git-core/downloads/list
As I said, Cgc is not the ony download site. The end of
http://git-blame.blogspot.com/p/git-public-repositories.html
Linus Torvalds torva...@linux-foundation.org writes:
This means that git request-pull will never rewrite the ref-name you gave
it. If the local branch name is xyzzy, that is the only branch name
that request-pull will ask the other side to fetch.
If the remote has that branch under a
Linus Torvalds torva...@linux-foundation.org writes:
That may be very helpful if your local tree doesn't match the layout of
the remote branches, but for the common case it's been a recurring
disaster, when request-pull is done against a delayed remote update, and
it rewrites the target
Junio C Hamano gits...@pobox.com writes:
... there is no 'for-linus' branch locally, so there is no way for
him to say
git request-pull initial origin for-linus
unless he creates it locally first.
In real life on the kernel list, for-linus may have to be a signed
tag, and pushed
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
You can find the changes described here in the integration branches
of the repositories listed at
Eric Wong normalper...@yhbt.net writes:
Pushed for Junio.
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
Paul Mackerras pau...@samba.org writes:
Yes, please pull. I have just pushed one more:
76d64ca gitk: Indent word-wrapped lines in commit display header
Thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
Jeff King p...@peff.net writes:
..., but it feels awfully wrong to be so intimate with
a subprogram that we do not control.
Yeah, I think we are in agreement on that point.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
Jiang Xin worldhello@gmail.com writes:
Maybe three weeks left. You can estimate it by checking the date
for history tags, such as v1.8.5-rc0 and v1.8.5-rc3.
v1.8.5-rc0: Wed Oct 30 12:17:56 2013 -0700
v1.8.5-rc3: Wed Nov 20 11:27:39 2013 -0800
v1.8.5: Wed Nov 27 12:14:52 2013
Pat Thoyts pattho...@gmail.com writes:
GIT_VERSION=1.9.rc0
all:
echo $(join -DMAJOR= -DMINOR= -DPATCH=, \
$(wordlist 1,3,$(filter-out rc%,$(subst -, ,$(subst .,
,$(GIT_VERSION 0 0))
This removes any rc* parts and appends a couple of zeros so that all
missing elements
Jeff King p...@peff.net writes:
Junio, since you prepare such tarballs[1] anyway for kernel.org, it
might be worth uploading them to the Releases page of git/git. I
imagine there is a programmatic way to do so via GitHub's API, but I
don't know offhand. I can look into it if you are
Jeff King p...@peff.net writes:
On Wed, Jan 22, 2014 at 08:06:42PM -0500, Jeff King wrote:
But I think there is a subtle problem. Here (and elsewhere) we use the
parsed value of 0 as a sentinel. I think that is OK for
--max-pack-size, where 0 is not a reasonable value. But git-repack(1)
Linus Torvalds torva...@linux-foundation.org writes:
So this relaxes the remote matching, and allows using the local:remote
syntax to say that the local branch is differently named from the remote
one.
It is probably worth folding it into the previous patch if you think this
whole
Jeff King p...@peff.net writes:
and assume that it will fail. It doesn't. Solaris happily renames
some-file to a regular file named no-such-dir. So we fail later during
the index-update, complaining about adding the entry no-such-dir/, but
still exit(0) at the end. I'm mostly willing to just
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
When you do git diff HEAD submodule/, submodule from the index is
picked out and match_pathspec_depth() in charge of matching it with
the pathspec submodule/.
Is ... is called or something missing at the end of this sentence?
Unlike
Jeff King p...@peff.net writes:
... The test does not care about the timestamp of the
.keep file it creates at all, only that it exists.
Please refrain from using touch for such use cases in the first
place. It appears that
pack-$packsha1.keep
is what the test wants.
--
To
of the .keep file it
creates at all, only that it exists. For such a use case, with or
without portability issues around -r, touch should not be used
in the first place.
Signed-off-by: Jeff King p...@peff.net
Signed-off-by: Junio C Hamano gits...@pobox.com
---
t/t7700-repack.sh | 2 +-
1 file changed, 1
Jens Lehmann jens.lehm...@web.de writes:
... But a single
trailing '/' does mark submod as a directory, which I think is
ok for a submodule. And it makes life easier for the user if we
accept that, as shell completion will add it there automatically.
OK, that would be annoying.
Perhaps the
should be before doing so, so...
Signed-off-by: Junio C Hamano gits...@pobox.com
---
t/t5150-request-pull.sh | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh
index 1afa0d5..412ee4f 100755
--- a/t/t5150-request
Jeff King p...@peff.net writes:
In a triangular workflow, you may have a distinct
@{upstream} that you pull changes from, but publish by
default (if you typed git push) to a different remote (or
a different branch on the remote). It may sometimes be
useful to be able to quickly refer to that
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
While looking at this, I found a funny behavior of fill_directory.
$ git init
$ mkdir b
$ b/c
$ b/d
$ git status b
Untracked files:
b/
$ git status b/
Untracked files:
b/c b/d
Notice how the trailing
Brad King brad.k...@kitware.com writes:
Teach add_cacheinfo to optionally tolerate make_cache_entry failure when
the reason is ENOENT from lstat. Tell it to do so in the call path when
the entry from HEAD is known to be up to date.
It somehow feels wrong to force callers of
Jeff King p...@peff.net writes:
On Fri, Jan 24, 2014 at 07:32:22PM +0100, Markus Trippelsdorf wrote:
However, you do have to specify each branch individually. You probably
want to say all branches except X, and you cannot currently specify
a negative refspec like that.
Yes, that was
Nicolas Vigier bo...@mars-attacks.org writes:
On Fri, 24 Jan 2014, brian m. carlson wrote:
This series was posted to the list some time back, but it fell through
the cracks. This is a re-send of Nicolas Vigier's work with an
additional patch that adds --gpg-sign to pull as well. I added my
Linus Torvalds torva...@linux-foundation.org writes:
So I don't actually think anybody should need to be retrained, or
always use the local:remote syntax. The local:remote syntax exists
only for that special insane case where you used (the same)
local:remote syntax to push out a branch under
Brad King brad.k...@kitware.com writes:
+extern struct cache_entry *make_cache_entry(unsigned int mode, const
unsigned char *sha1, const char *path, int stage, int refresh, int
refresh_flags);
Why a new parameter? If refresh_flags can be ANY when refresh=NoThanks,
shouldn't they be a
Markus Trippelsdorf mar...@trippelsdorf.de writes:
On 2014.01.24 at 12:00 -0800, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
On Fri, Jan 24, 2014 at 07:32:22PM +0100, Markus Trippelsdorf wrote:
However, you do have to specify each branch individually. You probably
want
brian m. carlson sand...@crustytoothpaste.net writes:
+-S[keyid]::
+--gpg-sign[=keyid]::
+ GPG-sign commits.
+
Does this accept --no-gpg-sign? If not, shouldn't it?
diff --git a/sequencer.c b/sequencer.c
index 90cac7b..bde5f04 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -392,11
Jeff King p...@peff.net writes:
I had imagined a not token at the front of the refspec, like:
git fetch origin +refs/heads/*:refs/remotes/origin/* ^refs/heads/foo
In this case, a colon in the refspec would be an error. An alternative
would be:
git fetch origin
brian m. carlson sand...@crustytoothpaste.net writes:
On Fri, Jan 24, 2014 at 01:00:06PM -0800, Junio C Hamano wrote:
brian m. carlson sand...@crustytoothpaste.net writes:
+-S[keyid]::
+--gpg-sign[=keyid]::
+ GPG-sign commits.
+
Does this accept --no-gpg-sign? If not, shouldn't
Ramkumar Ramachandra artag...@gmail.com writes:
On that note, can you hold off graduating
jk/branch-at-publish-rebased, Junio? Hopefully, I'll come up with a
replacement over the weekend.
Sure.
This close to the feature freeze, I'd rather see all contributors,
not limited to you, not rush on
Torsten Bögershausen tbo...@web.de writes:
Another solution could be to do the chmod +x in mingw_rename().
This may be done in another commit, because
a) It improves git gc only when Git for Windows is used
on the client machine
b) Windows refuses to delete a file when the file is
Johannes Schindelin johannes.schinde...@gmx.de writes:
In any case, I'd rather change the permissions only when the rename
failed. *And* I feel uncomfortable ignoring the return value...
Good judgement I'd agree with 100%.
Thanks.
--
To unsubscribe from this list: send the line unsubscribe
David Kastrup d...@gnu.org writes:
As it can easily be guessed, the add xxx function commits are
basically adding not-yet-used code (and so will not disrupt
compilation), but everything starting with Reorganize blame data
structures up until the final commit will not work or compile since the
Ramkumar Ramachandra artag...@gmail.com writes:
Junio C Hamano wrote:
This change could introduce a regression for people on a platform
whose certificate directory is /etc/ssl/certs but its IO::Socket:SSL
somehow fails to use it as SSL_ca_path without being told.
I can confirm that my git
Michael Haggerty mhag...@alum.mit.edu writes:
On 01/27/2014 01:15 AM, Eric Sunshine wrote:
On Sun, Jan 26, 2014 at 6:43 PM, Michael Haggerty mhag...@alum.mit.edu
wrote:
Subject: [PATCH] doc: remote author/documentation sections from more pages
s/remote/remove/
Gaah! Git is a virus that
Martin Erik Werner martinerikwer...@gmail.com writes:
In order to manipulate symliks in the
work tree using absolute paths, symlinks should only be dereferenced
outside the work tree.
I agree 100% with this reasoning (modulo s/symliks/symlinks/).
As to the implementation, it looks a bit
David Kastrup d...@gnu.org writes:
The previous implementation uses a sorted linear list of struct
blame_entry in a struct scoreboard for organizing all partial or
completed work. Every task that is done requires going through the
whole list where most entries are not relevant to the task at
Duy Nguyen pclo...@gmail.com writes:
Ack. Perhaps this on top to verify it
-- 8 --
diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh
index af5134b..d9f37c3 100755
--- a/t/t4010-diff-pathspec.sh
+++ b/t/t4010-diff-pathspec.sh
@@ -110,4 +110,17 @@ test_expect_success
Brad King brad.k...@kitware.com writes:
Move lstat ENOENT handling from refresh_index to refresh_cache_ent and
activate it with a new CE_MATCH_IGNORE_MISSING option. This will allow
other call paths into refresh_cache_ent to use the feature.
Signed-off-by: Brad King brad.k...@kitware.com
David Kastrup d...@gnu.org writes:
Junio C Hamano gits...@pobox.com writes:
David Kastrup d...@gnu.org writes:
The previous implementation uses a sorted linear list of struct
blame_entry in a struct scoreboard for organizing all partial or
completed work. Every task that is done requires
Is this from the same Christian?
The series seems to have unusually high rate of style violations
compared to the usual submission, like these:
ERROR: open brace '{' following function declarations go on the next line
#78: FILE: trailer.c:44:
+static size_t alnum_len(const char *buf, size_t len)
Christian Couder chrisc...@tuxfamily.org writes:
+'git interpret-trailers' [--trim-empty] [--infile=file]
[token[=value]...]
Would it be more consistent with existing documentation to format this as so?
[--infile=file] [token[=value]]...
No, it would be very inconsistent:
$ grep
Junio C Hamano (6):
Documentation: exclude irrelevant options from git pull
Documentation: git pull does not have the -m option
revision: mark contents of an uninteresting tree uninteresting
revision: propagate flag bits from tags to pointees
Documentation: make
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 tip of 'master' is at 1.9-rc1; as far as new features are
concerned, this is pretty much it until the final.
On the maintenance track, we
Thanks; will try to rebase on top of more recent codebase and then
review.
--
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
Jeff King p...@peff.net writes:
On Thu, Jan 23, 2014 at 10:15:33AM -0800, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
Junio, since you prepare such tarballs[1] anyway for kernel.org, it
might be worth uploading them to the Releases page of git/git. I
imagine
brian m. carlson sand...@crustytoothpaste.net writes:
From: Nicolas Vigier bo...@mars-attacks.org
If the variable $OPTIONS_STUCKLONG is not empty, then rev-parse
option parsing is done in --stuck-long mode.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m.
brian m. carlson sand...@crustytoothpaste.net writes:
git merge already allows us to sign commits, and git rebase has recently
learned how to do so as well. Teach git pull to parse the -S/--gpg-sign
option and pass this along to merge or rebase, as appropriate.
Signed-off-by: brian m.
brian m. carlson sand...@crustytoothpaste.net writes:
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 43c19e0..73d32dd 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -181,7 +181,7 @@ exit_with_patch () {
git rev-parse --verify
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
skip_stat_unmatch flag is added in fb13227 (git-diff: squelch empty
diffs - 2007-08-03) to ignore empty diffs caused by stat-only
dirtiness. In some diff case, stat is not involved at all. While
the code is written in a way that no expensive I/O
Jeff King p...@peff.net writes:
The git-repack command always passes `--honor-pack-keep`
to pack-objects. This has traditionally been a good thing,
as we do not want to duplicate those objects in a new pack,
and we are not going to delete the old pack.
...
Note that this option just
David Sharp dhsh...@google.com writes:
@@ -738,9 +740,11 @@ int cmd_rev_parse(int argc, const char **argv, const
char *prefix)
continue;
}
if (!strcmp(arg, --resolve-git-dir)) {
- const
David Sharp dhsh...@google.com writes:
Without this patch, git-rev-parse --prefix, --default, or
--resolve-git-dir, without a value argument, would result in a segfault.
Instead, die() with a message.
When I sent the review message, I actually was on the fence between
checking i vs argc and
Kirill Smelkov k...@mns.spb.ru writes:
diff --git a/combine-diff.c b/combine-diff.c
index 3b92c448..98c2562 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -15,8 +15,8 @@
...
+ while (1) {
...
+ if (cmp 0) {
+ if (pprev)
+
Junio C Hamano gits...@pobox.com writes:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
skip_stat_unmatch flag is added in fb13227 (git-diff: squelch empty
diffs - 2007-08-03) to ignore empty diffs caused by stat-only
dirtiness. In some diff case, stat is not involved at all. While
Torsten Bögershausen tbo...@web.de writes:
In a1bbc6c0 a shell command mv -f was replaced with the rename() function.
Use move_temp_to_file() from sha1_file.c instead of rename().
This is in line with the handling of other Git internal tmp files,
and calls adjust_shared_perm()
Elia Pinto gitter.spi...@gmail.com writes:
Add cppcheck target to Makefile. Cppcheck is a static
analysis tool for C/C++ code. Cppcheck primarily detects
the types of bugs that the compilers normally do not detect.
It is an useful target for doing QA analysis.
Signed-off-by: Elia Pinto
Elia Pinto gitter.spi...@gmail.com writes:
Signed-off-by: Elia Pinto gitter.spi...@gmail.com
---
Either the patch is whitespace damaged during the mail transport, or
you are incorrectly indenting the lines with all spaces.
archive.c |4 ++--
1 file changed, 2 insertions(+), 2
Duy Nguyen pclo...@gmail.com writes:
On Tue, Jan 28, 2014 at 02:51:45PM -0800, Junio C Hamano wrote:
This replaces 'diff: turn off skip_stat_unmatch on diff --cached'
The previous patch obviously leaves skip_stat_unmatch on in diff
rev rev and maybe other cases.
Oops, I lost track
Christian Couder chrisc...@tuxfamily.org writes:
I find it a bad taste to allow unbound set of token on the LHS of
'=' on the command line, but that is a separate issue in the design,
not in the documentation of the design.
I don't understand this sentence, sorry.
It is a bad design taste
David Kastrup d...@gnu.org writes:
Hi, I am wondering if I may compare pointers with that have been
created using different calls of malloc.
The C standard does not allow this (inequalities are only allowed for
pointers into the same structure) to allow for some cheapskate sort of
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 second release candidate is expected to happen this weekend.
You can find the changes described here in the integration branches
of the
Junio C Hamano gits...@pobox.com writes:
So there are two remaining items, I think.
- After creating a tags/for-linus signed tag and pushing it to
tags/for-linus, asking request-pull to request that tag to be
pulled seems to lose the tag message from the output.
- Docs.
[Footnote
Duy Nguyen pclo...@gmail.com writes:
On Thu, Jan 30, 2014 at 2:25 AM, Junio C Hamano gits...@pobox.com wrote:
On Tue, Jan 28, 2014 at 02:51:45PM -0800, Junio C Hamano wrote:
This however shows that the existing test *KNEW* that it was enough
to check just a few cases (especially
Jonathan Nieder jrnie...@gmail.com writes:
Otherwise there is a race: if 'git log' finishes writing before the
pager terminates and closes the pipe, all is well, and if the pager
finishes quickly enough then 'git log' terminates with SIGPIPE.
died of signal 13 at
Peter Krefting pe...@softwolves.pp.se writes:
...if I have the time, maybe I can come up with a patch. There is
already some hacks in the core.symlinks setting, so I guess it
should be possible.
That is totally unrelated. The variable only says on this platform
and/or filesystem, you cannot
Benoit Sigoure tsuna...@gmail.com writes:
When we detect that vsnprintf / snprintf are broken, we #define them to
an alternative implementation. On OS X, stdio.h already #define's them,
which causes a warning to be issued at the point we re-define them in
`git-compat-util.h'.
---
Makes
Torsten Bögershausen tbo...@web.de writes:
But, look at
https://www.kernel.org/pub/software/scm/git/docs/git-add.html
This page seems to need an update too, and I wonder why:
a) The makefile did'nt re-generate html even if it should have
b) That page is not owned or updated by the git.git
A release candidate Git v1.9-rc2 is now available for testing at
the usual places.
I've heard rumours that various third-party tools do not like the
two-digit version numbers (e.g. Git 2.0) and started barfing left
and right when the users install v1.9-rc1. While it is tempting to
laugh at them
vX.Y.Z
(Z 0) are maintenance releases.
Signed-off-by: Junio C Hamano gits...@pobox.com
---
* Haven't committed to this outline, but I am raising a
weather-balloon to see reaction from the list. Comments?
Documentation/howto/maintain-git.txt | 18 +++---
1 file changed, 11
Torsten Bögershausen tbo...@web.de writes:
On 2014-02-01 10.14, Reuben Hawkins wrote:
Most case-insensitive filesystems are case-preserving. In these
filesystems (such as HFS+ on OS X) you can name a file Filename.txt,
then rename the file to FileName.txt. That file will be accessible
by
Duy Nguyen pclo...@gmail.com writes:
I usually start splitting a commit with reset @^ then add -p back.
The problem is reset @^ does not keep track of new files added in
HEAD, so I often end up forgetting to add new files back (with add
-p). I'm thinking of making reset to do add -N
Jeff King p...@peff.net writes:
[+cc Joshua Jensen, who wrote 50906e0]
On Sun, Feb 02, 2014 at 07:13:04AM -0600, Reuben Hawkins wrote:
fast-import should not use strncmp_icase.
I am not sure of that. My gut feeling is that core.ignorecase is
completely about the _filesystem_, and that git
brian m. carlson sand...@crustytoothpaste.net writes:
... It also happens to fix the issue where the help
text is improperly quoted. With your suggested fix, it is now quoted
(ugly, but quoted):
I do not see anything ugly about the output below. Of course you
could do -S'brian ...', but
Todd Zullinger t...@pobox.com writes:
I know the Fedora/EPEL spec file and what's in git.git have grown
apart a good bit, unfortunately. That's the cost of having a spec
file that is meant to work across a very wide array of RPM-based
systems, I guess. The Fedora/EPEL spec file is fairly
Jeff King p...@peff.net writes:
[1] I _do_ use reset -p when splitting commits, but I do not think it
is useful here. I use it for oops, I staged this change, but it
actually belongs in the next commit. Undo my staging, but leave the
changes in the working tree for the next one.
Martin Erik Werner martinerikwer...@gmail.com writes:
When symlinks in the working tree are manipulated using the absolute
path, git dereferences them, and tries to manipulate the link target
instead.
The above may a very good description of the root cause, but
can we have description of a
Kirill Smelkov k...@mns.spb.ru writes:
That cleanup patch is good, but I've found a bug in it. In the item removal
code
+ /* p-path not in q-queue[]; drop it */
+ struct combine_diff_path *next = p-next;
+
+ if ((*tail = next)
Junio C Hamano gits...@pobox.com writes:
Can we have that git foo $path to the testsuite as well? That is
the breakage we do not want to repeat in the future by regressing.
Something like this, perhaps?
t/t3004-ls-files-basic.sh | 17 +
1 file changed, 17 insertions(+)
diff
Adrian Johnson ajohn...@redneon.com writes:
- Allow extra space in is new and is separate
- Fix bug in word regex for numbers
Signed-off-by: Adrian Johnson ajohn...@redneon.com
---
t/t4034/ada/expect | 2 +-
userdiff.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
George Spelvin li...@horizon.com writes:
Another point is that Ada doesn't actually include leading + or -
signs in the syntax for number, but rather makes them unary operators.
This means that spaces are allowed, and whether you want to include them
in the number pattern is a judgement call.
brian m. carlson sand...@crustytoothpaste.net writes:
git merge already allows us to sign commits, and git rebase has recently
learned how to do so as well. Teach git pull to parse the -S/--gpg-sign
option and pass this along to merge or rebase, as appropriate.
Signed-off-by: brian m.
brian m. carlson sand...@crustytoothpaste.net writes:
diff --git a/sequencer.c b/sequencer.c
index 90cac7b..bde5f04 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -392,11 +392,18 @@ static int run_git_commit(const char *defmsg, struct
replay_opts *opts,
{
struct argv_array array;
Martin Erik Werner martinerikwer...@gmail.com writes:
The path being exactly equal to the work tree is handled separately,
since then there is no directory separator between the work tree and
in-repo part.
What is an in-repo part? Whatever it is, I am not sure if I
follow that logic. After
brian m. carlson sand...@crustytoothpaste.net writes:
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 43c19e0..73d32dd 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -181,7 +181,7 @@ exit_with_patch () {
git rev-parse --verify
Jens Lehmann jens.lehm...@web.de writes:
This commit adds the functions and files needed for configuration,
Please just say Add the functions and files needed for
+++ b/Documentation/recurse-submodules-update.txt
@@ -0,0 +1,8 @@
+--[no-]recurse-submodules::
+ Using
Jens Lehmann jens.lehm...@web.de writes:
This new option will allow the user to not only reset the work tree of
the superproject but to also update the work tree of all initialized
submodules (so they match the SHA-1 recorded in the superproject) when
used together with --hard or --merge. But
Jens Lehmann jens.lehm...@web.de writes:
+ set_config_update_recurse_submodules(
+
parse_update_recurse_submodules_arg(--recurse-submodules-default,
+ recurse_submodules_default),
+ recurse_submodules);
I think I
Jens Lehmann jens.lehm...@web.de writes:
This new option will allow the user to not only update the work tree of
the superproject according to the merge result but to also update the
work tree of all initialized submodules (so they match the SHA-1 recorded
in the superproject). But this
Kirill Smelkov k...@mns.spb.ru writes:
where correct paths stands for paths that are different to all
parents.
Up until now, we were testing combined diff only on one file, or on
several files which were all different (t4038-diff-combined.sh).
As recent thinko in simplify intersect_paths()
Kirill Smelkov k...@mns.spb.ru writes:
Because if there is, such two tree entries would never be compared as
equal - the code in base_name_compare() explicitly compares modes, if
there is a change for dir bit, even for equal paths, entries would
compare as different.
OK.
--
To unsubscribe
Kirill Smelkov k...@mns.spb.ru writes:
Judging from sample outputs and tests nothing changes in diff -c output,
Yuck.
I do not think the processing done inside the loop for the first
path (i.e. i==0) before we call show_log(rev) affects what that
called show_log(rev) does, so it probably is a
201 - 300 of 27729 matches
Mail list logo
