Commits
- Commit:
5b67f96efbfbf2e5a3f75f6ab91e45dd3013c77f
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: require exact match when removing files
- Commit:
dd6c3779b6533ba060e07dc68fdaf6b1e0e49d30
- From:
- Omar Polo <op@omarpolo.com>
- Date:
improve `got patch' section of the manpage
Simplify some phrasing, explain what preconditions `got patch' has and
what happens to the work tree when an error occurs.
- Commit:
dbda770b9c10968769697cd1a7d6ffff596dd30b
- From:
- Omar Polo <op@omarpolo.com>
- Date:
check file status before applying the patch
Don't allow `got patch' to delete files that are not known, or add files
that are already known and to edit files that are known, not obstructed
and without conflicts.
- Commit:
a84c0d302fea1f440dfc5b1e70dac59cc50e31f9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix 'got status' with an obstructed file given as argument; found by Omar
- Commit:
f7fce2e256045540640f55a619a55eea6ec859fa
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make got log, diff, blame, tree, and cat unlock the work tree earlier
These commands perform potentially long-running operations on the
repository after reading information from the work tree. There is no
need for them to keep the work tree locked until the end. Doing so
blocks other commands the user may want to run concurrently. For example,
the user may want to be able to run 'got diff' in the work tree while
browsing 'got log' output in less(1).
Pointed out by Misha on gameoftrees IRC.
- Commit:
6e96b3268181f675fcf264d5e682d86a15ce426a
- From:
- Omar Polo <op@omarpolo.com>
- Date:
refactor apply_patch to support renaming files
add two helper functions (schedule_add, schedule_del) and move the guts
of apply_patch into a new function `patch_file'. This simplifies
apply_patch and makes easier to figure out what happens.
Then, drop GOT_ERR_PATCH_PATHS_DIFFER since we allow the to rename
files.
- Commit:
423faaa61a622c043f5a2918f3a9183ae02408d4
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got-read-patch: plug memory leak
- Commit:
b95c53dfde0b4b71d68386b5a6e362877bba1d43
- From:
- Omar Polo <op@omarpolo.com>
- Date:
apply_patch: move sanity check early in recv_patch
- Commit:
ca6444c5b3830627626458222ef3f16852e3505f
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: re-add forgotten lseek
otherwise got-read-patch can't parse any patch because the position
indicator is at the end of file. While here fix the return too and set
patchfd to -1 on error (stsp suggestion.)
ok thomas, stsp
- Commit:
33df9995672a4f24ded6f8cd1575637e47d27921
- From:
- Omar Polo <op@omarpolo.com>
- Date:
save `pos' in locate_hunk instead of calling ftello again
ok thomas, stsp
- Commit:
39479daec29a845f84812b85418dc85dc3a433a9
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
make "got cherrypick/backout" match argument against refs before object IDs
Use got_repo_match_object_id() instead of hand-rolled code and pick up
the updated handling of reference arguments.
ok stsp
- Commit:
4be911ed5341c159d93089befd31a1190dbd6353
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix got_repo_match_object_id() docstring, it is not specific to commits
This was a leftover from got_repo_resolve_commit_arg() which was superseded
in commit 71a276322e39e17baf5697b5daac8e8fe6ad2ae1
- Commit:
d8247bfd656690b08de2d17c40861701b5b8be6d
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
make "got ref" match argument against references before object IDs
Use got_repo_match_object_id() instead of hand-rolled code and pick up
the updated handling of reference arguments.
ok stsp
- Commit:
8e26059c044bff5930bc14b3ae5123fc0fc838d5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
document that 'gotadmin listpack' requires a pack index
- Commit:
81a197017a772a59ade02c19a033c0153b74d3b8
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
ref.sh: fix pastos and report the actual command that was run
- Commit:
0e6ab4b2dda12fd56fa5ccb1cb3ff1aa12876891
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make got_repo_match_object_id_prefix() reject overlong input strings
suggested by + ok naddy
- Commit:
0ed2285b0119b293d6b77b882c707c0377e176cd
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle reference arguments which look like short object IDs
Match command line arguments against references before matching object IDs.
This makes it possible to use reference names that happen to match a short
object ID.
For example, a branch called "11ac" could not be diffed in OpenBSD src.git
which happens to contain commit IDs that begin with hex digits 0x11ac.
A bogus error would be reported in this situation:
$ got diff master 11ac
got: ambiguous object ID
ok naddy
- Commit:
d955343d21ec47956137ebce96b31ce9c0de5669
- From:
- Omar Polo <op@omarpolo.com>
- Date:
pass the callback data instead of hardcoding NULL, ok stsp
- Commit:
36751b1b2e8389b739a0f7aacf7d8e5371d898bf
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove needless header inclusion; lib/pack.c does not need got_opentemp.h
- Commit:
6f5cb1bdf76f3043ac81d413349d354738180769
- From:
- Omar Polo <op@omarpolo.com>
- Date:
fix path to the temp file used to accumulate the patch edits
ok stsp
- Commit:
bfbccd0a546344106bb6e22074678a396d7bcad0
- From:
- Omar Polo <op@omarpolo.com>
- Date:
use test(1) -eq and -ne to compare integers; ok tb
- Commit:
fd79e2e02793239b5efc0d2ffda3c44a49a85e8a
- From:
- Omar Polo <op@omarpolo.com>
- Date:
typos
- Commit:
e9ce266e31923cc339954b331d273d9bba543f6f
- From:
- Omar Polo <op@omarpolo.com>
- Date:
add `got patch' command for applying unified diffs
- Commit:
805253d5155091691f7cf36e54134cc87b2ea91a
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
fix level of indirection
ok stsp
- Commit:
3a12860c3cbeae377b90f5526d0b75ccdb01bfc4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make the URI parser tolerate trailing slashes at the end of the input URI
ok naddy