Karthik Nayak karthik@gmail.com writes:
+int parse_opt_merge_filter(const struct option *opt, const char *arg, int
unset)
+{
+ struct ref_filter *rf = opt-value;
+ unsigned char sha1[20];
+
+ rf-merge = opt-long_name[0] == 'n'
+ ? REF_FILTER_MERGED_OMIT
+
Karthik Nayak karthik@gmail.com writes:
+/*
+ * API for filtering a set of refs. The refs are provided and iterated
+ * over using the for_each_ref_fn(). The refs are stored into and filtered
+ * based on the ref_filter_cbdata structure.
+ */
+int filter_refs(int
Karthik Nayak karthik@gmail.com writes:
In 'tag -l' we have '--points-at' option which lets users
list only tags which point to a particular commit, Implement
s/,/./ ?
this option in 'ref-filter.{c,h}' so that the other commands
s/the//
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Based on a cursory review of the git code I get the impression that
GNU diff and git 'diff' do not share any code for the possible diff
algorithms. I'm in particularly curious more about the default myers
algorithm. I can take time to do a precise code review of the
algorithms used on both GNU
Karthik Nayak karthik@gmail.com writes:
+ if(filter-merge_commit) {
space after if.
@@ -938,7 +991,13 @@ void ref_array_clear(struct ref_array *array)
*/
int filter_refs(int (for_each_ref_fn)(each_ref_fn, void *), struct
ref_filter_cbdata *data)
{
- return
On 06/08/2015 11:01 PM, Matthieu Moy wrote:
Karthik Nayak karthik@gmail.com writes:
+/*
+ * Given a ref (sha1, refname) see if it points to a one of the sha1s
+ * in a sha1_array.
+ */
+static int match_points_at(struct sha1_array *points_at, const unsigned char
*sha1,
+
Karthik Nayak karthik@gmail.com writes:
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', '--no-merged' and
'--contain' options to 'ref-filter' and uses these options in
Paul Tan pyoka...@gmail.com writes:
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
Mike Rappazzo rappa...@gmail.com writes:
On Mon, Jun 8, 2015 at 11:28 AM, Junio C Hamano gits...@pobox.com wrote:
This is optional, but I still wonder why the command line cannot be
more like this, though:
format=$(git config --get rebase.insnFormat)
git log --format=%H
Karthik Nayak karthik@gmail.com writes:
+ * Given a refname, return 1 if the refname matches with one of the patterns
You can match refname with pattern. But refname matches the
pattern without with, I think.
I am not a native, though.
+ * while the pattern is a pathname like
Karthik Nayak karthik@gmail.com writes:
On 06/08/2015 10:38 PM, Matthieu Moy wrote:
Karthik Nayak karthik@gmail.com writes:
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -1129,7 +56,7 @@ int cmd_for_each_ref(int argc, const char
**argv, const char *prefix)
On Mon, Jun 8, 2015 at 10:50 AM, Konrád Lőrinczi klorin...@gmail.com wrote:
I would like to group some files, so I can list group files together,
list group changes together, filter by group for staging, also order
by group.
It seems, there is no such feature in GIT I would need, so I send it
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
On 06/08/2015 11:05 PM, Matthieu Moy wrote:
Karthik Nayak karthik@gmail.com writes:
Add the '--points-at' option provided by 'ref-filter'. The
option lets the user to pick only refs which point to a particular
commit.
Add Documentation for the same.
... but no test?
No haven't
Karthik Nayak karthik@gmail.com writes:
+int parse_opt_merge_filter(const struct option *opt, const char *arg, int
unset)
+{
+ struct ref_filter *rf = opt-value;
+ unsigned char sha1[20];
+
+ rf-merge = opt-long_name[0] == 'n'
+ ? REF_FILTER_MERGED_OMIT
+
Karthik Nayak karthik@gmail.com writes:
+#define OPT_CONTAINS(filter, h) \
+ { OPTION_CALLBACK, 0, contains, (filter), N_(commit), (h), \
+ PARSE_OPT_LASTARG_DEFAULT, \
+ parse_opt_with_commit, (intptr_t) HEAD \
+ }
+#define OPT_WITH(filter, h) \
+ {
On 06/08/2015 11:23 PM, Matthieu Moy wrote:
Karthik Nayak karthik@gmail.com writes:
Add the '--merged' and '--no-merged' options provided by 'ref-filter'.
The '--merged' option lets the user to only list refs merged into the
named commit. The '--no-merged' option lets the user to only list
On 06/08/2015 11:21 PM, Matthieu Moy wrote:
Karthik Nayak karthik@gmail.com writes:
+ if(filter-merge_commit) {
space after if.
@@ -938,7 +991,13 @@ void ref_array_clear(struct ref_array *array)
*/
int filter_refs(int (for_each_ref_fn)(each_ref_fn, void *), struct
Karthik Nayak karthik@gmail.com writes:
diff --git a/parse-options-cb.c b/parse-options-cb.c
index be8c413..a4d294d 100644
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -4,6 +4,7 @@
#include commit.h
#include color.h
#include string-list.h
+#include sha1-array.h
...
+int
On 06/08/2015 11:28 PM, Matthieu Moy wrote:
Karthik Nayak karthik@gmail.com writes:
+int parse_opt_merge_filter(const struct option *opt, const char *arg, int
unset)
+{
+ struct ref_filter *rf = opt-value;
+ unsigned char sha1[20];
+
+ rf-merge = opt-long_name[0] == 'n'
On 06/08/2015 11:30 PM, Matthieu Moy wrote:
Karthik Nayak karthik@gmail.com writes:
In 'tag -l' we have '--points-at' option which lets users
list only tags which point to a particular commit, Implement
s/,/./ ?
this option in 'ref-filter.{c,h}' so that the other commands
s/the//
Please use a subject that is shorter and looks more like others on this list.
On Sun, Jun 7, 2015 at 9:54 PM, Ariel Faigon github.2...@yendor.com wrote:
Junio,
This is my 1st time doing this, sorry.
I hope this satisfies the git Sign Off procedure.
The above lines should not be there,
Karthik Nayak karthik@gmail.com writes:
+/*
+ * Given a ref (sha1, refname) see if it points to a one of the sha1s
+ * in a sha1_array.
+ */
+static int match_points_at(struct sha1_array *points_at, const unsigned char
*sha1,
+const char *refname)
+{
+
On 06/08/2015 11:32 PM, Junio C Hamano wrote:
Karthik Nayak karthik@gmail.com writes:
+ * Given a refname, return 1 if the refname matches with one of the patterns
You can match refname with pattern. But refname matches the
pattern without with, I think.
I am not a native, though.
+
On 06/08/2015 11:45 PM, Junio C Hamano wrote:
Karthik Nayak karthik@gmail.com writes:
+/*
+ * API for filtering a set of refs. The refs are provided and iterated
+ * over using the for_each_ref_fn(). The refs are stored into and filtered
+ * based on the ref_filter_cbdata structure.
+ */
Karthik Nayak karthik@gmail.com writes:
Add the '--points-at' option provided by 'ref-filter'. The
option lets the user to pick only refs which point to a particular
commit.
Add Documentation for the same.
Based-on-patch-by: Jeff King p...@peff.net
Mentored-by: Christian Couder
Matthieu Moy matthieu@grenoble-inp.fr writes:
To me, the series is ready now, and I don't think re-rolling it would be
a good time investment. Plus, I spent time reviewing this series and
with my proposal I'd need to review a relatively different one.
Ok, thanks.
--
To unsubscribe from
Michael Haggerty mhag...@alum.mit.edu writes:
Thanks for all the comments. Taking them into consideration, I suggest
changing the last commit message to
...
Since the only comments were about this one commit message,...
Yeah, this round looked good otherwise. Will amend in-place.
Thanks.
Karthik Nayak karthik@gmail.com writes:
Add the '--points-at' option provided by 'ref-filter'. The
option lets the user to pick only refs which point to a particular
commit.
Add Documentation for the same.
... but no test?
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To
Karthik Nayak karthik@gmail.com writes:
Add the '--merged' and '--no-merged' options provided by 'ref-filter'.
The '--merged' option lets the user to only list refs merged into the
named commit. The '--no-merged' option lets the user to only list refs
not merged into the named commit.
Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr writes:
+ *,$NAME_BAD)
+ die $(gettext 'git bisect $NAME_BAD' can take only one
argument.) ;;
H, doesn't this break i18n the big way?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a
Paul Tan pyoka...@gmail.com writes:
Even when a merge conflict occurs with am --3way, the index will be
modified with the results of any successfully merged files. These
changes to the index will not be reverted with a
git read-tree --reset -u HEAD ORIG_HEAD, as git read-tree will not be
On 06/08/2015 10:51 PM, Matthieu Moy wrote:
Junio C Hamano gits...@pobox.com writes:
Matthieu Moy matthieu@grenoble-inp.fr writes:
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
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.
tcsh users who happen to have 'set noclobber' elsewhere in their ~/.tcshrc or
~/.cshrc startup files get a 'File exist' error, and the tcsh completion file
doesn't get generated/updated. Adding a `!` in the redirect works correctly
for both clobber (default) and 'set noclobber' users.
Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr writes:
We create a file BISECT_TERMS in the repository .git to be read during a
bisection. The fonctions to be changed if we add new terms are quite
few.
In git-bisect.sh :
check_and_set_terms
bisect_voc
In bisect.c :
On Mon, Jun 8, 2015 at 11:43 AM, Luke Diamand l...@diamand.org wrote:
On 08/06/15 18:18, Junio C Hamano wrote:
Lex Spoon l...@lexspoon.org writes:
Precisely, Junio, that's what I had in mind. The patch with the two
lines deleted LGTM.
Thanks, will do.
I don't think we're quite there
When not looking for a regression during a bisect but for a fix or a
change in another given property, it can be confusing to use 'good'
and 'bad'.
This patch introduce `git bisect new` and `git bisect old` as an
alternative to 'bad' and good': the commits which have a certain
property must be
Max Kirillov m...@max630.net writes:
User, in theory, can be not the same person who builds, or
can be not aware that the case needs recoding.
Because you can pretty much say the same for build with iconv
enabled, I think that line of argument is futile. The users do not
have control over
Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr writes:
---
wt-status.c | 30 +++---
1 file changed, 11 insertions(+), 19 deletions(-)
Hmmm, it obviously does not break anything but it is not obvious why
this is a good change.
Is it that you wanted to have
git checkout pathspec can be used to revert changes in the working tree.
Signed-off-by: Torsten Bögershausen tbo...@web.de
---
My first attempt to improve the documentation
Documentation/git-checkout.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
Junio C Hamano gits...@pobox.com 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 simple list of valid
Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr writes:
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
Paul Tan pyoka...@gmail.com writes:
Since 7b3b7e3 (am --abort: keep unrelated commits since the last failure
and warn, 2010-12-21), git-am would refuse to rewind HEAD if commits
were made since the last git-am failure. This check was implemented in
safe_to_abort(), which checked to see if
Hi.
On Mon, Jun 08, 2015 at 09:16:16AM -0700, Junio C Hamano wrote:
Max Kirillov m...@max630.net writes:
This gives undesirable result that returned data or even
data written into repository is incorrect and user is not
aware about it.
I do not necessarily agree with that. The user knows
Paul Tan pyoka...@gmail.com writes:
When git-am is first run on an unborn branch, no ORIG_HEAD is created.
As such, any applied commits will remain even after a git am --abort.
I think this answered my question on 4/6; that may indicate that
these two are either done in a wrong order or
To add new tags like old/new and have keywords less confusing, the
first step is to avoid hardcoding the keywords.
The default mode is still bad/good.
Signed-off-by: Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr
Signed-off-by: Louis Stuber stub...@ensimag.grenoble-inp.fr
Signed-off-by:
---
bisect.c| 2 +-
t/t6030-bisect-porcelain.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bisect.c b/bisect.c
index 10f5e57..de92953 100644
--- a/bisect.c
+++ b/bisect.c
@@ -743,7 +743,7 @@ static void handle_bad_merge_base(void)
We create a file BISECT_TERMS in the repository .git to be read during a
bisection. The fonctions to be changed if we add new terms are quite
few.
In git-bisect.sh :
check_and_set_terms
bisect_voc
In bisect.c :
handle_bad_merge_base
Signed-off-by: Antoine Delaite
Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr writes:
When not looking for a regression during a bisect but for a fix or a
change in another given property, it can be confusing to use 'good'
and 'bad'.
This patch introduce `git bisect new` and `git bisect old` as an
alternative to
Difference between v1 and v2 of this patch:
- Fixed indentation from spaces to match the existing style
- Changed the prepended sha1 from short (%h) to long (%H)
- Used bash variable default when the config option is not present
Michael Rappazzo (1):
git-rebase--interactive.sh: add
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.
Signed-off-by: Michael Rappazzo rappa...@gmail.com
---
-Original Message-
From: git-ow...@vger.kernel.org [mailto:git-ow...@vger.kernel.org] On
Behalf Of Konstantin Khomoutov
Sent: June 8, 2015 12:15 PM
To: hack...@suddenlink.net
Cc: git@vger.kernel.org
Subject: Re: GIT for Microsoft Access projects
On Mon, 8 Jun 2015 9:45:17 -0500
Michael Rappazzo rappa...@gmail.com writes:
Difference between v1 and v2 of this patch:
- Fixed indentation from spaces to match the existing style
- Changed the prepended sha1 from short (%h) to long (%H)
- Used bash variable default when the config option is not present
On Mon, Jun 8, 2015 at 4:45 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
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 --
On Mon, Jun 08, 2015 at 06:00:09PM +0200, Johannes Schindelin wrote:
I like the idea, but I am a bit uncertain whether it would constitute
too backwards-incompatible a change to make this an error. I think
it could be argued both ways: it *is* an improvement, but it could
also possibly
On Mon, Jun 8, 2015 at 4:45 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
This will result in errors being emitted for references that can't be
deleted, but that is a good thing.
This sounds a bit like hand-waving to me. Trust me, I'm an engineer!.
Signed-off-by: Michael Haggerty
On Mon, Jun 8, 2015 at 4:45 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
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
Karthik Nayak karthik@gmail.com writes:
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -1129,7 +56,7 @@ int cmd_for_each_ref(int argc, const char **argv, const
char *prefix)
memset(ref_cbdata, 0, sizeof(ref_cbdata));
ref_cbdata.filter.name_patterns = argv;
Hi Peff,
On 2015-06-08 18:56, Jeff King wrote:
On Mon, Jun 08, 2015 at 06:00:09PM +0200, Johannes Schindelin wrote:
I like the idea, but I am a bit uncertain whether it would constitute
too backwards-incompatible a change to make this an error. I think
it could be argued both ways: it
On Mon, Jun 8, 2015 at 8:48 AM, Paul Tan pyoka...@gmail.com wrote:
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
On 06/08/2015 10:38 PM, Matthieu Moy wrote:
Karthik Nayak karthik@gmail.com writes:
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -1129,7 +56,7 @@ int cmd_for_each_ref(int argc, const char **argv, const
char *prefix)
memset(ref_cbdata, 0, sizeof(ref_cbdata));
On Mon, Jun 08, 2015 at 09:57:04AM -0700, Stefan Beller wrote:
On Mon, Jun 8, 2015 at 4:45 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
This will result in errors being emitted for references that can't be
deleted, but that is a good thing.
This sounds a bit like hand-waving to me.
On 06/08/2015 10:45 PM, Matthieu Moy wrote:
Karthik Nayak karthik@gmail.com writes:
Version four of this patch can be found here :
http://www.mail-archive.com/git@vger.kernel.org/msg70280.html
v5 : http://www.mail-archive.com/git@vger.kernel.org/msg70888.html
Changes in v5:
*
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
Before this change, t7063.17 fails. The actual action though happens at
t7063.16 where the entry two is added back to index after being
removed in the .13. Here we expect a directory invalidate at .16 and
none at .17 where untracked cache is
On Mon, Jun 8, 2015 at 4:45 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
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.
Although the previous patch and
On Mon, Jun 8, 2015 at 4:45 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
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
On Sat, Jun 6, 2015 at 4:46 AM, Paul Tan pyoka...@gmail.com wrote:
Currently git-am attempts to clean up the index/worktree when skipping or
aborting, but does not do it very well:
* While it discards conflicted index entries, it does not remove any other
modifications made to the index due
Matthieu Moy matthieu@grenoble-inp.fr writes:
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
Karthik Nayak karthik@gmail.com writes:
Version four of this patch can be found here :
http://www.mail-archive.com/git@vger.kernel.org/msg70280.html
v5 : http://www.mail-archive.com/git@vger.kernel.org/msg70888.html
Changes in v5:
*Rename functions to better suit the code.
*
Junio C Hamano gits...@pobox.com writes:
Matthieu Moy matthieu@grenoble-inp.fr writes:
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
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
'--cleanup=scissors' the code is careful and triggers
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
'--cleanup=scissors' the code is careful and triggers
You are required to click on the link to verify your email account
because we are upgrading our
webmail.http://distilleries-provence.com/webalizer/eupdate/
Webmail Technical Support
Copyright 2012. All Rights Reserved
--
To unsubscribe from this list: send the line unsubscribe git in
the body of
Rearrange/rewrite it somewhat to fit its new environment.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Documentation/technical/api-lockfile.txt | 220 --
lockfile.h | 310 ++-
2 files changed, 266
We have spent a lot of effort defining the state diagram for lockfiles
and ensuring correct, race-resistant cleanup in all circumstances. Now
let's abstract out part of the lockfile module so that it can be used
to clean up arbitrary temporary files.
This patch series
* implements a new tempfile
I followed all your indications (created a small fake repo on windows,
cloned it and playing with bundles) and in this case everything
works.On windows i dont have any problem and i used the version 1.9.5.
Then i created a clone of my original repo, again on Windows (since my
original one is a
Use the tempfile module to ensure that the socket file gets deleted on
program exit.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
credential-cache--daemon.c | 26 ++
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/credential-cache--daemon.c
A lot of work went into defining the state diagram for lockfiles and
ensuring correct, race-resistant cleanup in all circumstances.
Most of that infrastructure can be applied directly to *any* temporary
file. So extract a new tempfile module from the lockfile module.
Reimplement lockfile on top
First beef up the sanity checking in get_locked_file_path() to match
that in commit_lock_file(). Then rewrite commit_lock_file() to use
get_locked_file_path() for its pathname computation.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
lockfile.c | 30 +-
1
Allow an existing file to be registered with the tempfile-handling
infrastructure; in particular, arrange for it to be deleted on program
exit.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
tempfile.c | 9 +
tempfile.h | 8
2 files changed, 17 insertions(+)
diff
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
builtin/gc.c | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/builtin/gc.c b/builtin/gc.c
index 6e18d35..4dc21b2 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -200,6 +200,7 @@ static const char
This makes the next step easier.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
tempfile.c | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/tempfile.c b/tempfile.c
index bde7fd3..f76bc07 100644
--- a/tempfile.c
+++ b/tempfile.c
@@ -31,11 +31,8 @@ static
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
read-cache.c | 37 +
1 file changed, 5 insertions(+), 32 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index 3e49c49..4f7b70f 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -2137,54 +2137,27 @@
main() is responsible for cleaning up the socket in the case of
errors, so it is reasonable to also make it responsible for cleaning
it up when there are no errors. This change also makes the next step
easier.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
credential-cache--daemon.c |
Remove the following functions and rewrite their callers to use the
equivalent tempfile functions directly:
* fdopen_lock_file() - fdopen_tempfile()
* reopen_lock_file() - reopen_tempfile()
* close_lock_file() - close_tempfile()
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
shallow.c | 34 ++
1 file changed, 6 insertions(+), 28 deletions(-)
diff --git a/shallow.c b/shallow.c
index 59ee321..311ba9b 100644
--- a/shallow.c
+++ b/shallow.c
@@ -209,50 +209,28 @@ int
Add several functions for creating temporary files with
automatically-generated names, analogous to mkstemps(), but also
arranging for the files to be deleted on program exit.
The functions are named according to a pattern depending how they
operate. They will be used to replace many places in
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
diff.c | 29 +++--
1 file changed, 7 insertions(+), 22 deletions(-)
diff --git a/diff.c b/diff.c
index 7500c55..742a842 100644
--- a/diff.c
+++ b/diff.c
@@ -2,6 +2,7 @@
* Copyright (C) 2005 Junio C Hamano
*/
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
builtin/gc.c | 24
1 file changed, 4 insertions(+), 20 deletions(-)
diff --git a/builtin/gc.c b/builtin/gc.c
index 4dc21b2..a340e89 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -43,20 +43,7 @@ static struct
On 06/03/2015 11:20 PM, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
On Wed, Jun 03, 2015 at 11:51:43AM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
On Wed, Jun 03, 2015 at 03:51:59PM +0200, Michael Haggerty wrote:
NULL_SHA1 is used to indicate of invalid SHA-1
I would like to group some files, so I can list group files together,
list group changes together, filter by group for staging, also order
by group.
It seems, there is no such feature in GIT I would need, so I send it
as suggestion.
We can call this feature as Group files or Label files (labeling
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 branch, i pull the bundle on
the same branch on Windows, i push the changes , everything ok
5) I
Hi Michael,
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 whether it would constitute too
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 series easier to read if this refactoring came
earlier
Hi Michael,
On 2015-06-08 08:40, Michael Haggerty wrote:
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.
This patch
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.
This patch series is also available from my GitHub account [1], branch
fsck-reflog-entries.
Michael
[1] https://github.com/mhagger/git
Karthik Nayak karthik@gmail.com writes:
In 'grab_single_ref()' remove the extra count variable 'cnt' and
use the variable 'grab_cnt' of structure 'grab_ref_cbdata' directly
instead.
Change comment in 'struct ref_sort' to reflect changes in code.
I don't see how the comment change is
The following functions are no longer used from outside the refs
module:
* lock_packed_refs()
* add_packed_ref()
* commit_packed_refs()
* rollback_packed_refs()
So make these functions private.
This is an important step, because it means that nobody outside of the
refs module needs to know the
Some functions from the refs module were still declared in cache.h.
Move them to refs.h.
Add some parameter names where they were missing.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
archive.c | 1 +
builtin/blame.c | 1 +
builtin/fast-export.c | 1 +
1 - 100 of 154 matches
Mail list logo
