Sun He sunheeh...@gmail.com writes:
Signed-off-by: Sun He sunheeh...@gmail.com
---
The tmpname is uninitialized and it should a bug
Please ignore the former patches about this with wrong format.
I am sorry to cause a jam in your inbox. ^_^
In the end, I wanna thank Michael Haggerty who
Michael Haggerty mhag...@alum.mit.edu writes:
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Reviewed-by: Junio C Hamano gits...@pobox.com
Thanks.
cache.h | 13 +
replace_object.c | 7 +++
2 files changed, 20 insertions(+)
diff --git a/cache.h b
Ralf Thielow ralf.thie...@gmail.com writes:
The part string_list of the name of function
pretty_print_string_list is just an implementation
detail. The function pretty-prints command names so
rename it to pretty_print_cmdnames.
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com
---
Just
Jens Lehmann jens.lehm...@web.de writes:
Good point. What about this?
Documentation/git-submodule.txt | 13 +++--
git-submodule.sh| 2 +-
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-submodule.txt
Duy Nguyen pclo...@gmail.com writes:
On Sat, Mar 1, 2014 at 1:58 AM, Junio C Hamano gits...@pobox.com wrote:
Karsten Blees karsten.bl...@gmail.com writes:
If you are on a case-insensitive filesystem, or work on a cross-platform
project, ensure that you avoid ambiguous refs. Problem solved
Jonathan Nieder jrnie...@gmail.com writes:
To make life saner for translators, this should be either
untranslatable or a single multi-line string, I suspect:
diff --git i/builtin/branch.c w/builtin/branch.c
index b4d7716..972040c 100644
--- i/builtin/branch.c
+++ w/builtin/branch.c
@@
Duy Nguyen pclo...@gmail.com writes:
On Thu, Feb 20, 2014 at 6:26 AM, Junio C Hamano gits...@pobox.com wrote:
Is there a reason not to do just an equivalent of
#define git_pathdup mkpathdup
and be done with it? Am I missing something?
They have a subtle difference: mkpathdup() calls
Lee Hopkins leer...@gmail.com writes:
I went ahead and took a stab at a solution. My solution is more
aggressive than a warning, I actually prevent the creation of
ambiguous refs. My changes are also in refs.c, which may not be
appropriate, but it seemed like the natural place.
I have never
Duy Nguyen pclo...@gmail.com writes:
On Wed, Feb 26, 2014 at 5:44 AM, Junio C Hamano gits...@pobox.com wrote:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
git_path() soon understands the path given to it. Some paths abc may
become def while other ghi may become ijk. We don't want
Jeff King p...@peff.net writes:
On Fri, Feb 28, 2014 at 10:45:39AM -0800, Junio C Hamano wrote:
Exactly. The two features (bitmaps and .keep) are not compatible with
each other, so you have to prioritize one. If you are using static .keep
files, you might want them to continue being
Michael Haggerty mhag...@alum.mit.edu writes:
On 02/28/2014 10:29 AM, Dmitry S. Dolzhenko wrote:
Thank you for your remarks. In this patch I tried to take them into account.
Dmitry S. Dolzhenko (11):
builtin/pack-objects.c: change check_pbase_path() to use ALLOC_GROW()
bundle.c: change
Jeff King p...@peff.net writes:
I realize that I just bikeshedded on subject lines for half a page, and
part of me wants to go kill myself in shame. But I feel like I see the
technique misapplied often enough that maybe some guidance is merited.
Thanks. What I queued read like these:
$ git
Faiz Kothari faiz.of...@gmail.com writes:
Signed-off-by: Faiz Kothari faiz.of...@gmail.com
---
Implemented write_or_die.c:strbuf_write_or_die() and used in relevant places
to substitute write_or_die(). I spotted other places where strbuf can be used
in place of buf[MAX_PATH] but that would
Eric Sunshine sunsh...@sunshineco.com writes:
On Sat, Mar 1, 2014 at 7:51 AM, He Sun sunheeh...@gmail.com wrote:
2014-03-01 19:21 GMT+08:00 Faiz Kothari faiz.of...@gmail.com:
diff --git a/remote-curl.c b/remote-curl.c
index 10cb011..dee8716 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@
Jacopo Notarstefano jacopo.notarstef...@gmail.com writes:
Here my proposal differs in that I have no way of knowing which label
is good and which label is bad: I blindly accept two distinct labels
and bisect with those. I gave an example of this behaviour above.
I think you fundamentally
Michael Haggerty mhag...@alum.mit.edu writes:
-if (!starts_with(buf, author )) {
+if (!skip_prefix(buf, author )) {
If this is the only change, there is not much point, is there? How does
this help? Perhaps there is some way to take advantage of the
difference
Sun He sunheeh...@gmail.com writes:
'pack_tmp_name' is the subject of the utime() check, so report it in the
warning, not the uninitialized 'tmpname'
Signed-off-by: Sun He sunheeh...@gmail.com
---
Changing the subject and adding valid information as tutored by
Eric Sunshine.
Thanks
Eric Sunshine sunsh...@sunshineco.com writes:
diff --git a/branch.c b/branch.c
index 723a36b..ca4e824 100644
--- a/branch.c
+++ b/branch.c
@@ -50,7 +50,7 @@ static int should_setup_rebase(const char *origin)
void install_branch_config(int flag, const char *local, const char *origin,
Simon Ruderich si...@ruderich.org writes:
Most distributions don't require Term::Readkey as dependency,
leaving the user to wonder why the setting doesn't work.
Signed-off-by: Simon Ruderich si...@ruderich.org
Thanks, but is it true that interactive.singlekey requries
Term::ReadKey?
The
Siddharth Goel siddharth98...@gmail.com writes:
Helped-by: Eric Sunshine sunsh...@sunshineco.com
Signed-off-by: Siddharth Goel siddharth98...@gmail.com
---
Added a space after colon in the subject as compared to previous
patch [PATCH v2].
[PATCH v2]:
[CC'ing the submodule area experts.]
Henri GEIST geist.he...@laposte.net writes:
This new option prevent git submodule add|update to clone the missing
submodules with the --separate-git-dir option.
Then the submodule will be regular repository and their gitdir will not
be placed in the
Tanay Abhra tanay...@gmail.com writes:
In record_author_date() parse_gpg_output() ,using skip_prefix() instead of
starts_with() is more elegant and abstracts away the details.
Avoid subjective judgement like more elegant when justifying your
change; you are not your own judge.
The caller of
Jeff King p...@peff.net writes:
On Mon, Mar 03, 2014 at 10:13:47AM -0800, Junio C Hamano wrote:
Or the flip side: if the user wants to use .keep, we should drop
bitmaps. My point is that we do not know which way the user wants to
go, so we should not tie the options together.
Hmph. I
Jeff King p...@peff.net writes:
On Fri, Feb 28, 2014 at 12:04:19PM +0900, Brian Gesiak wrote:
From: modocache modoca...@gmail.com
Both your emailed patches have this, which is due to your author name
not matching your sending identity. You probably want to set user.name,
or if you already
Jeff King p...@peff.net writes:
Most callbacks would convert to a query system in a pretty
straightforward way, but some that have side effects might be tricky.
Converting them all may be too large for a GSoC project, but I think you
could do it gradually:
1. Convert the parser to read
Eric Sunshine sunsh...@sunshineco.com writes:
On Mon, Mar 3, 2014 at 1:31 PM, Junio C Hamano gits...@pobox.com wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
On Sat, Mar 1, 2014 at 7:51 AM, He Sun sunheeh...@gmail.com wrote:
2014-03-01 19:21 GMT+08:00 Faiz Kothari faiz.of...@gmail.com
Michael Haggerty mhag...@alum.mit.edu writes:
This might be a reason that -NUM is a bad idea.
Or perhaps -NUM should fail with an error message if any of the last
NUM commits are merges. In that restricted scenario (which probably
accounts for 99% of rebases), -NUM is equivalent to
Matthieu Moy matthieu@grenoble-inp.fr writes:
Michael Haggerty mhag...@alum.mit.edu writes:
Or perhaps -NUM should fail with an error message if any of the last
NUM commits are merges. In that restricted scenario (which probably
accounts for 99% of rebases), -NUM is equivalent to
Michael Haggerty mhag...@alum.mit.edu writes:
Based on my experience so far as a first-time Google Summer of Code
mentor, I just wrote a blog article containing some hopefully useful
advice for students applying to the program. Please note that this is
my personal opinion only and doesn't
Junio C Hamano gits...@pobox.com writes:
Siddharth Goel siddharth98...@gmail.com writes:
Helped-by: Eric Sunshine sunsh...@sunshineco.com
Signed-off-by: Siddharth Goel siddharth98...@gmail.com
---
Added a space after colon in the subject as compared to previous
patch [PATCH v2].
[PATCH
Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru writes:
Use ALLOC_GROW() instead inline code in
diffstat_add() and diff_q()
...instead of open coding it in... may read better.
Signed-off-by: Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru
---
diff.c | 12 ++--
1 file changed, 2
Dmitry S. Dolzhenko (14):
builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path()
bundle.c: use ALLOC_GROW() in add_to_ref_list()
cache-tree.c: use ALLOC_GROW() in find_subtree()
commit.c: use ALLOC_GROW() in register_commit_graft()
diff.c: use ALLOC_GROW()
Eric Sunshine sunsh...@sunshineco.com writes:
On Mon, Mar 3, 2014 at 5:24 AM, Ilya Bobyr ilya.bo...@gmail.com wrote:
We used to show (missing ) next to tests skipped because they are
specified in GIT_SKIP_TESTS. Use (matched by GIT_SKIP_TESTS) instead.
Bikeshedding: That's pretty verbose.
Eric Sunshine sunsh...@sunshineco.com writes:
On Mon, Mar 3, 2014 at 5:24 AM, Ilya Bobyr ilya.bo...@gmail.com wrote:
This is a counterpart to GIT_SKIP_TESTS. Mostly useful when debugging.
To be grammatically similar to GIT_SKIP_TESTS, perhaps name it GIT_RUN_TESTS?
I actually do not like
David Kastrup d...@gnu.org writes:
How about a function body of
do {
if (!*prefix)
return str;
} while (*str++ == *prefix++);
return NULL;
I'm not too fond of while (1) and tend to use for (;;) instead, but that
may again partly
Eric Sunshine sunsh...@sunshineco.com writes:
That new message in patch #2 says not in GIT_TEST_ONLY, but isn't
(excluded) also applicable to that case? Is it important to be able
to distinguish between the two excluded reasons?
An obvious solution is not to *have* two reasons in the first
Max Horn m...@quendi.de writes:
On 03.03.2014, at 20:43, Junio C Hamano gits...@pobox.com wrote:
Tanay Abhra tanay...@gmail.com writes:
@@ -1193,9 +1194,9 @@ static void parse_gpg_output(struct signature_check
*sigc)
for (i = 0; i ARRAY_SIZE(sigcheck_gpg_status); i
Ilya Bobyr ilya.bo...@gmail.com writes:
It might be that we are looking at different use cases, as you are
talking about whole test suits.
I do not think so.
I do not see anything prevents you from saying
GIT_SKIP_TESTS='t !t.1 !t.4'
to specify test-pieces in individual
Jacopo Notarstefano jacopo.notarstef...@gmail.com writes:
Redirection operators should have a space before them, but not after them.
Signed-off-by: Jacopo Notarstefano jacopo.notarstef...@gmail.com
---
Looks obviously harmless ;-)
Thanks.
--
To unsubscribe from this list: send the line
Ilya Bobyr ilya.bo...@gmail.com writes:
While it could be done, it looks less obvious than this:
GIT_TEST_ONLY='1 4' ./t0001-init.sh
If you are thinking about affecting only one test, then you
shouldn't be mucking with environment variables in the first place,
primarily because running:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
Before cdab485 (upload-pack: delegate rev walking in shallow fetch to
pack-objects - 2013-08-16) upload-pack does not write to the source
repository. cdab485 starts to write $GIT_DIR/shallow_XX if it's a
shallow fetch, so the source repo
From: Ilya Bobyr ilya.bo...@gmail.com
Date: Thu, 27 Feb 2014 22:51:37 -0800
We already replace old SHA with the clipboard content for the mouse
paste event. It seems reasonable to do the same when pasting from
keyboard.
Signed-off-by: Ilya Bobyr ilya.bo...@gmail.com
---
* Paul? I do not use
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
If the option spec is
-NUM Help string
then rev-parse will accept and parse -([0-9]+) and return -NUM $1
Even though the hardcoded NUM token initially gave me a knee-jerk
Yuck reaction, that literal option name is very unlikely to be
desired
Michael Haggerty mhag...@alum.mit.edu writes:
... All of the following seem to make sense:
git rebase --edit COMMIT
A long-form for the -e option we have been talking about.
It is unfortunately that this spelling sounds like the
--edit option on git commit
...@savoirfairelinux.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
* Forwarding to the i18n coordinator. I don't do French, but this
seems trivially correct.
po/fr.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/po/fr.po b/po/fr.po
index e10263f..0b9d59e
Michael Haggerty mhag...@alum.mit.edu writes:
On 03/03/2014 07:31 PM, Junio C Hamano wrote:
That is a very good sign why this change is merely a code-churn and
not an improvement, isn't it? We know (and any strbuf user should
know) that -buf and -len are the ways to learn the pointer
Ilya Bobyr ilya.bo...@gmail.com writes:
On 3/4/2014 12:29 AM, Junio C Hamano wrote:
...
then you
shouldn't be mucking with environment variables in the first place,
primarily because running:
$ GIT_TEST_ONLY='1 4' make test
to run test .1 and .4 of all the test scripts would
Ilya Bobyr ilya.bo...@gmail.com writes:
Built-in commands can specify names for option arguments, that are shown
when usage text is generated for the command. sh based commands should
be able to do the same.
Option argument name hint is any text that comes after [*=?!] after the
argument
benefit from knowing the string that follows
the prefix.
By using skip_prefix(), we can do both at the same time.
Helped-by: Max Horn m...@quendi.de
Helped-by: Junio C Hamano gits...@pobox.com
Helped-by: Michael Haggerty mhag...@alum.mit.edu
Signed-off-by: Tanay Abhra tanay...@gmail.com
Signed
Krzesimir Nowak krzesi...@endocode.com writes:
It might be possible (in Gerrited setups) to have local branches
outside refs/heads/, like for example in following fetch config:
[remote origin]
url = ssh://u...@example.com/my-project
fetch = +refs/heads/*:refs/remotes/origin/*
Max Horn m...@quendi.de writes:
+buf = ident_line;
if (split_ident_line(ident,
- buf + strlen(author ),
- line_end - (buf + strlen(author ))) ||
+ buf,
+
Jeff King p...@peff.net writes:
When we are creating a pack to send to a remote, we should
make sure that we are not respecting grafts or replace refs.
Otherwise, we may end up sending a broken pack to the other
side that does not contain all objects (either omitting them
entirely, or using
Michael Haggerty mhag...@alum.mit.edu writes:
while (*path) {
- const char *slash;
struct cache_tree_sub *sub;
+ const char *slash = strchr(path, '/');
- slash = strchr(path, '/');
if (!slash)
Find places where we scan a string twice unnecessarily, once with
strchr() and then with strlen(), e.g.
const char *colon = strchr(name, ':');
int namelen = colon ? colon - name : strlen(name);
and rewrite such a pattern using strchrnul() as appropriate.
The above example can
at the same time.
Helped-by: Max Horn m...@quendi.de
Helped-by: Junio C Hamano gits...@pobox.com
Helped-by: Michael Haggerty mhag...@alum.mit.edu
Signed-off-by: Tanay Abhra tanay...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
Do not add the last when sending; I never signed-off
Junio C Hamano gits...@pobox.com writes:
+found = skip_prefix(buf, sigcheck_gpg_status[i].check + 1);
+if(!found) {
Missing SP between the control keyword and parenthesized expression
the keyword uses.
I've fixed this (and the broken indentation) locally and queued
Michael Haggerty mhag...@alum.mit.edu writes:
Isn't the above a strchrnul()?
Oh, cool, I never realized that this GNU extension was blessed for use
in Git. Will change.
We do have our own fallbacks for non-glibc platforms, so it should
be safe.
Combining a freestanding decl with
Brian Gesiak modoca...@gmail.com writes:
No test asserts that git branch -u refs/heads/my-branch my-branch
emits a warning. Add a test that does so.
Signed-off-by: Brian Gesiak modoca...@gmail.com
---
t/t3200-branch.sh | 8
1 file changed, 8 insertions(+)
diff --git
What's cooking in git.git (Mar 2014, #01; Tue, 4)
--
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
A handful of GSoC warm-up microprojects
Junio C Hamano gits...@pobox.com writes:
Michael Haggerty mhag...@alum.mit.edu writes:
I really wish we could mix declarations with statements because I think
it is a big help to readability.
...
Unfortunately, I think we are in violent disagreement.
After re-reading the above, I realize
Andrew Wong andrew.k...@gmail.com writes:
On Wed, Feb 26, 2014 at 3:38 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Andrew Wong wrote:
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -909,7 +909,8 @@ static int suggest_conflicts(int renormalizing)
fclose(fp);
Jeff King p...@peff.net writes:
On Tue, Mar 04, 2014 at 12:52:18PM -0800, Junio C Hamano wrote:
I do not recall any past discussion on this topic, and searching the
archive only shows people echoing what I said above. Is this something
we've promised to work in the past?
The history lesson
Jeff King p...@peff.net writes:
But I have not thought hard about it, so maybe there is a good reason
not to (it is a little weird just because the resulting index is a
partial application of the patch).
Originally .rej was a deliberate attempt to be not very Git but
more like 'patch', so I
Jeff King p...@peff.net writes:
On Wed, Mar 05, 2014 at 10:49:24AM -0800, Junio C Hamano wrote:
... the plan, at least in my mind, has always been exactly that: grafts
were a nice little attempt but is broken---if you really wanted to
muck with the history without rewriting (which is still
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
core.worktree::
Set the path to the root of the working tree.
+ If GIT_COMMON_DIR environment variable is set, core.worktree
+ is ignored and not used for determining the root of working tree.
Just thinking aloud to see if I got
Duy Nguyen pclo...@gmail.com writes:
If only there is a way to pass this info without a temporary
file. Multiplexing it to pack-objects' stdin should work. It may be
ugly, but it's probably the safest way.
Wait it does not look that ugly. We can feed --shallow SHA1 lines
before sending
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
+ if (get_device_or_die(path) != get_device_or_die(get_git_dir())) {
+ strbuf_reset(sb);
+ strbuf_addf(sb, %s/locked, sb_repo.buf);
+ write_file(sb.buf, 1, located on a different file system\n);
+
Jeff King p...@peff.net writes:
On Wed, Mar 05, 2014 at 11:18:17AM -0800, Junio C Hamano wrote:
Given that we discourage grafts strongly and replace less so
(but still discourage it), telling the users that biting the bullet
and rewriting the history is _the_ permanent solution, I think
Jeff King p...@peff.net writes:
types, we simply look for an identifier at the start of the
line that contains a (, meaning it is either a function
definition or a function call, and then not containing ;
which would indicate it is a call or declaration.
It is not worth worrying about:
Jeff King p...@peff.net writes:
We can't fully process the refspecs until we have talked to the other
side, because they may involve matching refs from the remote; I don't
think git even really looks at them until after we've connected.
But I think there are some obvious cases, like a bogus
Andrew Wong andrew.k...@gmail.com writes:
... merge hints in the future as well.
I actually wish we did not have to add any hints in the first place.
Having one advice config/variable
for every single situation seems a bit overkill, and we would end up
with too many variables.
That goes
Vincenzo di Cicco enzodici...@gmail.com writes:
But: why the decision to support the Blob Pattern instead of the
Regular Expressions?
s/Blob/glob/;
Matching pathnames using fnmatch/glob is a fine UNIX tradition;
because we generally consider refnames also as pathname-like
things, we use
Sun He sunheeh...@gmail.com writes:
Replacing memcpy with hashcpy is more directly and elegant.
Can we justify the change without being subjective?
Leave ppc/sha1.c alone, as it is an isolated component.
Pull cache.h(actually ../cache.h) in just for one memcpy
there is not proper.
That is
Jiang Xin worldhello@gmail.com writes:
2014-03-05 2:40 GMT+08:00 Junio C Hamano gits...@pobox.com:
From: Sandy Carter sandy.car...@savoirfairelinux.com
Date: Mon, 3 Mar 2014 09:55:53 -0500
Add missing leading dash to proposed commands in french output when
using the command:
git
tanay abhra tanay...@gmail.com writes:
On Wed, Mar 5, 2014 at 3:41 AM, Junio C Hamano gits...@pobox.com wrote:
Junio C Hamano gits...@pobox.com writes:
+found = skip_prefix(buf, sigcheck_gpg_status[i].check + 1);
+if(!found) {
Missing SP between the control
Christian Couder chrisc...@tuxfamily.org writes:
Implement the logic to process trailers from stdin and arguments.
At the beginning trailers from stdin are in their own in_tok
doubly linked list, and trailers from arguments are in their own
arg_tok doubly linked list.
The lists are
Christian Couder chrisc...@tuxfamily.org writes:
diff --git a/trailer.c b/trailer.c
index 5b8e28b..5d69c00 100644
--- a/trailer.c
+++ b/trailer.c
@@ -378,3 +378,96 @@ static int git_trailer_config(const char *conf_key,
const char *value, void *cb)
...
+static struct trailer_item
Christian Couder chrisc...@tuxfamily.org writes:
diff --git a/trailer.c b/trailer.c
index 5d69c00..e0e066f 100644
--- a/trailer.c
+++ b/trailer.c
@@ -50,6 +50,13 @@ static size_t alnum_len(const char *buf, size_t len)
return len;
}
+static inline int contains_only_spaces(const
Christian Couder chrisc...@tuxfamily.org writes:
diff --git a/trailer.c b/trailer.c
index ab93c16..67e7baf 100644
--- a/trailer.c
+++ b/trailer.c
@@ -490,12 +544,22 @@ static struct trailer_item
*process_command_line_args(int argc, const char **arg
...
+ /* Add conf commands that
Christian Couder chrisc...@tuxfamily.org writes:
+# We want one trailing space at the end of each line.
+# Let's use sed to make sure that these spaces are not removed
+# by any automatic tool.
+test_expect_success 'setup 3' '
+ sed -e s/ Z\$/ / complex_message_trailers -\EOF
+Fixes: Z
Conley Owens c...@android.com writes:
On Fri, Feb 28, 2014 at 3:26 PM, Conley Owens c...@android.com wrote:
$ git --version # This is just the git from MacPorts
git version 1.8.5.5
$ sw_vers
ProductName:Mac OS X
ProductVersion: 10.8.5
BuildVersion: 12F45
OK, I've tried using my
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
From: Duy Nguyen pclo...@gmail.com
Before cdab485 (upload-pack: delegate rev walking in shallow fetch to
pack-objects - 2013-08-16) upload-pack does not write to the source
repository. cdab485 starts to write $GIT_DIR/shallow_XX if it's a
Jeff King p...@peff.net writes:
I also noticed that the diff engine does not play well with replacements
of blobs. When we are diffing the trees, we see that the sha1 for path
foo is the same on either side, and do not look further, even though
feeding those sha1s to builtin_diff would fetch
Michael Haggerty mhag...@alum.mit.edu writes:
I just wrote up the idea that fell out of the discussion [1] about the
other configuration features that I proposed. As far as I am concerned,
it can be merged as soon as somebody volunteers as a co-mentor. The
idea is embodied in a pull request
Sun He sunheeh...@gmail.com writes:
hashcpy() can keep the abstraction of object name behind it.
Do we really want to change the phrasing you took the above from to
say *can* keep?
Providing the object name abstraction is the whole point of the
function, so of course it can keep it, but that
We already have 147972b1 (commit.c: use skip_prefix() instead of
starts_with(), 2014-03-04) that covers the record_author_date() and
parse_gpg_output(), don't we?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo
Karthik Nayak karthik@gmail.com writes:
@@ -1098,6 +1099,7 @@ int parse_signed_commit(const unsigned char *sha1,
char *buffer = read_sha1_file(sha1, type, size);
int in_signature, saw_signature = -1;
char *line, *tail;
+ const char *gpg_sig;
if (!buffer ||
When looking at a merge, git blame inspects the blob object names
of all parents and if one of them exactly match the merge result,
pass the entire blame down to that parent. This is very much in
line with the history simplification done with git log when
traversing a history with merges.
On the
David Kastrup d...@gnu.org writes:
Junio C Hamano gits...@pobox.com writes:
When looking at a merge, git blame inspects the blob object names
of all parents and if one of them exactly match the merge result,
pass the entire blame down to that parent. This is very much in
line
Rohit Mani rohit.m...@outlook.com writes:
Avoid scanning strings twice, once with strchr() and then with
strlen(), by using strchrnul(). Update the conditional expressions
involving the return value of strchrnul() with a check for '\0'.
Signed-off-by: Rohit Mani rohit.m...@outlook.com
---
Benoit Pierre benoit.pie...@gmail.com writes:
This patch fixes the fact that hunk editing with 'commit -p -m' does not work:
GIT_EDITOR is set to ':' to indicate to hooks that no editor will be launched,
which result in the 'hunk edit' option not launching the editor (and selecting
the whole
Benoit Pierre benoit.pie...@gmail.com writes:
+int run_commit_hook(int editor_is_used, const char *index_file, const char
*name, ...)
+{
+ const char *hook_env[3] = { NULL };
+ char index[PATH_MAX];
+ va_list args;
+ int ret;
+
+ snprintf(index, sizeof(index),
Benoit Pierre benoit.pie...@gmail.com writes:
Signed-off-by: Benoit Pierre benoit.pie...@gmail.com
---
Please have these preparatory fix-ups (i.e. the changes that would
be immediately useful even if it turns out that the main body of the
series were not ready for inclusion) early in the
Benoit Pierre benoit.pie...@gmail.com writes:
Signed-off-by: Benoit Pierre benoit.pie...@gmail.com
---
t/t7505-prepare-commit-msg-hook.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t7505-prepare-commit-msg-hook.sh
b/t/t7505-prepare-commit-msg-hook.sh
index
Eric Sunshine sunsh...@sunshineco.com writes:
+test_expect_failure 'edit hunk commit -p -m message' '
+ echo e | env GIT_EDITOR=sed s/+line3\$/+line2/ -i git commit -p -m
commit2 file
+ git diff HEAD^ HEAD diff
+ test_cmp expected diff
+'
If you ever add more tests,
In a bourne shell script, VAR=VAL command is sufficient to run
'command' with environment variable VAR set to value VAL without
affecting the environment of the shell itself; there is no reason to
say env VAR=VAL command.
Signed-off-by: Junio C Hamano gits...@pobox.com
---
* Just something I
Martin Langhoff martin.langh...@gmail.com writes:
Back in
http://git.661346.n2.nabble.com/PATCH-0-2-Make-git-gc-more-robust-with-regard-to-grafts-td3310281.html
we got gc/repack to be safer for users who might be shooting
themselves in the foot.
Would a patch be welcome to add
Michael Haggerty mhag...@alum.mit.edu writes:
I didn't mean to insult all Windows users in general. I was only
referring to the fact that since the default Windows command line is not
a POSIX shell, even an experienced Windows user might have trouble
figuring out how to execute a shell loop.
Junio C Hamano gits...@pobox.com writes:
Benoit Pierre benoit.pie...@gmail.com writes:
Signed-off-by: Benoit Pierre benoit.pie...@gmail.com
---
t/t7505-prepare-commit-msg-hook.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t7505-prepare-commit-msg-hook.sh
b
Because VAR=VAL command is sufficient to run 'command' with
environment variable VAR set to value VAL without affecting the
environment of the shell itself, but we cannot do the same with a
shell function (most notably, test_must_fail), we have subshell
invocations with multiple lines like this:
601 - 700 of 27729 matches
Mail list logo
