If read_tree_trivial succeeds and produces a tree that is already in the
object store, then the index is not written to disk, leaving it
out-of-sync with both HEAD and the working tree.
In order to write the index back out to disk after a merge,
write_index_locked() needs to be called. For most m
With one exception, we require the index to exactly match the current HEAD
commit at the time git merge is invoked. This expectation was even
documented in git-merge.txt until commit ebef7e5 (Documentation: simplify
How Merge Works, 2010-01-23). Most merge strategies enforced this
requirement, bu
Repeating a trivially merge more than once will leave the index out of
sync, despite being clean before the merge and operating on the exact
same heads as the first run. The recorded merge has the correct tree and
the working tree is brought up to date, it is just the index that is left
as it was
Signed-off-by: Elijah Newren
---
git-merge-octopus.sh | 6 ++
t/t6044-merge-unrelated-index-changes.sh | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 8643f74..dc2fd1b 100755
--- a/git-merge-octop
This series has four independent miscellaneous fixes, three split out
from my RFC series at $gmane/291007 and one new fix. These four fixes
have no dependencies on each other, so I can trivially split them into
four submissions if preferred. I only batched them because I want my
index-only merge
In commit 51931bf (merge-recursive: Improve handling of rename target vs.
directory addition, 2011-08-11) I apparently added two lines of code that
were immediately duplicated a few lines later. No idea why, other than
it seems pretty clear this was a mistake: there is no need to remove the
same f
There were a few cases in merge-recursive that could result in a check for
the presence of files in the working copy while trying to create a virtual
merge base. These were rare and innocuous, but somewhat illogical. The
two cases were:
* When there was naming conflicts (e.g. a D/F conflict) a
On Thu, Apr 7, 2016 at 11:58 PM, Elijah Newren wrote:
> Luckily, I figured out that bug. So, that leaves just one case left
> that I can't seem to figure out: read_tree_trivial. So much better,
> right? Even it's name is sitting there, mocking me. "Ha ha, I'm
> read_tree_*trivial* and
On Sat, Apr 9, 2016 at 9:19 AM, Michael Haggerty wrote:
>
> I think this risk is acceptable nevertheless, because expiring reflogs
> is an uncommon operation and unlikely to be done from two processes at
> the same time; moreover, the integrity of reflogs is not a matter of
> life or death.
> ...
Jeff King writes:
> Hmm. t3404.40 does this:
>
> echo "#!/bin/sh" > $PRE_COMMIT &&
> echo "test -z \"\$(git diff --cached --check)\"" >>$PRE_COMMIT &&
> chmod a+x $PRE_COMMIT &&
>
> So I'm pretty sure that $PRE_COMMIT script should be barfing each time
> it is called on Solari
On Sun, Apr 10, 2016 at 12:29:45AM +0200, Tom G. Christensen wrote:
> On 09/04/16 23:04, Jeff King wrote:
> >I did some quick grepping around, and I suspect you may run
> >into the same thing in other places (e.g., t3404.40 looks
> >like a similar case).
>
> There are only a few tests that fail a
On 09/04/16 23:04, Jeff King wrote:
I did some quick grepping around, and I suspect you may run
into the same thing in other places (e.g., t3404.40 looks
like a similar case).
There are only a few tests that fail and just t5532.3 seems affected by
this issue.
Subject: [PATCH] t5532: use wri
On Sat, Apr 09, 2016 at 10:27:37PM +0200, Tom G. Christensen wrote:
> Looking at the testsuite results on Solaris I see a failure in t5532.3.
>
> Running the testsuite with -v -i revealed a shell syntax error:
>
> proxying for example.com 9418
> ./proxy: syntax error at line 3: `cmd=$' unexpecte
Remove a comma from string marked for translation. Make the string match the
one in builtin/mv.c. Now translators have do handle this string only once.
Signed-off-by: Vasco Almeida
---
builtin/rm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/rm.c b/builtin/rm.c
in
Split string "If you wish to set tracking information
for this branch you can do so with:\n" to match occurring string in
git-parse-remote.sh. In this case, the translator handles it only once.
On the other hand, the translations of the string that were already made
are mark as fuzzy and the trans
Mark description and parameter for option "set-upstream-to" for translation.
Signed-off-by: Vasco Almeida
---
builtin/branch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 7b45b6b..5ab106b 100644
--- a/builtin/branch.c
+++ b/builti
Some translations might also translate "" and "".
Signed-off-by: Vasco Almeida
---
builtin/pull.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index 10eff03..9e8883c 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -458,13 +458,13 @
Change Makefile to include git-parse-remote.sh in LOCALIZED_SH.
TODO: remove 3rd argument of error_on_missing_default_upstream function
that is no longer required.
Signed-off-by: Vasco Almeida
---
Makefile| 2 +-
git-parse-remote.sh | 50 +---
Mark strings seen by the user inside setup_unpack_trees_porcelain() and
display_error_msgs() functions for translation.
Signed-off-by: Vasco Almeida
---
unpack-trees.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c
i
Git could output "completed with 1 local objects", but in this case
using "object" instead of "objects" is the correct form.
Use Q_() instead of _().
Signed-off-by: Vasco Almeida
---
builtin/index-pack.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/index-pack.c
On Sat, Apr 09, 2016 at 10:17:56PM +0200, Tom G. Christensen wrote:
> On 09/04/16 19:39, Jeff King wrote:
>
> > [1/3]: config: lower-case first word of error strings
> > [2/3]: git_config_set_multivar_in_file: all non-zero returns are errors
> > [3/3]: git_config_set_multivar_in_file: handl
Hello,
Looking at the testsuite results on Solaris I see a failure in t5532.3.
Running the testsuite with -v -i revealed a shell syntax error:
proxying for example.com 9418
./proxy: syntax error at line 3: `cmd=$' unexpected
not ok 3 - fetch through proxy works
#
# git fetch fake
On 09/04/16 19:39, Jeff King wrote:
[1/3]: config: lower-case first word of error strings
[2/3]: git_config_set_multivar_in_file: all non-zero returns are errors
[3/3]: git_config_set_multivar_in_file: handle "unset" errors
I applied them to 2.8.1 and ran the testsuite again on Solar
Hi,
I encountered some issues with the git documentation while modifying
my deployment scripts to enforce that the tree being fetched was
signed by a trusted key.
It was unclear which commits needed to be signed (in the case of `git
merge`) and what were the criteria for the signature to be consi
To allow column display, we will need to first render the output in a
string list to allow print_columns() to compute the proper size of
each column before starting the actual output. Introduce the function
format_ref_array_item() that does the formatting of a ref_array_item
to an strbuf.
show_ref
Call ref-filter's setup_ref_filter_porcelain_msg() to enable
translated messages for the %(upstream:tack) atom. Although branch.c
doesn't currently use ref-filter's printing API's, this will ensure
that when it does in the future patches, we do not need to worry about
translation.
Written-by: Matt
Implement the '--format' option provided by 'ref-filter'. This lets the
user list branches as per desired format similar to the implementation
in 'git for-each-ref'.
Add tests and documentation for the same.
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
-
Add support for %(upstream:track,nobracket) which will print the
tracking information without the brackets (i.e. "ahead N, behind M").
This is needed when we port branch.c to use ref-filter's printing APIs.
Add test and documentation for the same.
Mentored-by: Christian Couder
Mentored-by: Matth
Introduce setup_ref_filter_porcelain_msg() so that the messages used in
the atom %(upstream:track) can be translated if needed. This is needed
as we port branch.c to use ref-filter's printing API's.
Written-by: Matthieu Moy
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by:
Add support for %(objectname:short=) which would print the
abbreviated unique objectname of given length. When no length is
specified, the length is 'DEFAULT_ABBREV'. The minimum length is
'MINIMUM_ABBREV'. The length may be exceeded to ensure that the provided
object name is unique.
Add tests and
The "%(symref)" atom doesn't work when used with the ':short' modifier
because we strictly match only 'symref' for setting the 'need_symref'
indicator. Fix this by using comparing with valid_atom rather than used_atom.
Add tests for %(symref) and %(symref:short) while we're here.
Helped-by: Junio
Introduce refname_atom_parser() which will parse the '%(refname)' atom
and store information into the 'used_atom' structure based on the
modifiers used along with the atom.
Signed-off-by: Karthik Nayak
---
ref-filter.c | 70 +---
1 file cha
Port branch.c to use ref-filter APIs for printing. This clears out
most of the code used in branch.c for printing and replaces them with
calls made to the ref-filter library.
Introduce build_format() which gets the format required for printing
of refs. Make amendments to print_ref_list() to reflec
Introduce symref_atom_parser() which will parse the '%(symref)' atom and
store information into the 'used_atom' structure based on the modifiers
used along with the atom.
Signed-off-by: Karthik Nayak
---
ref-filter.c | 25 +++--
1 file changed, 23 insertions(+), 2 deletions(-
Borrowing from branch.c's implementation print "[gone]" whenever an
unknown upstream ref is encountered instead of just ignoring it.
This makes sure that when branch.c is ported over to using ref-filter
APIs for printing, this feature is not lost.
Make changes to t/t6300-for-each-ref.sh and
Docum
Add the options `:dir` and `:base` to the %(refname) atom. The `:dir`
option gives the directory (the part after $GIT_DIR/) of the ref without
the refname. The `:base` option gives the base directory of the given
ref (i.e. the directory following $GIT_DIR/refs/).
Add tests and documentation for th
Ensure that each 'atom_value' has a reference to its corresponding
'used_atom'. This let's us use values within 'used_atom' in the
'handler' function.
Hence we can get the %(align) atom's parameters directly from the
'used_atom' therefore removing the necessity of passing %(align) atom's
parameter
This is part of unification of the commands 'git tag -l, git branch -l
and git for-each-ref'. This ports over branch.c to use ref-filter's
printing options.
Initially posted here: $(gmane/279226). It was decided that this series
would follow up after refactoring ref-filter parsing mechanism, which
Move the implementation of get_head_description() from branch.c to
ref-filter. This gives a description of the HEAD ref if called. This
is used as the refname for the HEAD ref whenever the
FILTER_REFS_DETACHED_HEAD option is used. Make it public because we
need it to calculate the length of the HE
Implement %(if:equals=) wherein the if condition is only
satisfied if the value obtained between the %(if:...) and %(then) atom
is the same as the given ''.
Similarly, implement (if:notequals=) wherein the if condition
is only satisfied if the value obtained between the %(if:...) and
%(then) atom
Implement %(if), %(then) and %(else) atoms. Used as
%(if)...%(then)...%(end) or %(if)...%(then)...%(else)...%(end). If the
format string between %(if) and %(then) expands to an empty string, or
to only whitespaces, then the whole %(if)...%(end) expands to the string
following %(then). Otherwise, it
We pass off to the "_gently" form to do the real work, and
just die() if it returned an error. However, our die message
de-references "value", which may be NULL if the request was
to unset a variable. Nobody using glibc noticed, because it
simply prints "(null)", which is good enough for the test
s
This function is just a thin wrapper for the "_gently" form
of the function. But the gently form is designed to feed
builtin/config.c, which passes our return code directly to
its exit status, and thus uses positive error values for
some cases. We check only negative values, meaning we would
fail t
This follows our usual style (both throughout git, and
throughout the rest of this file).
This covers the whole file, but note that I left the capitalization in
the multi-sentence:
error: malformed value...
error: Must be one of ...
because it helps make it clear that we are starting a new s
On Sat, Apr 09, 2016 at 09:02:38AM +0200, Tom G. Christensen wrote:
> I've finished testing 2.8.1 and I found one more case where a null is being
> printed and causing a segfault. This happens even on Solaris 8 and 9.
> The failling test is t3200.63.
Oh good, this one wasn't me. :)
It's just a n
On Fri, Apr 08, 2016 at 01:13:51PM +0200, Johannes Schindelin wrote:
> Hi Michael,
>
> On Thu, 7 Apr 2016, Michael S. Tsirkin wrote:
>
> > On Thu, Apr 07, 2016 at 05:23:09PM +0200, Johannes Schindelin wrote:
> > >
> > > On Thu, 7 Apr 2016, Michael S. Tsirkin wrote:
> > >
> > > > Reverts can typ
On 04/07/2016 03:02 PM, David Turner wrote:
> We now have quite a large number of patches before we even get into
> the meat of the pluggable refs backend series. So it's worth breaking
> those out and getting them in before we get into the main series
> (which Michael Haggerty swants to redesign
On Thu, Mar 31, 2016 at 10:38:04AM -0700, Junio C Hamano wrote:
>> diff --git a/builtin/log.c b/builtin/log.c
>> index 0d738d6..03cbab0 100644
>> --- a/builtin/log.c
>> +++ b/builtin/log.c
>> @@ -1185,6 +1185,82 @@ static int from_callback(const struct option *opt,
>> const char *arg, int unset)
>
Hey,
Greeting!!
Do you need to increase your sales?
Do you need more clients leads?
Do you need our marketing services?
No matter you are selling products or services, we can generate you new
leads from our marketing service.
If you need more information please contact us today.
Thanks,
Jeff
Às 20:33 de 08-04-2016, Junio C Hamano escreveu:
> Vasco Almeida writes:
>
>> Some translations might also translate "" and "".
>> ...
>> fprintf_ln(stderr, _("See git-pull(1) for details."));
>> fprintf(stderr, "\n");
>> -fprintf_ln(stderr, "git pull ")
Include tests to check for multiple levels of quiet and to check if the
'--no-quiet' option sets it to 0.
Signed-off-by: Pranit Bauva
---
t/t0040-parse-options.sh | 37 +
1 file changed, 37 insertions(+)
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-o
Add commit.verbose configuration variable as a convenience for those
who always prefer --verbose.
Helped-by: Junio C Hamano
Helped-by: Eric Sunshine
Signed-off-by: Pranit Bauva
---
The previous version of the patch are:
- [v12] $gmane/288820
- [v11] $gmane/288820
- [v10] $gmane/288820
- [v
Make the fake "editor" store output of grep in a file so that we can
see how many diffs were contained in the message and use them in
individual tests where ever it is required. A subsequent commit will
introduce scenarios where it is important to be able to exactly
determine how many diffs were pr
OPT_COUNTUP() merely increments the counter upon --option, and resets it
to 0 upon --no-option, which means that there is no "unspecified" value
with which a client can initialize the counter to determine whether or
not --[no]-option was seen at all.
Make OPT_COUNTUP() treat any negative number as
Current implementation of parse-options.c treats OPT__QUIET() as integer
and not boolean and thus it is more appropriate to print it as integer
to avoid confusion.
Signed-off-by: Pranit Bauva
---
t/t0040-parse-options.sh | 26 +-
test-parse-options.c | 2 +-
2 files
Signed-off-by: Pranit Bauva
---
Changes wrt previous version (v12):
- Use '\' when interpolation isn't required
---
t/t0040-parse-options.sh | 76
1 file changed, 38 insertions(+), 38 deletions(-)
diff --git a/t/t0040-parse-options.sh b/t/t0040-
Às 20:23 de 08-04-2016, Junio C Hamano escreveu:
> Vasco Almeida writes:
>
>> Mark strings seen by the user inside setup_unpack_trees_porcelain() and
>> display_error_msgs() functions for translation.
>>
>> One case Git outputs the named strings is when the user does some editing to
>> a file on
Thanks a lot!
Tested the patch and it works as expected :-)
On Fri, Apr 8, 2016 at 9:16 PM, Junio C Hamano wrote:
> Felix Ruess writes:
>
>> I just encountered a problem with the latest git version (2.8.1) that
>> looks like a regression to me:
>> When trying to clone a repo via a https socks5 p
I was working on a simple bug fix[1], and I wanted to add a test to t1500. I
put
the new test at the beginning rather than try to decipher what state the test
run
would be in at the end. In the review, Eric Sunshine described the test:
> this script is ancient and cd's all around the place with
t1500-rev-parse has many tests which change directories and leak
environment variables. This makes it difficult to add new tests without
minding the environment variables and current directory.
Each test is now setup, executed, and cleaned up without leaving anything
behind. Tests which have tex
On 07/04/16 22:19, Tom G. Christensen wrote:
On 07/04/16 20:50, Junio C Hamano wrote:
Junio C Hamano writes:
So perhaps this is all we need to fix your box.
setup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
I applied this patch to 2.8.0 and have completed a testsuite run on
S
61 matches
Mail list logo
