For those who use two-factor authentication with gmail, git-send-email
will not work unless it is setup with an app-specific password. The
example for setting up git-send-email for use with gmail will now
include information on generating and storing the app-specific password.
---
this to return the
proper relative path to the git directory.
Related tests marked to expect failure are updated to expect success
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
builtin/rev-parse.c | 22 +-
t/t1500-rev-parse.sh | 4 ++--
t/t1700-split-in
Changes since v3 [1]:
- Rebased onto 'pu' which includes the cleanup of t1500 by Eric Sunshine
- Fixed a memory leak due to misusing xstrfmt()
[1] http://thread.gmane.org/gmane.comp.version-control.git/293778
Michael Rappazzo (2):
rev-parse tests: add tests executed from a subdirectory
rev
a subdirectory of the main worktree.
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
t/t1500-rev-parse.sh | 28
t/t1700-split-index.sh | 17 +
t/t2027-worktree-list.sh | 12 ++--
3 files changed, 55 insertions(+), 2 deletions(-)
diff
Differenced from v2[1]:
- Rewrote the commits to just two; one that introduces tests, and
one which fixes the problem.
[1] http://thread.gmane.org/gmane.comp.version-control.git/292272
Michael Rappazzo (2):
rev-parse tests: add tests executed from a subdirectory
rev-parse: fix some
-dir
which has been adjusted and marked to expect failure.
Some of the tests added have been marked to expect failure. These
demonstrate a problem with the way that some options to git rev-parse
behave when executed from a subdirectory of the main worktree.
Signed-off-by: Michael Rappazzo <ra
this to return the
proper relative path to the git directory.
Related tests marked to expect failure are updated to expect success
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
builtin/rev-parse.c | 19 ++-
t/t1500-rev-parse.sh | 4 ++--
t/t1700-split-in
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
t/t1700-split-index.sh | 17 +
1 file changed, 17 insertions(+)
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index 8aef49f..d2d9e02 100755
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@
Differences from v1[1]:
- Simplify implementation based on review comments
- Included similar changes in rev-parse for --git-path and --shared-index-path
- Added tests and separated them into individual commits
[1] http://thread.gmane.org/gmane.comp.version-control.git/290669
Michael Rappazzo
Adjust the incorrect expectation for `rev-parse --git-common-dir`.
Add a test for `git rev-parse --git-path` executed from a linked
worktree.
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
t/t2027-worktree-list.sh | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
t/t1500-rev-parse.sh | 37 +
1 file changed, 37 insertions(+)
diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh
index 48ee077..1e220f7 100755
--- a/t/t1500-rev-parse.sh
+++ b/t/t1500-rev-pa
this to return the
proper relative path to the git directory.
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
builtin/rev-parse.c | 19 ++-
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index c961b74..1
been converted to use test_cmp or test_stdout.
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
t/t1500-rev-parse.sh | 355 ++-
1 file changed, 295 insertions(+), 60 deletions(-)
diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh
test_stdout accepts an expection and a command to execute. It will execute
the command and then compare the stdout from that command to an expectation.
If the expectation is not met, a mock diff output is written to stderr.
Based-on-a-patch-by: Jeff King <p...@peff.net>
Signed-off-by: M
as recommended in the discussion.
[1] http://thread.gmane.org/gmane.comp.version-control.git/291087
[2] http://thread.gmane.org/gmane.comp.version-control.git/291087/focus=291475
Michael Rappazzo (2):
test-lib: add a function to compare an expection with stdout from a
command
t1500-rev-parse
luding this patch as the first commit in the aforementioned bug
fix, but I wanted to get it out for review to make sure that it is acceptible.
[1]http://thread.gmane.org/gmane.comp.version-control.git/290669
[2]http://article.gmane.org/gmane.comp.version-control.git/287462
Michael Rappazzo (1):
textual expectations have been converted to use
test_cmp (which will show a diff when the test is run with --verbose).
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
t/t1500-rev-parse.sh | 607 +--
1 file changed, 545 insertions(
(similar to `--show-cdup`).
Add as test to t1500-rev-parse.sh for this case and adjust another test
in t2027-worktree-list.sh to use this expectation.
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
builtin/rev-parse.c | 14 --
t/t1500-rev-parse.sh
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
gitk | 21 -
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/gitk b/gitk
index 3686370..29ef36c 100755
--- a/gitk
+++ b/gitk
@@ -9944,7 +9944,7 @@ proc reflistfilter_change {n1 n2 op} {
}
s.
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
gitk | 60 +++-
1 file changed, 51 insertions(+), 9 deletions(-)
diff --git a/gitk b/gitk
index 805a1c7..3686370 100755
--- a/gitk
+++ b/gitk
@@ -1772,12 +1772,12 @@ pro
].
[1] http://thread.gmane.org/gmane.comp.version-control.git/289244
[2] http://thread.gmane.org/gmane.comp.version-control.git/288544
Michael Rappazzo (2):
gitk: alter the ordering for the "Tags and heads" view
gitk: add an option to enable sorting the "Tags and heads" view by
I found a small bug in the v1 of this patch[1], when a tracked upstream
branch is no longer present. The changes are only in the first commit.
[1] http://thread.gmane.org/gmane.comp.version-control.git/288544
Michael Rappazzo (2):
gitk: alter the ordering for the "Tags and heads" v
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
gitk | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/gitk b/gitk
index d6d3136..6d376e3 100755
--- a/gitk
+++ b/gitk
@@ -158,6 +158,7 @@ proc parseviewargs {n arglist} {
global vdatemode vmer
s.
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
gitk | 48 ++--
1 file changed, 42 insertions(+), 6 deletions(-)
diff --git a/gitk b/gitk
index 5f1255c..d6d3136 100755
--- a/gitk
+++ b/gitk
@@ -9933,35 +9933,71 @@ proc refill_reflist
s.
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
gitk | 48 ++--
1 file changed, 42 insertions(+), 6 deletions(-)
diff --git a/gitk b/gitk
index 5f1255c..32fbc50 100755
--- a/gitk
+++ b/gitk
@@ -9933,35 +9933,71 @@ proc refill_reflist
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
gitk | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/gitk b/gitk
index 32fbc50..c933233 100755
--- a/gitk
+++ b/gitk
@@ -158,6 +158,7 @@ proc parseviewargs {n arglist} {
global vdatemode vmer
independently sorted before being put into the main
ref list. Also note that the upstream refs are _not_ duplicated in the
remote refs list.
Michael Rappazzo (2):
gitk: alter the ordering for the "Tags and heads" view
gitk: add an option to enable sorting the "Tags and head
as 'UPDATED'. If
it is not successful, the ref is reported as 'UNABLE-TO-UPDATE'.
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
builtin/ff-refs.c | 40
1 file changed, 40 insertions(+)
diff --git a/builtin/ff-refs.c b/builtin/ff-refs.c
index 9
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
t/t7900-ff-refs.sh | 164 +
1 file changed, 164 insertions(+)
create mode 100755 t/t7900-ff-refs.sh
diff --git a/t/t7900-ff-refs.sh b/t/t7900-ff-refs.sh
new file mode 100755
in a
worktree are reported as 'SKIPPED'. With `--dry-run` these are reported
'WOULD-SKIP'.
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
builtin/ff-refs.c | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/builtin/ff-refs.c b/builtin/ff-refs.c
index f
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
Documentation/git-ff-refs.txt | 55 +++
1 file changed, 55 insertions(+)
create mode 100644 Documentation/git-ff-refs.txt
diff --git a/Documentation/git-ff-refs.txt b/Documentation/git-ff-re
which track upstream remote branches that update often. The
intended usage pattern is to run `git-fetch` followed by `git-ff-refs`.
Michael Rappazzo (5):
ff-refs: builtin cmd to check and fast forward local refs to their
upstream
ff-refs: update each updatable ref
ff-refs: add --dry-run
- The branch would be fast forwarded
REMOTE-MISSING - The branch is tracking an upstream that is not present
NON-FAST-FORWARD - The branch has diverged from the upstream
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
.gitignore| 1 +
Makefile
'git worktree list' iterates through the worktree list, and outputs
details of the worktree including the path to the worktree, the currently
checked out revision and branch, and if the work tree is bare. There is
also porcelain format option available.
Signed-off-by: Michael Rappazzo <ra
worktree.c contains functions to work with and get information from
worktrees. This introduction moves functions related to worktrees
from branch.c into worktree.c
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
Makefile| 1 +
branch.c
The worktree structure provided for an individual worktree includes the
absolute path of the worktree. The fuction to get the worktree details
is a refactor of the find main/linked symref functions.
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
worktree.c
Refactoring will help transition this code to provide additional useful
worktree functions.
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
worktree.c | 96 --
1 file changed, 69 insertions(+), 27 deletions(-)
diff
In addition to the absolute path in the worktree struct, add the location
of the git dir, the head ref (if not detached), the head revision sha1,
whether or not head is detached, and whether or not the worktree is a
bare repo.
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
work
In addition to the absolute path in the worktree struct, add the location
of the git dir, the head ref (if not detached), the head revision sha1,
whether or not head is detached, and whether or not the worktree is a
bare repo.
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
work
worktree.c contains functions to work with and get information from
worktrees. This introduction moves functions related to worktrees
from branch.c into worktree.c
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
Makefile| 1 +
branch.c
[1]: http://thread.gmane.org/gmane.comp.version-control.git/278190
Michael Rappazzo (5):
worktree: add top-level worktree.c
worktree: refactor find_linked_symref function
worktree: add a function to get worktree details
worktree: add details to the worktree struct
worktree: add 'list
The worktree structure provided for an individual worktree includes the
absolute path of the worktree. The fuction to get the worktree details
is a refactor of the find main/linked symref functions.
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
worktree.c
Refactoring will help transition this code to provide additional useful
worktree functions.
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
worktree.c | 94 --
1 file changed, 67 insertions(+), 27 deletions(-)
diff
'git worktree list' iterates through the worktree list, and outputs
details of the worktree including the path to the worktree, the currently
checked out revision and branch, and if the work tree is bare. There is
also porcelain format option available.
Signed-off-by: Michael Rappazzo <ra
The worktree structure provided for an individual worktree includes the
absolute path, the location of the git dir, the head ref (if not
detached), the head revision sha1, whether or not head is detached, and
whether or not the worktree is a bare repo.
Signed-off-by: Michael Rappazzo <ra
'git worktree list' iterates through the worktree list, and outputs
details of the worktree including the path to the worktree, the currently
checked out revision and branch, and if the work tree is bare. There is
also porcelain format option available.
Signed-off-by: Michael Rappazzo <ra
/git/git/compare/master...rappazzo:worktree-list/v8/next-entry-in-worktree
Michael Rappazzo (4):
worktree: add top-level worktree.c
worktree: refactor find_linked_symref function
worktree: add functions to get worktree details
worktree: add 'list' command
Documentation/git-worktree.txt
worktree.c contains functions to work with and get information from
worktrees. This introduction moves functions related to worktrees
from branch.c into worktree.c
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
Makefile| 1 +
branch.c
Refactoring will help transition this code to provide additional useful
worktree functions.
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
worktree.c | 86 ++
1 file changed, 64 insertions(+), 22 deletions(-)
diff
Including functions to get the list of all worktrees, and to get
a specific worktree (primary or linked).
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
Makefile | 1 +
worktree.c | 157 +
worktree.h
decorate bare worktrees
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
Documentation/git-worktree.txt | 10 +++-
builtin/worktree.c | 63 +
t/t2027-worktree-list.sh | 122 +
3 files changed, 194 inse
The code formerly in branch.c was largely the basis of the
get_worktree_list implementation is now moved to worktree.c,
and the find_shared_symref implementation has been refactored
to use get_worktree_list
Signed-off-by: Michael Rappazzo <rappa...@gmail.com>
---
branch.c
This series represents a major rewrite of the previous series. It introduces
a top-level worktree.c which includes `get_worktree_list` and `get_worktree`
functions, and it also moves the `find_shared_symref` from branch.c to
worktree.c
Michael Rappazzo (3):
worktree: add top-level worktree.c
is returned from the for_each_worktree
function.
Signed-off-by: Michael Rappazzo rappa...@gmail.com
---
builtin/worktree.c | 83 ++
1 file changed, 83 insertions(+)
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 430b51e..7b3cb96
'git worktree list' uses the for_each_worktree function to iterate,
and outputs the worktree dir. With the verbose option set, it also
shows the branch or revision currently checked out in that worktree.
Signed-off-by: Michael Rappazzo rappa...@gmail.com
---
Documentation/git-worktree.txt | 10
Changes since v5:
- used already existing functions instead of reimplementing:
- resolve_ref_unsafe
- find_unique_abbrev
- shorten_unambiguous_ref
- added more tests for 'worktree list'
Michael Rappazzo (2):
worktree: add 'for_each_worktree' function
worktree: add 'list
()` returns
false. The worktree_path also needs to the /.git removed from it.
Therefore, I opted to keep the code like this.
Michael Rappazzo (2):
worktree: add 'for_each_worktree' function
worktree: add 'list' command
Documentation/git-worktree.txt | 11 +++-
builtin/worktree.c
'git worktree list' uses the for_each_worktree function to iterate,
and outputs in the format: 'worktree (short-ref)'
Signed-off-by: Michael Rappazzo rappa...@gmail.com
---
Documentation/git-worktree.txt | 11 +-
builtin/worktree.c | 55
t/t2027
is returned from the for_each_worktree
function.
Signed-off-by: Michael Rappazzo rappa...@gmail.com
---
builtin/worktree.c | 83 ++
1 file changed, 83 insertions(+)
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 430b51e..7b3cb96
is NOT included in the iterated worktrees
Michael Rappazzo (2):
worktree: add 'for_each_worktree' function
worktree: add 'list' command
Documentation/git-worktree.txt | 11 +++-
builtin/worktree.c | 139 +
t/t2027-worktree-list.sh
'git worktree list' uses the for_each_worktree function to iterate,
and outputs in the format: 'worktree (short-ref)'
Signed-off-by: Michael Rappazzo rappa...@gmail.com
---
Documentation/git-worktree.txt | 11 -
builtin/worktree.c | 55
is returned from the for_each_worktree
function.
Signed-off-by: Michael Rappazzo rappa...@gmail.com
---
builtin/worktree.c | 84 ++
1 file changed, 84 insertions(+)
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 430b51e..a43e360
Differences from
[v2](http://www.mail-archive.com/git@vger.kernel.org/msg75467.html)
- removed unintended whitespace changes
- cleanup based on comments from v2
Michael Rappazzo (1):
worktree: add 'list' command
Documentation/git-worktree.txt | 6 +++-
builtin/worktree.c
'git worktree list' will list the main worktree followed by any linked
worktrees which were created using 'git worktree add'.
Signed-off-by: Michael Rappazzo rappa...@gmail.com
---
Documentation/git-worktree.txt | 6 +++-
builtin/worktree.c | 67
I am attempting to add the 'git worktree list' command.
I don't have a lot of c experience, so please double check that I am
not missing something important.
Michael Rappazzo (1):
worktree: list operation
Documentation/git-worktree.txt | 9 -
builtin/worktree.c | 80
'git worktree list' will list the main worktree followed by any linked
worktrees which were created using 'git worktree add'. The option
'--main-only' will restrict the list to only the main worktree.
---
Documentation/git-worktree.txt | 9 -
builtin/worktree.c | 80
I am attempting to add the 'git worktree list' command.
I don't have a lot of c experience, so please double check that I am
not missing something important.
Sorry about publishing the first version too soon.
Michael Rappazzo (1):
worktree: list operation
Documentation/git-worktree.txt
'git worktree list' will list the main worktree followed by any linked
worktrees which were created using 'git worktree add'. The option
'--main-only' will restrict the list to only the main worktree.
---
Documentation/git-worktree.txt | 9 -
builtin/worktree.c | 84
For some mergetools, the current invocation of git mergetool will
include an auto-merge flag. By default the flag is included, however if
the git config option 'merge.automerge' is set to 'false', then that
flag will now be omitted.
Signed-off-by: Michael Rappazzo rappa...@gmail.com
During conflict resolution, invoking a mergetool which supports
auto-merge will pass that option by default to the underlying tool.
This patch is intended to allow one to set 'merge.automerge' to
'false' in order to override this behavior.
Michael Rappazzo (1):
mergetools: add config option
Difference between v4 and v5 of this patch:
- added documention in Documentation/config.txt
- renamed the new auto-rebase w/ config test to be less inaccurate
Apologies for this, I should have caught these before.
Michael Rappazzo (1):
git-rebase--interactive.sh: add config option
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
Difference between v3 and v4 of this patch:
- cleaned up changes in rearrange_squash() function
- consolidated autosquash test
Michael Rappazzo (1):
git-rebase--interactive.sh: add config option for custom instruction
format
Documentation/git-rebase.txt | 7 +++
git-rebase
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
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
Difference between v2 and v3 of this patch:
- Fixed autosquash
- Added documentation on the config options
- Added two tests to t3414 (rebase-autosquash)
Michael Rappazzo (1):
git-rebase--interactive.sh: add config option for custom instruction
format
Documentation/git
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
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
In the Tags and heads view, the list of refs is globally sorted.
The list of local refs (heads) is separated by the remote refs. This
change re-orders the view toi be: local refs, remote refs tracked by
local refs, remote refs, tags, and then other refs
Signed-off-by: Michael Rappazzo rappa
list. Also note that the upstream refs are _not_ duplicated in the
remote refs list.
Michael Rappazzo (1):
gitk: Alter the ordering for the Tags and heads view
gitk-git/gitk | 48 ++--
1 file changed, 42 insertions(+), 6 deletions(-)
--
2.4.2
81 matches
Mail list logo
