Move the function remove_branches() from builtin/remote.c to refs.c,
rename it to delete_refs(), and make it public.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
builtin/remote.c | 21 +
refs.c | 19 +++
refs.h | 7 +++
3
Add functions to the reference API to
* Delete a bunch of references at once, but *without* failing the
whole transaction if one of the deletions fails. This functionality
is used by `git remote remove` and `git remote prune`.
* Create initial references during `git clone`. (During clone,
git clone uses shortcuts when creating the initial set of
references:
* It writes them directly to packed-refs.
* It doesn't lock the individual references (though it does lock the
packed-refs file).
* It doesn't check for refname conflicts between two new references or
between one new
In initial_ref_transaction_commit(), check for D/F conflicts (i.e.,
the type of conflict that exists between refs/foo and
refs/foo/bar) among the references being created and between the
references being created and any hypothetical existing references.
Ideally, there shouldn't *be* any existing
Change the error message from
Could not remove branch %s
to
Could not remove reference %s
This change makes sense even for the existing caller, which uses the
function to delete remote-tracking branches.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
refs.c | 2 +-
1 file
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
builtin/remote.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/builtin/remote.c b/builtin/remote.c
index f4a6ec9..53b8e13 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -756,8 +756,7 @@ static int
delete_ref() uses a different convention for its old_sha1 parameter
than, say, ref_transaction_delete(): NULL_SHA1 means not to check the
old value. Make this fact a little bit clearer in the code by handling
it in explicit, commented code rather than burying it in a conditional
expression.
Error out if the ref_transaction includes more than one update for any
refname.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
refs.c | 11 +++
1 file changed, 11 insertions(+)
diff --git a/refs.c b/refs.c
index b103a4b..ced4e53 100644
--- a/refs.c
+++ b/refs.c
@@ -4064,12
This string is going to have to be re-internationalized anyway because
of the previous commit. So while we're at it, we might as well convert
it to lower case as per our usual practice.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
refs.c | 2 +-
1 file changed, 1 insertion(+), 1
This will result in errors being emitted for references that can't be
deleted, but that is a good thing.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
builtin/remote.c | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/builtin/remote.c b/builtin/remote.c
It is no longer called from outside of the refs module. Also move its
docstring and change it to imperative voice.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
refs.c | 9 -
refs.h | 11 ---
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/refs.c
On Mon, Jun 8, 2015 at 10:47 AM, Rossella Barletta
rossella.barle...@gmail.com wrote:
So summarizing:
1) Git repository (bare) is on Windows on a shared folder
2) Clone of the repository is on Linux
3) Clone of the repository is on windows
4) I received a bundle made starting by a
New function, extracted from fsck_handle_reflog_ent(). The extra
is_null_sha1() test for the new reference is currently unnecessary, as
reflogs are deleted when the reference itself is deleted. But it
doesn't hurt, either.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
builtin/fsck.c |
Also
* Add a docstring
* Rename the second parameter to old_sha1, to be consistent with the
convention used elsewhere in the refs module
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
cache.h | 2 --
refs.c | 5 +++--
refs.h | 9 +
3 files changed, 12 insertions(+), 4
Please, don't top-post on this list.
Louis-Alexandre Stuber stub...@ensimag.grenoble-inp.fr writes:
Thank you for the feedback. We are trying to apply all of your suggestions,
but we would prefer to rebase the history before doing some of them (like
renaming variables).
About the
On Sun, Jun 7, 2015 at 12:13 PM, Mustafa Kerim Yılmaz mkys...@gmail.com wrote:
I try to download from this url:
https://github.com/msysgit/msysgit/releases/download/Git-1.9.5-preview20150319/Git-1.9.5-preview20150319.exe
It is redirect to amazon aws with url but not responsed:
Previously, if a reflog entry's old or new SHA-1 was not resolvable to
an object, that SHA-1 was silently ignored. Instead, report such cases
as errors.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
builtin/fsck.c | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes:
+test_expect_success 'setup am -3' '
+ rm -fr .git/rebase-apply
I don't think you need this 'rm -fr' since you're going to repeat it at
the beginning of individual tests. But it doesn't harm to keep it just
in case.
With or
Eric Sunshine sunsh...@sunshineco.com writes:
On Fri, Jun 5, 2015 at 12:34 PM, Louis Stuber
stub...@ensimag.grenoble-inp.fr wrote:
git-bisect.sh :
No space before : in english.
create a file if the bisection is in old/new mode, named
BISECT_OLDNEWMODE, so it can easily be seen outside the
Expand test coverage with one or more than two commands done
and with zero, one or more than two commands remaining
---
t/t7512-status-help.sh | 88 ++
1 file changed, 88 insertions(+)
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
git status gives more information during rebase -i, about the list of
command that are done during the rebase. It displays the two last
commands executed and the two next lines to be executed. It also gives
hints to find the whole files in .git directory.
---
I've applied your remarks, the way to
Dear Thomas,
Unfortunatly for me i cannot send the files, since there are
restrictions, but thanks for your offer.
At the moment also configuring the repo with --shared=all is not
helping, but i could try to reproduce the problem with a fake repo
shared between windows and linux and see if i get
Karthik Nayak karthik@gmail.com writes:
+/* Free all memory allocated for ref_array */
+void ref_array_clear(struct ref_array *array)
Is this a private function? If so, then add static. If not, you probably
want to export it in a .h file.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Hello,
I'm Paul Hacker here in Tyler Texas.
We are looking for a software control system to keep track of our changes in
software.
My question is, will GIT work with MS access forms, queries, tables, modules,
etc?
Thanks for any help.
Paul (yes my last name is Hacker!!)
--
To unsubscribe
On 06/08/2015 08:23 PM, Matthieu Moy wrote:
Karthik Nayak karthik@gmail.com writes:
+/* Free all memory allocated for ref_array */
+void ref_array_clear(struct ref_array *array)
Is this a private function? If so, then add static. If not, you probably
want to export it in a .h file.
It
On 06/08/2015 08:23 PM, Matthieu Moy wrote:
Karthik Nayak karthik@gmail.com writes:
+/* Free all memory allocated for ref_array */
+void ref_array_clear(struct ref_array *array)
Is this a private function? If so, then add static. If not, you probably
want to export it in a .h file.
It
On 06/08/2015 08:12 PM, Matthieu Moy wrote:
Karthik Nayak karthik@gmail.com writes:
Make 'symref' a non const char pointer, so that the compiler doesn't
throw an error when we try to free the memory allocated to it.
Casting to non-cost when calling free() is a common pattern. I think it
On 06/07/2015 06:40 PM, Christian Couder wrote:
On Sat, Jun 6, 2015 at 10:03 PM, Karthik Nayak karthik@gmail.com wrote:
This is a follow up series to the one posted here
http://thread.gmane.org/gmane.comp.version-control.git/270922
This patch series adds '--ponints-at', '--merged',
Michael Haggerty mhag...@alum.mit.edu writes:
New function, extracted from fsck_handle_reflog_ent(). The extra
is_null_sha1() test for the new reference is currently unnecessary, as
reflogs are deleted when the reference itself is deleted. But it
doesn't hurt, either.
I think we would crash
On 06/08/2015 04:27 PM, Johannes Schindelin wrote:
On 2015-06-08 08:40, Michael Haggerty wrote:
Previously, if a reflog entry's old or new SHA-1 was not resolvable
to an object, that SHA-1 was silently ignored. Instead, report such
cases as errors.
I like the idea, but I am a bit uncertain
On 06/08/2015 05:07 PM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
New function, extracted from fsck_handle_reflog_ent(). The extra
is_null_sha1() test for the new reference is currently unnecessary, as
reflogs are deleted when the reference itself is deleted. But it
Michael Rappazzo rappa...@gmail.com writes:
A config option 'rebase.instructionFormat' can override the
default 'oneline' format of the rebase instruction list.
Since the list is parsed using the left, right or boundary mark plus
the sha1, they are prepended to the instruction format.
SZEDER Gábor sze...@ira.uka.de writes:
The diff and submodule shortlog appended to the commit message template
by 'git commit --verbose' are not stripped when the commit message
contains an indented scissors line.
When cleaning up a commit message with 'git commit --verbose' or
Karthik Nayak karthik@gmail.com writes:
Make 'symref' a non const char pointer, so that the compiler doesn't
throw an error when we try to free the memory allocated to it.
Casting to non-cost when calling free() is a common pattern. I think it
would make more sense to cast at free() time
On Mon, Jun 8, 2015 at 11:28 AM, Junio C Hamano gits...@pobox.com wrote:
Michael Rappazzo rappa...@gmail.com writes:
A config option 'rebase.instructionFormat' can override the
default 'oneline' format of the rebase instruction list.
Since the list is parsed using the left, right or boundary
Matthieu Moy matthieu@grenoble-inp.fr writes:
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes:
Simplify code by creating a function to transform list of email lists
(comma separated, with aliases ...) into a simple list of valid email
addresses.
I would have found the
Karthik Nayak karthik@gmail.com writes:
On 06/08/2015 08:23 PM, Matthieu Moy wrote:
Karthik Nayak karthik@gmail.com writes:
+/* Free all memory allocated for ref_array */
+void ref_array_clear(struct ref_array *array)
Is this a private function? If so, then add static. If not,
On Mon, Jun 8, 2015 at 4:45 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
Found-to-be-Obviously-Correct-by: Stefan Beller sbel...@google.com ;)
---
builtin/remote.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
A StGit series is a directory containing a series file which begins
with the line:
# This series applies on GIT commit X
where X is the commit ID that the patch series applies on. Every
following line names a patch in the directory to be applied.
Test that git-am, when given
git-mailsplit, which splits mbox patches, will read the patch from stdin
when the filename is - or there are no files listed on the
command-line.
To be consistent with this behavior, teach the StGit patch parser to
read from stdin if the filename is - or no files are listed on the
command-line.
git-am is able to parse StGit and mercurial patches. However, there are no
regression tests in the test suite for these patch formats, and there are some
small bugs as well:
* the mercurial and stgit patch parsers does not support reading from stdin
* the mercurial patch parser parsed the patch
Lex Spoon l...@lexspoon.org writes:
Unless I am reading something wrong, the new_changes variable could
be dropped now. It was needed for the -m version for detecting the
smallest change number that was returned. Otherwise it looks good to
me.
Meaning that I should squash this in to 3/3,
On Mon, 8 Jun 2015 9:45:17 -0500
hack...@suddenlink.net wrote:
[...]
My question is, will GIT work with MS access forms, queries, tables,
modules, etc?
[...]
Git works with files. So in principle it will work with *files*
containing your MS access stuff.
But Git will consider and treat those
Please, include a version number in the subject. git send-email -v2 does
this for you.
Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr writes:
+static void show_rebase_information(struct wt_status *s,
+ struct wt_status_state *state,
+
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes:
Matthieu Moy matthieu@grenoble-inp.fr writes:
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes:
Simplify code by creating a function to transform list of email lists
(comma separated, with aliases ...) into a
Quoting Junio C Hamano gits...@pobox.com:
SZEDER Gábor sze...@ira.uka.de writes:
The diff and submodule shortlog appended to the commit message template
by 'git commit --verbose' are not stripped when the commit message
contains an indented scissors line.
When cleaning up a commit message
Precisely, Junio, that's what I had in mind. The patch with the two
lines deleted LGTM.
--
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
An example of the line in a mercurial patch that specifies the date of
the commit would be:
# Date 1433753301 25200
where the first number is the number of seconds since the unix epoch (in
UTC), and the second number is the offset of the timezone, in second s
west of UTC (negative if the
By default, an StGit patch separates the subject from the commit message
and headers as follows:
$subject
From: $author_name $author_email
$message
---
$diffstats
We test git-am's ability to detect such a patch as an StGit patch, and
its ability to be
git-mailsplit, which splits mbox patches, will read the patch from stdin
when the filename is - or there are no files listed on the
command-line.
To be consistent with this behavior, teach the mercurial patch parser to
read from stdin if the filename is - or no files are listed on the
Hi Michael,
On 2015-06-08 17:09, Michael Haggerty wrote:
On 06/08/2015 04:27 PM, Johannes Schindelin wrote:
On 2015-06-08 08:40, Michael Haggerty wrote:
Previously, if a reflog entry's old or new SHA-1 was not resolvable
to an object, that SHA-1 was silently ignored. Instead, report such
Max Kirillov m...@max630.net writes:
It is an allowed compile-time option to build git without iconv
support. Resulting build almost always functions correctly, and
never displays that it is missing anything, but reencode_string_len()
just never modifies its input.
Correct.
This gives
Karthik Nayak karthik@gmail.com writes:
I put these two together as they are trivial changes.
Either I could reword the commit message or split the commit.
I'd split the commit. Actually, even though it's only a small comment
change, it's not so trivial in the sense that one needs a good
Will Palmer wmpal...@gmail.com writes:
- * For future extension, ':/!' is reserved. If you want to match a message
- * beginning with a '!', you have to repeat the exclamation mark.
+ * For negative-matching, prefix the pattern-part with '!-', like: ':/!-WIP'.
+ *
+ * For a literal '!'
101 - 154 of 154 matches
Mail list logo
