Faheem Mitha fah...@faheem.info writes:
I was going by the answer (by CodeWizard) in
http://stackoverflow.com/q/30348615/350713
OK, so the hash you got comes from a superproject which references it.
My guess is that the superproject did a private commit in a submodule,
added this submodule to
Hi,
On Mon, May 18, 2015 at 10:43 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
On 2015-05-18 15:54, Paul Tan wrote:
diff --git a/git-pull.sh b/git-pull.sh
index 633c385..67f825c 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -4,13 +4,53 @@
#
# Fetch one or more remote refs
Hi,
On Mon, May 18, 2015 at 11:20 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
Hi Paul,
On 2015-05-18 15:32, Paul Tan wrote:
@@ -95,7 +94,11 @@ test_expect_success 'test . as a remote' '
git checkout copy
test $(cat file) = file
git pull
- test $(cat
Karthik Nayak karthik@gmail.com writes:
+static int match_name_as_path(const char **pattern, const char *refname)
I would have appreciated a short docstring. The full doc would probably
be as long as the code, but a few examples of what matches and what
doesn't can help the reader.
Hi,
On Mon, May 18, 2015 at 11:13 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
Hi Paul,
On 2015-05-18 15:32, Paul Tan wrote:
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 4a2c0a1..3bc0594 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -164,6 +164,26 @@
Hi,
On Mon, May 18, 2015 at 10:37 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
On 2015-05-18 15:30, Paul Tan wrote:
t5520: failing test for pull --all with no configured upstream
t5521: test pull --all --dry-run does not make any changes
error_on_no_merge_candidates() does not
Hi,
On Mon, May 18, 2015 at 10:37 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
On 2015-05-18 15:30, Paul Tan wrote:
t5520: failing test for pull --all with no configured upstream
t5521: test pull --all --dry-run does not make any changes
error_on_no_merge_candidates() does not
On 05/20/2015 10:27 PM, Matthieu Moy wrote:
Karthik Nayak karthik@gmail.com writes:
From: Jeff King p...@peff.net
This means that git am will consider Peff as the author ...
Written-by: Jeff King p...@peff.net
... hence this is not needed: in the final history, it will appear as if
On Tue, May 19, 2015 at 03:12:31PM -0700, Junio C Hamano wrote:
Philippe De Muyter p...@macq.eu writes:
On Tue, May 19, 2015 at 09:01:10AM -0700, Junio C Hamano wrote:
Philippe De Muyter p...@macq.eu writes:
Trying to understand, I have eventually done git log on my branch and
on
Hi,
I noticed that in some weird cases, git rev-list and friends would
appear to not do their work as intended. As I wasn't entirely sure at
the time I saw previous occurrence (which involved lots of refs and
big history) , I kept that on the side to look back later, but today,
it happened again
On 05/21/2015 05:20 AM, Junio C Hamano wrote:
Karthik Nayak karthik@gmail.com writes:
convert 'for-each-ref' to use the common API provided by 'ref-filter'.
Start a sentence with capital?
More importantly, the above is misleading, as if you invented a new
ref-filter API and made
On Wed, May 20, 2015 at 12:18:15PM -0400, Jeff King wrote:
On Wed, May 20, 2015 at 04:12:38PM +0200, Philippe De Muyter wrote:
After reading the man page of 'git log', should --topo-order not be the
default log order ?
The problem with --topo-order is that it has to traverse all of the
Fix remaining instances where pack-file is used instead of
packfile.
Signed-off-by: Patrick Steinhardt p...@pks.im
---
This patch now also fixes instances where we refer to EBNF-style
command line parameters, as discussed by Junio and Peff.
Documentation/git-index-pack.txt | 10
Hi,
On Tue, May 19, 2015 at 2:00 AM, Stefan Beller sbel...@google.com wrote:
On Mon, May 18, 2015 at 6:32 AM, Paul Tan pyoka...@gmail.com wrote:
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index f991439..4d649a5 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -413,6 +413,21 @@
Just a minor change, the modification of new-command.txt was squashed to
2/5 instead of 1/5.
Eric Sunshine (2):
command-list: prepare machinery for upcoming common groups section
generate-cmdlist: parse common group commands
Sébastien Guimmara (3):
command-list.txt: add the common groups
I miss a high-level description of what the code is doing. Essentially,
there's the complete repository list of refs, and you want to filter
only some of them, right?
From the name, I would guess that ref_filter is the structure describing
how you are filtering, but from the code it seems to
The ultimate goal is for git help to display common commands in
groups rather than alphabetically. As a first step, define the
groups in a new block, and then assign a group to each
common command.
Add a block at the beginning of command-list.txt:
init start a working area (see also:
command-list.sh, retired in the previous patch, was the only
consumer of the common tag, so drop this now-unnecessary
attribute.
before:
git-add mainporcelaincommon worktree
after:
git-add mainporcelainworktree
Helped-by: Eric Sunshine
On Thu, May 21, 2015 at 1:39 PM, Sébastien Guimmara
sebastien.guimm...@gmail.com wrote:
Just a minor change, the modification of new-command.txt was squashed to
2/5 instead of 1/5.
Thanks. With or without addressing the two very minor nits I pointed
out in patches 2/5 and 5/5, this entire patch
Jeff King p...@peff.net writes:
On Thu, May 21, 2015 at 12:44:29AM -0400, Jeff King wrote:
This is a re-roll of the series at:
http://thread.gmane.org/gmane.comp.version-control.git/268185
The only changes here are the addition of patches 2 and 6, which are
both cleanups that help
Hello dear
I am Mrs Roseanna Martins from Sierra-Leone,a widow suffering from
long time (neck cancer) illness,I sent you letter a month ago, but I'm
not sure you received it, what his email fast, because I have not
heard from you, this is the reason why I repeat.
I have decided to hand over all
Am 21.05.2015 um 19:06 schrieb Heiko Voigt:
diff --git a/submodule-config.h b/submodule-config.h
index 9061e4e..58afc83 100644
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -24,6 +24,6 @@ const struct submodule *submodule_from_name(const unsigned
char *commit_sha1,
const
Heiko Voigt hvo...@hvoigt.net writes:
This is finally the next iteration of the submodule config api. The last
iteration can be found here:
http://article.gmane.org/gmane.comp.version-control.git/252601
This iteration fixes the lookup of submodules by name
(submodule_from_name()) where one
On Thu, May 21, 2015 at 11:33:58AM -0700, Junio C Hamano wrote:
+static const char *error_buf(struct strbuf *err, const char *fmt, ...)
{
- if (!branch || !branch-merge || !branch-merge[0])
- return NULL;
+ if (err) {
+ va_list ap;
+ va_start(ap,
Jeff King p...@peff.net writes:
When we call branch_get() to lookup or create a struct
branch, we make sure the merge field is filled in so that
callers can access it. But the conditions under which we do
so are a little confusing, and can lead to two funny
situations:
...
In addition to
Jeff King p...@peff.net writes:
All of the information needed to find the @{upstream} of a
branch is included in the branch struct, but callers have to
navigate a series of possible-NULL values to get there.
Let's wrap that logic up in an easy-to-read helper.
Signed-off-by: Jeff King
Matthieu Moy (2):
rebase -i: demonstrate incorrect behavior of post-rewrite hook with
exec
rebase -i: fix post-rewrite hook with failed exec command
git-rebase--interactive.sh | 10 +-
t/t5407-post-rewrite-hook.sh | 17 +
2 files changed, 22 insertions(+), 5
The 'exec' command is sending the current commit to stopped-sha, which is
supposed to contain the original commit (before rebase). As a result, if
an 'exec' command fails, the next 'git rebase --continue' will send the
current commit as old-sha1 to the post-rewrite hook.
The test currently fails
On Thu, May 21, 2015 at 1:30 PM, karthik nayak karthik@gmail.com wrote:
On 05/21/2015 12:37 AM, Eric Sunshine wrote:
On Wed, May 20, 2015 at 9:18 AM, Karthik Nayak karthik@gmail.com
wrote:
Makefile | 1 +
ref-filter.c | 73
On Thu, May 21, 2015 at 02:14:29PM -0400, Jeff King wrote:
There is a related cleanup I resisted, which is that several call-sites
will call stat_tracking_info, then later look directly at
branch-merge[0]-dst without a check for NULL (fill_tracking_info is
such a site).
This works because
It's better to start the man page with a description of what submodules
actually are instead of saying what they are not.
Reorder the paragraphs such that
the first short paragraph introduces the submodule concept,
the second paragraph highlights the usage of the submodule command,
the third
On Thu, May 21, 2015 at 10:24 AM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller sbel...@google.com writes:
Reorder the paragraphs such that
the first short paragraph introduces the submodule concept,
the second paragraph highlights the usage of the submodule command,
the third
On Thu, May 21, 2015 at 1:39 PM, Sébastien Guimmara
sebastien.guimm...@gmail.com wrote:
'git help' shows common commands in alphabetical order:
The most commonly used git commands are:
addAdd file contents to the index
bisect Find by binary search the change that introduced
On Thu, May 21, 2015 at 11:07:33AM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
All of the information needed to find the @{upstream} of a
branch is included in the branch struct, but callers have to
navigate a series of possible-NULL values to get there.
Let's wrap
Usually, when 'git rebase' stops before completing the rebase, it is to
give the user an opportunity to edit a commit (e.g. with the 'edit'
command). In such cases, 'git rebase' leaves the sha1 of the commit being
rewritten in $state_dir/stopped-sha, and subsequent 'git rebase
--continue' will
Jeff King p...@peff.net writes:
diff --git a/remote.c b/remote.c
index dca3442..1b7051a 100644
--- a/remote.c
+++ b/remote.c
@@ -1705,10 +1705,35 @@ int branch_merge_matches(struct branch *branch,
return refname_match(branch-merge[i]-src, refname);
}
-const char
On Wed, May 20, 2015 at 04:11:57PM -0700, Stefan Beller wrote:
It's better to start the man page with a description of what submodules
actually are instead of saying what they are not.
Reorder the paragraphs such that
the first short paragraph introduces the submodule concept,
the second
command-list.sh, retired in the previous patch, was the only
consumer of the common tag, so drop this now-unnecessary
attribute.
before:
git-add mainporcelaincommon worktree
after:
git-add mainporcelainworktree
Helped-by: Eric Sunshine
This message can be improved to show what entries have this problem.
Yes, that would definitely be a start. :)
But then I don't see any way to recover the index manually. ls-files
will die too. Perhaps we should be gentle in this case: show warnings
Actually, ls-files
Same as v9 [1], with:
* command-list.txt: reduce verbosity by squashing the two header lines
into one:
### command list (do not change this line)
* include a missing update to new-command.txt.
[1] http://thread.gmane.org/gmane.comp.version-control.git/269496
Eric Sunshine (2):
The ultimate goal is for git help to display common commands in
groups rather than alphabetically. As a first step, define the
groups in a new block, and then assign a group to each
common command.
Add a block at the beginning of command-list.txt:
init start a working area (see also:
'git help' shows common commands in alphabetical order:
The most commonly used git commands are:
addAdd file contents to the index
bisect Find by binary search the change that introduced a bug
branch List, create, or delete branches
checkout Checkout a branch or
From: Philippe De Muyter p...@macq.eu
To: Junio C Hamano gits...@pobox.com
Cc: git@vger.kernel.org; Jeff King p...@peff.net; John Keeping
j...@keeping.me.uk
Sent: Thursday, May 21, 2015 8:15 AM
Subject: Re: identical hashes on two branches, but holes in git log
On Tue, May 19, 2015 at
From: Stefan Beller sbel...@google.com
It's better to start the man page with a description of what
submodules
actually are instead of saying what they are not.
Reorder the paragraphs such that
the first short paragraph introduces the submodule concept,
the second paragraph highlights the
I thought about that, but no. The box I'm running git-p4 on has the
following specs:
CentOS 6.6 64bit
1 CPU
8GB RAM
8GB Swap
It is also on the same physical network as the Perforce server. I
remember seeing someone else complain about this, but I can't find the
article/blog now.
On Wed, May
On Thu, May 21, 2015 at 5:05 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Thu, May 21, 2015 at 4:48 PM, Allen Hubbe alle...@gmail.com wrote:
My motivation for this patch was not really to support the sendmail
aliases file directly. The commit message may therefore be
misleading. So, I
Allen Hubbe alle...@gmail.com writes:
Those are good points. Maybe I shouldn't even mention sendmail at
all, not in the name of the format, and not in the commit message.
What name would be a good name for this format?
simple?
And if you are going to define such a format, then I do not
With uploadpack.allowReachableSHA1InWant configuration option set on the
server side, git fetch can make a request with a want line that names
an object that has not been advertised (likely to have been obtained out
of band or from a submodule pointer). Only objects reachable from the
branch tips,
On Thu, May 21, 2015 at 4:48 PM, Allen Hubbe alle...@gmail.com wrote:
My motivation for this patch was not really to support the sendmail
aliases file directly. The commit message may therefore be
misleading. So, I could also rewrite the commit message to say
something like, loosely based on
On Thu, May 21, 2015 at 2:13 PM, Matthieu Moy matthieu@imag.fr wrote:
The 'exec' command is sending the current commit to stopped-sha, which is
supposed to contain the original commit (before rebase). As a result, if
an 'exec' command fails, the next 'git rebase --continue' will send the
Allen Hubbe alle...@gmail.com writes:
diff --git a/git-send-email.perl b/git-send-email.perl
index e1e9b14..5f2ec0d 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -515,7 +515,12 @@ my %parse_alias = (
$aliases{$alias} = [ split_addrs($addr) ];
Most of the options in config.txt are camelCase. Improve the readability
for allowtipsha1inwant by changing to allowTipSHA1InWant.
Signed-off-by: Fredrik Medley fredrik.med...@gmail.com
---
This patch is optional. There has been work on fixing the whole
Documentation/config.txt which has not been
2015-05-20 10:55 GMT+02:00 Michael J Gruber g...@drmicha.warpmail.net:
Stefan Beller venit, vidit, dixit 19.05.2015 23:46:
On Tue, May 19, 2015 at 1:51 AM, Michael J Gruber
g...@drmicha.warpmail.net wrote:
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
po/de.po | 2 +-
1
On Thu, May 21, 2015 at 08:58:35PM +0100, Philip Oakley wrote:
From: Philippe De Muyter p...@macq.eu
To: Junio C Hamano gits...@pobox.com
Cc: git@vger.kernel.org; Jeff King p...@peff.net; John Keeping
j...@keeping.me.uk
Sent: Thursday, May 21, 2015 8:15 AM
Subject: Re: identical hashes on
On 21/05/15 21:49, FusionX86 wrote:
I thought about that, but no. The box I'm running git-p4 on has the
following specs:
CentOS 6.6 64bit
1 CPU
8GB RAM
8GB Swap
Can you post the output, with -v added?
$ git-p4 clone //depot/some/dir -v
Also, what is your p4d server version?
$ p4 info
A
Paul Tan pyoka...@gmail.com writes:
So, here's the re-rolled patch.
Sigh, too late.
I thought the previous round was good enough and the patch is
already on 'next'.
If the incremental change is still worth doing on top, please do so.
Thanks.
--
To unsubscribe from this list: send the line
To allow future extensions, e.g. allowing non-tip sha1, replace the
boolean allow_tip_sha1_in_want variable with the flag-style
allow_request_with_bare_object_name variable.
Signed-off-by: Fredrik Medley fredrik.med...@gmail.com
---
fetch-pack.c | 9 ++---
upload-pack.c | 20
On Thu, May 21, 2015 at 4:19 PM, Junio C Hamano gits...@pobox.com wrote:
Allen Hubbe alle...@gmail.com writes:
diff --git a/git-send-email.perl b/git-send-email.perl
index e1e9b14..5f2ec0d 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -515,7 +515,12 @@ my %parse_alias = (
Allen Hubbe alle...@gmail.com writes:
The diff doesn't show enough context to include this comment:
my %parse_alias = (
# multiline formats can be supported in the future
...
I can't be sure the author's intent, but my interpretation is such.
The parsers do not support multiline,
Hi Junio,
On 2015-05-20 23:00, Junio C Hamano wrote:
Sebastian Schuberth sschube...@gmail.com writes:
On Wed, May 20, 2015 at 10:13 PM, Junio C Hamano gits...@pobox.com wrote:
David Aguilar dav...@gmail.com writes:
+ for directory in $(env | grep -Ei '^PROGRAM(FILES(\(X86\))?|W6432)='
On Tue, May 19, 2015 at 5:53 AM, Junio C Hamano gits...@pobox.com wrote:
Yeah, either that, or insert separator only before adding to
something else pattern, i.e.
for (i = 0; i argc; i++) {
if (i)
addch(msg, ' ');
addstr(msg,
On Mon, May 18, 2015 at 10:53 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
On 2015-05-18 15:39, Paul Tan wrote:
diff --git a/t/t5524-pull-msg.sh b/t/t5524-pull-msg.sh
index 8cccecc..eebb8c9 100755
--- a/t/t5524-pull-msg.sh
+++ b/t/t5524-pull-msg.sh
@@ -17,6 +17,9 @@
Hi,
On Tue, May 19, 2015 at 3:02 AM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
Hi Paul,
On 2015-05-18 17:06, Paul Tan wrote:
diff --git a/builtin/pull.c b/builtin/pull.c
index 8982fdf..b305a47 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -209,6 +209,28 @@ static void
Hi,
On Tue, May 19, 2015 at 1:41 AM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
On 2015-05-18 17:05, Paul Tan wrote:
diff --git a/builtin/pull.c b/builtin/pull.c
index 0b771b9..a4d9c92 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -11,16 +11,64 @@
#include argv-array.h
On Tue, May 19, 2015 at 8:48 PM, McHenry, Matt
mmche...@carnegielearning.com wrote:
I've just upgraded my git from 2.0.5 to 2.3.6, and I'm now unable to
run 'git svn fetch' in one of my repositories:
$ git svn fetch
fatal: unordered stage entries in index
This message can be
On Thu, May 21, 2015 at 9:13 AM, Sébastien Guimmara
sebastien.guimm...@gmail.com wrote:
'git help' shows common commands in alphabetical order:
[...]
without any indication of how commands relate to high-level
concepts or each other. Revise the output to explain their relationship
with the
On Thu, May 21, 2015 at 9:31 PM, Duy Nguyen pclo...@gmail.com wrote:
In case an object is not found pack directory
is re-read again, which might cause some increased load on nfs.
has_sha1_file() not finding the object should not happen often..
That last statement is probably very wrong, but I
On Thu, May 21, 2015 at 8:13 PM, steve.nor...@thomsonreuters.com wrote:
So there appears to be a change in 1.8.4.2 that made this issue appear for
me. Looking at the release notes the only thing that I can see that might be
related could be:
* When an object is not found after checking
On Thu, May 21, 2015 at 9:13 AM, Sébastien Guimmara
sebastien.guimm...@gmail.com wrote:
From: Eric Sunshine sunsh...@sunshineco.com
The ultimate goal is for git help to classify common commands by
group. Toward this end, a subsequent patch will add a new common
groups section to
On 05/21/2015 03:48 PM, Eric Sunshine wrote:
On Thu, May 21, 2015 at 9:13 AM, Sébastien Guimmara
sebastien.guimm...@gmail.com wrote:
From: Eric Sunshine sunsh...@sunshineco.com
The ultimate goal is for git help to classify common commands by
group. Toward this end, a subsequent patch will
In setting up some new git servers I was trying to test the performance of some
NFS mounted volumes and when compared to local disk (although this is a
vitualized server so not truly local) cloning to NFS was taking a long time.
Here are some timings:
~ $ time bin/git clone
On Thu, May 21, 2015 at 3:13 PM, steve.nor...@thomsonreuters.com wrote:
[...]
So the questions are:
1) Should I expect a clone to NFS to be that much slower?
2) Is there anything I could do to speed it up (I've tried --bare as that is
what the repositories will be when stored on NFS and
On Thu, May 21, 2015 at 9:55 AM, Sébastien Guimmara
sebastien.guimm...@gmail.com wrote:
On 05/21/2015 03:48 PM, Eric Sunshine wrote:
On Thu, May 21, 2015 at 9:13 AM, Sébastien Guimmara
sebastien.guimm...@gmail.com wrote:
The ultimate goal is for git help to classify common commands by
group.
On Thu, May 21, 2015 at 5:38 PM, Junio C Hamano gits...@pobox.com wrote:
Allen Hubbe alle...@gmail.com writes:
Those are good points. Maybe I shouldn't even mention sendmail at
all, not in the name of the format, and not in the commit message.
What name would be a good name for this format?
On Thu, May 21, 2015 at 09:41:55AM -0700, Junio C Hamano wrote:
Mike Hommey m...@glandium.org writes:
My guess is that rev-walking is tripping on the fact that this repository
has commit dates in random order.
Yeah, that is well known (look for SLOP both in the code and list
archive).
Fredrik Medley fredrik.med...@gmail.com writes:
To allow future extensions, e.g. allowing non-tip sha1, replace the
boolean allow_tip_sha1_in_want variable with the flag-style
allow_request_with_bare_object_name variable.
Signed-off-by: Fredrik Medley fredrik.med...@gmail.com
---
On Thu, May 21, 2015 at 1:03 PM, Philip Oakley philipoak...@iee.org wrote:
+Submodules are not to be confused with remotes, which are meant
+mainly for branches of the same project;
This use of 'branches' didn't work for me. remotes are meant mainly for
branches of the same project ?
Maybe
Depends on why you are running rev-list.
If you want to know if one commit is contained in another, the way
that should work the most reliably is to use merge-base, as the
traversal engine of that command was written not to trust the commit
timestamps but go with the topology alone.
(pardon
Fredrik Medley fredrik.med...@gmail.com writes:
--- a/Documentation/technical/protocol-capabilities.txt
+++ b/Documentation/technical/protocol-capabilities.txt
@@ -260,6 +260,13 @@ If the upload-pack server advertises this capability,
fetch-pack may
send want lines with SHA-1s that exist
On Thu, May 21, 2015 at 10:53 PM, steve.nor...@thomsonreuters.com wrote:
On Thu, May 21, 2015a at 9:31 PM, Duy Nguyen [mailto:pclo...@gmail.com], did
scribble:
In case an object is not found pack directory is re-read again, which
might cause some increased load on nfs.
has_sha1_file()
This format is more simple than the other alias file formats, so it may
be preferred by some users. The format is as follows.
alias: address|alias[, address|alias...]
Aliases are specified one per line. There is no line splitting.
Example:
alice: Alice W Land a...@example.com
For my Perforce to Git migration project, I am creating an empty local
git repo and then running git p4 sync with --branch to bring code from
Perforce into a specific Git branch. I'm going this route because I
need to take two Perforce branches that are similar and put them into
different branches
On Thu, May 21, 2015 at 12:25:57PM -0700, Junio C Hamano wrote:
Note also that the original may dereference branch-merge[0] even if it
is NULL. I think that can't actually happen in practice (we only
allocate branch-merge if we have at least one item to put in it, and
all of the checks of
On Thu, May 21, 2015 at 08:46:43PM -0400, Jeff King wrote:
On Thu, May 21, 2015 at 12:25:57PM -0700, Junio C Hamano wrote:
Note also that the original may dereference branch-merge[0] even if it
is NULL. I think that can't actually happen in practice (we only
allocate branch-merge if
Commit f86a374 (pack-bitmap.c: fix a memleak, 2015-03-30)
noticed that we leak the result bitmap. But we should use
bitmap_free rather than straight free, as the former
remembers to free the bitmap array pointed to by the struct.
Signed-off-by: Jeff King p...@peff.net
---
Sorry, I should have
On Thu, May 21, 2015 at 8:16 PM, Allen Hubbe alle...@gmail.com wrote:
This format is more simple than the other alias file formats, so it may
be preferred by some users. The format is as follows.
alias: address|alias[, address|alias...]
Aliases are specified one per line. There is no line
On Thu, May 21, 2015 at 11:49 PM, Junio C Hamano gits...@pobox.com wrote:
Duy Nguyen pclo...@gmail.com writes:
This message can be improved to show what entries have this problem.
But then I don't see any way to recover the index manually. ls-files
will die too.
Isn't this failure coming
On Thu, May 21, 2015 at 03:59:48PM -0700, Junio C Hamano wrote:
Depends on why you are running rev-list.
If you want to know if one commit is contained in another, the way
that should work the most reliably is to use merge-base, as the
traversal engine of that command was written not to
This format is more simple than the other alias file formats, so it may
be preferred by some users. The format is as follows.
alias: address|alias[, address|alias...]
Aliases are specified one per line. There is no line splitting.
Anything on a line after and including a `#` symbol is
This format is more simple than the other alias file formats, so it may
be preferred by some users. The format is as follows.
alias: address|alias[, address|alias...]
Aliases are specified one per line. There is no line splitting.
Anything on a line after and including a `#` symbol is
On Thu, May 21, 2015 at 11:40 PM, Allen Hubbe alle...@gmail.com wrote:
This format is more simple than the other alias file formats, so it may
be preferred by some users. [...]
Signed-off-by: Allen Hubbe alle...@gmail.com
---
diff --git a/Documentation/git-send-email.txt
On May 21, 2015 9:05 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Thu, May 21, 2015 at 8:16 PM, Allen Hubbe alle...@gmail.com wrote:
This format is more simple than the other alias file formats, so it may
be preferred by some users. The format is as follows.
alias:
Please ignore v3... this is the same as v2 for some reason. I will
resend as v4.
On Thu, May 21, 2015 at 11:35 PM, Allen Hubbe alle...@gmail.com wrote:
This format is more simple than the other alias file formats, so it may
be preferred by some users. The format is as follows.
On Thu, May 21, 2015 at 11:19 PM, Allen Hubbe alle...@gmail.com wrote:
On May 21, 2015 9:05 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Thu, May 21, 2015 at 8:16 PM, Allen Hubbe alle...@gmail.com wrote:
+test_expect_success $PREREQ 'sendemail.aliasfiletype=simple' '
+
Jeff King p...@peff.net writes:
On Thu, May 21, 2015 at 02:14:29PM -0400, Jeff King wrote:
There is a related cleanup I resisted, which is that several call-sites
will call stat_tracking_info, then later look directly at
branch-merge[0]-dst without a check for NULL (fill_tracking_info is
From: Eric Sunshine sunsh...@sunshineco.com
The ultimate goal is for git help to classify common commands by
group. Toward this end, a subsequent patch will add a new common
groups section to command-list.txt preceding the actual command list.
As preparation, teach existing command-list.txt
'git help' shows common commands in alphabetical order:
The most commonly used git commands are:
addAdd file contents to the index
bisect Find by binary search the change that introduced a bug
branch List, create, or delete branches
checkout Checkout a branch or
On Thu, May 21, 2015 at 1:39 PM, Sébastien Guimmara
sebastien.guimm...@gmail.com wrote:
The ultimate goal is for git help to display common commands in
groups rather than alphabetically. As a first step, define the
groups in a new block, and then assign a group to each
common command.
Support sendmail (and postfix) style email aliases in git-send-email.
This is the format of /etc/mail/aliases, documented by `man 5 aliases`.
The man page may be provided by sendmail or postfix on your system, or
by another email service that uses the same configuration file.
See also:
Jeff King p...@peff.net writes:
On Thu, May 21, 2015 at 11:33:58AM -0700, Junio C Hamano wrote:
+static const char *error_buf(struct strbuf *err, const char *fmt, ...)
{
- if (!branch || !branch-merge || !branch-merge[0])
- return NULL;
+ if (err) {
+ va_list
1 - 100 of 124 matches
Mail list logo
