Akin to 'am --skip' and 'rebase --skip'.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-cherry-pick.txt | 1 +
Documentation/git-revert.txt | 1 +
Documentation/sequencer.txt | 3 +++
builtin/revert.c | 6 ++
sequencer.c
Hi,
These are improvements to 'git rebase' by using a much improved 'git
cherry-pick'.
A new rewrite.c helper is added, and builtin/commit updated to use
that.
A new git-rebase--cherypick mode is added, and it replaces git-rebase--am and
git-rebase--merge.
Felipe Contreras (28):
cherry-pick:
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
sequencer.c | 2 +-
t/t3510-cherry-pick-sequence.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 351548f..a962b33 100644
--- a/sequencer.c
+++ b/sequencer.c
Pretty much what it says on the tin.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-cherry-pick.txt | 3 +++
builtin/revert.c| 8
sequencer.c | 6 ++
sequencer.h | 1 +
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-cherry-pick.txt | 6 +-
Documentation/git-revert.txt | 6 +-
builtin/revert.c | 1 +
sequencer.c | 11 +++
sequencer.h | 1 +
5
So that we can load and store rewrites, as well as other operations on a
list of rewritten commits.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Makefile | 2 ++
rewrite.c | 71 +++
rewrite.h | 18
3
And use struct rewrite.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/commit.c | 38 +-
rewrite.c| 32
rewrite.h| 1 +
3 files changed, 38 insertions(+), 33 deletions(-)
diff --git
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-rebase--cherrypick.sh | 9 +
1 file changed, 9 insertions(+)
diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh
index d36b0dc..bda7cfc 100644
--- a/git-rebase--cherrypick.sh
+++ b/git-rebase--cherrypick.sh
We are not in am mode.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-rebase--cherrypick.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh
index e142cfb..d8d32fe 100644
---
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-rebase--cherrypick.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh
index e9e..be17ec4 100644
--- a/git-rebase--cherrypick.sh
+++ b/git-rebase--cherrypick.sh
@@
Probably enough changes to warrant that.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-rebase--cherrypick.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh
index bda7cfc..da949aa 100644
---
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-rebase.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/git-rebase.sh b/git-rebase.sh
index b28addc..db2ea8d 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -368,6 +368,7 @@ skip)
run_specific_rebase
;;
So it can be used by other tools (e.g. git rebase), and the right action
is passed to the hooks and notes rewrite stuff.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/revert.c | 2 ++
git-rebase--interactive.sh | 4 ++--
sequencer.c| 6 +-
We don't use the 'rebase-apply'.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-rebase--cherrypick.sh | 5 -
git-rebase.sh | 5 -
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh
index
When there's changes in the staging area. Just like the other rebase
modes.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-rebase--cherrypick.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh
index
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
sequencer.c | 8
1 file changed, 8 insertions(+)
diff --git a/sequencer.c b/sequencer.c
index 076bb9d..453e4a4 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -847,6 +847,8 @@ static int populate_opts_cb(const char *key, const
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
sequencer.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 468fa54..56d791f 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -1047,7 +1047,7 @@ static int
Unless any specific 'git am' options are used.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-rebase.sh | 8
t/t3407-rebase-abort.sh| 2 +-
t/t3420-rebase-autostash.sh| 2 +-
t/t3425-rebase-topology-merges.sh
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-rebase--cherrypick.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh
index 241cda7..d36b0dc 100644
--- a/git-rebase--cherrypick.sh
+++
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/completion/git-prompt.sh | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index a81ef5a..a7bde16 100644
---
So that it can be used by shell prompts.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
sequencer.c | 24 ++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 453e4a4..c855dd4 100644
--- a/sequencer.c
+++
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-rebase--am.sh | 1 +
git-rebase.sh | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index aae6a85..d6a434c 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@
If no action-name is specified, nothing is done.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/config.txt | 9 -
Documentation/githooks.txt | 8
rewrite.c | 1 +
sequencer.c| 25 -
4
The cherrypick mode does the job.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
.gitignore| 1 -
Makefile | 1 -
git-rebase--interactive.sh| 2 +-
git-rebase--merge.sh | 151
They do something completely different from 'git am', it belongs in a
different file.
No functional changes.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
.gitignore| 1 +
Makefile | 1 +
git-rebase--am.sh | 11 +--
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t3420-rebase-autostash.sh | 105 ++--
1 file changed, 52 insertions(+), 53 deletions(-)
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
index 90eb264..c179262 100755
Will be useful for the next commits.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
sequencer.c | 22 +-
sequencer.h | 1 +
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
index d0e65de..468fa54 100644
---
So that all the tests pass.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-rebase--cherrypick.sh | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh
index d8d32fe..e9e 100644
---
And use it on commit.c.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/commit.c | 8 +---
rewrite.c| 18 ++
rewrite.h| 1 +
3 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index
On 08/29/2013 10:53 PM, Junio C Hamano wrote:
Stefan Beller stefanbel...@googlemail.com writes:
Here is a diff since the last time sending this patch series:
This is very readable.
There may be people who misread LOOSE as LOSE; the option -A is
about making the unreachable ones loose
On Fri, Aug 30, 2013 at 1:32 AM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
So that it's possible to remove certain refs from the list without
removing the objects that are referenced by other refs.
For example this repository:
* 374e8dd
On Fri, Aug 30, 2013 at 2:11 AM, Johannes Sixt j.s...@viscovery.net wrote:
Am 8/30/2013 7:00, schrieb Felipe Contreras:
So that it's possible to remove certain refs from the list without
removing the objects that are referenced by other refs.
For example this repository:
* 374e8dd (crap)
On Fri, Aug 30, 2013 at 2:26 AM, Junio C Hamano gits...@pobox.com wrote:
Pardon terseness, typo and HTML from a tablet.
On Aug 30, 2013 12:19 AM, Felipe Contreras felipe.contre...@gmail.com
wrote:
On Fri, Aug 30, 2013 at 1:32 AM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras
Am 8/30/2013 8:32, schrieb Junio C Hamano:
If you have a history where
- branches master and maint point at commit A;
- branch next points at commit B that is a descendant of A; and
- there are tags X and Y pointing at commits that are ahead of B
or behind A
i.e.
Change the @author_initials feature Jakub added in
v1.6.4-rc2-14-ga36817b to match non-ASCII author initials as intended.
The regexp Jakub added was intended to match
non-ASCII (/\b([[:upper:]])\B/g). But in Perl this doesn't actually
match non-ASCII upper-case characters unless the string being
Hi, Junio
Please merge this commit to the maint branch.
The following changes since commit e230c568c4b9a991e3175e5f65171a566fd8e39c:
Git 1.8.4 (2013-08-23 11:49:46 -0700)
are available in the git repository at:
git://github.com/git-l10n/git-po master
for you to fetch changes up to
Am 8/30/2013 9:32, schrieb Felipe Contreras:
On Fri, Aug 30, 2013 at 2:26 AM, Junio C Hamano gits...@pobox.com wrote:
On Aug 30, 2013 12:19 AM, Felipe Contreras felipe.contre...@gmail.com
Would the same argument apply to
next ^maint --except maint
where next gets in the queue, maint in
Currently, git p4 does not support many of the view
wildcards, such as * and %%n. It only knows the
common ... mapping, and exclusions.
Redo the entire wildcard code around the idea of
directly querying the p4 server for the mapping. For each
commit, invoke p4 where with committed file paths as
an if clause must not be empty; add a colon command
Signed-off-by: Thorsten Glaser t.gla...@tarent.de
---
templates/hooks--pre-push.sample | 1 +
1 file changed, 1 insertion(+)
diff --git a/templates/hooks--pre-push.sample b/templates/hooks--pre-push.sample
index 15ab6d8..1f3bceb 100755
---
On Fri, Aug 30, 2013 at 4:10 AM, Jonathan Nieder jrnie...@gmail.com wrote:
V.Krishn wrote:
Quite sometimes when cloning a large repo stalls, hitting Ctrl+c cleans what
been downloaded, and process needs re-start.
Is there a way to recover or continue from already downloaded files during
On Tue, 2013-08-27 at 07:50 -0700, Junio C Hamano wrote:
Carlos Martín Nieto c...@elego.de writes:
In remote's configuration callback, anything that looks like
'remote.name.*' creates a remote 'name'. This remote may not end
up having any configuration for a remote, but it's still in the
On Fri, Aug 30, 2013 at 7:17 PM, Duy Nguyen pclo...@gmail.com wrote:
OK how about a new capability resume to upload-pack. fetch-pack can
then send capability resume[=SHA-1,skip] to upload-pack. The
first time it sends resume without parameters, and upload-pack will
send back an SHA-1 to
This is similar in spirit to to make -C dir ... and tar -C dir
Currently it takes more effort (keypresses) to invoke git command in a
different directory than the current one without leaving the current
directory:
1. (cd ~/foo git status)
git --git-dir=~/foo/.git
Felipe Contreras felipe.contre...@gmail.com writes:
If you do 'master ^maint --except master', handle_commit will return
three commits:
Would the same argument apply to
next ^maint --except maint
where next gets in the queue, maint in tainted, and skipped?
maint is not skipped, as
Carlos Martín Nieto c...@elego.de writes:
On Tue, 2013-08-27 at 07:50 -0700, Junio C Hamano wrote:
Carlos Martín Nieto c...@elego.de writes:
In remote's configuration callback, anything that looks like
'remote.name.*' creates a remote 'name'. This remote may not end
up having any
Jiang Xin worldhello@gmail.com writes:
Please merge this commit to the maint branch.
The following changes since commit e230c568c4b9a991e3175e5f65171a566fd8e39c:
Git 1.8.4 (2013-08-23 11:49:46 -0700)
are available in the git repository at:
git://github.com/git-l10n/git-po master
Le vendredi 30 août 2013 09:54:59 Junio C Hamano a écrit :
Jiang Xin worldhello@gmail.com writes:
Please merge this commit to the maint branch.
The following changes since commit
e230c568c4b9a991e3175e5f65171a566fd8e39c:
Git 1.8.4 (2013-08-23 11:49:46 -0700)
are available in
Jean-Noël AVILA jn.av...@free.fr writes:
Le vendredi 30 août 2013 09:54:59 Junio C Hamano a écrit :
Jiang Xin worldhello@gmail.com writes:
Please merge this commit to the maint branch.
The following changes since commit
e230c568c4b9a991e3175e5f65171a566fd8e39c:
Git 1.8.4
Hi Folks,
Here is the second revision of a series to support locking multiple
refs at the same time to update all of them consistently. The first
series can be found at $gmane/233260. This revision is ready to
consider for integration.
Updates since the previous revision of the series:
*
The function resets refs rather than doing arbitrary updates.
Rename it to allow a future general-purpose update_refs function
to be added.
Signed-off-by: Brad King brad.k...@kitware.com
---
builtin/reset.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
Junio C Hamano gits...@pobox.com writes:
Ævar Arnfjörð Bjarmason ava...@gmail.com writes:
Acked-by: Jakub Narębski jna...@gmail.com
Tested-by: Ævar Arnfjörð Bjarmason ava...@gmail.com
Tested-by: Simon Ruderich si...@ruderich.org
---
+++ b/gitweb/gitweb.perl
@@ -6631,6 +6631,7 @@ sub
Extend t/t1400-update-ref.sh to cover cases using the --stdin option.
Signed-off-by: Brad King brad.k...@kitware.com
---
t/t1400-update-ref.sh | 206 +
1 file changed, 206 insertions(+)
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
Factor loose ref deletion into helper function delete_ref_loose to allow
later use elsewhere.
Signed-off-by: Brad King brad.k...@kitware.com
---
refs.c | 22 +++---
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/refs.c b/refs.c
index 2e755b4..5dd86ee 100644
---
Factor the lock and write steps and error handling into helper functions
update_ref_lock and update_ref_write to allow later use elsewhere.
Expose lock_any_ref_for_update's type_p to update_ref_lock callers.
Signed-off-by: Brad King brad.k...@kitware.com
---
refs.c | 28
Expose lock_ref_sha1_basic's type_p argument to callers of
lock_any_ref_for_update. Update all call sites to ignore it by passing
NULL for now.
Signed-off-by: Brad King brad.k...@kitware.com
---
branch.c |2 +-
builtin/commit.c |2 +-
builtin/fetch.c|3
Generalize repack_without_ref as repack_without_refs to support a list
of refs and implement the former in terms of the latter.
Signed-off-by: Brad King brad.k...@kitware.com
---
refs.c | 29 ++---
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/refs.c
Add 'struct ref_update' to encode the information needed to update or
delete a ref (name, new sha1, optional old sha1, no-deref flag). Add
function 'update_refs' accepting an array of updates to perform. First
sort the input array to order locks consistently everywhere and reject
multiple
Add a --stdin signature to read update instructions from standard input
and apply multiple ref updates together. Use an input format that
supports any update that could be specified via the command-line,
including object names like 'branch:path with space'.
Signed-off-by: Brad King
On Fri, Aug 30, 2013 at 11:13:19AM -0700, Junio C Hamano wrote:
I think in this function the filehandle is called $fd, not $fh. Has
any of you really tested this???
I did, but I applied the change by hand without applying the
patch directly and didn't notice the difference. Sorry for that.
On Fri, Aug 30, 2013 at 11:48 AM, Junio C Hamano gits...@pobox.com wrote:
Which means that the approach taken by the patch to only allow
exclusion of negative ones makes the idea only 50% useful compared
to its potential. And I suspect that we can start from 50% which
is better than 0% and
On Thu, Aug 29, 2013 at 2:57 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
Again, *everyone* has agreed that index needs to be renamed, and
staging area is the best option.
Do I really need to go through all the discussions and list each and
every person that participated in them,
On Fri, Aug 30, 2013 at 12:28:01AM -0400, Jeff King wrote:
On Thu, Aug 29, 2013 at 09:10:52PM -0400, Jeff King wrote:
In the case of git-fsck, which uses the
DO_FOR_EACH_INCLUDE_BROKEN flag, this will cause us to
erroneously complain that the ref points to an invalid
object. But for
Am 30.08.2013 21:51, schrieb Jens Lehmann:
Am 30.08.2013 21:40, schrieb Jens Lehmann:
Am 29.08.2013 23:23, schrieb Matthieu Moy:
Jens Lehmann jens.lehm...@web.de writes:
Am 29.08.2013 15:05, schrieb Matthieu Moy:
The --for-status option was an undocumented option used only by
wt-status.c,
Am 30.08.2013 21:40, schrieb Jens Lehmann:
Am 29.08.2013 23:23, schrieb Matthieu Moy:
Jens Lehmann jens.lehm...@web.de writes:
Am 29.08.2013 15:05, schrieb Matthieu Moy:
The --for-status option was an undocumented option used only by
wt-status.c, which inserted a header and commented out the
Am 29.08.2013 23:23, schrieb Matthieu Moy:
Jens Lehmann jens.lehm...@web.de writes:
Am 29.08.2013 15:05, schrieb Matthieu Moy:
The --for-status option was an undocumented option used only by
wt-status.c, which inserted a header and commented out the output. We can
achieve the same result
Am 29.08.2013 01:24, schrieb Junio C Hamano:
* bc/submodule-status-ignored (2013-08-20) 2 commits
- submodule: don't print status output with ignore=all
- submodule: fix confusing variable name
Originally merged to 'next' on 2013-08-22
Will merge to 'next'.
Looks like you didn't
On Thu, Aug 29, 2013 at 2:57 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
On Thu, Aug 29, 2013 at 1:37 PM, Junio C Hamano gits...@pobox.com wrote:
IIRC, when this was discussed, many non-native speakers had trouble
with the verb to stage, not just from i18n/l10n point of view.
On Fri, Aug 30, 2013 at 2:11 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
On Thu, Aug 29, 2013 at 2:57 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
Here are the threads once again:
http://thread.gmane.org/gmane.comp.version-control.git/197111
On Fri, Aug 30, 2013 at 3:40 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
On Fri, Aug 30, 2013 at 2:11 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
On Thu, Aug 29, 2013 at 2:57 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
Here are the threads once again:
On Aug 30, 2013, at 11:13, Junio C Hamano wrote:
Junio C Hamano gits...@pobox.com writes:
Ævar Arnfjörð Bjarmason ava...@gmail.com writes:
Acked-by: Jakub Narębski jna...@gmail.com
Tested-by: Ævar Arnfjörð Bjarmason ava...@gmail.com
Tested-by: Simon Ruderich si...@ruderich.org
---
+++
There's no need to remove 'refs/heads/' yet again.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-pull.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index f0df41c..3bdcbfd 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@
Felipe Contreras (6):
reset: trivial refactoring
branch: trivial style fix
rebase: trivial style fixes
reset: trivial style cleanup
add: trivial style cleanup
pull: trivial cleanup
branch.c| 2 +-
builtin/add.c | 10 +-
builtin/reset.c | 11 ---
git-pull.sh
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-rebase.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 8d7659a..2c02853 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -324,7 +324,7 @@ done
test $# -gt 2 usage
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
branch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/branch.c b/branch.c
index c5c6984..546c4b4 100644
--- a/branch.c
+++ b/branch.c
@@ -307,7 +307,7 @@ void create_branch(const char *head,
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/reset.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/reset.c b/builtin/reset.c
index 225e3f1..7e65934 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -323,7 +323,7 @@ int cmd_reset(int
After commit 3fde386 (reset [--mixed]: use diff-based reset whether or
not pathspec was given), some code can be moved to the 'reset_type ==
MIXED' check.
Let's move the code that is specific to MIXED.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/reset.c | 9 +++--
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/add.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/add.c b/builtin/add.c
index 8266a9c..a1e1e0e 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -336,7 +336,7 @@ static int
Brad King brad.k...@kitware.com writes:
Add a --stdin signature to read update instructions from standard input
and apply multiple ref updates together. Use an input format that
supports any update that could be specified via the command-line,
including object names like 'branch:path with
Hi,
This has been discussed before:
http://thread.gmane.org/gmane.comp.version-control.git/224489
but in the spirit of the perfect being the enemy of the good, nothing got done.
This series makes 'git branch -v' much faster, and gives us the most important
information; the configured upstream
No functional changes.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/branch.c | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 0836890..ac17b18 100644
--- a/builtin/branch.c
+++
Showing the upstream tracking branch is more important than how many
commits are ahead/behind, so now 'git branch -v' shows the upstream, but
not the tracking info, and 'git branch -vv' shows all information (as
before).
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
If I click the commit list while reading (or rereading, by Shift-F5)
commits, sometimes an error message appears:
`can't read pending_select: no such variable',
because pending_select is reset during update.
Just removing update or saving value in local variable would result in
occasional
People often find git log --branches etc. that includes _all_
branches is cumbersome to use when they want to grab most but except
some. The same applies to --tags, --all and --glob.
Teach the revision machinery to remember patterns, and then upon the
next such a globbing option, exclude those
On Wed, Aug 28, 2013 at 04:18:03PM -0400, Jeff King wrote:
On Wed, Aug 28, 2013 at 01:05:38PM -0700, Junio C Hamano wrote:
What are our plans to help existing scripts people have written over
time, especially before status -s was invented, that will be
broken by use of this?
I thought
On Sat, Aug 31, 2013 at 6:55 AM, Junio C Hamano gits...@pobox.com wrote:
+static int ref_excluded(struct rev_info *revs, const char *path)
+{
+ struct string_list_item *item;
+
+ if (!revs-ref_excludes)
+ return 0;
+ for_each_string_list_item(item,
Duy Nguyen pclo...@gmail.com writes:
On Sat, Aug 31, 2013 at 6:55 AM, Junio C Hamano gits...@pobox.com wrote:
+static int ref_excluded(struct rev_info *revs, const char *path)
+{
+ struct string_list_item *item;
+
+ if (!revs-ref_excludes)
+ return 0;
+
This makes reinitializing on a .git file repository work.
This is probably the only case that setup_git_env() (via
set_git_dir()) is called on a .git file. Other cases in
setup_git_dir_gently() and enter_repo() both cover .git file case
explicitly because they need to verify the target repo is
On Thu, Aug 29, 2013 at 4:50 PM, Duy Nguyen pclo...@gmail.com wrote:
On Wed, Aug 28, 2013 at 11:02 PM, Matthijs Kooijman matth...@stdin.nl wrote:
This is a testcase that checks for a problem where, during a specific
shallow fetch where the client does not have any commits that are a
successor
On Fri, Aug 30, 2013 at 8:15 PM, Max Kirillov m...@max630.net wrote:
References which fail check_refname_format() cause the whole
import to fail. This might be undesirable if the references
are not important.
A better solution would be to provide some mapping, either
by some reversible
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
Incorporated suggestions by Nico and Junio. I went ahead and added
escape hatches for converting thin packs to full ones so the document
does not really match the code (I've been watching Nico's repository,
commit reading is added,
Good. 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
Felipe Contreras felipe.contre...@gmail.com writes:
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/add.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/add.c b/builtin/add.c
index 8266a9c..a1e1e0e 100644
--- a/builtin/add.c
Felipe Contreras felipe.contre...@gmail.com writes:
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-rebase.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 8d7659a..2c02853 100755
--- a/git-rebase.sh
+++
Felipe Contreras felipe.contre...@gmail.com writes:
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/reset.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/reset.c b/builtin/reset.c
index 225e3f1..7e65934 100644
--- a/builtin/reset.c
+++
Felipe Contreras felipe.contre...@gmail.com writes:
There's no need to remove 'refs/heads/' yet again.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-pull.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index
Felipe Contreras (4):
t: branch: trivial style fix
t: branch: fix typo
t: branch: fix broken chains
t: branch: improve test rollback
t/t3200-branch.sh | 82 +++
1 file changed, 41 insertions(+), 41 deletions(-)
--
1.8.4-fc
--
To
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t3200-branch.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index ea548f9..3134652 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -351,7 +351,7 @@
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t3200-branch.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 44ec6a4..ea548f9 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -14,7 +14,8 @@
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t3200-branch.sh | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 3134652..d85306f 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -425,14 +425,14 @@
After every test the environment should be as close as to how it was
before as possible.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t3200-branch.sh | 71 +++
1 file changed, 35 insertions(+), 36 deletions(-)
diff --git
1 - 100 of 101 matches
Mail list logo
