Eric Sunshine sunsh...@sunshineco.com writes:
+rebase.checkLevel::
+ If set to warn, git rebase -i will print a warning if some
+ commits are removed (i.e. a line was deleted) or if some
+ commits appear more than one time (e.g. the same commit is
+ picked twice),
Remi Galan Alfonso remi.galan-alfo...@ensimag.grenoble-inp.fr writes:
Ideally, I think we should do a sanity check before starting the rebase,
and error out if we encounter an invalid command, a command that should
be followed by a valid sha1 and does not, ...
But currently, we do the
Junio C Hamano gits...@pobox.com writes:
The reason why we have the verify the input thing, allow users to
supply multiple --to/--cc/etc., and do not try to split the
addresses ourselves is because we want to avoid mistakenly splitting
a single address like the above into two and producing
Ideally, I think we should do a sanity check before starting the rebase,
and error out if we encounter an invalid command, a command that should
be followed by a valid sha1 and does not, ...
But currently, we do the verification while applying commands, and I
don't think there's anything
refspec - git's guilty little secret. Let's milk the guilt.
git branch refspec ought work in a similar way to
git fetch refspec
One syntax to rule them all. Or something.
I just learned how git fetch uses refspecs and how this can just as
well apply to tags to create remote tags
phillip venit, vidit, dixit 01.06.2015 17:10:
Hi,
#: sequencer.c:661
#, c-format
msgid git %s: failed to read the index
-msgstr git %s: Fehler beim Lesen der Staging-Area
+msgstr git %s: Fehler beim Lesen des Indexes
Now we have to decide whether we flex Index like a foreign
Matthieu Moy matthieu@grenoble-inp.fr writes:
Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr writes:
Check if commits were removed (i.e. a line was deleted) and print
warnings or abort git rebase according to the value of the
configuration variable rebase.checkLevel.
Christian Stimming venit, vidit, dixit 01.06.2015 22:00:
Am Montag, 1. Juni 2015, 12:34:31 schrieb Stefan Beller:
On Mon, Jun 1, 2015 at 12:26 PM, Christian Stimming stimm...@tuhh.de
wrote:
index concept, my explanation routinely says This concept is called
'index' but it has nothing to do
On Tue, Jun 2, 2015 at 7:02 AM, Stefan Beller sbel...@google.com wrote:
diff --git a/string-list.h b/string-list.h
index d3809a1..88c18e9 100644
--- a/string-list.h
+++ b/string-list.h
@@ -19,6 +19,7 @@ struct string_list {
#define STRING_LIST_INIT_DUP { NULL, 0, 0, 1, NULL }
void
On Fri, May 8, 2015 at 9:09 PM, Jeff King p...@peff.net wrote:
On Fri, May 08, 2015 at 07:56:28PM -0400, Eric Sunshine wrote:
I spent some time downloading old Xcode releases and poking through
the packages. Xcode 3.2.x seems to be the last in the Xcode 3 series,
and none of the Xcode 3.2.x
Remi Galan Alfonso remi.galan-alfo...@ensimag.grenoble-inp.fr
writes:
In this case it is not true, because of the infile and outfile being
identical. However sort does have a -o (-output) that I missed that
allows avoiding using echo or writing in another file; I'm correcting
with this.
Even
Dear Author,
You can upload your invited paper for our conferences in Salerno, Italy, June
27-29, 2015: www. wseas. org until June 7, 2015
(by the way, you can also upload your papers for our conferences in Zakynthos
Island, Greece until June 30, 2015)
As you remember we had invited you as
On Tue, Jun 02, 2015 at 02:18:57PM -0400, Eric Sunshine wrote:
The use of 'expr' in this new test is decidedly different from existing
instances which merely check if `uname -R` matches a particular single
digit and a period. If the new test took the same approach, it would
have to match
Stefan Beller sbel...@google.com writes:
Subject: [RFCv2 04/16] upload-pack-2: Implement the version 2 of upload-pack
Nit; s/I/i/, to match others in the series, I think.
In upload-pack-2 we send each capability in its own packet buffer.
Signed-off-by: Stefan Beller sbel...@google.com
---
On Tue, Jun 2, 2015 at 11:48 AM, Andre Bossert an...@anbos.de wrote:
Hello,
we are moving from ClearCase to Git (MSYS 1.9.5 at Win7x64) and trying to
configure one special merge tool DiffMerge for IBM Rhapsody files. So
we've added our merge tool (script) to gitconfig. The merge script calls
On Tue, Jun 02, 2015 at 02:44:13PM -0400, Jeff King wrote:
+ ifeq ($(shell expr $(shell expr $(uname_R) : '\([0-9][0-9]*\)\.')
'=' 11),1)
Do you need to spawn two shells? It seems like:
$(shell expr `expr $(uname_R) : '\([0-9][0-9]*\)'` '=' 11),1)
Oops, I missed the trailing '.'
On Tue, Jun 2, 2015 at 8:10 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Tue, Jun 2, 2015 at 5:42 AM, Duy Nguyen pclo...@gmail.com wrote:
On Tue, Jun 2, 2015 at 7:02 AM, Stefan Beller sbel...@google.com wrote:
diff --git a/string-list.h b/string-list.h
index d3809a1..88c18e9 100644
---
On Tue, Jun 2, 2015 at 2:58 AM, Duy Nguyen pclo...@gmail.com wrote:
On Tue, Jun 2, 2015 at 7:02 AM, Stefan Beller sbel...@google.com wrote:
Signed-off-by: Stefan Beller sbel...@google.com
---
Notes:
name it to_free
transport.c | 17 +++--
1 file changed, 15 insertions(+),
On Tue, Jun 02, 2015 at 02:18:58PM -0400, Eric Sunshine wrote:
As an optimization, strbuf will take advantage of getdelim() if
available, so add a configure check which defines HAVE_GETDELIM if
found.
Thanks, looks good.
-Peff
--
To unsubscribe from this list: send the line unsubscribe git
On Mac OS X, getdelim() first became available with Xcode 4.1[1], which
was released the same day as OS X 10.7 Lion, so assume getdelim()
availability from 10.7 onward. (As of this writing, OS X is at 10.10
Yosemite.)
According to Wikipedia[2], 4.1 was also available for download by paying
As an optimization, strbuf will take advantage of getdelim() if
available, so add a configure check which defines HAVE_GETDELIM if
found.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
Tested on:
* OS X 10.10.3 Yosemite with Xcode 6.3.2
* OS X 10.5.8 Leopard with Xcode 3.1
* Linux
*
As an optimization, strbuf takes advantage of getdelim() when available
(HAVE_GETDELIM). Currently, HAVE_GETDELIM is defined automatically only
for Linux. This patch series updates config.mak.uname to define
HAVE_GETDELIM on Mac OS X (Darwin) based upon version (uname -r), and
more generally via a
Hello,
we are moving from ClearCase to Git (MSYS 1.9.5 at Win7x64) and trying
to configure one special merge tool DiffMerge for IBM Rhapsody files.
So we've added our merge tool (script) to gitconfig. The merge script
calls the DiffMerge for some file-extensions (sbs, rpy etc.). It works
in
Stefan Beller sbel...@google.com writes:
Signed-off-by: Stefan Beller sbel...@google.com
---
The change in 2/16 to extract something into a helper was sort-of
guessable without any comment (i.e. perhaps it will gain new callers
in later patches), but a change like this needs to hint why this
Heiko Voigt hvo...@hvoigt.net writes:
This submodule configuration cache allows us to lazily read .gitmodules
configurations by commit into a runtime cache which can then be used to
easily lookup values from it. Currently only the values for path or name
are stored but it can be extended for
On Tue, Jun 2, 2015 at 3:04 PM, Jeff King p...@peff.net wrote:
On Tue, Jun 02, 2015 at 02:44:13PM -0400, Jeff King wrote:
+ ifeq ($(shell expr $(shell expr $(uname_R) : '\([0-9][0-9]*\)\.')
'=' 11),1)
Do you need to spawn two shells? It seems like:
$(shell expr `expr $(uname_R) :
On Tue, Jun 02, 2015 at 03:57:44PM -0400, Eric Sunshine wrote:
Oops, I missed the trailing '.' in the regex there, and it probably
needs double-quotes in case the inner expr fails to match anything.
Which is messy considering the double quotes already surrounding
$(uname_R). Suggestions?
Paul Tan pyoka...@gmail.com writes:
However, certain functions in git-pull assume that the positional
parameters do not contain any options. Fix this by making git-pull
handle git-fetch's options as well at the option parsing stage.
Good.
--
To unsubscribe from this list: send the line
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes:
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index d412f6b..0472182 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
...
+am.threeWay::
+ By default, git-am will fail if the patch does
Overall this round looks sensible, modulo minor nits.
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
On 06/02/2015 07:28 PM, Stefan Beller wrote:
On Tue, Jun 2, 2015 at 8:57 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
NULL_SHA1 is never a valid value for a reference. If a loose reference
has that value, mark it as broken.
Why check NULL_SHA1 and not the nearly 2^160 other SHA-1s that
Michael Haggerty mhag...@alum.mit.edu writes:
NULL_SHA1 is never a valid value for a reference. If a loose reference
has that value, mark it as broken.
Why check NULL_SHA1 and not the nearly 2^160 other SHA-1s that are
also invalid in a given repository? Because (a) it is cheap to test
for
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes:
Prepare a configuration section for the git am documentation.
Remove the part related to the am.keepcr configuration variable in the
description of the --keepcr option and place the description of the
am.keepcr configuration variable
On Tue, Jun 2, 2015 at 4:01 PM, Jeff King p...@peff.net wrote:
On Tue, Jun 02, 2015 at 03:57:44PM -0400, Eric Sunshine wrote:
Oops, I missed the trailing '.' in the regex there, and it probably
needs double-quotes in case the inner expr fails to match anything.
Which is messy considering
On Mon, Jun 1, 2015 at 8:02 PM, Stefan Beller sbel...@google.com wrote:
Signed-off-by: Stefan Beller sbel...@google.com
---
diff --git a/t/t5544-fetch-2.sh b/t/t5544-fetch-2.sh
new file mode 100755
index 000..beee46c
--- /dev/null
+++ b/t/t5544-fetch-2.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
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
Matthieu Moy matthieu@grenoble-inp.fr writes:
Junio C Hamano gits...@pobox.com writes:
I recall fetch --tags was updated to become your --tags-also by
e66ef7ae (Merge branch 'mh/fetch-tags-in-addition-to-normal-refs',
2013-12-12). Perhaps we should do the same on the push side.
Would
Stefan Beller sbel...@google.com writes:
No function uses the return value of get_remote_heads, so we don't want
to confuse readers by it.
Signed-off-by: Stefan Beller sbel...@google.com
---
This is somewhat a sad change, as the returned value is designed to
be useful if caller wants to
As an optimization, strbuf will take advantage of getdelim() if
available, so add a configure check which defines HAVE_GETDELIM if
found.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
configure.ac | 6 ++
1 file changed, 6 insertions(+)
diff --git a/configure.ac b/configure.ac
On Mac OS X, getdelim() first became available with Xcode 4.1[1], which
was released the same day as OS X 10.7 Lion, so assume getdelim()
availability from 10.7 onward. (As of this writing, OS X is at 10.10
Yosemite.)
According to Wikipedia[2], 4.1 was also available for download by paying
This series updates config.mak.uname to define HAVE_GETDELIM on Mac OS X
when appropriate, and adds a configure check for the same.
Changes since v1[1]:
patch 1/2 -- optimize OS X version recognition:
* Use `...` for 'expr' invocation to extract digits from $(uname_R),
thus only a fork(),
On Tue, Jun 2, 2015 at 2:18 PM, Junio C Hamano gits...@pobox.com wrote:
Why?
To have all options required for selecting the capabilities
together in one struct.
Currently there are independent variables used in a few places for this
(fetchpack.c: lines 296 - 309, which is where I also got the
Stefan Beller sbel...@google.com writes:
Signed-off-by: Stefan Beller sbel...@google.com
---
This may go unrelated to this series as well.
Yeah, this can come before this series as a good independent
clean-up.
Documentation/technical/pack-protocol.txt | 6 +++---
1 file changed, 3
On Tue, Jun 2, 2015 at 2:55 PM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller sbel...@google.com writes:
Signed-off-by: Stefan Beller sbel...@google.com
---
Notes:
A minor issue I am unsure about here is the
line
transport-smart_options-transport_version)
which
Stefan Beller sbel...@google.com writes:
On Tue, Jun 2, 2015 at 2:18 PM, Junio C Hamano gits...@pobox.com wrote:
Why?
To have all options required for selecting the capabilities
together in one struct.
No need to explain in the e-mail, as that won't be kept in our
history, unless you write
On PowerPC Mac OS X (10.5.8 Leopard with Xcode 3.1), system header
/usr/include/ppc/param.h[1] pollutes the preprocessor namespace with a
macro generically named MASK. This conflicts with the same-named macro
in ewah/bitmap.c.
[1]: Included indirectly via:
git-compat-util.h -
Junio C Hamano gits...@pobox.com writes:
Stefan Beller sbel...@google.com writes:
Signed-off-by: Stefan Beller sbel...@google.com
---
This may go unrelated to this series as well.
Yeah, this can come before this series as a good independent
clean-up.
I'll pick this up and queue (with
Eric Sunshine sunsh...@sunshineco.com writes:
On PowerPC Mac OS X (10.5.8 Leopard with Xcode 3.1), system header
/usr/include/ppc/param.h[1] pollutes the preprocessor namespace with a
macro generically named MASK. This conflicts with the same-named macro
in ewah/bitmap.c.
[1]: Included
Stefan Beller sbel...@google.com writes:
Signed-off-by: Stefan Beller sbel...@google.com
---
Why?
remote.h | 14 ++
1 file changed, 14 insertions(+)
diff --git a/remote.h b/remote.h
index d5242b0..16cacfe 100644
--- a/remote.h
+++ b/remote.h
@@ -56,6 +56,20 @@ struct
Stefan Beller sbel...@google.com writes:
Instead of calling get_remote_heads as a first command during the
protocol exchange, we need to have fine grained control over the
capability negotiation in version 2 of the protocol.
Introduce get_remote_capabilities, which will just listen to
Stefan Beller sbel...@google.com writes:
Signed-off-by: Stefan Beller sbel...@google.com
---
Notes:
name it to_free
transport.c | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/transport.c b/transport.c
index 651f0ac..b49fc60 100644
---
On Tue, Jun 2, 2015 at 2:37 PM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller sbel...@google.com writes:
Signed-off-by: Stefan Beller sbel...@google.com
---
Notes:
name it to_free
transport.c | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff
Stefan Beller sbel...@google.com writes:
Hmph, so everybody else thinks it is interacting with 'upload-pack',
and this is the only function that knows it is actually talking with
'upload-pack-2'?
Yes.
I am wondering why there isn't a separate helper function that
munges
On Tue, Jun 2, 2015 at 2:17 PM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller sbel...@google.com writes:
No function uses the return value of get_remote_heads, so we don't want
to confuse readers by it.
Signed-off-by: Stefan Beller sbel...@google.com
---
This is somewhat a sad
Stefan Beller sbel...@google.com writes:
On Tue, Jun 2, 2015 at 2:17 PM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller sbel...@google.com writes:
No function uses the return value of get_remote_heads, so we don't want
to confuse readers by it.
Signed-off-by: Stefan Beller
Stefan Beller sbel...@google.com writes:
Signed-off-by: Stefan Beller sbel...@google.com
---
Why?
When adding a new thing that nobody uses yet, please explain what it
is used for and how it would help the callers in what way to help
reviewers.
connect.c | 28
Stefan Beller sbel...@google.com writes:
Signed-off-by: Stefan Beller sbel...@google.com
---
Notes:
A minor issue I am unsure about here is the
line
transport-smart_options-transport_version)
which could be prevented if we always set the transport_version
in
rebase learned to stash changes when it encounters a dirty work tree, but
git pull --rebase does not.
Only verify if the working tree is dirty when rebase.autostash is not
enabled.
---
git-pull.sh | 5 -
t/t5520-pull.sh | 17 +
2 files changed, 21 insertions(+), 1
On Tue, Jun 2, 2015 at 11:59 AM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller sbel...@google.com writes:
Subject: [RFCv2 04/16] upload-pack-2: Implement the version 2 of upload-pack
Nit; s/I/i/, to match others in the series, I think.
In upload-pack-2 we send each capability in its
On Wed, 3 Jun 2015, chenxitwo wrote:
Hi Konrad Scherer,
Thanks for your reply.
But git mirror is helpless for me.
I have an idea about two repos' sync. However there is a problem with
this is how to prevent other usrs' push operation.
Details as follows:
Hi Konrad Scherer,
Thanks for your reply.
But git mirror is helpless for me.
I have an idea about two repos' sync. However there is a problem with
this is how to prevent other usrs' push operation.
Details as follows:
Team A, B have their own git server
On Tue, Jun 02, 2015 at 05:15:42PM -0400, Eric Sunshine wrote:
This series updates config.mak.uname to define HAVE_GETDELIM on Mac OS X
when appropriate, and adds a configure check for the same.
Changes since v1[1]:
patch 1/2 -- optimize OS X version recognition:
* Use `...` for 'expr'
Hi,
Some comments which may not necessarily be correct.
On Wed, Jun 3, 2015 at 5:55 AM, Kevin Daudt m...@ikke.info wrote:
rebase learned to stash changes when it encounters a dirty work tree, but
git pull --rebase does not.
Only verify if the working tree is dirty when rebase.autostash is
On Tue, Jun 02, 2015 at 03:15:09PM -0700, Junio C Hamano wrote:
The alternative is to rename MASK in ewah/bitmap.c to something less
generic, resulting in a slightly more noisy patch. I chose the #undef
approach since it's a relatively common idiom to #undef a macro before
#defining it in
On 06/02/2015 07:34 PM, Remi Lespinet wrote:
[]
Signed-off-by: Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr
---
Documentation/git-am.txt | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index
When we do create a new empty git repo using git init or create a
orphan branch and do a git log then I am getting an error saying that
fatal: bad default revision 'HEAD'
Well the error should have been something like no commits to show
either the branch is orphan / you didn't make any commits in
Hi,
thank you for responding this fast. I would suggest providing this information
as an additional parameter (like %A %O %B and %L) maybe %P. I think this would
cost about 2 lines of code und wouldn't be any performance issue I assume. If I
got it right in the source code, the information is
On Tue, Jun 2, 2015 at 12:49 AM, Stefan Beller sbel...@google.com wrote:
However the client side with builtin/fetch, builtin/fetch-pack, fetch-pack
is a bit of a mystery to me, as I cannot fully grasp the difference between
* connect.{h,c}
* remote.{h.c}
* transport.{h.c}
there. All of it
On 6/2/15, Zenaan Harkness z...@freedbms.net wrote:
refspec - git's guilty little secret. Let's milk the guilt.
git branch refspec ought work in a similar way to
git fetch refspec
One syntax to rule them all. Or something.
I just learned how git fetch uses refspecs and how this can just as
On Tue, Jun 2, 2015 at 7:02 AM, Stefan Beller sbel...@google.com wrote:
Signed-off-by: Stefan Beller sbel...@google.com
---
Notes:
name it to_free
transport.c | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/transport.c b/transport.c
index
On Tue, Jun 2, 2015 at 7:02 AM, Stefan Beller sbel...@google.com wrote:
builtin/fetch-pack.c | 22 ++-
fetch-pack.c | 109
+++
fetch-pack.h | 1 +
3 files changed, 80 insertions(+), 52 deletions(-)
And the companion
Frawley, Sarah sarah.frawley at intel.com writes:
Correct when I referred to 10+ layers I meant nested repositories
which make up a large hierarchy. Some
repositories are repeated across the hierarchy. We check-out
submodules to tag versions (as opposed
to master branch). If we need to
On Tue, Jun 2, 2015 at 7:02 AM, Stefan Beller sbel...@google.com wrote:
@@ -127,6 +128,10 @@ int cmd_fetch_pack(int argc, const char **argv, const
char *prefix)
args.update_shallow = 1;
continue;
}
+ if
On Wed, May 27, 2015 at 01:20:11PM +, Frawley, Sarah wrote:
Thanks Heiko for getting back to me.
Correct when I referred to 10+ layers I meant nested repositories
which make up a large hierarchy. Some repositories are repeated
across the hierarchy. We check-out submodules to tag
Heiko Voigt hvoigt at hvoigt.net writes:
What exactly is the feature of using a tag instead of a commit id like
it
is currently the default? A tag should be nailed to a commit anyway or
does it change in your situation? In that case I would say it is a
branch.
Cheers Heiko
In the Tags and heads view, the list of refs is globally sorted.
The list of local refs (heads) is separated by the remote refs. This
change re-orders the view toi be: local refs, remote refs tracked by
local refs, remote refs, tags, and then other refs
Signed-off-by: Michael Rappazzo
In a codebase with a large number of remote branches, the Tags and heads
view can split the local refs around the name remotes. I wanted to make
this view more useful as a quick view of the refs that are important to me
at the moment (I would say the branches that I am actively looking at).
On Sun, May 31, 2015 at 4:18 PM, Paul Tan pyoka...@gmail.com wrote:
On Tue, May 19, 2015 at 9:04 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
Also, I wonder if something like this would do the job:
spec = parse_fetch_refspec(1, refspec);
if (spec-dst)
On Sat, May 30, 2015 at 03:25:31PM -0500, Robert Dailey wrote:
On Sat, May 30, 2015 at 2:54 PM, Junio C Hamano gits...@pobox.com wrote:
Robert Dailey rcdailey.li...@gmail.com writes:
On Sat, May 30, 2015 at 12:04 PM, Junio C Hamano gits...@pobox.com wrote:
Robert Dailey
Thanks for getting back to me Heiko
To comment on the below. Adding some automated way of setting a relative path
via git submodule add would be really useful.
Is this something that is possible in a new git release?
As regards using the command below.
git submodule update --init --recursive
Since there were no other comments than style fixes here is another
iteration. The last iteration can be found here:
http://article.gmane.org/gmane.comp.version-control.git/269611
I found there is a merge conflict with master so I rebased this series
to master.
The interdiff to last iteration
We remove the extracted functions and directly parse into and read out
of the cache. This allows us to have one unified way of accessing
submodule configuration values specific to single submodules. Regardless
whether we need to access a configuration from history or from the
worktree.
This submodule configuration cache allows us to lazily read .gitmodules
configurations by commit into a runtime cache which can then be used to
easily lookup values from it. Currently only the values for path or name
are stored but it can be extended for any value needed.
It is expected that
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes:
Add the am.threeWay configuration variable to use the -3 or --3way
option of git am by default. When am.threeway is set and not desired
for a specific git am command, the --no-3way option can be used to
override it.
Signed-off-by:
Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr writes:
+test_expect_success 'drop' '
Please, be more descriptive in the first argument of
test_expect_success. It's usually a good thing to say not only what the
test stresses but also what the expected behavior is.
test_expect_success
To enable unambiguous parsing of abbreviated options, bundled short
options, separate form options and to provide consistent usage help, use
git-rev-parse --parseopt for option parsing. With this, simplify the
option parsing code.
Signed-off-by: Paul Tan pyoka...@gmail.com
---
Notes:
v2
This is a re-roll of [v1]. Thanks Johannes for the reviews last round.
Previous versions:
[v1] http://thread.gmane.org/gmane.comp.version-control.git/269249
This patch series is based on pt/pull-tests.
While parsing the command-line arguments, git-pull stops parsing at the
first unrecognized
While parsing the command-line arguments, git-pull stops parsing at the
first unrecognized option, assuming that any subsequent options are for
git-fetch, and can thus be kept in the shell's positional parameters
list, so that it can be passed to git-fetch via the expansion of $@.
However,
On Tue, Jun 2, 2015 at 9:52 AM, Remi LESPINET
remi.lespi...@ensimag.grenoble-inp.fr wrote:
Matthieu Moy matthieu@grenoble-inp.fr writes:
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes:
+if test $(git config --bool --get am.threeWay) = true
+then
+threeway=t
+fi
I
Hi,
On Tue, Jun 2, 2015 at 9:37 PM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes:
+if test $(git config --bool --get am.threeWay) = true
+then
+threeway=t
+fi
I think you missed Paul's remark on this:
On Tue, Jun 02, 2015 at 09:45:39AM +, Mattias Vannergård wrote:
I am planning on using submodules in a way, where I can specify a
configuration of repos with tags, and rebuild the submodule tree, when
selecting a configuration on the top level.
But, yet I have found no easy way to
On Tue, Jun 2, 2015 at 3:24 PM, Remi Lespinet
remi.lespi...@ensimag.grenoble-inp.fr wrote:
Add the am.threeWay configuration variable to use the -3 or --3way
option of git am by default. When am.threeway is set and not desired
for a specific git am command, the --no-3way option can be used to
request-pull prints incorrectly warn messages about not found commits
and man pages don't say
anything about todays changed behaviour. People are confused and try
look for errors at wrong places.
At least these should be fixed/modified.
Warn massage says that commit can't be found ar remote,
We should not die when reading the submodule config cache since the user
might not be able to get out of that situation when the configuration is
part of the history.
We should handle this condition later when the value is about to be
used.
Signed-off-by: Heiko Voigt hvo...@hvoigt.net
---
On Fri, May 29, 2015 at 7:05 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Wed, May 27, 2015 at 9:33 AM, Paul Tan pyoka...@gmail.com wrote:
@@ -128,13 +190,32 @@ static void am_next(struct am_state *state)
*/
+/**
+ * parse_options() callback that validates and sets opt-value to the
This is one step towards using the new configuration API. We just
extract these functions to make replacing the actual code easier.
Signed-off-by: Heiko Voigt hvo...@hvoigt.net
---
submodule.c | 142 +---
1 file changed, 97 insertions(+),
Matthieu Moy matthieu@grenoble-inp.fr : writes
+test_expect_success 'drop' '
Please, be more descriptive in the first argument of
test_expect_success. It's usually a good thing to say not only what the
test stresses but also what the expected behavior is.
test_expect_success 'drop
Add the am.threeWay configuration variable to use the -3 or --3way
option of git am by default. When am.threeway is set and not desired
for a specific git am command, the --no-3way option can be used to
override it.
Signed-off-by: Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr
---
Create a setup for git am -3 in a separate test instead of creating
this setup each time.
This prepares for the next commit which will use this setup as well.
Signed-off-by: Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr
---
I removed the function creating temporary branch for now, because
Instead of removing a line to remove the commit, you can use the
command drop (just like pick or edit). It has the same effect as
deleting the line (removing the commit) except that you keep a visual
trace of your actions, allowing a better control and reducing the
possibility of removing a commit
1 - 100 of 126 matches
Mail list logo
